gentoo resync : 02.01.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-01-02 14:45:16 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-01-02 14:45:16 +0000
commit: a70f42c65202d88c203c40910fef8f96f333d1ee (patch)
tree: de550ee3deb79c550ae1aba7fcce118d5d4dbc31
parent: 721254b86a09bdedd5eefd0de7899c90ea2ead1a (diff)
819 files changed, 3390 insertions, 11771 deletions
diff --git a/Manifest b/Manifest
index 5813301408cc..d4600e19a7b9 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 28833 BLAKE2B 4b708071e30eb9628b76081644142ade95485d50d18bf26b841fd18e17505ed1990bde3b1468dfbf4d69fe8f7cf4e3291268e83028ecf9d30cc401ddc42d15d7 SHA512 b1ef1654800412b40077fff5f7efd8a4331d10b065d084d5af490299d129ca44f03b895392c0e83d644798ddb061e1ea3132a5a62df36dc9858bdae70349a0a0
-TIMESTAMP 2018-01-01T19:39:40Z
+MANIFEST Manifest.files.gz 28786 BLAKE2B 9eb501b797d56600ff181008b74d46a13274583df52461d8548a48deec5fddd258ab4be3aa0a2d4674c7429110b4c54fcc8ed9ff124578a1b2d5da4469112656 SHA512 3735c174faae13882046f3ba32561af89e0b9f3967129f0103c529c66d492baa72abe503a76552c423f0faa48af620aa3c2d8e39e374e6d0d06965851b971fef
+TIMESTAMP 2018-01-02T13:39:46Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlpKjnxfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlpLi6JfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAZzQ/+PCDcCxgRm6m5JbUhe9ljKoHiRauDI3ki3upB/DknXD49p9bl2/dV3R2T
-+lzG5YJcuuJ1eye+pkZ/ofzGo9U8hU2Lu3nzoziTOOEA70FXud/wfMstQVPBNWy6
-bOnP7r5cRzSSIZ7FhI4OfvaGQJ8Z3ILM1BW9BXFTRnYmhBJRFR/Rdxu6D1BjNvVJ
-Dkn1xHBFSOSVqR/NQJVK3sMWDjBhMy1++MB2yxo4UirIeTkaoIJxU9gu8wNbgAE1
-y9kInTSIbRqf08JGw3gr0PTrHdtAXL/UIlXb9eEjwcpuWdHIrk2JhyF1g29FeSPl
-m8fZgFgIRpP1YkkWGAahR7URyh91QZPZxa96ADa0YgTpj1uNm022Nciv5QNKosny
-uX/ZRxi1HYBnNUMzWwCi/invTEZJ6JhFoR6Trllw+HSjFzWpUcA31CpacHQqoxes
-srZq/7iCOgNgV3jVnAsc8rb6Q7sKEhXsw5Cp9JijnVSNddO5IaKwWqc7GqdOV+T2
-odMKtfg25nFVr1FapbWD1ogF432vTD9H/hbCLUI9xYmnwI+THg2Fk6mcMjJqZMWH
-CtXlm7JgBoutfkgJip/kP/TFhuERQkAyINeRfA0+f/AEti4goE35yGweWC0awL0O
-qHLJeWWGn2wqd6d0NXrLfT/4F6Cfr4dL8AQTQfG1rpit1kOOkvs=
-=Dlif
+klBhiRAAtIOPpTb+wYSuLPoZ8V0NsaJA0P8QXyGNISr0IeRplFa042aVAEIqXCLV
+h5rUYP37I6W9W0+ONpUvvuQJgEbbvJ+mU7DrhaeqZ6cvKuqND9XtKk4P9fC6BgKb
+9+8YCdI8eKjJdfrcxM2NzOOEfIGus8cPr7y9Z4Yl9EIRCNqTq4J/SDlGrNc+JozK
+rLITIBkyH8PHBOXzrjN6ytpXFgaklrFCvzxTPeu74m6blgGr3o5uv93IIVHEux/q
+ZBjBD1MaLqmNBz33xqeIhhZE01pQgW0aas2s7SOYQzIXPlTzMlsNwF+jt59CwKdF
+5LzktfS7YJWuG+VsPMvPyDbPusSMhZ7ACBrn0OkFurau0DVtkImM//+bXKhxGHkY
+uIZyeJvyP/N1QiLjLdyvmtfdSha9a49vxTDTg+B0thFgy67LvJiBfY809IZfeAjd
+qYm86kM/0A9KdZQx0b52r78jWcem37OoHkFj8qgwyiPtjjSVy9gNdr2PN0pQyDiJ
+zETT39MjF2+35qKb3o4ymXHFWKRiddUa/F+zXxZSwW9OM8ZDdpR3sbGxf+zunOkg
+8ILSvwYgvAJUQanwz6P8I9/qtTGUgJeM9ZxEK/xlQXHppFPhiDIPzYL19Ifn3oZI
+7RnBsWGiayf0N5UYIyPr+JfSvvjJMszWNX6W+HjDfC2zmC05cL8=
+=AcaA
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index ac4e3a5e3b22..58a4b6b72a0b 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 9594cfcfbc35..60da22ba3c88 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index 08dcada4f26d..a03bd19d2c16 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1,4 +1,6 @@
 AUX calamares-pkexec 43 BLAKE2B 432999808da0fdde0e5d9c88887a5f112ac00c90af51f3d907d02ab4f9eb4fae7348856028bcfff98ced8698d0d039bd9506f50baa90f5b12b43c1b72885f230 SHA512 768148cd58cdfb5c6791b76ec60c21a4ca852120f53ed31a83bc7a2e0a26aa77b10bd3756182d3dff03208e820def4b83c45edba0484fa2f5a33c93880c3f4bb
+DIST calamares-3.1.11.tar.gz 2273213 BLAKE2B da746957ca583db2cf2b89814e9b6b8a94130b890263a851248aa83ebb0ac481805a4193e2ca2fc6fdae3e86c871a6dd9b922aa3f06b4af73db28dd6bdc093cc SHA512 5aa47b07c238d7de89aac4417b577fb6cf87d2ede7fd3d4e272381cb1f90ce967f5478134e9fe728adaf32361335f2f590956200c8daf265bfeab9d979057e8c
 DIST calamares-3.1.7.tar.gz 2275893 BLAKE2B b60127a34b2f79be78540c5fd9affabde2889d335a3a41a61950adc48c9200e357f3e0b23e6c94f117c64a08fa4312ae8cbcb5e42e0ea5893d38378a583e4b7e SHA512 eaf516db4d97b89a5854c5dac5fd556a2deb47bebb88e7c55e2bb7d4ce050e913afbf08c6536503f5c3af7427a43b75f67bfa317e1601bb5a6f05f17c5bf6760
+EBUILD calamares-3.1.11.ebuild 1974 BLAKE2B ce325762ebf3755c1c1d76b0dcf3b171b12878011044c46dad3c175322160481db0727842c1daf5ad298dd360cf9f873ed6e3c4de8e79eb382c15e86c7073cda SHA512 0fc81afa86c9b487da519e63093ed7abd60838b411ae390b081ea35f805a91bb322851cba29d19f665111d301230099f6015695793c753a500a82de77dc493cb
 EBUILD calamares-3.1.7.ebuild 1974 BLAKE2B 4f4aaa52cec0d35c8f9379554b96ff6267e3d318c1cc6c18cdf906e29d119bb23ebefd2769a514443a68b854e84720967abbf1c2c111cd018dbc749af9ac9f70 SHA512 e6b308f8fe540fc520d4f071e6276e924dfbff7c0176a3b27bd0ca9ebf400ffdcbf54483cbcdcc2eaca11bf72463ceb80505262f5dfa06c4c02f519d645c8b38
 MISC metadata.xml 1055 BLAKE2B a6c7974103baa5a646cb1d594e3f224903df9ce5c618ad4ed46c0b3d4df5d3437be570eda0d55e3b0ca8f6df4af9627b088ace2a3f0efc802528aeb49fc7bce6 SHA512 0269dad0b0a05e7c729ad5b9f1f7d6790c117b0d76b904dc909b868b1c298ff3352faafe91104b39cfc3c2e4f5e1a20244d3f5321c937d2334bd15bd910dc89f
diff --git a/app-admin/calamares/calamares-3.1.11.ebuild b/app-admin/calamares/calamares-3.1.11.ebuild
new file mode 100644
index 000000000000..4ad1a07e9d4c
--- /dev/null
+++ b/app-admin/calamares/calamares-3.1.11.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_4,3_5} )
+inherit kde5 python-r1
+
+DESCRIPTION="Distribution-independent installer framework"
+HOMEPAGE="https://calamares.io"
+if [[ ${KDE_BUILD_TYPE} == live ]] ; then
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+IUSE="+networkmanager pythonqt +upower"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwebengine 'widgets')
+	$(add_qt_dep qtwidgets)
+	>=dev-cpp/yaml-cpp-0.5.1
+	>=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
+	sys-apps/dbus
+	sys-apps/dmidecode
+	sys-auth/polkit-qt[qt5(+)]
+	>=sys-libs/kpmcore-3.0.3:5=
+	pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_USEDEP}] )
+"
+
+RDEPEND="${DEPEND}
+	app-admin/sudo
+	dev-libs/libatasmart
+	net-misc/rsync
+	>=sys-block/parted-3.0
+	|| ( sys-boot/grub:2 sys-boot/systemd-boot )
+	sys-boot/os-prober
+	sys-fs/squashfs-tools
+	virtual/udev
+	networkmanager? ( net-misc/networkmanager )
+	upower? ( sys-power/upower )
+"
+
+src_prepare() {
+	python_setup
+	export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
+	       PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
+	       PYTHON_CFLAGS="$(python_get_CFLAGS)"\
+	       PYTHON_LIBS="$(python_get_LIBS)"
+
+	eapply_user
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWEBVIEW_FORCE_WEBKIT=OFF
+		-DWITH_PYTHONQT=$(usex pythonqt)
+	)
+
+	kde5_src_configure
+	sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' "${S}"/calamares.desktop
+	sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' "${S}"/calamares.desktop
+}
+
+src_install() {
+	kde5_src_install
+	dobin "${FILESDIR}"/calamares-pkexec
+}
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 891ae388cf8f..3591920d131a 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index 78a93b972636..1a16296d475c 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -1,9 +1,6 @@
-AUX CVE-2017-5601.patch 979 BLAKE2B 4ecf3f2dfa52f5d5efcce3807072dda9cf4a1f680743a0bea5859bef4480dff05155f98cc68f16c81a9ba11ec5190b0f7ea5b9ab19b7670a5cd14516aeab7fb7 SHA512 a2c8507698166b3d4bbd197323a15cb82d53a647f2d0c74e17e9b229e4f1fd44c3f0468b674c0dfb693ddad7fc7c5cc4f00fbce1e607d0c02fb90d59cc9e09a0
 AUX libarchive-3.3.1-libressl.patch 825 BLAKE2B 63babd383dce64f836a84db3c336c865d1740f30df45838a7cba178499f110aae1883dc52189694ce52f8c7966dbe1af043a8043586a2476395168935713c3e7 SHA512 2418a281562ee5f0e4f54ca181c68265f6b72a80786d17f45547222a3fde83597a17d88075e5f9c5d52a2688d8890006f592a129ddc634397a9160d16724a12c
-DIST libarchive-3.2.2.tar.gz 5458241 BLAKE2B 99a3f01e780a3cac1142645887f31fc4d68c9a60a3539c259745274ea612373b41a7e93d95c27739c87c6050a0304ff069a0f1435fdbf0a13d47935209547c20 SHA512 a67920c37d49cf9478032d77fc4fa21827cebb96e9b83d9ecb8466328834052e4ab3d3a9bc4e2edf405d6cb14ffd648c9fa100b578257f6e5842c99bbea558a7
 DIST libarchive-3.3.1.tar.gz 6219943 BLAKE2B fc951a613098060d55c000436ccdc6997126be2e1eeb41f348ca20c1ae3e54936ae053404fdd3211de90a2a223b29f5a80c580a937878a37265401d55655fff1 SHA512 90702b393b6f0943f42438e277b257af45eee4fa82420431f6a4f5f48bb846f2a72c8ff084dc3ee9c87bdf8b57f4d8dddf7814870fe2604fe86c55d8d744c164
 DIST libarchive-3.3.2.tar.gz 6236562 BLAKE2B da26474b4fd8111561c1e5ac12a6333a8ba8a23cce9e9cdce7b50647ab8dbae08609ea1bffbab60da74c6555ebf0815c456fe69c72129eb6071fb845141d0beb SHA512 1e538cd7d492f54b11c16c56f12c1632ba14302a3737ec0db786272aec0c8020f1e27616a7654d57e26737e5ed9bfc9a62f1fdda61a95c39eb726aa7c2f673e4
-EBUILD libarchive-3.2.2-r1.ebuild 3429 BLAKE2B eacd04939285d3354a28150396a3f8e70c65b1492869a592e04bb9c3d3f2cc007c38689490c9105887a3b7ac2943a747d908682e48397d736101ef4fae43135a SHA512 0b3e1059ff5b1118934591f2a8c9c00c36c4104c72eddc9d831a66e6ce0254db04513c05e3856e53b27e5ba422b6e5ded6238da56f9d9c23f66dfa7f4907feef
 EBUILD libarchive-3.3.1.ebuild 3300 BLAKE2B 10bce3600696bbcafbb17267ab7139958d0b810acbbfb56e476e873a138770ff5b5b96216387e97a3281f06df01ec67fdd573ea6351ca9a46344c33c1d1d881c SHA512 3c8bd5989c8b6f5554f98e35243a88b3d132779c59bd9d74ee77c7971dba7784345d4c3da2c1294d57384d8034a3461bf5e794a5c15060115bd1451bd7cd879b
 EBUILD libarchive-3.3.2.ebuild 3314 BLAKE2B b864f34e27ee57395cce46578d23880c64b0544f0661b34c50b36fa7138d92b221835e643420279950154c0642118c6e042fea8b7b6c38fd990d094e37c99db3 SHA512 465cedc1ad9b10c83a8a218af0b4fc50207dbf9593a25bb0292781a8b7f141950496b1909ce355174020a97c63b88322c41806f9215765b7a8e5fa6743bbb5e2
 MISC metadata.xml 1322 BLAKE2B 71089cf0e8324981233467ce2a07d13689731ecb01b50b319081b442eae55f7b9c879826b572be84123d3decaab2672fd68f5494021559a36de1cd3f152010cc SHA512 0da2a58ed4e5ee5ee41c0bde97473fb50a7ea0248ade72a16b9b7ba2d9da811b68ab183c4d2e615a51954cd8338ba0a810529f47738847f6f9711628823a5680
diff --git a/app-arch/libarchive/files/CVE-2017-5601.patch b/app-arch/libarchive/files/CVE-2017-5601.patch
deleted file mode 100644
index 4ba85ff9072f..000000000000
--- a/app-arch/libarchive/files/CVE-2017-5601.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 98dcbbf0bf4854bf987557e55e55fff7abbf3ea9 Mon Sep 17 00:00:00 2001
-From: Martin Matuska <martin@matuska.org>
-Date: Thu, 19 Jan 2017 22:00:18 +0100
-Subject: [PATCH] Fail with negative lha->compsize in lha_read_file_header_1()
- Fixes a heap buffer overflow reported in Secunia SA74169
-
----
- libarchive/archive_read_support_format_lha.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/libarchive/archive_read_support_format_lha.c b/libarchive/archive_read_support_format_lha.c
-index 52a5531..d77a7c2 100644
---- a/libarchive/archive_read_support_format_lha.c
-+++ b/libarchive/archive_read_support_format_lha.c
-@@ -924,6 +924,9 @@ lha_read_file_header_1(struct archive_read *a, struct lha *lha)
- 	/* Get a real compressed file size. */
- 	lha->compsize -= extdsize - 2;
- 
-+	if (lha->compsize < 0)
-+		goto invalid;	/* Invalid compressed file size */
-+
- 	if (sum_calculated != headersum) {
- 		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
- 		    "LHa header sum error");
diff --git a/app-arch/libarchive/libarchive-3.2.2-r1.ebuild b/app-arch/libarchive/libarchive-3.2.2-r1.ebuild
deleted file mode 100644
index 34485b16533b..000000000000
--- a/app-arch/libarchive/libarchive-3.2.2-r1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils libtool multilib-minimal toolchain-funcs
-
-DESCRIPTION="BSD tar command"
-HOMEPAGE="http://www.libarchive.org/"
-SRC_URI="http://www.libarchive.org/downloads/${P}.tar.gz"
-
-LICENSE="BSD BSD-2 BSD-4 public-domain"
-SLOT="0/13"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="acl +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo nettle static-libs +threads xattr +zlib"
-
-RDEPEND="
-	acl? ( virtual/acl[${MULTILIB_USEDEP}] )
-	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
-	expat? ( dev-libs/expat[${MULTILIB_USEDEP}] )
-	!expat? ( dev-libs/libxml2[${MULTILIB_USEDEP}] )
-	iconv? ( virtual/libiconv[${MULTILIB_USEDEP}] )
-	kernel_linux? (
-		xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] )
-	)
-	!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-	libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
-	lzma? ( app-arch/xz-utils[threads=,${MULTILIB_USEDEP}] )
-	lzo? ( >=dev-libs/lzo-2[${MULTILIB_USEDEP}] )
-	nettle? ( dev-libs/nettle:0=[${MULTILIB_USEDEP}] )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	kernel_linux? (
-		virtual/os-headers
-		e2fsprogs? ( sys-fs/e2fsprogs )
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/CVE-2017-5601.patch
-)
-
-src_prepare() {
-	default
-	elibtoolize  # is required for Solaris sol2_ld linker fix
-}
-
-multilib_src_configure() {
-	export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923
-
-	local myconf=()
-	myconf=(
-		$(use_enable acl)
-		$(use_enable static-libs static)
-		$(use_enable xattr)
-		$(use_with bzip2 bz2lib)
-		$(use_with expat)
-		$(use_with !expat xml2)
-		$(use_with iconv)
-		$(use_with lz4)
-		$(use_with lzma)
-		$(use_with lzo lzo2)
-		$(use_with nettle)
-		$(use_with zlib)
-	)
-	if multilib_is_native_abi ; then myconf+=(
-		--enable-bsdcat=$(tc-is-static-only && echo static || echo shared)
-		--enable-bsdcpio=$(tc-is-static-only && echo static || echo shared)
-		--enable-bsdtar=$(tc-is-static-only && echo static || echo shared)
-	); else myconf+=(
-		--disable-bsdcat
-		--disable-bsdcpio
-		--disable-bsdtar
-	); fi
-
-	# We disable lzmadec because we support the newer liblzma from xz-utils
-	# and not liblzmadec with this version.
-	myconf+=(
-		--without-lzmadec
-	)
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi ; then
-		emake
-	else
-		emake libarchive.la
-	fi
-}
-
-multilib_src_test() {
-	# Replace the default src_test so that it builds tests in parallel
-	multilib_is_native_abi && emake check
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi ; then
-		emake DESTDIR="${D}" install
-
-		# Create symlinks for FreeBSD
-		if ! use prefix && [[ ${CHOST} == *-freebsd* ]]; then
-			# Exclude cat for the time being #589876
-			for bin in cpio tar; do
-				dosym bsd${bin} /usr/bin/${bin}
-				echo '.so bsd${bin}.1' > "${T}"/${bin}.1
-				doman "${T}"/${bin}.1
-			done
-		fi
-	else
-		emake DESTDIR="${D}" \
-			install-includeHEADERS \
-			install-libLTLIBRARIES \
-			install-pkgconfigDATA
-	fi
-
-	# Libs.private: should be used from libarchive.pc instead
-	prune_libtool_files
-}
-
-multilib_src_install_all() {
-	cd "${S}" || die
-	einstalldocs
-}
diff --git a/app-arch/lz4/Manifest b/app-arch/lz4/Manifest
index 0ac2a679de0f..067ab6d781d7 100644
--- a/app-arch/lz4/Manifest
+++ b/app-arch/lz4/Manifest
@@ -1,16 +1,8 @@
-AUX lz4-0_p106-cflags.patch 630 BLAKE2B fbd20433d111a49a2a3c407805732e03d80cfe6e9488afeb2b315bde165b2d78cb69c1d05fde500aedb6c9bbd3ac4e9af6302a7b0ad624b27577656be22efe5b SHA512 0c7cc51229fe20ee0c5e5cb3d933f924750fe3aaa0e97ac78f1f74e4810bf4d9d431990cf12992f25f29dfaffb9dc66b42f3ab6d49147ff881a5cbe49990a89d
-AUX lz4-0_p106-install-to-bindir.patch 2141 BLAKE2B 16d098c3664a0aa69aa2db6be68176fa167adb3bc79c8c2645813f7c693d30b68a3ae7a9dc68cee6c245a0b5a1520fc0ffe7a7d1115f85ebfe2521bb19623f01 SHA512 853be770173b46188c4f293f13c263053fd3837c23e959b2d19e36c5d3c8c04798b619224fe02b20f414494baf4db4235b7c223ce665b9b90f14a655c8303f8c
-AUX lz4-0_p131-static-libs.patch 1515 BLAKE2B bfdfe4a82bb1ea8bf1d8025f9a65441a5d047347a41ad47437c64e78854549b2c148841dd2cc4db1acf37f6eed6fb446dde1c5d12301cc803efe9cd6facfe0ca SHA512 caa55637529c3b723d95965eb1c3ece4551abac6bbaa16cd8c6eae05a41e8be2cde9d67c2099d47a4d62f4e9edeeaf87e532e11fce94bfea953132b5bd7a4732
-DIST lz4-0_p106.tar.xz 129352 BLAKE2B f66467bbb3dc20e0220b3bd6bba793232900c4a4022085f42597b9108696edbb68d29f59896dceb0d42ff123815f978b32c23eed9fcecfccf2ef87b4642fe5ea SHA512 8b2bafbf78be7c42831e264d7acdca12712c88369cecdb3aa4621c84bb6b450c372f5153f7c3939a5f70d5810c62b98993697397319d286a1bb51b1e4a6ecde6
 DIST lz4-1.7.5.tar.gz 208019 BLAKE2B a3d79d622eb0be2447cc6b0459bd81ae22b44ebe536ebd34b1c394bf1ff560c9b53e3f9203d5c94d046101a48d9b1ea7db74c39875d0a67b3a5f71d9633aa3b7 SHA512 b4e5b17fe06805e676608e636a45f0b480b79a02c6b7ffce84dc4d607861cb2652b2852493ab9d9249e7caeae6f00b6834801fdc39f58d901cbc1c7347915295
 DIST lz4-1.8.0.tar.gz 222840 BLAKE2B 0b33f920f59a5ec9576051baa9ba887b320d424f8f64e1a752124371797d3f8bf2dbf13ee2e7268ef363d70697b8358e7ad627489c6843c61bdba004df80c5ec SHA512 aea46d4a900a3ede7dd7b498ee938ecd98397d3277c5b3a85b4236a44777cba85cd68a2f32c993b872afda96c5dafe0cb3dd391101fe8181e17c9f48884c1535
-DIST lz4-r120.tar.gz 161950 BLAKE2B 59bbcfa30ac0c74ad0388a78ffbdd6c33a69754654365ce525e7f3b2c24a3e8770a9489cdc295d7d5deb70fcb427ecb270af2787b192bb1152cbb19dc14e0d64 SHA512 8b27c57737ba4c2c8e4f00f7ce13f6edc91f74885bad66dd521dfe85d427e0fd78a300896d599bb8642a34fba78446daf207d1b2fd8e91543d4c093e53694e86
 DIST lz4-r131.tar.gz 133784 BLAKE2B f072d1f97ac6f804140c3896dfa95c16eb3c2c2208cfeb35a07535bb345fa100e4169ea91b2aa05655fb61f6f2d64a7c25444778b99841d3e3d0f09b10f570d8 SHA512 60bd95d529691ffee2c43f0d8a62484c3cff74c0154094f073192606806ac8182dced61e0534ffa7e0ccf5f18e9a8cfd2738883a83814c0711a6d7f1d1b252e5
-EBUILD lz4-0_p106-r1.ebuild 1271 BLAKE2B 9c7e2a9718593c5ed7d0ed0f1681cec1400904e8795fd68863a3fad86ab59c2d9d6d60495bab4c6bc1d82aff76700cf1149534c70686934a9ee9b40b47c592f3 SHA512 7bfd1129e14b73a28c8970c3ec93a9fa81725e89ceb6fd65f31e0a6885acb260d76fc8185a1e44d66861d83335eaa3ba8dbbb52e0a3668b9114b72e5f9ff597b
-EBUILD lz4-0_p120.ebuild 1179 BLAKE2B 3074e462f6d7b181a42f3996a233dba231341b1d5e128bc4ed69d05e5ffbe77779cfb5a29ef8de55b6b22c49be4897c3f75a01e7d4dfe02e5b456034a0490491 SHA512 fc9390f7feea6763cb8f75713154b01f3e2b97acf0d0964d3c38644ee38d97bd46a474780254fb44315c0561f2191cfa2bb86387e9e2704afc989480726888db
-EBUILD lz4-0_p131-r1.ebuild 1665 BLAKE2B f7f810df830254d1f40c33efc76ae52eaca493dea9f65c28bb7d45b6c15c38623c7711185e080db6f074fbc30ed8a579ed4d67ca7af02927c468323b609c1e74 SHA512 f146c7c9202873973b676e197141618439a4b20253715284a0a2cbf0ee3193e65cc80157a5da152277b21fb188e89be1704dbf176e2035d0c39e7c2814bd6d73
 EBUILD lz4-0_p131.ebuild 1521 BLAKE2B 5748445c1b995930382c846a6ffdca206f008a447b63660f07b6817f9710f0c434c29e775f635e1928d781053dc16142546f5c9d9606df3ee4465eaa85f4d799 SHA512 466cf8f24471af82f9789dc02ff9b93d69a450f7ec768e3d5c4f2a374ae36a46209d39859701cbd7856b7600dc1d33fbf993d1651cc56338601390f72f78e61c
 EBUILD lz4-1.7.5-r1.ebuild 1033 BLAKE2B 1e6724ddeb18f9e4ffe78a84e96d0593b2501e96bad632db32e10082559c1ea77c38686ec77b953dc0c981796a14bbabf38985ed953617e02ea0d704cdebe59e SHA512 763b64264b063b7066052ead680c262ce1019ddd41dd627dc76d38eb72b2ba9e1da23df7356188901fc92984822563179df9e06df975976c988e7bfd86c7b9ee
-EBUILD lz4-1.8.0.ebuild 1056 BLAKE2B 588c968ca0e400a3f48fdcab09da5daf17325ddae88f569fc435155c0a88195acf6c537269770daf63a87c85854d420dd38b16981fb85e74a8635529767c3c4a SHA512 86c066c80879f0eb335aafa5c5c86d081bb96e3c68f07d644ad2ee124fb82c978dcd01a73f6232ca453a929f58235ec92e1b4a2b56680aab6d34699011f32736
+EBUILD lz4-1.8.0.ebuild 1052 BLAKE2B be63c9aa301361c6430c57b9499dc202e81929a298480ee1fbba185f9006c5e134569d42bff62b906e27d1e5ba905ccb40a5005a3a411df0a3b3f7dac61a8722 SHA512 a9b240f98944d91c0fc8dcfe998398b5ec3017d9a49a985975e7950df456e35fd75bada3e01b921e4ee456c2683bd29f8c010564fb8fb2e907179b3c091288d4
 EBUILD lz4-9999.ebuild 824 BLAKE2B dbc4eeaf3f65d527eaafd48a1083c43b76fd564b9dec1e6393c93445be4a0d9b56e540a4dd24df5438ea9b2ffeeb8a53a113a69b40f9b1ded3af4567b00122d8 SHA512 f28250733aa50bab0d908f5288d69d3d78af865433864716474d6d8fc639a44de61fb25dff06614bee003b9fee1d1a71528f9b96d2347c3562a5eb5736a340a9
 MISC metadata.xml 516 BLAKE2B 89b858097e6409d3b6f9855c0eb82ef02ee9c705516a1c32d1eb81730b03733e7abca122e59e43c193367429bb277dc1f044d09276f7b3db37f79d6f5c3a8054 SHA512 b559b65a4eebe71824ad3cd46c1ef3aabcc1c43f4312cb2e1072f0e7ab4396890696ef7450d7a41a2e03498db9da9e6823f9d8de4d413a0244607b85192efaa8
diff --git a/app-arch/lz4/files/lz4-0_p106-cflags.patch b/app-arch/lz4/files/lz4-0_p106-cflags.patch
deleted file mode 100644
index 6fc0fbb47dd8..000000000000
--- a/app-arch/lz4/files/lz4-0_p106-cflags.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/cmake/pack/CMakeLists.txt
-+++ b/cmake/pack/CMakeLists.txt
-@@ -36,7 +36,7 @@
- ADD_DEFINITIONS("-Wundef")
- ADD_DEFINITIONS("-Wcast-align")
- ADD_DEFINITIONS("-Wno-implicit-function-declaration")
--ADD_DEFINITIONS("-O3 -march=native -std=c99")
-+ADD_DEFINITIONS("-std=c99")
- INCLUDE_DIRECTORIES (${SRC_DIR})
- 
- 
---- a/cmake/CMakeLists.txt
-+++ b/cmake/CMakeLists.txt
-@@ -99,7 +99,7 @@
- ADD_DEFINITIONS("-Wundef")
- ADD_DEFINITIONS("-Wcast-align")
- ADD_DEFINITIONS("-Wno-implicit-function-declaration")
--ADD_DEFINITIONS("-Os -march=native -std=c99")
-+ADD_DEFINITIONS("-std=c99")
- INCLUDE_DIRECTORIES (${SRC_DIR})
- 
- 
diff --git a/app-arch/lz4/files/lz4-0_p106-install-to-bindir.patch b/app-arch/lz4/files/lz4-0_p106-install-to-bindir.patch
deleted file mode 100644
index 521b1bfc58d2..000000000000
--- a/app-arch/lz4/files/lz4-0_p106-install-to-bindir.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
-index 496c076..ce3fab1 100644
---- a/cmake/CMakeLists.txt
-+++ b/cmake/CMakeLists.txt
-@@ -41,11 +41,11 @@ endif()
- if (CMAKE_SYSTEM_PROCESSOR STREQUAL "64bit")
-     message(STATUS "Build 64bit executable binary")
-     add_executable(lz4c64 ${LZ4_SRCS})
--    install(TARGETS lz4c64 RUNTIME DESTINATION "./")
-+    install(TARGETS lz4c64 RUNTIME DESTINATION "bin/")
-     if(NOT BUILD_SHARED_LIBS)
-         message(STATUS "Build 32bit executable binary")
-         add_executable(lz4c32 ${LZ4_SRCS})
--        install(TARGETS lz4c32 RUNTIME DESTINATION "./")
-+        install(TARGETS lz4c32 RUNTIME DESTINATION "bin/")
- 
-         SET_TARGET_PROPERTIES(lz4c32 PROPERTIES
-             COMPILE_FLAGS PROPERTIES COMPILE_FLAGS "-m32" LINK_FLAGS "-m32")
-@@ -53,7 +53,7 @@ if (CMAKE_SYSTEM_PROCESSOR STREQUAL "64bit")
- else()
-     message(STATUS "Build 32bit executable binary")
-     add_executable(lz4c32 ${LZ4_SRCS})
--    install(TARGETS lz4c32 RUNTIME DESTINATION "./")
-+    install(TARGETS lz4c32 RUNTIME DESTINATION "bin/")
- endif()
- 
- if(BUILD_SHARED_LIBS)
-diff --git a/cmake/pack/CMakeLists.txt b/cmake/pack/CMakeLists.txt
-index a9b0557..e85416e 100644
---- a/cmake/pack/CMakeLists.txt
-+++ b/cmake/pack/CMakeLists.txt
-@@ -48,16 +48,16 @@ set(FUZZER_SRCS ${SRC_DIR}lz4.c ${SRC_DIR}lz4hc.c ${SRC_DIR}lz4.h ${SRC_DIR}fuzz
- # EXECUTABLES FOR 32 Bit and 64 versions
- if(CMAKE_SYSTEM_PROCESSOR STREQUAL "64bit")
- 	add_executable(lz4c32 ${LZ4_SRCS})
--	install(TARGETS lz4c32 RUNTIME DESTINATION "./")
-+	install(TARGETS lz4c32 RUNTIME DESTINATION "bin/")
- SET_TARGET_PROPERTIES(lz4c32 PROPERTIES
- 	COMPILE_FLAGS PROPERTIES COMPILE_FLAGS "-m32 -Os" LINK_FLAGS "-m32")
- endif()
- 
- add_executable(lz4c ${LZ4_SRCS})
--install(TARGETS lz4c RUNTIME DESTINATION "./")
-+install(TARGETS lz4c RUNTIME DESTINATION "bin/")
- 
- add_executable(fuzzer ${FUZZER_SRCS})
--install(TARGETS fuzzer RUNTIME DESTINATION "./")
-+install(TARGETS fuzzer RUNTIME DESTINATION "bin/")
- 
- #target_link_libraries(lz4 ${LZ4_SRCS_LIB})
- ####################### CPACK PACKAGING ###################
diff --git a/app-arch/lz4/files/lz4-0_p131-static-libs.patch b/app-arch/lz4/files/lz4-0_p131-static-libs.patch
deleted file mode 100644
index f8c5c2de1e83..000000000000
--- a/app-arch/lz4/files/lz4-0_p131-static-libs.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-fix from upstream
-
-From 43b631223b2d0425a0970876974074934f89c450 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Thu, 22 Sep 2016 23:59:02 -0400
-Subject: [PATCH] add a flag to disable static libs
-
----
- lib/Makefile | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/lib/Makefile b/lib/Makefile
-index b5352a0cb372..27b35c41b693 100644
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -40,6 +40,8 @@
- LIBVER_PATCH=`sed -n '/define LZ4_VERSION_RELEASE/s/.*[[:blank:]]\([0-9][0-9]*\).*/\1/p' < lz4.h`
- LIBVER=$(LIBVER_MAJOR).$(LIBVER_MINOR).$(LIBVER_PATCH)
- 
-+BUILD_STATIC:= yes
-+
- DESTDIR?=
- PREFIX ?= /usr/local
- CFLAGS ?= -O3
-@@ -71,9 +72,11 @@
- all: liblz4
- 
- liblz4: lz4.c lz4hc.c lz4frame.c xxhash.c
-+ifeq ($(BUILD_STATIC),yes)
- 	@echo compiling static library
- 	@$(CC) $(CPPFLAGS) $(CFLAGS) -c $^
- 	@$(AR) rcs liblz4.a lz4.o lz4hc.o lz4frame.o xxhash.o
-+endif
- 	@echo compiling dynamic library $(LIBVER)
- 	@$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -shared $^ -fPIC $(SONAME_FLAGS) -o $@.$(SHARED_EXT_VER)
- 	@echo creating versioned links
-@@ -104,7 +107,9 @@
- 	@cp -a liblz4.$(SHARED_EXT_MAJOR) $(DESTDIR)$(LIBDIR)
- 	@cp -a liblz4.$(SHARED_EXT) $(DESTDIR)$(LIBDIR)
- 	@cp -a liblz4.pc $(DESTDIR)$(LIBDIR)/pkgconfig/
-+ifeq ($(BUILD_STATIC),yes)
- 	@install -m 644 liblz4.a $(DESTDIR)$(LIBDIR)/liblz4.a
-+endif
- 	@install -m 644 lz4.h $(DESTDIR)$(INCLUDEDIR)/lz4.h
- 	@install -m 644 lz4hc.h $(DESTDIR)$(INCLUDEDIR)/lz4hc.h
- 	@install -m 644 lz4frame.h $(DESTDIR)$(INCLUDEDIR)/lz4frame.h
--- 
-2.9.0
-
diff --git a/app-arch/lz4/lz4-0_p106-r1.ebuild b/app-arch/lz4/lz4-0_p106-r1.ebuild
deleted file mode 100644
index af0720e31f37..000000000000
--- a/app-arch/lz4/lz4-0_p106-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils multilib
-
-CMAKE_USE_DIR="${S}/cmake"
-
-if [ ${PV} == "9999" ] ; then
-	inherit subversion
-	ESVN_REPO_URI="https://lz4.googlecode.com/svn/trunk/"
-	ESVN_PROJECT="lz4-read-only"
-else
-	SRC_URI="https://dev.gentoo.org/~ryao/dist/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="Extremely Fast Compression algorithm"
-HOMEPAGE="https://github.com/Cyan4973/lz4"
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	if [ ${PV} == "9999" ]
-	then
-		subversion_src_prepare
-	else
-		epatch "${FILESDIR}/${P}-install-to-bindir.patch"
-		epatch "${FILESDIR}/${P}-cflags.patch"
-	fi
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(-DBUILD_SHARED_LIBS=ON)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	dodir /usr
-	dodir "/usr/$(get_libdir)"
-	ln -s "$(get_libdir)" "${ED}usr/lib" || \
-		die "Cannot create temporary symlink from usr/lib to usr/$(get_libdir)"
-
-	cmake-utils_src_install
-
-	rm "${ED}usr/lib"
-
-	if [ -f "${ED}usr/bin/lz4c64" ]
-	then
-		dosym lz4c64 /usr/bin/lz4c
-	else
-		dosym lz4c32 /usr/bin/lz4c
-	fi
-}
diff --git a/app-arch/lz4/lz4-0_p120.ebuild b/app-arch/lz4/lz4-0_p120.ebuild
deleted file mode 100644
index 85a4e4542a82..000000000000
--- a/app-arch/lz4/lz4-0_p120.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib multilib-minimal toolchain-funcs
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Cyan4973/lz4.git"
-	EGIT_BRANCH=dev
-else
-	MY_PV="r${PV##0_p}"
-	MY_P="${PN}-${MY_PV}"
-	SRC_URI="https://github.com/Cyan4973/lz4/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="Extremely Fast Compression algorithm"
-HOMEPAGE="https://github.com/Cyan4973/lz4"
-
-LICENSE="BSD-2 GPL-2"
-SLOT="0"
-IUSE="test valgrind"
-
-DEPEND="test? ( valgrind? ( dev-util/valgrind ) )"
-
-src_prepare() {
-	if ! use valgrind; then
-		sed -i -e '/^test:/s|test-mem||g' programs/Makefile || die
-	fi
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	tc-export CC AR
-	# we must not use the 'all' target since it builds test programs
-	# & extra -m32 executables
-	emake
-	emake -C programs
-}
-
-multilib_src_install() {
-	emake install DESTDIR="${D}" \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}"/usr/$(get_libdir)
-}
diff --git a/app-arch/lz4/lz4-0_p131-r1.ebuild b/app-arch/lz4/lz4-0_p131-r1.ebuild
deleted file mode 100644
index 47e496da8698..000000000000
--- a/app-arch/lz4/lz4-0_p131-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib multilib-minimal toolchain-funcs
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Cyan4973/lz4.git"
-	EGIT_BRANCH=dev
-else
-	MY_PV="r${PV##0_p}"
-	MY_P="${PN}-${MY_PV}"
-	SRC_URI="https://github.com/Cyan4973/lz4/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="Extremely Fast Compression algorithm"
-HOMEPAGE="https://github.com/Cyan4973/lz4"
-
-LICENSE="BSD-2 GPL-2"
-# Upstream has trouble keeping ABI stable, so please test new versions
-# with abi-compliance-checker and update the subslot every time ABI
-# changes. This is the least we can do to keep things sane.
-SLOT="0/r131"
-IUSE="static-libs test valgrind"
-
-DEPEND="test? ( valgrind? ( dev-util/valgrind ) )"
-
-src_prepare() {
-	if ! use valgrind; then
-		sed -i -e '/^test:/s|test-mem||g' programs/Makefile || die
-	fi
-	epatch "${FILESDIR}"/${PN}-0_p131-static-libs.patch
-	multilib_copy_sources
-}
-
-lmake() {
-	emake \
-		BUILD_STATIC=$(usex static-libs) \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}"/usr/$(get_libdir) \
-		"$@"
-}
-
-multilib_src_compile() {
-	tc-export CC AR
-	# we must not use the 'all' target since it builds test programs
-	# & extra -m32 executables
-	lmake -C lib liblz4 liblz4.pc
-	lmake -C programs lz4 lz4c
-	# work around lack of proper target dependencies
-	touch lib/liblz4
-}
-
-multilib_src_test() {
-	lmake -j1 test
-}
-
-multilib_src_install() {
-	lmake install DESTDIR="${D}"
-}
diff --git a/app-arch/lz4/lz4-1.8.0.ebuild b/app-arch/lz4/lz4-1.8.0.ebuild
index 17840895424d..c44da5e07a39 100644
--- a/app-arch/lz4/lz4-1.8.0.ebuild
+++ b/app-arch/lz4/lz4-1.8.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
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_BRANCH=dev
 else
 	SRC_URI="https://github.com/Cyan4973/lz4/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 fi
 
 DESCRIPTION="Extremely Fast Compression algorithm"
diff --git a/app-arch/snappy/Manifest b/app-arch/snappy/Manifest
index a8fa92882d66..265a0e70f69e 100644
--- a/app-arch/snappy/Manifest
+++ b/app-arch/snappy/Manifest
@@ -1,11 +1,6 @@
-AUX snappy-1.1.6-0001-cmake-Use-GNUInstallDirs-to-provide-configurable-cor.patch 3562 BLAKE2B b4534d9969957e7ba42ca8d0d02c7605164a0ffad0b401adf77cb7b10ee09ef7bbbd20ee7bc67a45b9487456e6993685f2b44a99a5560be2dd11fc99c4beb579 SHA512 8d97bca1ec972e3b0727d5d2705cf1a499a62de478c653fba39deac5da5bc8c67f29cb83eaaa95ba08681e1c12f507d25bb6f903e6daf1da776ec017065c139d
-AUX snappy-1.1.6-0002-cmake-Correct-unify-CMake-install-path.patch 1451 BLAKE2B 23ddc92164301a0e79aba0d2e5b930e0e9de5db4d69e2e566d2d64bf656ff471435b8448dfeb9ef2c22e7165d91d3a5d1831b81f3758dc962452ff498d5551b3 SHA512 2ad8647f89ff59ff96a24c7ab5067292d58269b7413e18c9b5165cfced8526abbf2d008f19bb18288a78a9a4f479790899648b1ef55df318eacae64d33fe417b
-AUX snappy-1.1.6-0003-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch 1123 BLAKE2B 62e89ab3f7e9f0e8aaaf5dc6f85beb4f753e53eaf75566a263e382cd649daef15f23ec9d539debffcdbd2dc44c63a73b335d221e7f074bd0aea55806a906d30d SHA512 05265f5af9edbb69c518c4cd5260f6ef0c318292fb7d93556ab710d35d143a9d9d212b1f70b3f8e0fa6310b178f6e65bb07c370f33d7203a48a1101b660753bf
 AUX snappy-1.1.7-0001-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch 1017 BLAKE2B e9181a6a89bd62c3433c71008d182fcbdd2960e29542539f9ef5a48eff15347968a8a1a2d362633056f27df0a5ea84a5a721afcc375335295cb7c0cdd9267790 SHA512 52bf7db93ddfaba96fb16379f5d3e923bb27b6763db15698b5a5b6529c17e667b9b5c98108291a8eb9ddb98b7cfb0b5836602f66ac6beeacafa9da654e632ef4
 DIST snappy-1.1.3.tar.gz 1509026 BLAKE2B d8dbb6e92d1788f7b13e6e36aa0297cfcb28d664fb625d0798831ccd00de818675c224821359cc66f38f274da248725737510a85b01a36efe07aa4c9a8bcfda4 SHA512 4c4f47c657a072989179be9df0e5e98d14f4a67c27ec7ae0e5a15d14289a75d4e266bc6c5c89723f3e9860408ffcc7138a815f8ad9299407c4a1946fc00ab5bf
-DIST snappy-1.1.6.tar.gz 1128388 BLAKE2B e02380dae96b00a485ce7584ea3018311b039a622c928bdeff67f7233b9e001800c7c5755e389f85023bfac960e480db6b6f9615de2af81cb0353385930b2c30 SHA512 38698b7ff03b39528de88bf62a84fcfc6f3dce2e98efa25a97ebdf396b6aba49860072ffa99830323944ab41c3721a3c53ff2636beb3422d5f812e84afe8dadf
 DIST snappy-1.1.7.tar.gz 1090550 BLAKE2B e389c96e093de5db92b896a7fa17a90d3ad0be07972e279321f24875f0f0c8c704ff478f4902a6356d458f93c249e3e06424d5a4efc9753a23ab12b7ee83a088 SHA512 32046f532606ba545a4e4825c0c66a19be449f2ca2ff760a6fa170a3603731479a7deadb683546e5f8b5033414c50f4a9a29f6d23b7a41f047e566e69eca7caf
 EBUILD snappy-1.1.3-r1.ebuild 970 BLAKE2B f4794a69d78a43906d661c1e05a1810d8ec708e166b1c045ca7611b3800cd1694657a5b67b0b34155384edb28f1023e6c980d12fa963fb270f2378a7eec0bc98 SHA512 75c6fdc710845048e095963edbf50a7713cf919cabe45b5548487c27ad4e2278e06b79b3c56c16a529a82f65ef0eff8a11a3964b9f3a40b1a3293fcb4afdce29
-EBUILD snappy-1.1.6.ebuild 2112 BLAKE2B b7223cc1b5408fac7bc5b3a4d5eccd608d8ae8fff812abbcd5f21a6efd29ca5dad14c3d073c056f15dd8207df4aa4772fe06c601a45605508d8676985e0709ae SHA512 7762d015200dce6310f3a46ff18b0b3f46825592bdb1af053a00386ecf6194586bde76c7ca823fc1b6c6b9ccc7c74c36514c7457d544d33836e26b2ca66722cd
-EBUILD snappy-1.1.7.ebuild 1930 BLAKE2B 83becea5bd607f345141a003720fd0a6df6c99443a86396e76bf556a1751dcce4a8aa57696eeed94047709d16ffb9fbe70a6e4fde1f14900544a38465f7de075 SHA512 2f6578ebf0fe9feeaf518811c4c7fba6fae70d27af0926d98027b61bde1891c0cea41e513f2750d7124a745eaab60968fc74850676db5b4d1d73eaf304154ada
+EBUILD snappy-1.1.7.ebuild 1926 BLAKE2B 0bd32400602038e843f93689f84bf2c98fa663cf1dbb9df654a48afda082248fe8dfaa411855d1289a9f26aae44ec8f418ebdaca37d83cd572387d90e9bc0052 SHA512 8672e96d9a80d388891892dbfe5e46240826f5ab33dce96f3dedbd752c64a5be341a689435840132b3b28275df6590d56e7746638a6d158dd4af2e18ea0c2cb4
 MISC metadata.xml 584 BLAKE2B 9972ee3948809ca45ea18129bde88c5a93fbe73d24c6e125cd13a45bb381099110dc0e006cf76a57d0baf7d18001bf261dd1d6db1025750b114903725e2e3aa4 SHA512 5897170c6fb84f520d879b5df295608b92376150ed2535b578ff04c5cfb5a0ba334a7aee3ad1ef41a8ed45b3fb36425e1dc0e54c0fb880e0c2bf72803a2da552
diff --git a/app-arch/snappy/files/snappy-1.1.6-0001-cmake-Use-GNUInstallDirs-to-provide-configurable-cor.patch b/app-arch/snappy/files/snappy-1.1.6-0001-cmake-Use-GNUInstallDirs-to-provide-configurable-cor.patch
deleted file mode 100644
index b83bc93465af..000000000000
--- a/app-arch/snappy/files/snappy-1.1.6-0001-cmake-Use-GNUInstallDirs-to-provide-configurable-cor.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From 7507c5fcadc53894b128f3b9fc4b073d15564704 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Thu, 29 Jun 2017 11:12:44 +0200
-Subject: [PATCH 1/3] cmake: Use GNUInstallDirs to provide configurable &
- correct install dirs
-
-Use the GNUInstallDirs CMake module to provide a standard set of
-variables to control install paths. Otherwise, the package is
-incorrectly installed into 'lib' (instead of 'lib64') on 64-bit systems.
-While this could be solved via providing custom variables for each
-directory, it is simpler to reuse what's already in CMake.
----
- CMakeLists.txt              | 21 +++++++++------------
- cmake/SnappyConfig.cmake.in |  8 ++++----
- 2 files changed, 13 insertions(+), 16 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index de52666..1ca77c1 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -8,6 +8,7 @@ INCLUDE(CheckLibraryExists)
- INCLUDE(CheckCXXSourceCompiles)
- INCLUDE(TestBigEndian)
- INCLUDE(CMakePackageConfigHelpers)
-+INCLUDE(GNUInstallDirs)
- 
- TEST_BIG_ENDIAN(WORDS_BIG_ENDIAN)
- IF (WORDS_BIG_ENDIAN)
-@@ -98,33 +99,29 @@ INSTALL(FILES snappy.h
-         snappy-c.h
-         snappy-sinksource.h
-         ${Snappy_BINARY_DIR}/snappy-stubs-public.h
--        DESTINATION include)
-+        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
- 
- INSTALL(TARGETS snappy
-         EXPORT SnappyTargets
--        RUNTIME DESTINATION bin
--        LIBRARY DESTINATION lib
--        ARCHIVE DESTINATION lib)
--INSTALL(EXPORT SnappyTargets NAMESPACE Snappy:: DESTINATION lib/cmake/Snappy)
-+        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-+        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+INSTALL(EXPORT SnappyTargets NAMESPACE Snappy:: DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Snappy)
- 
- SET_TARGET_PROPERTIES(snappy PROPERTIES VERSION ${PROJECT_VERSION}
-                       SOVERSION ${PROJECT_VERSION_MAJOR})
- 
--SET(INCLUDE_INSTALL_DIR include)
--SET(LIBRARY_INSTALL_DIR lib)
--SET(BINARY_INSTALL_DIR bin)
--
- CONFIGURE_PACKAGE_CONFIG_FILE(cmake/SnappyConfig.cmake.in
-         ${Snappy_BINARY_DIR}/SnappyConfig.cmake
--        INSTALL_DESTINATION lib/Snappy/cmake
--        PATH_VARS INCLUDE_INSTALL_DIR LIBRARY_INSTALL_DIR BINARY_INSTALL_DIR
-+        INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/Snappy/cmake
-+        PATH_VARS CMAKE_INSTALL_INCLUDEDIR CMAKE_INSTALL_LIBDIR CMAKE_INSTALL_BINDIR
-         )
- 
- WRITE_BASIC_PACKAGE_VERSION_FILE(${Snappy_BINARY_DIR}/SnappyConfigVersion.cmake
-         COMPATIBILITY SameMajorVersion)
- INSTALL(FILES ${Snappy_BINARY_DIR}/SnappyConfig.cmake
-         ${Snappy_BINARY_DIR}/SnappyConfigVersion.cmake
--        DESTINATION lib/cmake)
-+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
- 
- ENABLE_TESTING()
- 
-diff --git a/cmake/SnappyConfig.cmake.in b/cmake/SnappyConfig.cmake.in
-index 5e604fe..d47656b 100644
---- a/cmake/SnappyConfig.cmake.in
-+++ b/cmake/SnappyConfig.cmake.in
-@@ -2,8 +2,8 @@ set(SNAPPY_VERSION @SNAPPY_MAJOR@.@SNAPPY_MINOR@.@SNAPPY_PATCHLEVEL@)
- 
- @PACKAGE_INIT@
- 
--set_and_check(SNAPPY_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@")
--set_and_check(SNAPPY_LIBRARY_DIR "@PACKAGE_LIBRARY_INSTALL_DIR@")
--set_and_check(SNAPPY_BINARY_DIR "@PACKAGE_BINARY_INSTALL_DIR@")
-+set_and_check(SNAPPY_INCLUDE_DIR "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@")
-+set_and_check(SNAPPY_LIBRARY_DIR "@PACKAGE_CMAKE_INSTALL_LIBDIR@")
-+set_and_check(SNAPPY_BINARY_DIR "@PACKAGE_CMAKE_INSTALL_BINDIR@")
- 
--check_required_components(SNAPPY)
-\ No newline at end of file
-+check_required_components(SNAPPY)
--- 
-2.13.2
-
diff --git a/app-arch/snappy/files/snappy-1.1.6-0002-cmake-Correct-unify-CMake-install-path.patch b/app-arch/snappy/files/snappy-1.1.6-0002-cmake-Correct-unify-CMake-install-path.patch
deleted file mode 100644
index 0b7faa08772b..000000000000
--- a/app-arch/snappy/files/snappy-1.1.6-0002-cmake-Correct-unify-CMake-install-path.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From e801bd3553dc4e49e19a031ce4007620c35764f8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Thu, 29 Jun 2017 11:14:37 +0200
-Subject: [PATCH 2/3] cmake: Correct & unify CMake install path
-
-The CMake file is using 'lib/cmake/Snappy', 'lib/Snappy/cmake'
-and 'lib/cmake' inconsistently. Replace all of them with a single
-'lib/cmake/Snappy' that matches most of standard CMake packages.
----
- CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1ca77c1..3d1a304 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -113,7 +113,7 @@ SET_TARGET_PROPERTIES(snappy PROPERTIES VERSION ${PROJECT_VERSION}
- 
- CONFIGURE_PACKAGE_CONFIG_FILE(cmake/SnappyConfig.cmake.in
-         ${Snappy_BINARY_DIR}/SnappyConfig.cmake
--        INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/Snappy/cmake
-+        INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Snappy
-         PATH_VARS CMAKE_INSTALL_INCLUDEDIR CMAKE_INSTALL_LIBDIR CMAKE_INSTALL_BINDIR
-         )
- 
-@@ -121,7 +121,7 @@ WRITE_BASIC_PACKAGE_VERSION_FILE(${Snappy_BINARY_DIR}/SnappyConfigVersion.cmake
-         COMPATIBILITY SameMajorVersion)
- INSTALL(FILES ${Snappy_BINARY_DIR}/SnappyConfig.cmake
-         ${Snappy_BINARY_DIR}/SnappyConfigVersion.cmake
--        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
-+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Snappy)
- 
- ENABLE_TESTING()
- 
--- 
-2.13.2
-
diff --git a/app-arch/snappy/files/snappy-1.1.6-0003-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch b/app-arch/snappy/files/snappy-1.1.6-0003-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch
deleted file mode 100644
index b1b8a2cd5e97..000000000000
--- a/app-arch/snappy/files/snappy-1.1.6-0003-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 93d30c53e28759c9dbe82535821f3b1df29e5767 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Thu, 29 Jun 2017 10:01:37 +0200
-Subject: [PATCH 3/3] cmake: Add missing linking to GTEST_LIBRARIES
-
-Since the snappy_unittest target uses gtest routines (when available),
-it needs to link to gtest explicitly. Otherwise, the build fails due
-to unavailable gtest symbols.
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3d1a304..9f2cc23 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -144,7 +144,7 @@ ENDIF (HAVE_LIBQUICKLZ)
- ADD_EXECUTABLE(snappy-unittest snappy_unittest.cc snappy-test.cc)
- TARGET_COMPILE_DEFINITIONS(snappy-unittest PRIVATE -DHAVE_CONFIG_H)
- TARGET_LINK_LIBRARIES(snappy-unittest snappy ${COMPRESSION_LIBS}
--                      ${GFLAGS_LIBRARIES})
-+                      ${GFLAGS_LIBRARIES} ${GTEST_LIBRARIES})
- TARGET_INCLUDE_DIRECTORIES(snappy-unittest BEFORE PRIVATE ${Snappy_SOURCE_DIR}
-                            ${GTEST_INCLUDE_DIRS} ${GFLAGS_INCLUDE_DIRS})
- 
--- 
-2.13.2
-
diff --git a/app-arch/snappy/snappy-1.1.6.ebuild b/app-arch/snappy/snappy-1.1.6.ebuild
deleted file mode 100644
index 2556b836d776..000000000000
--- a/app-arch/snappy/snappy-1.1.6.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-multilib
-
-DESCRIPTION="A high-speed compression/decompression library by Google"
-HOMEPAGE="https://github.com/google/snappy"
-SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV%%.*}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
-IUSE="static-libs test"
-# upstream killed static lib support with build system update
-# (and we have packages depending on the flag)
-REQUIRED_USE="!static-libs"
-
-# all test dependencies are optional:
-# - gflags-2.2 is supposedly needed for command-line option parsing
-# but it's a huge hack and does not work,
-# - gtest probably gives nicer output,
-# - compression libraries are used for benchmarks which we do not run.
-DEPEND="test? ( dev-cpp/gtest )"
-
-# AUTHORS is useless, ChangeLog is stale
-DOCS=( format_description.txt framing_format.txt NEWS README.md )
-
-src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}"/snappy-1.1.6-0001-cmake-Use-GNUInstallDirs-to-provide-configurable-cor.patch
-		"${FILESDIR}"/snappy-1.1.6-0002-cmake-Correct-unify-CMake-install-path.patch
-		"${FILESDIR}"/snappy-1.1.6-0003-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch
-	)
-
-	# command-line option parsing does not work at all, so just force
-	# it off
-	sed -i -e '/run_microbenchmarks/s:true:false:' snappy-test.cc || die
-
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	# TODO: would be nice to make unittest build conditional
-	# but it is not a priority right now
-	local mycmakeargs=(
-		# use gtest for tests only
-		-DCMAKE_DISABLE_FIND_PACKAGE_GTest=$(usex '!test')
-		# gflags does not work anyway
-		-DCMAKE_DISABLE_FIND_PACKAGE_Gflags=ON
-
-		# we do not want to run benchmarks, and those are only used
-		# for benchmarks
-		-DHAVE_LIBZ=NO
-		-DHAVE_LIBLZO2=NO
-		-DHAVE_LIBLZF=NO
-		-DHAVE_LIBQUICKLZ=NO
-	)
-	cmake-utils_src_configure
-}
-
-multilib_src_test() {
-	# run tests directly to get verbose output
-	cd "${S}" || die
-	"${BUILD_DIR}"/snappy-unittest || die
-}
diff --git a/app-arch/snappy/snappy-1.1.7.ebuild b/app-arch/snappy/snappy-1.1.7.ebuild
index eea333450b70..b56e491c71da 100644
--- a/app-arch/snappy/snappy-1.1.7.ebuild
+++ b/app-arch/snappy/snappy-1.1.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV%%.*}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="static-libs test"
 # upstream killed static lib support with build system update
 # (and we have packages depending on the flag)
diff --git a/app-arch/unzip/Manifest b/app-arch/unzip/Manifest
index 83ad225696cd..febecf2e648f 100644
--- a/app-arch/unzip/Manifest
+++ b/app-arch/unzip/Manifest
@@ -5,6 +5,6 @@ DIST unzip60.tar.gz 1376845 BLAKE2B 5016d300b4452018a391f4ebc03c6960c068df400a04
 DIST unzip_6.0-20.debian.tar.xz 16680 BLAKE2B 17ce9234ac485eab4e5188b555af31dcb0db577b199e0c58991ba7211c4c80edce52b72e89cc4d82b000b70bed1ac90262c0972507f28f054af2cebd0ca33b48 SHA512 7212cb110291581c2e465dc8ea5130eabffc4e0369d6245e8c26fa9d350bed904847d6e1191afaaa2d3fc23bd05fda7da80439d0c06b88f5331b01c9eff97fbe
 DIST unzip_6.0-21.debian.tar.xz 17740 BLAKE2B 098a84e5b05f819f9c8c6a6656fdb2359dfb5b93f63444e55347e0bef9735fa48bf1631a658a2cb6d0c604e7e740e47b57910d251b74e5df7c8b9468acfe55f4 SHA512 f7bce4156ac13c34da3f991df3ae88b0db99b0810c7f8904ea3ac666a4cb2788d7182056f2bbd82d7519d0e0ee31a10af47bee08f360ceb859e5fbfc6e15ef36
 EBUILD unzip-6.0_p20.ebuild 2557 BLAKE2B 55203420f8676c64899a6e8572ea31ce3318018402e7f02790f7510d955d69fd3371e08ffa50bcb2867025e8542e6d745f20a0ba60562b2f8f7e7b42c25f53b8 SHA512 72014935da1e7acec784f189568fbec2756968811d348594d98e5a4f440579471b9e6348aa57877a18e0e34b6434aa144cd7015a88c5b999805428d4192dd212
-EBUILD unzip-6.0_p21-r2.ebuild 2613 BLAKE2B ac9a9686e2b289f25f1f369b16a3befa42b69af753d8379912c7bd71dc156352a047b376950ff8fd6d7c097bd6a6dfcca050fc334cf5b8884f866dfcdc8ceb6f SHA512 542c7a263336f5e1b1e82a0f2c2e822f9895584a18ebf3e4f40fa0f720964b1ebfea4f8709d372965c41e368789bdcafe5128b7547af90251bb5e876856f63cf
+EBUILD unzip-6.0_p21-r2.ebuild 2609 BLAKE2B 5d13ddb0dc77f1406008067a8770d1c303edaf6759c2a88ec1f66f2450777a5e1212f01daddf436e2eec5b0b94742adab7265ece60a187b5f424fd5d64acf504 SHA512 f444813b642ea887c04faf61f95cbc65e81c4677a6544f45bf4da14da9e0063145e7c69d4e3e4a86639ff16c7537601ce92a9f2d412c834aac030e452b20c9be
 EBUILD unzip-6.0_p21.ebuild 2539 BLAKE2B 10ad8ccadfbd15b18449b61c3e3ed2c73d428ed85595e0065f2e397a4821221fd6dcb20be3c6d41b13c99f6b20de57fda263eabab2b842204e09ecde1f729d56 SHA512 df4efaf0e18777f9ffacc1e72100b33c60a35f535f15934fd9b1a5c5d287a3dd1fe9ab0442ca03fb316b7a792ab737bc130cae75116cb5b8adf7d825fceebdd5
 MISC metadata.xml 476 BLAKE2B 4cd0cc36008b6ec9ee618ef2e8a9c48e7fc6228e051a5c24e922faace6645de951a6836cc5d49a6041102944bf5b1901a5febcd6db86b67eb4182cad46a2a100 SHA512 0b82799f21ec8d57451ce8f231d24eabb02f637ee6fd2c32af12f9806f104ea53dc4d848b29950c1d5e848ea81f04a58422fa37f39287937dfb54e186f30b653
diff --git a/app-arch/unzip/unzip-6.0_p21-r2.ebuild b/app-arch/unzip/unzip-6.0_p21-r2.ebuild
index bdc9d03e2786..9a6c5e1fb7cd 100644
--- a/app-arch/unzip/unzip-6.0_p21-r2.ebuild
+++ b/app-arch/unzip/unzip-6.0_p21-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"
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz
 
 LICENSE="Info-ZIP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="bzip2 natspec unicode"
 
 DEPEND="bzip2? ( app-arch/bzip2 )
diff --git a/app-arch/zip/Manifest b/app-arch/zip/Manifest
index 1142490accab..90a5c6b3faad 100644
--- a/app-arch/zip/Manifest
+++ b/app-arch/zip/Manifest
@@ -8,11 +8,7 @@ AUX zip-3.0-natspec.patch 6800 BLAKE2B 6363c941894d7de7611392ea3e883ad724093bf6f
 AUX zip-3.0-no-crypt.patch 1108 BLAKE2B 92de0a453e128a87a6d37f0a9cca55f5451946c14316992898c8f3451336a7f526d8283a57fff841c5b990374b0cea163723a25522f5ecd194b294e39bf137d4 SHA512 89a99e694fa2ad289ecc93a514e7b408e4b9e01778e622b2c2928d98181de3823446e91085f401e3478afce1ccbf8775fb227c1908144889dd0106c2d7029b83
 AUX zip-3.0-pic.patch 499 BLAKE2B 0b3ad7552ed4b3900b720360145f2466bb2835823a828ed4e3fe7e8ce22c547296ff0f74416f8b9a75ae4ef70d9cce521f96becbbbcc9ddb89481c3944d6b501 SHA512 a5f4381de900821c91bb164f580b7abe0bb61ebbbcb00e376f38763255bc647bda678fd66af59e9d56cb8bb7a2166553a77af79cfa75f3e0ea4dbc515b876b8e
 AUX zip-3.0-zipnote-freeze.patch 2170 BLAKE2B b0080c9d5310a9cdd14eebc503d76e7463969982717476aa4359ae1c4651290112654f25c202defeddec5efaf1f32ec74c824a7370727b7e6a055dcac6211908 SHA512 c7db2d8c43d33bff4be6068c89603d2f67876f2b5ea72a01ad53f1baa42206c7a0a967f101a54092715f7fcc3ee2bf45a448e76a0ef55e64dc0fe0b204966367
-DIST zip232.tar.gz 807180 BLAKE2B d2dac8024df8f04eff26ea5a9d74bae6a7bdf3ccc5d6d8d74bbe3c35d79d85c87eae9ca941072164ed305794f3ea596e124b657314f2475138109c12a6d5dd2f SHA512 706646115440597f361b77569ef0301a72c4c990ace5053d4c3b730f20ba0f08af2a8c4fe27c4df5808649cad52d477a6e36e731e82057d6b426a3983836fde2
 DIST zip30.zip 1287223 BLAKE2B d29a3e3ddbaa3ce50c80b2dd058b39c35791bf2079879b61dab0be4f011ccd3331d1768ebda5a69aa150c651713eb7a99b02833bb727eee75a3e0bbdc8504cbc SHA512 642ea6768d79adc1499251a3fb7bfc7ddc8d708699cbf9e0cfe849deda94165cb93e21dc2606bea1166ae5d8531e1e2cb056a7246bf2ab86ea7587bd4712d8d8
-EBUILD zip-2.32-r1.ebuild 1085 BLAKE2B 64461869e6ffe73bf9ca789b744884619a94b992ee6ede8eba5daba90af6f0a22c0c6db2d194e746c3467ad40109e7d786180ccc980288795a77f5c5bc576a2e SHA512 28d8c49581ef41c537131643d5ef5a1b5229f181455cbcc9e84513a3784e48a65e51fdfb2c1e8ef0de6e6932f12d383c53f6a91f4599d4f3afd234d4df1d9e46
-EBUILD zip-3.0-r1.ebuild 1378 BLAKE2B eb04b9924d1f5a84d5a7f051cfe44b028da07dc42975d2bc1ed29ebded5746d9cc377567d2e32ac7a89b305fbc17261e736abee90a5f8ea1768f67c1b4921b08 SHA512 a3bd7c975178c44f0530f14361a7112ae1c1662e0914fc0252c591951b7e0a25f4ab498f263d0fee4fa916fa26d8fff59262cd05a45f52d12fef1f009b53ebc3
 EBUILD zip-3.0-r2.ebuild 1620 BLAKE2B 373efeea47d7a536cd94d2451b0010de2305dae6f9b53030e25376d818a1601eac9d5a067f8d7b59edeb76c9d813d29caa8cb77e9557debf5214b328d3d2e5fc SHA512 05f7dc22394c58b22435bad6c7de359ad994ccc1665ddae55a556f9f9dff6e14136a1115532b70ccb1809c3cf4b0eba14d3aadd26a3323a0b53ff3b5b2510b14
 EBUILD zip-3.0-r3.ebuild 1720 BLAKE2B 58973350277d37f4c13aaa19e300f2bdcbf1417f66878b2b83cb76cf2cd07e8b149c1dab5608fdf452a66416c728a6af3fbf1968b4869a21c03c8f8fa62699b7 SHA512 1910a94dc81acd0533d91b161a21b1270b4898708cdbb20bd9cf728add15456c23ba9f9b820e181beac7e77650c8cbabfabc1fc12993da281c9960884179cdf7
-EBUILD zip-3.0.ebuild 1379 BLAKE2B add774d5410a6c6daf87b413d80e5b6b1421fbfd5eaa687afb0f229222c922c9a91f4c4ba5a5fb897915bf1f95bd3a26ec843e75268a6578c00e7b7b72c076bd SHA512 c2954826d1e990097adcad8bc9925a5143b2e6eafea21bcf9e60c962af5db3eddfd607730ae9129dad1f8eaebfc9b5828b1e2f193e0a468a1b699bcd7d4fe712
 MISC metadata.xml 573 BLAKE2B 1818315ab71e9bbcd96875d0bd99f11fc41131c1d082bd6468465a3dd8e48f79817958c8aa4d31f4d0ad0aa28bfced7fbdc5567cebd23badf2a9b9a623f6a80a SHA512 bd9d04efbaf530bd10d6641543984a3f5672de39c66538dd4c7a52684e8c6cf31111d3c8c0052e9958297a972c6b9f11131dd3f5d95af6db6ee9ca64c3ab5131
diff --git a/app-arch/zip/zip-2.32-r1.ebuild b/app-arch/zip/zip-2.32-r1.ebuild
deleted file mode 100644
index 7d5eb0a73215..000000000000
--- a/app-arch/zip/zip-2.32-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit toolchain-funcs eutils flag-o-matic
-
-DESCRIPTION="Info ZIP (encryption support)"
-HOMEPAGE="http://www.info-zip.org/"
-SRC_URI="ftp://ftp.info-zip.org/pub/infozip/src/zip${PV//.}.tar.gz"
-
-LICENSE="Info-ZIP"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="crypt"
-
-DEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/zip-2.3-unix_configure-pic.patch
-	epatch "${FILESDIR}"/${PN}-2.31-exec-stack.patch
-	epatch "${FILESDIR}"/${PN}-2.32-build.patch
-}
-
-src_compile() {
-	tc-export CC CPP
-	use crypt || append-flags -DNO_CRYPT
-	append-lfs-flags
-	emake -f unix/Makefile generic || die
-}
-
-src_install() {
-	dobin zip zipnote zipsplit || die
-	doman man/zip.1
-	dosym zip.1 /usr/share/man/man1/zipnote.1
-	dosym zip.1 /usr/share/man/man1/zipsplit.1
-	if use crypt ; then
-		dobin zipcloak || die
-		dosym zip.1 /usr/share/man/man1/zipcloak.1
-	fi
-	dodoc BUGS CHANGES MANUAL README TODO WHATSNEW WHERE proginfo/*.txt
-}
diff --git a/app-arch/zip/zip-3.0-r1.ebuild b/app-arch/zip/zip-3.0-r1.ebuild
deleted file mode 100644
index 739f4b6aafdf..000000000000
--- a/app-arch/zip/zip-3.0-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-inherit toolchain-funcs eutils flag-o-matic
-
-MY_P="${PN}${PV//.}"
-DESCRIPTION="Info ZIP (encryption support)"
-HOMEPAGE="http://www.info-zip.org/"
-SRC_URI="mirror://sourceforge/infozip/${MY_P}.zip"
-
-LICENSE="Info-ZIP"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux"
-IUSE="bzip2 crypt natspec unicode"
-
-RDEPEND="bzip2? ( app-arch/bzip2 )
-	natspec? ( dev-libs/libnatspec )"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.0-no-crypt.patch #238398
-	epatch "${FILESDIR}"/${PN}-3.0-pic.patch
-	epatch "${FILESDIR}"/${PN}-3.0-exec-stack.patch
-	epatch "${FILESDIR}"/${PN}-3.0-build.patch
-	use natspec && epatch "${FILESDIR}"/${PN}-3.0-natspec.patch #275244
-}
-
-src_compile() {
-	use bzip2 || append-flags -DNO_BZIP2_SUPPORT
-	use crypt || append-flags -DNO_CRYPT
-	use unicode || append-flags -DNO_UNICODE_SUPPORT
-	emake \
-		CC="$(tc-getCC)" \
-		LOCAL_ZIP="${CFLAGS} ${CPPFLAGS}" \
-		-f unix/Makefile generic \
-		|| die
-}
-
-src_install() {
-	dobin zip zipnote zipsplit || die
-	doman man/zip{,note,split}.1
-	if use crypt ; then
-		dobin zipcloak || die
-		doman man/zipcloak.1
-	fi
-	dodoc BUGS CHANGES README* TODO WHATSNEW WHERE proginfo/*.txt
-}
diff --git a/app-arch/zip/zip-3.0.ebuild b/app-arch/zip/zip-3.0.ebuild
deleted file mode 100644
index 24708dc83140..000000000000
--- a/app-arch/zip/zip-3.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit toolchain-funcs eutils flag-o-matic
-
-MY_P="${PN}${PV//.}"
-DESCRIPTION="Info ZIP (encryption support)"
-HOMEPAGE="http://www.info-zip.org/"
-SRC_URI="mirror://sourceforge/infozip/${MY_P}.zip"
-
-LICENSE="Info-ZIP"
-SLOT="0"
-KEYWORDS="alpha amd64 arm 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="bzip2 crypt unicode"
-
-RDEPEND="bzip2? ( app-arch/bzip2 )"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-3.0-no-crypt.patch #238398
-	epatch "${FILESDIR}"/${PN}-3.0-pic.patch
-	epatch "${FILESDIR}"/${PN}-3.0-exec-stack.patch
-	epatch "${FILESDIR}"/${PN}-3.0-build.patch
-}
-
-src_compile() {
-	use bzip2 || append-flags -DNO_BZIP2_SUPPORT
-	use crypt || append-flags -DNO_CRYPT
-	use unicode || append-flags -DNO_UNICODE_SUPPORT
-	emake \
-		CC="$(tc-getCC)" \
-		LOCAL_ZIP="${CFLAGS} ${CPPFLAGS}" \
-		-f unix/Makefile generic \
-		|| die
-}
-
-src_install() {
-	dobin zip zipnote zipsplit || die
-	doman man/zip{,note,split}.1
-	if use crypt ; then
-		dobin zipcloak || die
-		doman man/zipcloak.1
-	fi
-	dodoc BUGS CHANGES README* TODO WHATSNEW WHERE proginfo/*.txt
-}
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index c7ae2a5919fc..cd7996c443c2 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index d8c0c3012c8c..22cb99178260 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,8 +1,8 @@
 DIST certbot-0.18.2.tar.gz 1044019 BLAKE2B d198252c1e3e24a80bcadeecde7fd133e454036df6bd782585b31234ddd8d393fc2ab792e60f381eabd9fb453ee2a57d132ba7d41254c8acd9cf64dbfb94fb89 SHA512 30dea063cf8d4bd714a40c1a82a7f4aab51e3a7d4de0d5f9a923f95badb2881562562c4a198da6a4c3cd1db7f9e2d124c2def70f3a245faca0040438586bf6a4
 DIST certbot-0.19.0.tar.gz 1061557 BLAKE2B 4f1c623276cbcc88d414dd9d135b65f472d1e35cfef74901fb8031d40d414266870229b6aaf60a4bfde983c7e930819e5e7326d5cfa3cbffb155e3a9c724883a SHA512 d29c9e2041171f2574bf2ee9ff7442b80b261a03f9e82e4dd40aad0617730aca6bff17fcc728496bda4133f86a4894cf21d083dacb0d0df2dec11d23e4e1541b
 DIST certbot-0.20.0.tar.gz 1108139 BLAKE2B 6af07dd245912741592761bd11160c081e278e5f48b69747669aa6146d81cc7ad6f0d9c7b4bf31ad137d51bd378f670e5e5d7318efe7b3b5463d52515a5df257 SHA512 92c128bc955a576a1eb568d39b3a5568f9bd841acefaa455d716ce5036312d0ad67b3dcfcf960b15abdd39c1f34f82ffe2ebca0722628c5c804fc5472a6c0546
-EBUILD acme-0.18.2.ebuild 1095 BLAKE2B 2b9a678884bd1a89c38e09fdc9dbfd850fd737f138b6ed419138e5e6b539762f45b80882e4cea4b036a7ef210fc4385a605c8fb69dcb9b4ac94dbffcb1694d5e SHA512 f6bd1a44d00471327892e61c4966b300339a2188510258bb22ed046b892587158a6290f09ee9a01bea7f55aba2ed1e2f5168cc7bb41da0574ec0854c2a8a19b4
-EBUILD acme-0.19.0.ebuild 1101 BLAKE2B dd7bc65a98f4b8168f2bc341ac699f68ab65a8a911b4a8fb409fe3ae78e8553c168b55a5a304b3d7cf697d34c58b32d751a87d6d04303a39a11e6eadbebd4be0 SHA512 73db02807520cc53e8695f112e3ee75841bd0aaf9ec9935db7b3e812010f0f9947ed805bd8300d602c0757a5a18b1b4bf1665ac92494791915c09790c10953be
-EBUILD acme-0.20.0.ebuild 1160 BLAKE2B 5cab784cc64156e26fb12b662f0d5d209dffce77011436c9ae1de8a891537b7567c07460334754be5e83fbcd1a17b051ec87affcc115e3b04faad73387de5953 SHA512 05ebf726ac5c68b3be47bb9dd90729b17240c010119c3ae017fb0ca478fcbd8ecfe163eb95d83b195923f2666530f9ff8b2ac09d3b60b04e66f7ada181c3a1a9
+EBUILD acme-0.18.2.ebuild 1133 BLAKE2B 401d18f882e17b5cb3b2554be65faaecd297ff995aa2a27740a02f5ab492e5cc54e93bae8f9d70630718ad428dcccfd99969f34ae53bef082408d21c8b3c436f SHA512 f06d2ed89253047db5a4943d6b4a9e78587af57d352ff5e892f9fa339ab2971684466afa2bffd9c4c7d6d14fde3e59382056b4cf5bab45abc5f914597d61ad13
+EBUILD acme-0.19.0.ebuild 1139 BLAKE2B 38a9513be1f7da99521962ca9a42ed7c5ef519a498ffe36f5fbf6451cd9820f7b2a796dc40ec02cc363c9f3e73e3a158de93bf7bf9677bc79b64c73a563e0e73 SHA512 577fb0baf8b0c0322cd594bbd68635bffaf47ead067563d838d5f787001f9e03ea7e0611f8975bd864b6a749534a4d9d851c519e601b139837310cc11f5b380d
+EBUILD acme-0.20.0.ebuild 1198 BLAKE2B 50eba9ca7a8fffcbe925318761d181b2f78cff34881dedda3bb9e1d4c1a385e23762a3cbdc4482e1407afa5451f2cf236405cf07887682d130a68b4002a49415 SHA512 c14e85f3722e7ae140ff6488faca0f0e00d03df2b01cb32dea1d53c8a090e827f8235b34c40e8ec6be76a14060982dde7a7a958efcad5d38c9463aec93f08658
 EBUILD acme-9999.ebuild 1205 BLAKE2B 8c9ee00ff6505c592a3c1ae4ab57e4abf9c6f49b5dd7737cc4a081645edd808f3bf3422a59fbda1597f31176d003e51aa784886ccd8cb5e5862c2823339f51ee SHA512 164272884c2301b9e2a5252ccff8c87678116bb8007527cd064af9147d536a266c5ed8910b711bd242f384298b903f620ad9cf9431c4e26ec65b7e34a8c20767
 MISC metadata.xml 342 BLAKE2B 770c32b421519cd6bdf7e09a71a1ee679a7fdf18e03587f75097a766c51dc878000184759e3c69f0c19afe060dd5578ff91e481644086e138dbb728619895130 SHA512 bb057838d2a4161b1b5d545d32fb798bf52571fccaf3dfe7e1811ee4090813341222f7c27e21f36ea9353e9f48b401a4cda0f1937640ef052445e6b0eac9defb
diff --git a/app-crypt/acme/acme-0.18.2.ebuild b/app-crypt/acme/acme-0.18.2.ebuild
index 135b289d3d81..88225e3b4f47 100644
--- a/app-crypt/acme/acme-0.18.2.ebuild
+++ b/app-crypt/acme/acme-0.18.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
@@ -29,7 +29,8 @@ RDEPEND=">=dev-python/cryptography-0.8[${PYTHON_USEDEP}]
 	dev-python/pyrfc3339[${PYTHON_USEDEP}]
 	dev-python/pytz[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.10[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
+	dev-python/six[${PYTHON_USEDEP}]
+	!dev-python/josepy[${PYTHON_USEDEP}]"
 DEPEND="test? ( ${RDEPEND} dev-python/nose[${PYTHON_USEDEP}] )
 	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]"
 
diff --git a/app-crypt/acme/acme-0.19.0.ebuild b/app-crypt/acme/acme-0.19.0.ebuild
index 13f5e31382c3..39d761d8800c 100644
--- a/app-crypt/acme/acme-0.19.0.ebuild
+++ b/app-crypt/acme/acme-0.19.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
@@ -29,7 +29,8 @@ RDEPEND=">=dev-python/cryptography-0.8[${PYTHON_USEDEP}]
 	dev-python/pyrfc3339[${PYTHON_USEDEP}]
 	dev-python/pytz[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.10[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	!dev-python/josepy[${PYTHON_USEDEP}]"
 DEPEND="test? ( ${RDEPEND} dev-python/nose[${PYTHON_USEDEP}] )
 	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]"
 
diff --git a/app-crypt/acme/acme-0.20.0.ebuild b/app-crypt/acme/acme-0.20.0.ebuild
index b02dbde82a94..81cab6d823e4 100644
--- a/app-crypt/acme/acme-0.20.0.ebuild
+++ b/app-crypt/acme/acme-0.20.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
@@ -31,6 +31,7 @@ RDEPEND="
 	dev-python/pytz[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.10[${PYTHON_USEDEP}]
 	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	!dev-python/josepy[${PYTHON_USEDEP}]
 "
 DEPEND="
 	test? (
diff --git a/app-crypt/moolticute/Manifest b/app-crypt/moolticute/Manifest
index aeebd211b0b0..747205c85f17 100644
--- a/app-crypt/moolticute/Manifest
+++ b/app-crypt/moolticute/Manifest
@@ -1,6 +1,8 @@
 AUX 50-mooltipass.rule 84 BLAKE2B 574568b60d33216a8de4a90866f2dd4a53d5369fb7e112c6125b8492e8cdaff51067dffe4e36e07fa24cf8a9aaaa77a388f3217ad039a51d7ba0781239020a43 SHA512 26f8a9f2c5fb2f3a87a486f91d5fae7069955dc528eacb8a37a833d393be38b70e3a9784024287cdfeb93a90abad83400395bb803e82a091100bd44cb7b2c28d
 AUX moolticuted.init 309 BLAKE2B 1f967b7e497e7e2d5547baf3e1b18127590997d8221ed34da1b4b4b2843bb1590fbb0c4153cb89d7f68b4fc0852e66f38879362fdd482414e4b6ba6862f06e30 SHA512 bbb80cf14d3adf744538f03513b461eb8bd2b633ef314f9e935e919f288f629aa8d84ff856e3aa104a2933e16143fbdbff90d9df8651473c39907f5aff580ed0
 DIST moolticute-0.10.0_beta.tar.gz 4945663 BLAKE2B 371ab382239d635251b3921cbae24ee8f0ccefdd2ca2a102e73ecf2eccdef5a86f1613d9cc051871b37ebe9936ffb5f95719f7e3c36c4d7fdc58a18ba9948b73 SHA512 febb828cc179cbbc40684b7c382babfe998d8e14c59358d985658dabc0c414de7b5bec3187336459b286fb85b79f8d781254c7dc55ecd6519fc4ea50952af9b4
+DIST moolticute-0.11.4_beta.tar.gz 5278216 BLAKE2B 7d78549e9ea384669ea2fcea3f543e543ece87b9ce016fbb8675d0ea9065957c0d10bd6048a43c37715de3d1638fa75c518640feca22702713c7c7ab6c9e2ea1 SHA512 4c832b286784c4e8fbfc2eea498e4b7c57377ba745ba226c88001a3ab564d6e7c719dcdb849a409e367eaebc43a8b4c6e756b8a3e90a722f48554df4822e7a19
 EBUILD moolticute-0.10.0_beta.ebuild 1221 BLAKE2B d7846f6ffdf9461819bd57cdf6d800c2d3cbee5f62f8bfc4f8cf38b4001c79c9637d329a1ad0efb27d006cfb27b29ce838ac88065619b60ebe06f27203da2558 SHA512 8c60b98f38e898ba74aacc00bf0bc58bb9cebb701e3beaca6f4ec934c2041ce5132ae96c73e644348582a00e44012d9a1a5e05b3f0741e378edcdb67f04ca1c7
+EBUILD moolticute-0.11.4_beta.ebuild 1221 BLAKE2B d7846f6ffdf9461819bd57cdf6d800c2d3cbee5f62f8bfc4f8cf38b4001c79c9637d329a1ad0efb27d006cfb27b29ce838ac88065619b60ebe06f27203da2558 SHA512 8c60b98f38e898ba74aacc00bf0bc58bb9cebb701e3beaca6f4ec934c2041ce5132ae96c73e644348582a00e44012d9a1a5e05b3f0741e378edcdb67f04ca1c7
 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.4_beta.ebuild b/app-crypt/moolticute/moolticute-0.11.4_beta.ebuild
new file mode 100644
index 000000000000..6176b1bb8674
--- /dev/null
+++ b/app-crypt/moolticute/moolticute-0.11.4_beta.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/mooltipass/moolticute.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/mooltipass/moolticute/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+inherit gnome2-utils qmake-utils udev
+
+DESCRIPTION="Mooltipass crossplatform daemon/tools"
+HOMEPAGE="https://github.com/mooltipass/moolticute"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+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
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${P/_/-}"
+
+src_prepare() {
+	default
+
+	# Fill version.h with package version
+	if [[ ${PV} != 9999* ]]; then
+		sed -i "s/\"git\"/\"v${PV/_/-}\"/" src/version.h || die
+	fi
+}
+
+src_configure() {
+	eqmake5 PREFIX="/usr" Moolticute.pro
+}
+
+src_install() {
+	emake install INSTALL_ROOT="${D}"
+
+	udev_dorules "${FILESDIR}/50-mooltipass.rule"
+	newinitd "${FILESDIR}/moolticuted.init" moolticuted
+}
+
+pkg_postinst() {
+	udev_reload
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index d931cc242514..42d2c743de3e 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/containerd/Manifest b/app-emulation/containerd/Manifest
index 22a426dba5c2..7c9eb589bb2a 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -1,9 +1,7 @@
-DIST containerd-0.2.9_p20170605.tar.gz 1229549 BLAKE2B 9dd68595694b5b624007ecd8a8a6546abeacbd45c6f4bd79754c275a2148938f17f7313f59567a7095d3d292807bf0eda9b79a5c9129a36f05eaa2478b97fde5 SHA512 900cf9c251c4de0f9848fb5bf26537226c1361d1a64a0fba853bda3805cb141fc2a849442fe885f0ee228b3e3a7018440af18898b484a54a7b75b4a86538aaa9
 DIST containerd-0.2.9_p20170917.tar.gz 1140788 BLAKE2B 96effa85f9cb03c3e416d53438376af6c7965660bf9c9931fdfa7fee94cca9386f2732e70dc88ee32b83e902b7d4a3072e22a817d9970ed1e07dc1271e8b33ab SHA512 c749bda691197ec8a7603db9ad92f2800a3f065143430a660333b7862518deb4c158a1c1fd01671dff438b40988d4a64d8f06bab05496b8728c6e2f57cd7da0a
 DIST containerd-1.0.0.tar.gz 3763785 BLAKE2B cd4af679c9028b616aeedd594518f796a350523899c13da5a848a5843b318394166ddfbf5e7ed1f473a3759b26d134659f928d8e15da17ebdf65a41d2fd5f914 SHA512 8c1a03de7f30976675e4482b4f18f4b87da56108de4d92f2e33b4cb4f8c188af5b3fad87971a294eac8442a0fb6ddae48cda81334c363203a8c8bdfc09176a7a
 DIST containerd-1.0.0_beta2_p20171019.tar.gz 3682585 BLAKE2B a67b581e3e5ddf2e95d551a9cca3dafa14772dc6ec1f1b1226ce21b0d7f88f3f80669b21f471fede50d5dd68d3916ef8696d0551c333c57e87a8ee2db3d25488 SHA512 290dcc97c47dccc6af424f5bcdfa2b59ae29eda135f71fb68a456245017a7ce5262150088f91b9edcaa19886d8919e5b6246f2816d6947c0a9b33ec6b58185e9
-EBUILD containerd-0.2.9_p20170605.ebuild 1000 BLAKE2B 16ffbe24d43a2a8a46023a1a2d454e06141ceeab94f559986960fc285f31d954a166f609c11b021d44d6d36d7d4198b84ea70768a30aa2c16d9a044e17f78fac SHA512 adec8a0e7d4d2e4dc200d470c1cbd2dbd38daf2ae2b931c9d32f5cd1b7c580cc1222c628c2e9b22fb64098c800c956a636e6167d6c7a6f391ec280b77a438a04
-EBUILD containerd-0.2.9_p20170917.ebuild 1001 BLAKE2B 3cd479b76dc812f5dec2b85e40bb52d4ce856bcada67d42cb1816cd4cd0a6afdc39cd0ac373f44453d5776911e1ca292608aed81cddcedb92877f8729cacd7f8 SHA512 d206822a85e56f2226b1099b98605800bb3f1aad7aac1846ece87c75b740e6e6aacee0def14925c96ea8ff86cf21622e5821e6112a39ea75edef1dfbeaf71b1f
+EBUILD containerd-0.2.9_p20170917.ebuild 1000 BLAKE2B e207ebb992d1c1e47a13c5ebae2004a6e8bb887ab605d9aaf7ac053762aecb58224b0d21cf13cc59fd1d9bc508fc6c0be5d3f7c4fd6a22136059a1a12b0df072 SHA512 c258fd617c1006ccc09506c1ff28d2edfe2e15966cacc62ea4e1194f3cdf96d74a60db5bf1f009a05b97f84bac44c23cef33e73e77ba272b8861244be7dbbe36
 EBUILD containerd-1.0.0.ebuild 1239 BLAKE2B 93aeb4bb834e6d79835d9eee995d0e8ec82d042d344eb2082366c71e56dc3f9376f3621a57b050f88478f5f9874c6cfd458a3c04a4866d3e583ed925bd49726f SHA512 b68d0bf59a5bdcbb98a8d480e5db49b182fcedf16962a6d9570dfeef22670d84215b8dd2b1c372108f92e6dd3b0f6c0b5478b1ce2c61ab2a2f4063820fcce97e
 EBUILD containerd-1.0.0_beta2_p20171019.ebuild 1250 BLAKE2B f0f6b831f90be916ef5841d4da3a5f14ea9569c978fbb250cd47df39020badc540eec2fa1a165e9b4e93d705bbcdd40d83317eac6db113c80ce66ff1ad1cfa00 SHA512 31eaa813c4ed0cf942d9b5b8d6b42acb33838b606d74706d02affe7eca3393f1f45644e496b7353b517a051c982111b872ea58a12c6644664d88ba023e2de185
 EBUILD containerd-9999.ebuild 965 BLAKE2B b671ff0dd3c5b8c72f2d713c04926047a304b7eec201051b5051a4ce49550176683a934d0b03350d5302fdff242e8e11f31b3db0b3962b73bcac85a0ed1a116d SHA512 b2acd6bd1c237a1058cec02875877d82e2e8c568bf3143cca020c64e13a0649975e3adcdb68540216e8ce1bcdbc7141eda8476c1c01ee2ca313120eca2850012
diff --git a/app-emulation/containerd/containerd-0.2.9_p20170605.ebuild b/app-emulation/containerd/containerd-0.2.9_p20170605.ebuild
deleted file mode 100644
index e574004b67ee..000000000000
--- a/app-emulation/containerd/containerd-0.2.9_p20170605.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGO_PN="github.com/${PN}/${PN}"
-
-inherit toolchain-funcs
-
-if [[ ${PV} == *9999 ]]; then
-	inherit golang-vcs
-else
-	MY_PV="${PV/_/-}"
-	EGIT_COMMIT="6e23458c129b551d5c9871e5174f6b1b7f6d1170"
-	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~ppc64"
-	inherit golang-vcs-snapshot
-fi
-
-DESCRIPTION="A daemon to control runC"
-HOMEPAGE="https://containerd.tools"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="hardened +seccomp"
-
-DEPEND=""
-RDEPEND=">=app-emulation/docker-runc-1.0.0_rc3_p20170706
-	seccomp? ( sys-libs/libseccomp )"
-
-S=${WORKDIR}/${P}/src/${EGO_PN}
-
-RESTRICT="test"
-
-src_compile() {
-	local options=( $(usex seccomp "seccomp" '') )
-	export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
-	LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') emake GIT_COMMIT="$EGIT_COMMIT" BUILDTAGS="${options[@]}"
-}
-
-src_install() {
-	dobin bin/containerd* bin/ctr
-}
diff --git a/app-emulation/containerd/containerd-0.2.9_p20170917.ebuild b/app-emulation/containerd/containerd-0.2.9_p20170917.ebuild
index 90c87cf44750..25e1ed88476f 100644
--- a/app-emulation/containerd/containerd-0.2.9_p20170917.ebuild
+++ b/app-emulation/containerd/containerd-0.2.9_p20170917.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
@@ -12,7 +12,7 @@ else
 	MY_PV="${PV/_/-}"
 	EGIT_COMMIT="06b9cb35161009dcb7123345749fef02f7cea8e0"
 	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc64"
+	KEYWORDS="amd64 ~arm ~ppc64"
 	inherit golang-vcs-snapshot
 fi
 
diff --git a/app-emulation/docker-proxy/Manifest b/app-emulation/docker-proxy/Manifest
index 2f6af893dbf4..10c6df8bd6ce 100644
--- a/app-emulation/docker-proxy/Manifest
+++ b/app-emulation/docker-proxy/Manifest
@@ -1,6 +1,6 @@
 DIST docker-proxy-0.8.0_p20161111.tar.gz 2150464 BLAKE2B a752ad0170cab2aebe2d5e826db22f5e21135a8fbfa835f62804c303be9f136fee941942e7d07e82e19033a62d51f37a41e9c36b48df48947d2885c351584f4f SHA512 86293b9cafc3c468760266b47412040f21309baad27765f584cfa1e93bc2ad88068832ed55f2ae8e4f16825e9f44619e89985fd36d98b3d47eaf1d1160f76c8e
 DIST docker-proxy-0.8.0_p20170917.tar.gz 2177045 BLAKE2B 0fed1328e8216ab83b23e8e1fe1793da6e874eced7ad18d101b0b7757f1de4fa7d321fb78620a349a4ed492abb4d85c3ecbf49311698b6af156a6255dec5740e SHA512 673ea638fa5c560d8238d7c1d88f114430f9d8efe701804bfe30044d0c059a688cbf6b62922be50834e16ee055ef6cf015f6232f76f0d942768f9e84e95496cd
 EBUILD docker-proxy-0.8.0_p20161111.ebuild 811 BLAKE2B 52fea3672054a214e08d3bf0f5392ec40620eb21c90e2b1535ce2ae327f544b6c852df93eb799217f42d4baaed927df7a266e12946d8efee84c5871471795d00 SHA512 f9fbd5faa13fc3f32fa8b23188dc242b11a8e7933a382552e80d0cc17dae3c2c2302ff42a0502acf55fd660bdbd4cb6e82f60ad977b0ed31873509ffb3a18462
-EBUILD docker-proxy-0.8.0_p20170917.ebuild 845 BLAKE2B c0ccb3363493ceffdbd2bfdae9bdb4a6eee9568f66df1d3c0b46f8fd6f2849fc46f38ad2d6443838a88b8ca6540c8698411dd0ab871451717188f939bb4a7302 SHA512 bf5d6aa116d1b6a59d33bb9168baf3a24b20bc34706a65ee6ef02378399d73843cd16580118287201310ec13657cd35dcee16e08fe8fa26f747368c818027d57
+EBUILD docker-proxy-0.8.0_p20170917.ebuild 844 BLAKE2B d9bb516d405a741229ffacefab421d80a44c9524d11ec17d0e5f67fb7560587791d90144b6822e189da137b8ddf77dfc0e91490318b04cface43813bd8554c43 SHA512 ac2d561d877731632d839d728a8b02021e6a80cd97274914abdd25c4b35f42e2ee23b3dfbcc15e96b411dfa20cdf6838b354f0da8eb495a3b0783069a246aa79
 EBUILD docker-proxy-9999.ebuild 767 BLAKE2B f78b475830edd0e33139d9f46a75629b9375ca1c2efc0e5e6c78447fd2bded0f2d1face48e8a0a8da92f6ea724eec843d2d96eb8e94a6881615926ceab6811df SHA512 07c829f9d6e5a2c64512fba2c6cef66bf33e15818d905f9b9fb3e412a98d651ac32c2fb9c07da57c7f8de963c4919f621021929375adf72afa485da9a69051ed
 MISC metadata.xml 543 BLAKE2B 69df333c0432bae7b2211dfa93683e3aee83fd63283fd7e34e0917e3292bd5d8947580fe7977fbc6f5d60fa0ca2d7902416bf4b878e27cbf2cf3413abacd18d6 SHA512 8580076d68f5803bc66fb9cdc088d13be2610ce1f200e614efcdabe75cfbeae5b72bcc4d043ce18844b4774f18e7861c3b6c788fa294c29e856bbcdd091677f6
diff --git a/app-emulation/docker-proxy/docker-proxy-0.8.0_p20170917.ebuild b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20170917.ebuild
index 0235cd99b405..5a4839ae1018 100644
--- a/app-emulation/docker-proxy/docker-proxy-0.8.0_p20170917.ebuild
+++ b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20170917.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
 else
 	EGIT_COMMIT="7b2b1feb1de4817d522cc372af149ff48d25028e"
 	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc64"
+	KEYWORDS="amd64 ~arm ~ppc64"
 	inherit golang-vcs-snapshot
 fi
 
diff --git a/app-emulation/docker-runc/Manifest b/app-emulation/docker-runc/Manifest
index 8488726e6e81..895a006b4864 100644
--- a/app-emulation/docker-runc/Manifest
+++ b/app-emulation/docker-runc/Manifest
@@ -1,7 +1,7 @@
-DIST docker-runc-1.0.0_rc3_p20170706.tar.gz 1042839 BLAKE2B b0d5d3788cdbaf17af23fe102a3b5ebba9324505d2389e2acd3300680cfdff682dc170b214e1a000d081e791943c160c7d797acb90173f4549caa554493c86e5 SHA512 8e937e8ccaa114913d61a450b030496668c1e2d80eecccf5e4914c5685d7dde9a0d50bc2aef9be844dc69eab81621aa1c043abbc72ba28ab6bdb9db5e86daeaf
 DIST docker-runc-1.0.0_rc4_p20170917.tar.gz 1094599 BLAKE2B fed7b3cb3bbf214c61f9bc84752f143de9f18aa1ad1720c80df171eaa82f545cdafdbd58f64ee21e05db67f7fcfa139622fc8356aa7584db87b72d46e3285907 SHA512 0cb0748812296294a87dda257dbf0947897a1ada2aa861ff3e65309a6bbecebbe798929845fca6f23b66fd0dc019bca0a032737c7192fe20618d8e1849866f3d
 DIST docker-runc-1.0.0_rc4_p20170926.tar.gz 1188421 BLAKE2B ba21aaed4c434358876e9a1656a0592e5df90e16ebd52b69a2ddd3344aba2db5e335de1c88aeed27101ec5441174da148d0da02ade0b517d36d45e0aff53ca9e SHA512 bad4643ce37dbba168cc3b0820cf7dc8166ff2d7970de519f86ca09123b59999174dd98b7bc550b714dc8235732923e0090031c789deb603f310e042a39f1d76
-EBUILD docker-runc-1.0.0_rc3_p20170706.ebuild 1383 BLAKE2B caf99dfd6f7168ff3973cee36512fdf06cf75c7ac2351a5bd6b78bd465bb5d2fe0882fdfd095b8111457470b6db716d985314bc953f0a37ece2afd2dc30b0950 SHA512 e06eafdf1d1f6af0b6c994bdf7cd278b6f7d1f0a9e649a0dcbf2a41c79c5b298418cfde46a47db85105140012871c9ba57d0dbf8c1d6d3f191da7547ec911b0c
-EBUILD docker-runc-1.0.0_rc4_p20170917.ebuild 1386 BLAKE2B 2ba72209d0db389e3f80f07e4bab4e217148ccbc7f5caebadc4e093cd15cdda827477e3f3d5a88d3935f253d996f626ec60823fbe6c97bb3d056fce4df398c13 SHA512 06d41f7d5a6a1fc20e4a6d2a284a00131d5290fd9b305cf7bdf7ffbb9878449a3a9316ec70ebb0e5eef7df57d976fe6774b4ee4e768d491b08572e2fbce95133
+DIST docker-runc-1.0.0_rc4_p20171108.tar.gz 1189298 BLAKE2B e213955ef59e7d5a43f1567c67d72b99d7de503340ed8c777a43a70c4f2b1dbfce2905377c912958f736cf31247334d1c2ab29fae203a297561c26ad43a4e4c1 SHA512 a5bf97ce284317e03e63ee0e39228d77848fcde2f6322de06eebc2536978b5d87fd8c3fbccb2e74ef8c80fbaa28f3d0b24074cb9fde01e268593332aacd57695
+EBUILD docker-runc-1.0.0_rc4_p20170917.ebuild 1385 BLAKE2B 03aab7b27952ff4dc2e1e84c6e3edb599b03df34dc1a82c7b7cbff6a3f36324cd191e723f4700c58761f221b395f443ba84a09ed5310af15d35a3bbbc43ed7a8 SHA512 466f519c03e8df4d71bf9b95149d9e4e15ed0858b999840f7d80d8ad9ccb7339b25a726451d9f08e4820ed09a6cd873e1d21a1de6e041d23202290a7da3e98cc
 EBUILD docker-runc-1.0.0_rc4_p20170926.ebuild 1385 BLAKE2B 90e1005077667c7f2f4b1e77543d50d266cd0fcddb020dc3a349c7071beacf2a9d5ae2ebdd88a79870684700fb843860e2c9c2257dd08928b28f84a62c10092b SHA512 91b1981d8660f91d376662ffbc87ef7afa77e00adeae8a87b8014093e930669f5d7da38710a41c227619ff30b22fb6e5bdd8fd8128366ebd07f4883dba4be88d
+EBUILD docker-runc-1.0.0_rc4_p20171108.ebuild 1385 BLAKE2B 02cd7e8361f69cb4e37bc97f81c1069e2ef9928ce335bcddc1755a32e0a67a77f236e03fe6126db4870122a0d9798b925b463e6616ff29c719d05674e8de3ab7 SHA512 fddf7cb0b5df213c14d5d832c683e8b5721c54c5f787688b08ff106561724d1e5cd4223b266ef71e1419ab248eddbfeb5d96909139105c4f83c39192e6fe0e32
 MISC metadata.xml 627 BLAKE2B af677935e5cb5c43d3b0e4d8a204bcfb14f4b77dc386fd2a756923457ae88cdc33fd85a84879b7908662c3c1b20ce0ba5598ae708d764bd36a071e32d9beb2c8 SHA512 1038519441e238a48dafd9a0827d931cc3ca2618e57f7f1300bdc138e6bc2b768ae47f936456bf2aa5c434e617b628344aa4071fe805e698671d5f74ffb10163
diff --git a/app-emulation/docker-runc/docker-runc-1.0.0_rc4_p20170917.ebuild b/app-emulation/docker-runc/docker-runc-1.0.0_rc4_p20170917.ebuild
index 8ea1d028f5b3..680647433350 100644
--- a/app-emulation/docker-runc/docker-runc-1.0.0_rc4_p20170917.ebuild
+++ b/app-emulation/docker-runc/docker-runc-1.0.0_rc4_p20170917.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 @@ else
 	EGIT_COMMIT="3f2f8b84a77f73d38244dd690525642a72156c64"
 	RUNC_COMMIT="3f2f8b84" # Change this when you update the ebuild
 	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc64"
+	KEYWORDS="amd64 ~arm ~ppc64"
 	inherit golang-vcs-snapshot
 fi
 
diff --git a/app-emulation/docker-runc/docker-runc-1.0.0_rc3_p20170706.ebuild b/app-emulation/docker-runc/docker-runc-1.0.0_rc4_p20171108.ebuild
index 930d6d1ff44e..f8b7a5ec0385 100644
--- a/app-emulation/docker-runc/docker-runc-1.0.0_rc3_p20170706.ebuild
+++ b/app-emulation/docker-runc/docker-runc-1.0.0_rc4_p20171108.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,10 +8,10 @@ if [[ ${PV} == *9999 ]]; then
 	inherit golang-vcs
 else
 	MY_PV="${PV/_/-}"
-	EGIT_COMMIT="810190ceaa507aa2727d7ae6f4790c76ec150bd2"
-	RUNC_COMMIT="810190" # Change this when you update the ebuild
+	EGIT_COMMIT="b2567b37d7b75eb4cf325b77297b140ea686ce8f"
+	RUNC_COMMIT="b2567b3" # Change this when you update the ebuild
 	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~ppc64"
+	KEYWORDS="~amd64 ~arm ~ppc64"
 	inherit golang-vcs-snapshot
 fi
 
diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index 57d14dcbf110..0175fc0261ca 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -1,10 +1,8 @@
-DIST docker-17.06.2.tar.gz 9684548 BLAKE2B bfe36c5fbc98bb2b1e8534cb59b54aef9b371fd46f7585c99c16c46d391356302fe9e3e064c7561cde617b8a5b97a07f994eb2452452a61a4c6ed38c434d9665 SHA512 0a9b7b122aadef911141ec1f606759e892c0673821ddf5f3247a5b2d4476a20018add84a22c5aca32f0f91c1046e5be6d8d3f9ce65c3e4244896bf061b1eac6b
-DIST docker-17.09.0.tar.gz 10132253 BLAKE2B 2964f20fd0badbea7961ccc4026fa107edbb42e92a63bfba18aed456c474990d76d118baec423c6d3cb6a89215a802b822b245222b73552569f03f0f30684819 SHA512 d96570825fb3dc24516b3b9666e935d5277674221452d8a23e6bcd1116f0bb3a2b8b315f47b98f52e681ab79309c099bb3b5c437af942539708ff3126c993638
 DIST docker-17.09.1.tar.gz 10135978 BLAKE2B 4c2dea48b3593332ac7b02bfcc7bf037b858adf87e5dd8ff84b03aca75d711375fafb06683a6a57cd2549c1a0a0edb2d7c7c1d4cf1b9ceefce18f4f91164b931 SHA512 e968ced32c379b74602053d1e9fe9ee5abe595078bb8d5f0d994c7eafd1557158d58fa48489ca8d7d578dbc7a5241182288b3ab37885b53abb8364d7aa9d2a4f
 DIST docker-17.11.0.tar.gz 10649392 BLAKE2B fff44885f535020bfd8cd6ab9c347df12610779de90290330e1315a2570c1e85a8d0c497320528f44187389b61c3f177f8032c3edc236347900034dfe3eaf764 SHA512 b9444775fd7bca1e1ec5b2fdeba063f7a7ead4a5b1fd60c836f42f98a8fe9a3a2fe963332e225491280772c9e4024fec5ebfa9b89ab9fa1b83cd60b5afd0333e
-EBUILD docker-17.06.2.ebuild 8711 BLAKE2B da8da6b779f54d9058191cd3888c79c523122bd729baa66e82c9a68226ab0b9cb46d8e22cbe2bd0be05f0494b8731349a55b8e44c65abc482a1da102c0668154 SHA512 6037ebc36e28e89905a3e15b4816114c16c624fc0072bdbda628fccfff5574509099923c15cc33cc7a39d0b67eabfb1511d7650ead4d5fcd360c7ac9b97408c4
-EBUILD docker-17.09.0.ebuild 8767 BLAKE2B 5c23044a93abb2728b9955158ba0475ca2c0f6e70d4e3d2ec10aae72f5831f08b19c5b99a4d7288f859c3d0807c2802b3fb0b95a3c2516f665c457636ee65c3c SHA512 5455e549fbcfa75082e1e0f4211d75439d26b028306ebc9bbecfec36fa951e52d7014e78d8893043194047ddcecbcb0b7fa1c4e2ad947373b1945576b270279f
-EBUILD docker-17.09.1.ebuild 8767 BLAKE2B deddd036ff353e11809f7a84b453be4f9b15331749a3aa7263f0ff3768c75c79288b9b1c9551b3ff164cd922cbe30527c4c682d60386f071b69db16cd14099f8 SHA512 6dd4d987080d778a3bd5bdb2bde8086a4fbf5a07036b0e08e74d8afa070a214a5e78e3623677c8a466816d3a7ca445a7625106c3dd936ac8cb645d10fe7fff1f
+DIST docker-17.12.0.tar.gz 11011208 BLAKE2B aee4a1b8af69b2418c62b0f5fc8cf6b1a0945ccbc870572e5835ec23bd9b6d5919fe9e8170b9d3c20eea479fec05aa97f380e1229b09cccbdbca9ed2baaa9f0b SHA512 1a4dfc86dc6c85c78d2abf4f559e5efe0fb22d915997f047fa6641e2aefb3e2fc6cb0124b6a0fc69abfc09ac8b261ebbd4d80b380cf9eb4304d3e1a423957b67
+EBUILD docker-17.09.1.ebuild 8766 BLAKE2B 79466ae75ff1b04af6fa51414d0d63b56f400d8c5879bd53ce37a99f824720559c323fad6129da7720ed252c9b5f70d3cb2d63afe25eaa177072272b98e5da3b SHA512 744bf909f82262827d04307bc71f9ec18ce194e3e213ce8f0ebfe172565d84d9c31ccf92ccf9ccadf7457780246427e82cd1f2082a49524e6b35d17ffec6131e
 EBUILD docker-17.11.0.ebuild 8772 BLAKE2B b912ef908bd41857144ef72076da4a14ada29edafb26662b8f5c2ae3e377e10f35d8e6113d7ced3a4bdfd29273f1f9a94e92313b8e844423dfea9cf85bd5536f SHA512 a7617ac4beef9492a918d0e7379c3a1b3ba38970a079ba96492851cec05346a629e2fe84a9bfed487c49442c257b14db5f60fed22c9546ea267f4a9aff0014ab
+EBUILD docker-17.12.0.ebuild 8773 BLAKE2B d5e28d1f014748b80561f6434869f745b1baaf96e879880adbc2e50f167daf75ee25d346fffe3dfbfc314473cc09cbc75af82209143a39c50f11ce6394e4cefe SHA512 bd36e73b7e389fad7eb52fb9462bcab4620dcb44b4b92fd06d8dc2d2e0ffb2e0f5e6f209a58916fcf70ee0e06260c7c5e9a4cb6e951900e2813f8917fa572ffa
 EBUILD docker-9999.ebuild 8077 BLAKE2B c6ee72c20ec0275500268b0c50af3609f164058ee69fd4dbd855c13d3fdeace8fb556750530e3517f769d5b24002ef6f457d3ea02041ec62d1069dfa06a45a4f SHA512 a2ec513765edbfb246460aaf41beae4a24e4fc8413ce20702785ac7403de7a0567017dc205b864d343dabfdeff7405e734a9ea9a9584322862b9b19005c285a4
 MISC metadata.xml 1637 BLAKE2B 14c56a84e41ebd76827cf37c27fe21259ca06e00d8c7fe318bd5eca609a77a9e23fc5ea13caba1616e47d17978402f715e6a8bc40643ce0cfb3ee87494ee6858 SHA512 bdaea32036a7f65f7015634d45bdf4f13322f3266cda389b49d2c57ad86e9811731194af5786e312d5ea40dab8b8eb78fc7b79a2ffee186b8eaabae9cc3c7a1b
diff --git a/app-emulation/docker/docker-17.06.2.ebuild b/app-emulation/docker/docker-17.06.2.ebuild
deleted file mode 100644
index 8d869dab470f..000000000000
--- a/app-emulation/docker/docker-17.06.2.ebuild
+++ /dev/null
@@ -1,314 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/docker/docker-ce"
-
-if [[ ${PV} = *9999* ]]; then
-	# Docker cannot be fetched via "go get", thanks to autogenerated code
-	EGIT_REPO_URI="https://${EGO_PN}.git"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
-	inherit git-r3
-else
-	inherit versionator
-	if [ "$(get_version_component_count)" = 4 ]; then
-		MY_PV="$(replace_version_separator 3 '-ce-')"
-	else
-		MY_PV="$PV-ce"
-	fi
-	DOCKER_GITCOMMIT="cec0b72"
-	EGIT_COMMIT="v${MY_PV}"
-	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm"
-	[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
-	inherit golang-vcs-snapshot
-fi
-inherit bash-completion-r1 golang-base linux-info systemd udev user
-
-DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
-HOMEPAGE="https://dockerproject.org"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="apparmor aufs btrfs +container-init +device-mapper hardened overlay pkcs11 seccomp"
-
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
-CDEPEND="
-	>=dev-db/sqlite-3.7.9:3
-	device-mapper? (
-		>=sys-fs/lvm2-2.02.89[thin]
-	)
-	seccomp? ( >=sys-libs/libseccomp-2.2.1 )
-	apparmor? ( sys-libs/libapparmor )
-"
-
-DEPEND="
-	${CDEPEND}
-
-	dev-go/go-md2man
-
-	btrfs? (
-		>=sys-fs/btrfs-progs-3.16.1
-	)
-"
-
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies
-RDEPEND="
-	${CDEPEND}
-	>=net-firewall/iptables-1.4
-	sys-process/procps
-	>=dev-vcs/git-1.7
-	>=app-arch/xz-utils-4.9
-
-	~app-emulation/containerd-0.2.9_p20170605
-	~app-emulation/docker-runc-1.0.0_rc3_p20170706[apparmor?,seccomp?]
-	app-emulation/docker-proxy
-	container-init? ( >=sys-process/tini-0.15.0[static] )
-"
-
-RESTRICT="installsources strip"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-# see "contrib/check-config.sh" from upstream's sources
-CONFIG_CHECK="
-	~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
-	~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
-	~KEYS
-	~VETH ~BRIDGE ~BRIDGE_NETFILTER
-	~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
-	~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK
-	~NF_NAT ~NF_NAT_NEEDED
-	~POSIX_MQUEUE
-
-	~USER_NS
-	~SECCOMP
-	~CGROUP_PIDS
-	~MEMCG_SWAP ~MEMCG_SWAP_ENABLED
-
-	~BLK_CGROUP ~BLK_DEV_THROTTLING ~IOSCHED_CFQ ~CFQ_GROUP_IOSCHED
-	~CGROUP_PERF
-	~CGROUP_HUGETLB
-	~NET_CLS_CGROUP
-	~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED
-	~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR
-
-	~VXLAN
-	~XFRM_ALGO ~XFRM_USER
-	~IPVLAN
-	~MACVLAN ~DUMMY
-"
-
-ERROR_KEYS="CONFIG_KEYS: is mandatory"
-ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers"
-ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering"
-
-ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering"
-ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering"
-ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering"
-ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering"
-ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks"
-ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks"
-
-pkg_setup() {
-	if kernel_is lt 3 10; then
-		ewarn ""
-		ewarn "Using Docker with kernels older than 3.10 is unstable and unsupported."
-		ewarn " - http://docs.docker.com/engine/installation/binaries/#check-kernel-dependencies"
-	fi
-
-	# for where these kernel versions come from, see:
-	# https://www.google.com/search?q=945b2b2d259d1a4364a2799e80e8ff32f8c6ee6f+site%3Akernel.org%2Fpub%2Flinux%2Fkernel+file%3AChangeLog*
-	if ! {
-		kernel_is ge 3 16 \
-		|| { kernel_is 3 15 && kernel_is ge 3 15 5; } \
-		|| { kernel_is 3 14 && kernel_is ge 3 14 12; } \
-		|| { kernel_is 3 12 && kernel_is ge 3 12 25; }
-	}; then
-		ewarn ""
-		ewarn "There is a serious Docker-related kernel panic that has been fixed in 3.16+"
-		ewarn "  (and was backported to 3.15.5+, 3.14.12+, and 3.12.25+)"
-		ewarn ""
-		ewarn "See also https://github.com/docker/docker/issues/2960"
-	fi
-
-	if kernel_is le 3 18; then
-		CONFIG_CHECK+="
-			~RESOURCE_COUNTERS
-		"
-	fi
-
-	if kernel_is le 3 13; then
-		CONFIG_CHECK+="
-			~NETPRIO_CGROUP
-		"
-	else
-		CONFIG_CHECK+="
-			~CGROUP_NET_PRIO
-		"
-	fi
-
-	if kernel_is lt 4 5; then
-		CONFIG_CHECK+="
-			~MEMCG_KMEM
-		"
-		ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional"
-	fi
-
-	if kernel_is lt 4 7; then
-		CONFIG_CHECK+="
-			~DEVPTS_MULTIPLE_INSTANCES
-		"
-	fi
-
-	if use aufs; then
-		CONFIG_CHECK+="
-			~AUFS_FS
-			~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
-		"
-		ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used instead of aufs4/aufs3"
-	fi
-
-	if use btrfs; then
-		CONFIG_CHECK+="
-			~BTRFS_FS
-			~BTRFS_FS_POSIX_ACL
-		"
-	fi
-
-	if use device-mapper; then
-		CONFIG_CHECK+="
-			~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
-		"
-	fi
-
-	if use overlay; then
-		CONFIG_CHECK+="
-			~OVERLAY_FS ~EXT4_FS_SECURITY ~EXT4_FS_POSIX_ACL
-		"
-	fi
-
-	linux-info_pkg_setup
-
-	# create docker group for the code checking for it in /etc/group
-	enewgroup docker
-}
-
-src_compile() {
-	export GOPATH="${WORKDIR}/${P}"
-
-	# setup CFLAGS and LDFLAGS for separate build target
-	# see https://github.com/tianon/docker-overlay/pull/10
-	export CGO_CFLAGS="-I${ROOT}/usr/include"
-	export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)"
-
-	# if we're building from a tarball, we need the GITCOMMIT value
-	[ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT
-
-	# fake golang layout
-	ln -s docker-ce/components/engine ../docker || die
-	ln -s docker-ce/components/cli ../cli || die
-
-	# let's set up some optional features :)
-	export DOCKER_BUILDTAGS=''
-	for gd in aufs btrfs device-mapper overlay; do
-		if ! use $gd; then
-			DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
-		fi
-	done
-
-	for tag in apparmor pkcs11 seccomp; do
-		if use $tag; then
-			DOCKER_BUILDTAGS+=" $tag"
-		fi
-	done
-
-	pushd components/engine || die
-
-	if use hardened; then
-		sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die
-		grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed'
-		sed  "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \
-			-i hack/make/dynbinary-daemon || die
-		grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed'
-	fi
-
-	# build daemon
-	./hack/make.sh dynbinary || die 'dynbinary failed'
-
-	popd || die # components/engine
-
-	pushd components/cli || die
-
-	# build cli
-	emake \
-		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \
-		VERSION="$(cat ../../VERSION)" \
-		GITCOMMIT="${DOCKER_GITCOMMIT}" \
-		dynbinary || die
-
-	# build man pages
-	go build -o gen-manpages github.com/docker/cli/man || die
-	./gen-manpages --root . --target ./man/man1 || die
-	./man/md2man-all.sh -q || die
-	rm gen-manpages || die
-	# see "components/cli/scripts/docs/generate-man.sh" (which also does "go get" for go-md2man) 
-
-	popd || die # components/cli
-}
-
-src_install() {
-	dosym containerd /usr/bin/docker-containerd
-	dosym containerd-shim /usr/bin/docker-containerd-shim
-	dosym runc /usr/bin/docker-runc
-	use container-init && dosym tini /usr/bin/docker-init
-
-	pushd components/engine || die
-	newbin "$(readlink -f bundles/latest/dynbinary-daemon/dockerd)" dockerd
-
-	newinitd contrib/init/openrc/docker.initd docker
-	newconfd contrib/init/openrc/docker.confd docker
-
-	systemd_dounit contrib/init/systemd/docker.{service,socket}
-
-	udev_dorules contrib/udev/*.rules
-
-	dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md
-	dodoc -r docs/*
-
-	insinto /usr/share/vim/vimfiles
-	doins -r contrib/syntax/vim/ftdetect
-	doins -r contrib/syntax/vim/syntax
-
-	# note: intentionally not using "doins" so that we preserve +x bits
-	dodir /usr/share/${PN}/contrib
-	cp -R contrib/* "${ED}/usr/share/${PN}/contrib"
-	popd || die # components/engine
-
-	pushd components/cli || die
-
-	newbin build/docker-* docker
-
-	doman man/man*/*
-
-	dobashcomp contrib/completion/bash/*
-	insinto /usr/share/zsh/site-functions
-	doins contrib/completion/zsh/_*
-	popd || die # components/cli
-}
-
-pkg_postinst() {
-	udev_reload
-
-	elog
-	elog "To use Docker, the Docker daemon must be running as root. To automatically"
-	elog "start the Docker daemon at boot, add Docker to the default runlevel:"
-	elog "  rc-update add docker default"
-	elog "Similarly for systemd:"
-	elog "  systemctl enable docker.service"
-	elog
-	elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
-	elog "  usermod -aG docker youruser"
-	elog
-}
diff --git a/app-emulation/docker/docker-17.09.1.ebuild b/app-emulation/docker/docker-17.09.1.ebuild
index 10c65a98732e..bae5865672df 100644
--- a/app-emulation/docker/docker-17.09.1.ebuild
+++ b/app-emulation/docker/docker-17.09.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
@@ -20,7 +20,7 @@ else
 	DOCKER_GITCOMMIT="19e2cf6"
 	EGIT_COMMIT="v${MY_PV}"
 	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm"
+	KEYWORDS="amd64 ~arm"
 	[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
 	inherit golang-vcs-snapshot
 fi
diff --git a/app-emulation/docker/docker-17.09.0.ebuild b/app-emulation/docker/docker-17.12.0.ebuild
index 4f2669f8f5a1..0a2445ceb541 100644
--- a/app-emulation/docker/docker-17.09.0.ebuild
+++ b/app-emulation/docker/docker-17.12.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
@@ -17,7 +17,7 @@ else
 	else
 		MY_PV="$PV-ce"
 	fi
-	DOCKER_GITCOMMIT="afdb6d4"
+	DOCKER_GITCOMMIT="1caf76c"
 	EGIT_COMMIT="v${MY_PV}"
 	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm"
@@ -60,9 +60,9 @@ RDEPEND="
 	sys-process/procps
 	>=dev-vcs/git-1.7
 	>=app-arch/xz-utils-4.9
-
-	~app-emulation/containerd-0.2.9_p20170917
-	~app-emulation/docker-runc-1.0.0_rc4_p20170917[apparmor?,seccomp?]
+	dev-libs/libltdl
+	~app-emulation/containerd-1.0.0
+	~app-emulation/docker-runc-1.0.0_rc4_p20171108[apparmor?,seccomp?]
 	>=app-emulation/docker-proxy-0.8.0_p20170917
 	container-init? ( >=sys-process/tini-0.16.1[static] )
 "
@@ -254,7 +254,7 @@ src_compile() {
 	./gen-manpages --root . --target ./man/man1 || die
 	./man/md2man-all.sh -q || die
 	rm gen-manpages || die
-	# see "components/cli/scripts/docs/generate-man.sh" (which also does "go get" for go-md2man) 
+	# see "components/cli/scripts/docs/generate-man.sh" (which also does "go get" for go-md2man)
 
 	popd || die # components/cli
 }
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index 61f6b2f48e71..5ae69d92c3b3 100644
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
diff --git a/app-eselect/eselect-lib-bin-symlink/Manifest b/app-eselect/eselect-lib-bin-symlink/Manifest
index 5197ef23cf83..6662df4f27f2 100644
--- a/app-eselect/eselect-lib-bin-symlink/Manifest
+++ b/app-eselect/eselect-lib-bin-symlink/Manifest
@@ -1,6 +1,4 @@
 DIST eselect-lib-bin-symlink-0.1.1.tar.bz2 45376 BLAKE2B 59ffe0897a57115debf185344eb7fef5177394337c02dde6f67e79114e53f411edd5e5854c86beb4884eca6a51282a0dc09ee94e82cb0d0d0fd7e54a99e660ed SHA512 16b56153aa61534997f42641656c3feaf27243fece8cdd42e93ed0be5dabedafc316af8111cd7ff0e321666de8deb1a35e86032cd9590060f677ac7e68fd48bd
-DIST eselect-lib-bin-symlink-0.1.tar.bz2 45331 BLAKE2B ffc21e3496d8affb0ac45c2781e26355192f84f44bf252042ae8dcea60b1e3d2ff4bfb3a6f53b0d67a13617dd5e3b076aa864fd803219d9dc64fe47c7f5229f4 SHA512 c4e31c81ee778a18335e3a5f45eba28688ca6af8b7f5069897a19f1d51e0a83fc35b80149c29643c01ff959aedd05b80a020bd0fbdb9fc7ecf207405f8c77ed6
 EBUILD eselect-lib-bin-symlink-0.1.1.ebuild 656 BLAKE2B 224c90c5714a5aca835065726779806e7873e4029aa33134ea2e4b0e65dc370daa35dd590d190295691c435c81e69579a3563d10e99cee3b6d7ad76ded7d4aa1 SHA512 721c447737d131b1b09223362c43481798d8fd3ba8fb7b47d8da1b032db205b4bf42c1651cbb55a886fbac4de247176cf58d1226b85fcce5bb0702da3712fa02
-EBUILD eselect-lib-bin-symlink-0.1.ebuild 636 BLAKE2B 26d367a5562c743670835145a83781dcba1109349c77f6f2302b4645cd8dbdf730d617a20c35d14f95c1893eb4da1e52ccc9f4b36a2a13407ccf43e7016a30c2 SHA512 7dcdbdb17eb197dfcac899dcc09e1b667184313de4f7336b9c4c0d26e3ec823e74b1dd2e086af2c01231ac29365985e115fdf01d52da5d34903727ed15b1c3b1
 EBUILD eselect-lib-bin-symlink-9999.ebuild 793 BLAKE2B cfe551ad8b6a12317abca16a4728c40812dd751712358911a16c387f7788eee1e8b8e08de6b3046cc1ef929e2dc08167a10557d698752047bdb9d68f1bf031d9 SHA512 e77554398060f689c0b427070a4b2b475674c16dc443bcfa1e13c11be8b54d050b8aa4e50a73d8fe8d7baa3ac5f811fa03ec5afa511d65d2f9457d5fc685a68c
 MISC metadata.xml 563 BLAKE2B c794d406f73c06b4c05fa441274f145600677f1b82256cc1621540510f6246934ee00f90e40ce170aded4e97ac2b77c5982ab4d1df1e0d27873bd4498212124f SHA512 35b31f23ebe0f3d08726edc4a876162907a8031d9907d67d775534b4d7719330701a94859a5dd79457cfc50ee9be3cc9a7829c7a0dcfd751dba2e68d2f75b6cb
diff --git a/app-eselect/eselect-lib-bin-symlink/eselect-lib-bin-symlink-0.1.ebuild b/app-eselect/eselect-lib-bin-symlink/eselect-lib-bin-symlink-0.1.ebuild
deleted file mode 100644
index d94346e6c9b6..000000000000
--- a/app-eselect/eselect-lib-bin-symlink/eselect-lib-bin-symlink-0.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils
-
-DESCRIPTION="An eselect library to manage executable symlinks"
-HOMEPAGE="https://bitbucket.org/mgorny/eselect-lib-bin-symlink/"
-SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
-
-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"
-IUSE=""
-
-RDEPEND="app-admin/eselect"
diff --git a/app-eselect/eselect-repository/Manifest b/app-eselect/eselect-repository/Manifest
index 3b9c2b32dcbd..586a6d2108de 100644
--- a/app-eselect/eselect-repository/Manifest
+++ b/app-eselect/eselect-repository/Manifest
@@ -1,6 +1,4 @@
-DIST eselect-repository-1.tar.gz 5378 BLAKE2B c60ff31d570a63b7b2863ae45d467f2d1302a35263f192ff96fea2cb3f448e5042ef8b6903e9a4e9db76f203e0609600ea3b4a7cbca957aa34bdafe40bc25da6 SHA512 7f985c3abe3fa02dfe44aade71583e7280c4757470fe8bf43de8fcc2403e8b924d9b0af104e926a2b3cd79a92b440570347db511767c908dda087ccc9f3aba6e
 DIST eselect-repository-2.tar.gz 5441 BLAKE2B 28608b7e5d06747afea4ef28b0f45ac97dcea0310201d857f1248e7fc586a331fce01c9017df83c332cbfb55b51b52a45361e06db8a7d4b788a70f63eb4c83d8 SHA512 7667053b7d06117f49366d7bb6ad39b1b0715c778e49e18649ce38b364e58c0c31f4fa077a459374c52d3bb7f550002a4368cbb7fc14fd9961815bb1355c1f61
-EBUILD eselect-repository-1-r1.ebuild 873 BLAKE2B f6fb58f5a89342c1a1d615b5cdb269785e1a82b392f4cec5611ffdbc6fb3d84d8877f58418c0c597e29036a47a3da3135b3246cafe113ee4798ea012c6c591e3 SHA512 f854db694f468bd3730025b97c8d34e5bf6f692d9a92fa7585276bbbb2490164e784497795d3597f9bf5e48565aeb48c6465633bcdea37f06dfd7d93ff1a356e
-EBUILD eselect-repository-2.ebuild 868 BLAKE2B f22906813061515d7cddac0e85474aa58d4491fdeffc3d63f5c3c7c588603cce2a0ff1c0f9122db10f0ec31bf9225d741e5618c1baa904b3e8fe2a5d338cee4b SHA512 cc5ede5a2d32f110ca1a41c6b78a8ced608659430fcca7cf015c10fa5f363dd0acce42e08cbc62082d2728d2b23ca671f451a3d6054c005bcf21e7308fb022a4
+EBUILD eselect-repository-2.ebuild 873 BLAKE2B f6fb58f5a89342c1a1d615b5cdb269785e1a82b392f4cec5611ffdbc6fb3d84d8877f58418c0c597e29036a47a3da3135b3246cafe113ee4798ea012c6c591e3 SHA512 f854db694f468bd3730025b97c8d34e5bf6f692d9a92fa7585276bbbb2490164e784497795d3597f9bf5e48565aeb48c6465633bcdea37f06dfd7d93ff1a356e
 EBUILD eselect-repository-9999.ebuild 848 BLAKE2B a0487c133cc3096374e30c2e2d024f346e4f1f3e8573ef29cc416a8ba9066a61fa6ea0fb2d7acfb6bb3ede0eb31fac7fa71f81ecc04f73b7dcf47d800ea6015c SHA512 0c3cc2c3e2e894d2fdb1ddd4123b76283c56120da2332f5b364b9e4941b39c11cc28c200162f9f2c994deab34f5b97580116431652058a971282171923daa261
 MISC metadata.xml 337 BLAKE2B f1e5fed0f35fa48ba72720ef703cbd6cba18d0e8a15097b49544d86caef6752fa672f1904f511f1c54f3a7eb0cf195b95bb1bdee20f0317431c077839269ca77 SHA512 e3da0532b27d28ee74ddb0b4c2bd7fb4f2e128b86de2001583b03312692a8c8b0ae943e3e3ebabc6f109dd816d783543cbd5f91fb92a5f6055d07a0c0f11f4af
diff --git a/app-eselect/eselect-repository/eselect-repository-1-r1.ebuild b/app-eselect/eselect-repository/eselect-repository-1-r1.ebuild
deleted file mode 100644
index 54b33e1a1bd0..000000000000
--- a/app-eselect/eselect-repository/eselect-repository-1-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
-inherit python-single-r1
-
-DESCRIPTION="Manage repos.conf via eselect"
-HOMEPAGE="https://github.com/mgorny/eselect-repository"
-SRC_URI="https://github.com/mgorny/eselect-repository/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RDEPEND="${PYTHON_DEPS}
-	app-admin/eselect
-	dev-python/lxml[${PYTHON_USEDEP}]
-	net-misc/wget"
-
-src_compile() {
-	MAKEARGS=(
-		PREFIX="${EPREFIX}/usr"
-		SYSCONFDIR="${EPREFIX}/etc"
-		SHAREDSTATEDIR="${EPREFIX}/var"
-		ESELECTDIR="${EPREFIX}/usr/share/eselect/modules"
-	)
-
-	emake "${MAKEARGS[@]}"
-	python_fix_shebang eselect-repo-helper
-}
-
-src_install() {
-	emake "${MAKEARGS[@]}" DESTDIR="${D}" install
-	keepdir /var/db/repos
-	einstalldocs
-}
diff --git a/app-eselect/eselect-repository/eselect-repository-2.ebuild b/app-eselect/eselect-repository/eselect-repository-2.ebuild
index fef00322510b..54b33e1a1bd0 100644
--- a/app-eselect/eselect-repository/eselect-repository-2.ebuild
+++ b/app-eselect/eselect-repository/eselect-repository-2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mgorny/eselect-repository/archive/v${PV}.tar.gz -> $
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 462a618a105f..a6dc0172d0ba 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/qchartdiary/Manifest b/app-office/qchartdiary/Manifest
deleted file mode 100644
index fddb586fcf41..000000000000
--- a/app-office/qchartdiary/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST QChartDiary-0.6.4.1-src.tar.gz 72683 BLAKE2B adaa070e3befdc495ffb341d92390b0dc2ef5028c193a25a856c4a7b61b9ef407a8bdd4f8b28a6b44851ba4d409c4712a199ab2b1b04f4817191e00dff1dcc3d SHA512 8f804daf4fc8f61c0f584f667ac109771976808ae03f1d5fa9debe4bee3ce4010906fcb337b0007bcf0058ec83f5f9381187155c42ba118915ae64857982fd89
-EBUILD qchartdiary-0.6.4.1-r2.ebuild 719 BLAKE2B ee73a232f19813aefc58e5c64d243009f05e8370eedd8dfb981b87ecbf56a9fa8c413c86dd2f869db054133c672cd25f4b99ce64b4bf5ef578ae3372027e27d9 SHA512 281f2a56b730f3e090398116eb7403a14d9f94c8c335f2d7811cb4122d4158050bb4248f0d1b496856897522ee6f169a4e2c6b1c35506013600972bb054424a4
-MISC metadata.xml 331 BLAKE2B cdfa193ad6745abe4b0a9031536d0424950dffa998545db240ab30c024c9eb9e048087ba14bb440cf9f2cd638cda7a6cfc0fe4959715425692183f1cdff6c2d0 SHA512 7c9764228eb3be50b287c3cbd0bb653c1217e783f5e1634a9a44be8173a44ac2d2f5c864779e4c28d73572a01d77387d728fdb0bbca45d15acc8b88dfa327aaf
diff --git a/app-office/qchartdiary/metadata.xml b/app-office/qchartdiary/metadata.xml
deleted file mode 100644
index acd8e0ee3226..000000000000
--- a/app-office/qchartdiary/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>hwoarang@gentoo.org</email>
-		<name>Markos Chandras</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">qchartdiary</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-office/qchartdiary/qchartdiary-0.6.4.1-r2.ebuild b/app-office/qchartdiary/qchartdiary-0.6.4.1-r2.ebuild
deleted file mode 100644
index cca0b4e30ce7..000000000000
--- a/app-office/qchartdiary/qchartdiary-0.6.4.1-r2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit qt4-r2
-
-MY_PN="QChartDiary"
-
-DESCRIPTION="Free Qt4 diary/agenda application"
-HOMEPAGE="http://qt-apps.org/content/show.php?content=99294"
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}-src.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-DEPEND="dev-qt/qtgui:4
-	dev-qt/qtsql:4"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_PN}"
-
-DOCS="AUTHORS CHANGELOG README"
-
-src_prepare() {
-	sed -i "s/doc\/${MY_PN}/doc\/${PF}/" ${MY_PN}.pro \
-		|| die "failed to fix documentation path"
-	qt4-r2_src_prepare
-}
-
-src_install() {
-	qt4-r2_src_install
-	dobin ${MY_PN} || die "dobin failed"
-}
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index dcdc64a6d6d4..15d8318eb573 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/cpuid2cpuflags/Manifest b/app-portage/cpuid2cpuflags/Manifest
index c249a66f633b..d250b672f701 100644
--- a/app-portage/cpuid2cpuflags/Manifest
+++ b/app-portage/cpuid2cpuflags/Manifest
@@ -1,8 +1,6 @@
-DIST cpuid2cpuflags-4.tar.bz2 71216 BLAKE2B 58338699d9765c71e1f7d5c1518bbd1186a8a3b6d4752578dd97ec7e6c6e7661726accf606a940a8a554c95d80515465575958254ee908687387a39136f6eeed SHA512 0f8a078a605687af9be0152d530dabfa7636827005747a5cce399103eec34f96216b4417e06472821aceecdca737a6ee106b63f056f221d6f2a3050bc3a03f6b
 DIST cpuid2cpuflags-5.tar.bz2 72050 BLAKE2B e9b7022ae5b7d51c88b5e41d9d7af1175498cb5a1f32876bfb766f785060f501d07ba3a5c346961e742bbf7022121faf3d0d068ec711ee9ed4e67cbdcd72a58a SHA512 41dcd2b974f6bd96867dea15a3839a8d63a3ff600189107ab16a67b5bc77ef421acbedb83f3e3b16ec90ac900d187aa8c44baae6fbdb4988f3bf7caa2d0d19a2
 DIST cpuinfo2cpuflags-1.tar.gz 1429 BLAKE2B 5126e643e5e2ea0be2418068fbcfbbae1781a0e3ab7903d909d4a5a291cb2e5db132a7a6a5c6db12a757688efca0557e4331a91f64af4b7e47deca415fd05b34 SHA512 68a21cfdb0fc8c6eb5aad5c6702d50dd56c927b2010efea1651dbc6a9657654b770bc5a4055fb11e790066c2c63c9ea29c3e03d91057abe187e7029e6797aede
 EBUILD cpuid2cpuflags-1.ebuild 1058 BLAKE2B 2f84de424a39c3f163dffffb5acf0b919e1abd2375b961e6f1f281011157fe7fabcebcee4ba771abfb2fef9407fbf4c67a104aa3ec4de2bf1d81b91cbc6e272c SHA512 ca30faabee1bd898fc80f7207fe71d205d6ee6a09e1697f242bfafaca1071fb343ab58623d713b15202096f6e3e240dd83600ce0b695be546721037c77e9c850
-EBUILD cpuid2cpuflags-4.ebuild 930 BLAKE2B 3e5303f56f197a2d2e7212d47fb7ca3cbd153401938274d3f262ab7266f4ac934c4cd5ae4d17438aab3ddc129b0df84d283229f27fba4393ac12fab5ed42b512 SHA512 428b39f888875375ecb735e2d75e562e4df447133e9eece95156e0eafcd6672baa09d2ffad96769f171027cd4207d1fc02d4e24f9cf900dcce0425183db3adc0
 EBUILD cpuid2cpuflags-5.ebuild 930 BLAKE2B 3e5303f56f197a2d2e7212d47fb7ca3cbd153401938274d3f262ab7266f4ac934c4cd5ae4d17438aab3ddc129b0df84d283229f27fba4393ac12fab5ed42b512 SHA512 428b39f888875375ecb735e2d75e562e4df447133e9eece95156e0eafcd6672baa09d2ffad96769f171027cd4207d1fc02d4e24f9cf900dcce0425183db3adc0
 EBUILD cpuid2cpuflags-9999.ebuild 410 BLAKE2B db323508784e37a7f4220c8d192460e854ab54bccfcebb40826821335de6834e97460dd4bc6dfbe11fc6d650171fb76a0a9196bb1bf6af81a08db35afda2e466 SHA512 02a38010f453641b73461f5afb980b7e1cb1817f3a688064d699827d698f94a3f27a65f7c0dddb7be287694cfe426bbfdd5ec03714d3b777a4975a38e5561b69
 MISC metadata.xml 343 BLAKE2B 29f607a891c673bbf997aa75bb445adfc43cffa35f63a30d1f2b06e4c5a7429ad503fae596c4c633b7e6680e26da674bd9f8aaea32a8a9bd8a3ac2c79a0a5667 SHA512 8ae8b8d61adaf555d1f59e50655e9e12f342e194ab8363f03a34390eed1455144acee39553b93306d9775b8c9fb119de52b8bb4d9284c71ddc39c3d3414a31dc
diff --git a/app-portage/cpuid2cpuflags/cpuid2cpuflags-4.ebuild b/app-portage/cpuid2cpuflags/cpuid2cpuflags-4.ebuild
deleted file mode 100644
index 318806faa56c..000000000000
--- a/app-portage/cpuid2cpuflags/cpuid2cpuflags-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=6
-
-DESCRIPTION="Tool to guess CPU_FLAGS_X86 flags for the host"
-HOMEPAGE="https://github.com/mgorny/cpuid2cpuflags"
-SRC_URI="https://github.com/mgorny/cpuid2cpuflags/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-pkg_postinst() {
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if [[ ${v%-r*} -lt 2 ]]; then
-			elog 'Please note that the output has changed in v2. The new format is suitable'
-			elog 'both for Portage and Paludis. To use it, e.g.:'
-			elog
-			elog '  $ echo "*/* $(cpuid2cpuflags)" > /etc/portage/package.use/00cpuflags'
-			elog
-			elog '(you may need to convert package.use into a directory if you want to use'
-			elog ' separate file as presented here)'
-		fi
-	done
-}
diff --git a/app-portage/eclass-manpages/Manifest b/app-portage/eclass-manpages/Manifest
index 25221ea78287..af4d77d90e9a 100644
--- a/app-portage/eclass-manpages/Manifest
+++ b/app-portage/eclass-manpages/Manifest
@@ -1,14 +1,8 @@
 AUX eclass-to-manpage.awk 10909 BLAKE2B e41b792f8316c612609da17c16ba41f01a4fc27c847bc380a26a570abef030d6e11a74673d703da77e17bb3db796ed3207d95cd9d8e7604551a6d0b10c6a3e07 SHA512 c37d502f66c31b2e5be8c27071ade6bfe7617d84bbca57ab3ac9d0f2d3403281d50fd8c6bada2c3dbe29041bcef4c0dafc76506a1ddca82fc26aa83d4785bae2
 AUX eclass-to-manpage.sh 780 BLAKE2B 74c9580dd603e036f8209107794d39eb6705333312a98f1c1fba86feb807792ba8ae52420b3ab4b5296c6dbd42af597e591ce928c19b26c5fc80be09202973c3 SHA512 266f15ac5d2efc42ce792d9e0c1d91e99502a5cd93ee1b915fe952cdd894bc4e773014c3f6731d2a11a2d82466676035cff21a1d88070fe85f1dca915dca203c
-DIST eclass-manpages-20170321.tar.xz 459596 BLAKE2B 03eb3110774f6b0fa6f6f7a578113d540e1f9c0f0c2f0bdc7a21fbaa1b05b592ed67d693f3669cfcee0b3faa9f320c7cb14ba08e67f9f31e46030a07bf690765 SHA512 7ff2a48659382ae84944e4f4cf4bb8a73d51355d8bcd63f16fa155e3da3010430babe6f7d977327e5c7f14f0b5e6a23ee5659665e35b020bcd7772008ce3b3b0
-DIST eclass-manpages-20170428.tar.xz 457936 BLAKE2B 2d03cb4913962e744a8b4a0a44ca57f06923b658684ce8545d031e0459c0dc9c481ff2cb66600649bce00f1f2c6d37847c0f0005c946430eb5365f99532b18d7 SHA512 15f21b13aa66eb7fa9a02bcd4e33ec5f9eba9a82412184ba821ccfdccaa1e34d8161464ae9db939bc3e7df661eda45755efa4a465883c4577b406ca712aa2e01
-DIST eclass-manpages-20170521.tar.xz 455584 BLAKE2B 71152fdaf2aa1b64993d19a34aaa18750eb9414b08d8539088b9118d8f130f71994f3d2946a6f6c4e80d3b42c8843fe01e00e2c2c9fcef6b8de5fdd7222c7ea8 SHA512 0f91eaf3066a8208fd02c256927ea5e8b2d488642f37573bedf8284afef49d7c4951144687fda29146cf27af05cc29efbea0a41462e0d59fc94cae3e9e70870e
-DIST eclass-manpages-20170712.tar.xz 456832 BLAKE2B 2119c7989bf3b6c2d4baaf9f1bc2dd61a44d2d006472604f5fdb9ac5e887e35009c1ceba176f1a98cece70d6083f1fa467855b723967e8ddb05def11bdb5167a SHA512 a64c97683fa796d6122b722dfe065447ebd106c2974a7f3c4ea67743429efa43082979febdfd5a3676635b745cec02420771d1b2ce401c7100867aef9bd9de0b
 DIST eclass-manpages-20170905.tar.xz 453248 BLAKE2B dee13d3db8d685903bcaa4e54eb2b1167cac5f4b16fa639b4ddf37e4e33037cb12035b752f2bf12ccd886df38342a32d4e6e64a9ec2e1eea1c38db95b1e13bc8 SHA512 a6e8732f7a06e3a7bfd009a25d91f7f3c6721283c0265361029ee25cdaa20198a7b273e5825d7ac3f66c7ccfa7eea20c2c3ff23dc08bab22a32c2325a413e6b5
-EBUILD eclass-manpages-20170321.ebuild 1051 BLAKE2B bfdf848ce12d7e5dcc0a25c4eb104ba0fd78021eb72b956f5a19c2a11c9e79a094c35b2bd26a0d0980a19dd192537312767bc619dfff6339bf535f8754ca829d SHA512 26fd28474f65d196a20b1a64e7e9e5c04890bcc1a28b23a878220bb993f90ea226b1ddefb00af469998394510973f02fb8cde38eb713f4e7329940b95f30ed16
-EBUILD eclass-manpages-20170428.ebuild 1051 BLAKE2B bfdf848ce12d7e5dcc0a25c4eb104ba0fd78021eb72b956f5a19c2a11c9e79a094c35b2bd26a0d0980a19dd192537312767bc619dfff6339bf535f8754ca829d SHA512 26fd28474f65d196a20b1a64e7e9e5c04890bcc1a28b23a878220bb993f90ea226b1ddefb00af469998394510973f02fb8cde38eb713f4e7329940b95f30ed16
-EBUILD eclass-manpages-20170521.ebuild 1051 BLAKE2B bfdf848ce12d7e5dcc0a25c4eb104ba0fd78021eb72b956f5a19c2a11c9e79a094c35b2bd26a0d0980a19dd192537312767bc619dfff6339bf535f8754ca829d SHA512 26fd28474f65d196a20b1a64e7e9e5c04890bcc1a28b23a878220bb993f90ea226b1ddefb00af469998394510973f02fb8cde38eb713f4e7329940b95f30ed16
-EBUILD eclass-manpages-20170712.ebuild 1051 BLAKE2B bfdf848ce12d7e5dcc0a25c4eb104ba0fd78021eb72b956f5a19c2a11c9e79a094c35b2bd26a0d0980a19dd192537312767bc619dfff6339bf535f8754ca829d SHA512 26fd28474f65d196a20b1a64e7e9e5c04890bcc1a28b23a878220bb993f90ea226b1ddefb00af469998394510973f02fb8cde38eb713f4e7329940b95f30ed16
+DIST eclass-manpages-20180101.tar.xz 459156 BLAKE2B 1bddc6e20da2b037968eed722e6121ae8adeb90a80d5bbcd6c04528eefbeaa6e08b6a9dda08d2e677dfa140d0b978db51c450121a017360ce05b97709e4f8863 SHA512 7f9d843bd3b41e8a0993981a92aca69cfc423121db132d081d28487f83351a8b5b273eb9576c9610ec96e81b8e9a664d2089f30a0e94720baf07a28313627644
 EBUILD eclass-manpages-20170905.ebuild 1112 BLAKE2B df88ad03c1d6a8a3f407178324a682ffea016cc238ecc43f7354388a00a75574a1b0f3c884547a1c27eaad0dc263344c0b01335034e5a955d2770292f8265627 SHA512 c91678e3f434802810c0611aeb5186218ddef027c7f0896cb27429b697005f5c1dd724e4b3946dc030c8cf8cc0e28f8a1e5e2f09db06aba0e13950ca64cb9231
-EBUILD eclass-manpages-99999999.ebuild 916 BLAKE2B fb19dcfab8acdec6ce540275092f3d2a187373b71246be766f2b562a463361764cbb4069002adcef2be7c0d64a4e19d136592e21048eb903eae0dacc968104c5 SHA512 ac863b1ab0c85239d7c31350be6cdeaef0856e771881f0296aa5321012618fa20a74dae3c20b11925eab18f6c787ebe050d9fb41abc8d2281d3e5713146e27b9
+EBUILD eclass-manpages-20180101.ebuild 1108 BLAKE2B c4a96c80199a52e43b036035034d52b887a63af49f5a402ecb009c679e128d8b4525fb920e817487f245bf206cd09893cf51d938b657f4f6b549847ffdf4341b SHA512 7bb673880fd559cdebe572499730b97f19e79d388989395f6ae5c8ebe0d72a6fea9922ed96df59fb2add84a29896373261afaba03de3d1e539fa2e450d06811b
+EBUILD eclass-manpages-99999999.ebuild 916 BLAKE2B 45211f3e2b6102ea314ad4d29b41b4f2dd0022cdec40a5c4d998efcf6dd3222d0b15f805b3d0ed964e97eb23b4e210f77efc036c3ff20ed1d10a5d03ba07808e SHA512 f282ff310f77b69c8dd48a211e1e79feb1ca6a0e269694ab8d11919a44fc1417b7de5a804b4a6c32cc9ab83a4ef25144b37d0d7e16ae67a3fa8424a62b6cc0e0
 MISC metadata.xml 374 BLAKE2B 3f87ce1d875199a067b945d6c9f3b80bde36ec25714d7dd802a55b37895d6c1e9360e003c4e6066ffcf6338a7f04b46a181a8c49f7144866fd9547626a0378bb SHA512 3caedcecef2f388c833b9f7db0af743a71227288bb145ec8a56c2862c7f56571a860f7f961d0ab1565cc98a0d178e87e24a7321cf0b7d4c4d3ab95c120fb0cf9
diff --git a/app-portage/eclass-manpages/eclass-manpages-20170321.ebuild b/app-portage/eclass-manpages/eclass-manpages-20170321.ebuild
deleted file mode 100644
index a9f100ab082e..000000000000
--- a/app-portage/eclass-manpages/eclass-manpages-20170321.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"
-
-DESCRIPTION="collection of Gentoo eclass manpages"
-HOMEPAGE="https://www.gentoo.org/"
-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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE=""
-
-DEPEND="app-arch/xz-utils"
-
-# How to create a snapshot and upload it to your dev-space:
-#
-# mkdir eclass-manpages-$(date +%Y%m%d)
-# cp "$(portageq get_repo_path / gentoo)"/eclass/*.eclass eclass-manpages-$(date +%Y%m%d)/
-# tar -cf eclass-manpages-$(date +%Y%m%d).tar eclass-manpages-$(date +%Y%m%d)
-# xz -9e eclass-manpages-$(date +%Y%m%d).tar
-# scp eclass-manpages-$(date +%Y%m%d).tar.xz dev.gentoo.org:public_html/dist/
-#
-# Then copy the ebuild and update your name in SRC_URI ;-).
-
-src_compile() {
-	env ECLASSDIR="${S}" bash "${FILESDIR}"/eclass-to-manpage.sh || die
-}
-
-src_install() {
-	doman *.5
-}
diff --git a/app-portage/eclass-manpages/eclass-manpages-20170428.ebuild b/app-portage/eclass-manpages/eclass-manpages-20170428.ebuild
deleted file mode 100644
index a9f100ab082e..000000000000
--- a/app-portage/eclass-manpages/eclass-manpages-20170428.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"
-
-DESCRIPTION="collection of Gentoo eclass manpages"
-HOMEPAGE="https://www.gentoo.org/"
-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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE=""
-
-DEPEND="app-arch/xz-utils"
-
-# How to create a snapshot and upload it to your dev-space:
-#
-# mkdir eclass-manpages-$(date +%Y%m%d)
-# cp "$(portageq get_repo_path / gentoo)"/eclass/*.eclass eclass-manpages-$(date +%Y%m%d)/
-# tar -cf eclass-manpages-$(date +%Y%m%d).tar eclass-manpages-$(date +%Y%m%d)
-# xz -9e eclass-manpages-$(date +%Y%m%d).tar
-# scp eclass-manpages-$(date +%Y%m%d).tar.xz dev.gentoo.org:public_html/dist/
-#
-# Then copy the ebuild and update your name in SRC_URI ;-).
-
-src_compile() {
-	env ECLASSDIR="${S}" bash "${FILESDIR}"/eclass-to-manpage.sh || die
-}
-
-src_install() {
-	doman *.5
-}
diff --git a/app-portage/eclass-manpages/eclass-manpages-20170521.ebuild b/app-portage/eclass-manpages/eclass-manpages-20170521.ebuild
deleted file mode 100644
index a9f100ab082e..000000000000
--- a/app-portage/eclass-manpages/eclass-manpages-20170521.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"
-
-DESCRIPTION="collection of Gentoo eclass manpages"
-HOMEPAGE="https://www.gentoo.org/"
-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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE=""
-
-DEPEND="app-arch/xz-utils"
-
-# How to create a snapshot and upload it to your dev-space:
-#
-# mkdir eclass-manpages-$(date +%Y%m%d)
-# cp "$(portageq get_repo_path / gentoo)"/eclass/*.eclass eclass-manpages-$(date +%Y%m%d)/
-# tar -cf eclass-manpages-$(date +%Y%m%d).tar eclass-manpages-$(date +%Y%m%d)
-# xz -9e eclass-manpages-$(date +%Y%m%d).tar
-# scp eclass-manpages-$(date +%Y%m%d).tar.xz dev.gentoo.org:public_html/dist/
-#
-# Then copy the ebuild and update your name in SRC_URI ;-).
-
-src_compile() {
-	env ECLASSDIR="${S}" bash "${FILESDIR}"/eclass-to-manpage.sh || die
-}
-
-src_install() {
-	doman *.5
-}
diff --git a/app-portage/eclass-manpages/eclass-manpages-20170712.ebuild b/app-portage/eclass-manpages/eclass-manpages-20180101.ebuild
index a9f100ab082e..42a54f0e3d5a 100644
--- a/app-portage/eclass-manpages/eclass-manpages-20170712.ebuild
+++ b/app-portage/eclass-manpages/eclass-manpages-20180101.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 
-DESCRIPTION="collection of Gentoo eclass manpages"
+DESCRIPTION="Collection of Gentoo eclass manpages"
 HOMEPAGE="https://www.gentoo.org/"
 SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
+# Keep the keywords stabled. No need to change to ~arch.
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE=""
 
diff --git a/app-portage/eclass-manpages/eclass-manpages-99999999.ebuild b/app-portage/eclass-manpages/eclass-manpages-99999999.ebuild
index e37f9d2ce39a..2ee50cf52679 100644
--- a/app-portage/eclass-manpages/eclass-manpages-99999999.ebuild
+++ b/app-portage/eclass-manpages/eclass-manpages-99999999.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="5"
+EAPI="6"
 
-DESCRIPTION="collection of Gentoo eclass manpages"
+DESCRIPTION="Collection of Gentoo eclass manpages"
 HOMEPAGE="https://www.gentoo.org/"
 SRC_URI=""
 
diff --git a/app-portage/gemato/Manifest b/app-portage/gemato/Manifest
index 8af424761876..32512b168a76 100644
--- a/app-portage/gemato/Manifest
+++ b/app-portage/gemato/Manifest
@@ -1,8 +1,4 @@
-DIST gemato-8.tar.gz 57379 BLAKE2B e83cba508ed781667abab3e18059f838c99e92217a7f1dde90b2cc4200a0ab83baabf789bc6bc978b4f080bf285ab9b7ea62e86a98c272abf3889093d780eac3 SHA512 9e5e7c304166d311b7101330b36c3d781e5d3901feb5247235ed04a8aa316416f6045658fab176e34ca6c2d6653eda66ef19789b39a60cb316add9985c9a8040
-DIST gemato-9.1.tar.gz 59352 BLAKE2B e2e2d02de29856a91c2432496101589fbe1a87456d46071c03ae5b999a46356f144c6d5831d42896ee15d1bdede32cdcc6b02c412b427f7878d8fc9ecaef84c1 SHA512 cf7bec8ccf7eab75bdbaf0e9a701c7b0fa1a8f2f329f4ba7ef3399898997a6bb3f53c6dfe49cd054ce12baf1f4490e2b7610f5964ff7e6053ae7dd53dd34900e
 DIST gemato-9.2.tar.gz 60217 BLAKE2B f46cb35b5ae71fe1743c7a43bfeff42a9d77517ef48dca1dd05c5c8cd569d5dcd9bdb0c0957d81d2db6b8d873099463fd6132121be04e0fd6f55bb130df48c2e SHA512 bb40abb910b528e455bdc01ed528071ca6f1390a8a5ae670692c93e6c3fc8fd7fc7e95d7321c81ad5144fc8a042676a8dac634c7b3f68e7f725edc98edd30c94
-EBUILD gemato-8.ebuild 1054 BLAKE2B 76b1ace451f773cc6b60110fbc75df45bff19604ddf2383e4e59df5aeb4e730d61b66acab39d8060f0879be636dbe76b17bf7d29b63e6a03d16bf85015b03b1f SHA512 84d6dc68246c608eaa1d72ca902e688c24e5f16667397a784f298b9bc6718723f2b5bdec85aa1b3a99d063753de5a1533da0177459a9556bb27c15c5f5c68e90
-EBUILD gemato-9.1.ebuild 1047 BLAKE2B 031ca60fc75f580c5cf6051e2838dd7cf98d7eadfc2d2b163b04463edf018c9eac520544e815de5d7e3f6062bb75641397c94e085d16ee0e51e3213ef6c03275 SHA512 ed9196e369cb4f964c70a9fb3f8e2226058284d92e2cd1a295a01069cee8f57c44f66891db4f87dadb314b5462b8deff576d00a6dd0abb1f31f3a68cf6063da9
-EBUILD gemato-9.2.ebuild 1400 BLAKE2B 5ccb98c73cbc6e50764168a71a07249530b276591c6311c0b1ca9792da72289049f3790d9596d23087df19727a1b69eb5280a7a10873d6c906e37625fa8070ec SHA512 2947c22dbc191569bfaf304d0a1478dbe9d58325114f0aa24f9a2a3f6cad596a84fe2cb26ea3b175aa917434f4073cc5c498e58ba196995d97b4a4f76f5edb85
+EBUILD gemato-9.2.ebuild 1407 BLAKE2B 2f0c1a2b329500f35f03a3d2f2ad7e445924c23b315f4d8903a028837f9292cea21640a96f7e1593f3e592814c432d25786a7571b7d15c25aa7805d48c1373ee SHA512 96c4ab75637837e180472cfb10e21b625a9659197ac04e9634262df2bae8c71cf603a6e2c6f32d387afa28f3e6c0fc350ee9d96aae6135c75dd80b23f16e54fd
 EBUILD gemato-9999.ebuild 1373 BLAKE2B 7e8bc4fe97e744414e52bf382707c997ffc06b6f996e622c90c6d4dc1816889b947ea775efa64f2589c4801a039c18c7fa44796b75fa063c2a250923a575817c SHA512 b7f6a5f21aa92c933dc6ab0b66b35a76949ea8daca49a2e37a87505483b820c3e54fe03db9ccbc3d32e0b722a893681193fb5f5738e0d4e6b3f2d1be700e0f62
 MISC metadata.xml 785 BLAKE2B ad8381a17cee4fee5099ca5e4312b703eae026436ec8082f272954ec0850547844923e108c02d9041beb6bfcd33bf18c846344d797f56a61170fd6b4445557c2 SHA512 86ffb0a9b39e261b35430d1055deebe8c66eb2c285211274feb793bf003296389a3bbb38ccd33d350a8bf56fcd241edcf9576305fc3aaf68cab68401ad983b83
diff --git a/app-portage/gemato/gemato-8.ebuild b/app-portage/gemato/gemato-8.ebuild
deleted file mode 100644
index e690d59edaf8..000000000000
--- a/app-portage/gemato/gemato-8.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
-
-# backports.lzma is broken with pypy
-# pyblake2 & pysha3 are broken with pypy3
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-inherit distutils-r1
-
-DESCRIPTION="Stand-alone Manifest generation & verification tool"
-HOMEPAGE="https://github.com/mgorny/gemato"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="+blake2 bzip2 +gpg lzma sha3"
-
-RDEPEND="
-	blake2? ( $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' python{2_7,3_4,3_5} pypy{,3}) )
-	bzip2? ( $(python_gen_cond_dep 'dev-python/bz2file[${PYTHON_USEDEP}]' python2_7 pypy) )
-	gpg? ( app-crypt/gnupg )
-	lzma? ( $(python_gen_cond_dep 'dev-python/backports-lzma[${PYTHON_USEDEP}]' python2_7 pypy) )
-	sha3? ( $(python_gen_cond_dep 'dev-python/pysha3[${PYTHON_USEDEP}]' python{2_7,3_4,3_5} pypy{,3}) )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
diff --git a/app-portage/gemato/gemato-9.1.ebuild b/app-portage/gemato/gemato-9.1.ebuild
deleted file mode 100644
index b6774a8be338..000000000000
--- a/app-portage/gemato/gemato-9.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=6
-
-# backports.lzma is broken with pypy
-# pyblake2 & pysha3 are broken with pypy3
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-inherit distutils-r1
-
-DESCRIPTION="Stand-alone Manifest generation & verification tool"
-HOMEPAGE="https://github.com/mgorny/gemato"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="+blake2 bzip2 +gpg lzma sha3"
-
-RDEPEND="
-	blake2? ( $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' python{2_7,3_4,3_5} pypy{,3}) )
-	bzip2? ( $(python_gen_cond_dep 'dev-python/bz2file[${PYTHON_USEDEP}]' python2_7 pypy) )
-	gpg? ( app-crypt/gnupg )
-	lzma? ( $(python_gen_cond_dep 'dev-python/backports-lzma[${PYTHON_USEDEP}]' python2_7 pypy) )
-	sha3? ( $(python_gen_cond_dep 'dev-python/pysha3[${PYTHON_USEDEP}]' python{2_7,3_4,3_5} pypy{,3}) )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
diff --git a/app-portage/gemato/gemato-9.2.ebuild b/app-portage/gemato/gemato-9.2.ebuild
index 08ab080454a6..a3d0234e963a 100644
--- a/app-portage/gemato/gemato-9.2.ebuild
+++ b/app-portage/gemato/gemato-9.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+blake2 bzip2 +gpg lzma +portage-postsync sha3 test"
 
 MODULE_RDEPEND="
diff --git a/app-portage/gpyutils/Manifest b/app-portage/gpyutils/Manifest
index 18df9798c7a3..a2c9b41a8558 100644
--- a/app-portage/gpyutils/Manifest
+++ b/app-portage/gpyutils/Manifest
@@ -1,7 +1,5 @@
 AUX implementations.txt 781 BLAKE2B 8bd653731c5a92073a98fe69dc98fefbb1c3c7bfe0bfbf4417b4bcfaa8f93d23b95bb11dcc19b75ff4b3f1cbb597fa65d323df2836e9a610519fdeb528356673 SHA512 f442fbc1a4da5e3ecdb51b3b3a72f5f4f2f8b3777fc514c923d8ad885a89dd725486eae803fe481a7f8d5a32691ba2fba974f887548094599a27cb3b39a0ab89
-DIST gpyutils-0.1.4.tar.bz2 13458 BLAKE2B 1fa3741881e0d2d800b04d287cc470597e61cfb4afa45fd710ff10efc3e6bd778ab56f4bcd9ddf532dedc4024d738442665254edd16e5189a19cecd5079cb967 SHA512 fce002bd77868106990ceda1f7ef5e734ec279b85352d9481c0044624e0c837c558654f1d59617301dc7d8125fe7fb2b9778547f1dad19448c0aae165018babc
 DIST gpyutils-0.2.1.tar.bz2 15044 BLAKE2B 44a67a70c42b07523232f3e8d6db0b9155709100c4fede41e1f96c2d3fa396a1d4a67529c7e70fa75c2729c1a8f769cff35936606784a9ddc2a59cb3d163780a SHA512 58b796647bf614e4ad492fe97539bd11f0d5beeecb7fd903a81917bfaac54ced4fb14813f499010093884891eda9c43226bcf2cae7744e7290bf9b16928b6172
-EBUILD gpyutils-0.1.4.ebuild 513 BLAKE2B c23a0417b8f454cfa22290a7d26cb44b6e60f6a75d5c5a6a974e4997e30f4cc468ce6d5b35a486ab825e6796524f058617fdeffa32a1b009f527ef02cacff2e1 SHA512 971fd49a6b1e67e0693128e30b9265b2d1f56fb4970f5d1f9a555a092620fd272d7de19999bd4c1c2d398f4a09ac96c758292edb37808e45cb30acade59c7e65
 EBUILD gpyutils-0.2.1.ebuild 519 BLAKE2B 1d1f4767c7f3ab0d2e5791ac1e3fa9bba0b6e93f091273a4bfb20260beef1febb5877e4e6b6c21bdd069e421719fe6fa997b93051bdf0fada7d9c796220889b5 SHA512 e19aa3fad32d70354d00b28ef019243cfaeb64cddb6ce7ede3397588b870b9f16bfe5901514a0df3982432432b254a94c5901e79bb73402ebed7bb3d05ffd42e
 EBUILD gpyutils-9999.ebuild 498 BLAKE2B 8dbdf34500e17239e1045d9543a57d6a39471b94352d935c59130142306b32de4078bd3db80bedde5bd9f22209257b6075184740696ab1a71a07656789fca003 SHA512 d7a4e377084238a4eae3698258c33156348986a12f10cdf9a528c4d9697a30502cf628c640326f514ec034806eafb8f18cfd071f12b16ec1c449dc70a9fc6c71
 MISC metadata.xml 527 BLAKE2B 14b3e5012c6b0543eb70b56132d289837eb9b5e355ea38f21c0fa5de841eb3dd9cc9d89f60136b523121648d8a94d62563b1f065fbe9f120f2e03cc7e6d84d0c SHA512 52f6670e1fd8b5b58a566226a20ea405aad364eb085a7f2d62485086e5d9ce2ceebfe9ab3c6321892fa775187cecfe8148cc25ed5256ebbe1ac3fba8d7d39ddc
diff --git a/app-portage/gpyutils/gpyutils-0.1.4.ebuild b/app-portage/gpyutils/gpyutils-0.1.4.ebuild
deleted file mode 100644
index cd588c59526b..000000000000
--- a/app-portage/gpyutils/gpyutils-0.1.4.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
-PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Utitilies for maintaining Python packages"
-HOMEPAGE="https://github.com/mgorny/gpyutils/"
-SRC_URI="https://github.com/mgorny/gpyutils/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=app-portage/gentoopm-0.2.9[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
diff --git a/app-portage/unsandbox/Manifest b/app-portage/unsandbox/Manifest
index 02f479a0bf20..d4bc05baac34 100644
--- a/app-portage/unsandbox/Manifest
+++ b/app-portage/unsandbox/Manifest
@@ -1,5 +1,3 @@
 DIST unsandbox-2.tar.gz 891 BLAKE2B 7daabf3f5ae0bdd1fcbc9c61a098c6752a84f7e1ea9053ff4317760a6140d84bae541b802f738d1c11316c336ed67ebdd1d802ca4af467a4558fe14a940967e8 SHA512 d669a7119e397434219c7a86a5d10caeb0099fed841a3264ba09ed45c206621baf3f98104d3b6ff8239a79306177d6ebe0305ab67ab472e739f722e1823ab2c6
-DIST unsandbox.c 678 BLAKE2B 64afaa54751a84b042454eb62c5baed02b1c163c54c5646147e18667766f84bfa0454a18f177ae45a5428a2b559ca9b9475ff93b2e9728376f05537b53d2864a SHA512 380bb1c59442c1637de0b95450a58be7249b7943e061b3ec18464f5fa04629e27453aaefa85d48f84c4f3a0affaa9302a81d36b33a860d027280e4e9a396fd04
-EBUILD unsandbox-1.ebuild 535 BLAKE2B 275a972b33607c9bf67b88cadbc86d56650e699ad32b5c253c46c5091494f93c5e08647c2ff22c8f6981eeec87e8ccad9f95aeabd88d83363bb2f8ae265a2294 SHA512 aba1fea454faab73c88af47ceea41e736f0810f27f21ca0f886963ee864c8185ae112d1c8fb2fef28a5332070b7202f6fc96614bc0a88dc825fc4650a1a441ed
 EBUILD unsandbox-2.ebuild 369 BLAKE2B 2b7df2bde09003d681c93eb2137448a694f00be0f00b2f60aa176247dabfaf57cd6d40b0ec47600c0b61c68f8c53610bec74e592f1689b9a9893a72425e5ad58 SHA512 ab24e87b520139ea49e611781a1f40a2160bf47da6060e350b4d0e05e42594b8f66569d41a02ca7ddc2d3069306b6b07d398ecea605f3128002b2b53a4302993
 MISC metadata.xml 328 BLAKE2B a5cffa25c3b0f9094e74a51c45f97b624c95b0d0461f1da1b8a237815b774e39359436a82959ec9c9669bde7f0b6c8d17835233c01eb2354f58607bb4259bead SHA512 800ada1895db6c4dd907d24e7400046c8c5d9b919310b3bd7f394ba368b1261fafd1140d175e20830e406282c4088c3304f70a506461fc1ea0c86a8a3e783961
diff --git a/app-portage/unsandbox/unsandbox-1.ebuild b/app-portage/unsandbox/unsandbox-1.ebuild
deleted file mode 100644
index 34a3551ad98a..000000000000
--- a/app-portage/unsandbox/unsandbox-1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="The Sandbox escapist tool"
-HOMEPAGE="https://dev.gentoo.org/~mgorny/dist/unsandbox.c"
-SRC_URI="https://dev.gentoo.org/~mgorny/dist/unsandbox.c"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S=${WORKDIR}
-
-src_unpack() {
-	cp "${DISTDIR}"/unsandbox.c "${WORKDIR}"/ || die
-}
-
-src_compile() {
-	tc-export CC
-	emake LDLIBS=-ldl unsandbox
-}
-
-src_install() {
-	dobin unsandbox
-}
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index d439ede2bff0..c5430e024e2b 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/bash-completion/Manifest b/app-shells/bash-completion/Manifest
index 848273f79fe5..8bfa47c91499 100644
--- a/app-shells/bash-completion/Manifest
+++ b/app-shells/bash-completion/Manifest
@@ -1,11 +1,8 @@
 AUX bash-completion-2.1-escape-characters-r1.patch 1084 BLAKE2B 62a9ccb7b1cc4162db2f8e35fb20d3a24f9e4c067e5297816d91a85ffcdd3ff43695f3c361959cba59b887afd0d12e75fa317899054d3a615ee3da615a4409ec SHA512 b7cb548024fbc68e87d781208a378299c399d2661121290c500d62cd66855acc02848710b44c363917c3c4923e063212a2b56c9b0c08deb71aba308d75939cab
 DIST bash-completion-2.4.tar.xz 276148 BLAKE2B 1ca38db1d1ad9f0bf7d1aa4e49cba1c82a6a575b05118099b609da12bf2e369637be907cba1d46e1e33fface482ebd7c63d70d56c948e45ef71725780ffb2171 SHA512 b852e0a38417dfc3754a91dae2d107f99a3c2970d835a4bbaa80f2a4db8d670bc3820ddc6ada26f68070f22fb4c1db7abe50ad489b1c0f8497b1e6e91be27627
-DIST bash-completion-2.5.tar.xz 276732 BLAKE2B bf1d51ee2ede39d5ff0a2ebcb3b4d763f36ecf8f8ce6923e9b907922ef685569c9cd65713775cdd56bee4584e87f958f3160efc0b53c9460de065de9e92efbdb SHA512 44ca2cbf38190c2bfa1e98021c1de36dbef0e55f9fe7840e83bd7f91b4c9afc92afa9bb03d53dbc6d9f9b468ac63ff1021a60e456fc239010010d75687eff3da
 DIST bash-completion-2.7.tar.xz 280048 BLAKE2B 88b09f451fd4e14daf8e139951a4b65aaa9d9b1d86dceade388a726ac7f3caff2546597695c3f0cbd5dd64e20472d0cf3e98e0f367898b81d696d4ccb8f2fb73 SHA512 514709ad2e5f6bd4e20027c7049a1144c1854a37b653d5c11fad1cdf7a46d0e1afca725d6ce75d49691149e0de57be85747f704ac1c429ef4cea114bfbff8fcd
 DIST bashcomp-2.0.2.tar.gz 3625 BLAKE2B ebd835e23634e8a7491467ad66c53941763cea43bad75fe24982d3885be2d2ba132e5273a655fec34705224315d7a3f0248c030fb7685fc613ac4f489cde5bf5 SHA512 46bc1bcc32263135f44be68569459a409250dd2c81c18190735f11e13a26508e9d3cb91d24a8fe7b21bdea678347873b7ac1b67d5e8c78c8444011f85dfdcdce
 EBUILD bash-completion-2.4-r1.ebuild 3173 BLAKE2B d12832478452f9bd1a003f649c707906141bfec5a0c24b9c50c924b5c79fb7fa3eb369d1962cb693fe3e703bf6779e4fd67ddd9180aa14a2806e5577dac5c4fa SHA512 5421a782dff1e908fdaafa97b58bcacdaa250ce6d0a701765506bd3384a5f32983bc86e4733336913462102c842b8168fb9e30450180820ce0c6239582467cce
-EBUILD bash-completion-2.5.ebuild 3183 BLAKE2B 916117c030fac2c36bc70a4bf580aa3e91e0045e50ee586114ce426f61e15dc25e2cd23b8b707e1296a403661b77ade7da3c09ca34e07db4cf015e780ba17ccb SHA512 a3a790e199dfba8150c2f5abdc120e5c3b8b41814f996c034e432b4633b211f79eaf056a3622823b36ea0a259cb9ee3ce09210e3e631250fdd6cc315a2642e0a
 EBUILD bash-completion-2.7-r1.ebuild 3880 BLAKE2B 5648d042f8a0b9864b59848688b8618f5305a20b3202a72516ea382038c89ff8f223a21f6f4b1d147272a55023ea4e6484e34178af7a743153d046542075a1ec SHA512 ad265aeaddcdacd962972df67c996735a08ab82de41a24e23189f4f1b81fe753d2b8f588e4b36699b98a6b0072a5f23b2267c3cc369857747b4c4d97e041cd16
-EBUILD bash-completion-2.7.ebuild 3830 BLAKE2B 6501b1d918c7931c51a75e70e6b00fac265c2e449837336ef44c50cb554620f6650e0c3d41dc1124922a3ca23d5f18d08117103442ec6fd5435c5a04afccbd4c SHA512 7d49ec4fe462c1cf62ad61e76d4427d231ad8aeab4dde7fa0a921b13503a4ae4f382d1de820f208c13ec656af2d26aad8e4b107a906e941863e5ece381b5e645
 EBUILD bash-completion-9999.ebuild 3859 BLAKE2B 0d390685f8f5aeecb1e5243262a2977b0d1d4d9659bc5804e2aa148526c3a6d7dc0d3a1561fa066fe6053555c64ab9453af6cf4cbc1adf1cf95a7bd3c4b5177e SHA512 01d182b8eba17ea9d661b8c562e5b066c82a3913e593ff82da817f0c882bb13e4ebc825cafd9ff9bf594fd545da90dad2f5db498db5e12a089d58f5e66b87633
 MISC metadata.xml 1285 BLAKE2B 67ec44c85388b85802294201046537898af798f98bb3ffac39fcf9720a5aacad33aaa5bbbcd56e6f9ea1826c97f70c990810b4e04fbaeedb95f296f8c0838a1d SHA512 1bdcc390d3e58fbd70506738f281a165a9bad69d14be9774b7ae75deac54c5a1bdf6170a16d8ac817ecd15dd4ac820b3e861e208b1d80a9b5739b0d41a9e1e03
diff --git a/app-shells/bash-completion/bash-completion-2.5.ebuild b/app-shells/bash-completion/bash-completion-2.5.ebuild
deleted file mode 100644
index 0585f5e0e970..000000000000
--- a/app-shells/bash-completion/bash-completion-2.5.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-BASHCOMP_P=bashcomp-2.0.2
-inherit versionator
-
-DESCRIPTION="Programmable Completion for bash"
-HOMEPAGE="https://github.com/scop/bash-completion"
-SRC_URI="https://github.com/scop/bash-completion/releases/download/${PV}/${P}.tar.xz
-	https://bitbucket.org/mgorny/bashcomp2/downloads/${BASHCOMP_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
-IUSE=""
-
-RDEPEND=">=app-shells/bash-4.3_p30-r1
-	sys-apps/miscfiles
-	!app-eselect/eselect-bashcomp"
-DEPEND="app-arch/xz-utils"
-PDEPEND=">=app-shells/gentoo-bashcomp-20140911"
-
-# Remove unwanted completions.
-STRIP_COMPLETIONS=(
-	# Slackware package stuff, quite generic names cause collisions
-	# (e.g. with sys-apps/pacman)
-	explodepkg installpkg makepkg pkgtool removepkg upgradepkg
-
-	# Debian/Red Hat network stuff
-	ifdown ifup ifstatus
-
-	# Installed in app-editors/vim-core
-	xxd
-
-	# Now-dead symlinks to deprecated completions
-	hd ncal
-
-	# Installed by sys-apps/util-linux-2.28
-	mount umount mount.linux umount.linux
-)
-
-src_prepare() {
-	eapply "${WORKDIR}/${BASHCOMP_P}/${PN}"-2.1_p*.patch
-	# Bug 543100, update bug 601194
-	eapply "${FILESDIR}/${PN}-2.1-escape-characters-r1.patch"
-	eapply_user
-}
-
-src_test() { :; } # Skip testsuite because of interactive shell wrt #477066
-
-src_install() {
-	# work-around race conditions, bug #526996
-	mkdir -p "${ED}"/usr/share/bash-completion/{completions,helpers} || die
-
-	emake DESTDIR="${D}" profiledir="${EPREFIX}"/etc/bash/bashrc.d install
-
-	local file
-	for file in "${STRIP_COMPLETIONS[@]}"; do
-		rm "${ED}"/usr/share/bash-completion/completions/${file} || die
-	done
-	# remove deprecated completions (moved to other packages)
-	rm "${ED}"/usr/share/bash-completion/completions/_* || die
-
-	dodoc AUTHORS CHANGES CONTRIBUTING.md README.md
-
-	# install the eselect module
-	insinto /usr/share/eselect/modules
-	doins "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect"
-	doman "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect.5"
-}
-
-pkg_postinst() {
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least 2.1-r90 ${v}; then
-			ewarn "For bash-completion autoloader to work, all completions need to"
-			ewarn "be installed in /usr/share/bash-completion/completions. You may"
-			ewarn "need to rebuild packages that installed completions in the old"
-			ewarn "location. You can do this using:"
-			ewarn
-			ewarn "$ find ${EPREFIX}/usr/share/bash-completion -maxdepth 1 -type f '!' -name 'bash_completion' -exec emerge -1v {} +"
-			ewarn
-			ewarn "After the rebuild, you should remove the old setup symlinks:"
-			ewarn
-			ewarn "$ find ${EPREFIX}/etc/bash_completion.d -type l -delete"
-		fi
-	done
-
-	if has_version 'app-shells/zsh'; then
-		elog
-		elog "If you are interested in using the provided bash completion functions with"
-		elog "zsh, valuable tips on the effective use of bashcompinit are available:"
-		elog "  http://www.zsh.org/mla/workers/2003/msg00046.html"
-		elog
-	fi
-}
diff --git a/app-shells/bash-completion/bash-completion-2.7.ebuild b/app-shells/bash-completion/bash-completion-2.7.ebuild
deleted file mode 100644
index 99d53dd87c6a..000000000000
--- a/app-shells/bash-completion/bash-completion-2.7.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-BASHCOMP_P=bashcomp-2.0.2
-inherit versionator
-
-DESCRIPTION="Programmable Completion for bash"
-HOMEPAGE="https://github.com/scop/bash-completion"
-SRC_URI="https://github.com/scop/bash-completion/releases/download/${PV}/${P}.tar.xz
-	https://bitbucket.org/mgorny/bashcomp2/downloads/${BASHCOMP_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
-IUSE="test"
-# Multiple test failures, need to investigate the exact problem
-RESTRICT="test"
-
-RDEPEND=">=app-shells/bash-4.3_p30-r1
-	sys-apps/miscfiles
-	!app-eselect/eselect-bashcomp"
-DEPEND="app-arch/xz-utils
-	test? (
-		${RDEPEND}
-		app-misc/dtach
-		dev-util/dejagnu
-		dev-tcltk/tcllib
-	)"
-PDEPEND=">=app-shells/gentoo-bashcomp-20140911"
-
-# Remove unwanted completions.
-STRIP_COMPLETIONS=(
-	# Slackware package stuff, quite generic names cause collisions
-	# (e.g. with sys-apps/pacman)
-	explodepkg installpkg makepkg pkgtool removepkg upgradepkg
-
-	# Debian/Red Hat network stuff
-	ifdown ifup ifstatus
-
-	# Installed in app-editors/vim-core
-	xxd
-
-	# Now-dead symlinks to deprecated completions
-	hd ncal
-
-	# Installed by sys-apps/util-linux-2.28
-	mount umount mount.linux umount.linux
-)
-
-src_prepare() {
-	eapply "${WORKDIR}/${BASHCOMP_P}/${PN}"-2.1_p*.patch
-	# Bug 543100, update bug 601194
-	eapply "${FILESDIR}/${PN}-2.1-escape-characters-r1.patch"
-	eapply_user
-}
-
-src_test() {
-	# Tests need an interactive shell, #477066
-	# idea stolen from:
-	# http://pkgs.fedoraproject.org/cgit/rpms/bash-completion.git/tree/bash-completion.spec
-
-	# real-time output of the log ;-)
-	touch "${T}/dtach-test.log" || die
-	tail -f "${T}/dtach-test.log" &
-	local tail_pid=${!}
-
-	nonfatal dtach -N "${T}/dtach.sock" \
-		bash -c 'emake check &> "${T}"/dtach-test.log; echo ${?} > "${T}"/dtach-test.out'
-
-	kill "${tail_pid}"
-	[[ -f ${T}/dtach-test.out ]] || die "Unable to run tests"
-	[[ $(<"${T}"/dtach-test.out) == 0 ]] || die "Tests failed"
-}
-
-src_install() {
-	# work-around race conditions, bug #526996
-	mkdir -p "${ED}"/usr/share/bash-completion/{completions,helpers} || die
-
-	emake DESTDIR="${D}" profiledir="${EPREFIX}"/etc/bash/bashrc.d install
-
-	local file
-	for file in "${STRIP_COMPLETIONS[@]}"; do
-		rm "${ED}"/usr/share/bash-completion/completions/${file} || die
-	done
-	# remove deprecated completions (moved to other packages)
-	rm "${ED}"/usr/share/bash-completion/completions/_* || die
-
-	dodoc AUTHORS CHANGES CONTRIBUTING.md README.md
-
-	# install the eselect module
-	insinto /usr/share/eselect/modules
-	doins "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect"
-	doman "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect.5"
-}
-
-pkg_postinst() {
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least 2.1-r90 ${v}; then
-			ewarn "For bash-completion autoloader to work, all completions need to"
-			ewarn "be installed in /usr/share/bash-completion/completions. You may"
-			ewarn "need to rebuild packages that installed completions in the old"
-			ewarn "location. You can do this using:"
-			ewarn
-			ewarn "$ find ${EPREFIX}/usr/share/bash-completion -maxdepth 1 -type f '!' -name 'bash_completion' -exec emerge -1v {} +"
-			ewarn
-			ewarn "After the rebuild, you should remove the old setup symlinks:"
-			ewarn
-			ewarn "$ find ${EPREFIX}/etc/bash_completion.d -type l -delete"
-		fi
-	done
-
-	if has_version 'app-shells/zsh'; then
-		elog
-		elog "If you are interested in using the provided bash completion functions with"
-		elog "zsh, valuable tips on the effective use of bashcompinit are available:"
-		elog "  http://www.zsh.org/mla/workers/2003/msg00046.html"
-		elog
-	fi
-}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 6c8af4fe4ca6..dc8223583dbc 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/fbreader/Manifest b/app-text/fbreader/Manifest
index af321e2ffc9c..867091d2f2e6 100644
--- a/app-text/fbreader/Manifest
+++ b/app-text/fbreader/Manifest
@@ -5,7 +5,6 @@ AUX fbreader-0.99.4-qreal-cast.patch 950 BLAKE2B ae354d03bf2e6efcdb9f16a0bf2272c
 AUX fbreader-0.99.4-qt5.patch 18697 BLAKE2B 241f103b97b87f084c4f35ffb137cc9b6ea3368ddf6f0b4df2037856c5a3401d3687ed809abb0efc2e224bdb3a8d382930681f7896299421ebb7bd0300e0cbca SHA512 9eb8319308a36cada28d6036ee0537433cea03cb59e648c6ad1dd8f4d10a1b05fb879ebd38b1f9b1e149e6a6544aaafb93c52d6a97f4c9fd8905e89b8cf7ae86
 AUX fbreader-0.99.4.patch 472 BLAKE2B a34f27d9f53f3faed5889dcb7a841a1c045e7bd4080f2ae6ae6a949d76e1bc99e31953cd552a1aa8afbe26d64262aead7463432f407532050db1eda5da1517a9 SHA512 486dc74e3cfc6f94f1bf95269e35e866465095efee0cd31b586592fbd780613d4d5d243b809e494da14a69da8e0c5e47e6dd2ca35619616c4497eb0a053ba09d
 DIST fbreader-sources-0.99.4.tgz 2345664 BLAKE2B 29d921a953df98def51740d9b7fed5a7164f5df6410c70daf03f30ba8f77e9aa898d6f50038945155dc46243165860ffaf13abc81f662abccdeb6dc91652b3d5 SHA512 d4b11d7ab03df002ad4212db805b10b80a24ea4384e92122b12c25a3f817a0eb343509ae30e31d68417fd4ce27f77e043235436f0081ff2c785a2830d6211dc7
-EBUILD fbreader-0.99.4-r2.ebuild 2144 BLAKE2B 0c4082f8330929dc55d0969f7a862eabb58e8c1f66eb78adfb2efd8e0c101a5dd0c8fdf0d3a77e6fb3bcca4882241780c8ea4ab5b759e075bcf56175573e0c1f SHA512 4219403d355e7b38a04944cb589090a412fcbf1fdf2c21a5f04984f41c6175096bcc9436dd0179e19687f08d5b6326290baadb8b4e641254f627c679b50d09ee
-EBUILD fbreader-0.99.4-r3.ebuild 2280 BLAKE2B 83d3253c6058a5c4613787ec0103cb814e0992c483b4d15fbee6f9ff3658aea8a223b7c67cfdf96532447878a7dedaaff0952463d548f6e7765b97c06d04959e SHA512 a93f212b39da83696e4da0ba372b63459af6f70f99c2750f8ed628447d8396ca937d143489f5c1b8251e62874626b7fcf0258331e5bca85e68117e62adad22b0
+EBUILD fbreader-0.99.4-r3.ebuild 2279 BLAKE2B 1e22f5cbdc916be2543a79ccc95c753726e946c56c85e9dcd53c89b643fea39edefda496de67bc603d8c885858802a89e7d09c5d1a4d635fd5a32ff0333e0e24 SHA512 f93ebe20622e94f54b68ecd62d76520d3455595e3433b875d76654479939f34ba21ed80b580c1b46824473e9f927b4349e8a5df37e4b2f350daf824cb07eb27e
 EBUILD fbreader-0.99.4-r4.ebuild 2111 BLAKE2B 955873c4d80c35e8579e97140bc4eab256cff750ef844a68de99418666bb93f61824486c48983ed366993d8496e1d7396d4e8e2c5ebeb11f1513a3ddefb5e8bc SHA512 28195b8b7d246fd7057ba9c30835e263b37932206d07a26fa3f01d240b44c19a58196e575ffaf8fb4e4cdf76d50682ecf97a4b5bca2dc4c18582fdfdea2eb1a2
 MISC metadata.xml 320 BLAKE2B b537c430018e9035438033df51325115040dc2468f03721c678a60c40654ed99be77a154ba34bb6cc1b7afd54191912906a007a50924cefddb2b6bba908eceb8 SHA512 d215791adfc4cb16e4c25d0dfea7dcf6439fa12916d0c0e51be65d62dd8d48bd63c7e983080027101c6cac1220f4e622c580f7ced4dc895e8b4898f14e921539
diff --git a/app-text/fbreader/fbreader-0.99.4-r2.ebuild b/app-text/fbreader/fbreader-0.99.4-r2.ebuild
deleted file mode 100644
index 347957b53029..000000000000
--- a/app-text/fbreader/fbreader-0.99.4-r2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib
-
-DESCRIPTION="E-Book Reader. Supports many e-book formats"
-HOMEPAGE="http://www.fbreader.org/"
-SRC_URI="http://www.fbreader.org/files/desktop/${PN}-sources-${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86"
-IUSE="debug"
-
-RDEPEND="
-	app-arch/bzip2
-	dev-libs/expat
-	dev-libs/liblinebreak
-	dev-libs/fribidi
-	dev-db/sqlite
-	net-misc/curl
-	sys-libs/zlib
-	dev-qt/qtcore:4[ssl]
-	dev-qt/qtgui:4
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Still use linebreak instead of new unibreak
-	sed -e "s:-lunibreak:-llinebreak:" \
-		-i makefiles/config.mk zlibrary/text/Makefile || die "fixing libunibreak failed"
-
-	# Let portage decide about the compiler
-	sed -e "/^CC = /d" \
-		-i makefiles/arch/desktop.mk || die "removing CC line failed"
-
-	# let portage strip the binary
-	sed -e '/@strip/d' \
-		-i fbreader/desktop/Makefile || die
-
-	# Respect *FLAGS
-	sed -e "s/^CFLAGS = -pipe/CFLAGS +=/" \
-		-i makefiles/arch/desktop.mk || die "CFLAGS sed failed"
-	sed -e "/^	CFLAGS +=/ d" \
-		-i makefiles/config.mk || die "CFLAGS sed failed"
-	sed -e "/^	LDFLAGS += -s$/ d" \
-		-i makefiles/config.mk || die "sed failed"
-	sed -e "/^LDFLAGS =$/ d" \
-		-i makefiles/arch/desktop.mk || die "sed failed"
-
-	echo "TARGET_ARCH = desktop" > makefiles/target.mk
-	echo "LIBDIR = /usr/$(get_libdir)" >> makefiles/target.mk
-
-	echo "UI_TYPE = qt4" >> makefiles/target.mk
-	sed -e 's:MOC = moc-qt4:MOC = /usr/bin/moc:' \
-		-i makefiles/arch/desktop.mk || die "updating desktop.mk failed"
-
-	if use debug; then
-		echo "TARGET_STATUS = debug" >> makefiles/target.mk
-	else
-		echo "TARGET_STATUS = release" >> makefiles/target.mk
-	fi
-
-	# bug #452636
-	epatch "${FILESDIR}"/${P}.patch
-	# bug #515698
-	epatch "${FILESDIR}"/${P}-qreal-cast.patch
-	# bug #516794
-	epatch "${FILESDIR}"/${P}-mimetypes.patch
-	# bug #437262
-	epatch "${FILESDIR}"/${P}-ld-bfd.patch
-	# bug #592588
-	epatch "${FILESDIR}"/${P}-gcc6.patch
-}
-
-src_compile() {
-	# bug #484516
-	emake -j1
-}
-
-src_install() {
-	default
-	dosym FBReader /usr/bin/fbreader
-}
diff --git a/app-text/fbreader/fbreader-0.99.4-r3.ebuild b/app-text/fbreader/fbreader-0.99.4-r3.ebuild
index 82e032af33a2..ab2f47419e79 100644
--- a/app-text/fbreader/fbreader-0.99.4-r3.ebuild
+++ b/app-text/fbreader/fbreader-0.99.4-r3.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="http://www.fbreader.org/files/desktop/${PN}-sources-${PV}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc x86"
+KEYWORDS="amd64 ~arm ~ppc x86"
 IUSE="debug"
 
 RDEPEND="
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index a7113a866fb4..9abc19038571 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/catch/Manifest b/dev-cpp/catch/Manifest
index 14f5717b693a..9072b4e0c37f 100644
--- a/dev-cpp/catch/Manifest
+++ b/dev-cpp/catch/Manifest
@@ -1,11 +1,7 @@
-DIST Catch-1.10.0.tar.gz 375205 BLAKE2B d0fc8f1a476c5b31f4b4bfd96af06b87a4be69f2387857a530096c16c282d59a82d5a59dbb681b506838f19baaef8266180f269082573d2ecc8b86eb774e1aba SHA512 07ea6c8fbef849000c69009478fc895fe520420d835a57881b832f8181ca28f04030027ab0f8614d590cff1c36d06598bd4f5723f44e252c3a2566da1be1341e
 DIST Catch-1.11.0.tar.gz 376132 BLAKE2B 23a1a6292dd91ec1c71923b4902b42b59ff6be5227b666f68ef0dc33756a58a63edd70a9b139dda0b1860c2b7a0cfec7ab9262e6447eff3184cfe28ea9b0aa77 SHA512 33085c2671f78c7562eace909564b2730eabcaf4490cd463402e66ab4ac2be1fe4fe360916c11aa589ba4a010622444126ee2ae747783b5869b5d7276361f132
-DIST Catch-2.0.0-develop.6.tar.gz 395416 BLAKE2B e936749c51d8fb679895686c32953001d6ea0acc37ec45230e62975db617288181a79fa66c5dc86c8c337ce29dd3b0931990324edcf5cf5a05bdd8e1f7adaf66 SHA512 079172f063da06453d434d1b74b9a4ffeb45b40c90657ea410d6695756f23c581b1d574a88ab6537082df4e6e703e7bc9ce9084653abdc2a7033018e65a1bf5e
 DIST Catch2-2.0.1.tar.gz 397154 BLAKE2B e41cb3afb706ebed5742b2639cbba9a3468b6325788c6928f8c4e307cd0b11a5fda6aa91def709536ec56412010c0865589999f1cb270630372ba3275bd36fbf SHA512 df6dc480aa208c6c39c8b36d06295883345f925b7ec579e9f0f7a68c816b90dbc3c2ece32926a6458646f7412027212f1b4c3cb28f217f411d3a56580f6edc32
-EBUILD catch-1.10.0.ebuild 729 BLAKE2B 9c52ce8e827467e77763408252f4c72448f8003dad47d3d035612dba04e58062e5dc429894927c9569adf090554de02df5ea1fa28ccc47fbfed3715e326bb00a SHA512 34875c7820d83b27feca0a96e6d3fa80c9f4a671dbd86a68c1ce3dba2c5ee60fe81aaccdaac63a43fbd1d41e7de0a8bc6fd81719378a1e90bdc35ae2891b8053
 EBUILD catch-1.11.0.ebuild 729 BLAKE2B 9c52ce8e827467e77763408252f4c72448f8003dad47d3d035612dba04e58062e5dc429894927c9569adf090554de02df5ea1fa28ccc47fbfed3715e326bb00a SHA512 34875c7820d83b27feca0a96e6d3fa80c9f4a671dbd86a68c1ce3dba2c5ee60fe81aaccdaac63a43fbd1d41e7de0a8bc6fd81719378a1e90bdc35ae2891b8053
 EBUILD catch-1.9999.ebuild 560 BLAKE2B ae6c6f9128c19be10f9a61f2ef4662b771c5046803a38a7f492339c16fd8cdc58bb0857b4664c3bfef9fb8e0ed2d6b18ad1387a5f6c80f3c88f9684f1a143981 SHA512 70cb380180bbd0aa6887cca66d1291be81f0f05a93841a8ef12c764ed20fc95ae8b3f97117c6a3721b432cca6bfb272d8b7bf6826c57af171f57909502fcae8a
-EBUILD catch-2.0.0_pre6.ebuild 785 BLAKE2B 9f0abd57b64ea24eacc021e4738dea8bb74eaf3311a1aadd3b864e747c387c484e7ff5fb7b56a808369b5ab85e3164dfb89d6ea8ecc00e4418478a9f692c299a SHA512 4deb9ac51dcdfd855218e5e295b130d50759dec771a8c52b6f115c6ffdf47cd6e66aac432c7b8c0c175c0664516ea688028928fbd013bd273b3ccb635f75ee8e
 EBUILD catch-2.0.1.ebuild 604 BLAKE2B 0b9fb3d54edea8ecc375b718639c644cb13fb07cd4fff4e4ac1f208d170d283b6aaca9adc33cebbd6d0ea9989a5f5a536c15fc3cc6d2db5b931e874864a53655 SHA512 287b2eb5e7b641bdb18611974f0e69e2b999cfa5e49b481ffd804fb53680750f8468c279a3137cb5cc2d810e8af1e999671e2f969387237586244c7e06cf2e63
 EBUILD catch-9999.ebuild 539 BLAKE2B 964abd6024bdb26457d8ac74ab5fe2f347cfcc758846ba05d14ea1cd8f3f1355f402b41d167ea49c336de30774698478384b304768f7e521cfcb57b4d9a006b1 SHA512 034d2afbc80114b6dfe83b3a75fc96ef3a0eaecee02fbbc1532391aae2b32b5fedca36916d01de98754b8de2849c9bf82940838bd55f026f166841d885784e80
 MISC metadata.xml 329 BLAKE2B b89c403ccccdad23fc4936aa8f2c23568ef37be7f6843d9195c6318349cb89b888b55055ca3127ed71e9b18c5ddce49f3048f87af2d287ce2e560973e1f5db61 SHA512 a6bc13d759be7cb9ff9c4b754927720ccb73268fec3d6065e3eb873bbf17f9500a50db27962b69890784ec5dfc7bcfcbadaa2c3c867c31e46dbc72a9f3a3f7b0
diff --git a/dev-cpp/catch/catch-1.10.0.ebuild b/dev-cpp/catch/catch-1.10.0.ebuild
deleted file mode 100644
index dd8e74f2615d..000000000000
--- a/dev-cpp/catch/catch-1.10.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Modern C++ header-only framework for unit-tests"
-HOMEPAGE="https://github.com/philsquared/Catch"
-SRC_URI="https://github.com/philsquared/Catch/archive/v${PV}.tar.gz -> ${P^}.tar.gz"
-
-LICENSE="Boost-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S=${WORKDIR}/${P^}
-
-# CMake is only used to build & run tests, so override phases
-src_configure() { :; }
-src_compile() { :; }
-
-src_test() {
-	cmake-utils_src_configure
-	cmake-utils_src_compile
-	cmake-utils_src_test
-}
-
-src_install() {
-	# same location as used in fedora
-	insinto /usr/include/catch
-	doins -r include/.
-	dodoc -r docs/.
-}
diff --git a/dev-cpp/catch/catch-2.0.0_pre6.ebuild b/dev-cpp/catch/catch-2.0.0_pre6.ebuild
deleted file mode 100644
index 827ac8458edb..000000000000
--- a/dev-cpp/catch/catch-2.0.0_pre6.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-MY_PV=${PV/_pre/-develop.}
-MY_P=${PN^}-${MY_PV}
-
-DESCRIPTION="Modern C++ header-only framework for unit-tests"
-HOMEPAGE="https://github.com/philsquared/Catch"
-SRC_URI="https://github.com/philsquared/Catch/archive/V${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="Boost-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-# CMake is only used to build & run tests, so override phases
-src_configure() { :; }
-src_compile() { :; }
-
-src_test() {
-	cmake-utils_src_configure
-	cmake-utils_src_compile
-	cmake-utils_src_test
-}
-
-src_install() {
-	# same location as used in fedora
-	insinto /usr/include/catch
-	doins -r include/.
-	dodoc -r docs/.
-}
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 9cb8d47b2c2f..ab26c40d48e0 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/pg_top/Manifest b/dev-db/pg_top/Manifest
index d2e1bfbf55fc..0791de4d01ea 100644
--- a/dev-db/pg_top/Manifest
+++ b/dev-db/pg_top/Manifest
@@ -3,5 +3,5 @@ AUX pg_top-3.7.0.patch 749 BLAKE2B 26d3d391e33a55b5af857ec3262b5f37e97a64262c050
 DIST pg_top-3.6.2.tar.bz2 220985 BLAKE2B 93676f5e35b0048e4bcaee6385e7f6d291ca8b3740f7226715acf254fcc24bd4cc921a078f679e22e599e22f79fc3e2de5b971c918b6bc7e6eff2fd6e7a72df2 SHA512 0e7f33cccd7a1debce4965a11ff3d5d6868aace53651ca1c486f061728034f0ab3901ddfbded022c9297d3393eaea32585ca779334954c87fd0c13c8fa523074
 DIST pg_top-3.7.0.tar.bz2 236076 BLAKE2B 87a29d0237aad48b683c17ba56fdbc4a90f854f4f497057ffc978be1797d978f02694781e83d296fca82e03c8bc737f7cfd74e996987eea0bd8d6a66ae433ce0 SHA512 509cd3ce65a9b549097eaab5ae27106fa469cdeb4f37950564654f3df01390e1a771c8fa4f5858c3e4c1e76470b6c0fd9b07e8268564f59285e30bf824d7c4ec
 EBUILD pg_top-3.6.2-r1.ebuild 623 BLAKE2B f90f6ce762622e85de0883da662d3eacb12ff5de78209f519af8535312d573778d00367ae6d5414113d17bd47206423973e84d235f1c91a63d0e262536959748 SHA512 3c6d2bdfc87807147247418b9a8b1178a5df5159cb4d8b0e0c12ba8ea7f8c14f491ebb207614eba4f6e9a8857dd5be509aa138a166dd44a1cf2fa9acb69ccd57
-EBUILD pg_top-3.7.0.ebuild 622 BLAKE2B 1965ba9d41b5706c49aa2324081744a1d7be369d4d5f7e8d1e1643fc6ecaedc7ba2e6020b0b961c739f635ab9abf1132f68e34dc7093b4d3bcb48ab476296cd5 SHA512 cccdd4044b79f6546321beb5bcf9da3ad59252befbd87d19e84045524404714345c04eceb9fdfe93154c3da4a900e529f90d68b670c6d51208c755f6a8f0ce56
+EBUILD pg_top-3.7.0.ebuild 621 BLAKE2B 3f411c73e55bdbe3db445d6cb23de24d478d7edeb18e8657da639f73400655eb1dfd95036f469b014ca8e467b02438640a0495ab60697478896735004f15d1f1 SHA512 b78758656bc4e2a1fa702bf2e03f108aa91c7815db10da22a16ca1e6f8939e443577b82d4458f741c991d8742c5d8ebfbf22ca977a638b9e224d1dc425b61564
 MISC metadata.xml 461 BLAKE2B e6f8d76b546b6b6b6cb13dc1158f71d20f3c68fc9ecc9b37ccf8d8581ec8699e5faab5bd4b10100a0897f668e04449e8f67622e3e3eeb3fdbc54023af536ec0a SHA512 ef6740e37b9d51eb8d303e393d826c91519e8fbd2fe66930486bfbf16bf3bfe09f1a90040a044428841ed61dd6885eefefa2fc9bc43a08e6d4e2dec4a67ba9fc
diff --git a/dev-db/pg_top/pg_top-3.7.0.ebuild b/dev-db/pg_top/pg_top-3.7.0.ebuild
index d452275d840a..5b311408477c 100644
--- a/dev-db/pg_top/pg_top-3.7.0.ebuild
+++ b/dev-db/pg_top/pg_top-3.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"
@@ -12,7 +12,7 @@ SRC_URI="http://pgfoundry.org/frs/download.php/3504/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 RDEPEND="dev-db/postgresql"
diff --git a/dev-dotnet/Manifest.gz b/dev-dotnet/Manifest.gz
index 9a7d56777cde..b2557819eec2 100644
--- a/dev-dotnet/Manifest.gz
+++ b/dev-dotnet/Manifest.gz
diff --git a/dev-dotnet/pe-format/Manifest b/dev-dotnet/pe-format/Manifest
index fb62dcfcacdd..208eedb2a419 100644
--- a/dev-dotnet/pe-format/Manifest
+++ b/dev-dotnet/pe-format/Manifest
@@ -1,5 +1,4 @@
 DIST pe-format-2.1.2.tar.bz2 79023 BLAKE2B 83877431f12ccf6e344f435a9a5ca993adca286558efd96734b0b5b5a29b160ccaa1d219d899d12e368db861ec04d4fa365e69f97f66c79deb161e57747395e4 SHA512 c946384fdb95593f8b9390f77c7ccc2fc5ae2588412e37e868785523ca91f0d9d98e41928ec61c4cd1f47ba7d1b167cd7b6671f6662ac247d1d83a37b1c32b0f
 EBUILD pe-format-2.1.2-r1.ebuild 770 BLAKE2B 45230d1123cec6430cc69181d27e5b756a801c4572772f9faee3d4a9904761756b225836a7b3db3b9c74978780f4b13bf8fb24438347fb687d0aa1c1236069ac SHA512 216320e5cd9e99c5ac69998cd6ff304a829995f2271fba653acd8b527f8022cfc785434751749ad785d92428b59899af05d029c6a159e5c6ba59e490287b118a
-EBUILD pe-format-2.1.2.ebuild 754 BLAKE2B e93c504ae3e167cc30f6f23d05b232f4a54d4eb934b629530c12690224f171950a3947da5c428420007722327be0e81127de0e14b9ab9fa48528d88523f01d42 SHA512 f949afa9e9e2aed92f11f4a48c21c08251a8d889f3c891a4cfc173e50dbf0903a37fadbbc2f53ea9c2745dc2df9697080cafdfe26615c2eb75a3dd371af0442d
 EBUILD pe-format-9999.ebuild 949 BLAKE2B 1e19028f40c9ed682aa1978381ac6901b69cc65e77779344c3a907eb6d95f54f9584dae2a3c559bcd06c72723d14323ab65230aaf17ea9eb5474aae10b561f8b SHA512 13e44ad4df2b11edeffda77a772922a1111abbb8a3bb1f7f7a326018c61890c30725ab2ce237f44f2730851e703f20140f6011c5a8d3e8a851ceadbf74c48efb
 MISC metadata.xml 659 BLAKE2B a8a98f5b67ad105de4824cd384b26577006cefd176e02a2777f73de7c3a6aa88be6612b49233a554b6ddc673fb4049d207e3c5ceb25132ba336e80090923c9d7 SHA512 c13fe4fcb55825347d3d894af8f34f0978d3c6aa413f0d460c1f5d9b5321491d30537c1045ecb5a921419c5cb07a2a1d53e9f48d015b20a34f880a171926bb3d
diff --git a/dev-dotnet/pe-format/pe-format-2.1.2.ebuild b/dev-dotnet/pe-format/pe-format-2.1.2.ebuild
deleted file mode 100644
index 7f35a3d30e24..000000000000
--- a/dev-dotnet/pe-format/pe-format-2.1.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools-utils fdo-mime systemd
-
-DESCRIPTION="Intelligent PE executable wrapper for binfmt_misc"
-HOMEPAGE="https://bitbucket.org/mgorny/pe-format2/"
-SRC_URI="https://www.bitbucket.org/mgorny/${PN}2/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND="!<sys-apps/openrc-0.9.4"
-
-src_configure() {
-	local myeconfargs=(
-		"$(systemd_with_unitdir)"
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-	keepdir /var/lib
-}
-
-pkg_postinst() {
-	ebegin "Calling pe-format2-setup to update handler setup"
-	pe-format2-setup
-	eend ${?}
-
-	fdo-mime_desktop_database_update
-}
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 379c621be9a0..458f7ce62f5d 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/servletapi/Manifest b/dev-java/servletapi/Manifest
index c959763b2f49..6850ef9c8064 100644
--- a/dev-java/servletapi/Manifest
+++ b/dev-java/servletapi/Manifest
@@ -2,6 +2,9 @@ DIST apache-tomcat-5.5.20-src.tar.gz 4796377 BLAKE2B 34950d25c969006510dcff96ded
 DIST servletapi-2.2-20021101.tar.gz 65342 BLAKE2B 03674ca65e0cc509b04a6255d5dd20d26aa5053ed54588e9ba655330c56c9c523c5b382804aee9816cb9aa2ac19cccc1ad288ed06b2af85ba535854bc72bed73 SHA512 7dad5a52ab6bfca4b052d60a48fc89ce22a5eb790584671f24d8d22b163f2dffe93bea58caebc6b4ecb0bd8434a074c88f640aa57daa1cefbf47d74df758c084
 DIST servletapi-2.3-20021101.tar.gz 127874 BLAKE2B f78f8d0724e73ef4a21bbbef6a1b855c0a55c158dba2e3ed3ee7b6d48a60ce87881bbe6b38bf5098f48f1c3064bc73c072a485e550c1caf920710ecd6e27519f SHA512 a09a5e0cd7b8c557fca983646dc49284350ff9cac7a288013c6c4c7582923d1b16d6e6b68c73e74bc06fad628ab81da95e201106643b8f6564f984a9587bd03d
 EBUILD servletapi-2.2-r3.ebuild 874 BLAKE2B b6c3368581a30f5f2247ccbe25eb90954170d2a138c6cb3058c3ebaed6159acb90a49f0f0cf27f87ae0e11230d3ba2de956fb9e6671cb2461c50df0d9503bc0e SHA512 7dd16250131c84424a81bd038e86956af8c871ca12fe77b335e2d328858fd5f30f138c5f2c7a93d2b797641a8af7459e6f401b37a914927818ddd9f132f16f67
+EBUILD servletapi-2.2-r4.ebuild 892 BLAKE2B 2178343174013bb43a8825ac28ba4b92be44f3337f8fb8ba2b1996bd4c2681073f8a1c2462cdb6c9b20253e7db37667cda80dd62a084bfdafa690cc778d454f7 SHA512 e4ef54d6bb90f70f605136e6a4bbe67df9bb9d6fca348cbf0dd070e2002cd6e3a04be54dddf6998f80d8ccb785b47e677d21e3f930f12c9b3e892572d48500df
 EBUILD servletapi-2.3-r3.ebuild 755 BLAKE2B 7e67fce7bbcb034fcc55445bd97aab8f2be2dd7332085ed190b181221a44673ed01efaf05bcfdcf6cf2105c12d1a11c83c7e6254e3a2dfb102b895142f188e14 SHA512 c47fa89bab9b9c65be375b99f19fb5467907806c4363609e4b443ce7e836fdaa1a9e183c970a8c4dfae738d7c392523371b1dcca03f3b49d876bc66d15e318fc
+EBUILD servletapi-2.3-r4.ebuild 773 BLAKE2B baf73c7efe1b1f57a7f00414b38b3435dd5fcece5235f3489a82288df9424f0bb883685b28f086dfe1b86c8f8382153b928e22f26568da3fec61ba799a74d1b1 SHA512 9138e2b14e89f8207b2d3b2d59e4ab4f67ce08acb315875ef9d934a8bad3d7480e1c881e08a1a4e99655667db4f741e222063c31c7578477051cc33fbb74cdcb
 EBUILD servletapi-2.4-r5.ebuild 1261 BLAKE2B 5f8c59c80da9054cd134fd48e449f5d2786c34ee7969f3755379efe8625e8595eac46e709ddcfbf140a5a887a750cba5225b49c1a21f18a4f3e3d17592d77016 SHA512 4e00cc80f7ef0e92922ba2bfb89fa7c5225e97ef41288e0ba096078363c8c06894b343fa98d4cdc050cc7ef8a4b9e210da441992c304aaef11a7806433176966
+EBUILD servletapi-2.4-r6.ebuild 1337 BLAKE2B eb13c2dcf08df9e65bbe52ece293fb5b79210df384e25664e8a2f578f388ab24fde6527a1e7c2ec18e0a399fd44774ecbe681f644fdd4cce2c26e4cc30b66796 SHA512 4d3d77095a9d1e133e08addcf55d558c4c6572110fe9482baa98543df20f862ecf29aa06794c7d3c95cb8336e9aa3bc6a665084df85a4bdb14dd492de7052d70
 MISC metadata.xml 343 BLAKE2B a80748e0afc76957694f9e0c5d086c538d4c88de015f5e66d7f1e0e21d38a2449f6986e708714610bc0ea3054b1330db2754f930c4500f213d8d6ca57f0b6c42 SHA512 62a67a69fdb781c32b070fa227e21223324678d315a5fa95687597744dd2d4afc26412ef0656d2e5cebc13d9ee2a0edf7f8e8f94b416a3996bb16b59bf2a83f3
diff --git a/dev-java/servletapi/servletapi-2.2-r4.ebuild b/dev-java/servletapi/servletapi-2.2-r4.ebuild
new file mode 100644
index 000000000000..0cbcbc065829
--- /dev/null
+++ b/dev-java/servletapi/servletapi-2.2-r4.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Servlet API 2.2 from jakarta.apache.org"
+HOMEPAGE="http://jakarta.apache.org/"
+SRC_URI="mirror://gentoo/${P}-20021101.tar.gz"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	dev-java/ant-core:0
+	source? ( app-arch/zip )"
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+LICENSE="Apache-1.1"
+SLOT="2.2"
+IUSE="doc"
+
+S="${WORKDIR}/jakarta-servletapi-src"
+
+EANT_BUILD_TARGET="all"
+
+src_prepare() {
+	default
+	sed -i 's/compile,javadoc/compile/' build.xml || die "sed failed"
+}
+
+src_install() {
+	einstalldocs
+	java-pkg_dojar ../dist/servletapi/lib/servlet.jar
+	use doc && java-pkg_dojavadoc ../build/servletapi/docs/api
+	use source && java-pkg_dosrc src/share/javax
+}
diff --git a/dev-java/servletapi/servletapi-2.3-r4.ebuild b/dev-java/servletapi/servletapi-2.3-r4.ebuild
new file mode 100644
index 000000000000..bb0d308808e8
--- /dev/null
+++ b/dev-java/servletapi/servletapi-2.3-r4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Servlet API 2.3 from jakarta.apache.org"
+HOMEPAGE="https://jakarta.apache.org/"
+SRC_URI="mirror://gentoo/${P}-20021101.tar.gz"
+
+KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris"
+LICENSE="Apache-1.1"
+SLOT="2.3"
+IUSE="doc source"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	>=dev-java/ant-core-1.4
+	source? ( app-arch/zip )"
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+S="${WORKDIR}/jakarta-servletapi-4"
+
+src_compile() {
+	eant all
+}
+
+src_install() {
+	java-pkg_dojar dist/lib/servlet.jar
+
+	use doc && java-pkg_dohtml -r dist/docs/*
+	use source && java-pkg_dosrc src/share/javax
+	dodoc dist/README.txt
+}
diff --git a/dev-java/servletapi/servletapi-2.4-r6.ebuild b/dev-java/servletapi/servletapi-2.4-r6.ebuild
new file mode 100644
index 000000000000..730650e38210
--- /dev/null
+++ b/dev-java/servletapi/servletapi-2.4-r6.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils java-pkg-2 java-ant-2
+
+TC_VERSION="5.5.20"
+DESCRIPTION="Servlet API 2.4 from jakarta.apache.org"
+HOMEPAGE="https://jakarta.apache.org/"
+SRC_URI="https://archive.apache.org/dist/tomcat/tomcat-5/v${TC_VERSION}/src/apache-tomcat-${TC_VERSION}-src.tar.gz"
+
+SLOT="2.4"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+LICENSE="Apache-1.1"
+IUSE="doc source"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	dev-java/ant-core:0
+	source? ( app-arch/zip )"
+
+RDEPEND="
+	>=virtual/jdk-1.4"
+
+S="${WORKDIR}/apache-tomcat-${TC_VERSION}-src/servletapi"
+
+src_compile() {
+	local antflags="jar $(use_doc javadoc examples)"
+	eant ${antflags} -f jsr154/build.xml
+	eant ${antflags} -f jsr152/build.xml
+}
+
+src_install() {
+	mv jsr{154,152}/dist/lib/*.jar "${S}" || die
+
+	if use doc; then
+		mkdir docs || die
+		cd "${S}"/jsr154/build || die
+		mv docs "${S}"/docs/servlet || die
+		mv examples "${S}"/docs/servlet/examples || die
+
+		cd "${S}"/jsr152/build || die
+		mv docs "${S}"/docs/jsp || die
+		mv examples "${S}"/docs/jsp/examples || die
+	fi
+
+	cd "${S}" || die
+	java-pkg_dojar *.jar
+	use doc && java-pkg_dohtml -r docs/*
+	use source && java-pkg_dosrc jsr{152,154}/src/share/javax
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 7e97a4cf902c..9d09069a4551 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/jsoncpp/Manifest b/dev-libs/jsoncpp/Manifest
index 2b0b27de1164..a5d940188508 100644
--- a/dev-libs/jsoncpp/Manifest
+++ b/dev-libs/jsoncpp/Manifest
@@ -3,11 +3,9 @@ AUX jsoncpp-1.6.2-fix-pkgconfig.patch 2271 BLAKE2B 24fee66b70f4b21a249fb962af6bf
 DIST jsoncpp-0.10.2.tar.gz 197188 BLAKE2B eeca1bbccab98f9da0d1158d19cab0079b9a025ea53494795531de53206256d083703e2d1f0ab68e68f5f6f7427a28b3ffe04078a9fb26a775fd086783e2997f SHA512 8e451e3ba37094445ab098d5b9f7236ac84e2f15d98e2039c565e609b757c2383e91850bd86aca507ca5cd2f733fedc484bb7760eeeee7fe9bace71d97ae0d2e
 DIST jsoncpp-0.10.6.tar.gz 200213 BLAKE2B 3b643a4c672c150ab235473010894674d1577b33b23dbe3cb1e951ddfb5ed59574ddca750f38278afbcf74de44c62d09888ee61e0e756b2a406fe663292a3d7d SHA512 9fcf584d14c31fc135c9789b36c02c5985daecc7396eb21912d5ea3e757d1fd0d516d7a060e14b4955c73f6b4aa256529281da908726919236fa65310de9f1aa
 DIST jsoncpp-1.8.1.tar.gz 210629 BLAKE2B 5f9a7f51b463784c5a74a78b7189800a37797f233b1d5a66d34edc0689c77a2b96b230c0ed4dfc749401087c551dd5659a6d152e09342ca92250ce9ea91a293e SHA512 4203826fca4c366b51d28ffc928399c914ffaba8be1cada64ff118b5742e6b469d3fc3e59344587d851447857b479794c5697d4fd11a9a55b32a3a7a801b745b
-DIST jsoncpp-1.8.3.tar.gz 199061 BLAKE2B c56d0ee987185817ef92a3b9e5c7350943375aadb960ce0c6bdfa993febf8f1976f5a848c5fc8e6204c2e7f3789dca56071260d33ad3db9e62fe1334329d0fa9 SHA512 a5170ccbc440c1bd2b365e34f7367a55731d4fa86b2d323d11431cead771127364bad9d8e2e59dcbe41bc111d11a5da94988dec5e40b9119f793f43e487d7429
 DIST jsoncpp-1.8.4.tar.gz 200226 BLAKE2B bbfa8cf7b6cfa6af34762b54de2da0e919849c65b1093b29f7a7ac437524d8b3cf07b42926b250489e9a289105df971fad798f3e73f908fac3e2f52a4e5467b3 SHA512 f70361a3263dd8b9441374a9a409462be1426c0d6587c865171a80448ab73b3f69de2b4d70d2f0c541764e1e6cccc727dd53178347901f625ec6fb54fb94f4f1
 EBUILD jsoncpp-0.10.2-r1.ebuild 1461 BLAKE2B a09c52f309f131f670ceecf2967f2979a05f9abc28ab6833e0342ec69b3b29fcaeaafaaac5fe5195a18d3d46da985bf72412a64825c71c57046f0b4b61d4082e SHA512 88b4652e85f8134d4633e143e07da5f0ff8b2515bc50ba937a985310b7651ae3695858d5b236fca73dd1fd95d0c7b8f2a50fb2545a81751f1b09e05befc986a4
 EBUILD jsoncpp-0.10.6.ebuild 1385 BLAKE2B 02ce4136b20a08a4a3d04f4a1f4a4a57da48447b7084343a743703eb0cd1bac3d85580ba6f3b2af8a58c0ec3f03c013d922ec1d1d8ec45d8c16e0b2a17b00813 SHA512 2d00e37b0ae59303b3a0f12f099daf78a98f209b406aa8362e4bf8aaf9542a74968a76c8ef0ab625ec3a9065d492c791948517a7a4a6927e7d2ce0c33b81fbb3
 EBUILD jsoncpp-1.8.1.ebuild 1353 BLAKE2B a561f153e32b1b81043fc02b64020a51235fb6557626aeceb49ddb58be7a424f8da93c2c8db7bb16a24a4d6cd86e01f8c7290f22926d983794fa2969ce4cbd1f SHA512 1479c2d2c5069ff392f158dc7f0e8320b1414d15ebb941a62a3e1359baf482e3e07093b828e38796180f5b08866e081fe3cd9f62efdca5104e9c583a1ec24a82
-EBUILD jsoncpp-1.8.3.ebuild 1363 BLAKE2B 7c6ef13d94da6d7a1dce5ea9d25bc233bc0ebed93e825af2844257ebc49f0128870f56f0ac8089878a712afdda7b56240c5ddad598f7b3e0401211796d5ed4dc SHA512 b36102dfa33afb9ad6a209dc2c980b5ab6ee103a761fe1224b20f059ab5834f2b127da343180623d99e0ffbd43a46395785449839f09d061939580efdb1a961b
 EBUILD jsoncpp-1.8.4.ebuild 1363 BLAKE2B 7c6ef13d94da6d7a1dce5ea9d25bc233bc0ebed93e825af2844257ebc49f0128870f56f0ac8089878a712afdda7b56240c5ddad598f7b3e0401211796d5ed4dc SHA512 b36102dfa33afb9ad6a209dc2c980b5ab6ee103a761fe1224b20f059ab5834f2b127da343180623d99e0ffbd43a46395785449839f09d061939580efdb1a961b
 MISC metadata.xml 522 BLAKE2B 6f34ae666bd7ccce5ccb075abfed8c32b8b5b3b32ac9fde277871ab735626fef6af12bf6b9da75f081726af7846bbe55cb8fe0663f107d6adb4f3bdf2db2dd26 SHA512 95270a54162bd5940602765fc238d7f30fdd0f42b8523774464a3f2e124b586dc0b03913a7b2db4bbb90f83b6384b97d8b8af8bcfabe7ce50dc93e2c87058530
diff --git a/dev-libs/jsoncpp/jsoncpp-1.8.3.ebuild b/dev-libs/jsoncpp/jsoncpp-1.8.3.ebuild
deleted file mode 100644
index 96aefaacbe70..000000000000
--- a/dev-libs/jsoncpp/jsoncpp-1.8.3.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
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils python-any-r1
-
-DESCRIPTION="C++ JSON reader and writer"
-HOMEPAGE="https://github.com/open-source-parsers/jsoncpp"
-SRC_URI="https://github.com/open-source-parsers/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( public-domain MIT )"
-SLOT="0/19"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc test"
-
-DEPEND="
-	doc? (
-		app-doc/doxygen
-		${PYTHON_DEPS}
-	)
-	test? (
-		${PYTHON_DEPS}
-	)"
-RDEPEND=""
-
-RESTRICT="!test? ( test )"
-
-pkg_setup() {
-	if use doc || use test; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DJSONCPP_WITH_TESTS=$(usex test)
-		-DJSONCPP_WITH_POST_BUILD_UNITTEST=OFF
-		-DJSONCPP_WITH_CMAKE_PACKAGE=ON
-
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_STATIC_LIBS=OFF
-
-		# Follow Debian, Ubuntu, Arch convention for headers location
-		# bug #452234
-		-DCMAKE_INSTALL_INCLUDEDIR=include/jsoncpp
-
-		# Disable implicit ccache use
-		-DCCACHE_FOUND=OFF
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use doc; then
-		"${EPYTHON}" doxybuild.py --doxygen="${EPREFIX}"/usr/bin/doxygen || die
-		HTML_DOCS=( dist/doxygen/jsoncpp*/. )
-	fi
-}
-
-src_test() {
-	cmake-utils_src_make jsoncpp_check
-}
diff --git a/dev-libs/libb64/Manifest b/dev-libs/libb64/Manifest
index 6daa77107736..6d7cf1203322 100644
--- a/dev-libs/libb64/Manifest
+++ b/dev-libs/libb64/Manifest
@@ -1,5 +1,3 @@
 DIST libb64-1.2.1.zip 23316 BLAKE2B 1e3aa08679e363d61b7a0a77bfe909c0fc80411bf2c7b0f35e7a8a692a25585a37303ea0f010600c0e07e0419f016fe60f88851eebb26d044e7dbaf3d02726a0 SHA512 8b1e5c8086a38be82471b5f37393f3f236c923f4a2bb737209a297cbab32a9f0a5c4af4ac912c695f0f7d8ff9458d97ce0d01092fbacbfe7181e4fd816e2153d
-DIST libb64-1.2.src.zip 16063 BLAKE2B 4224d16e9f1ee5dfcd3ca7b3a6d085a7d11031d1cd3ea0072d73f2679ad3abb61346222486563450878832f0665491ca8d4e917ebf1a2505c39ccfc783c69490 SHA512 ac041c78bf324a027e311fb10935886f8713f9b6ac53136396186a5b5fd936efdf6add715899827591bdf6d3727f6e27f680bc273c7634517cc2e1941140f596
 EBUILD libb64-1.2.1.ebuild 608 BLAKE2B 080c2a3b5e60b3f85f4b95ba876bfa810189212b348c9f5ebe3b4b5559baab652ad2176218f1d03fa53da2e9381a4542b930e2430500f73d381239303ef822c1 SHA512 2a093186f85978e1190b3d8f48bc9116380b7b1e5f39752000f6bb2b3d6fa77f6e72aa6f12b2d7d7fd0b095436ed8415b1aee1ab4d7d18f3889214077c966ff2
-EBUILD libb64-1.2.ebuild 612 BLAKE2B d53445d90bd982bdd77ac62aa07d0432045393df5f860f5a8f9f64b77e439896a28ebe5d2c2f2d126f118eecdfc886bb63d5a889cfa22dc44695e25659e1cb27 SHA512 723d367f83e514b3e7fa42dfcf7b31d0da1b452d90999cf55939a358e87f95456ab1da4bf1dfbeebb737fca39c8133dcb17f812929792d9e24898a5ed5baa59d
 MISC metadata.xml 323 BLAKE2B a5f023ab7e18b96fd023bab92d37b806bedb465a45619074084b61c85fb72d88ebcc241be89461ee733b6aea4661e858c38472245b63f5d36104500645220e67 SHA512 1280f198aab48b475f7bed0c8e27bb538ae9097630f18008879592a2bbe0430f0635c93aee0db13534c3cc5678929c758a0d734902f6509d4da332b4df9d14e4
diff --git a/dev-libs/libb64/libb64-1.2.ebuild b/dev-libs/libb64/libb64-1.2.ebuild
deleted file mode 100644
index 8935cbf4ad1c..000000000000
--- a/dev-libs/libb64/libb64-1.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Fast Base64 encoding/decoding routines"
-HOMEPAGE="http://libb64.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.src.zip"
-
-LICENSE="CC-PD"
-# static library, so always rebuild
-SLOT="0/${PVR}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-
-src_compile() {
-	# override -O3, -Werror non-sense
-	emake -C src CFLAGS="${CFLAGS} -I../include"
-}
-
-src_install() {
-	dolib src/libb64.a
-	insinto /usr/include
-	doins -r include/b64
-	dodoc AUTHORS BENCHMARKS CHANGELOG README
-}
diff --git a/dev-libs/libgit2-glib/Manifest b/dev-libs/libgit2-glib/Manifest
index dd4557f9abfd..17a24ba546b4 100644
--- a/dev-libs/libgit2-glib/Manifest
+++ b/dev-libs/libgit2-glib/Manifest
@@ -1,9 +1,7 @@
 DIST libgit2-glib-0.24.4.tar.xz 458360 BLAKE2B 2a4202939ac6442c2119e102cc160981caa15abe4151bddd772f297c75a62d9f020701f69943023d81a7f7d2e659d670be31582c06035655b93285c9bff673f5 SHA512 55874f77ded1474eab6f84d3426c8cddd56a42b04b8b3e50e4294f396b8c10025a38bc925c0b74ba3e52022c696f07e7f69b75c443bbd0af0f9e0769b7c4555f
 DIST libgit2-glib-0.25.0.tar.xz 420500 BLAKE2B 7522417cd9f5249e108c39c3bef820f19a806891dfe81ffd1851b1544f224d943b3bf96e8e824f852bdd181f60581879f84d48a2603263445c122de6cd393140 SHA512 f265d5da4bba28de2aa7254d36fa596b9e348c6543cd559cbb9c1f9610d4b63af00c82fb4138f345e15109503e0d61101d3344c68539348cb268403387a4418e
-DIST libgit2-glib-0.26.0.tar.xz 420404 BLAKE2B 366da25b507838366bbe7bb86ffde77e1261b69ae198faf15c72008e70e50cbec49dbe891a6c4f83f6eadd81aa596f907d916eeaabeaf5f18b722df9c792fdf4 SHA512 322f99b6273f0e56fcccdccd3b1193e1b62ca9dd495144e7c5fc59520dd693b1ceea4bab7335de1201ab09ecd7e146daa86afd9256d16649c144adb0b6de97c6
 DIST libgit2-glib-0.26.2.tar.xz 421956 BLAKE2B d38698f00d85b484d17078e78ad051a4c068b87df73fcf4d7b852dc6966628580cc4e5b3899a6edd5dc29fb47ef97ebe2c458992701b7642549f3e411d917dc5 SHA512 35fb3ec7a3757212f53cc884760f69725beff8462018b8e716fad389ba57d1acba99ece0fcd148ff40dc63e1fc7e7d566fe84759bd88d3a0ff9fdf970b0a5563
 EBUILD libgit2-glib-0.24.4.ebuild 1302 BLAKE2B 76dd86570dfbf545750175058f4bf04732791e3260e3cce80ee90519b93a1e18c4d48b9e0024bc6db08cbe0033e339fc548637626ba57306bc76f6150a6bf951 SHA512 168f01747fb30312bfd7f68b7dfc0d7a9ad35a6ce53a01d8a076af910a956c0add62bbaaace1bb48b6e816cdaae0ef82fdc1fc30ce21579eb638e2dc7536624f
 EBUILD libgit2-glib-0.25.0.ebuild 1265 BLAKE2B 3e1c7c29740795a9c495ddc27a12cd1226facb351975884507a1a39c364c7ef22d3a4e59439b95112ba11bcc4803bae0724aec80ef7b5c72dfa077b279c7935c SHA512 793aa9f92833a29e865826ef0267d40c0478e017102bcbff1233e49eddd6c7037874a916cf33722ac9ffce1573cabdf9e4abb3977d073fb48596ecc6f8d7e0f0
-EBUILD libgit2-glib-0.26.0-r1.ebuild 1285 BLAKE2B ea14277646056ef9e7bcb3070be2d02092df48b8ff8cb5480ba3491f12d720d48c62b515a1f1d3a93b998286bb259faa4fc44230bd0d13af70edd0eff0d1bbb3 SHA512 1b28fa0cb24aadfb5da8ee6ceb2d27621fc52706d1f096d4d8e6963061a755a822fdf79930cb835b12001bf697c06600bb6bcb3b8247550295732df7a9640174
 EBUILD libgit2-glib-0.26.2.ebuild 1285 BLAKE2B ea14277646056ef9e7bcb3070be2d02092df48b8ff8cb5480ba3491f12d720d48c62b515a1f1d3a93b998286bb259faa4fc44230bd0d13af70edd0eff0d1bbb3 SHA512 1b28fa0cb24aadfb5da8ee6ceb2d27621fc52706d1f096d4d8e6963061a755a822fdf79930cb835b12001bf697c06600bb6bcb3b8247550295732df7a9640174
 MISC metadata.xml 431 BLAKE2B b9cd78ab798b15be24933f218649464c25a768b6fda11d29190a18d49d2d5b2011555ee047a6b6d14df94cde89dd6bd83a85cf525215ff84ccaa2c8b5d64bbc4 SHA512 7ec17f350ff55331f7c502957be11244f629201769446e9900660f1573872a4425036feee58a9c82f05ed16d7e36820719818b7cf29bff4c37ab944c4c19c970
diff --git a/dev-libs/libgit2-glib/libgit2-glib-0.26.0-r1.ebuild b/dev-libs/libgit2-glib/libgit2-glib-0.26.0-r1.ebuild
deleted file mode 100644
index 2a3ed8af6ae2..000000000000
--- a/dev-libs/libgit2-glib/libgit2-glib-0.26.0-r1.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
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 python-r1 vala
-
-DESCRIPTION="Git library for GLib"
-HOMEPAGE="https://wiki.gnome.org/Projects/Libgit2-glib"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="python +ssh +vala"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Specify libgit2 dependency with subslot because libgit2 upstream has a habit
-# of changing their API in each release in ways that break libgit2-glib
-RDEPEND="
-	>=dev-libs/gobject-introspection-0.10.1:=
-	>=dev-libs/glib-2.44.0:2
-	>=dev-libs/libgit2-0.26.0:0/26[ssh?]
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pygobject:3[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.11
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable python) \
-		$(use_enable ssh) \
-		$(use_enable vala)
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use python ; then
-		install_gi_override() {
-			python_moduleinto "$(python_get_sitedir)/gi/overrides"
-			python_domodule "${S}"/${PN}/Ggit.py
-		}
-		python_foreach_impl install_gi_override
-	fi
-}
diff --git a/dev-libs/libunistring/Manifest b/dev-libs/libunistring/Manifest
index 0899706056cb..80a4d5c6ccd2 100644
--- a/dev-libs/libunistring/Manifest
+++ b/dev-libs/libunistring/Manifest
@@ -2,7 +2,9 @@ AUX libunistring-nodocs.patch 287 BLAKE2B b351d572e702a17cc4b1df97f182b6fa5ca232
 DIST libunistring-0.9.5.tar.gz 3487957 BLAKE2B 31c345d503476467ac0178cb127d85d2af343bc7d65504600b2950d44e50996d84d77750cc89af643667568f1d01beb2742aba5122bd4e4a50ab8c8225f1cf63 SHA512 89404b8f0fde264c3faa4285e4717487f2b6c348fa9374ccff2251eb3db6dda208fe013056a22f496c1fb099abe7e79b72a203d15499c641e3ac48e7957ba1b4
 DIST libunistring-0.9.6.tar.gz 3565883 BLAKE2B 8cd9e05f78e37246036ae134ae7d6c570da46c04822f749297ffeec7ec529ad17cee22a9d9ebbf3f1e36398efde41714c3953efdc3859d3f1e454281ad591249 SHA512 244f4ef6343047d2dedfdbe536a7a29584a58f668a41ba3183fc86d2f167186acf120708e024e31551ee2f035b9bee35e9ed24a276a4de9359cf08aec198c20a
 DIST libunistring-0.9.7.tar.gz 3589989 BLAKE2B 5ba029be96adf3804e9591ee0c271f41111a9c48c773d50adbf2408577e98ddd06d54dc665d3791a835698012021384c9290da0e3ce3d331f20283462c6a3c75 SHA512 43cb60163299a781b57bca326ddeb6333cde0b12d274fcd2b176971c8080ee8868f8c11bf9c524596d3a56dc0213ed1d3246fb805db1de950257c3764eb34ae0
+DIST libunistring-0.9.8.tar.gz 3720294 BLAKE2B 873dbccbe869c9dd6fe72f17759aefadc6495f97ba26e2cc62a1d94c9ca966a5f35d8d40a480077b90018602abf04342de51dfd64a4034db2ef0ff8a0f102c03 SHA512 91c0da429cc13272bf94cc1afa2bcc6cb0afa2af8b9c05fde2c1cd3ed0f54c6571803c303e20579bba51600d0e63fe917b415ccbb3751353cd8310388dddb72f
 EBUILD libunistring-0.9.5.ebuild 795 BLAKE2B 145d00d7494f389ca53e39519541db49c39172a2938ce0af435d2446ac4eec21442f26c6cf49066214f938ddbdc05d566c94016f43c788cbf70b428059339e60 SHA512 6e1b1580c92232f461c186effcc67ee340a3b8b47eaa7361fe57532a4cf4f451c9f46375fb7b488cf113787270ad80d420be0742b552396f6849a714a88366e6
 EBUILD libunistring-0.9.6.ebuild 719 BLAKE2B 47f5e802086e99639a9caa845a37982c1cc62e4f873575c72ba6ba06372c9b4cc529b0f224f6cd9e26531dc3b82682a04c0a1b9900d636f6da51e0d760deb504 SHA512 2d057f8397697b6bb8212fc4ed47b44c09607f8e8cd44cebb5da617a1aa91c77bb29636fb90eb6969bd23906cc924d574f5a6a8e2f43cae85e336352427630a9
 EBUILD libunistring-0.9.7.ebuild 998 BLAKE2B 75ab1eb5ac3e5099677cfb03dfac09c9b1a4851754a5633d94de4c925c8f44b56ed23a06b4b39a6fb8b4329eeb0344887a4f1582fe77987670f27c4bf75e25b1 SHA512 fe39a9540299c3cf1d8538aa8eecb0f9824e67ea460d05abe458df6cc7f9ac0f8a239d944e2f1029566c8f26d610529ea90002beb6856e545e323945a3949bf0
+EBUILD libunistring-0.9.8.ebuild 1011 BLAKE2B 1dcbc1efc9937a5a225a1b26c25df2162a304f7fe1d6834adb47aeba2998ae0404449a14c59866deaf652fe860c50623a34edd82c683321c891212fe13a140b2 SHA512 4282f418c75273ceb2fcbf52109e460c60ac278e5ca126affd5d363b9d31f1abc74e5598fecedcce8c33300d9271b447dac962f23e8d8c58bd1901ca09849f6a
 MISC metadata.xml 941 BLAKE2B 8234694090eba5e3506623b298b69657ece0a7c84d04b7dae238322112a74859e8c7bfebe40877f172a449ab8dc2095edc147f01040c949c704a54fc7a606617 SHA512 f4a8e3611f2e109b281e5777a0b7a30e14b64393af8c320be8fd18f293b9b8e1a732061e0b6598da24547dc71f068efc8f397bcdbefc4b286084d8f72478d4cf
diff --git a/dev-libs/libunistring/libunistring-0.9.8.ebuild b/dev-libs/libunistring/libunistring-0.9.8.ebuild
new file mode 100644
index 000000000000..ba7327e2d797
--- /dev/null
+++ b/dev-libs/libunistring/libunistring-0.9.8.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils multilib-minimal libtool
+
+DESCRIPTION="Library for manipulating Unicode and C strings according to Unicode standard"
+HOMEPAGE="https://www.gnu.org/software/libunistring/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3 GPL-3"
+SLOT="0/2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc static-libs"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-nodocs.patch
+)
+
+src_prepare() {
+	default
+	elibtoolize  # for Solaris shared libraries
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" \
+	econf $(use_enable static-libs static)
+}
+
+multilib_src_install() {
+	default
+
+	prune_libtool_files
+}
+
+multilib_src_install_all() {
+	default
+
+	if use doc; then
+		dohtml doc/*.html
+		doinfo doc/*.info
+	fi
+}
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 3207cec59733..9cb64d06fde1 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/PEAR-Exception/Manifest b/dev-php/PEAR-Exception/Manifest
index 0ceb6c545415..163514bdd8c4 100644
--- a/dev-php/PEAR-Exception/Manifest
+++ b/dev-php/PEAR-Exception/Manifest
@@ -1,3 +1,3 @@
 DIST PEAR_Exception-1.0.0.tgz 5270 BLAKE2B f6f6874083fcef2453e1d07e1ee3e900e4f7d18eca8e9a9eda9891492dd3fc1e31eb13944031e82044f976f1070463a3b099a8223d2dabb2da109bb123997f5a SHA512 f2078186fdad6c6ca59ac462a24f7f9689bea08d30f786acb7779d52cd433e490c752ba0a263067d869151b0c051cded327cb3477a039c5de68c854bff002b58
-EBUILD PEAR-Exception-1.0.0.ebuild 646 BLAKE2B 9a3a36c8d4ed9f2ce93c49a2ba0f693de9b00f6c0781fea7e40d4e364d322c50fa3093244215e5fb18827ddb946b5d13c68da2438ca102384ac0ebeb2234453b SHA512 6e840230274a2f3c57a32a62e308dee4dfc897c2cd89dd46a1d3949446e07a707d3a5b09ebc3771c93085221c995792a8c825f4a6ea5e6063eb1c5f8151fa520
+EBUILD PEAR-Exception-1.0.0.ebuild 653 BLAKE2B 1e2504b97bd4c6ce4c5936ee340353ce6c75089337325cfb17f38e1d50fcc7b44680fed66d2cc058c9732093efbd8e62692b00268684b6a83f7e76420fcfc1d4 SHA512 54490acd18f65fca7d6c5afd55971747684f9ed720d24881d094c48d5573be6ee29fa832c91e917e774b188fa78959de99422760eb074208f4ca6f32eb074a7f
 MISC metadata.xml 387 BLAKE2B 889a6e870f53bbaf7ea5d86dbddd30c85bbab181886d5eed8b8d05d4b744ed5b1152773a158f7ace3b3bf037d0dc6d5631d5e951a12f4c7a16d05a66156513ba SHA512 c3c5a2c8f8f1696240e9631e2e29d5f0780c856ad92067b24bafdf2325170b24177dd2b0ef6dba4582ec517e64f98019e9c4b823a045c9f65dd5606f0bc29e62
diff --git a/dev-php/PEAR-Exception/PEAR-Exception-1.0.0.ebuild b/dev-php/PEAR-Exception/PEAR-Exception-1.0.0.ebuild
index 42a77744cb2f..9c988e1d146e 100644
--- a/dev-php/PEAR-Exception/PEAR-Exception-1.0.0.ebuild
+++ b/dev-php/PEAR-Exception/PEAR-Exception-1.0.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
@@ -11,7 +11,7 @@ HOMEPAGE="http://pear.php.net/package/${MY_PN}"
 SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 RDEPEND="dev-lang/php:*
 	!<=dev-php/PEAR-PEAR-1.10.3-r1"
diff --git a/dev-php/PEAR-PEAR/Manifest b/dev-php/PEAR-PEAR/Manifest
index 460ab786b986..def3b21b6a77 100644
--- a/dev-php/PEAR-PEAR/Manifest
+++ b/dev-php/PEAR-PEAR/Manifest
@@ -3,5 +3,5 @@ AUX pear.conf-r2 379 BLAKE2B fe57574f4e4ce095f7ddd9bc26606181a86e67f6c8e6dad57a7
 DIST PEAR-1.10.1.tgz 291167 BLAKE2B 27bb792db46e560fc8ba7daccc4a8a4d6580193bcaecab11548e10cadfa66a56242b125594b88d58a86974c2d82330d4cdd6ede491f3dbc2040efb3c646745d3 SHA512 df5f09a92d211a09dae147af474399171aed46e0536c091468b73b43ba4acdbdbf7b5cbdd17ef48b7d36d7b9dd23187dc6c75733731c267768d49c89698b0ef2
 DIST PEAR-1.10.5.tgz 291151 BLAKE2B b9095e6e488348917846693769f075c898271f2b65fbc69781247e8f46bf41afa4dfeb98d66c1aabce884e24c91bda50af3766745c3b8b5101aa54595e53c796 SHA512 c310fa8ec72ba201313dc03953ec1eba82daa137b27eac880fd5388dce72d38e6aa40737da43c3ad41db4df0d6717c7d77cf477d64b29245854ae95d2a94c364
 EBUILD PEAR-PEAR-1.10.1-r1.ebuild 5088 BLAKE2B 4ad309d5296c0456ff1ea7ac531543bc98f6867e2ed5fbded5fcbbfb03ec82f4eae6639ad2be55731ce8803f2b6e44a399da873b979fce22cb7632975f7356db SHA512 a709a4874155a1095a390e159d77e797fc0cdca1b59929851a07e752d32648a27d36abc755c49a23fc6cc349dc0ef1a3f0012ba67c92b69c8c3c56b5394db22f
-EBUILD PEAR-PEAR-1.10.5.ebuild 5882 BLAKE2B 709a63b525d3f506ae17fbc509e25d396d5b2c3b85ce3a320d8dd8fcfc4fb31a0beec4d4ecc98dbb124fb83646499f7e35381858aca34a22fe081bf73fb77f7b SHA512 e87709aac8de8feeb34ad662a91dff86db7f704f27b4d9c4398cf7793655571f7e713babcc46922f0acf376b71a806296d1150e30b6784ae763b68c0ce84d91c
+EBUILD PEAR-PEAR-1.10.5.ebuild 5889 BLAKE2B f05633db088a891c5fd731946678f26493318b0381b01e6e14e9a9b4766e4e85979c56389f5b6f7cf69767f2769813e85f088972e5b3c0d1d6952fc4222157c4 SHA512 d1ae838b883d18e6e9f75a9b32e9cf70717e8d3a48d1121070e60a7661633fa5b4189c1fd0e19c7c6746afc0b1c4436d7d8c78e4d6c2c501bfb7315406bfb306
 MISC metadata.xml 306 BLAKE2B fdddffeab9925e2296436f14f6224e0cbdbe2d386e863de68a555cf8b1e5434409af998a4b73c9380d2118db0a021401b23034895038e31559e0de0919a8c597 SHA512 2e46d7a6fcadfed2ff7be17a5f0a82b5cbf6184b50384f868a6ad8821746badfe126279ef9c114ef9d9a42374931193dba4b84483d437797636b95e6e97247fa
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.5.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.5.ebuild
index 277099941f1a..de6fe9d4ee3f 100644
--- a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.5.ebuild
+++ b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.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 @@ DESCRIPTION="PEAR Base System"
 HOMEPAGE="http://pear.php.net/package/${MY_PN}"
 SRC_URI="http://pear.php.net/get/${MY_P}.tgz"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 5759b4597ad9..497848e3c5c3 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/google-apitools/Manifest b/dev-python/google-apitools/Manifest
index 0cfb7328861a..2c5fbb193504 100644
--- a/dev-python/google-apitools/Manifest
+++ b/dev-python/google-apitools/Manifest
@@ -1,3 +1,5 @@
+DIST google-apitools-0.5.16.tar.gz 405331 BLAKE2B 9bd086a68e5787f6dcd426887bb5e0af23ac985f851471da61567266fe52dc254054f0f2fb49e08b461c9281a32c25a764a7b751e10fe6ccca13c2758cdc4637 SHA512 cda60ec21622368c67cc47900218ceaa4137e6d602ee5196f59dac82aa87d35382785323971cc7e4aedf9d69e0a1baf8017c5d941d05171df9e1d5eea15570eb
 DIST google-apitools-0.5.4.tar.gz 255413 BLAKE2B 549aca8a2ef41f5f6de408efcd9ad3dc3c27fb9d0ce6c2c93794bd89355b0ed19499ad602aa79cac88d4aacf3c4e2820accbeb3e9c156caf3466bc36d5b0a7ec SHA512 63953a3ce4e7485344f54434ae4e6de75e4ca1ca380858143735b02560a5ac808d5f2ffed346b09402c156632a34ea1ded27d152538a98ec40981230f7d38764
+EBUILD google-apitools-0.5.16.ebuild 772 BLAKE2B cc645f6a373240dfd8d9eb5ecd3206604e99cec1477b54b0e343732b99a5e0e4ea8f21577d4c6498a1e9a7a8486cf3f82693233e7463b6737cbe540224ddd8ad SHA512 025f4583be50f927853dd96e2b6f22f840c6cb4301636297c3eb3917065509a2cdfd49b89a03b9caf0cab56ac517187b8cbb91759a329acb6a85869437a5f7f3
 EBUILD google-apitools-0.5.4.ebuild 770 BLAKE2B f073c844f94e9cf8527e5d3ae847e084ddac6499796cbdac32a8adc4b70751e20e3a16bf7453f985a70f62d5b7699a8be522162a92ba8e14d6cae13ebf3baa01 SHA512 5b441733cc1930ecc8cb571b87f78b13b848700fe299e64b0b4fa6ae10b7b4d74490aad4687bf306aec8212468654fd9fed0be66a64f90fb13ce4318fa9feb2f
 MISC metadata.xml 330 BLAKE2B cea2ae09b3468b95764b84c8891b9840e918db4961a77f4d514a4c15a33248a011b79f235728883e31a968c69a07c436a31a282f1e4a2baed2cbb2c7ba3c4982 SHA512 a4b6c01f3d8c411c5e96b911585770af30c8a1f262e92bf01748447111798a8e6ede7aa5979f16c3cf7068b3f158842023546e234049e2345f1a2f2891e51296
diff --git a/dev-python/google-apitools/google-apitools-0.5.16.ebuild b/dev-python/google-apitools/google-apitools-0.5.16.ebuild
new file mode 100644
index 000000000000..389a7b7a8dba
--- /dev/null
+++ b/dev-python/google-apitools/google-apitools-0.5.16.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library to manipulate Google APIs"
+HOMEPAGE="https://github.com/google/apitools"
+SRC_URI="https://github.com/google/apitools/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND=">=dev-python/httplib2-0.8[${PYTHON_USEDEP}]
+	>=dev-python/oauth2client-1.5.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/google-apputils-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/python-gflags-3.0.6[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-18.5[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/apitools-${PV}"
diff --git a/dev-python/miniupnpc/Manifest b/dev-python/miniupnpc/Manifest
index 6cef2d0ef948..310b32b0501b 100644
--- a/dev-python/miniupnpc/Manifest
+++ b/dev-python/miniupnpc/Manifest
@@ -1,9 +1,7 @@
 AUX miniupnpc-1.9.20150917-shared-lib.patch 723 BLAKE2B 0f88b59fb039802c2d7b8177d831933e13bacf84b26523ceb1146cfb34103d961847ef983d25371aa9a97dd30e9b46aaf9640205856c290490cfa156f4522741 SHA512 2a74eb019b5da38468d917f62b86a95b636f1e7375285af17e12556dec04026209cf384aa154e31a23fd86a2888dc340dee8e4bd6184779101bf290d340186f1
 AUX miniupnpc-2.0.20171102-shared-lib.patch 1220 BLAKE2B 97fa99582f7992587e5f13e7569b7d6709cef8cc627d984c6a3ddef3265a6d069e3ae4a371e35804982ff9e5cd41b795a69576223b3a4ec8c591032f2f2f99f4 SHA512 bb099cee440b318ac12f68d810e2a7848df0150ecce01ba05e8f60cdff8fa0efb61ddc958586ffecf1bd9b0c15ea41954a6170e59028a24eb5a225e8fffdea33
 DIST miniupnpc-2.0.20170509.tar.gz 86055 BLAKE2B 7da640c4baac58aa26965a670877953b4c2d27aff08b604366bad6913b30c152d52120099f37c6250eeed97396ff412a4dd6000179070a82eebd3c052596b0d0 SHA512 71ec052ef6c8ad0d529e467ddae6eae19a93b9816174eeac753aa90e036cc2f00cf7e8d1cdb188ef8280849a988fe2995e37b63f8e2a361e021c1d1b306bff6f
-DIST miniupnpc-2.0.20171102.tar.gz 86363 BLAKE2B 755cc85bbac7f7c9b480612c12c46c09eaa7089dc9f458027805ffb4836631efafbead4bbb5e5313d1267e3110bc4b24c726c34250da3afd1ab0f1f96d53a654 SHA512 5af68a58bef587ea5cc405155b1aca4438de3b56d5fb7e11945edd79e5cbdbf44c708b7f1ad3c3fde6bf4710de69782acf30cfcce327c5a906f4eb8f76a6ba37
 DIST miniupnpc-2.0.20171212.tar.gz 86607 BLAKE2B fce582c4125192f74f6ffb174295020af1c9b574b2094f5565a5e49641820a2d9cef719de59cb94bfd207182505237c22cf58425e1a7b47f5dfe2eb84c07d3c5 SHA512 d25708f4e2ef7311878ba6d17cb506f4bfe5c9cc6b7a79e4168f143ca9da8b96beb018c42dd735f0b23806668eba2308b7de26d1b506d91c23f79c7ed77399a0
 EBUILD miniupnpc-2.0.20170509.ebuild 714 BLAKE2B c5de8d25eb9c8219ac4d124c53a8af8f62b88ace08d12084a0110571ec00b2518c3a163c54dd6b2ff3fcc215449fce8b0ffa58549c7458259ad57bf86bc6da94 SHA512 a145554f2dc93f098f6a4bf70f2505d8878de57ceb44fa74c894bbd1a6f7d27e57b2ed2f2e2d1144503444a1c25ef72a244139748db7dc5877888d785c1f330d
-EBUILD miniupnpc-2.0.20171102.ebuild 759 BLAKE2B e212f55992753b9ab838cf5085b1f5ddadd8bbb37080d26b0599070674a3be1a16b4e2a01dfe7f3b17b55392df118f989ddc58b7dd085a189aca29f4e5dff37f SHA512 9cee2e5c32c934a5b63a5c38b74605cfb48b58ddd9d6afac1544f7a79b8e5543fa63f606c662e29224ca838779a9e139967ce61fad19ba3424656d4191840f1f
 EBUILD miniupnpc-2.0.20171212.ebuild 759 BLAKE2B e212f55992753b9ab838cf5085b1f5ddadd8bbb37080d26b0599070674a3be1a16b4e2a01dfe7f3b17b55392df118f989ddc58b7dd085a189aca29f4e5dff37f SHA512 9cee2e5c32c934a5b63a5c38b74605cfb48b58ddd9d6afac1544f7a79b8e5543fa63f606c662e29224ca838779a9e139967ce61fad19ba3424656d4191840f1f
 MISC metadata.xml 243 BLAKE2B 997913e51bb9c2ba601c78673246d3845d1078f5be11ff209532c5afc9f433d4cfe7a0066ba23677d23ffe368d7ee718df71d28301d45c0473f50e931f674165 SHA512 ded2bb7e056d9081e11b0470aa2874fbe9b5e63f0178bec611291f639763a9bd85a076dbc526e01df1403dea4d0eb28913addb346b676084e690e063b68eca28
diff --git a/dev-python/miniupnpc/miniupnpc-2.0.20171102.ebuild b/dev-python/miniupnpc/miniupnpc-2.0.20171102.ebuild
deleted file mode 100644
index c3659faf80f3..000000000000
--- a/dev-python/miniupnpc/miniupnpc-2.0.20171102.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,3_5,3_6} pypy{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for UPnP client library"
-HOMEPAGE="http://miniupnp.free.fr/"
-SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND=">=net-libs/miniupnpc-${PV}:0="
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}"/miniupnpc-2.0.20171102-shared-lib.patch
-)
-
-# DOCS are installed by net-libs/miniupnpc.
-DOCS=()
-
-# Example test command:
-# python -c 'import miniupnpc; u = miniupnpc.UPnP(); u.discover(); u.selectigd(); print(u.externalipaddress())'
diff --git a/dev-python/protobuf-python/Manifest b/dev-python/protobuf-python/Manifest
index a3d697e81a8f..1ae25fd264ef 100644
--- a/dev-python/protobuf-python/Manifest
+++ b/dev-python/protobuf-python/Manifest
@@ -3,7 +3,7 @@ DIST protobuf-3.1.0.tar.gz 4051503 BLAKE2B af93f125a6b7b3e0be6f50ff5eaabe0db21f6
 DIST protobuf-3.3.0.tar.gz 4336596 BLAKE2B 381b2961fe1de8a86225903d0cfe4c98c238336b8782e5191c57c6fcf60cf321f39163d50864bf9c119a90bd7796269dc7e34168a158f7affa7fa295ce5deae0 SHA512 0734a55ae92f0539dfb507e174539d290fd8e93633c1edd8810e0d51c37e67254337b75fc5ba9450316f6416e1f8f8cfb59415864657b55f2a1696fbcdfe7636
 DIST protobuf-3.4.1.tar.gz 4490100 BLAKE2B e2bc1ef2ee1a0af44830b3c65a6c9e73883fe6ec0d07f6a6136f5564f0e85306005440ca6f8c4eb834c7c70f909792c9e2457a761f10f95431981263a9acd7a3 SHA512 471e52198fa878a79183dc8fbc39d9c65239be4d9dff799e12281ee9b1af61a427584534b1baae1773bc6e4c86467f89ca2e7911a21effd86bc5f40cc7d94c34
 EBUILD protobuf-python-3.1.0.ebuild 1300 BLAKE2B 3161e68c237802ad81cf3ec7fe435d13d8cf53d2bfee81c90b13ad9353cffafedbd67a1e432ca5109c3051feaa297fdd257bf6f92e10d77119e71712e0236c89 SHA512 b58a5cb40d85289e8f4e491a71d4887131df1fdeda67d2602298c5e3129255b1cc9f8cf2ea390d6072f57746a77bbc23f6aa013fa0b34dcda0ee09b1ffbf1d3b
-EBUILD protobuf-python-3.3.0-r1.ebuild 1424 BLAKE2B 323a207e6188dc5e93fbe78d8b0321299adce5c173cd681d4887e2c571778e3c4bf3e07520b25346d8f8222d1b4002ce6f92b742a7a01b1375aa27e06e384301 SHA512 e418df42b58de1efef38f54cfa6ff0818d1349d314003759d6f921a03ede7aa45083014955933f21d416d70e551a9525408abafa773934ebf074c9cfdf55e61f
+EBUILD protobuf-python-3.3.0-r1.ebuild 1424 BLAKE2B 67b847ee6872f1953f75668c573bd769ab93be8d6a8d35e850cbfec6f724dac7b3affeffbd6c30c36623a6dde12513c7f61c8807c7fbf6a3d10a05e54f44ac12 SHA512 0c0a60fe63e116c30412ecc7092207f8ffb1d3a07a63813669eb9497b14152114fac40986bf108fca38aefaae1203b071a49591894870a5d30a30e38e6c0e910
 EBUILD protobuf-python-3.3.0.ebuild 1273 BLAKE2B f6c0c22aec41805c3491d23fcbe89687989483813d809ce484f4a0993be4bcd532e43d78c3da27f669844b007215316c749b7c64b0f2c4d9adab89527c55506e SHA512 5f9d1d730877b24133839ccb669416df55e178c5af94a76261445a15b8e15ec4735724d531d2f8ca972ab759a34718974b5636c6f4ac6056348a1386c3b52d4e
 EBUILD protobuf-python-3.4.1.ebuild 1250 BLAKE2B b531ad3c2ace5bf9a2ca33b04d7b0f977b78fa47a3f0486183e938a85cf2583c06698160996946c80e093d3f7b9abac4cb66ffed9167875a37d0268b7ad72d07 SHA512 a82b7e00afb6408dfeaf3c70fe5df077792daadca9e0de3b30689fd5ef49405e81f615fa2e586f14548715e189bc9db1a013b69bc17b599a0119801f74857d14
 MISC metadata.xml 609 BLAKE2B 788caedfdc3ee2ae24ab9f650d5bb0e0a61a3c49bc10fae0c2a4229a99eab9188ae949128c815bf40f9ea2306379dd9f76b1a72ceba06cbf5bb9481d05ffb61c SHA512 8766a0489a3233173a980c7b49b2a8024c582c06f4366f188264ba032d4df5171b14b9b68b98d911dea30e5188a6b80f04cc17cb6d074fdc46eb5588e5ce0f29
diff --git a/dev-python/protobuf-python/protobuf-python-3.3.0-r1.ebuild b/dev-python/protobuf-python/protobuf-python-3.3.0-r1.ebuild
index ec1907817312..a70b39fe2bc7 100644
--- a/dev-python/protobuf-python/protobuf-python-3.3.0-r1.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.3.0-r1.ebuild
@@ -24,12 +24,12 @@ IUSE=""
 # In case of using the (linked) cpp implementation we should be fine with the same subslot.
 RDEPEND="${PYTHON_DEPS}
 	dev-python/namespace-google[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
 	!<dev-libs/protobuf-3[python(-)]
 	~dev-libs/protobuf-${PV}"
 
 DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
+	dev-python/setuptools[${PYTHON_USEDEP}]"
 
 PATCHES=( "${FILESDIR}/${PN}-3.0.0_beta3-link-against-installed-lib.patch" )
 
diff --git a/dev-python/pyblake2/Manifest b/dev-python/pyblake2/Manifest
index c75cbaea56dd..ec71a3150cc1 100644
--- a/dev-python/pyblake2/Manifest
+++ b/dev-python/pyblake2/Manifest
@@ -1,7 +1,5 @@
 DIST pyblake2-0.9.3.tar.gz 130641 BLAKE2B 5165f104b5d6bc10bf8b72177b4ad08db55e1a92ad1f04efae2c3d73b6f3f52a0962cfb23832a5f5c1ed9d75c7c3a04be9c37643e381abfc7a2f843fefb43151 SHA512 6336a7f7e79bd3e6ff7f8ff4d279ae170e86f1464b9fa9e7ea7f0dbbac6fcc044caf225111e065f9cd9cdeea0f81fae8d373e1f65be3e418929f53fad063205e
-DIST pyblake2-1.0.1.tar.gz 128037 BLAKE2B cdee6ea650b152ba8d41698b6c08e95a33b4ccf209df3829038f39845a8734f31810e5362b41519ce4196edc2daeea8656e7df414fb06dc52afdfea01f1f689b SHA512 66311aa1cd60942d395c1cd8b996f66f1cb2380f36be471244152a885cee115a8e341a34309520d8b1254eb30d5e1b39b83f89d7eace9353c8ee9e919f4a3881
 DIST pyblake2-1.1.0.tar.gz 125855 BLAKE2B 46af4c24882040bbdd221f90e06652918798e4555c0a7307a596ca4c9ed3147f00297269a44d174782c2b0402eac03ecf5387b1c5a16efb57d036730b58b2630 SHA512 e13c7e4f3a35155cbf531e337895349ec01f0ac36908a4e746cecec063601adfc8a73a7961a9c310d01d3231f44f08d2cc92e891e9cb87659bc7170b9fee6102
 EBUILD pyblake2-0.9.3-r1.ebuild 1485 BLAKE2B 9249f9d8c7802c08c01e726f552532bdcf6fc072f5f826f919d8c3411bf2e7e80ba780f4b7a517e9609dcc98f9e9f1105134df19f36e52660f409197887d6f4e SHA512 840f62b6ea7355b97f7898f94ef88392f0dff8e909a5383a5d601d6c5a013a1cb9119e6af92033e6d28bcc62a7745f0ea98377a18c63e6d1ee3ed75045cf5749
-EBUILD pyblake2-1.0.1.ebuild 1471 BLAKE2B 294227a89b8516d8362e67ff714bcbef947e80eff9a06ee56a60464d4889d33eb15a28a943f94490f9dcfb38c86c01ca7b5dba47e31a92ec617fd39c8799f913 SHA512 c687fbce7c0b625fa1d03cb5a63a494baf1f3fb0a3471875a7fc91c84ef5e50946ef90119f916d0219683f2864662a7c52be564fe739ca0f269961c926116511
 EBUILD pyblake2-1.1.0.ebuild 783 BLAKE2B c034ef54bab98ba4460f09a29d2ea50405d3f16e32452877d0e91de31bc4996cdafa9d8a31bbbc6eeca0cca10b7796e24d0a4b4b5c95f764a8ca14fa185d61ec SHA512 fc1d0fdeaf357d634cc42ddf7127c795aa92ee3dfdc9fcb2e51df73afa1b4a022f22b1bfb92e05915f8d0d0bec345d75cfba443d63cd8691bf61edd54791b579
 MISC metadata.xml 452 BLAKE2B b5539d95846469f07dc0ec47d4c34f4ae7fa950c58d728f5ba92efb3f74d849598af1eeb7c3d3ab90a41591746e94b3d4c3ea5330c423fb340cbec4a1da28e80 SHA512 28acd5472435f8832eb8cb7587e651f428309e9a37c17cad378fe8f01c47896115c4d42ace1c6125eb99ddd30de562d42503b6dac42432b55b37775cdde7c1ff
diff --git a/dev-python/pyblake2/pyblake2-1.0.1.ebuild b/dev-python/pyblake2/pyblake2-1.0.1.ebuild
deleted file mode 100644
index 6fa0b27728e1..000000000000
--- a/dev-python/pyblake2/pyblake2-1.0.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
-inherit distutils-r1 flag-o-matic toolchain-funcs
-
-DESCRIPTION="BLAKE2 hash function extension module"
-HOMEPAGE="https://github.com/dchest/pyblake2 https://pypi.python.org/pypi/pyblake2"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-# pyblake2 itself allows more licenses but blake2 allows the following three
-LICENSE="|| ( CC0-1.0 openssl Apache-2.0 )"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-blake2_impl() {
-	local code='
-#if defined(__XOP__)
-	HAVE_XOP
-#elif defined(__AVX__)
-	HAVE_AVX
-#elif defined(__SSSE3__)
-	HAVE_SSSE3
-#elif defined(__SSE2__)
-	HAVE_SSE2
-#endif
-'
-	local res=$($(tc-getCC) -E -P ${CFLAGS} - <<<"${code}")
-
-	case ${res} in
-		*HAVE_XOP*)    echo XOP;;
-		# this does not actually do anything but implicitly enabled SSE4.1...
-		*HAVE_AVX*)    echo AVX;;
-		*HAVE_SSSE3*)  echo SSSE3;;
-		# note: SSE2 is 2.5x slower than pure REGS, so we ignore it
-		#*HAVE_SSE2*)  echo SSE2;;
-		*)             echo REGS;;
-	esac
-}
-
-python_prepare_all() {
-	# uncomment the implementation of choice
-	sed -i -e "/BLAKE2_COMPRESS_$(blake2_impl)/s:^#::" setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${EPYTHON}" test/test.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pygit2/Manifest b/dev-python/pygit2/Manifest
index 5bb701971f35..bd8e8189b6df 100644
--- a/dev-python/pygit2/Manifest
+++ b/dev-python/pygit2/Manifest
@@ -1,9 +1,6 @@
 AUX pygit2-0.25.1-cffi-1.10.patch 2309 BLAKE2B 99584632af0f26ef92ada55fc0f8b3fb31c7bbd6a1c74211c991db8ec7f792b5d74c551a5e0d457512ed156a5536ab2b25f8b21994706ebf7c7af3234b3faa95 SHA512 adcd46ccf81d01afe5d959e50f0acaae392fc2422a7e0582a9d065d860c2d0d9245505ce5c156136921f48c126a3741bb65be5a021b53116ccf5f0f1451c00f3
-AUX pygit2-0.26.1-internet-tests.patch 5484 BLAKE2B 6b2d9462add5dea62e33da13aa0de137d1004b17b820796e78154944883e43a941527f344a1ea57469029228e5b9be3585fce76eea95e773cb46cab770f69c06 SHA512 2fa9fd5cbc726bba25b4163fb446c97161194e62b7711989cd676a5ad0b641174923bae5d8a72758262736b54ad3e217f295b39f60e6cf052945379fc3822184
 DIST pygit2-0.25.1.tar.gz 456580 BLAKE2B b7a9ce90076f2475df41f2e5ee8cbf7cb2ca68553076ae05cb2e8bdd68067f7373e33dfb03cadf90b7f410b5d5989b902b545fddbb1e3a9f17eb17d50692e982 SHA512 19908c874d5c2469609a54893f37367480d27ff03583c38b474ebb125dc9db95dc60776a120bb05662938d6eb62d4bcef24f684688e97e3453ccc27e015736cd
-DIST pygit2-0.26.1.tar.gz 458526 BLAKE2B 703093a5a292e92c90987785065f3a1590addc09d72311f75b22caf6fe1a17be8fb16cf777189835204cb7dc4d2066e841d3d4327e2cc040c312e22a4c75a8ee SHA512 23585bc0f41458442889b5434347cbc11d6c729898864262426f84e5b9239164bb58c6e910d2381b25f1b8be271674c1a6960630a504c40accdd30e487d27a7d
 DIST pygit2-0.26.3.tar.gz 462080 BLAKE2B b3c4b9b8a6aeba22a70a8d2ef1393dace3a065a3625ee3574058e333bca4ba1d60223939f412eecf5ae9d93a81fb81c4a536af46aa047c2c82a48bd81afe4cf9 SHA512 6f727686221d4e8c348f836b7ad278b48a4b971a121b9953c2cf7163bf093936d838aaf83e9edb8628757624ab27e8345a2fb29eb1a79a30e06c0ab0a77e4cc6
 EBUILD pygit2-0.25.1.ebuild 699 BLAKE2B 88dd65d7ad660682316bf3d85aa83e8c9c6d091e24cb28888a194cb77afe9713fd921363f9e8f263cf2de558cdeb5a40ca6f1152c2e82dc24030fa5a7710bf03 SHA512 5f55fd77acb4ddbf3fdb8d7d56dba9e3882dfe30a271cb5f0bb1a8dc89ee65172fd66ab0f46c543c8722af020be751055c37589e6d9b91f1cefb6d22b4e0f72c
-EBUILD pygit2-0.26.1.ebuild 694 BLAKE2B 48a8f3a97d7cbab3a2e97fb8868e5f7d98763482a9dd80252f75ee83c11996c7331da7ad56f71327852804055f40b08ba679a1377b1e0d471bdef6ab589ebeed SHA512 df7a9b2c20d352c626562c38e966065c4d33550def9806ab2abb73ed5ba4112bb3b6b9a8a87ef5e712a19ca4082d7e31253db6ebcc1d31ee2d17943bfe4f4928
 EBUILD pygit2-0.26.3.ebuild 631 BLAKE2B 0f4903e3613c3ce410c919c17c0a7686996c408e29519a505fa38825bfdbfcbf777c8c419288441801ca6a5123d9c5e9e185ff9fa7945ce58144afded00b5dcb SHA512 b07ec6e01ef855ade0bff6848224e278cd30a991f9c15bba5e9ae2476791a5f941cdd5d51294d412ea1186cc2748fe2a13a3233e01ff54cda88fc5c72ec2d927
 MISC metadata.xml 489 BLAKE2B 3733ff314640ab2cbfa07e0ea67041ddb3635b51d339070abe97c95b5b358851b412cca5d8996dc1f25abb986a03095f19e8a50cbaeab7eb156c6b9107108cf6 SHA512 d20b7ebbdb3ea2ec72c3c5ded9874b7506b3ddabb43dbf329891478fcf5d7c4b9487ab0675d735733f463dd897dd5cdcc28080ad597f4f838bbcaa565c26915e
diff --git a/dev-python/pygit2/files/pygit2-0.26.1-internet-tests.patch b/dev-python/pygit2/files/pygit2-0.26.1-internet-tests.patch
deleted file mode 100644
index 6b96eb40f3b1..000000000000
--- a/dev-python/pygit2/files/pygit2-0.26.1-internet-tests.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-From 24a929d003f1b6b4899f41cb227293e8c4b62eb7 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Tue, 21 Nov 2017 17:53:48 +0100
-Subject: [PATCH] Disable tests requiring network access
-
----
- test/test_credentials.py | 3 +++
- test/test_repository.py  | 1 +
- test/test_submodule.py   | 4 ++++
- 3 files changed, 8 insertions(+)
-
-diff --git a/test/test_credentials.py b/test/test_credentials.py
-index 7921a41..e60383a 100644
---- a/test/test_credentials.py
-+++ b/test/test_credentials.py
-@@ -70,39 +70,42 @@ class CredentialCreateTest(utils.NoRepoTestCase):
-         username = "git"
-  
-         cred = KeypairFromAgent(username)
-         self.assertEqual((username, None, None, None), cred.credential_tuple)
- 
- 
- class CredentialCallback(utils.RepoTestCase):
-+    @unittest.skip('requires Internet access')
-     def test_callback(self):
-         class MyCallbacks(pygit2.RemoteCallbacks):
-             @staticmethod
-             def credentials(url, username, allowed):
-                 self.assertTrue(allowed & GIT_CREDTYPE_USERPASS_PLAINTEXT)
-                 raise Exception("I don't know the password")
- 
-         url = "https://github.com/github/github"
-         remote = self.repo.create_remote("github", url)
- 
-         self.assertRaises(Exception, lambda: remote.fetch(callbacks=MyCallbacks()))
- 
-+    @unittest.skip('requires Internet access')
-     def test_bad_cred_type(self):
-         class MyCallbacks(pygit2.RemoteCallbacks):
-             @staticmethod
-             def credentials(url, username, allowed):
-                 self.assertTrue(allowed & GIT_CREDTYPE_USERPASS_PLAINTEXT)
-                 return Keypair("git", "foo.pub", "foo", "sekkrit")
- 
-         url = "https://github.com/github/github"
-         remote = self.repo.create_remote("github", url)
-         self.assertRaises(TypeError, lambda: remote.fetch(callbacks=MyCallbacks()))
- 
- class CallableCredentialTest(utils.RepoTestCase):
- 
-+    @unittest.skip('requires Internet access')
-     def test_user_pass(self):
-         credentials = UserPass("libgit2", "libgit2")
-         callbacks = pygit2.RemoteCallbacks(credentials=credentials)
- 
-         url = "https://bitbucket.org/libgit2/testgitrepository.git"
-         remote = self.repo.create_remote("bb", url)
-         remote.fetch(callbacks=callbacks)
-diff --git a/test/test_repository.py b/test/test_repository.py
-index 941851b..33f0571 100644
---- a/test/test_repository.py
-+++ b/test/test_repository.py
-@@ -569,14 +569,15 @@ class CloneRepositoryTest(utils.NoRepoTestCase):
-             return repo.remotes.create("custom_remote", url)
- 
-         repo = clone_repository(url, repo_path, repository=create_repository, remote=create_remote)
-         self.assertFalse(repo.is_empty)
-         self.assertTrue('refs/remotes/custom_remote/master' in repo.listall_references())
-         self.assertIsNotNone(repo.remotes["custom_remote"])
- 
-+    @unittest.skip('requires Internet access')
-     def test_clone_with_credentials(self):
-         repo = clone_repository(
-             "https://bitbucket.org/libgit2/testgitrepository.git",
-             self._temp_dir, callbacks=pygit2.RemoteCallbacks(credentials=pygit2.UserPass("libgit2", "libgit2")))
- 
-         self.assertFalse(repo.is_empty)
- 
-diff --git a/test/test_submodule.py b/test/test_submodule.py
-index f123b8b..df44e16 100644
---- a/test/test_submodule.py
-+++ b/test/test_submodule.py
-@@ -49,14 +49,15 @@ class SubmoduleTest(utils.SubmoduleRepoTestCase):
-         self.assertIsNotNone(s)
- 
-     def test_listall_submodules(self):
-         submodules = self.repo.listall_submodules()
-         self.assertEqual(len(submodules), 1)
-         self.assertEqual(submodules[0], SUBM_PATH)
- 
-+    @unittest.skip('requires Internet access')
-     def test_submodule_open(self):
-         s = self.repo.lookup_submodule(SUBM_PATH)
-         self.repo.init_submodules()
-         self.repo.update_submodules()
-         r = s.open()
-         self.assertIsNotNone(r)
-         self.assertEqual(str(r.head.target), SUBM_HEAD_SHA)
-@@ -69,28 +70,31 @@ class SubmoduleTest(utils.SubmoduleRepoTestCase):
-         s = self.repo.lookup_submodule(SUBM_PATH)
-         self.assertEqual(SUBM_PATH, s.path)
- 
-     def test_url(self):
-         s = self.repo.lookup_submodule(SUBM_PATH)
-         self.assertEqual(SUBM_URL, s.url)
- 
-+    @unittest.skip('requires Internet access')
-     def test_init_and_update(self):
-         subrepo_file_path = os.path.join(self.repo_path, 'submodule', 'setup.py')
-         self.assertFalse(os.path.exists(subrepo_file_path))
-         self.repo.init_submodules()
-         self.repo.update_submodules()
-         self.assertTrue(os.path.exists(subrepo_file_path))
- 
-+    @unittest.skip('requires Internet access')
-     def test_specified_update(self):
-         subrepo_file_path = os.path.join(self.repo_path, 'submodule', 'setup.py')
-         self.assertFalse(os.path.exists(subrepo_file_path))
-         self.repo.init_submodules(submodules=['submodule'])
-         self.repo.update_submodules(submodules=['submodule'])
-         self.assertTrue(os.path.exists(subrepo_file_path))
- 
-+    @unittest.skip('requires Internet access')
-     def test_oneshot_update(self):
-         subrepo_file_path = os.path.join(self.repo_path, 'submodule', 'setup.py')
-         self.assertFalse(os.path.exists(subrepo_file_path))
-         self.repo.update_submodules(init=True)
-         self.assertTrue(os.path.exists(subrepo_file_path))
- 
- if __name__ == '__main__':
--- 
-2.15.0
-
diff --git a/dev-python/pygit2/pygit2-0.26.1.ebuild b/dev-python/pygit2/pygit2-0.26.1.ebuild
deleted file mode 100644
index d121e89b7219..000000000000
--- a/dev-python/pygit2/pygit2-0.26.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1 eapi7-ver
-
-DESCRIPTION="Python bindings for libgit2"
-HOMEPAGE="https://github.com/libgit2/pygit2 https://pypi.python.org/pypi/pygit2"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	=dev-libs/libgit2-$(ver_cut 1-2)*
-	>=dev-python/cffi-1.0:=[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/pygit2-0.26.1-internet-tests.patch
-)
-
-python_test() {
-	esetup.py test --args='-v'
-}
diff --git a/dev-python/pymountboot/Manifest b/dev-python/pymountboot/Manifest
index 23a63d70c0a2..f6e952b0d0bd 100644
--- a/dev-python/pymountboot/Manifest
+++ b/dev-python/pymountboot/Manifest
@@ -1,6 +1,4 @@
-DIST pymountboot-0.2.1.tar.bz2 4075 BLAKE2B ee8195536b9aeeb6e628242852c167c7a923342a8ace26c4b40c0a43d41c8630f097958697e72be8cfd9d76852087f74f49e6bce8a4806984f6b25be2f7ce0c3 SHA512 e21f73d832b69bc458a3f220f099bf6a8eabb21c0159b230969f4342e83874bac3983ef6bba19975b17e5185bdeb5cc42c6778f982f4fd4551a077039a2b6a0c
 DIST pymountboot-0.2.2.tar.bz2 4098 BLAKE2B bbfbe631313189e6aef684ff29e73fcf2dcbbb998528103afe9c89e517e5a6c13bf6e05ced7c2eb05f668e0cc269212618b648043b65fb95da2e1b46c37476ac SHA512 bb6ec0772300b2edf9864a09ff64f67ad99f0cd29b009793e1b2a590be48146640c927b5772023d27e68fc2fba51652a55ab66d1cf875dd9b4134f043ac353c9
-EBUILD pymountboot-0.2.1.ebuild 461 BLAKE2B 4eee37783b627c42ea0951817384e8a71575f55b59b69c36801ddf2a4415baac30102854266a768f6356891e774b1d44523f6aa5b94215c44a49777187ec1383 SHA512 d0d6123990ab19dd28d0c066c5bddd079ab6a7494ae0a2f9e31b5b7a073c08b45ae3b1621629b12e57ba089f9f1d3b34eded94b8e8d85db06e94caa2bea229c2
 EBUILD pymountboot-0.2.2.ebuild 600 BLAKE2B 898387af21a770c019ab471d2bd87f76324347f9b5c143cba00bf83fd83909bb308cd9458fa9898f0b624ccbe6a79c3fa517931da711bd0bbf79ced1d2065e9c SHA512 540f0ddae0944f8663ca802b530b23718c08cb0839ce0c0759ece91ea8f1d265f7929a3b8526ad2c92ca260ca83b723618efa2845ed2a9bc486386c027be3bf5
 EBUILD pymountboot-9999.ebuild 725 BLAKE2B 7d269d71fca86676a1dd78a33605ddcee852ac3ad28fd6b126c311f12334833fced52715e7db8bb57031bc8e818a609e5cc895dcd652592ab4eaa1c54a4748cb SHA512 e34f603432578895bfa4380aca112d5d76551acf6fcac3c7cf3aa39ec001958211351f53dea5c41b886382db2b572d9b9ec1d163599b3a9279c668cb43c7f4a7
 MISC metadata.xml 539 BLAKE2B 0ab0699ff77f99bb28bfc66ddfad742f877f256a597305b3ce4d4a462c865696a7c466e32e0f68eccb138d367c5d360880372a5816683fb49d1063a5c55d9249 SHA512 d95f758cbce79b166abc9cf68c5605e03a4b5f168a25e46016c812e667bed8ce40a146beeb02ea236890f081154e2239e87386ccb37aa29acbb134fdf7704756
diff --git a/dev-python/pymountboot/pymountboot-0.2.1.ebuild b/dev-python/pymountboot/pymountboot-0.2.1.ebuild
deleted file mode 100644
index f862ee2ca314..000000000000
--- a/dev-python/pymountboot/pymountboot-0.2.1.ebuild
+++ /dev/null
@@ -1,19 +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 distutils-r1
-
-DESCRIPTION="Python extension module to (re)mount /boot"
-HOMEPAGE="https://bitbucket.org/mgorny/pymountboot/"
-SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=sys-apps/util-linux-2.20"
-DEPEND="${RDEPEND}"
diff --git a/dev-python/pyrsistent/Manifest b/dev-python/pyrsistent/Manifest
index ec5fd2664280..5c90f1698c80 100644
--- a/dev-python/pyrsistent/Manifest
+++ b/dev-python/pyrsistent/Manifest
@@ -3,5 +3,5 @@ DIST pyrsistent-0.12.1.tar.gz 94031 BLAKE2B 162c3c1bbb8738cca06e9b2822ecbfc06c24
 DIST pyrsistent-0.13.0.tar.gz 96326 BLAKE2B 47388d7d48841c3a093c5309e20e92619b16c9f7c59a47929b8504a7e6aed803cb1fa07260ef8fbc5ebb4b243a52329a5a9976ca947c00243fc5dd3bc9e34e8a SHA512 6bfb657841382c4ad402c383cae5092b83e93a3dde0b905f6cb8ca8a50b8acbe0f3241e9cc50cb83892c0d59b13145764faa2a3db1eabecbe6606a35d07bb5ff
 EBUILD pyrsistent-0.12.0.ebuild 919 BLAKE2B bdd5df9d48994800478eb1df184be8002110285b6a945e29b02237c429a11636338aaa22bf5263b1e7830222051575514347344e268b986039d9739bb1412802 SHA512 bf6b3827ca3ec28a28cd04e2ea3dede70f0a678860203d1edc79b513411557b7998b226edfff4364d991aa39c6b61ac5f42d909384ca41dfc73a9374fa501ce7
 EBUILD pyrsistent-0.12.1.ebuild 919 BLAKE2B bdd5df9d48994800478eb1df184be8002110285b6a945e29b02237c429a11636338aaa22bf5263b1e7830222051575514347344e268b986039d9739bb1412802 SHA512 bf6b3827ca3ec28a28cd04e2ea3dede70f0a678860203d1edc79b513411557b7998b226edfff4364d991aa39c6b61ac5f42d909384ca41dfc73a9374fa501ce7
-EBUILD pyrsistent-0.13.0.ebuild 913 BLAKE2B 67224c34284f15fface32aae04a38c3f28024ef3d1b94ed7d2ced750480bd2caa699ac262b10e61907d732c29e314d29f48828d9401a071b54b018104b17365f SHA512 9b6e26a65a91ea5cad906f2976b569e8ff87658a34c0feadee368f02241728bad0b8a104392a7691679d7f2e2cd224829ad331311559368a2b11c7155cf94dda
+EBUILD pyrsistent-0.13.0.ebuild 912 BLAKE2B 5c977d1ac807d385b039287c84b6098d21cab68ffdb5267db7bb9464d623f557e1588f3734ca5ea4374506e6e44f9184a69f6795c2b03fe38edeeaa0a6e2750f SHA512 89ae8ed3601e5f0573eb10211149e6319e4e397bbd92834343725f7a64c63ab2e64e59d6c32b089a5d0476619d77987ffda22c4de257e12aa8a0877efc7ca620
 MISC metadata.xml 521 BLAKE2B 0081a54c9db451d020647e808b80c47e590530bc952c40d3dc6c11e187cb6ff4c644c9c8c448b206ef3036a3a0ae07760e23ba88d41938667b0a83ab2299cd9d SHA512 16d13966bbf6d52360d9438a56a949e6e31a9d2ace85e319db27be14f85c8446ee28e00c6bafc9232b3608e3a209396dc601cb3ce193d3cb4e8284cc8b3cfef1
diff --git a/dev-python/pyrsistent/pyrsistent-0.13.0.ebuild b/dev-python/pyrsistent/pyrsistent-0.13.0.ebuild
index 4c543724f9cb..a3ae27aee016 100644
--- a/dev-python/pyrsistent/pyrsistent-0.13.0.ebuild
+++ b/dev-python/pyrsistent/pyrsistent-0.13.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
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 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="test"
 
 RDEPEND="
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index cb74fc50ef3e..5d9b499e369a 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/curses/Manifest b/dev-ruby/curses/Manifest
index 5c7f81dffb92..62489ed7a4ea 100644
--- a/dev-ruby/curses/Manifest
+++ b/dev-ruby/curses/Manifest
@@ -1,5 +1,3 @@
-DIST curses-1.2.3.gem 35328 BLAKE2B ce62f1073e7700fd25f2360e057c8138b7f06fb17d5f5358800fd7d4af24727bba38fece96d19329649024a855036fb2fcb80a525ee7795e801199d215a6a1c2 SHA512 1fe87cf158ff7f25720096dddfc49fb90105d939a5fe3d405a5467b0afcc559526b1547bd6b84e469aaf5d8e31499f193b07c32bf449bd64a52233b4735f90ee
 DIST curses-1.2.4.gem 35328 BLAKE2B ba84d733a663c27a89be200b95c1e7a72063389190b2f90f0fc1b3a2af60025d926c348a08116734b15c2d494a4431c6e2be78e1f5982c03ee13d69bf7edb96e SHA512 bece3833be353ef8db51717dcdbf060667be5d33d00ce78952c44b3a8c3df082c11649b0a2a30072ce99c6578ffde7dce0c0108e109e55022703cfa1c1861bb9
-EBUILD curses-1.2.3.ebuild 664 BLAKE2B d04dd553220a0afbcdf5f0cd560828d4b72fd564ead048a5d92c573be3961beba530b4ed8e5d6b1fb196757559a0da29d264b16d6fbb0d5e41972ff13e87952a SHA512 876bdad866ec46b6c4b437ae4ad2a63b07b2470b961bb37dfbb5d1fea5da331dc1d55e2599d13669c50694f79dd9e6f288d54d59ed83495bf8c594137256cefa
-EBUILD curses-1.2.4.ebuild 657 BLAKE2B 207a2b63d27a0ece9707e6df61ff9af4f484e7598e69342053d69a2b0d3a5e94bcb6b3f9880008737134c23f86c8fd42d0bddbd9a4ae8e0e4a229ee0e918c39f SHA512 c6decd486f8c816d7cdcce0eabde221f673192a9dd191d9fba7353723f9a01fe149388038efe6880ad02252920951dfbd50619cf8f5d5b8adc82201045a4dddc
+EBUILD curses-1.2.4.ebuild 664 BLAKE2B 59cba296e8e3b7eb8ea4b48a8240c5585ccb71d9fddfe316be56115b43b6221880aad309469d11b500b72a8959d1f031358d3983bd5acedb03cebc06316f9fb4 SHA512 1f0a3db6d6614a4d0fd9db72c3de74a2b9e5dc5d63a89c0e880520f7564efe899a6665e6142e0621107caea3182c09730bb6bd16b4dc2e07bbad1c9308257914
 MISC metadata.xml 337 BLAKE2B f68ad5630ff84b55238f101e480a86102303dceaf6b05716d38966d567dfb894f668acdd0f1178ee61ae550e829c053868867d73e9935cde24677b3e14735277 SHA512 3f64366e00d412b476b81e46f0d9d4144d6f698fdc277f59cbefacbce8d9e35bf9fcd2d45dcfd5ba8a386e5972492004f693976f85a90ad69ebbbcf46542971a
diff --git a/dev-ruby/curses/curses-1.2.3.ebuild b/dev-ruby/curses/curses-1.2.3.ebuild
deleted file mode 100644
index 4f454b976e84..000000000000
--- a/dev-ruby/curses/curses-1.2.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=6
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby binding for curses, ncurses, and PDCurses"
-HOMEPAGE="https://github.com/ruby/curses"
-LICENSE="|| ( Ruby BSD-2 )"
-
-KEYWORDS="~amd64 ~x86"
-
-SLOT="1"
-IUSE=""
-
-DEPEND+=" sys-libs/ncurses:0"
-RDEPEND+=" sys-libs/ncurses:0"
-
-each_ruby_configure() {
-	${RUBY} -Cext/curses extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/curses
-	cp ext/curses/curses.so lib/ || die
-}
diff --git a/dev-ruby/curses/curses-1.2.4.ebuild b/dev-ruby/curses/curses-1.2.4.ebuild
index 748a37ce0b2a..c6b36a1ee212 100644
--- a/dev-ruby/curses/curses-1.2.4.ebuild
+++ b/dev-ruby/curses/curses-1.2.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="README.md"
diff --git a/dev-ruby/request_store/Manifest b/dev-ruby/request_store/Manifest
index 310015f25042..f0af042a93b3 100644
--- a/dev-ruby/request_store/Manifest
+++ b/dev-ruby/request_store/Manifest
@@ -1,7 +1,7 @@
 DIST request_store-1.0.5.gem 6656 BLAKE2B 2bd96d3dd40e846e8b36cae338c1f95ec812d6121db332e60c85b4c8e043fe81229e9e2f7f8f3c1ef3d7c592515bb69d5dae3cc4755f181fd29a1eb7e7c6254d SHA512 0d69ebdb8d3f6df11f89780c250b5fcc702258e19d7fbf8e2273614ecc220ee25e059a596a8a7e39bcc426f8d834cab38c161c0c1a800cc7ebdba3daa810e727
-DIST request_store-1.3.1.gem 8704 BLAKE2B 67fd0427e4ad32b97f4c1995284044e2d6a237783e2d85ff0dc88e003a4d42ba435c7666c86b79f1ee2e4303af928b46e5b7f03d3ec33120a5a68e1ba0b0a5ee SHA512 67e3be519e33a58c5bb45437dee3a77ff298cc228066af1b101b72a3ffe95844d065370942db696eeff57a781e0be9eed2d80ac8b99a4d4592eec1b33345ab63
 DIST request_store-1.3.2.gem 7680 BLAKE2B 78825112c3893b631952275885096a0f4475fdd67f5fcf1834c5f7f4c468f79709e60d7f64f68cf13d44e6673c2b555e024a15f0518d083dacc54a40d588867c SHA512 038aad3f71d3e8ac4b13503ac6bb484cc1b85516ecdf618dc5af2c5f906d7f33c2304c3d7ab25b7acaa6210fe8a419ec8bda40e5036f692928a08fc5cca6e40b
+DIST request_store-1.4.0.gem 9216 BLAKE2B 90e4dfa1c43a4c64f17b70dd4b77e2b982f5dc4bf42cd3b26345cf168d1ac8ac750dca75db679fc1c24097638c7dba031f8b29f3f4d9e81fdbcc30dc8dc6e5e0 SHA512 12835dc2f5b4b6a6812adb756ebc45a9f6a0b80e65800a7dabc27c55c359f5090adc9530b17de072d2feb6903ba0f1b075379bef83c7b673a86b1b8ce51447e4
 EBUILD request_store-1.0.5.ebuild 473 BLAKE2B 62fa2961842b571f65ad6e45566255eb9a87cc912fc8a6c8456caabe7f255ed0a08e434c0a6264701e9637db4821775d61bc6d63d53e8cfc43191c5e509d4cb5 SHA512 1dc521601da8da2b5a9892390cf7498db5434cc05b9286ef4bff608bd42dd07a5831d18f983a28487bac49b183b5625b2adfea3c6d7c558d2aad98a0742b8d59
-EBUILD request_store-1.3.1.ebuild 475 BLAKE2B 37ae3e8b59118776a1d660e261291670ada09c08ae6b151305ba7ba8393e34a51eb28e679bc1db1fcb13f80555d37e2a34ce71972d7b7c85de05eccecc38363e SHA512 7acda7891ffe9eb040007c6085d7abe2a68b2abaeee9a154f2f3c45579b026447c525fbe51ee9c3a8f329a6bf3bcd5cc062e36f1b8635925b7a2bfe40e08643d
 EBUILD request_store-1.3.2.ebuild 475 BLAKE2B 90a93951c9907a7c81c4962dfb67e1ee67a5dc32638c6c1dcf76fde0106990059b6c13cc74c54f252e3b264eca0569af79132c32b549c9178b8e5dafa724530f SHA512 6843364d04ad12a77eabb3e02221aa2ee8e1baaac267dd7f7d806c12a4184e4d95e7ee726009fbf3b4578e6bf33deda8be90f080d42894402020e3322ae24c2c
+EBUILD request_store-1.4.0.ebuild 510 BLAKE2B 17629d2258a77d0650d659fad6734b3aa71ada082b9d7390ea1033519aebd5a4912645967d9100c57dbf648b12c4e3896191a1ce707330de68a00958419e47d8 SHA512 31bb957ef46ce5b335fabbd0546132281513aafbea8ecd1e7c6e7de75ad792e27bde41a04f5a81f6866f988c94188e603d75f194b149471061a15a7df2c75c91
 MISC metadata.xml 352 BLAKE2B 96f0c7bc363401045297f0819f643d6bb4673c196b9edc4d40ec6aa3c66b9b4921cfcb0e5d5082778a720a68d7fcc26f6d814843f0177f7f548cc0d1f56f34d6 SHA512 ef219e94da98dce395d21d81db23380925391207d00dd4e39d2000ba841f62b237b13733ded2fcd67c36e3d18e9ba28b33fa3905c7d9cd7466fc8c942d577c39
diff --git a/dev-ruby/request_store/request_store-1.3.1.ebuild b/dev-ruby/request_store/request_store-1.4.0.ebuild
index 75318a12c85e..ab89379ff34b 100644
--- a/dev-ruby/request_store/request_store-1.3.1.ebuild
+++ b/dev-ruby/request_store/request_store-1.4.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="README.md"
@@ -17,6 +17,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
+ruby_add_rdepend ">=dev-ruby/rack-1.4:*"
+
 all_ruby_prepare() {
 	sed -i -e "/bundler/ s:^:#:" Rakefile || die
 }
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index ed3dc933303d..5253a612fb00 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/abi-compliance-checker/Manifest b/dev-util/abi-compliance-checker/Manifest
index 2e67099c4827..f66db46deac3 100644
--- a/dev-util/abi-compliance-checker/Manifest
+++ b/dev-util/abi-compliance-checker/Manifest
@@ -1,6 +1,4 @@
-DIST abi-compliance-checker-2.1.tar.gz 229447 BLAKE2B 4d286339d2b1b3d2ab265159f3092d6225da31083cf788b58c28614732ec2658b18376b1e8d5f8d1ad6f22101c4491fa0c813ee57e0a3fa5272fc134a99e22ad SHA512 1621a7862e775c8ffe60d2fca131b002fc8ec3b7370b50c9d6463b539d6b85f504cf2f56cf350d8928cd144ce821b05b37edd3a575d416d167cee237ed96df24
 DIST abi-compliance-checker-2.2.tar.gz 229812 BLAKE2B 8cbbaab1b4063a93a794a6d68acbf4d2c2356eb759b6d5dea2836173887937aca3e23cc3ea54b716a472a43e3e7841f749c2e15286cf5d12780577841b792685 SHA512 4bfdad1d708f2498187a0c06cbabced3c34a05b44900231d453a8dcea88df3f381a180aa2d4cbb4c3df14d0013660b355f630e890e3715c79ce8af3a385759e7
-EBUILD abi-compliance-checker-2.1.ebuild 622 BLAKE2B 210c126f4d2f04911ffea376d8db7d84a2df16496002918179b101e331099b7152db9a24827d46b324056d96500abaa1b24568eb72059e835764810d85e93b0d SHA512 49650e30c2078a5c7c128f92640991342af271acaf833de67bf887ba30e52e2e1d7f053a6ae7f3c018dc99d793102cb7973bfcb61c92b65f187d59cb39d29889
 EBUILD abi-compliance-checker-2.2.ebuild 622 BLAKE2B 210c126f4d2f04911ffea376d8db7d84a2df16496002918179b101e331099b7152db9a24827d46b324056d96500abaa1b24568eb72059e835764810d85e93b0d SHA512 49650e30c2078a5c7c128f92640991342af271acaf833de67bf887ba30e52e2e1d7f053a6ae7f3c018dc99d793102cb7973bfcb61c92b65f187d59cb39d29889
 EBUILD abi-compliance-checker-9999.ebuild 740 BLAKE2B 7a571efbee6057fcc147a3f5dce36452480c13f02e75a6bbd47077489763b4dd445f22e1b186050fbae604a2f50b4c1830009c202981289c093d2ef21b152c6d SHA512 0d7b959e935298a67596b38bffe8ebd03698f7bd823767e43769182bbf6f1b6a530a61d569ef49d1a1990edc688d05ed76c7d635b280d9da587de4db302d574a
 MISC metadata.xml 445 BLAKE2B 4a2c82729f916f7ae374040aa2e4008d45b0623fde7ffd41dbf54906690115441feb930695ee39c01cf3dd440d385414618781aa6a0d8a6e1e7a4256b668649e SHA512 a71d08620d61505c7cf7c6b56503c9275795980c97a1c4897bc20455674c60bd6b09bb5002a5faa0360be992fc775152c95b2a3366966cd7e636103e480d9dd2
diff --git a/dev-util/abi-compliance-checker/abi-compliance-checker-2.1.ebuild b/dev-util/abi-compliance-checker/abi-compliance-checker-2.1.ebuild
deleted file mode 100644
index 1057874dcfaa..000000000000
--- a/dev-util/abi-compliance-checker/abi-compliance-checker-2.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A tool for checking backward compatibility of a C/C++ library"
-HOMEPAGE="http://ispras.linuxbase.org/index.php/ABI_compliance_checker"
-SRC_URI="https://github.com/lvc/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}
-	dev-util/abi-dumper
-	dev-util/ctags"
-
-src_compile() {
-	:
-}
-
-src_install() {
-	dodir /usr
-	perl Makefile.pl --install --prefix="${EPREFIX}"/usr --destdir="${D}" || die
-	einstalldocs
-}
diff --git a/dev-util/abi-dumper/Manifest b/dev-util/abi-dumper/Manifest
index a0734dd3ddf4..aa3292abca2f 100644
--- a/dev-util/abi-dumper/Manifest
+++ b/dev-util/abi-dumper/Manifest
@@ -1,7 +1,3 @@
-DIST abi-dumper-0.99.15.tar.gz 40265 BLAKE2B f890ede6fff57ba69155aa8d44021789730c40fa446d533e015e0d88f334388a8c76fa622a67da609a153da13c34833aaf725ed3acb92b5ed9b845f1804993d1 SHA512 695462c8972e7f5abcf3415652ef6bb52d9770ae5fc21aceb44b0eaadc087f23d6c1cd92d6e29961141cfa863b0bad7944cee826df2aa8c83f3be7e42d098e61
-DIST abi-dumper-0.99.19.tar.gz 44380 BLAKE2B 2fb98ae3e7d41afc0bf9a3a949cc9c26d0920caf3e6e715b73f68c710c39964e6935e03e03a7d2cca93e7696a666a1bd6ee8f7903f7f620f8818aceca0b99817 SHA512 4afbaf1b15e61d67f25849ace34074fb21f09165cef04f2a554c8d0c6930912cd890384ce3949f6aeee60cddf6b100b5bbc34f8b21f1e5d611fb31c06849040b
 DIST abi-dumper-1.1.tar.gz 49012 BLAKE2B ec86c073bccef5022376acf10b7e0b13d34bac8394277ae53c5ea9b981c4008c5895d3137e3ca0a5cfd64f2d2425cb13a0912f6dada048adfa290dd144ab58ed SHA512 28b791de74dafd0b3d78314c1c722d03bfeb0daa5cb702def9268e4c64f49c79b4fd92d4adf89a20f79c745ef70bc18d2b1143fbe0c7ad192b2f64cb1551b371
-EBUILD abi-dumper-0.99.15.ebuild 587 BLAKE2B 904f7e7f433a83a182470755698b5304c5e4a95762c941a6d47575f33f570ed49cacf92991b1250decaa9f1d816fe395ff52e70f78504dbb06504f1c1281e2f9 SHA512 50824fb0bb6af19507c262a3374208bd1068ce1ada7b555e0e2ac20319ed3363667f42a63ecae6ee693935d605e9f3975708db87858e08c2865ef7bc28369b72
-EBUILD abi-dumper-0.99.19.ebuild 587 BLAKE2B 904f7e7f433a83a182470755698b5304c5e4a95762c941a6d47575f33f570ed49cacf92991b1250decaa9f1d816fe395ff52e70f78504dbb06504f1c1281e2f9 SHA512 50824fb0bb6af19507c262a3374208bd1068ce1ada7b555e0e2ac20319ed3363667f42a63ecae6ee693935d605e9f3975708db87858e08c2865ef7bc28369b72
 EBUILD abi-dumper-1.1.ebuild 587 BLAKE2B b3362c46859c331740304089106e36b1ee8cbabc0874febf7a524ab5c0e7d7dc80633d971dcc5a5c2da59a3a933b92593d5e56e2f201e1fc4ac6bf7513d892df SHA512 d9b0ed3d94f6bba83e949e4e3ee309d544d53efe58666e69b37286f879201ed6d2f00e62ac7d8994c711571c6a65a3e02115066a8edcecefdc14fa8dd07ce873
 MISC metadata.xml 433 BLAKE2B df4920a06673222e81e4142dbfe44e7aaf8cef4793ee72d512f6cc28dd02df6c8e280b722860ed5ccd3e1bf96a26190ab8be81ae76c305190c5b5e053abe1d0e SHA512 1d2b626dd625e2469efe07130c1ccb1d3727f61226a7759d8a9c4eb942c37f992bc8d7bddcb54869b4316af8442c92ff56b76981fcd7bb779920e8da4bb1116a
diff --git a/dev-util/abi-dumper/abi-dumper-0.99.15.ebuild b/dev-util/abi-dumper/abi-dumper-0.99.15.ebuild
deleted file mode 100644
index 1a4ff5dc50af..000000000000
--- a/dev-util/abi-dumper/abi-dumper-0.99.15.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Dump ABI of an ELF object containing DWARF debug info"
-HOMEPAGE="https://github.com/lvc/abi-dumper"
-SRC_URI="https://github.com/lvc/abi-dumper/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}
-	dev-libs/elfutils
-	dev-util/vtable-dumper"
-
-src_compile() {
-	:
-}
-
-src_install() {
-	dodir /usr
-	perl Makefile.pl -install -prefix "${EPREFIX}/usr" -destdir "${D}" || die
-	einstalldocs
-}
diff --git a/dev-util/abi-dumper/abi-dumper-0.99.19.ebuild b/dev-util/abi-dumper/abi-dumper-0.99.19.ebuild
deleted file mode 100644
index 1a4ff5dc50af..000000000000
--- a/dev-util/abi-dumper/abi-dumper-0.99.19.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Dump ABI of an ELF object containing DWARF debug info"
-HOMEPAGE="https://github.com/lvc/abi-dumper"
-SRC_URI="https://github.com/lvc/abi-dumper/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}
-	dev-libs/elfutils
-	dev-util/vtable-dumper"
-
-src_compile() {
-	:
-}
-
-src_install() {
-	dodir /usr
-	perl Makefile.pl -install -prefix "${EPREFIX}/usr" -destdir "${D}" || die
-	einstalldocs
-}
diff --git a/dev-util/bcc/Manifest b/dev-util/bcc/Manifest
index 0bd99830ee44..d9dbd00eb749 100644
--- a/dev-util/bcc/Manifest
+++ b/dev-util/bcc/Manifest
@@ -1,7 +1,5 @@
-DIST bcc-0.3.0_p20170913.tar.gz 1736513 BLAKE2B 1ed234f3c74e3cc9f47a26f97a8e296499eecc30442a59a3da7b4a5bdb0d628033f01c9ba038a0f2c2de13dd381a627590d387d0c77361e82c10e0a4f5d145b2 SHA512 8298d98fcadc95a2f5f27e1f656f392634c0940cf6ea03f432135477790e770f58dc3e3e0b434391eff8d4e3df6671c250252a29a7344c6adf7606251daef4dd
-DIST bcc-0.4.0.tar.gz 1752520 BLAKE2B 3fdaafebc0ceadbdc5ab2ce0fc7e154ebe0242adb1fec912f517cbf14065a0e79d21794b47a82c4b29c8a618882f75b0d22a29799387c7c250ec54ac7ec5f89e SHA512 d4bca6ab30ed2d398685a5e142bc55ebd70d29b494ce9fa28d85aceb1843111de8f1c61049712d8be9ab827b65866db07b6be27e82bd243e182b7bbe6fb2014f
 DIST bcc-0.5.0.tar.gz 1764775 BLAKE2B e1e059b83846115347f225e968edd2823408c26f4f25a89e26c663147ca9c379222c4f1d97578f7cf981fbbb23307deab408bcb278cb26fde5399afbbceb1e39 SHA512 12de5ef04185dccd0847fc97ae855b386e0c81b545ae497af797667925ebedf97164c17fb99468abae3f87fb3ddfdba5200070f80b3bbcad63c2355497012f0e
-EBUILD bcc-0.3.0_p20170913.ebuild 1128 BLAKE2B 4a22ee3ba191a54a7b958e689100576c3bbfe788e8d261fbfe764388280e70fe3a4cf44ea6cb33b174376329788ff7649b6bbd647c47dfb0269a00b179a34617 SHA512 3d76907e1322f352b52b4152854ab5d6401a8a23431766ab1238483c5835d5085647cdcfd3507d33eff1d6397f641cdb9666901a0bfa974d9af264f0a4c62a8b
-EBUILD bcc-0.4.0.ebuild 1094 BLAKE2B fd1c7b5e5fc687b69dbd94c4402ffc810d9296b935cf04acaea509570c059ab072b9260614308fd7430b5912e0b2d369a823b806e5fcce0a2dd0050f4ed3a838 SHA512 c670c31428c55d670c7a2af790e10c143fbc02fc2d6a60056018e89d1fcea7d1bac35d855e4bbef6a8961ab2852e1b6e7823ec249d25dc3be711a7dea3b5888a
+DIST bcc-0.5.0_p20171230.tar.gz 1773522 BLAKE2B bc5ec32570cf230f071c10d2925a8c8a777c60c22d31bbf72f3cad1718e59dacd604e45a326ff2a941aa519a2b3544bc7376dd40ceafe154c497b488e0ec1b9b SHA512 d8e810768b5801c0beef98a13ee23eb8aa756f7f8a3e35f6a391958e30affc5a8622a9b75c785f66d86761105045cb2b1c7ce284f3ac3b482a4605987bea9f30
 EBUILD bcc-0.5.0.ebuild 1094 BLAKE2B fd1c7b5e5fc687b69dbd94c4402ffc810d9296b935cf04acaea509570c059ab072b9260614308fd7430b5912e0b2d369a823b806e5fcce0a2dd0050f4ed3a838 SHA512 c670c31428c55d670c7a2af790e10c143fbc02fc2d6a60056018e89d1fcea7d1bac35d855e4bbef6a8961ab2852e1b6e7823ec249d25dc3be711a7dea3b5888a
+EBUILD bcc-0.5.0_p20171230.ebuild 1128 BLAKE2B 2b43727b4b2008ef6e3480f5cc2b94a3ec8947ab23bd14c0ae67a9c6a9877300b451950aec402f0a5dc593610b909f7c831bc1994947c5d0ac5313cfb7671c2a SHA512 c50cd6a6bd11d05636c47621ce154af4ec2ef146b509fd772e717eac506744ecf7c93a3a827825eff92100647affe3320af48b77828462a21e062da3afd37090
 MISC metadata.xml 302 BLAKE2B 1c06a0a2737ee7f574578ffa657d131a6c296e7f21dbf79f77f47f77814779b82fa6d2d7e21aa6700e11ce3c11daec48595db4a82d06e11eddeaacd377cf8fe4 SHA512 56eecad64a95bef18df26d32d87911e46c8222079387c946b086c38be9b22ec07dbd715344f373ca486758dadf65d84f1ec289af065f964adcff8b2e8906b6ad
diff --git a/dev-util/bcc/bcc-0.3.0_p20170913.ebuild b/dev-util/bcc/bcc-0.3.0_p20170913.ebuild
deleted file mode 100644
index 1aaafa79153e..000000000000
--- a/dev-util/bcc/bcc-0.3.0_p20170913.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
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit cmake-utils linux-info python-single-r1 python-utils-r1
-
-DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more"
-HOMEPAGE="https://iovisor.github.io/bcc/"
-EGIT_COMMIT="488c119ee7aa7598c11be876acd6761342874e68"
-SRC_URI="https://github.com/iovisor/bcc/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-RESTRICT="test"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND=">=dev-libs/elfutils-0.166:=
-	sys-devel/clang:=
-	>=sys-devel/llvm-3.7:=[llvm_targets_BPF(+)]
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-S=${WORKDIR}/${PN}-${EGIT_COMMIT#v}
-
-pkg_pretend() {
-	local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF
-		~BPF_JIT ~BPF_EVENTS"
-
-	check_extra_config
-}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DREVISION=${PV%%_*}
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	python_fix_shebang "${ED}"
-}
diff --git a/dev-util/bcc/bcc-0.4.0.ebuild b/dev-util/bcc/bcc-0.5.0_p20171230.ebuild
index 0e8e32826953..5062f45dfd85 100644
--- a/dev-util/bcc/bcc-0.4.0.ebuild
+++ b/dev-util/bcc/bcc-0.5.0_p20171230.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 cmake-utils linux-info python-single-r1 python-utils-r1
 
 DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more"
 HOMEPAGE="https://iovisor.github.io/bcc/"
-EGIT_COMMIT="v${PV}"
+EGIT_COMMIT="82ef5a0d999b687d26059e5adfdaac3e605f2339"
 SRC_URI="https://github.com/iovisor/bcc/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 RESTRICT="test"
 
diff --git a/dev-util/docker-ls/Manifest b/dev-util/docker-ls/Manifest
index 9ded2e244c8c..e38f0059d313 100644
--- a/dev-util/docker-ls/Manifest
+++ b/dev-util/docker-ls/Manifest
@@ -1,7 +1,3 @@
-DIST docker-ls-0.2.1_p20161102.tar.gz 20313 BLAKE2B 5dd9fa07934327851d60accac653ab05353c2d919811e7d7b2efe740b1e31915bf76659af6f96c76ff41c73e98adf5d70d67aaa6f1cfa8a1431266e8efc90fba SHA512 fd44fcb21db696e9565b8e4e84ef4aaeee7d1101fc0e1f2978a452cc8ec8016fce47508afe201b7096f06066b030eedd9d78c8d3408ca82d2e96431661857e3f
 DIST docker-ls-0.3.1.tar.gz 7308660 BLAKE2B eaedd07cef81da01c2d0c629867f5c3841900f839cecc9049c81b11bbbcb864ff4e8048068688832660961221b499710db45cbe417f326ec019f473dff0d6a4a SHA512 8ae831222e03b7dcb90121c2e6dea7bdc442418aa6dcc3905db82f6fd1ceb78a048d6fc2a2ef9bf0dea21a6e9d601ad77e25c077de7632057994f614d484fb99
-DIST github.com-go-yaml-yaml-a3f3340b5840cee44f372bddb5880fcbc419b46a.tar.gz 60814 BLAKE2B a77b7d72e2937af71a0734c21bee7a1d7770157c27f1ddfa164c66fd5461f86a2ef46e002087092ef011caae572838bcc9537a8290cd54dfafb7f54423e47c48 SHA512 184a0e658a4eac3b867533cd0e494bd84db94fbe10e8df0d0b755c7ffc95bc99e2f84c0157183ca74cdc79289a85dcf7f1dea8a4c89a253565baf473b3627eae
-DIST github.com-golang-crypto-728b753d0135da6801d45a38e6f43ff55779c5c2.tar.gz 1317212 BLAKE2B 00078092ba94d76ef3111401707de65c254ad13a2737b63d00b123aee9020acc83d016781e65bab4dc23a5697898498e744f0c2f6bd58c0e6f73b47af4b1c9e5 SHA512 163ca4b00188133d5c4d82dd685deaf2b889ae76b97021697d96dd8f11675a57361352e204d774a6fb7941f45dc8027ddb324abf0a4799ed19c3052181536992
-EBUILD docker-ls-0.2.1_p20161102.ebuild 1170 BLAKE2B ce06a50d5c034aecef7d93f6f0827c66d6bfb3247cb179cffd3e9c1aa70124ffc942d5d01b5eb806171341447feaea0d2b2263e7daa02fe1f9cfc4156040b8b4 SHA512 2408f1dd3b151ca426d4d7471dbb3a27e9818d265b51bc88fb101a62dffd6a65d10701816117a93bdf8f3cca8b9f4d5a8bcce5efbd7cc8e99e02adc337b43a9b
 EBUILD docker-ls-0.3.1.ebuild 1347 BLAKE2B 0f3795a9d68db30770000123e0bcfd24f695eea8642ee69ceed114636f1eb41befeab3916f41f7672f5f5eeb5f20b11b41240e7172c7faa87cbbe5290c899d39 SHA512 dc20c433d8696b0b111630d0bce4a976f841b116d06d89fef96e543ec5faf86ad5af3ee523f4592071c28ca8ada0efe540445501cfc5f5279aa7e6bb15907fea
 MISC metadata.xml 323 BLAKE2B 509388c3e74b1791db2db40b4386f905d811ed9a8e8b4ec374e78a7479e67b0f0b3c39c56d5070e9eee0070ef86c9dcef71c6668cacca6603416bf0792fb03de SHA512 bf430f00f6338c4790ca536314d722968a2325a46714212c122ac4ad56c401acc88bb593a19c4df4042d4477a9607c73af06e7d1d26fefbfaeeabbccbaeec14f
diff --git a/dev-util/docker-ls/docker-ls-0.2.1_p20161102.ebuild b/dev-util/docker-ls/docker-ls-0.2.1_p20161102.ebuild
deleted file mode 100644
index 127c5f1c57e2..000000000000
--- a/dev-util/docker-ls/docker-ls-0.2.1_p20161102.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/mayflower/${PN}/..."
-EGIT_COMMIT="3c5e2decd5c6717d4f375a2588179758d62bb591"
-EGO_VENDOR=( "gopkg.in/yaml.v2 a3f3340b5840cee44f372bddb5880fcbc419b46a github.com/go-yaml/yaml"
-	"golang.org/x/crypto 728b753d0135da6801d45a38e6f43ff55779c5c2 github.com/golang/crypto" )
-
-inherit golang-build golang-vcs-snapshot
-
-ARCHIVE_URI="https://${EGO_PN%/*}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Tools for browsing and manipulating docker registries"
-HOMEPAGE="https://github.com/mayflower/docker-ls"
-SRC_URI="${ARCHIVE_URI}
-	${EGO_VENDOR_URI}"
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "s/\"git\", \"rev-parse\", \"--short\", \"HEAD\"/\"echo\", \"${EGIT_COMMIT:0:8}\"/"\
-	src/${EGO_PN%/*}/generators/version.go || die
-}
-
-src_compile() {
-	pushd src || die
-	GOPATH="${WORKDIR}/${P}" go generate ${EGO_PN} || die
-	GOPATH="${WORKDIR}/${P}" go install ${EGO_PN%/*}/cli/... || die
-	popd || die
-}
-
-src_install() {
-	dobin bin/*
-	dodoc src/${EGO_PN%/*}/{README,CHANGELOG}.md
-}
diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
index 3e47b5b6229e..8cfafaeefdcf 100644
--- a/dev-util/scons/Manifest
+++ b/dev-util/scons/Manifest
@@ -1,22 +1,13 @@
-AUX scons-2.1.0-jython.patch 427 BLAKE2B f2ea3445ee54bac5b9867a8bc3491cb96f29a8f0bc0e1d61f7e5e6df43409f48e660745fc853a72f1c5d42e4603a5b7a32024932ff369d477eb654961d5689f6 SHA512 5ffe6ee08e2dbf7dfb92e67a2b4ac75a5566a34680dbe86eae749c67709e8ddf585ddbd4549c0151c022567f171240c329cc546ce3d0bfb76efd2c8bd6f185e1
-DIST scons-2.3.5-user.html 1280097 BLAKE2B 8739b670a9d1f8351b6c7435adb8016af52f5b802942161b18ae217478dddc778d624c59aeef08b948a3a1cd46afaa1765020bf8f3aadd26696c649c46f878f9 SHA512 e2c80beacd03f4071e33f8084e499e54c8529e68ec02b972d0d0944b6e096437fd70f59339ebba652cc5539475e1b4eb8b80e4a3d188413ca5181af9ae5b70d3
-DIST scons-2.3.5-user.pdf 2505997 BLAKE2B 4df89d653fe0dff18676fd0ead12c994bf90aa5c3b450b97dbb156c00a14175f7df0cd11208e6de2ef8a9b6a5f7324bbcd0ee484b84545432925ba3c3a44c058 SHA512 137ab2d3b1cab6821f2d8a8fde33406e2a7d46a4c26eec9de1073d3c03f49e1d485ae7884ed3cd2e41a0e3d2ef457e103d782dc1deb01a280c48e4f5e7e68f1e
-DIST scons-2.3.5.tar.gz 631619 BLAKE2B 4725c274b53751dcbd6bc20b05798565fca9401755a1f40b6dced512ee34a6cd21d796b55a4c8ae22c9521f7d80688e16e3d5d921e1bd8921fbd3c6cc95529a3 SHA512 aad0213d70c06b02d647a4de4a4fdcd9970e7bda6f3ba0b33e9ba05677af617302b3a557e7cb13560c9057c3b11fbc27cf5e8e7511297058ad9599a04c8381a3
 DIST scons-2.4.1-user.html 1110981 BLAKE2B 3c2c7c3bb283e18e63b5dfe64928c2821ceb74ac6d5f4c4fc08f0ceb98ef25f6114308d02d65be0ee8231e367556bdce0f76f1f37bb9d3c1ab813a653fda2f54 SHA512 e73caa3daedb5da419a417dbec73a3958da162311e9ad09a7d5e9d6989686b24cf5c1b34fdb1d547a43de1da36e99566e6c367fde05af032a2d1000a7e12270c
 DIST scons-2.4.1-user.pdf 2527773 BLAKE2B 16c9a90fd57af7552f8d05fcf018ed99b76d29c148169dee4fd610aa40e439448f5a7a6e8ba8d72830a605a26141927f5dcd1643f99a1bfe9433d87350e96569 SHA512 d53d41e51096d1923e168054d335da1498e9ca338e39aef7985967f839656d368b65a8b979dac701ca1c529deeff4a79f402f058d23ef4e658f849ce0784eb45
 DIST scons-2.4.1.tar.gz 638990 BLAKE2B 44084dd396d8cbe63da59aed706cda7342bbe51dd4f78bd324ad6ce822ae45b9da1099400e1dfeafdb2e4e8f1906e88be423598cc2c2915a1544f37285b31297 SHA512 bd0830719dfc0c2e8620ec767ee6342af74a170cd895acda2995761eafe52e1efa9471626fcaedb0dd9a779ef9bb9b4306bd6cd3c2a5bd7bd2500018b40653e0
-DIST scons-2.5.0-user.html 1111090 BLAKE2B 80a4c7230861a52678610df382f31f6d03a2c6b3ff016921b971b52a9960e2e57c922f3b0afdb4a20429cf1f6056f8de4a1727ac97b41f7196a99ccb5573aa46 SHA512 650be28d9be4322b51d31c001ffce339aa926dd3aa2b59c4e16e34151c26f0aa62f9d7a7407d0bcf1ae0e5f10e2e31a5adb66a7a189afac084101c6b0dc209e4
-DIST scons-2.5.0-user.pdf 2527810 BLAKE2B 1f94dde46c828f3e1ac44f90c78dc95ed7aa644393c9def5d3f1f009c6fa8b445685cdf07d91b2b9b81978a39d5ef77bd6a121966c37a699f2efd6f4587412b0 SHA512 f8572db6d2fb4e6c4814d785fcde0a2c0bbe647265bf8b8904c315cf46af60636f273843d757f630b9a70f33762cca7010c4dc475143be670ee1c008e6be9155
-DIST scons-2.5.0.tar.gz 619991 BLAKE2B 3bbf5b1411bdacbad821076ebff859f229589f62f771d1e4e6f4010c539ac9c863f6705b8be36c3e63a64e3a5fe325450787754e39adedd728987de6f7073d1e SHA512 abb0069976390182b77dbf6f20819c30ccf5fe9f58032eef7694ef408dceb63cfd1d1be69e7c0bced8a179297243b1a93924dd5064cd7c123ea118619bb53572
 DIST scons-2.5.1-user.html 1112180 BLAKE2B 93df42b296d1be6ffcb73143c5ec9f46225e3e9d07154cf8f703d5f624d2996d85569ff302093a7a73dc0001cfeddf49ee9e57d9a1939d3c6b4689f8773e3ede SHA512 5be58a6bba4b92fc51f0b271fd7e08b820dda10775aaa40a012c0e54d485e02ebf6d0d0be379bd90980a9b496e86a951c8760a4a90107fb3b8f422e874e46046
 DIST scons-2.5.1-user.pdf 2522755 BLAKE2B 0dbf4ec98cd1dfb4889595762fdf57c2988a6784d75f8c3ac53e79d686b745ae4dd7b674ce34d61255c798e203fb6de93eaaf936a4842b27990350fa73b6bd46 SHA512 0bd7f67a1355ec33125bef87ce1bc352bda5b0befd9809673a427851c843191d74930b4ca9add705152393521f81d926595d173b0101013da216217dc5b64397
 DIST scons-2.5.1.tar.gz 620909 BLAKE2B 021e02583dab06a859e46d164be79dcaa49a1a383c5d3fb9baa64afabb793e049b7ebefff1bbbcc8be1f364ca5c64e1a9c7ef937c32407853e39f4d84a91e51d SHA512 0e39f7f22a6c4ecc13edcd843b050754da5ded5371b3a8b406395f7b53dd280f95f804707eec271f8de3624d06f5b4ba3cc788dc4eb891cad224a163544f51b9
 DIST scons-3.0.0-user.html 1111001 BLAKE2B 99a4994b161522535386ea7c0b60755653e782fb67eb725336f5afd3101efcece3036e729c1282f6006c1e291544641a4e2d4f1887fd1ed2378be424bd9a6ca4 SHA512 fb03770d2ca37d33acafa79a76db2fe5378b16f7717bcbf2c80bb8f8244678bf4418ba2cf8631bd5abfb782af2e22e00a77e889cf4f9a69fa1c49d7dc690d5b6
 DIST scons-3.0.0-user.pdf 2376928 BLAKE2B fed5b4b43f4ce387f6ed0a7ca9017e087ba9bd341bcf02e93c223f4fe1e60935b70dcee73e048e206ccc663bd9413231e05266656623c32d97536116e1a5db88 SHA512 826653a8d6700b8faab6e22451fbf0839b2d639db1492334fbcec39f224d19b2d076f49d6cb167c085e8285e4b7022329042d805066922c2edb20db3322816a4
 DIST scons-3.0.0.tar.gz 630418 BLAKE2B c700ebf316932993540c52735af5ae9a2044a35cf2a1c7324d213059f16e0cd45370432fa32b96fd2e4f328add97ff8d608f73da85ae0b952fd97ba0a727b876 SHA512 e52c31a21f8aab4bbb684a8770cbcb9eeef042d5c8c86ea2f4beb64ec0c50bc1ca4aa738a2bf92330bd26f8fa9589cb10314dc53defccc2825a5a13b01641b2d
-EBUILD scons-2.3.5.ebuild 1728 BLAKE2B f66dc2ad04cc529027804e9a80399df6a18bb09fb6d269389522b9d41ae138941b5f6c3c5de9b5f68e370f866f2ee0754fe084fc8b903e424b3a333942e5cc1b SHA512 e1a645980bb9e096c558a0f3925f7019ddfb6823792e81bffc632a76e45b6724866ded80502ef806a921bdc99661b3ad6f2c1809823300b7b897662cb0b975c3
 EBUILD scons-2.4.1.ebuild 1703 BLAKE2B 1fffba6edc3540869ce1af6c0a2e199614886610a464031395dd72e8f1311b703a398d9abb56eae9a67d4654529ec2fe06b8465f00fe83c442e251875dc53317 SHA512 69f7b513981e51bf547aad20f31af7ee98b77bb11bc10257499f92ea32d4a664cf83d77cabea81a56b068f2c18a40503567611e7ba78b987d4c6de1d52648b90
-EBUILD scons-2.5.0.ebuild 1713 BLAKE2B 39a4a520b0c9b8c06abe1570d6036bd25891a901b4e72c605f7ea2fba9b6bf352405a5fbae31a19d51019ed67ed330f5549f11950467d7e3a11f65b642742687 SHA512 223a1b338295c4e1aecfe8765344ba026367ba0d2cacfb269c40a9cf880baba1cd51932c93ee70b78d3666dce97c9047fb49df0c55f74de1525b46356aadeddd
 EBUILD scons-2.5.1.ebuild 1725 BLAKE2B 30886b9cc82f13a772e1308680dc2e2cfa419a0fd24ac35610dcac89afcaf7cceb91e5c9af0103e9bf9d6e899af7c6855c5e7abc0f027ed962509a5f022503f8 SHA512 a5fa3ee3607112a4985b60c1b8cba91430b46770d5bc9161b344a697bb02af5d7d109c16e268a716eba80098a0743816b6afa6abd1f38fc17736f726c14f26e3
 EBUILD scons-3.0.0.ebuild 1745 BLAKE2B d70c095a6dc1b176b838d2f2b837f8c2ae10f91effaa66695161d2c5b318b5f7e9787cd692b8e3f382c9a1f9e44aa53e5ba1f058075be94fa9bfb513eb11d031 SHA512 f9431d9fde567661f8e3e3d101cda45be797ee2f24276c7d3b91a47bee6bf15222bfc61b213e56ac27ad18ad0038188b583f167aa85c626cc92e21fe0c593970
 MISC metadata.xml 704 BLAKE2B 448bfef70e4f230008c21d8e542618a52f9761295ed33f1c7385a2a678bcb29d1028792e221441f9ba61fecb34646f5ef0f04795e28b17e8d4aeacbabf8751f2 SHA512 62e5c8c23f1c67c218ff6b33c1f941ac3c258b39a5b2d799bedceb734aa5b2e29a718f90823ab5bf199e9d1eb8236aefaddcbff99c6d03f58987fb4936b10aa6
diff --git a/dev-util/scons/files/scons-2.1.0-jython.patch b/dev-util/scons/files/scons-2.1.0-jython.patch
deleted file mode 100644
index ca04e12031e1..000000000000
--- a/dev-util/scons/files/scons-2.1.0-jython.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://scons.tigris.org/issues/show_bug.cgi?id=2791
-
---- setup.py
-+++ setup.py
-@@ -325,7 +325,7 @@
-                 self.copy_scons(src, scons_version_bat)
- 
-         # --- distutils copy/paste ---
--        if os.name == 'posix':
-+        if hasattr(os, 'chmod'):
-             # Set the executable bits (owner, group, and world) on
-             # all the scripts we just installed.
-             for file in self.get_outputs():
diff --git a/dev-util/scons/scons-2.3.5.ebuild b/dev-util/scons/scons-2.3.5.ebuild
deleted file mode 100644
index 2c581c3b0cbf..000000000000
--- a/dev-util/scons/scons-2.3.5.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 pypy )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Extensible Python-based build utility"
-HOMEPAGE="http://www.scons.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	doc? ( http://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
-	       http://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html )"
-
-LICENSE="MIT"
-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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="doc"
-
-PATCHES=( "${FILESDIR}/${PN}-2.1.0-jython.patch" )
-
-python_prepare_all() {
-	# https://bugs.gentoo.org/show_bug.cgi?id=361061
-	sed -i -e "s|/usr/local/bin:/opt/bin:/bin:/usr/bin|${EPREFIX}/usr/local/bin:${EPREFIX}/opt/bin:${EPREFIX}/bin:${EPREFIX}/usr/bin:/usr/local/bin:/opt/bin:/bin:/usr/bin|g" engine/SCons/Platform/posix.py || die
-	# and make sure the build system doesn't "force" /usr/local/ :(
-	sed -i -e "s/'darwin'/'NOWAYdarwinWAYNO'/" setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install() {
-	distutils-r1_python_install \
-		--standard-lib \
-		--no-version-script \
-		--install-data "${EPREFIX}"/usr/share
-}
-
-python_install_all() {
-	local DOCS=( {CHANGES,README,RELEASE}.txt )
-	distutils-r1_python_install_all
-
-	use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	# Build system does not use build_scripts properly.
-	# http://scons.tigris.org/issues/show_bug.cgi?id=2891
-	python_replicate_script "${ED}"usr/bin/scons{,ign,-time}
-}
diff --git a/dev-util/scons/scons-2.5.0.ebuild b/dev-util/scons/scons-2.5.0.ebuild
deleted file mode 100644
index 1229463da8c0..000000000000
--- a/dev-util/scons/scons-2.5.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 pypy )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Extensible Python-based build utility"
-HOMEPAGE="http://www.scons.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	doc? ( http://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
-	       http://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html )"
-
-LICENSE="MIT"
-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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc"
-
-#PATCHES=(  )
-
-python_prepare_all() {
-	# https://bugs.gentoo.org/show_bug.cgi?id=361061
-	sed -i -e "s|/usr/local/bin:/opt/bin:/bin:/usr/bin|${EPREFIX}/usr/local/bin:${EPREFIX}/opt/bin:${EPREFIX}/bin:${EPREFIX}/usr/bin:/usr/local/bin:/opt/bin:/bin:/usr/bin|g" engine/SCons/Platform/posix.py || die
-	# and make sure the build system doesn't "force" /usr/local/ :(
-	sed -i -e "s/'darwin'/'NOWAYdarwinWAYNO'/" setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install() {
-	distutils-r1_python_install \
-		--standard-lib \
-		--no-version-script \
-		--install-data "${EPREFIX}"/usr/share
-}
-
-python_install_all() {
-	local DOCS=( {CHANGES,README,RELEASE}.txt )
-	distutils-r1_python_install_all
-
-	use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	# Build system does not use build_scripts properly.
-	# http://scons.tigris.org/issues/show_bug.cgi?id=2891
-	python_replicate_script "${ED}"usr/bin/scons{,ign,-time}
-}
diff --git a/dev-util/shadowman/Manifest b/dev-util/shadowman/Manifest
index e94335427e8d..a46489a56b81 100644
--- a/dev-util/shadowman/Manifest
+++ b/dev-util/shadowman/Manifest
@@ -1,6 +1,4 @@
-DIST shadowman-1.tar.gz 3337 BLAKE2B 6253bbdef18f3b48adfc04553b08d63b81fadb531ab3feedd328a4d084e57837af11fa18feec3f9acbc9d11833aed481b175cfce6897fe4d7607a73e5a85df62 SHA512 9ec41c53444a20ba3e3d69c33f1ecdce46dbcd911de5b024cab84f2573ccb772b508b5c79f6f9cafda0cc4ab5a8de7414fa8d893a1ca5b86fabd0b2cfb62f6d2
 DIST shadowman-2.tar.gz 3349 BLAKE2B 2881c0487205c00114967be7600ef5483cc64c7ad5ed5cac60fe8bf2ca17e5b06d5df6e39148d90ff68a51d3e918ca616d0c5eedf11366df90c788a07e4c63b0 SHA512 eeb10248c7f76116352bffa671ab7c761b2f79cb943de20dba327b0d7bf1126d15021508c9e9389b9f0c37cf5049ad2c67bad93f6a03340fcfd27e03c4969110
-EBUILD shadowman-1.ebuild 584 BLAKE2B 5e6a1bfed7db2d7dba4f0f60950c4dc0512eaf6a053501a3c1b0f31ce0f8ec2065ed052cfd1bae727933a854c1567eaef1bcba0da3d117af8a8ca1e787f5b599 SHA512 0000f3bc020f31120634282069c19107c814f20030797bad94a3588579a9bd0ce434569974e9a1352a67b95c3d2446cf4becafc49373ef78a4623056c266a631
 EBUILD shadowman-2.ebuild 607 BLAKE2B 1f9fe593a50a6c29c8d02764e64f64d231f06a1b3fea1a2a9c8ed84d892dcaa55d7013ce4e36c988f9cf6f1a5d0acb46b9d60bd440d365a5009f420fa806440f SHA512 196522ec2088b917ddf865f48b0f1c32ae0a17b228ed2d5ea84927e823d492d677de7f98855b8c7bd2843ebe6a67d0643bd60e9a31ef799ccae0b2133c9d131f
 EBUILD shadowman-9999.ebuild 568 BLAKE2B 199779d69123dae88d3024a00370b24a898f40ce7aca43257e0dfd3a9747f5b969133cffce9aa70ff1fa0555a18442e4170829df7d27d397ea10b96136a76524 SHA512 4325db35429e59387690b10c09e86268e79e3a4a5e968075f36155fbcd5af7e0ec0a79b6a08b6e9e74ea5cad6727be0697abebcc63ba48c7449cd54141edd794
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-util/shadowman/shadowman-1.ebuild b/dev-util/shadowman/shadowman-1.ebuild
deleted file mode 100644
index df3f6d1f3b81..000000000000
--- a/dev-util/shadowman/shadowman-1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Unified compiler shadow link directory updater"
-HOMEPAGE="https://github.com/mgorny/shadowman"
-SRC_URI="https://github.com/mgorny/shadowman/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-admin/eselect"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	# tool modules are split into their respective packages
-	emake DESTDIR="${ED}" install \
-		INSTALL_MODULES_TOOL=""
-	keepdir /usr/share/shadowman/tools
-}
diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index 88751694f08f..6e9df23fac4f 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -1,8 +1,6 @@
 DIST strace-4.16.tar.xz 966668 BLAKE2B b3c593b2fc17d540ca04a05886fc0d37b3445a4e88f5e93035bc9dbeb6fe21678b9018f052ba8e356a51d0a5013ec8863a50f8fcd5dcfd1d8b9ac4a6363f2d71 SHA512 d1a7b782cb8196eb95b431b66f9b0eff7886869a7e3a4618d985f73b2eed7590ba73150b9c33e55ee5c65fc8f863588b64c5611dca7b5d7a4183110eaf4451d5
-DIST strace-4.19.tar.xz 1113124 BLAKE2B 7018df9a1efd5e732cbef9eb3907e9cff8eafcee0b69853c54627d244ab55bae1ed295ac06a36314f3e88ce9e623fbe147a59f3519352e8d4d3a0d552d0bc884 SHA512 91d57f58ac0e70ff4dcd69fda3cb835de7f40a9152817427e9c264773f99015badbad7bab047ce7f69001b689b1ce54af9522a9738060823de8873bee1e0c629
 DIST strace-4.20.tar.xz 1132460 BLAKE2B 2e0e3080008ed1d5fd87572df740af8c62ebba44e0ece3c6b5ab581f246e79d8074a7fc2d0857abe158a055042fccbd880e11c9567beca1aeddc23f92d763c2d SHA512 869b3b9c48401619073a021e20e80cce37d8884f615bdb52dac9e6a2903df11507d7a0cb0ccad75bcc03d8dfafead0e68d14267e663503e94849079c9a2ebd4c
 EBUILD strace-4.16.ebuild 1804 BLAKE2B 3b572e70ba3f15553e3824eb39ed66cc21972ab0a9c98e2b58eb82de9639b8a14aea7506013256fb5c08f58cab143e33715dd21bede0aff9173b0196a66f28c4 SHA512 cfd07c1a3cc8794c4eb518b41ee9ba256e5019b68c0b8cae5dbf3c395731b918114da43289bd5c29ff0d06b2f169d23fbe76fcef2f5364a6dd72942f24ebbcaf
-EBUILD strace-4.19.ebuild 1817 BLAKE2B eb572e07f4fe3dd676d15c70ba43228d123dd192a358a248de418bc92b3da7297acfeb28ab411939c3360102c68ae2801170877d1a1f742c896c8c85c1cd497b SHA512 93dbae7968097b2283344eac1fa152d3d279d358f025b647c49c250e045a46fd85243a79463a619d80a0748bbee67f8051dc8b640f0f187567d24f8609a6e24e
-EBUILD strace-4.20.ebuild 1807 BLAKE2B 338dbc774d412c49960cfc6b036bd704582b7c9d345afa87796f4619f6bbb2b03f4dcb07a6b50b7a2f3b05d836fddd79493800dfd3a78f7899199c5c31590e2b SHA512 59bb42f86b4fc9c40cfb8c0ba7e5eae44984eec4cf0ea6b1c9cdf6928f67f0fe57fa142da85f91e4d11a7581616fbfc40b48e744ea737c974117da3f4b10368f
-EBUILD strace-9999.ebuild 1807 BLAKE2B 338dbc774d412c49960cfc6b036bd704582b7c9d345afa87796f4619f6bbb2b03f4dcb07a6b50b7a2f3b05d836fddd79493800dfd3a78f7899199c5c31590e2b SHA512 59bb42f86b4fc9c40cfb8c0ba7e5eae44984eec4cf0ea6b1c9cdf6928f67f0fe57fa142da85f91e4d11a7581616fbfc40b48e744ea737c974117da3f4b10368f
+EBUILD strace-4.20.ebuild 1973 BLAKE2B 412b8994c819e0e13e9e98f5b2e831046f77a48fff782deeb3f4715adcea979ffc1e51aa4fca4d8d34bd29ced21c7a729cb2c3281ba6e968d1c130e50a276e0b SHA512 0329814e518cab45d476d6fe4244b5b3a2bb9449f5cc4a33fa1a17e6af39624c6481b114ffebe5264c9e34bf78f32918a1e9070d37d36329fec96b95d8a29012
+EBUILD strace-9999.ebuild 1974 BLAKE2B f3315727c093ae27f58cc89a3b349e6c85863b09e8a2595890916b0bb4956aaa90b3f36581904cfe5c5ebb942243a63b504b3c3e085d9625b00e28f20479458f SHA512 bb5f51ff496c447567594ad51fca30114344f961a3efc55f27ab62279fe27ac3b2446582cc95b0572efe3d1a4e63347a9dd70ecb599ea6879a0141049fe57040
 MISC metadata.xml 593 BLAKE2B 8ee093aa497166817f6dc6086494cd01ea3a232d8d62fe36228cfb79ff8e5c5cc10a7880a6b2f3559cc2d2f190607d83228acacc77a44a0831202418dba64c44 SHA512 67300cfcaba830a47e49cd327bf2d8490b084b016a321fd6e19e52d8dc28968395b3ffc114675a7d4dc723a9ddd7b57c3ede10207a226d60a2225f88aceb59e4
diff --git a/dev-util/strace/strace-4.19.ebuild b/dev-util/strace/strace-4.19.ebuild
deleted file mode 100644
index 24bc92be859d..000000000000
--- a/dev-util/strace/strace-4.19.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit flag-o-matic eutils toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.code.sf.net/p/strace/code"
-	EGIT_PROJECT="${PN}"
-	inherit git-2 autotools
-else
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
-fi
-
-DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
-HOMEPAGE="https://sourceforge.net/projects/strace/"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="aio perl static unwind"
-
-LIB_DEPEND="unwind? ( sys-libs/libunwind[static-libs(+)] )"
-# strace only uses the header from libaio to decode structs
-DEPEND="
-	static? ( ${LIB_DEPEND} )
-	aio? ( >=dev-libs/libaio-0.3.106 )
-	sys-kernel/linux-headers
-"
-RDEPEND="
-	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	perl? ( dev-lang/perl )
-"
-
-src_prepare() {
-	epatch_user
-
-	if [[ ! -e configure ]] ; then
-		# git generation
-		./xlat/gen.sh || die
-		./generate_mpers_am.sh || die
-		eautoreconf
-		[[ ! -e CREDITS ]] && cp CREDITS{.in,}
-	fi
-
-	filter-lfs-flags # configure handles this sanely
-	use static && append-ldflags -static
-
-	export ac_cv_header_libaio_h=$(usex aio)
-	use elibc_musl && export ac_cv_header_stdc=no
-
-	# Stub out the -k test since it's known to be flaky. #545812
-	sed -i '1iexit 77' tests*/strace-k.test || die
-}
-
-src_configure() {
-	# Set up the default build settings, and then use the names strace expects.
-	tc-export_build_env BUILD_{CC,CPP}
-	local v bv
-	for v in CC CPP {C,CPP,LD}FLAGS ; do
-		bv="BUILD_${v}"
-		export "${v}_FOR_BUILD=${!bv}"
-	done
-
-	econf $(use_with unwind libunwind)
-}
-
-src_install() {
-	default
-	use perl || rm "${ED}"/usr/bin/strace-graph
-	dodoc CREDITS
-}
diff --git a/dev-util/strace/strace-4.20.ebuild b/dev-util/strace/strace-4.20.ebuild
index 458e7d64d80e..e445febc7869 100644
--- a/dev-util/strace/strace-4.20.ebuild
+++ b/dev-util/strace/strace-4.20.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
@@ -66,6 +66,15 @@ src_configure() {
 	econf $(use_with unwind libunwind)
 }
 
+src_test() {
+	if has usersandbox $FEATURES ; then
+		ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..." #643044
+		return 0
+	fi
+
+	default
+}
+
 src_install() {
 	default
 	use perl || rm "${ED}"/usr/bin/strace-graph
diff --git a/dev-util/strace/strace-9999.ebuild b/dev-util/strace/strace-9999.ebuild
index 458e7d64d80e..cfa22a181d7a 100644
--- a/dev-util/strace/strace-9999.ebuild
+++ b/dev-util/strace/strace-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -66,6 +66,16 @@ src_configure() {
 	econf $(use_with unwind libunwind)
 }
 
+src_test() {
+	if has usersandbox $FEATURES ; then
+		ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..." #643044
+		return 0
+	fi
+
+	default
+}
+
+
 src_install() {
 	default
 	use perl || rm "${ED}"/usr/bin/strace-graph
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 841d0edfa7f4..cd264f665aa1 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/tmpfiles.eclass b/eclass/tmpfiles.eclass
index 6a461d4df859..746225784128 100644
--- a/eclass/tmpfiles.eclass
+++ b/eclass/tmpfiles.eclass
@@ -55,7 +55,7 @@ if [[ -z ${TMPFILES_ECLASS} ]]; then
 TMPFILES_ECLASS=1
 
 case "${EAPI}" in
-6) ;;
+5|6) ;;
 *) die "API is undefined for EAPI ${EAPI}" ;;
 esac
 
diff --git a/eclass/x-modular.eclass b/eclass/x-modular.eclass
index 56d8a367990e..7c5ea3fbd90c 100644
--- a/eclass/x-modular.eclass
+++ b/eclass/x-modular.eclass
@@ -1,5 +1,8 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
+# @DEAD
+# Removal on 2018-02-01.
 #
 # DEPRECATED
 # This eclass has been superseded by xorg-2
diff --git a/games-board/Manifest.gz b/games-board/Manifest.gz
index f3ff7a04908d..16d497a92350 100644
--- a/games-board/Manifest.gz
+++ b/games-board/Manifest.gz
diff --git a/games-board/capicity/Manifest b/games-board/capicity/Manifest
deleted file mode 100644
index da83edf1a450..000000000000
--- a/games-board/capicity/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST CapiCity_1.0.tar.gz 363899 BLAKE2B b536f2c16bdaa2a11e42550cadfe0be092b82e6d3bd2d655c8214748cd040a8fe662d953dea7dcf219475c2fc5ea347f0b76be2f72d55b14d445e4e2c81f822d SHA512 0d2b03bb806e13dabe8fad8dc8c00ce43944229e79f2ad573bd3d4e384e472937818558ddc2ff9e5d45c88bf66d2300d447265c0d4045255ca626dbc26dcc0cc
-DIST Capid_1.0.tar.gz 95151 BLAKE2B 9dfd68c79b3079ee2d7d6f2f4b4a53c7570ec9512b0d9dc69a1013f9cb4186b476f174937e2cfa8988b2eccf44ec00fd995b1fd001eb919edce35987580f3c37 SHA512 9bb9bf3e8dc17689cf404dae414759821317b100e553f074fc1a66921fa59161df48839f3f26c040c3045621ff4ab62af3b9919509cef0d9f21bf8a03003166a
-EBUILD capicity-1.0-r1.ebuild 1296 BLAKE2B 731e88fea5ef51add7098b68c708e79b81359b4cb677c4b214f96d29ff76590a2251c7bd951408b039d4a4a3c5e07dc24addec183c7b5ea95b0bdb31460032d2 SHA512 47832a829370fb829a3dbff2e2701a2d57813b7d1138f669fc0a77c18aff29291f2ce3f49d1e05e749607915753a37121528ce9836f9d3f425c45579a6c43ed0
-MISC metadata.xml 333 BLAKE2B e08d45bfb7e2ce28435ec06f2e685adcf4c08daee07ba779a9133530856ce6cba42c2c531aa4b35d468e01b7ebfef89c8afb2950e01e02d65c3af8f32973f822 SHA512 c96593a634d3254339541e49b172195e94cbc00b0b0025f205479cd2b112353bdccfbd4c9d61a22aae831831d554e354c6f6158edb98ea1469e45c2430d684ce
diff --git a/games-board/capicity/capicity-1.0-r1.ebuild b/games-board/capicity/capicity-1.0-r1.ebuild
deleted file mode 100644
index 114de8e7f541..000000000000
--- a/games-board/capicity/capicity-1.0-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils gnome2-utils qmake-utils
-
-DESCRIPTION="Monopd compatible boardgame for Monopoly-like games, previously named capitalism"
-HOMEPAGE="http://linux-ecke.de/CapiCity/"
-SRC_URI="dedicated? ( mirror://sourceforge/project/capitalism/Capi%20City/${PV}/Capid_${PV}.tar.gz )
-	!dedicated? ( mirror://sourceforge/project/capitalism/Capi%20City/${PV}/CapiCity_${PV}.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated"
-
-RDEPEND="
-	dev-qt/qtcore:4
-	dev-qt/qtscript:4
-	!dedicated? ( dev-qt/qtgui:4 )"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	default
-	S=${WORKDIR}/$(usex dedicated Capid CapiCity)_${PV}
-}
-
-src_configure() {
-	if use dedicated ; then
-		eqmake4 Capid.pro
-	else
-		eqmake4 CapiCity.pro
-	fi
-}
-
-src_install() {
-	local res
-
-	if use dedicated ; then
-		dobin Capid
-		dodoc doc/*
-	else
-		dobin CapiCity
-		dodoc changelog README
-
-		for res in 16 22 24 32 48 64; do
-			newicon -s ${res} icons/${res}x${res}.png ${PN}.png
-		done
-
-		make_desktop_entry CapiCity "Capi City"
-	fi
-}
-
-pkg_preinst() {
-	use dedicated || gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	use dedicated || gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	use dedicated || gnome2_icon_cache_update
-}
diff --git a/games-board/capicity/metadata.xml b/games-board/capicity/metadata.xml
deleted file mode 100644
index 011e42b48be2..000000000000
--- a/games-board/capicity/metadata.xml
+++ /dev/null
@@ -1,11 +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>
-	<upstream>
-		<remote-id type="sourceforge">capitalism</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-board/holdingnuts/Manifest b/games-board/holdingnuts/Manifest
deleted file mode 100644
index 435c53e3d03d..000000000000
--- a/games-board/holdingnuts/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX holdingnuts-0.0.5-wheel.patch 572 BLAKE2B 24f1b2a030522d53892afa9cb1a6060ee522b7470ebe9cb941084edb39950c782af962cefcc97f20c1989ec76d6724975726adc613a4b24bddb2f15f8da371af SHA512 eb6041b803fab42f78917dc5138d08b2ff7fe3d9aee03b60a250b78744af1ff315008b21e395894e561c794f46a0ebe5b5dc25fb233038a6965e021ef1239f4d
-DIST holdingnuts-0.0.5.tar.bz2 1456227 BLAKE2B 638cd28e997e0b3d86b1ee4b857db02d336ef38495261d890fdc8252918487050a228f2cde367b24f485cef290b22df9042e8111b821491fc0635bffa0e0b8fc SHA512 95eb6d73c5b72c10bf04a03f9fb039bb1573ef74b6a3c820d5cc79fb81b8c6e2df24c5266a4067f4044ce050ba29bf1e2c65c46de50dd7cd3beac4736397053a
-EBUILD holdingnuts-0.0.5-r2.ebuild 1069 BLAKE2B ee1988e91ecddc41d7697d056c1f52d1759bfad3fe823e3756088c378309c4b562a5b0015154935d403853b4f862e472940c31c1ad242a1335ea1dd88d6dada5 SHA512 380bfd541fe187b0e9502e4ef1398c979c05aef2ff2f9dd3c6a31532c3ee3665942693fa14b92bd8ccfb20c813c800894449cf87ab0c191b7837066992e84104
-MISC metadata.xml 342 BLAKE2B 98dbf3e9e55a588512c8cc83fd73a4706fc05865ed277945bd222121ad18e3de2a0082c2b0f7dde1350f419fd16cae7d223a8a682fbdec9ed797296ec0dd24dc SHA512 ef866e273f29f8ad7f511174ab9a8cbd68e3a235b2ca116ce76995afd082e5492b56e04dc6017effba82986fd4ffa8de045ac1e1ebad1af05d25f95c9e099cc1
diff --git a/games-board/holdingnuts/files/holdingnuts-0.0.5-wheel.patch b/games-board/holdingnuts/files/holdingnuts-0.0.5-wheel.patch
deleted file mode 100644
index c5993b64bb8c..000000000000
--- a/games-board/holdingnuts/files/holdingnuts-0.0.5-wheel.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: fixed gamelogic bug with wheel-straight: check suit of ace if testing for straight-flush
-Origin: https://sourceforge.net/apps/trac/holdingnuts/changeset/741
---- a/src/libpoker/GameLogic.cpp
-+++ b/src/libpoker/GameLogic.cpp
-@@ -179,7 +179,11 @@
- 	
- 	// is an A2345-straight ("wheel")
- 	if (count == 4 && (last_face == Card::Two && allcards->front().getFace() == Card::Ace))
--		is_straight = true;
-+	{
-+		// check suit when testing for StraightFlush
-+		if (suit == -1 || allcards->front().getSuit() == suit)
-+			is_straight = true;
-+	}
- 	
- 	if (is_straight)
- 	{
-\ No newline at end of file
diff --git a/games-board/holdingnuts/holdingnuts-0.0.5-r2.ebuild b/games-board/holdingnuts/holdingnuts-0.0.5-r2.ebuild
deleted file mode 100644
index daad81defad1..000000000000
--- a/games-board/holdingnuts/holdingnuts-0.0.5-r2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils cmake-utils
-
-DESCRIPTION="An open source poker client and server"
-HOMEPAGE="http://www.holdingnuts.net/"
-SRC_URI="http://downloads.sourceforge.net/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug dedicated"
-
-RDEPEND="
-	!dedicated? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-		alsa? ( >=media-libs/libsdl-1.2.10:0[alsa] )
-	)"
-
-DEPEND="${RDEPEND}
-	>=dev-util/cmake-2.6.3"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-wheel.patch # upstream patch (bug #307901)
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -i -e '/^Path/d' holdingnuts.desktop || die
-}
-
-src_configure() {
-	local mycmakeargs=(-DWITH_AUDIO=$(usex alsa)
-		-DENABLE_CLIENT=$(usex !dedicated)
-		-DWITH_DEBUG=$(usex debug))
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if ! use dedicated ; then
-		domenu ${PN}.desktop
-		doicon ${PN}.png
-		doman docs/${PN}.6
-	fi
-
-	dodoc ChangeLog docs/protocol_spec.txt
-	doman docs/${PN}-server.6
-}
diff --git a/games-board/holdingnuts/metadata.xml b/games-board/holdingnuts/metadata.xml
deleted file mode 100644
index 882df6af6590..000000000000
--- a/games-board/holdingnuts/metadata.xml
+++ /dev/null
@@ -1,11 +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>
-  <upstream>
-    <remote-id type="sourceforge">downloads</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/games-board/kcheckers/Manifest b/games-board/kcheckers/Manifest
deleted file mode 100644
index 4b37946845b8..000000000000
--- a/games-board/kcheckers/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST kcheckers-0.8.1.tar.gz 81431 BLAKE2B 9d6d00447ae939406e0e14d610f856a07fe802b61d4ffc1a838bb6a700e96fe9423895ec2ec0fdceafb24ea55dc2268b80e67a7d00b477726e54be74c2a61328 SHA512 c5febbcc7f0362169879a29a159c86aa4f3d859ee3bebea243535ca07949366078406b87e5e5534586485601b92a79b621cef7ba96f2224acc5331e3624d1b73
-EBUILD kcheckers-0.8.1-r1.ebuild 708 BLAKE2B 4754da05105ae51fd0950ff6ae0c30584371d85a5bbfb4f4517eda7291c45fcc82b7b57ebc65210c1a724c2cedfdb9f4aea6a3c2906e1d32db5b5acb02774c95 SHA512 535fe0937158ce702bef5ec4983573b2c93c1e2910fa2d03bddcda03011c5d1c2c6c023ce052a1659ca132e4a20295e3211f9009b952787914b9e19f8c19ddc8
-MISC metadata.xml 332 BLAKE2B da1700962386c4d9157f54703e4c16ee17d7348f8cd6ca7008e0bf1594bb0b52529ed7838c9b2ddb37c48ee402dda41a7d2a207b30e7272ba0fb278c5b68f787 SHA512 afa154c499b0a0a6c2e44f65d3ca71f7c512f0d1c060a8318838df90d3d3ce542daa781d78cfd6b3521b8757cbd40569bd234a6143e5c5ed506acc14c86ba413
diff --git a/games-board/kcheckers/kcheckers-0.8.1-r1.ebuild b/games-board/kcheckers/kcheckers-0.8.1-r1.ebuild
deleted file mode 100644
index b88b44e2866f..000000000000
--- a/games-board/kcheckers/kcheckers-0.8.1-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils qmake-utils
-
-DESCRIPTION="Qt version of the classic boardgame checkers"
-HOMEPAGE="http://qcheckers.sourceforge.net/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND="dev-qt/qtgui:4"
-RDEPEND=${DEPEND}
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "s:/usr/local:/usr:" \
-		common.h || die
-}
-
-src_configure() {
-	eqmake4
-}
-
-src_install() {
-	dobin kcheckers
-
-	insinto /usr/share/${PN}
-	doins -r i18n/* themes
-
-	newicon icons/biglogo.png ${PN}.png
-	make_desktop_entry ${PN} KCheckers
-
-	dodoc AUTHORS ChangeLog FAQ README TODO
-}
diff --git a/games-board/kcheckers/metadata.xml b/games-board/kcheckers/metadata.xml
deleted file mode 100644
index 7212e2dc377e..000000000000
--- a/games-board/kcheckers/metadata.xml
+++ /dev/null
@@ -1,11 +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>
-	<upstream>
-		<remote-id type="sourceforge">qcheckers</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-board/qcheckers/Manifest b/games-board/qcheckers/Manifest
deleted file mode 100644
index 577b59feed50..000000000000
--- a/games-board/qcheckers/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST QCheckers-20091230.tar.gz 45259 BLAKE2B f631f29ca856315c798c29253f8d5d895f0c9eede8b336b7a9bd3d8eed222b4130602b22bb61a1922b7afb3871005adfa696c8fbab26d1990a19062e0473c9ba SHA512 c2cdb679a13804723064e87be1879185d14618e5147ead93b65a65d02100f3c47bed9243d845754b3aa862a0d4f7c803e5df42fa3bc3513b08a9a08b611a3d90
-EBUILD qcheckers-20091230-r1.ebuild 612 BLAKE2B 9acd5d76b0c451b4ca925f3111cacf8223604fa904cbb698eef5604bca1aa16152fe15b288a380730f7f5d67504ee5ba929fae463965f230153055d769ee272a SHA512 32681dec992e7a2e81a8fce212d6520aea12898ff410257f0394861c7668ebdaed99d94507d17f1075e0c09effd508727ff8590e41b3af10d21ccdf9c4ed8345
-MISC metadata.xml 332 BLAKE2B 9727e901c2636045a3e4e069be25bc94c60d1f0d7fb5fb78c5558755b7a2d7a4384731e88f107b2ef016a75e09a5ca1e320de21a287b25eddb4c6db3ac870b9a SHA512 e5a3259c4de6ff928301c78ec2e0282f592eb171f4b1bb9266e865fe2bbb9add46c85909cfdfa2c8472e10d044bce61e7bf1682275df8571881cc5645692cf15
diff --git a/games-board/qcheckers/metadata.xml b/games-board/qcheckers/metadata.xml
deleted file mode 100644
index 578f723f8165..000000000000
--- a/games-board/qcheckers/metadata.xml
+++ /dev/null
@@ -1,11 +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>
-	<upstream>
-		<remote-id type="google-code">qcheckers</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-board/qcheckers/qcheckers-20091230-r1.ebuild b/games-board/qcheckers/qcheckers-20091230-r1.ebuild
deleted file mode 100644
index 89ddf4f6e906..000000000000
--- a/games-board/qcheckers/qcheckers-20091230-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils qmake-utils
-
-MY_PN=${PN/qc/QC}
-
-DESCRIPTION="Qt4 based checkers game"
-HOMEPAGE="https://code.google.com/p/qcheckers/"
-SRC_URI="https://qcheckers.googlecode.com/files/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-qt/qtgui:4"
-RDEPEND=${DEPEND}
-
-S=${WORKDIR}/${MY_PN}
-
-src_configure() {
-	eqmake4 ${MY_PN}.pro
-}
-
-src_install() {
-	dobin ${MY_PN}
-	newicon icons/help-about.png ${PN}.png
-	make_desktop_entry ${MY_PN} ${MY_PN}
-	dodoc README
-}
diff --git a/games-board/qgo/Manifest b/games-board/qgo/Manifest
deleted file mode 100644
index be66aaf84838..000000000000
--- a/games-board/qgo/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX qgo-1.5.4_p20100322-buffer.patch 335 BLAKE2B a5b17eae447c1c3556845691ef6fcdef250218766f1fd6024d350e0c8ec52d70bdcf64f23495a4144b602610ecf0644f659c411c0353c894be5e1f7e6ced7cf5 SHA512 6558ace6412dc924add3fcdc27e9ce7556df6ca96773ca0d2b30c6b581905c1a352f0a4d1ab693d7c381f3fa422ccea43aad214ed2d040409264d0133159b8e0
-AUX qgo-1.5.4_p20100322-gcc45.patch 2831 BLAKE2B d071b036710bcec03680c534be3ad97723befba5688bcd309407ddad0dcb623e783606499d8cfc72d23c4c7d14aa0e605a0455c07b07e82d847b4d3d056ca2ad SHA512 7b52e5216bc5f5f96f62d2d1bb757b1e8b1fa08fcad423ceeede76bfa4efca3151d4b28583f4a14ae4b83ce3d2715e95b24cfb4875d81d56ec10ba0b0d8c3de3
-AUX qgo-1.5.4_p20100322-gcc6.patch 650 BLAKE2B 1f11a991c96bd6e59500887a4da16de32ca1cafb2aabfb8c4061b6c88ee51b160a7c7658447e9c8cea0b010079ae3a5f7b769c69eb6ae653418be2e444915559 SHA512 8cdc3eeed78caa9b2f3f11cb085dbfc299455c2a48a292419047afeecf16adee5db87a04e52d0bbe7d56857619850bbbbf21d0752638538093628d0a4e894865
-AUX qgo-1.5.4_p20100322-qt47.patch 2226 BLAKE2B 8de8a04b4a5b45b61e751c78f0caca9b58957e1fff13d58f8e9db65015a839f4cdf0708040537dbb4a770246995e95057d2ff5f79d54349cb9cc284cd8a1e0c4 SHA512 c63b265f54ba88f0c324dc12ae581e2c933757e33c0997f8a36217b4ef36b3eb8c1190f16fe0ae7ccc8706c81c8212a215e908d4034fcec92476120ecf465ebf
-DIST qgo-1.5.4_p20100322.tar.bz2 2486631 BLAKE2B eb4d97eb5950a95a12669ebba1d11852c7ecdcced373090e5e7e4a9d8dc8d06f42d7abb701d55837b916540856cc237134ae436e77f731e4e3c42dab287b3a8d SHA512 bdb6e5147cc0847ca0cf776ecce5a00af9ebc7bb06d148b79bf073d15fdcfe494a2d71d3fd1c2aa29ea70735fb3208b9b9be42adcb84c894c9d419c12d60f2a6
-EBUILD qgo-1.5.4_p20100322-r1.ebuild 871 BLAKE2B 51b39729a9617801bad158acb3d90c241656a53bbdd77cbbe96e945ebb8e3d06038eb0126f6a8ae377072a67d18aa8ad924050e56fd8bce75569083bb14ff99a SHA512 0d499136ff37af5bd0ba7b9485b982aa424b469747644d3e76bca87c4306942517cb110284347b7e47e16f0a06251b6cc0cc43dcb78f24d9784c4551a4c4931a
-MISC metadata.xml 326 BLAKE2B 45f86256e666268c6a3ac71427950e31f1b52624956ad7ff6d65c0b9f09622fbacdb67f889e1209f97420fe85b34311930d999797a124d5511d18dbe1616cdd1 SHA512 95558e7daaf40fda64ba974d9e565be34e8e02eb261c02da916b77e45b09f71d7b79e0eb7d5c9b13fe8990586d5e6d8689e98581a58a8337fef7b8523abd5cd8
diff --git a/games-board/qgo/files/qgo-1.5.4_p20100322-buffer.patch b/games-board/qgo/files/qgo-1.5.4_p20100322-buffer.patch
deleted file mode 100644
index bdf94eba6d80..000000000000
--- a/games-board/qgo/files/qgo-1.5.4_p20100322-buffer.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/network/tygemconnection.cpp	2014-10-29 23:49:21.436929924 -0400
-+++ b/src/network/tygemconnection.cpp	2014-10-29 23:50:43.481183852 -0400
-@@ -4768,7 +4768,7 @@
- 	unsigned int i;
- 	
- 	QString encoded_name;
--	name[15] = 0x00;
-+	name[14] = 0x00;
- 	int records = (msg[0] << 8) + msg[1];
- 	if((records * 16) + 4 != (int)size)
- 	{
diff --git a/games-board/qgo/files/qgo-1.5.4_p20100322-gcc45.patch b/games-board/qgo/files/qgo-1.5.4_p20100322-gcc45.patch
deleted file mode 100644
index a02fae6df648..000000000000
--- a/games-board/qgo/files/qgo-1.5.4_p20100322-gcc45.patch
+++ /dev/null
@@ -1,77 +0,0 @@
---- a/src/board/board.cpp	2010-06-01 08:20:32.000000000 +0200
-+++ b/src/board/board.cpp	2010-06-01 08:20:54.000000000 +0200
-@@ -347,7 +347,7 @@
- 		}
- 
- 	//redraws the image on a brush to set the background
--	canvas->setBackgroundBrush ( QBrush::QBrush(image));
-+	canvas->setBackgroundBrush ( QBrush(image));
- 
- }
- 
---- a/src/board/clockdisplay.cpp	2010-06-01 08:31:10.000000000 +0200
-+++ b/src/board/clockdisplay.cpp	2010-06-01 08:31:38.000000000 +0200
-@@ -274,13 +274,13 @@
- 
- 	if(b_time > 3600 || w_time > 3600)
- 	{
--		bt = QTime::QTime(0,0).addSecs(abs(b_time)).toString("h:mm:ss") ;
--		wt = QTime::QTime(0,0).addSecs(abs(w_time)).toString("h:mm:ss") ;
-+		bt = QTime(0,0).addSecs(abs(b_time)).toString("h:mm:ss") ;
-+		wt = QTime(0,0).addSecs(abs(w_time)).toString("h:mm:ss") ;
- 	}
- 	else
- 	{
--		bt = QTime::QTime(0,0).addSecs(abs(b_time)).toString("m:ss") ;
--		wt = QTime::QTime(0,0).addSecs(abs(w_time)).toString("m:ss") ;
-+		bt = QTime(0,0).addSecs(abs(b_time)).toString("m:ss") ;
-+		wt = QTime(0,0).addSecs(abs(w_time)).toString("m:ss") ;
- 	}
- 	
- 	switch(timeSystem)
---- a/src/gtp/qgtp.cpp	2010-06-01 08:34:09.000000000 +0200
-+++ b/src/gtp/qgtp.cpp	2010-06-01 08:34:28.000000000 +0200
-@@ -341,7 +341,7 @@
- 	_cpt++;
- 
- 	qDebug("flush -> %s",s);
--	uint i= programProcess->write(QByteArray::QByteArray(s));
-+	uint i= programProcess->write(QByteArray(s));
- 
- //	int j= programProcess->waitForBytesWritten ( 100 );
- 
---- a/src/board/imagehandler.cpp	2010-06-01 08:34:55.000000000 +0200
-+++ b/src/board/imagehandler.cpp	2010-06-01 08:35:17.000000000 +0200
-@@ -93,8 +93,8 @@
- 	{
- 		altGhostPixmaps = new QList<QPixmap>();//::QList();
- 
--		QPixmap alt1 = QPixmap::QPixmap(":/new/prefix1/ressources/pics/alt_ghost_black.png");
--		QPixmap alt2 = QPixmap:: QPixmap(":/new/prefix1/ressources/pics/alt_ghost_white.png");
-+		QPixmap alt1 = QPixmap(":/new/prefix1/ressources/pics/alt_ghost_black.png");
-+		QPixmap alt2 = QPixmap(":/new/prefix1/ressources/pics/alt_ghost_white.png");
- 
- 		if (alt1.isNull() || alt2.isNull())
- 			qFatal("Could not load alt_ghost pixmaps.");
---- a/src/board/mark.cpp	2010-06-01 08:36:39.000000000 +0200
-+++ b/src/board/mark.cpp	2010-06-01 08:36:51.000000000 +0200
-@@ -109,7 +109,7 @@
- 		setPen(QPen(col, 2));
- //	else
- 
--	pa = QPolygon::QPolygon(3);
-+	pa = QPolygon(3);
- 
- //		setPen(QPen(col, 1));
- 	setSize(s, s);
---- a/src/network/gamedialog.cpp	2010-06-01 08:45:26.000000000 +0200
-+++ b/src/network/gamedialog.cpp	2010-06-01 08:45:40.000000000 +0200
-@@ -1123,7 +1123,7 @@
- 	 * probably FIXME, I just wonder why its like that in the first place */
- 	
- 	QPalette p(QApplication::palette());
--	p.setColor(  QPalette::Base , QColor::QColor("cyan"));
-+	p.setColor(  QPalette::Base , QColor("cyan"));
- 	
- 	qDebug("GameDialog::recvRequest");
- 	/* If there's no existing request, then nothing should have changed
diff --git a/games-board/qgo/files/qgo-1.5.4_p20100322-gcc6.patch b/games-board/qgo/files/qgo-1.5.4_p20100322-gcc6.patch
deleted file mode 100644
index 52b4ec2faaf4..000000000000
--- a/games-board/qgo/files/qgo-1.5.4_p20100322-gcc6.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN qgo-1.5.4_p20100322.orig/src/network/cyberoroconnection.cpp qgo-1.5.4_p20100322/src/network/cyberoroconnection.cpp
---- qgo-1.5.4_p20100322.orig/src/network/cyberoroconnection.cpp	2010-02-26 19:43:41.000000000 +0100
-+++ qgo-1.5.4_p20100322/src/network/cyberoroconnection.cpp	2017-10-02 20:33:32.661506058 +0200
-@@ -534,7 +534,7 @@
- 	}
- 	
- 	// this is the initial packet
--	char packet[8] = { 0x0a, 0xfa, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00 };
-+	unsigned char packet[8] = { 0x0a, 0xfa, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00 };
- 	if(write((const char *)packet, 8) < 0)
- 		qWarning("*** failed sending init packet to reconnected host");
- 	return 0;
diff --git a/games-board/qgo/files/qgo-1.5.4_p20100322-qt47.patch b/games-board/qgo/files/qgo-1.5.4_p20100322-qt47.patch
deleted file mode 100644
index 203bf4857258..000000000000
--- a/games-board/qgo/files/qgo-1.5.4_p20100322-qt47.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- a/src/network/playergamelistings.h	2010-11-08 13:49:25.000000000 +0100
-+++ b/src/network/playergamelistings.h	2010-11-08 13:52:24.000000000 +0100
-@@ -66,21 +66,21 @@
- 	bool hidden;
- 	PlayerListing() : id(0), 
- 	online(0),
--	name(0),
--	notnickname(0),
--	info(0),
--	idletime(0),
-+	name(QString::null),
-+	notnickname(QString::null),
-+	info(QString::null),
-+	idletime(QString::null),
- 	seconds_idle(0),
--	rank(0),
-+	rank(QString::null),
- 	rank_score(0),
--	country(0),
-+	country(QString::null),
- 	wins(0), 
- 	losses(0),
- 	rated_games(0),
- 	observing(0),
- 	playing(0), 
--	extInfo(0),
--	email_address(0),
-+	extInfo(QString::null),
-+	email_address(QString::null),
- 	nmatch(0),
- 	nmatch_handicapMin(0),
- 	specialbyte(0),
-@@ -189,7 +189,7 @@
- 	_white_rank_score(0), 
- 	_black_rank_score(0), 
- 	observers(0), 
--	result(0),
-+	result(QString::null),
- 	flags(IN_PROGRESS),
- 	rated(0), 
- 	owner_id(0), 
---- a/src/board/board.h	2010-11-08 13:57:26.000000000 +0100
-+++ b/src/board/board.h	2010-11-08 13:58:17.000000000 +0100
-@@ -50,7 +50,7 @@
- 
- 	void removeGhosts();
- 	void setVarGhost(StoneColor c, int x, int y);
--	void setMark(int x, int y, MarkType t, bool update=true, QString txt=0, bool overlay=true);
-+	void setMark(int x, int y, MarkType t, bool update=true, QString txt=QString::null, bool overlay=true);
- 	Mark* hasMark(int x, int y);
- 	void removeMark(int x, int y, bool update = false);
- 	void removeDeadMarks();
---- a/src/board/boardwindow.h	2010-11-08 14:21:19.000000000 +0100
-+++ b/src/board/boardwindow.h	2010-11-08 14:21:39.000000000 +0100
-@@ -45,7 +45,7 @@
- 	~BoardWindow();
- 	
- 	void init();
--	bool loadSGF(const QString fileName, const QString SGFLoaded=0);
-+	bool loadSGF(const QString fileName, const QString SGFLoaded=QString::null);
- 	bool doSave(QString fileName, bool force);
- 	QString getCandidateFileName();
- 
---- a/src/sgf/sgfparser.h	2010-11-08 14:29:05.000000000 +0100
-+++ b/src/sgf/sgfparser.h	2010-11-08 14:29:27.000000000 +0100
-@@ -51,7 +51,7 @@
- */
- protected:
- 	int minPos(int n1, int n2, int n3);
--	bool corruptSgf(int where=0, QString reason=NULL);
-+	bool corruptSgf(int where=0, QString reason=QString::null);
- 
- 	bool parseProperty(const QString &toParse, const QString &prop, QString &result);
- 
diff --git a/games-board/qgo/metadata.xml b/games-board/qgo/metadata.xml
deleted file mode 100644
index 819cb6fe5c96..000000000000
--- a/games-board/qgo/metadata.xml
+++ /dev/null
@@ -1,11 +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>
-	<upstream>
-		<remote-id type="sourceforge">qgo</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-board/qgo/qgo-1.5.4_p20100322-r1.ebuild b/games-board/qgo/qgo-1.5.4_p20100322-r1.ebuild
deleted file mode 100644
index 7c65e182f470..000000000000
--- a/games-board/qgo/qgo-1.5.4_p20100322-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils qmake-utils
-
-DESCRIPTION="An ancient boardgame, very common in Japan, China and Korea"
-HOMEPAGE="http://qgo.sourceforge.net/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qttest:4
-	media-libs/alsa-lib"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc45.patch
-	"${FILESDIR}"/${P}-qt47.patch
-	"${FILESDIR}"/${P}-buffer.patch
-	"${FILESDIR}"/${P}-gcc6.patch
-)
-
-src_prepare() {
-	default
-	sed -i \
-		-e 's:$(QTDIR)/bin/lrelease:lrelease:' \
-		src/src.pro || die
-}
-
-src_configure() {
-	eqmake4 qgo2.pro
-}
-
-src_install() {
-	emake install INSTALL_ROOT="${D}"
-
-	dodoc AUTHORS
-
-	insinto /usr/share/${PN}/languages
-	doins src/translations/*.qm
-}
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index b7da3bc6a267..264afd1be393 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/dboxfe/Manifest b/games-emulation/dboxfe/Manifest
deleted file mode 100644
index 716ad6ed2327..000000000000
--- a/games-emulation/dboxfe/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX dboxfe-0.1.3-ldflags.patch 636 BLAKE2B 7e6eabd4c47ef4a0035ebb63f02b2ced7b346573a0436cc1e7529dd23b5a7aa5245307a6d93583bc0dc034a057961270220ad08765009874343462803871de8a SHA512 b441765fc8a570375e477eecd3a9ab91739ec80fc0e28d02fea92096044d7d75d3b241b6c2245f85424fd35da5d72e1823afd104a4141c008deb65bc6bf3a37a
-DIST dboxfe-0.1.3.tar.bz2 260934 BLAKE2B a267aa002a662254739fef6d3a92473d6efaae588898d5074c7f6af2f5ab3e35034859d5953a6820a0f7c2fd817922744ca604ee753024d3d108b0706bc76089 SHA512 2c4f56b03daa4701b1c28c6082c89cb5e737c2d808215ea994ecbaf18d7e02a5616291b229768a86e4ff272e4d84fffaf4ec3350efad72b4f6aa6195804a7ad2
-EBUILD dboxfe-0.1.3-r1.ebuild 616 BLAKE2B 9c4e744421b9a6a2a51fa91af763a8f734bb7c16a1fc4e20b1af25dbf1a32459b8668e439b1c75f9b9611504ef93419e5e41e7c483ea1ca6a786db552d9ddbcd SHA512 1e1242877b5b0b1d468c3718a2a43c72ecd9722c9bde13cb7b7baf36b3eacaa035c552a46c2e256c7494127be5d60c52a92fbc1f631bbaf1e3d6e5553176f1c4
-MISC metadata.xml 449 BLAKE2B 8e542a3905f8ffbd0c5ad143caa474490ba297e6b2c6bea689b48b793d65d4e04c56f7c789ee55bcd989b6553cf6764da1c3865399fc6b729d8f3c6083dfa8ee SHA512 adca5c3e992eac7a3f8ba7d81932ddb8b90455b1ad8930abbb779253a416f61349fd61aa749bbdb6c7ec2c6a7e2dd0931168b9fd68ef9a5a03cd9ab537be9884
diff --git a/games-emulation/dboxfe/dboxfe-0.1.3-r1.ebuild b/games-emulation/dboxfe/dboxfe-0.1.3-r1.ebuild
deleted file mode 100644
index 5ada0d983da2..000000000000
--- a/games-emulation/dboxfe/dboxfe-0.1.3-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Creates and manages configuration files for DOSBox"
-HOMEPAGE="https://sourceforge.net/projects/dboxfe.berlios/"
-SRC_URI="mirror://sourceforge/dboxfe.berlios/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-qt/qtgui:4
-	dev-qt/qtcore:4"
-RDEPEND="${DEPEND}
-	>=games-emulation/dosbox-0.65"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-ldflags.patch
-)
-
-src_install() {
-	default
-	dobin bin/dboxfe
-	newicon res/default.png ${PN}.png
-	make_desktop_entry dboxfe "DosBoxFE"
-}
diff --git a/games-emulation/dboxfe/files/dboxfe-0.1.3-ldflags.patch b/games-emulation/dboxfe/files/dboxfe-0.1.3-ldflags.patch
deleted file mode 100644
index b5927823d0cf..000000000000
--- a/games-emulation/dboxfe/files/dboxfe-0.1.3-ldflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/dboxfe.pro	2010-09-29 23:53:38.000000000 +0200
-+++ b/dboxfe.pro	2010-09-29 23:54:11.000000000 +0200
-@@ -83,6 +83,7 @@
- # Unix/Linux settings
- unix{
-   TARGET = dboxfe
-+  QMAKE_LFLAGS += $(LDFLAGS)
-   #QMAKE_POST_LINK = strip -s bin/dboxfe
-   RCC_DIR = .unix/rcc
-   MOC_DIR += .unix/moc
---- a/dboxfetray/dboxfetray.pro	2010-09-29 23:55:31.000000000 +0200
-+++ b/dboxfetray/dboxfetray.pro	2010-09-29 23:56:12.000000000 +0200
-@@ -56,6 +56,7 @@
- # Unix/Linux settings
- unix{
-   TARGET = dboxfetray
-+  QMAKE_LFLAGS += $(LDFLAGS)
-   #QMAKE_POST_LINK = strip -s bin/dboxfetray
-   RCC_DIR = .unix/rcc
-   MOC_DIR += .unix/moc
diff --git a/games-emulation/dboxfe/metadata.xml b/games-emulation/dboxfe/metadata.xml
deleted file mode 100644
index fb66d2dcbef0..000000000000
--- a/games-emulation/dboxfe/metadata.xml
+++ /dev/null
@@ -1,15 +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>
-	<maintainer type="project">
-		<email>wine@gentoo.org</email>
-		<name>Gentoo Wine Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">dboxfe.berlios</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-emulation/mastergear-bin/Manifest b/games-emulation/mastergear-bin/Manifest
index 2425970652b8..a2f48b0e9f09 100644
--- a/games-emulation/mastergear-bin/Manifest
+++ b/games-emulation/mastergear-bin/Manifest
@@ -1,3 +1,3 @@
-DIST MG20-Linux-80x86-bin.tar.Z 160293 SHA256 51f0af3e1c865abd2ab236e25ff7923851f22bd23a25481a1de1201adea10f5d SHA512 378d12d0977d773bf3aab0a4f138ea13b8ceff4db198849b8447e35ff1c43f9a997d7ee9b3bd2515fa40d4e462ea4dde3c0c8ef52a3680c67ea88db98889b7b4 WHIRLPOOL e8a08a7e8853fcffe5f3a5fb397c29b61292c6923538d9adba74c36ec5898959743c452e01510f3b6d90a0528ff24055cbe289c4a27ff964b2bc2bed157c1b30
+DIST MG20-Linux-80x86-bin.tar.Z 160293 BLAKE2B 5c93ac1536855cc9446888d85dc06a3cf4066d8db089affc123ee495b2c0886c341ff4063e7239275e928b0ba386191cc529f75996950e54e042c1f532d82e1b SHA512 378d12d0977d773bf3aab0a4f138ea13b8ceff4db198849b8447e35ff1c43f9a997d7ee9b3bd2515fa40d4e462ea4dde3c0c8ef52a3680c67ea88db98889b7b4
 EBUILD mastergear-bin-2.0.ebuild 565 BLAKE2B 80ebd8d0c095056d883d43f7b94215d951ce11306183532e35618d9d0e68997e28a1a75804595c5c3016f92e86d5ae8395c99a94af433b98b141ce37f6e76658 SHA512 634bf87ad096b148ffbf35a6eb48725dbd1ef095dfe0d007c66e405eadc7db48be5e21b6b8fafabc23df033d7d4e202ecfe752737bdd4b7d86495a2a70d8ea81
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-emulation/virtualjaguar/Manifest b/games-emulation/virtualjaguar/Manifest
deleted file mode 100644
index 8b45604bdb09..000000000000
--- a/games-emulation/virtualjaguar/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX virtualjaguar 695 BLAKE2B 2203485170370d9b67346b4d39d3b2ba5ef097ee3b2ff770442330edd99cbabc53aa71bdcf0b3a2d1d3826af04679bfaa1fb5382680386dcdf2a477a91cde26b SHA512 78967da2cca340559f57a037ad025bd643ac82c9097fa7c892ee2e3ca91e5ce1dc0f4a4fa50013e9d1016d5f308f1502b7c809f686117a5cfffe29262a0d802c
-AUX virtualjaguar-2.1.2-gcc6.patch 13767 BLAKE2B fc3792cd4d58d6f1901591671832d4a2152bcd560e93254969849db6cfb302119b2884b5407ff12660d932a16fc4e6b37d20a725e419ffd53ece08a09d10e9c4 SHA512 0c8360eab5b0ec1a7c179ae1df8f109326879f12dc82c05db0e03c6ab61cb73cd15e38049ad9cd19745c407b7dea8c51b91e1264b190787431c4bd5912c3d795
-DIST virtualjaguar-2.1.2.tar.bz2 2917041 BLAKE2B f9639b27549818b43b446ecf490a50d17c12c8951924e204ceb730afbd1842c5c066f4f20da3d3035f388ea0c698563f6ead3e4a56ffbcc82c39ecb10ddaa63f SHA512 96b842762773631b5df25721d4913f771580c8e23c017a3572539c15a028a4e7743870f2ce3f30380f553781d3beed26693d7e04191efc1475c0cc6fef9f91fb
-EBUILD virtualjaguar-2.1.2-r2.ebuild 1395 BLAKE2B 331f9c6d19636fde606fb2325129943d6c872f7cd3fcda55490aa815fec402afe2e3ed85c70710719c5f77e9c8b4131981d077ee6ed744403f02345da40a7335 SHA512 d817ae1b1b0271bd5ff53d434b0de36036675e0e1c510dc775f1309e7a6a3699c32b22ed8548d5fbff4f21b083c7485d8f60a3afd8b5b5af628e469eb70fe10a
-MISC metadata.xml 416 BLAKE2B 6ea983e3b906fd52e83ee87a9bd8c1600e4918ef83343a9ee8db579a98ff41d0843a945cac16ee6693fd7803ed6008a93ba9e2b6c0eacdfcfc45262acd5d3c02 SHA512 32606c2f70434bafa0bbd1c8a8161169b4274a117cc755967e297843e17775419369401b395446c124d9b5ad0ecd46f980b8177659de1c6cc63f55e3afd2316e
diff --git a/games-emulation/virtualjaguar/files/virtualjaguar b/games-emulation/virtualjaguar/files/virtualjaguar
deleted file mode 100644
index df4bb14d73f8..000000000000
--- a/games-emulation/virtualjaguar/files/virtualjaguar
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-# 
-# Script for launching virtualjaguar 
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-source /lib/gentoo/functions.sh || exit 1
-
-shopt -s nullglob
-
-if [[ ! -d ~/.vj/bios ]] ; then
-    mkdir -p ~/.vj/bios
-fi
-
-if [[ ! -d ~/.vj/eeproms ]] ; then
-    mkdir -p ~/.vj/eeproms
-fi
-
-if [[ ! -d ~/.vj/ROMs ]] ; then
-    mkdir -p ~/.vj/ROMs
-fi
-
-cd ~/.vj
-
-# check for bios
-if [[ -z "`cd ./bios && ls`" ]] ; then
-	# if the bios directory is empty, then ... well ...
-	echo
-	eerror "    Put your BIOS file into ~/.vj/bios/"
-	eerror "    or virtualjaguar will not work!"
-	exit 1
-fi
-
-# execute program (with args)
-exec GENTOODIR/vj "$@"
diff --git a/games-emulation/virtualjaguar/files/virtualjaguar-2.1.2-gcc6.patch b/games-emulation/virtualjaguar/files/virtualjaguar-2.1.2-gcc6.patch
deleted file mode 100644
index 8145de9bbd15..000000000000
--- a/games-emulation/virtualjaguar/files/virtualjaguar-2.1.2-gcc6.patch
+++ /dev/null
@@ -1,316 +0,0 @@
-Backported from following commit:
-
-From c9d57b57d70ab2ae842144828175820fb207a3b0 Mon Sep 17 00:00:00 2001
-From: Shamus Hammons <jlhamm@acm.org>
-Date: Wed, 18 May 2016 00:31:26 +0000
-Subject: [PATCH] Fixes for compilation against GCC 6.
-
-So Debian decides to be more rice than Gentoo, and makes the jump to GCC
-6 for some unknown reason. Thus, in order to prevent VJ from getting
-dumped out of Debian for incompatibility with GCC 6, we have the
-following update. Thanks to John Paul Adrian Glaubitz for the report, and
-to Teemu Hukkanen for Debian chroot advice. :-)
----
- Makefile                     |  2 +-
- src/blitter.cpp              |  2 +-
- src/gui/about.cpp            |  3 +--
- src/gui/controllerwidget.cpp | 10 ++++++----
- src/gui/mainwin.cpp          |  2 +-
- src/jagbios.cpp              |  4 +++-
- src/jagbios.h                |  4 +++-
- src/jagbios2.cpp             |  4 +++-
- src/jagbios2.h               |  4 +++-
- src/jagcdbios.cpp            |  4 +++-
- src/jagcdbios.h              |  4 +++-
- src/jagdevcdbios.cpp         |  4 +++-
- src/jagdevcdbios.h           |  4 +++-
- src/jagstub1bios.cpp         |  4 +++-
- src/jagstub1bios.h           |  4 +++-
- src/jagstub2bios.cpp         |  4 +++-
- src/jagstub2bios.h           |  4 +++-
- src/joystick.cpp             |  4 ++--
- 18 files changed, 48 insertions(+), 23 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 4fd8eae..29f5f49 100644
---- a/Makefile
-+++ b/Makefile
-@@ -65,7 +65,7 @@ virtualjaguar: sources libs makefile-qt
- 
- makefile-qt: virtualjaguar.pro
- 	@echo -e "\033[01;33m***\033[00;32m Creating Qt makefile...\033[00m"
--	$(Q)$(CROSS)qmake $(QMAKE_EXTRA) virtualjaguar.pro -o makefile-qt
-+	$(Q)$(CROSS)qmake -qt=5 $(QMAKE_EXTRA) virtualjaguar.pro -o makefile-qt
- 
- libs: obj/libm68k.a obj/libjaguarcore.a
- 	@echo -e "\033[01;33m***\033[00;32m Libraries successfully made.\033[00m"
-diff --git a/src/blitter.cpp b/src/blitter.cpp
-index 588e6c2..7193daf 100644
---- a/src/blitter.cpp
-+++ b/src/blitter.cpp
-@@ -5387,7 +5387,7 @@ Addq_x		:= JOIN (addq_x, addq_x[0..5], addqt_x[6..15]);
- Addq_y		:= JOIN (addq_y, addq_y[0..15]);*/
- 
- ////////////////////////////////////// C++ CODE //////////////////////////////////////
--	int16_t mask[8] = { 0xFFFF, 0xFFFE, 0xFFFC, 0xFFF8, 0xFFF0, 0xFFE0, 0xFFC0, 0x0000 };
-+	uint16_t mask[8] = { 0xFFFF, 0xFFFE, 0xFFFC, 0xFFF8, 0xFFF0, 0xFFE0, 0xFFC0, 0x0000 };
- 	addq_x = addqt_x & mask[modx];
- 	addq_y = addqt_y & 0xFFFF;
- //////////////////////////////////////////////////////////////////////////////////////
-diff --git a/src/gui/about.cpp b/src/gui/about.cpp
-index 1b3df54..71cec73 100644
---- a/src/gui/about.cpp
-+++ b/src/gui/about.cpp
-@@ -51,9 +51,8 @@ AboutWindow::AboutWindow(QWidget * parent/*= 0*/): QWidget(parent, Qt::Dialog)
- 		"<b>Ryan C. Gordon</b> for Virtual Jaguar's web presence<br>"
- 		"<b>Curt Vendel</b> for various Jaguar & other goodies<br>"
- 		"<b>Reboot</b> for reasons too numerous to mention<br>"
--		"<b>The Free Jaguar Project</b> (you know why) ;-)<br>"
- 		"The guys over at <b>Atari Age</b> :-)<br>"
--		"<b>byuu</b> for BSNES and showing us what was possible"
-+		"<b>byuu</b> for <s>BSNES</s> Higan and showing us what was possible"
- 	));
- 	text = new QLabel(s);
- 	layout->addWidget(text);
-diff --git a/src/gui/controllerwidget.cpp b/src/gui/controllerwidget.cpp
-index f7ea8d0..38ce415 100644
---- a/src/gui/controllerwidget.cpp
-+++ b/src/gui/controllerwidget.cpp
-@@ -47,8 +47,8 @@ char ControllerWidget::hatName[4][16] = { "Up", "Rt", "Dn", "Lf" };
- char ControllerWidget::axisName[2][8] = { "+", "-" };
- 
- // This is hard-coded crap. It's crap-tastic!
--// These are the positions to draw the button names at, ordered by the BUTTON_* sequence
--// found in joystick.h.
-+// These are the positions to draw the button names at, ordered by the BUTTON_*
-+// sequence found in joystick.h.
- int ControllerWidget::buttonPos[21][2] = { { 74, 32 }, { 71, 67 }, { 53, 49 }, { 93, 49 },
- 	{ 110, 200 }, { 110, 175 }, { 110, 151 }, { 110, 126 },
- 	{ 148, 200 }, { 148, 175 }, { 148, 151 }, { 148, 126 },
-@@ -239,7 +239,8 @@ void ControllerWidget::mouseMoveEvent(QMouseEvent * event)
- 
- 	for(int i=BUTTON_FIRST; i<=BUTTON_LAST; i++)
- 	{
--		// We loop through the button text positions, to see which one is closest.
-+		// We loop through the button text positions, to see which one is
-+		// closest.
- 		double distX = (double)(event->x() - buttonPos[i][0]);
- 		double distY = (double)(event->y() - buttonPos[i][1]);
- 		double currentDistance = sqrt((distX * distX) + (distY * distY));
-@@ -265,7 +266,8 @@ void ControllerWidget::leaveEvent(QEvent * /*event*/)
- 
- void ControllerWidget::DrawBorderedText(QPainter & painter, int x, int y, QString text)
- {
--	// Text is drawn centered at (x, y) as well, using a bounding rect for the purpose.
-+	// Text is drawn centered at (x, y) as well, using a bounding rect for the
-+	// purpose.
- 	QRect rect(0, 0, 60, 30);
- 	QPen oldPen = painter.pen();
- 	painter.setPen(QColor(0, 0, 0, 255));		// This is R,G,B,A
-diff --git a/src/gui/mainwin.cpp b/src/gui/mainwin.cpp
-index 9f64c62..cb01b02 100644
---- a/src/gui/mainwin.cpp
-+++ b/src/gui/mainwin.cpp
-@@ -964,7 +964,7 @@ void MainWin::LoadSoftware(QString file)
- 	running = false;							// Prevent bad things(TM) from happening...
- 	pauseForFileSelector = false;				// Reset the file selector pause flag
- 
--	char * biosPointer = jaguarBootROM;
-+	uint8_t * biosPointer = jaguarBootROM;
- 
- 	if (vjs.hardwareTypeAlpine)
- 		biosPointer = jaguarDevBootROM2;
-diff --git a/src/jagbios.cpp b/src/jagbios.cpp
-index 8c03e6f..7951524 100644
---- a/src/jagbios.cpp
-+++ b/src/jagbios.cpp
-@@ -4,7 +4,9 @@
- // NOTE: This is the Jaguar Series K boot ROM
- //
- 
--char jaguarBootROM[0x20000] = {
-+#include "jagbios.h"
-+
-+uint8_t jaguarBootROM[0x20000] = {
- 	0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x08, 0x41, 0xF9, 0x00, 0xF0, 0x00, 0x00, 0x30, 0xBC, 0x18, 0x61, 0x32, 0x3C, 0x35, 0xCC, 0x30, 0x39, 0x00, 0xF1, 0x40, 0x02, 0x08, 0x00, 0x00, 0x05, 
- 	0x66, 0x04, 0x32, 0x3C, 0x35, 0xDD, 0x31, 0x41, 0x00, 0x02, 0x46, 0xFC, 0x27, 0x00, 0x2E, 0x7C, 0x00, 0x00, 0x40, 0x00, 0x31, 0x7C, 0x00, 0x00, 0x00, 0x58, 0x21, 0x7C, 0x00, 0x00, 0x00, 0x00, 
- 	0x00, 0x2A, 0x33, 0xFC, 0x00, 0x04, 0x00, 0xF1, 0x00, 0x14, 0x08, 0x00, 0x00, 0x04, 0x67, 0x00, 0x00, 0x74, 0x33, 0xFC, 0x00, 0xB5, 0x00, 0xF1, 0x00, 0x12, 0x31, 0x7C, 0x03, 0x4C, 0x00, 0x2E, 
-diff --git a/src/jagbios.h b/src/jagbios.h
-index 3f6ae5e..9e9a383 100644
---- a/src/jagbios.h
-+++ b/src/jagbios.h
-@@ -1,6 +1,8 @@
- #ifndef __JAGBIOS_H__
- #define __JAGBIOS_H__
- 
--extern char jaguarBootROM[];
-+#include <stdint.h>
-+
-+extern uint8_t jaguarBootROM[];
- 
- #endif	// __JAGBIOS_H__
-diff --git a/src/jagbios2.cpp b/src/jagbios2.cpp
-index 413e5e6..5076405 100644
---- a/src/jagbios2.cpp
-+++ b/src/jagbios2.cpp
-@@ -4,7 +4,9 @@
- // NOTE: This is the Jaguar Series M boot ROM
- //
- 
--char jaguarBootROM2[0x20000] = {
-+#include "jagbios2.h"
-+
-+uint8_t jaguarBootROM2[0x20000] = {
- 	0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x08, 0x41, 0xF9, 0x00, 0xF0, 0x00, 0x00, 0x30, 0xBC, 0x18, 0x61, 0x70, 0xFF, 0x51, 0xC8, 0xFF, 0xFE, 0x32, 0x3C, 0x35, 0xCC, 0x30, 0x39, 0x00, 0xF1, 
- 	0x40, 0x02, 0x08, 0x00, 0x00, 0x05, 0x66, 0x04, 0x32, 0x3C, 0x35, 0xDD, 0x31, 0x41, 0x00, 0x02, 0x46, 0xFC, 0x27, 0x00, 0x2E, 0x7C, 0x00, 0x00, 0x40, 0x00, 0x31, 0x7C, 0x00, 0x00, 0x00, 0x58, 
- 	0x21, 0x7C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2A, 0x23, 0xFC, 0x00, 0x07, 0x00, 0x07, 0x00, 0xF1, 0xA1, 0x0C, 0x23, 0xFC, 0x00, 0x07, 0x00, 0x07, 0x00, 0xF0, 0x21, 0x0C, 0x23, 0xFC, 0x00, 0x00, 
-diff --git a/src/jagbios2.h b/src/jagbios2.h
-index 9944947..961e585 100644
---- a/src/jagbios2.h
-+++ b/src/jagbios2.h
-@@ -1,6 +1,8 @@
- #ifndef __JAGBIOS2_H__
- #define __JAGBIOS2_H__
- 
--extern char jaguarBootROM2[];
-+#include <stdint.h>
-+
-+extern uint8_t jaguarBootROM2[];
- 
- #endif	// __JAGBIOS2_H__
-diff --git a/src/jagcdbios.cpp b/src/jagcdbios.cpp
-index eea4cf0..a4c407a 100644
---- a/src/jagcdbios.cpp
-+++ b/src/jagcdbios.cpp
-@@ -2,7 +2,9 @@
- // This file was automagically generated by bin2c (by James Hammons)
- //
- 
--char jaguarCDBootROM[0x40000] = {
-+#include "jagcdbios.h"
-+
-+uint8_t jaguarCDBootROM[0x40000] = {
- 	0xF6, 0x1A, 0x8C, 0x5F, 0xF0, 0x28, 0xD5, 0xC2, 0xDE, 0xE7, 0xB6, 0x87, 0xD6, 0xEA, 0x4A, 0x42, 0x9A, 0x9B, 0x2E, 0xCB, 0xE7, 0x35, 0x3C, 0x3B, 0xA2, 0xA6, 0x74, 0xF9, 0xC9, 0x86, 0xE2, 0xD7, 
- 	0x67, 0xC0, 0x9A, 0xFB, 0x61, 0x37, 0x37, 0x89, 0x70, 0x3B, 0xE0, 0x84, 0x97, 0x0A, 0xD2, 0xC5, 0x9F, 0xC1, 0x62, 0xB5, 0x2E, 0xD1, 0x26, 0x02, 0x44, 0xC3, 0xE1, 0xD4, 0xD6, 0xC2, 0xE7, 0x6A, 
- 	0x56, 0x27, 0x2E, 0x60, 0x74, 0xE9, 0x05, 0xCE, 0x65, 0xB9, 0x87, 0x74, 0x64, 0x65, 0xF2, 0xB2, 0x00, 0xF7, 0xFB, 0xBC, 0xB9, 0xA2, 0x2D, 0x73, 0xC1, 0x75, 0xF5, 0xD1, 0xF3, 0xDB, 0xB5, 0x17, 
-diff --git a/src/jagcdbios.h b/src/jagcdbios.h
-index 2fb0861..23e5abe 100644
---- a/src/jagcdbios.h
-+++ b/src/jagcdbios.h
-@@ -1,6 +1,8 @@
- #ifndef __JAGCDBIOS_H__
- #define __JAGCDBIOS_H__
- 
--extern char jaguarCDBootROM[];
-+#include <stdint.h>
-+
-+extern uint8_t jaguarCDBootROM[];
- 
- #endif	// __JAGCDBIOS_H__
-diff --git a/src/jagdevcdbios.cpp b/src/jagdevcdbios.cpp
-index 85dbe91..e4ce4b4 100644
---- a/src/jagdevcdbios.cpp
-+++ b/src/jagdevcdbios.cpp
-@@ -2,7 +2,9 @@
- // This file was automagically generated by bin2c (by James Hammons)
- //
- 
--char jaguarDevCDBootROM[0x40000] = {
-+#include "jagdevcdbios.h"
-+
-+uint8_t jaguarDevCDBootROM[0x40000] = {
- 	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
- 	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
- 	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-diff --git a/src/jagdevcdbios.h b/src/jagdevcdbios.h
-index 432e48c..fe6ae8c 100644
---- a/src/jagdevcdbios.h
-+++ b/src/jagdevcdbios.h
-@@ -1,6 +1,8 @@
- #ifndef __JAGDEVCDBIOS_H__
- #define __JAGDEVCDBIOS_H__
- 
--extern char jaguarDevCDBootROM[];
-+#include <stdint.h>
-+
-+extern uint8_t jaguarDevCDBootROM[];
- 
- #endif	// __JAGDEVCDBIOS_H__
-diff --git a/src/jagstub1bios.cpp b/src/jagstub1bios.cpp
-index 80fdd43..7fb85d5 100644
---- a/src/jagstub1bios.cpp
-+++ b/src/jagstub1bios.cpp
-@@ -2,7 +2,9 @@
- // This file was automagically generated by bin2c (by James Hammons)
- //
- 
--char jaguarDevBootROM1[0x20000] = {
-+#include "jagstub1bios.h"
-+
-+uint8_t jaguarDevBootROM1[0x20000] = {
- 	0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x08, 0x4D, 0xF9, 0x00, 0xF0, 0x00, 0x00, 0x49, 0xF9, 0x00, 0xF1, 0x40, 0x00, 0x3C, 0xFC, 0x18, 0x61, 0x3C, 0xBC, 0x35, 0xCC, 0x46, 0xFC, 0x27, 0x00, 
- 	0x4F, 0xF8, 0x03, 0x00, 0x70, 0xFF, 0x74, 0x02, 0x51, 0xC8, 0xFF, 0xFC, 0x38, 0xBC, 0x80, 0x0D, 0xC4, 0x6C, 0x00, 0x02, 0x66, 0x06, 0x4E, 0xF9, 0x00, 0xE0, 0x1B, 0xFA, 0x41, 0xF9, 0x00, 0xE0, 
- 	0x00, 0x00, 0x47, 0xF8, 0x04, 0x00, 0x30, 0x3C, 0x06, 0xFF, 0x26, 0xD8, 0x51, 0xC8, 0xFF, 0xFC, 0x30, 0x3C, 0x06, 0xFF, 0x24, 0x23, 0xB4, 0xA0, 0x67, 0x04, 0x60, 0x00, 0x12, 0x1A, 0x51, 0xC8, 
-diff --git a/src/jagstub1bios.h b/src/jagstub1bios.h
-index a4b6f72..200e84b 100644
---- a/src/jagstub1bios.h
-+++ b/src/jagstub1bios.h
-@@ -1,6 +1,8 @@
- #ifndef __JAGSTUB1BIOS_H__
- #define __JAGSTUB1BIOS_H__
- 
--extern char jaguarDevBootROM1[];
-+#include <stdint.h>
-+
-+extern uint8_t jaguarDevBootROM1[];
- 
- #endif	// __JAGSTUB1BIOS_H__
-diff --git a/src/jagstub2bios.cpp b/src/jagstub2bios.cpp
-index 884680a..41d55c4 100644
---- a/src/jagstub2bios.cpp
-+++ b/src/jagstub2bios.cpp
-@@ -2,7 +2,9 @@
- // This file was automagically generated by bin2c (by James Hammons)
- //
- 
--char jaguarDevBootROM2[0x20000] = {
-+#include "jagstub2bios.h"
-+
-+uint8_t jaguarDevBootROM2[0x20000] = {
- 	0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x08, 0x4D, 0xF9, 0x00, 0xF0, 0x00, 0x00, 0x49, 0xF9, 0x00, 0xF1, 0x40, 0x00, 0x3C, 0xFC, 0x18, 0x61, 0x3C, 0xBC, 0x35, 0xCC, 0x46, 0xFC, 0x27, 0x00, 
- 	0x4F, 0xF8, 0x03, 0x00, 0x70, 0xFF, 0x76, 0x02, 0x51, 0xC8, 0xFF, 0xFC, 0x41, 0xF9, 0x00, 0xE0, 0x00, 0x00, 0x47, 0xF8, 0x04, 0x00, 0x30, 0x3C, 0x06, 0xFF, 0x26, 0xD8, 0x51, 0xC8, 0xFF, 0xFC, 
- 	0x30, 0x3C, 0x06, 0xFF, 0x24, 0x23, 0xB4, 0xA0, 0x66, 0x00, 0x12, 0x34, 0x51, 0xC8, 0xFF, 0xF6, 0x48, 0x79, 0x00, 0x00, 0x04, 0x64, 0x45, 0xF9, 0x00, 0xE0, 0x15, 0x94, 0x95, 0xFC, 0x00, 0xDF, 
-diff --git a/src/jagstub2bios.h b/src/jagstub2bios.h
-index fcec2e3..c80d98d 100644
---- a/src/jagstub2bios.h
-+++ b/src/jagstub2bios.h
-@@ -1,6 +1,8 @@
- #ifndef __JAGSTUB2BIOS_H__
- #define __JAGSTUB2BIOS_H__
- 
--extern char jaguarDevBootROM2[];
-+#include <stdint.h>
-+
-+extern uint8_t jaguarDevBootROM2[];
- 
- #endif	// __JAGSTUB1BIOS_H__
-diff --git a/src/joystick.cpp b/src/joystick.cpp
-index 4b25493..25aef85 100644
---- a/src/joystick.cpp
-+++ b/src/joystick.cpp
-@@ -137,6 +137,6 @@ uint16_t JoystickReadWord(uint32_t offset)
- 		if (offset0 != 0xFF)
- 		{
--			uint8_t mask[4][2] = { { BUTTON_A, BUTTON_PAUSE }, { BUTTON_B, -1 }, { BUTTON_C, -1 }, { BUTTON_OPTION, -1 } };
-+			uint8_t mask[4][2] = { { BUTTON_A, BUTTON_PAUSE }, { BUTTON_B, 0xFF }, { BUTTON_C, 0xFF }, { BUTTON_OPTION, 0xFF } };
- 			data &= (joypad0Buttons[mask[offset0][0]] ? 0xFFFD : 0xFFFF);
- 
- 			if (mask[offset0][1] != -1)
-@@ -147,6 +147,6 @@ uint16_t JoystickReadWord(uint32_t offset)
- 		if (offset1 != 0xFF)
- 		{
--			uint8_t mask[4][2] = { { BUTTON_A, BUTTON_PAUSE }, { BUTTON_B, -1 }, { BUTTON_C, -1 }, { BUTTON_OPTION, -1 } };
-+			uint8_t mask[4][2] = { { BUTTON_A, BUTTON_PAUSE }, { BUTTON_B, 0xFF }, { BUTTON_C, 0xFF }, { BUTTON_OPTION, 0xFF } };
- 			data &= (joypad1Buttons[mask[offset1][0]] ? 0xFFF7 : 0xFFFF);
- 
- 			if (mask[offset1][1] != -1)
diff --git a/games-emulation/virtualjaguar/metadata.xml b/games-emulation/virtualjaguar/metadata.xml
deleted file mode 100644
index e73cd94a1388..000000000000
--- a/games-emulation/virtualjaguar/metadata.xml
+++ /dev/null
@@ -1,12 +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>
-<longdescription>
-The Virtual Atari Jaguar GCC/SDL portable Jaguar emulator which is based on
-the source code released by Cal2 of Potato Emulation.
-</longdescription>
-</pkgmetadata>
diff --git a/games-emulation/virtualjaguar/virtualjaguar-2.1.2-r2.ebuild b/games-emulation/virtualjaguar/virtualjaguar-2.1.2-r2.ebuild
deleted file mode 100644
index d4d53cd4f1c9..000000000000
--- a/games-emulation/virtualjaguar/virtualjaguar-2.1.2-r2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils versionator gnome2-utils qmake-utils toolchain-funcs
-
-DESCRIPTION="an Atari Jaguar emulator"
-HOMEPAGE="http://www.icculus.org/virtualjaguar/"
-SRC_URI="http://www.icculus.org/virtualjaguar/tarballs/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/libcdio
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtopengl:4[-egl]
-	media-libs/libsdl[joystick,opengl,sound,video]
-	sys-libs/zlib
-	virtual/opengl"
-DEPEND="${RDEPEND}
-	>=sys-devel/gcc-4.4"
-
-S=${WORKDIR}/${PN}
-
-PATCHES=( "${FILESDIR}"/${P}-gcc6.patch )
-
-src_prepare() {
-	default
-	sed -i \
-		-e '/^Categories/s/$/;/' \
-		virtualjaguar.desktop || die
-}
-
-src_configure() {
-	eqmake4 virtualjaguar.pro -o makefile-qt
-}
-
-src_compile() {
-	emake -j1 libs
-	emake
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc README docs/{TODO,WHATSNEW}
-	doman docs/virtualjaguar.1
-	domenu virtualjaguar.desktop
-	newicon -s 128 res/vj-icon.png ${PN}.png
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	elog "The ${PN} ROM path is no-longer hardcoded, "
-	elog "set it from within, the ${PN} GUI."
-	elog
-	elog "The ROM extension supported by ${PN} is .j64, "
-	elog ".jag files will be interpreted as Jaguar Server executables."
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-emulation/xe/Manifest b/games-emulation/xe/Manifest
index 351f5baa619a..cfab9ded742e 100644
--- a/games-emulation/xe/Manifest
+++ b/games-emulation/xe/Manifest
@@ -1,6 +1,6 @@
 AUX xe-2.16.2 173 BLAKE2B a872f9cb20e082cfe1f81cf049cb6697b7a7a3064ff2f8651e2614062a4a76ea2c8fa3d6f126ba795cbd9b092d49e76b5a874da4a792b7b7d6f168d0bbf7f94e SHA512 6e5812cf355ded200a9fd16d41fca76938ca0526b120858771e0a900c2e4129ec5b00808f20ce4577df3643324dea6526296424c387db5babc36e1266ec8546b
 AUX xe-2.16.2-gentoo.patch 506 BLAKE2B 29b67d92770e1e4d5888872eb9a96ef8b4d984d665a3b14e1e0d6e9a078a4d776ce0ef79c83b6415ee3be1c1d0d99934328661e948d2fc30a63fd10b2e0cd960 SHA512 31a215532c2fb17fd7234ba6a5375c465d6336f82625a5406ac361a29929da787a8bf5398cd21425682de2bd350790d03eca2be666b7f000c90b8c1839cfe618
-DIST xe-x86-32-bin.2.16.2.tar.bz2 1610395 SHA256 fff82a9e56d8f03d14395eeebb9306de7b3a03df6af12b0acc11b0206d1212f0 SHA512 b73f79854f860f7e7060c8b09e0a038b787762d3bd440b5b2825b5a702e4f32c788b883012728813e0a9dcee779f8b98b807c8af3f655fea21bd0ed1383e361c WHIRLPOOL 0c6c18c53105859ec44767cbc21fdf82e14ea4532fe26ecf9dec2acc6917af2baa80df7d8050ce9206ad189a2d8ac5cad1b17c7daa86d69ebcc04b4e83d1cabf
-DIST xe-x86-64-bin.2.16.2.tar.bz2 2141614 SHA256 73a035c20b56fe197529aeb034ce3b81c680e184d0acca7d48df7fedbbafb103 SHA512 cf8a4be4f169660138018631b4a2b6c1a42850c7fc08bd9bd184ab054bffc6fe00197baaf9628cce87608628bb33db0dabac97debd7c53466b086cf0805cc5d8 WHIRLPOOL 49a8f159e34bb3a2c4e44130f6b2c68e3dc681f8795f776c9323c0e2d21180fa490dc810abab327f5573c0cfd71307c1c4d16abaf0775795949c5af244b8831c
+DIST xe-x86-32-bin.2.16.2.tar.bz2 1610395 BLAKE2B 37db06d73f5d6e3e6192e69bb2786b979e5cb74554fce3f89fd752dba76ea223d2a7a3e90950cc0d64d69e132d5bbd9f55816f93481d752aba79aa72e5ab1e97 SHA512 b73f79854f860f7e7060c8b09e0a038b787762d3bd440b5b2825b5a702e4f32c788b883012728813e0a9dcee779f8b98b807c8af3f655fea21bd0ed1383e361c
+DIST xe-x86-64-bin.2.16.2.tar.bz2 2141614 BLAKE2B cfa386cd1a0614d21f7f32af44fe13eeaf0b2b8f65c605961b2768087788a9e9b950955ec1853a0d3302326199217b180aa448669a31f662f05c8e867e018bdc SHA512 cf8a4be4f169660138018631b4a2b6c1a42850c7fc08bd9bd184ab054bffc6fe00197baaf9628cce87608628bb33db0dabac97debd7c53466b086cf0805cc5d8
 EBUILD xe-2.16.2.ebuild 1226 BLAKE2B 45ee5b77ab6270836fde5d3a2dc6e84218d514c27ea7ee2cf5f23fb803a7e13410c776c7b08a7792fe528edd608994b4c8e16e49a498b2c005aafe15c1fb18e1 SHA512 3fac70eb6ebe94816ed53b41b0950a88fa3df674901f5dbe12175b580e952837f4c654922205bf5e77339987a9172e028052ebf06e9457befc9e1b264741d0e4
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index fdf35b22e258..5b1197d0d1af 100644
--- a/games-fps/Manifest.gz
+++ b/games-fps/Manifest.gz
diff --git a/games-fps/ut2003-bonuspack-cm/Manifest b/games-fps/ut2003-bonuspack-cm/Manifest
index 611793ba8072..7f5d348e2ef2 100644
--- a/games-fps/ut2003-bonuspack-cm/Manifest
+++ b/games-fps/ut2003-bonuspack-cm/Manifest
@@ -1,3 +1,3 @@
-DIST cbp2003.zip 149198671 SHA256 fae9e78492cbf24102bba076225463b3bb8cd124a18e47162d429f77101836ba SHA512 92e136c03f1385a28163718cc6ef1c36e46fbad14c74d0f266dfe3d9f4a5093e1bd02dde54e68f70539ba2c4ee163b1e886529f7e734059a85223ab6f853a474 WHIRLPOOL f5ef466296413cc298d4a5b78826dba0b776f72476378dc449cc0a7f2b3d6e0224f2f7ae4f342a56189c1f7623f2e63633636162e56d0ca707face5d80796487
+DIST cbp2003.zip 149198671 BLAKE2B c5f7352b7fb1e0e6a18c99a6212cd5cb4e5e6144988534f91aed93bf33b031d437e86eebf239f0a49fa20b90ca0ded09e912a96b798bc855d527423f2a299ba7 SHA512 92e136c03f1385a28163718cc6ef1c36e46fbad14c74d0f266dfe3d9f4a5093e1bd02dde54e68f70539ba2c4ee163b1e886529f7e734059a85223ab6f853a474
 EBUILD ut2003-bonuspack-cm-1.ebuild 798 BLAKE2B b954b04147b08f02f55b32254bd6c54743af4379d6eb4bdf99546a01462c2235000f00cc5ddae3b0269f06238d9d48e91d01decdd09dc7c5417e5ffd47399f3a SHA512 be23becd978fee13ff5845670e2f60f6d17902a2aa2eaad4e6bc60ffdfef28aff8d52f6a6ec19a73ed6d32107899212d4a41fe0d576e28da88fe2a9b8375d144
 MISC metadata.xml 771 BLAKE2B 705c6aa979f650220a52db3ef5d8c5b8b468b28eac8692a2fbe583ed4b3f694fdfe088d64cc3f6d8506494522f8ca11b491e21e322e3f50ff4453e93ce0d543f SHA512 d30d55503e3b3897d2a5093c06a39f684bdf0879214931a360a87637cd62ae1ca019577f42275bf2b4ba28649ab2989b0a2e184998497ddc5ffddbb6ba35ef5e
diff --git a/games-kids/Manifest.gz b/games-kids/Manifest.gz
index 80c7a115ae7c..5ae27c6728f9 100644
--- a/games-kids/Manifest.gz
+++ b/games-kids/Manifest.gz
diff --git a/games-kids/cubetest/Manifest b/games-kids/cubetest/Manifest
deleted file mode 100644
index 5b35b2e69c8f..000000000000
--- a/games-kids/cubetest/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX cubetest-0.9.4-build.patch 4202 BLAKE2B 33cc442ea712c2d64f08315d9ed1899d31221514d7e2b246b5d0ead9e7fbc9a5d3da831400f7f9d73dfbaed3c78708e9a847c8d423bfae2c0c42f3e4798f2d2c SHA512 e8ce33dee2ac56ca79609dd5a88e2ea0ba484e58425e99a48f158c6af053d6c48e1c8cc602cf2233bc94b1976ac661d3375815174a04efcb1d7bf4a246b11c9c
-DIST cubetest-0.9.4.tar.bz2 764429 BLAKE2B f3ea59fdfa6015f52fa1fee692144b4312485a0573cb7b5fcb92aad5b3a7c80781d196d5a014ac30418f116d3989375ff5dab868bc3a898d6f4e034d5854a910 SHA512 91f1d312ba4cfb08d359ab43347088592977a0d5758baf64a17d62b49d7a53f5b112e16d2a98e3217c6eb06426ef320039d1ae8af8298eb010952473116c916b
-EBUILD cubetest-0.9.4-r1.ebuild 620 BLAKE2B e287d03101c2dc8b8faa5a9ac74b3fb430146932aab1b70900a8ff781fa396a0406242255a63c75509c3f21462a95d50fa1f2e85291187dd8c05b1d81de8e1b1 SHA512 7d2d699ef60477df74841e7d22b08655c69abde9ca60cdecb26a774dce3de65be4ab8316fc28d77bc253900b85572f2dafceee8cb16c99f9b4a17a9396c96e35
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-kids/cubetest/cubetest-0.9.4-r1.ebuild b/games-kids/cubetest/cubetest-0.9.4-r1.ebuild
deleted file mode 100644
index b55bc9ebc1b7..000000000000
--- a/games-kids/cubetest/cubetest-0.9.4-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A program to train your spatial insight"
-HOMEPAGE="http://www.vandenoever.info/software/cubetest/"
-SRC_URI="http://www.vandenoever.info/software/cubetest/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-qt/qtcore:4[qt3support]
-	dev-qt/qtgui:4"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-build.patch
-)
-
-src_prepare() {
-	local i
-
-	default
-
-	for i in $(find  src/ -iname *_moc.cpp) ; do
-		moc ${i/_moc.cpp/.h} -o $i || die
-	done
-}
diff --git a/games-kids/cubetest/files/cubetest-0.9.4-build.patch b/games-kids/cubetest/files/cubetest-0.9.4-build.patch
deleted file mode 100644
index 71411700c336..000000000000
--- a/games-kids/cubetest/files/cubetest-0.9.4-build.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-diff -ru cubetest-0.9.4.orig/configure cubetest-0.9.4/configure
---- cubetest-0.9.4.orig/configure	2005-12-05 17:29:43.000000000 -0500
-+++ cubetest-0.9.4/configure	2009-09-20 21:23:24.886585972 -0400
-@@ -19741,13 +19741,16 @@
- if test -n "$PKG_CONFIG"; then
-         if test -n "$PKG_CONFIG" && \
-     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"QtGui >= \$QT_REQUIRED_VERSION
-+	QtCore >= \$QT_REQUIRED_VERSION
- 	Qt3Support >= \$QT_REQUIRED_VERSION\"") >&5
-   ($PKG_CONFIG --exists --print-errors "QtGui >= $QT_REQUIRED_VERSION
-+	QtCore >= $QT_REQUIRED_VERSION
- 	Qt3Support >= $QT_REQUIRED_VERSION") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
-   pkg_cv_QT_CFLAGS=`$PKG_CONFIG --cflags "QtGui >= $QT_REQUIRED_VERSION
-+	QtCore >= $QT_REQUIRED_VERSION
- 	Qt3Support >= $QT_REQUIRED_VERSION" 2>/dev/null`
- else
-   pkg_failed=yes
-@@ -19758,13 +19761,16 @@
- if test -n "$PKG_CONFIG"; then
-         if test -n "$PKG_CONFIG" && \
-     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"QtGui >= \$QT_REQUIRED_VERSION
-+	QtCore >= \$QT_REQUIRED_VERSION
- 	Qt3Support >= \$QT_REQUIRED_VERSION\"") >&5
-   ($PKG_CONFIG --exists --print-errors "QtGui >= $QT_REQUIRED_VERSION
-+	QtCore >= $QT_REQUIRED_VERSION
- 	Qt3Support >= $QT_REQUIRED_VERSION") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
-   pkg_cv_QT_LIBS=`$PKG_CONFIG --libs "QtGui >= $QT_REQUIRED_VERSION
-+	QtCore >= $QT_REQUIRED_VERSION
- 	Qt3Support >= $QT_REQUIRED_VERSION" 2>/dev/null`
- else
-   pkg_failed=yes
-@@ -19775,6 +19781,7 @@
- 
- if test $pkg_failed = yes; then
- 	QT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "QtGui >= $QT_REQUIRED_VERSION
-+	QtCore >= $QT_REQUIRED_VERSION
- 	Qt3Support >= $QT_REQUIRED_VERSION"`
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$QT_PKG_ERRORS" 1>&5
-@@ -19842,6 +19849,7 @@
- 
- fi
- 
-+    QT_CXXFLAGS="$QT_CFLAGS $QT_CXXFLAGS"
-     { echo "$as_me:$LINENO: Set QT_CXXFLAGS... $QT_CXXFLAGS" >&5
- echo "$as_me: Set QT_CXXFLAGS... $QT_CXXFLAGS" >&6;}
-     { echo "$as_me:$LINENO: Set QT_LIBS... $QT_LIBS" >&5
-Only in cubetest-0.9.4: configure.orig
-diff -ru cubetest-0.9.4.orig/src/cubetest/cubetest_it.ts cubetest-0.9.4/src/cubetest/cubetest_it.ts
---- cubetest-0.9.4.orig/src/cubetest/cubetest_it.ts	2005-12-05 14:48:20.000000000 -0500
-+++ cubetest-0.9.4/src/cubetest/cubetest_it.ts	2009-09-20 21:23:06.640704967 -0400
-@@ -19,11 +19,11 @@
-     </message>
-     <message>
-         <source>Well done! The correct answer is %1.</source>
--        <translation>Bene! La risposta esatta &egrave; %1.</translation>
-+        <translation>Bene! La risposta esatta &#232; %1.</translation>
-     </message>
-     <message>
-         <source>Wrong! The correct answer is %1.</source>
--        <translation>Sbagliato! La risposta esatta &egrave; %1.</translation>
-+        <translation>Sbagliato! La risposta esatta &#232; %1.</translation>
-     </message>
-     <message>
-         <source>Next question</source>
-@@ -69,11 +69,11 @@
-     </message>
-     <message>
-         <source>Difficulty </source>
--        <translation>Difficolt&agrave;</translation>
-+        <translation>Difficolt&#224;</translation>
-     </message>
-     <message>
-         <source>Can I play Daddy?</source>
--        <translation>Posso giocare, Pap&agrave;?</translation>
-+        <translation>Posso giocare, Pap&#224;?</translation>
-     </message>
-     <message>
-         <source>Don&apos;t hurt my brain</source>
-@@ -113,7 +113,7 @@
-     </message>
-     <message>
-         <source>CubeTest is written by Jos van den Oever and released under the General Public License.</source>
--        <translation>CubeTest &egrave; stato scritto da Jos van der Oever ed &egrave; rilasciato con la Licenza Pubblica Generale (GPL) di GNU.</translation>
-+        <translation>CubeTest &#232; stato scritto da Jos van der Oever ed &#232; rilasciato con la Licenza Pubblica Generale (GPL) di GNU.</translation>
-     </message>
-     <message>
-         <source>Easy</source>
-@@ -132,4 +132,4 @@
-         <translation>Ostico</translation>
-     </message>
- </context>
--</TS>
-\ No newline at end of file
-+</TS>
diff --git a/games-kids/cubetest/metadata.xml b/games-kids/cubetest/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-kids/cubetest/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-misc/Manifest.gz b/games-misc/Manifest.gz
index c237c27534aa..4ff93b99f026 100644
--- a/games-misc/Manifest.gz
+++ b/games-misc/Manifest.gz
diff --git a/games-misc/ggencoder/Manifest b/games-misc/ggencoder/Manifest
deleted file mode 100644
index afcacabf7c8d..000000000000
--- a/games-misc/ggencoder/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ggencoder-0.91a.tar.bz2 82184 BLAKE2B a52cbb1c97cb35a219d74f0b20d62f2e0f357e8cfd6136b985f9bc0df5822d2f31a3cb714f01d7d856da49376696813af1ed14d194dd233d82e4bb749da931d1 SHA512 496fa9f181d39e425cb3766fcf5d307c3bb55ec206f79195e8aafd9e34a313ac88b3fa2594501fd509d76dda45c47ebe2f097df2d85abf006f56c859f37510f4
-EBUILD ggencoder-0.91a.ebuild 590 BLAKE2B 16cdbcbbefac4acbe991e9297ee49ab7dd2b14150e550485434d91a92aad9520b71a60b232a7039558984ab0fcb8e3edb87eefd78c9c93dd2125644a532d55ff SHA512 82fcf063371608ca75d722bb81fab0b1e0eea2176be3ba70103318e7a090b4eff579cd1d1a322c9154830f797c0830a73722d6490e3f8894615cecd4ada45db9
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/ggencoder/ggencoder-0.91a.ebuild b/games-misc/ggencoder/ggencoder-0.91a.ebuild
deleted file mode 100644
index b0c564518876..000000000000
--- a/games-misc/ggencoder/ggencoder-0.91a.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils qt4-r2
-
-DESCRIPTION="Utility to encode and decode Game Genie (tm) codes"
-HOMEPAGE="http://games.technoplaza.net/ggencoder/qt/"
-SRC_URI="http://games.technoplaza.net/ggencoder/qt/history/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND="dev-qt/qtcore:4
-	dev-qt/qtgui:4"
-RDEPEND=${DEPEND}
-
-S=${WORKDIR}/${P}/source
-
-src_install() {
-	dobin ${PN}
-	dodoc ../docs/ggencoder.txt
-	if use doc ; then
-		dohtml -r ../apidocs/html/*
-	fi
-}
diff --git a/games-misc/ggencoder/metadata.xml b/games-misc/ggencoder/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-misc/ggencoder/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-misc/qlife/Manifest b/games-misc/qlife/Manifest
deleted file mode 100644
index a826f10eadd9..000000000000
--- a/games-misc/qlife/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST qlife_linux.tar.gz 66056 BLAKE2B 803c3e5a2298e751274b43e71493639d5d68e15cf8d74b4f331f455b78296b72d8b6be7813fe1b8063e8fb1fb574d5334b95ee7e10baddd192993f53447ed332 SHA512 3cd3cddff667476bb7d89c52ed85be3a3c8a8018cce19aff2e8bd54e7a2a54d4b1453d16d693edf17545519373f96b448e468bd5ca6b675291e7b3d1ab378eaf
-EBUILD qlife-1.1-r1.ebuild 670 BLAKE2B 92e07e93204fa8953408a76353dacabc59efd586803baba014f3b895530f0ae1ab6ebd48e6b19442d9921417ace2726d5bd454ad0cf7acfe005cd5b7a0fe1a46 SHA512 24b18d9691e309708c409dcc03b9d75551c97341b8dc046263b9f4589fa6329a9f723ea2a955bba21f739fc956c1872464a1469289e5a6c61dcf3992842e349f
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/qlife/metadata.xml b/games-misc/qlife/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-misc/qlife/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-misc/qlife/qlife-1.1-r1.ebuild b/games-misc/qlife/qlife-1.1-r1.ebuild
deleted file mode 100644
index a3494653eec4..000000000000
--- a/games-misc/qlife/qlife-1.1-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils qmake-utils
-MY_PN=${PN/ql/QL}
-
-DESCRIPTION="Simulates the classical Game of Life invented by John Conway"
-HOMEPAGE="http://open-maker.tuxfamily.org/blog/index.php?post/2009/03/28/QLife"
-SRC_URI="http://open-maker.tuxfamily.org/blog/public/${PN}_linux.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-qt/qtgui:4"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_PN}/sources
-
-src_configure() {
-	eqmake4 ${MY_PN}.pro
-}
-
-src_install() {
-	dobin ${MY_PN}
-	newicon data/egg.png ${PN}.png
-	make_desktop_entry ${MY_PN} ${MY_PN}
-}
diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index 67f8f9487377..835e54d97bcc 100644
--- a/games-puzzle/Manifest.gz
+++ b/games-puzzle/Manifest.gz
diff --git a/games-puzzle/bubble-chains/Manifest b/games-puzzle/bubble-chains/Manifest
deleted file mode 100644
index 0091f99f6edc..000000000000
--- a/games-puzzle/bubble-chains/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST chains-0.1.1-src.7z 3282431 BLAKE2B 6d62a7f84cfba2e94e2abf138a87f0ee2f534d1c247b27c146070c738d691433424268553f758c033d72db9c87a694f26f815066d6b86e26ba1ed7f240b92d1a SHA512 2557974ccfa474329924684d859abae8555bdf7fc8e3264883ed0802255bd29ae486b8150b5ffd2d1b4176d0b8d98aec35f7717da4a6606a6c21026a41f1297c
-EBUILD bubble-chains-0.1.1.ebuild 1016 BLAKE2B f1971ef5562385ae66c3fb7684146a60942f373cdfe8aa01c3fbc676605ee14932ae02c830ceed6654ce1a3edbe1dbd75139e039410894d63ceb7bfa84b7d39f SHA512 bcb8c77eac54f8d8a1124f6c4891a23616df5db92251cdfcc2ae8f25b5795c7b86fd0cd594cbb95214ad5beaad5fe421a0821109b33d40946076821f3b4f46f4
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/bubble-chains/bubble-chains-0.1.1.ebuild b/games-puzzle/bubble-chains/bubble-chains-0.1.1.ebuild
deleted file mode 100644
index 71eb17a7bb69..000000000000
--- a/games-puzzle/bubble-chains/bubble-chains-0.1.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic qt4-r2 games
-
-MY_P=${P/bubble-}-src
-
-DESCRIPTION="Arcade-puzzle game"
-HOMEPAGE="http://bubble-chains.sintegrial.com/"
-SRC_URI="http://${PN}.sintegrial.com/files/${MY_P}.7z"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/libXrandr
-	dev-qt/qtgui:4
-	dev-qt/qtopengl:4
-	media-libs/libsdl[sound,video]
-	media-libs/sdl-mixer"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	app-arch/p7zip"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	append-cxxflags $(pkg-config sdl --cflags)
-	sed -i \
-		-e "s:/usr/local/bin:${GAMES_BINDIR}:g" \
-		-e "s:/usr/local/games:${GAMES_DATADIR}:g" \
-		-e "s:LIBS += -lSDLmain:LIBS += -lSDL -lX11:" \
-		Game.pro main.cpp || die
-}
-
-src_configure() {
-	eqmake4 Game.pro
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	dodoc README
-	newicon images/img64_base.png ${PN}.png
-	make_desktop_entry chains "Bubble Chains"
-	prepgamesdirs
-}
diff --git a/games-puzzle/bubble-chains/metadata.xml b/games-puzzle/bubble-chains/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-puzzle/bubble-chains/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-puzzle/jag/Manifest b/games-puzzle/jag/Manifest
deleted file mode 100644
index 164472d5cc27..000000000000
--- a/games-puzzle/jag/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST jag-0.3.2-data.zip 6237911 BLAKE2B 1c7deb2e0b3318439b1f5ff7808339d24be348dc1dddbb25fd8e4fb4cdf806a5ff7c349dc487f5d09f261da07f09aac59f9a58c454e952bc6446f031bffdf612 SHA512 fd8d625d47c12779baf9158475d378a8a09d8c96e48ebf8f8b23e3967db8fe38fada33625ac155550ec72f96e259b229311652e09001bb146a326ee202f2e32f
-DIST jag-0.3.2-src.zip 995053 BLAKE2B 0fc3da08a7d1facc18cf962e3a0fe168a52b897da248adcac5edae621c244400b200eb0ae2b52de67e69594382cd2ed46fa3ef7f20f65593776a14e0fcc2be1c SHA512 96379500aabb282324c7308304359412faa503ca2a62a22951313b612f7d065378ba3fa880ff0b2cb42ebd92ddbce22f8e3c088fc6a5361462beaf8b21aed8dc
-EBUILD jag-0.3.2.ebuild 1291 BLAKE2B 5972c9aea61864d0fee01574659ddfbdbe2315410714db1c6fe254f7697979a578084d8c5dd7a0e5fd76b1dd551b766f127871bd30f260467c79dda3109189ef SHA512 ce4309c4d2961e760a59a2a98e7cf489b40626910a850c6d562fe6c573f14ddbc3eefad2f93fe85f63d5bce564faf1782292746fd42efee59bb1fa04648711a6
-MISC metadata.xml 326 BLAKE2B 138b0d61a07f16cd7a594331a25a341e89616ec239d35888836040048c4726b17af62cf36713a2e0e56da8df0eaca8c6f0e65be682fe180527f2a5b57bf57f9b SHA512 ab91fc711c2b092c6d15e4bdb2ef60ce1b842f0000cf31c05eb2668706a11f3018aa91475504c15ddbaa2612a316c9caf5d0f237f451bdb5a8411aaeae023d21
diff --git a/games-puzzle/jag/jag-0.3.2.ebuild b/games-puzzle/jag/jag-0.3.2.ebuild
deleted file mode 100644
index e4eff536e414..000000000000
--- a/games-puzzle/jag/jag-0.3.2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils qt4-r2 games
-
-DESCRIPTION="Arcade 2D Puzzle Game"
-HOMEPAGE="http://jag.xlabsoft.com/"
-SRC_URI="http://jag.xlabsoft.com/files/${P}-src.zip
-	http://jag.xlabsoft.com/files/${P}-data.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="editor"
-
-RDEPEND="dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtopengl:4
-	x11-libs/libXrandr
-	media-libs/libsdl[sound,video]
-	media-libs/sdl-mixer"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}/${P}-src
-
-src_prepare() {
-	mv "${WORKDIR}"/${P}-data/data "${WORKDIR}"/${P}-src/
-	sed -i \
-		-e "s:/usr/local/bin:${GAMES_BINDIR}:g" \
-		-e "s:/usr/local/games:${GAMES_DATADIR}:g" \
-		-e "s:LIBS += -lSDLmain:LIBS += -lSDL -lX11:" \
-		Game.pro main.cpp editor/editor.pro \
-		|| die "sed failed"
-}
-
-src_configure() {
-	qt4-r2_src_configure
-	if use editor; then
-		cd editor
-		eqmake4 editor.pro
-	fi
-}
-
-src_compile() {
-	qt4-r2_src_compile
-	if use editor; then
-		cd editor
-		qt4-r2_src_compile
-	fi
-}
-
-src_install() {
-	qt4-r2_src_install
-	newicon images/logo.png ${PN}.png
-	make_desktop_entry jag Jag
-
-	if use editor; then
-		cd editor
-		qt4-r2_src_install
-		make_desktop_entry jag-editor "Jag Level editor" ${PN}
-	fi
-
-	prepgamesdirs
-}
diff --git a/games-puzzle/jag/metadata.xml b/games-puzzle/jag/metadata.xml
deleted file mode 100644
index 77b6c07ca6a5..000000000000
--- a/games-puzzle/jag/metadata.xml
+++ /dev/null
@@ -1,11 +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>
-  <use>
-    <flag name="editor">Install level editor</flag>
-  </use>
-</pkgmetadata>
diff --git a/games-puzzle/triptych-demo/Manifest b/games-puzzle/triptych-demo/Manifest
index 2ea7e4e12058..bdf88e197013 100644
--- a/games-puzzle/triptych-demo/Manifest
+++ b/games-puzzle/triptych-demo/Manifest
@@ -1,3 +1,3 @@
-DIST triptych.tar.gz 1748316 SHA256 2d583edc1b974fc346087ab73adb24d476cee040fb59912e28fbf7a8467db5a8 SHA512 614de78c9f90dd2145ff3dfa6f7a799a069c5add80bc8b0494a752346a163ab0eff7b707292b815adbffa34e4fec446035cfb65df4dd6cf284f270bb732b6daa WHIRLPOOL 53fb746b02c91a4434042a21b5b36f27b17528ac51ea9a3dcf4339cdf75c3ff93db2ffe71fb0c3123e3fbe9720264a18e183558cfda14c0320440e010c21b78d
+DIST triptych.tar.gz 1748316 BLAKE2B 0d66265df27f61ddee1e1777a1e749d3a8bbcebf0e2bfe64a054febb48def865b68ab59d9c25804ed725bb11d24af2bbd712cc2de88a7259db26aa6d7c3c8d1f SHA512 614de78c9f90dd2145ff3dfa6f7a799a069c5add80bc8b0494a752346a163ab0eff7b707292b815adbffa34e4fec446035cfb65df4dd6cf284f270bb732b6daa
 EBUILD triptych-demo-0.ebuild 1086 BLAKE2B f0ca3b7e3e8cdf459533419224dc15e1106be8fe180adcc04ecf905c71f2e78fbe236519fe23b3929716f9b90b2900b98276e1fc83348f0074921b10992352af SHA512 b66e1813a177c3268da4f60f392d22ee5048ec947e7035597a717655cd41b098bb08182345c749608a3c42d67680757ae53ec3a67b100d5aea59575a2e1bf602
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 8e59d1360d89..a47bf7becc30 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/mailx/Manifest b/mail-client/mailx/Manifest
index 9cc6c0ce06ee..71e18a36f34c 100644
--- a/mail-client/mailx/Manifest
+++ b/mail-client/mailx/Manifest
@@ -1,8 +1,9 @@
-AUX mailx-8.1.2.20050715-musl.patch 527 BLAKE2B 4640b8833b4c624277eb4262d32942e1b586c5b96e6946af834d7472d56546051bc794c73819442b47b08854dcc6d01913b3505316e2f1e9464552486cbc65de SHA512 58896bfdcb7a358dd92fa57e1b67ec79a950a2c852a189bc073e47c2c166a5f4f5b56e77899752e3c670f7605af38a51ed890cb93dbb6dac68eb221528fc6ff4
 AUX mailx-8.1.2.20050715-nostrip.patch 668 BLAKE2B 593d7a7764d5e0c37ca565aeb88b579f7b8986c3a81fadbdb8a16c9ad53c36ea0065ec7fb31d43bb345f6901f1d04a7b2ab63b72d5fe48e45891f378fb12e9e0 SHA512 abdf016ed925c8f8388eb03cba64a601b2b72e3c53fcdadefa5c220bf7008325f38004d1ed3fe0a938ea82f8a9167352c235ff2536c7b5b100f63ac36f25db2c
 AUX mailx-8.1.2.20050715-offsetof.patch 1566 BLAKE2B 0878d9f3b639e292e1cfc69676c3e8b3ef68627764828f89fb252c72ac8133162fc4bda234ed1a82487a39306efbead9406b2dc750548deea3fb4c767ddc26c1 SHA512 f6c865cfe32d75d2ce2cf3538822db3c22edc09038ba72f7e25001bfda9b4b2c320e03f91622b316a268cfbdc1f57780ffe199dd8da8c78fbcfe93daf9972aea
+DIST bsd-mailx_8.1.2-0.20160123cvs-4.debian.tar.xz 45768 BLAKE2B 7e5ae62dee742502ea86c55803615f67b2be082b0fe3e6dbf5f64ca7b63fa79014195f4c2262ffaba23624677227df4a94d3966611e9de4bf491f52e050c88b9 SHA512 79d822b4e0e9796970e96f656814cf835fe522d2e33b79484257af50e631a264f6fae99e225d96fa37f50d7ce9f3b9e9577ddb361a27c6e59af8db4736250c19
+DIST bsd-mailx_8.1.2-0.20160123cvs.orig.tar.bz2 76715 BLAKE2B c6491cd88e99b62184da60cc6f8a42aac5f7f5a828c80c05d3dc4493c77727e553b916cb646dade38214d3a6738c084559764abb812a1dfe1fcce2e4d6a04960 SHA512 b66dd0fc5a150c0e1068b9aedda8425c73be7ac7e22d91f2c52de3f2d416016886f46dd54ec5024c0cd4c7e736aee7bdb68d9117f9b2b455fc42d05e1a677373
 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.20050715-r7.ebuild 1349 BLAKE2B 4056ba4e0f9706c485caba2151b85ceb84869fe985d1aad781c3f272eb7023ef0d91d5bc3de52f965a84bb6eb5d3743639063146fb4d6ebced728e8e1c1e8541 SHA512 76bdc8b2e5142837f066ba8d3677cadc067f0985de9c76c5609fd2a9961626640131fbb9b0b7faee61bfc09805135f6403ce5a6f51a92652f46cc31d01359e76
+EBUILD mailx-8.1.2.20160123.ebuild 1261 BLAKE2B 43545135c1abff906c7cfc03776c727b8bd5e368a3d2f66e4800e817ffc87e85e003036c3c991b72de491f06e3cefed6b6b79a01bca7d4fb01bbe70289b4af2a SHA512 255bacf6ed74c910b7e206af1b93b60f6fdefa290a3abff713e7e312eb22ca00f627d97eb3c2f9981ebc468c2904116e80831a8f2a215693fa75adb81d17c0b5
 MISC metadata.xml 240 BLAKE2B eeb6099e7ebc29b81588528b970830d2461fa16783bda673672d405615e46d240dcd806b3d18b6207ef8e5365f8860aa20c304394c3f5b267c5ea4dc739cb94b SHA512 97824dbce22630efb21e647b55212b7a8a19d8e38b5bf05cb0b8078530bbbaaf4dc91284e2a11beab7dfcfb779df82b87b49d11a746c7a4f6dc71f2fda8942db
diff --git a/mail-client/mailx/files/mailx-8.1.2.20050715-musl.patch b/mail-client/mailx/files/mailx-8.1.2.20050715-musl.patch
deleted file mode 100644
index a2e03ec9753f..000000000000
--- a/mail-client/mailx/files/mailx-8.1.2.20050715-musl.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/mailx-8.1.2-0.20050715cvs.orig/EXT/vis.h
-+++ b/mailx-8.1.2-0.20050715cvs.orig/EXT/vis.h
-@@ -70,9 +70,6 @@
-  */
- #define	UNVIS_END	1	/* no more characters */
- 
--#include <sys/cdefs.h>
--
--__BEGIN_DECLS
- char	*vis(char *, int, int, int);
- int	strvis(char *, const char *, int);
- int	strnvis(char *, const char *, size_t, int)
-@@ -84,6 +81,4 @@ int	unvis(char *, char, int *, int);
- ssize_t strnunvis(char *, const char *, size_t)
- /*		__attribute__ ((__bounded__(__string__,1,3)))*/;
- 
--__END_DECLS
--
- #endif /* !_VIS_H_ */
diff --git a/mail-client/mailx/mailx-8.1.2.20050715-r7.ebuild b/mail-client/mailx/mailx-8.1.2.20160123.ebuild
index 073036d05b61..22d1c99a2fe5 100644
--- a/mail-client/mailx/mailx-8.1.2.20050715-r7.ebuild
+++ b/mail-client/mailx/mailx-8.1.2.20160123.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 inherit eutils
 
-MX_MAJ_VER=${PV%.*}
-MX_MIN_VER=${PV##*.}
-MY_PV=${MX_MAJ_VER}-0.${MX_MIN_VER}cvs
-S=${WORKDIR}/${PN}-${MY_PV}.orig
-debian_patch=${PN}_${MY_PV}-1.diff.gz
+DP="bsd-${PN}_${PV%.*}-0.${PV##*.}cvs"
+DPT="${DP}.orig.tar.bz2"
+DPP="${DP}-4.debian.tar.xz"
 
-DESCRIPTION="The /bin/mail program, which is used to send mail via shell scripts"
-HOMEPAGE="http://www.debian.org/"
-SRC_URI="mirror://gentoo/mailx_${MY_PV}.orig.tar.gz
-	mirror://gentoo/${debian_patch}"
+DESCRIPTION="The $ mail program, which is used to send mail via shell scripts"
+HOMEPAGE="https://www.debian.org/"
+SRC_URI="http://http.debian.net/debian/pool/main/b/bsd-${PN}/${DPT}
+	http://http.debian.net/debian/pool/main/b/bsd-${PN}/${DPP}"
+
+S="${WORKDIR}/${DP/_/-}.orig"
 
 LICENSE="BSD"
 SLOT="0"
@@ -22,6 +22,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 IUSE=""
 
 DEPEND=">=net-libs/liblockfile-1.03
+	dev-libs/libbsd
 	virtual/mta
 	mail-client/mailx-support"
 
@@ -30,11 +31,8 @@ RDEPEND="${DEPEND}
 	!net-mail/mailutils"
 
 src_prepare() {
-	epatch "${DISTDIR}/${debian_patch}"
-	epatch "${FILESDIR}/${P}-musl.patch"
-	epatch "${FILESDIR}/${P}-nostrip.patch"
-	sed -i -e "s: -O2: \$(EXTRAFLAGS):g" Makefile || die
-	epatch "${FILESDIR}/${P}-offsetof.patch"
+	eapply "${WORKDIR}/debian/patches"
+	eapply "${FILESDIR}/${PN}-8.1.2.20050715-offsetof.patch"
 	eapply_user
 }
 
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index b4b64164334f..3ad427550343 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/displaycal/Manifest b/media-gfx/displaycal/Manifest
index c2541180f351..462c541ee122 100644
--- a/media-gfx/displaycal/Manifest
+++ b/media-gfx/displaycal/Manifest
@@ -1,7 +1,5 @@
-DIST DisplayCAL-3.3.3.0.tar.gz 9887918 BLAKE2B a26198a13cc1119ae0e5605409e9bb6fb2e922eaf249c002fcf523d7af68f9a21b993a4f171254bdf6286f9923bd435b252ba0938e3e5a14f690b57eb45eee13 SHA512 2f9ac1ac2ce24629695f70078625ac4dc6e1346a675cd55658efc3631a6a37546cf6dc7b2747ae77b3681e7f7c816527497f53564e6cb51ce71a132d93955534
-DIST DisplayCAL-3.3.4.1.tar.gz 9909570 BLAKE2B ee66c580c72f823cc0ea9f618e0eea84992d375dd17e3e942aeee19a1c8f81d47c2b431de2c36ed7e384cf089efb530853e7a884a1ec2fbdd6d3dab7007c868c SHA512 c596333e298aea9366c808c074e467a49e32fa00b0534ae8ce6ad89d0250cf1f2a013dac0d87444edb911bcdea053a462026e335cfc2aa507a932217f1dcd272
 DIST DisplayCAL-3.3.5.0.tar.gz 9913672 BLAKE2B de95217baf18a3b07b51a9db24e37cd965ecf5ba96392410f7f5af788b696f69260eac5c0188cbd3a2f1b90dfafe781cd711c04a9bd45dd5a2fa59fd547087b2 SHA512 7a24cbc540771fd26b504536ee0c1b9c34f013c19b5b2a4e1ce38015014e9b34e67b48a1f08bf96581cef2968883691206ddb6cefa9ac70d76251a305a5b1c37
-EBUILD displaycal-3.3.3.0.ebuild 1415 BLAKE2B 7b13caeba27093f521ecc6cac620892db8127f4b88bbaff10602b21f7d3efc1fb7961f015a42814204b8e34c7c0bce0f38bb3517d30de31b8c3236e57f67d967 SHA512 c4f94565c12a623dfd1d7e7854655ddc9a1d09a7545fdf89aaa7fca713ece4a4647d0dc996269edbc22f658a850428d277d283c5dfb17d2491a30ced932b21c2
-EBUILD displaycal-3.3.4.1.ebuild 1415 BLAKE2B 7b13caeba27093f521ecc6cac620892db8127f4b88bbaff10602b21f7d3efc1fb7961f015a42814204b8e34c7c0bce0f38bb3517d30de31b8c3236e57f67d967 SHA512 c4f94565c12a623dfd1d7e7854655ddc9a1d09a7545fdf89aaa7fca713ece4a4647d0dc996269edbc22f658a850428d277d283c5dfb17d2491a30ced932b21c2
+DIST DisplayCAL-3.4.0.0.tar.gz 10279645 BLAKE2B cf0b6d841c26d8ee4eec47fa58071e31e1ae4c8f1cd63f08216dbfd33caeb900d767988aa19f1738bdbe3c180954a13be22fdd96187b32edc8b0419b945670be SHA512 a63cda986a70cef844908c5809157af28473b564c97fa4c1b957102401b177b254cd215b1cb7c8192873e6d1b204dca66f5a08862f27e0d2f0c06b6ceeaae25e
 EBUILD displaycal-3.3.5.0.ebuild 1518 BLAKE2B d6774180d9cbd3bb17572e96dfcf95b5d8e7f71efa038764dbf0012ad8f56965efb95c2c67e77a9dbf1a4bd07f7e6229a3f9fe9c35fa12417a0b8aada6fd9a18 SHA512 19671a35a80cbfb99d7f5fc2a36884990e791fc02b563efe00131b776320cac1e3c4307877152e07f972ba8aabde879ea3d7d6a4d498560f4cb96c7640459f58
+EBUILD displaycal-3.4.0.0.ebuild 1552 BLAKE2B 9de351bc65367c39bde13ccb143c62309e45f8a0ae1fc20e4b09cce8c82720fd72889d6a2992a421f5af9809cffac5a771b413fce2911babb40ef5330db919d8 SHA512 fad82ef40f25d1b68552e8038e8932ad903fa39c18d0bcf82277a1b5af864b1bb2a17455fe75770dd183f53824ba9a1ee5acad67e257fa5e31632e9f33f00b23
 MISC metadata.xml 342 BLAKE2B e74a7767c5b6e82bd35776606de555f9d4f26a25727decc6b0216fa3ea27cee8f28a7749e46b842c52e403c5150b24b4e33e0b971bd49077814e7945ee8cc290 SHA512 f9d5979fc8525c40af8d4e64afb8264873b0ae7cda1e9c4f3b3f30957c2a4f7fcbab76002783213a896395e8b5ef78e315441c28872589a91a0035d5f346d317
diff --git a/media-gfx/displaycal/displaycal-3.3.3.0.ebuild b/media-gfx/displaycal/displaycal-3.3.3.0.ebuild
deleted file mode 100644
index 4beb3e30e0da..000000000000
--- a/media-gfx/displaycal/displaycal-3.3.3.0.ebuild
+++ /dev/null
@@ -1,54 +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 distutils-r1 xdg
-
-MY_PN="DisplayCAL"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Display calibration and characterization powered by Argyll CMS"
-HOMEPAGE="https://displaycal.net/"
-SRC_URI="mirror://sourceforge/dispcalgui/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=media-gfx/argyllcms-1.1.0
-	dev-python/wxpython:3.0
-	>=x11-libs/libX11-1.3.3
-	>=x11-apps/xrandr-1.3.2
-	>=x11-libs/libXxf86vm-1.1.0
-	>=x11-proto/xineramaproto-1.2
-	>=x11-libs/libXinerama-1.1
-"
-RDEPEND="${DEPEND}
-	>=dev-python/numpy-1.2.1
-"
-
-# Just in case someone renames the ebuild
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# Do not generate udev/hotplug files
-	sed -e '/if os.path.isdir/s#/etc/udev/rules.d\|/etc/hotplug#\0-non-existant#' \
-		-i DisplayCAL/setup.py || die
-	# Prohibit setup from running xdg-* programs, resulting to sandbox violation
-	sed -e '/if which/s#xdg-icon-resource#\0-non-existant#' \
-		-e '/if which/s#xdg-desktop-menu#\0-non-existant#' \
-		-i DisplayCAL/postinstall.py || die
-
-	# Remove deprecated Encoding key from .desktop file
-	sed -e '/Encoding=UTF-8/d' -i misc/*.desktop  || die
-
-	# Remove x-world Media Type
-	sed -e 's/x\-world\/x\-vrml\;//g' \
-		-i misc/displaycal-vrml-to-x3d-converter.desktop || die
-
-	distutils-r1_src_prepare
-}
diff --git a/media-gfx/displaycal/displaycal-3.3.4.1.ebuild b/media-gfx/displaycal/displaycal-3.4.0.0.ebuild
index 4beb3e30e0da..d955f9b1fea5 100644
--- a/media-gfx/displaycal/displaycal-3.3.4.1.ebuild
+++ b/media-gfx/displaycal/displaycal-3.4.0.0.ebuild
@@ -1,10 +1,10 @@
-# 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=( python2_7 )
 
-inherit distutils-r1 xdg
+inherit distutils-r1 gnome2-utils xdg
 
 MY_PN="DisplayCAL"
 MY_P="${MY_PN}-${PV}"
@@ -52,3 +52,13 @@ src_prepare() {
 
 	distutils-r1_src_prepare
 }
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest
index 3e6e02e88a5b..d8cd29ae3012 100644
--- a/media-gfx/geeqie/Manifest
+++ b/media-gfx/geeqie/Manifest
@@ -1,4 +1,6 @@
 AUX geeqie-1.3-stdstring.patch 2247 BLAKE2B 4569351aff9f524c17b9ad08634406e21d6e1b88921e12e320f5a618665aad9287b05d4d16d90f3a701fb7de73514005dfd5bf7d09e87313a97cc594849a9b2b SHA512 f26122a1419f795393174340f0e4a5b341d8341664840347730a8b19b1956d4c684b6a5a5183357250364a040eacc18267aab272789ac65ece9ece56d6b2dadf
 DIST geeqie-1.3.tar.xz 1141820 BLAKE2B 7a8639a136797c85d1bf96567ed0cae74c5cd0dacb8fac4832ffcb31ead372ac100948f9b65332d749500327c6ec3e7cb195da15980eaf0771ca6b55879dd8e4 SHA512 b17c4174741acd60261af268f0e9290ee3d7766d18fc0d28ada5730bb50651a6261d0b04b9fbe810d323c8e6a1b5a21a4f1ebf0eb88daf95f123b77b8484e718
+DIST geeqie-1.4.tar.xz 35881152 BLAKE2B 2932ac379abaee2b742b66daff544f29d7bf0aac82ff97f92e10ac7902ad874badcbb143f562c665d94f6297331090d0746373979a745f338a738078b72538a4 SHA512 a88b6dcf30847e38c109f5bc6436d93f6b4e1336a094c6b8a45db117830117120bf58f390afcd8a4b7aaf2934f995c3f75ac33a7faf56bfc2bcc9bd4eebfb205
 EBUILD geeqie-1.3-r1.ebuild 1941 BLAKE2B 2ac0dfaa649219e597b6128fd65cc435edb9fb90f6e1c44defa821f9c282b18c208a3553d11dba175b69806f674b9baa0c2348dd7988971adbeb14d43d521e50 SHA512 9116a91a9459f59c9dab49bfd40b29f57ad042ae740d29809cfd55b6df829c73327ef28e1c8a69cee3b14fee2962edc5b002f2f26adb8c0d72ea1f61c17dc91b
-MISC metadata.xml 806 BLAKE2B bdab12aff9617fbcdc5e5e9be5b22d1d48b4a41691375c9a3af8bee2e3c10a511cb9aaf0144a1df2d0988ed9185d36699b45a04e397b532e9ca98ec1a7863ee7 SHA512 f5d2929460a639de62f06abf298d4817ffbf9550892b4ad0eccbb9bb8fbffeb5e399c9184bb1d1367090135af329d36807bf1f7497ec5af77201da631a5f91d4
+EBUILD geeqie-1.4-r1.ebuild 2177 BLAKE2B dfba0fb66e2af677c9356d8281b64ff3a30df0466278feb34a7ba1c65c73cab4c89cd100058b214ae85309e16d6045f7592c4a775d823f17b86b33e1b64aa962 SHA512 04dbd9352f4350ec1ed6e8d520b0403071aed833c63ac7c9067b3dca1f3d9257b64b4b2e5ce2ace2b80f37e33a952725752efdb8def2b4346f8fe06879b14542
+MISC metadata.xml 923 BLAKE2B 49de6dd7b0380b1cc74ccabbc8f84e2c55144b80612e04c4e55c82d052027882cc293a70a52f857bded73246ccbb5351df53dc1e1e08b8c2c08e630bc24f9882 SHA512 752280a5fefc097c5ca8b1fc2e9f05220aa809e45484560edca7baa68d95b0d91fa14973c321aefcdb76052dc02e405e2fb4a32e6322f04cd8223afaa6734d58
diff --git a/media-gfx/geeqie/geeqie-1.4-r1.ebuild b/media-gfx/geeqie/geeqie-1.4-r1.ebuild
new file mode 100644
index 000000000000..067d078c68ba
--- /dev/null
+++ b/media-gfx/geeqie/geeqie-1.4-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools xdg-utils
+
+DESCRIPTION="A lightweight GTK image viewer forked from GQview"
+HOMEPAGE="http://www.geeqie.org"
+SRC_URI="http://www.geeqie.org/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug doc exif ffmpegthumbnailer gpu-accel gtk3 jpeg lcms lirc lua map tiff xmp"
+
+RDEPEND="gtk3? ( x11-libs/gtk+:3 )
+	!gtk3? ( x11-libs/gtk+:2 )
+	virtual/libintl
+	doc? ( app-text/gnome-doc-utils )
+	ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
+	gpu-accel? ( media-libs/clutter-gtk )
+	jpeg? ( virtual/jpeg:0 )
+	lcms? ( media-libs/lcms:2 )
+	lirc? ( app-misc/lirc )
+	lua? ( >=dev-lang/lua-5.1:= )
+	map? ( media-libs/libchamplain:0.12 )
+	xmp? ( >=media-gfx/exiv2-0.17:=[xmp] )
+	!xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )
+	tiff? ( media-libs/tiff:0 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	dev-util/intltool
+	sys-devel/gettext"
+
+REQUIRED_USE="gpu-accel? ( gtk3 )
+	map? ( gpu-accel )"
+
+src_prepare() {
+	default
+
+	# Missing from release tarball, and requires git tree to generate
+	sed -e "/readme_DATA/s/ChangeLog\(.html\)\?//g" -i Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf="--disable-dependency-tracking
+		--with-readmedir="${EPREFIX}"/usr/share/doc/${PF}
+		$(use_enable debug debug-log)
+		$(use_enable ffmpegthumbnailer)
+		$(use_enable gpu-accel)
+		$(use_enable gtk3)
+		$(use_enable jpeg)
+		$(use_enable lcms)
+		$(use_enable lua)
+		$(use_enable lirc)
+		$(use_enable map)
+		$(use_enable tiff)"
+
+	if use exif || use xmp; then
+		myconf="${myconf} --enable-exiv2"
+	else
+		myconf="${myconf} --disable-exiv2"
+	fi
+
+	econf ${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	rm -f "${D}/usr/share/doc/${PF}/COPYING"
+	# Application needs access to the uncompressed file
+	docompress -x /usr/share/doc/${PF}/README.md
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+
+	elog "Some plugins may require additional packages"
+	elog "- Image rotate plugin: media-gfx/fbida (JPEG), media-gfx/imagemagick (TIFF/PNG)"
+	elog "- RAW images plugin: media-gfx/ufraw"
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/media-gfx/geeqie/metadata.xml b/media-gfx/geeqie/metadata.xml
index 4ccccdc6d6e3..653dda70b091 100644
--- a/media-gfx/geeqie/metadata.xml
+++ b/media-gfx/geeqie/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<longdescription>Geeqie is a lightweight image viewer. It was forked from GQview. The development is focused on features for photo collection maintenance: raw format, Exif/IPTC/XMP metadata and integration with programs like UFraw, ImageMagick, Gimp, gPhoto or ExifTool</longdescription>
 	<use>
+		<flag name="ffmpegthumbnailer">Enable video thumbnail support with <pkg>media-video/ffmpegthumbnailer</pkg></flag>
 		<flag name="gpu-accel">Enable GPU acceleration support - experimental</flag>
 		<flag name="gtk3">Link against <pkg>x11-libs/gtk+</pkg>:3 instead of <pkg>x11-libs/gtk+</pkg>:2</flag>
 		<flag name="map">Enable items map display - experimental</flag>
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index dc5d80e1ada2..f0bcabe3f8ff 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -3,10 +3,12 @@ DIST ImageMagick-6.9.9-18.tar.xz 8797460 BLAKE2B dc5fc072a5419cbf9b4f3ff9bc70932
 DIST ImageMagick-6.9.9-20.tar.xz 8994128 BLAKE2B fb52396956b6e34320e82f34f83273550af3a55f0d23af87a791b3a8ae4002d27d3726e1caae1822bfe2f697de6ec76a975156a305eef5233cdb60006e32314f SHA512 36c241490ee41de5cd72e5bc297ac2353a0d4574337776445798b0c5823f491304c3f3a728d420d03f66b652eafcdb68ec2992347321ac3919c1d72c0afdb849
 DIST ImageMagick-6.9.9-23.tar.xz 8795632 BLAKE2B c3a2ece7897961b191b1090384c0872422af80903d0447a0b67f06d45062d60f12903a30a00d28bedc33a6c0b74f38bfe043a113613f0bfb5b1608b972ce8e2a SHA512 9160e0f6606c6ea011e9e47a11f092735456be60d6d039b9cf73c055c046ce89f05d096bdc3d37f87e2d6e36cd8dc9adf233b42bb9ad7d14aa03f13c7a1b6c03
 DIST ImageMagick-6.9.9-26.tar.xz 8799740 BLAKE2B 6d781ef8b0285390cfef0544b26c8b4779a7bfdfb18ba9064eaa1b47edc19e98080e53ea073fe95f11dde52b910ecdff7c3a27efe6163a4b4855cc8db358a66c SHA512 e132deae4d14ccc179300841681c1ec83f90fe9ac8e2ce1f07af5642497be44ce017ec1e007964d307c32ecb733081bd2172e4f3113e5acea31c5783b1126e89
+DIST ImageMagick-6.9.9-31.tar.xz 8819864 BLAKE2B f6cdb19bff58a0b318a9af78f3fa429137cc4e79bbe075f9c6444204ce8a4324dde5792ab7232e6898a4993ad558c514a143c14469370de822038d1d669fdffa SHA512 85cbe4e4991a08a5c11c01b4276525fa1d63bcef9a9814fee1f8ede3a5ed432da8d3d84965ed75105723948d07ad879f7cf07d5121f0d624df9275dd4e41cb8f
 DIST ImageMagick-6.9.9-9.tar.xz 8797832 BLAKE2B 453102e0db6bf51c10e43b54d6fc35acaac4de193cdb0cc1f8448f70708739628e9e97ef310e9deb8d3967318d17f29344c1b9c6dc1c7437e39b4f42f23b5dd3 SHA512 d024f753e1bf234e38736935f38a9bf82969ca77130059383f9d1871a39f68d7678a546d2786d57d602744e2008909df3f2ab08e1207b4c97c0952e7b03876d8
 DIST ImageMagick-7.0.6-9.tar.xz 8550004 BLAKE2B 2ca6cb995bdbdb16188c8cfa1fe328cccfe604341331413dc35950bc115f8a76af21f2f07cc3384da460a03d3de97484e1293507d30fea4571ee8f064f536757 SHA512 5756d2605cbfbd876765372e954aeefdcdf60f1ee364ce40c3302f8958c510e6f0ecf47a3ee3c264eaaade1504bdae068118eb2cb96d418237f7f53da94a6c11
 DIST ImageMagick-7.0.7-11.tar.xz 8626180 BLAKE2B cb43c167227632dbcb96575d2f4845cb80a40f4490be240aa8020993033e23f42ba9f600ba37751cce66dc51237b209be965115fbed20329f046a8ca014accdf SHA512 089c8516ca66845c6b8e6b365815ef1806fc97c785f75c06ed62241d7b6255387ee8f9004b1bcc0a6d03b7aa397d8e25131ca2aadc9255cc1e2368d73f774551
 DIST ImageMagick-7.0.7-14.tar.xz 8617500 BLAKE2B 72d6a1319ec299e9717b68cef29c08817999dd9f2fffa5ee80aded6cb03c87c17859dc6d74cc48a63205c28f27ae5781cf55589a07bdda3b54528b489141f05f SHA512 c4b15ffe64bddb8da8e1ab04e6c41c46c9120d224a09225e76f5624250b31aea84bff37c712ad5cdea3faa8f2242054bfa3f33456468d68e14e7f4d85a88de6f
+DIST ImageMagick-7.0.7-19.tar.xz 8546416 BLAKE2B 6750dba45f7971f7a7e74ac7ae3ec94732a2bd31f638afac8a91abd595e81aadca1372ddb46dcc3bf2dcb258ececfa69a8e8ad5ff753930462d46804863c0f4e SHA512 656520f719a375c837b2ddebb7e5920e9c06a9f81f3529b8a7c405958ca75f7464790ff931b7a32e104ef500570e71ff80d3dfb7c5cf777b2a5ad8207fde7928
 DIST ImageMagick-7.0.7-6.tar.xz 8556160 BLAKE2B 3450c4c7e3804b0dcf7659a7ca0f11f6d1225c577b33216e10f6feeaa817412839ce613fdcae2175beace4cf844f880379899c1ad4914ff6df25fe2817fd0572 SHA512 9dff09a29b94f0de8ede82473820860f812edf3fc8edb0d1f8daa21c127d3e7831047f33ab22c407f2803a03561b690a52525672da837bbab1a1255156b4e6ff
 DIST ImageMagick-7.0.7-8.tar.xz 8797060 BLAKE2B a1a4278c375047fed7e59fdb9fa2a9526e2fc14136a669a0d148f78e5b308244de0ddd5c4b79e8e2214e4c91d39ae25531581868a2832ad91189a34460b5b5ad SHA512 0852df3bc996032a713ce6dc274cc36c3818c1c8304223de391e58bce8230aa12ac9778b4b28278c0ab4e42f2a7b4094052a5e4e6e4208329848948237fb41d2
 EBUILD imagemagick-6.9.9.0.ebuild 5158 BLAKE2B da4cadafcda858bb14d298662fa44abaeb346cc500bfaeaaf11cd0cd89162017af3d308ef240e1370f8320be260b77337077e7ca7ed84c0c007370da2f7a932c SHA512 ddec64d6ede1cf433bce3a4da1fb74c0346349b922cc1dd164acfb6cce99df1c207296a2334a7b59163a34250e91a80b8a7cb4a607fbca1bdb84bb3ee3c9f36c
@@ -14,10 +16,12 @@ EBUILD imagemagick-6.9.9.18.ebuild 5128 BLAKE2B c5d4f87b3ea909fa94d940f24a7f01f4
 EBUILD imagemagick-6.9.9.20.ebuild 5120 BLAKE2B b02f1bdfe05aa3a9f96bdc3596b785326753f5249bf5b19ba70a6a76ad1dfddb453acdacef7ee3d1c80bb75017912e73b9650fe5fad688620fdaadb01d87574a SHA512 f7e5492163118e23d46829613a8bd380faee2e2c6e597b1fcde7f7a1684c80a45ad0bab4b39deac083b4136cedc789c128fb6809c824469bef66c3a904738422
 EBUILD imagemagick-6.9.9.23.ebuild 5122 BLAKE2B 16f53dfb31f82f636b577bb12069741b81c2fa91e5d0db9cf8e04d4f1056a6327cb465dd2206d3ea817a0b5a0a1f42ba14d05b82736a3b98cc1ccabbd8db4c3b SHA512 65388e8d87b190ef90fbd009794442778d4faf242f9589d988db156417d769e6f7239fb0b1bcaf972952796c438431860567c3b6c64e41d72759d03770014113
 EBUILD imagemagick-6.9.9.26.ebuild 5120 BLAKE2B d326a9da7f04cdaa555fceb7bfc8d2abaa491444cbf6617158ebdb967ac8cd834159d8f34827b939cc5f62109a5c294216b986149600fc47ce022145aa0cc402 SHA512 fa9f6c396f3c40d061a69e99380af48b5c5f377c1621a9835304112bd9f0f00f0cf02ba265c03f5d19696c9a5fccacb1f4a0ef6b0b02998966145557468fdcb7
+EBUILD imagemagick-6.9.9.31.ebuild 5128 BLAKE2B bef8ca0d8e3ec8440ed08d36a22ea5afb9a2e8598aa0b2da4c9e16dbe577886fad9606c4a4a31e3864bf04f45de18173738fc542c9eeb28a91e084a85f4a0747 SHA512 02aeb5fc77a81c31f786b9f761011ebd3ce4cd43ac275a482422aecb1a927d9b628d020a7fef796af4eafcd54d232893089bb6393ca686093d2b52859cdc3510
 EBUILD imagemagick-6.9.9.9.ebuild 5128 BLAKE2B c5d4f87b3ea909fa94d940f24a7f01f4026955e874868ad0d8124d941f06ddc0b24c3e11e40d6d825c3201d2b58a1d5446ce607a73ac62e13600d609ce1dc777 SHA512 86114b9cd2ffb6aa94808060abb78a03897e7ae0611b3c326ba60fe2ff17506209c413fc863a32ac63ae36d24ae2960cdc931b7b0493a8cb04189fa163990c68
 EBUILD imagemagick-7.0.6.9.ebuild 5134 BLAKE2B 3542aaffdbab0fa1e93eed3c67b923effd7bf418fe3e95b7501d8b1d36b3f6b81a2beb4bbdd8da29ac3bb96842a1f7bf8dbb72da0e2ed5dedeb4fc1a61fce1a5 SHA512 e16e30d01265170f4e39cce0d9d4385246dbff419d021f80bae3c1138b076b14e8cfb58fa8e4adde535c2866c62d3a2c3fac4adf07be5c118e0ea15d3b5c6ae0
 EBUILD imagemagick-7.0.7.11.ebuild 5128 BLAKE2B 283c66b5aadd9c405bb9fea2a51d4fb952793a8834ae0f55fe049c73633835c5de1f2acbe9d82a5e78218bad6b54240c113d408eda547c09fa6ce2f80cd2fe36 SHA512 e404fa7e419da2c4b191b5a348e6dc6dc843d4543742f60328ebc7dfe93f4fd487915223ae90a408c3a0c298ffc48cf4775718e61eb7c7298f2da79fdc611023
 EBUILD imagemagick-7.0.7.14.ebuild 5126 BLAKE2B eb993578fe4760505ee23640be3d2ce5a22a8b98f907b8d95af31ca8be0c86e0dc73839e95714d319803b526e8552e0cabeea109cfded0380c3e826861be12ba SHA512 48fb072c9315511b07f3787c972df301cdbf62a04b7a40ae7f23228ec96ecb8070f0c83e2ba4a6b93777ba9af2536b6a2640929ca9323539a5b2bd056c850b99
+EBUILD imagemagick-7.0.7.19.ebuild 5134 BLAKE2B 33aabb4a32d0bd9555c5470617d9954973f615a89b8fbc9fe17d7b105402a8fc6bb73cd1311043b58673197ee1d94939c46fdce9979d5f983c26cd191d23e0f4 SHA512 58bf5277b40e8ef8fc3ff17da5c8d9f814e1c52866789748881fe2469f46d99842f3bfd5e368492ac25466a395e1141f48d0b2020d436452730fb0bf9fab58cf
 EBUILD imagemagick-7.0.7.6.ebuild 5134 BLAKE2B 3542aaffdbab0fa1e93eed3c67b923effd7bf418fe3e95b7501d8b1d36b3f6b81a2beb4bbdd8da29ac3bb96842a1f7bf8dbb72da0e2ed5dedeb4fc1a61fce1a5 SHA512 e16e30d01265170f4e39cce0d9d4385246dbff419d021f80bae3c1138b076b14e8cfb58fa8e4adde535c2866c62d3a2c3fac4adf07be5c118e0ea15d3b5c6ae0
 EBUILD imagemagick-7.0.7.8.ebuild 5134 BLAKE2B 3542aaffdbab0fa1e93eed3c67b923effd7bf418fe3e95b7501d8b1d36b3f6b81a2beb4bbdd8da29ac3bb96842a1f7bf8dbb72da0e2ed5dedeb4fc1a61fce1a5 SHA512 e16e30d01265170f4e39cce0d9d4385246dbff419d021f80bae3c1138b076b14e8cfb58fa8e4adde535c2866c62d3a2c3fac4adf07be5c118e0ea15d3b5c6ae0
 MISC metadata.xml 984 BLAKE2B ae695ec1fc34ad3b29269ad21cfb8b79ff6158a2ace9cd4194354448794dc183ac568757d6a7e6c07f31634dfb780e0411a0237b3c106344e6c7c7244a8aee36 SHA512 39a4c5aa27db2de81ad4621bacf43baf96415eecdf836fb2024890634c025b29f2b41dc003ac4d6f87b2365c1a4c68b6af2b9e169b3137bbee3e0a6cb435c5c7
diff --git a/media-gfx/imagemagick/imagemagick-6.9.9.31.ebuild b/media-gfx/imagemagick/imagemagick-6.9.9.31.ebuild
new file mode 100644
index 000000000000..cee94bf466d0
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.9.9.31.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
+
+MY_P=ImageMagick-$(replace_version_separator 3 '-')
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="http://www.imagemagick.org/"
+SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
+
+LICENSE="imagemagick"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~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="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+
+RESTRICT="perl? ( userpriv )"
+
+RDEPEND="
+	dev-libs/libltdl:0
+	bzip2? ( app-arch/bzip2 )
+	corefonts? ( media-fonts/corefonts )
+	djvu? ( app-text/djvu )
+	fftw? ( sci-libs/fftw:3.0 )
+	fontconfig? ( media-libs/fontconfig )
+	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+	graphviz? ( media-gfx/graphviz )
+	jbig? ( >=media-libs/jbigkit-2:= )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+	lcms? ( media-libs/lcms:2= )
+	lqr? ( media-libs/liblqr )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:0= )
+	pango? ( x11-libs/pango )
+	perl? ( >=dev-lang/perl-5.8.8:0= )
+	png? ( media-libs/libpng:0= )
+	postscript? ( app-text/ghostscript-gpl )
+	raw? ( media-gfx/ufraw )
+	svg? ( gnome-base/librsvg )
+	tiff? ( media-libs/tiff:0= )
+	truetype? (
+		media-fonts/urw-fonts
+		>=media-libs/freetype-2
+		)
+	webp? ( media-libs/libwebp:0= )
+	wmf? ( media-libs/libwmf )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXext
+		x11-libs/libXt
+		)
+	xml? ( dev-libs/libxml2:= )
+	lzma? ( app-arch/xz-utils )
+	zlib? ( sys-libs/zlib:= )"
+DEPEND="${RDEPEND}
+	!media-gfx/graphicsmagick[imagemagick]
+	virtual/pkgconfig
+	X? ( x11-proto/xextproto )"
+
+REQUIRED_USE="corefonts? ( truetype )
+	test? ( corefonts )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	local mesa_cards ati_cards nvidia_cards render_cards
+	default
+
+	elibtoolize # for Darwin modules
+
+	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+	shopt -s nullglob
+	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+	if test -n "${ati_cards}"; then
+		addpredict "${ati_cards}"
+	fi
+	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+	if test -n "${mesa_cards}"; then
+		addpredict "${mesa_cards}"
+	fi
+	nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g')
+	if test -n "${nvidia_cards}"; then
+		addpredict "${nvidia_cards}"
+	fi
+	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+	if test -n "${render_cards}"; then
+		addpredict "${render_cards}"
+	fi
+	shopt -u nullglob
+	addpredict /dev/nvidiactl
+}
+
+src_configure() {
+	local depth=16
+	use q8 && depth=8
+	use q32 && depth=32
+
+	local openmp=disable
+	use openmp && { tc-has-openmp && openmp=enable; }
+
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable hdri)
+		$(use_enable opencl)
+		--with-threads
+		--with-modules
+		--with-quantum-depth=${depth}
+		$(use_with cxx magick-plus-plus)
+		$(use_with perl)
+		--with-perl-options='INSTALLDIRS=vendor'
+		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
+		$(use_with bzip2 bzlib)
+		$(use_with X x)
+		$(use_with zlib)
+		--without-autotrace
+		$(use_with postscript dps)
+		$(use_with djvu)
+		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
+		$(use_with fftw)
+		$(use_with fpx)
+		$(use_with fontconfig)
+		$(use_with truetype freetype)
+		$(use_with postscript gslib)
+		$(use_with graphviz gvc)
+		$(use_with jbig)
+		$(use_with jpeg)
+		$(use_with jpeg2k openjp2)
+		$(use_with lcms)
+		$(use_with lqr)
+		$(use_with lzma)
+		$(use_with openexr)
+		$(use_with pango)
+		$(use_with png)
+		$(use_with svg rsvg)
+		$(use_with tiff)
+		$(use_with webp)
+		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
+		$(use_with wmf)
+		$(use_with xml)
+		--${openmp}-openmp
+		--with-gcc-arch=no-automagic
+	)
+	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
+	emake check
+}
+
+src_install() {
+	# Ensure documentation installation files and paths with each release!
+	emake \
+		DESTDIR="${D}" \
+		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
+		install
+
+	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+	dodoc {AUTHORS,README}.txt ChangeLog
+
+	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
+
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+
+	if use opencl; then
+		cat <<-EOF > "${T}"/99${PN}
+		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
+		EOF
+
+		insinto /etc/sandbox.d
+		doins "${T}"/99${PN} #472766
+	fi
+
+	insinto /usr/share/${PN}
+	doins config/*icm
+}
diff --git a/media-gfx/imagemagick/imagemagick-7.0.7.19.ebuild b/media-gfx/imagemagick/imagemagick-7.0.7.19.ebuild
new file mode 100644
index 000000000000..6d4dff609a64
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-7.0.7.19.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
+
+MY_P=ImageMagick-$(replace_version_separator 3 '-')
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="http://www.imagemagick.org/"
+SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
+
+LICENSE="imagemagick"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+
+RESTRICT="perl? ( userpriv )"
+
+RDEPEND="
+	dev-libs/libltdl:0
+	bzip2? ( app-arch/bzip2 )
+	corefonts? ( media-fonts/corefonts )
+	djvu? ( app-text/djvu )
+	fftw? ( sci-libs/fftw:3.0 )
+	fontconfig? ( media-libs/fontconfig )
+	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+	graphviz? ( media-gfx/graphviz )
+	jbig? ( >=media-libs/jbigkit-2:= )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+	lcms? ( media-libs/lcms:2= )
+	lqr? ( media-libs/liblqr )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:0= )
+	pango? ( x11-libs/pango )
+	perl? ( >=dev-lang/perl-5.8.8:0= )
+	png? ( media-libs/libpng:0= )
+	postscript? ( app-text/ghostscript-gpl )
+	raw? ( media-gfx/ufraw )
+	svg? ( gnome-base/librsvg )
+	tiff? ( media-libs/tiff:0= )
+	truetype? (
+		media-fonts/urw-fonts
+		>=media-libs/freetype-2
+		)
+	webp? ( media-libs/libwebp:0= )
+	wmf? ( media-libs/libwmf )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXext
+		x11-libs/libXt
+		)
+	xml? ( dev-libs/libxml2:= )
+	lzma? ( app-arch/xz-utils )
+	zlib? ( sys-libs/zlib:= )"
+DEPEND="${RDEPEND}
+	!media-gfx/graphicsmagick[imagemagick]
+	virtual/pkgconfig
+	X? ( x11-proto/xextproto )"
+
+REQUIRED_USE="corefonts? ( truetype )
+	test? ( corefonts )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	local ati_cards mesa_cards nvidia_cards render_cards
+	default
+
+	elibtoolize # for Darwin modules
+
+	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+	shopt -s nullglob
+	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+	if test -n "${ati_cards}"; then
+		addpredict "${ati_cards}"
+	fi
+	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+	if test -n "${mesa_cards}"; then
+		addpredict "${mesa_cards}"
+	fi
+	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
+	if test -n "${nvidia_cards}"; then
+		addpredict "${nvidia_cards}"
+	fi
+	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+	if test -n "${render_cards}"; then
+		addpredict "${render_cards}"
+	fi
+	shopt -u nullglob
+	addpredict /dev/nvidiactl
+}
+
+src_configure() {
+	local depth=16
+	use q8 && depth=8
+	use q32 && depth=32
+
+	local openmp=disable
+	use openmp && { tc-has-openmp && openmp=enable; }
+
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable hdri)
+		$(use_enable opencl)
+		--with-threads
+		--with-modules
+		--with-quantum-depth=${depth}
+		$(use_with cxx magick-plus-plus)
+		$(use_with perl)
+		--with-perl-options='INSTALLDIRS=vendor'
+		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
+		$(use_with bzip2 bzlib)
+		$(use_with X x)
+		$(use_with zlib)
+		--without-autotrace
+		$(use_with postscript dps)
+		$(use_with djvu)
+		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
+		$(use_with fftw)
+		$(use_with fpx)
+		$(use_with fontconfig)
+		$(use_with truetype freetype)
+		$(use_with postscript gslib)
+		$(use_with graphviz gvc)
+		$(use_with jbig)
+		$(use_with jpeg)
+		$(use_with jpeg2k openjp2)
+		$(use_with lcms)
+		$(use_with lqr)
+		$(use_with lzma)
+		$(use_with openexr)
+		$(use_with pango)
+		$(use_with png)
+		$(use_with svg rsvg)
+		$(use_with tiff)
+		$(use_with webp)
+		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
+		$(use_with wmf)
+		$(use_with xml)
+		--${openmp}-openmp
+		--with-gcc-arch=no-automagic
+	)
+	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
+	emake check
+}
+
+src_install() {
+	# Ensure documentation installation files and paths with each release!
+	emake \
+		DESTDIR="${D}" \
+		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
+		install
+
+	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+	dodoc {AUTHORS,README}.txt ChangeLog
+
+	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
+
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+
+	if use opencl; then
+		cat <<-EOF > "${T}"/99${PN}
+		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
+		EOF
+
+		insinto /etc/sandbox.d
+		doins "${T}"/99${PN} #472766
+	fi
+
+	insinto /usr/share/${PN}
+	doins config/*icm
+}
diff --git a/media-gfx/kpovmodeler/Manifest b/media-gfx/kpovmodeler/Manifest
deleted file mode 100644
index c1cd334e5c9e..000000000000
--- a/media-gfx/kpovmodeler/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX kpovmodeler-1.1.3-desktop.patch 482 BLAKE2B 3eee6b9a39d6dd916e51e9fe0ff81449d4164ab545c4af9f9e94855e5e387bb0999ee237a13f3da3a0fcea135d4d4fe8dcf674a32577ea94882197d624646aae SHA512 c20f7a0dfe5eb03e8e8a01ae6f99c494c9b7222de42f1e3413eb749f45a83aa32d88b04d1415b9b4454b3a278c4b8bc5d4d7b88dad4dc91b2b36fe9bb2813d92
-AUX kpovmodeler-1.1.3-freetype-include.patch 437 BLAKE2B 667f756d0f64f60d52920f77b35d426b3048ba9180c555b76aa30220d5057a2799090ec5ff252b637754c7be9dcc87232e4ad2abe6b9447e8fdb8a93bef23dfd SHA512 44bc1a02e3f9c915685e3a33b7157806d619d93e2b6661756d6063ae25ea49010d326bf391e3777267148dab4cb1a2c2fcb787480718758f2a998473b2064ac4
-AUX kpovmodeler-1.1.3-underlinking.patch 596 BLAKE2B 370ed588a8c1b8f03038655481d0acf6b599227e5f28754459998d6db2e7a1b9697a19cf59fff28085864ab364c830ad5862fde97c61779522757e6db73d5ed6 SHA512 ebaeab7d4d996867c0e0061db9749929c594dd1098260b444782ae9f5bee2c6bc1b41819acb5edbc00a37cec30adc85fbe0788d29646ce7b5face411eb68715d
-DIST kpovmodeler-1.1.3-kde4.1.1.tar.bz2 1875515 BLAKE2B 6c47ff48929cfde913d88e07a5de10c3578b7d54f6531bc013dde0cd3ad5d789d9496bc7e28ebed14454e80dd80c8c4a0d934127aaafb655b7383ece694bf1d5 SHA512 8cfdde653ec93bc044d049ecf61b4d106d7415874668f6f56e9f59fb88f023e78717592e5e3a0aff071d0d4a84ac51f8457bedb5b1fa48e92f06c6d1d08385f6
-EBUILD kpovmodeler-1.1.3-r1.ebuild 956 BLAKE2B bccf623fb6b7ad191f9c1df1ddb1d80a6a50f70b3c4bc456c579ed92e69eeddd5f6af41c8fb63396dbf439adfe2e8f4f4f430aa9745715150126b8f26835c1b0 SHA512 7305c0119b757b98ee400bab9d7607509ce7dd49bc509cc8202c93f15db2998e7079fb80fbd619ee1118cb7eb2e2af28559e8af10e16a2c2c2cccb500a83d5db
-MISC metadata.xml 368 BLAKE2B 5b8bb398b4642a348e4e256844013728f799cb15964e7e6b56512f010bbd4284e71f086deedbbf27442403a2f38986da0bc3297f19afe9236d17d8d8c4c44e1e SHA512 b6155078e289dd6004c392b3b54afb23c2e84b11a3ec23b156cb65ad7cbe37e6866e346ee9fe801db5afdc1691d8fc7a54c2e2b5cd7e6ee311dc34579e767a1f
diff --git a/media-gfx/kpovmodeler/files/kpovmodeler-1.1.3-desktop.patch b/media-gfx/kpovmodeler/files/kpovmodeler-1.1.3-desktop.patch
deleted file mode 100644
index 04013e22dad0..000000000000
--- a/media-gfx/kpovmodeler/files/kpovmodeler-1.1.3-desktop.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Remove deprecated/useless entries causing validation warnings.
-
---- kpovmodeler.desktop
-+++ kpovmodeler.desktop
-@@ -49,12 +49,8 @@
- GenericName[tr]=Povray Modelleyici
- GenericName[x-test]=xxPovray Modelerxx
- GenericName[zh_HK]=Povray 建模器
--Path=
- ServiceTypes=KParts/ReadOnlyPart,KParts/ReadWritePart,Browser/View,KPovModeler/Document
--SwallowExec=
--SwallowTitle=
- Terminal=false
- Type=Application
- X-KDE-Library=libkpovmodelerpart
- Categories=Qt;KDE;Graphics;
--Encoding=UTF-8
diff --git a/media-gfx/kpovmodeler/files/kpovmodeler-1.1.3-freetype-include.patch b/media-gfx/kpovmodeler/files/kpovmodeler-1.1.3-freetype-include.patch
deleted file mode 100644
index 9939780a4250..000000000000
--- a/media-gfx/kpovmodeler/files/kpovmodeler-1.1.3-freetype-include.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Use the correct freetype include directory to avoid a build failure.
-
-Gentoo bug #467998.
-
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -11,7 +11,7 @@
- 
- configure_file(config-kpovmodeler.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kpovmodeler.h )
- 
--include_directories(${FREETYPE_INCLUDE_DIR})
-+include_directories(${FREETYPE_INCLUDE_DIRS})
- add_definitions (-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS)
- 
- ########### next target ###############
diff --git a/media-gfx/kpovmodeler/files/kpovmodeler-1.1.3-underlinking.patch b/media-gfx/kpovmodeler/files/kpovmodeler-1.1.3-underlinking.patch
deleted file mode 100644
index 9f70e5c06b82..000000000000
--- a/media-gfx/kpovmodeler/files/kpovmodeler-1.1.3-underlinking.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN kpovmodeler-1.1.3-kde4.1.1.orig/CMakeLists.txt kpovmodeler-1.1.3-kde4.1.1/CMakeLists.txt
---- kpovmodeler-1.1.3-kde4.1.1.orig/CMakeLists.txt	2008-08-28 20:05:05.000000000 +0200
-+++ kpovmodeler-1.1.3-kde4.1.1/CMakeLists.txt	2011-08-06 22:37:50.471609939 +0200
-@@ -306,7 +306,7 @@
- 
- kde4_add_executable(kpovmodeler ${kpovmodeler_SRCS})
- 
--target_link_libraries(kpovmodeler  ${KDE4_KDECORE_LIBS} lkpovmodeler )
-+target_link_libraries(kpovmodeler ${QT_QTGUI_LIBRARY} ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} lkpovmodeler )
- 
- install(TARGETS kpovmodeler  ${INSTALL_TARGETS_DEFAULT_ARGS} )
- 
diff --git a/media-gfx/kpovmodeler/kpovmodeler-1.1.3-r1.ebuild b/media-gfx/kpovmodeler/kpovmodeler-1.1.3-r1.ebuild
deleted file mode 100644
index 44f61499af26..000000000000
--- a/media-gfx/kpovmodeler/kpovmodeler-1.1.3-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-KDE_LINGUAS="af ar be bg br ca cs cy da de el en_GB es et eu fa fi fr ga gl he
-hi hr hu is it ja km lt mk ms nb nds ne nl nn oc pl pt pt_BR ro ru se sk sl sv
-ta tg tr uk vi xh zh_CN zh_TW"
-OPENGL_REQUIRED="always"
-inherit kde4-base
-
-MY_P=${P}-kde4.1.1
-
-DESCRIPTION="A modeling and composition program for creating POV-Ray(TM) scenes"
-HOMEPAGE="https://extragear.kde.org/apps/kpovmodeler/"
-SRC_URI="https://dev.gentoo.org/~kensington/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1 FDL-1.2"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND="media-libs/freetype
-	virtual/glu
-	x11-libs/libX11
-"
-RDEPEND="${DEPEND}
-	media-gfx/povray
-"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( AUTHORS BUGS ChangeLog README StyleConvention TODO )
-
-PATCHES=(
-	"${FILESDIR}/${P}-desktop.patch"
-	"${FILESDIR}/${P}-freetype-include.patch"
-	"${FILESDIR}/${P}-underlinking.patch"
-)
diff --git a/media-gfx/kpovmodeler/metadata.xml b/media-gfx/kpovmodeler/metadata.xml
deleted file mode 100644
index c378119fad77..000000000000
--- a/media-gfx/kpovmodeler/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
-<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 264b9abee06d..78d4c852de08 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/libmypaint/Manifest b/media-libs/libmypaint/Manifest
index cac6153de903..ffc95ef85806 100644
--- a/media-libs/libmypaint/Manifest
+++ b/media-libs/libmypaint/Manifest
@@ -1,6 +1,6 @@
 AUX libmypaint-1.3.0_beta1-as-needed.patch 804 BLAKE2B 8aa4f9215651b540cb9517851f13bea57df56b4ad9cacfe7d2e176060773a6ae4f0e7506cc4325b72cdb8b99e1c4bd0bb274dd1956262909a33d66834cdce618 SHA512 49853d92f723690d67edb35b01e0907c314b07f99f468e73256faaaa49d4d3a7a35fd4b7b0d897223c14f4567d2f8d33689a21deee80d82413f72e840fea888c
 DIST libmypaint-1.3.0-beta.1.tar.xz 421424 BLAKE2B 3ca1718035de301ffe037ab25b5e6e7c48f92a31ba337b6652977cae71d94e2fa11f01f81b87598e71392d51e13747e82d813d35e981753c85674f0f8b5bb167 SHA512 ae98ec8947d521749d82bc1e683efcace2da7e3c8b8453e79e5191d65225f0963394344628d646947f79b141503d268277d26ce2eeaf482bbe24f1bfb1d103fa
 DIST libmypaint-1.3.0.tar.xz 438160 BLAKE2B a018ba2dc2b2cf2f771e871a0cb769887d962c18f83315d1c77864f567ae69aa16a1d55b770f46527990995f0dc940516371485d6f3d4f3cc332623fc408c248 SHA512 553eeb3439ffd0c013e33254a16334242583b8bab76d1a3e937f3ed1d7e05a832c6eb26acd7220dce20c6a7d997c32afe828202ce48e25a5fe57b67efd853fcf
-EBUILD libmypaint-1.3.0.ebuild 1289 BLAKE2B 7270a7c1386058ef4c91e023030d101ad9a2a122bcaa86d34f7c76334074fdb3d316fe078b1b41098ebc5d2ddce036eb0559fc79a3d339886268ab88fdf5dfa3 SHA512 3d8bdba9fd516d7d9daffa32aea108331766ab558f23ea8dd6c959c322100918763858e67e9a35f6fb2bd3c85083019773d44abd4b4587c41ae658ea47d5382a
+EBUILD libmypaint-1.3.0.ebuild 1296 BLAKE2B 1b25c798098e90e08dcfac82445ffa248af34ebcfbc992f0c64a2a21c92c5f1e245a36d075e122b17709209f9bd76eeec40f460ae0e1f35cb2c4d6f42b680f18 SHA512 966563cc7e12b3018963f45f7273511db677b8aa95b6c598cc8d4a86c67367771df00b569f714117966dfe353daf3029e4b52e2302cdd4a8b35b6a1a80b56d9e
 EBUILD libmypaint-1.3.0_beta1.ebuild 1339 BLAKE2B e7a63b289b9d4ef68d562f0e5f81d7a5a9318e08f560152c6ebbac1b0159285b537bb570456562b25537503eba26046451441e4c3cf0230531877bffa7c4d050 SHA512 caa081fdb5d793e14676e38816bc53ead5561035a3d8c0ef2af4315f59d5e500b4a2f6dd0ecf23f7c78bb22193017a80f213e47509b82873ae2f4540c2fbf3ab
 MISC metadata.xml 417 BLAKE2B 475b260c1300908d836d6ab22ac6d302b28502a817c5e0bd2cd3be2d4331b91db0d4579b4a38c78d81b02e37549fad8511f2b964f9020719bee38f531c627798 SHA512 2e106cc8c3dc9249aa34eefedefb2dbc72e9992e19f6bfef425393629d3e676ebfbaadba9c8fcc13014158d98fa463ff49c812103b11524c851cb0b457ad0f7a
diff --git a/media-libs/libmypaint/libmypaint-1.3.0.ebuild b/media-libs/libmypaint/libmypaint-1.3.0.ebuild
index a1c25ca7349c..b0b54c6a3558 100644
--- a/media-libs/libmypaint/libmypaint-1.3.0.ebuild
+++ b/media-libs/libmypaint/libmypaint-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=6
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/mypaint/libmypaint/releases/download/v${MY_PV}/${MY_
 
 LICENSE="ISC"
 SLOT="0/0"  # first soname component for subslot
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~sparc ~x86"
 IUSE="+gegl introspection nls openmp"
 
 CDEPEND="
diff --git a/media-libs/libsixel/Manifest b/media-libs/libsixel/Manifest
index 6fb142006c3d..984523f6be2a 100644
--- a/media-libs/libsixel/Manifest
+++ b/media-libs/libsixel/Manifest
@@ -1,5 +1,5 @@
 DIST libsixel-1.7.2.tar.gz 4760634 BLAKE2B 0cf1de06a133a018e4bc5d6d5fbceb07e33e4246b826c28c2e1f3251a383a9fddc7255c1b8726c0f4d13b41bbd42e9188e3d442cc65c399004628f3d7a020dd4 SHA512 9716ec45ba29cab6603896f717a6b21111ebacb48744009c8c032d6fd8dbb8f7444f27bc9f5c6f419a771544582ce5828e6b1870ea2cc37d917030c4c88de091
 DIST libsixel-1.7.3.tar.gz 4766335 BLAKE2B 5e546d31f9d66f5121301abe009677d05fbc1444e8a25a1feb6f9fed646a4bc543492376302b663569e0ddca99b665d5c81d9d35aa07349935b727ad581fb517 SHA512 f7b6b9748389f140ce2f6cf0eeb74ab5063c21455c72013a7e066981439bb1ada7b3e9b68a7b3b57c49205271f32ffb8d6d002a4f2af45b1381dd015873b4e91
 EBUILD libsixel-1.7.2.ebuild 1035 BLAKE2B 282b309821c835889539208da70f675ad2317103a69da30cc5c8667ea120393fba920b1abcf36f84a280d04f2ae31f671e86b93f2965182470130d63313f82da SHA512 2c2ec68d5bc1d93f6bd24ace358d075aa0a54b7582c43edab1497aa06be90384395af718a663b6417c4176807982e9b7c50a32ff2cf01a650930775e66e07071
-EBUILD libsixel-1.7.3.ebuild 1032 BLAKE2B 7e35ebd3b59bec9950aad925fe36721fc3b85b48b1c475567e3195e0c37050e53f17d8eb8bd73c97ad45b9eff9fd09b23c04bf5fcc6f94d8d1a7d38274ce0720 SHA512 ce1d5cee6f37077ebae4ad154dcca7b4474a3593856ec885ba6b4ff462e3e8513268267d5bdbd64fbbb1694c5167f89c1d58d2e7d298aac02c965ece0474ed50
+EBUILD libsixel-1.7.3.ebuild 1110 BLAKE2B 4ad85bd3aa3f0ef0811367bf4eb8ad40f677d4c0524d58a41628715bf2d075fb69e95ca7733156bbd3659b98d33f4c0ad3c14b610adbdf17d243d9cc61bfddc8 SHA512 08fe560db4fc76c1d2c70a0b7eacc3e48fffac3a4ef9ebf19e44c2735cc5473808b104792c07c80d7c60fc7c95eecabf7623a40d2fb2bbce96cf0caf830a108c
 MISC metadata.xml 306 BLAKE2B 9fb9f3186df0538ebf4d1ec03e7404f798f36c2763e048d4b4026156d75b0597e58a4412235e1d7c44b0fc9ea54665fdfcb248374818ab086e4741345469013d SHA512 5fe5ae6f4593b3c990ded3a3d96dc2149729b00bb0a0d13a936c68c61515a79efe90672a6f0b13023b1dbb3fb00e6698ca16751932bfc09af84fb5b4c5ef1dd1
diff --git a/media-libs/libsixel/libsixel-1.7.3.ebuild b/media-libs/libsixel/libsixel-1.7.3.ebuild
index 13adf5b40300..3d8e5d2dbd83 100644
--- a/media-libs/libsixel/libsixel-1.7.3.ebuild
+++ b/media-libs/libsixel/libsixel-1.7.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-inherit bash-completion-r1
+inherit bash-completion-r1 ltprune
 
 DESCRIPTION="A lightweight, fast implementation of DEC SIXEL graphics codec"
 HOMEPAGE="https://github.com/saitoha/libsixel"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/saitoha/libsixel/archive/v${PV}.tar.gz -> ${P}.tar.g
 LICENSE="MIT public-domain"
 SLOT="0"
 KEYWORDS="amd64 ia64 x86"
-IUSE="curl gd gtk jpeg png"
+IUSE="curl gd gtk jpeg png static-libs"
 
 RDEPEND="curl? ( net-misc/curl )
 	gd? ( media-libs/gd )
@@ -29,6 +29,7 @@ src_configure() {
 		$(use_with gtk gdk-pixbuf2) \
 		$(use_with jpeg) \
 		$(use_with png) \
+		$(use_enable static-libs static) \
 		--with-bashcompletiondir=$(get_bashcompdir) \
 		--disable-python
 }
@@ -39,6 +40,7 @@ src_test() {
 
 src_install() {
 	default
+	prune_libtool_files
 
 	cd images
 	docompress -x /usr/share/doc/${PF}/images
diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index f1f01e6e6d76..3321774928d7 100644
--- a/media-radio/Manifest.gz
+++ b/media-radio/Manifest.gz
diff --git a/media-radio/fldigi/Manifest b/media-radio/fldigi/Manifest
index 102beda39761..1f9386c3b47b 100644
--- a/media-radio/fldigi/Manifest
+++ b/media-radio/fldigi/Manifest
@@ -11,7 +11,7 @@ DIST fldigi-4.0.8.tar.gz 3616621 BLAKE2B a5bbb8ce6161ae880b7c05d6d99c358df0bb4dc
 DIST fldigi-4.0.9.tar.gz 3625206 BLAKE2B c3b4056b8b5ddbf388cc660742998c110c271347d6385368d3c652084fb93624958d51c3cc54b735ba3e0791d55d3eaa2026cc9cf2f62a351490be01a66a7cd9 SHA512 fff5bb845c5647a016f25887efb34d0361b7c128db808b8b927f694e1f27528dc02861653071e7ab5d0d5a3a4f081685bd9b8e5cbadab7a82ca8e34ad324c006
 EBUILD fldigi-4.0.10.ebuild 965 BLAKE2B 249c84924b752a7f34b17713d9bcba9496ecea87d19c3ca45706f1f8a6ed8bed649e1d47e168637046974730ffbaecab1800d8bcfd3638dab1698b4318c7d415 SHA512 58087bc28d121bc466dc89355de61ce0e1630aca431c5954099e6c5774ad7ef24e34d6ac686b306794464b6cf35696fd12a24aceaeaa53515f3adde7f0b517a0
 EBUILD fldigi-4.0.11.ebuild 965 BLAKE2B 249c84924b752a7f34b17713d9bcba9496ecea87d19c3ca45706f1f8a6ed8bed649e1d47e168637046974730ffbaecab1800d8bcfd3638dab1698b4318c7d415 SHA512 58087bc28d121bc466dc89355de61ce0e1630aca431c5954099e6c5774ad7ef24e34d6ac686b306794464b6cf35696fd12a24aceaeaa53515f3adde7f0b517a0
-EBUILD fldigi-4.0.12.ebuild 964 BLAKE2B ecfcb6b1f1181b9e6f4bde50418569fb917788758888aa0d1d7544a0d137aa9b5fe327c855bcdb15678c8f1637af840fb6f0d7079b606d01103c2827aff0ae93 SHA512 a33217892281522e69e0ae5d2583b46ed51ba6c36e811b51db85f8814a50b2eac98c51b45e209dc89618fa6ae70e1e1aead5c8fb454c1041d8b9e6c98fd1260d
+EBUILD fldigi-4.0.12.ebuild 963 BLAKE2B 40d3a14326eca2e180f17393928b8a856f419ff8f7c5f5d53c71a11677242f51f109efb51ebedb86dbc36592e11b694398f0537a49d52f2aa49f55de0509f918 SHA512 cd049738e4d063b4a23121e0a7890875b5dc19dc70bc183dcd748063717e03ab143a6c588a7c1383f0a1425517bb8b7b35e9af517567cfde82078456c367cc9d
 EBUILD fldigi-4.0.13.ebuild 965 BLAKE2B 249c84924b752a7f34b17713d9bcba9496ecea87d19c3ca45706f1f8a6ed8bed649e1d47e168637046974730ffbaecab1800d8bcfd3638dab1698b4318c7d415 SHA512 58087bc28d121bc466dc89355de61ce0e1630aca431c5954099e6c5774ad7ef24e34d6ac686b306794464b6cf35696fd12a24aceaeaa53515f3adde7f0b517a0
 EBUILD fldigi-4.0.4-r1.ebuild 1042 BLAKE2B 2d4b16b28cdc326b8102404f4ffdce8e1321657a46aa00beba7dfea5fe9c7f87525afbd5740ad2774b3f6c3247cd6fabd7a4a67b834c62af9b4bf2102266ddc8 SHA512 7e3701bf4ccfe6d6257db9fb09d730bae0044c19b74833faf9a75be24f9bde0b750b0a91a04ffbb802068479b7ed504b9ad0c62b232ad9ead9620d9b463c76cc
 EBUILD fldigi-4.0.4.ebuild 981 BLAKE2B e524958f675792c66746b3a43d2d789804c34a49d2c9c2052cf39a806b422ad5e6c2e1e0ef8adfcfdb5985a5e848625c4974570ccbcb1971646fd7e4b476afc8 SHA512 7702bf8879d87134ccf6306ed18874061ffe10897e0a32d9772263489c3d214f607eb3af7d6fc5447c2e644d869370fa8376e5f9b1e9b57c46819f48b98d467e
diff --git a/media-radio/fldigi/fldigi-4.0.12.ebuild b/media-radio/fldigi/fldigi-4.0.12.ebuild
index a33b5ec25710..5f82ae983153 100644
--- a/media-radio/fldigi/fldigi-4.0.12.ebuild
+++ b/media-radio/fldigi/fldigi-4.0.12.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://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="hamlib nls pulseaudio"
 
 RDEPEND="x11-libs/fltk:1[threads,xft]
diff --git a/media-radio/flrig/Manifest b/media-radio/flrig/Manifest
index ed9a765e3382..1d36b0510d5a 100644
--- a/media-radio/flrig/Manifest
+++ b/media-radio/flrig/Manifest
@@ -17,6 +17,6 @@ EBUILD flrig-1.3.32.ebuild 626 BLAKE2B ee1d3a031a3cc026faaedacdacdc728f4b37f674f
 EBUILD flrig-1.3.33.ebuild 625 BLAKE2B a355e324fdeb4cca2db3bab3ef4500871f4d0b8db73d11276a3dc3ac622492d108ffeed47db6c0bc3df808c77158627ae7efaefbeda04d66d755458f70b6cdcd SHA512 59ef8acf3d6101b54a05d832463eb1b100d6486f3c2a5fa2392fafc96abc32f228c4cb6655914a2111cc5ca67e3bb9e76916fde0edb183fa635794a64a89bca9
 EBUILD flrig-1.3.34.ebuild 626 BLAKE2B ee1d3a031a3cc026faaedacdacdc728f4b37f674fb1555eb29527b3bdd0852ad15094203d4909436a71b65b7afb5ebdaf0320ce27b4145452591b31b43ad4691 SHA512 e6c243bd911e9f894524d9366c6dd344941524a1811614056d547a68d56bf58996b3c4ff02b5e80bf27ced913c602589d480188b425d38fe5deaff3efbca7c9d
 EBUILD flrig-1.3.35.ebuild 626 BLAKE2B ee1d3a031a3cc026faaedacdacdc728f4b37f674fb1555eb29527b3bdd0852ad15094203d4909436a71b65b7afb5ebdaf0320ce27b4145452591b31b43ad4691 SHA512 e6c243bd911e9f894524d9366c6dd344941524a1811614056d547a68d56bf58996b3c4ff02b5e80bf27ced913c602589d480188b425d38fe5deaff3efbca7c9d
-EBUILD flrig-1.3.36.ebuild 625 BLAKE2B a355e324fdeb4cca2db3bab3ef4500871f4d0b8db73d11276a3dc3ac622492d108ffeed47db6c0bc3df808c77158627ae7efaefbeda04d66d755458f70b6cdcd SHA512 59ef8acf3d6101b54a05d832463eb1b100d6486f3c2a5fa2392fafc96abc32f228c4cb6655914a2111cc5ca67e3bb9e76916fde0edb183fa635794a64a89bca9
+EBUILD flrig-1.3.36.ebuild 624 BLAKE2B 35f05d522308aedf4919926975417e6052f44503f533b2496d2bbb594ed74beab0dc1fce65fb3975bf1e69ec4be190c9fabd8679223988b2d09376d16299ae24 SHA512 5d2cae5c29172ee70aa5dcbe65cf449094980b4ae75b1dc6dd23cfd368ac24d396b1154107a0506e6981c089e56626e4abe8e28e15fb12b0e68a84a3d587cae1
 EBUILD flrig-1.3.37.ebuild 626 BLAKE2B ee1d3a031a3cc026faaedacdacdc728f4b37f674fb1555eb29527b3bdd0852ad15094203d4909436a71b65b7afb5ebdaf0320ce27b4145452591b31b43ad4691 SHA512 e6c243bd911e9f894524d9366c6dd344941524a1811614056d547a68d56bf58996b3c4ff02b5e80bf27ced913c602589d480188b425d38fe5deaff3efbca7c9d
 MISC metadata.xml 325 BLAKE2B c4c98ed723dff91c8935c44ee552e25a08366edb7b73593d29d790622a49e130ef56137de21e1df16e1f968b1d5a0c984ce6df5b817a39f38523fb71353a3e1f SHA512 ca601e14e79450d08e0679e86827071a323fbc60cdf89412257747490046ca6efb2e78ae27f69c0e3ad449427049a35d478f2a7524a0606658ef9b302d9c0d43
diff --git a/media-radio/flrig/flrig-1.3.36.ebuild b/media-radio/flrig/flrig-1.3.36.ebuild
index f0f4e66200b9..8b0982ab2c0d 100644
--- a/media-radio/flrig/flrig-1.3.36.ebuild
+++ b/media-radio/flrig/flrig-1.3.36.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 @@ SRC_URI="mirror://sourceforge/fldigi/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="nls"
 
 RDEPEND="x11-libs/libX11
diff --git a/media-radio/xlog/Manifest b/media-radio/xlog/Manifest
index 47ce55ddedbf..615a8c43654a 100644
--- a/media-radio/xlog/Manifest
+++ b/media-radio/xlog/Manifest
@@ -4,5 +4,5 @@ DIST xlog-2.0.14.tar.gz 11452537 BLAKE2B e8ec6853e91190375d880a221aab75e1297cf5a
 DIST xlog-2.0.15.tar.gz 11461174 BLAKE2B 99b1d1cdcf6bad60f283d6885eb8c9317d5d35e411d2c449732e8f8bf9ed69e552fd73f2c1fcfc56ca386df447df8e5e2bbbffa80d596d8da4c347379231890c SHA512 58403d6cd05a222900236a9b165d1b51951f2efa668aba5989970036135a91955af64a4662a5cd6f6e7c4629e3353b3c93c79c3e14d81c7ae65a82cf9ade6397
 EBUILD xlog-2.0.14-r1.ebuild 1734 BLAKE2B 00602e74195d3d85c550d3a624118a974b29a2332dc714e57881df68eecba15892e666b6e2bdea63eb0affb62762924bae6c61beed8804b21a84185a03df0947 SHA512 338f8e115061113a1c725000dfdf6c3acd2be504f041a981cffd27a8aa5fc7f4565986727c707fe07f656838dfbf448b67080b8f0a8d6bac5862ee6d2e5d39b4
 EBUILD xlog-2.0.14.ebuild 1434 BLAKE2B a224b3b6adb95aac16c28a9a1d6ed674fe0a08a2d61264ca4304b7188280303bcb5af2c573648e76c623a2454aa558d95f7ca9b86009c55461caf3aa73b8114c SHA512 11ff98edad83e146e3d4bf63a91084218006e78c55f33a75ebd679d6f8e708419464e6dedcccbeca4a141c2c688d1db0c62ac0d1056dd2e9c3bc6ca25cdcbba4
-EBUILD xlog-2.0.15.ebuild 1435 BLAKE2B d8d08804dce0325f9070023efa0e1c1b1529d2351adb4003e869b27b2eb9ff41cd6f96e277aee1f87790b2a9d3751459d37cc0c2916046072c11c5292f8801fc SHA512 3f72bdaad17396f2056e928757324c7e9edd72c50c1e5fde5b518b93c0fa4cbf7898f131298463f377a30d28140e7f2f7b2f6c30e8a5edd8df6ba673b7662205
+EBUILD xlog-2.0.15.ebuild 1434 BLAKE2B 05e563ea4701058972728e0beaa25fe6cfe8533aeb634ed9eb71d334e0f36b20f366e053e8d3f24537ce424ff0bc16c1c8a30e6fb6f1b86ce18f1bcab973c658 SHA512 add1be481bce44e2fde778b8c1a64e05b99b98238cf30587cb77cfeb22336aa6fcff3090212c936360949e4dc28a7ed2379f7336684a7c4751df5c77c533d55c
 MISC metadata.xml 245 BLAKE2B 1d0fb3b909203735db219043a3b6ad6a2f3fafff1813f9c9caefdb9206262ff73c4ce6b93c0a8ec7d157148cea478b38d0c835ac9948a66d8ed81726f1b4d93f SHA512 9289d414ccbc30198596601b290cf42a583a093bbd7c5f8889c8ac0e81d8570bc4d42dfcbfe210456120edb910ea8572d6806400adec144f4eeb95fa36ae6ef3
diff --git a/media-radio/xlog/xlog-2.0.15.ebuild b/media-radio/xlog/xlog-2.0.15.ebuild
index e8fc51e7b5c5..b451488ef52c 100644
--- a/media-radio/xlog/xlog-2.0.15.ebuild
+++ b/media-radio/xlog/xlog-2.0.15.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
@@ -12,7 +12,7 @@ SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="media-libs/hamlib
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index d9fdb0ace216..54642d4fcd05 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index fb1b27326136..86d142dfb7d7 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -1,6 +1,6 @@
 AUX clementine-1.3-fix-tokenizer.patch 674 BLAKE2B 6f5b0c6bd71887cbe9ce0f85a85db134710f5aaf62c4e8105ab1b8ab0e69a0953b6177fb91dd89fcdcf5493dfc1e634f51658eea9f050689aa1e219dbd8db189 SHA512 4f520dcd4937634ebf5bb814ec64267d42473886fc5abd4924ac551bbae8ecc7643ddbacd9e2f9a5b0d8c7b0f67cf5aec420b5eb73162b248cbf6b3eafafbbd8
 AUX clementine-fts3-tokenizer.patch 1395 BLAKE2B e3dee5d7e9856c6d3d5b69ad2d4a195a7016a7dcd0f01128dc24a22c10ea5cba0cc302852272ca4d45844c0003572809fa8d8c1a2e37524d2e8c75e64d96290f SHA512 c4623333086cebb9d56d11c4deb8837fc23aaff8ddda07bcb8bb1c0df90700d6923d51324823d23b317366180660de3993053d9de0ff5103d88f59143328627a
 DIST clementine-1.3.1_p20171113.tar.gz 8467904 BLAKE2B bf1f59b987c0e4ec5c2ced00fab07c1a7e1df0eb5a46e90358b37eaaeaa916fb3e6a08ad79fc5fb791342d857783f615eb3726974dcfef9388da2793b1b7fe6a SHA512 39c459be8e4c5dd53ab9de6cdfd57f947926ccc2cd39ce2f72460bb991f7b2a28e6bc074e7bc23b0eba81c3d630e91dc2373794832c1089a9b5de7b212b94674
-EBUILD clementine-1.3.1_p20171113.ebuild 4947 BLAKE2B 14dbc1ddea527ce441fb7bf1c4c17d32f4977495cc879606a29aa2e2843be4e1e686efb5ffe39a0a165562897da1ef45500edf3d07b8c8e70e99a5bc776ac6b6 SHA512 9e5ebe21635216eabe086dc5872902bbbbba6360b69fb7d1e967f2883a6bedf9d7989d576af94eee65a11ed1a0fd8df2a9891138d42e92899be409f514ee3b2d
-EBUILD clementine-9999.ebuild 5193 BLAKE2B aad0efc0d126ff29ccf3211db65be57bcba02fa24d8b4c682ad95e6001d9aea33ca12e47e52d66a7cdb627930545cb72f35416b50c7110aeb66c8843da721119 SHA512 6ec8c6e0a28f53326752500fbd4a1e247127d0ac720df94e93c15868ee5a7ce25e51651a58126b8acb57bb0b6c3150c0d38be202644648dae9d054c49bfe881b
+EBUILD clementine-1.3.1_p20171113.ebuild 4949 BLAKE2B c191c95fe3eeed9a429120b212e449b6bec7de077f0da771612fb5a3d04c3b3d64f34c92ba48fb13037f930a243695fe0768ce0df03b877f7f4479dd8bcc6d48 SHA512 5a6038ab815b894e46c1f5d84c73754a3265e105b7aca76e4cb828749d3fad64fd2ea5ea153dd26ebb602bcdd6510a185c6547df5d5e4950372a1e8ce7cc6020
+EBUILD clementine-9999.ebuild 5195 BLAKE2B f19ba92eb4765b208ac633176583183e2277d964be17fb84224a89440a270c00ec70a73d08da844b1343e055f670aaf3bf9afc283d38360535b024e2b19e94fa SHA512 dca3b14b5790ed68f2afe15191ba4ae09459b1ef22894d826e8d38eef0fe8bcb44bf45563a034cd339baaa1f26ec835c7182455aecb43dd401aee6b9f820c520
 MISC metadata.xml 1415 BLAKE2B 9bdad36fc6b032413a003f93cb53ccc439d6dc437d8ab6b7da03ea148a550eafe5ec6910c984e90abf39bd4a427567a7e5de98fea8a36ed54452fc822ef28dda SHA512 02122e10260ba62b72ea2a5de32eb45fb1578cfb20f67294467ff2fcc1ac78f917dc415cf0c5dd587c509c5e05420a07c7c75379eb88fd97f03b962c77fd2213
diff --git a/media-sound/clementine/clementine-1.3.1_p20171113.ebuild b/media-sound/clementine/clementine-1.3.1_p20171113.ebuild
index 21eb4cf1fb61..0f4fc0d9ebbf 100644
--- a/media-sound/clementine/clementine-1.3.1_p20171113.ebuild
+++ b/media-sound/clementine/clementine-1.3.1_p20171113.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
@@ -44,7 +44,7 @@ COMMON_DEPEND="
 	virtual/glu
 	virtual/opengl
 	x11-libs/libX11
-	cdda? ( dev-libs/libcdio )
+	cdda? ( dev-libs/libcdio:= )
 	dbus? ( dev-qt/qtdbus:4 )
 	ipod? ( >=media-libs/libgpod-0.8.0 )
 	lastfm? ( >=media-libs/liblastfm-1[qt4(+)] )
diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-9999.ebuild
index a2fe1ad85c4b..567383c9fc22 100644
--- a/media-sound/clementine/clementine-9999.ebuild
+++ b/media-sound/clementine/clementine-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -52,7 +52,7 @@ COMMON_DEPEND="
 	virtual/glu
 	virtual/opengl
 	x11-libs/libX11
-	cdda? ( dev-libs/libcdio )
+	cdda? ( dev-libs/libcdio:= )
 	dbus? ( dev-qt/qtdbus:5 )
 	ipod? ( >=media-libs/libgpod-0.8.0 )
 	lastfm? ( >=media-libs/liblastfm-1[qt5] )
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index ad6a294b59fe..dc6f7b311ad2 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/bashnapi/Manifest b/media-video/bashnapi/Manifest
index aecf0be8f38f..29cb634e6a75 100644
--- a/media-video/bashnapi/Manifest
+++ b/media-video/bashnapi/Manifest
@@ -1,5 +1,3 @@
 DIST bashnapi_v1.3.5.tar.gz 98580 BLAKE2B 4a7b42f91c14c7dc24cbf14535700a778d915db0dec31206cd7bb91519f33aa4eedced56aa4efa136e3eef23f6674d1a7dafe6c63686aca4dccf076952da762d SHA512 7cf5abb009021a43261be863f320d6324b02ea25f1388c7cc99a4f695a3eb987971ada172f74d21e3a44deeec35e48c4424fa378de53749f994b6c0d0f76eec8
-DIST napi_v1.1.5_subotage_0.15.tgz 38080 BLAKE2B b8e15a91ebc026a74fb90d8ed81d8d0b1c9de31b4ab24a276258c05c844137a85afa7840b88abd5a52ff017e4792587919526c773987865a91b2e9f8dd9be09d SHA512 a8f2b79a3d0767c99af448e7ec9fb8d9b2048876f966ab7ef07c17b7935066387dd20e9535f43947266810d66d28e5e2d02cffc5f033c65112c10744506e86f5
-EBUILD bashnapi-1.1.5.ebuild 737 BLAKE2B d7e87681904b04fc975e20d074efd4f523587f300c8d601f5fa12066e84f09bd81734a06e5a1d50ad52c84037796fa0a40263f652144e2cd58dba6cf369195b0 SHA512 6311b0c41e49a0af06425b70b19ee1627cb2c2fa40211011cbbc7465dd6a67262f7b4d490435e3c6ff1021f598918037d2346b4a1bab32e3e8d2ff2b6726edfa
 EBUILD bashnapi-1.3.5.ebuild 1191 BLAKE2B 9de6ff32cad26dcb7af6bb5887e92319173a60607a928aaf99ae88488e22f332b9c7bbaf4da683d9fe97d2722a52aec19e8cd8415cf0a6889e3f60260aedca5e SHA512 7eaea6de7b4ef121ea70faff2c76ee963c0f76af9ca9440cffd7eea5c86bd6bb2129eeda6b9f56250e15e7a616c5be20a9c4ae589f92dae60bcabadcde7260dc
 MISC metadata.xml 325 BLAKE2B d80d1433192e99fcf314cee37c43606d74f771b7975fe0bea47610268a4cf616fe1f25ddd647b85f7b3bec4829fd268938a8cbae25596902ae589483c56b8a88 SHA512 93311c8909919558e542db42c144d361ee0289e4c61fa2d49508941f1aa93e307fc6f9a6afce008e3fe54a964cfe35b7774fb94eca405cd4dabba8aa9cb80732
diff --git a/media-video/bashnapi/bashnapi-1.1.5.ebuild b/media-video/bashnapi/bashnapi-1.1.5.ebuild
deleted file mode 100644
index d4e2ad65a1ab..000000000000
--- a/media-video/bashnapi/bashnapi-1.1.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-SUB_VER=0.15
-MY_TAR=napi_v${PV}_subotage_${SUB_VER}
-
-DESCRIPTION="Napiprojekt.pl subtitle downloader in bash"
-HOMEPAGE="https://sourceforge.net/projects/bashnapi/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_TAR}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S=${WORKDIR}/napi
-
-src_install() {
-	default # for docs
-
-	dobin napi.sh
-}
-
-pkg_postinst() {
-	elog "Optional runtime dependencies:"
-	elog
-	elog "   \033[1mmedia-video/subotage\033[0m for subtitle format conversion"
-	elog
-	elog "   \033[1mmedia-video/mediainfo\033[0m"
-	elog "or \033[1mmedia-video/mplayer\033[0m for FPS detection (for conversion)"
-}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index a1f5557d6c73..8b30e37be18f 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 4eb6604db6eb..5eb5ad3930e4 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 01 Jan 2018 19:39:35 +0000
+Tue, 02 Jan 2018 13:39:41 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 807f2686528f..febf6a0776ba 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 412859 BLAKE2B 29f22611257846c43da3f994e05684673fa1caa957a4b148f39ff19bc84f3682e8490d97c111e7eccbdb376d70136a0d0906ef152ce3abf044f4fb391eb520c4 SHA512 49d32fc5be9c59d40fa5555276aaf748a6274c5421c12e450644629355174f7bb6f7e77103a5571ae8f5e28bcd53505531ac68ed8f7957c3debfc9196bd152cd
-TIMESTAMP 2018-01-01T19:39:39Z
+TIMESTAMP 2018-01-02T13:39:45Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlpKjntfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlpLi6FfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAK0A//d+C3+1qX76+wdkjP9uiHbU96HZNDyLHwxD0iP3f4ZZP4jD9ofJ2u+kFP
-W25lO7kJLcgwRyYMrZ8g9Mzzk+30XAOzDjgtiBnbQJ5Vx+jbqYbUFCKD4spkdO3d
-xkr+eiqfkSjPDJOy7B4Xui+Kn+yfbD9zsNhptkKfowVX40OMwegMEVIkv6SatXkb
-zLq1zL/79CureFJzLux3i7bDHlJYKQUBprcvF1tR+mP+PQ7vvBK2/vFXui++eq6k
-5k9mBryFwJaqV1AoWSPEIjzhHmSuB1M1zjyLd73uOA8dPXaw3L8oJCB0mCrIZ+LY
-RVkWtN4hbrqJgz44UdXjQ23ECHiANXj3hGUkucHTAI7NNPA0pNg96Ws0hSFXRi0u
-LxVNIxNLSxgJQ19oyAyZjWsRRbla/TaPMsqulkGNB9Dso4XNDqKzcJV7UIoT9IIp
-JRfOC+fCQ4WncpPGwvf4pvd21wdqqUi6UOxnjKMrgHC4rIw9DLe9v+2fKoh4JrpN
-Fo3cLJ6f+5Va4TtG7cKx8tAoxoiTN4xo586crSYwFspLbXH9RqbsyhYFst1jGkii
-99BdNkxTh3nAPBnnJlD8zYTxfiWlBv6JqooMtKK9DLt4fDyATWC/1pobS98Encvr
-7oJxisBqp3Z+UHKW990Act1PQRvYBR643p/45HN66XNrJt16xSw=
-=90VW
+klAE1BAApMvuk5vbIIhvf6VxA/IxVV2xlDb68eBWroQoLaTzaMGOYR3uE0LmdNyt
+CDvLMp+bAqAWGGnonMqbHQNdiNBehMPoH1pSHIsR4N1xw8dcSGSnD9tgK8VkDE3Q
+9MLkZVCgZQq/3WjOnz8H2kQa5H+hcIJlQQ//GuM3PwaHghQWXRpYMtKgqJ0JAfMW
+1Aa0mMbX0PDkhd5GmK4lkli0ga/1lz1G3Nnnp3tGx72ekb3/moXXfPPsEI9zrimR
+bgYvGFdbjY66YWe1gneKbySHTXhYPU3jglVCYYhADq8Thgs9ZT4hh8oUC70GmX9L
+A84pWCqqF/SZ85ExQIxnW98XQ7hIvgTRP8L9+SqnJy9hpVEiNN1aHLPWnCKx2Hy6
+TssSLoiHn1cUAuq2fl6fNTB7g/+dY5bH9ewXZ0Dy08L945LXUitn61Jva4UajR1Z
++UhnVaWaowmqYsJi6RfjDtxm3HjXQl1bHzKGSL3AH9jHvw3z/UhVEGL1IKse+FmC
+yzLtDjvKhs9ai8wkVlZcwjZawderCZ438yIdwLWDppLtwkigGM/322wEKZBbP0l3
+uuIvq+Tisqb+RXc7tPR6mQkkIvqH8HvYYdbU/e4xQJK8UxbOJKidBhFJ5WzccX0d
+CMR6xaOwRFziyvTlpbQTLgFa0XuZu+taM4a87KG5BB5Vgnr+pto=
+=IwHs
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 4eb6604db6eb..5eb5ad3930e4 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Mon, 01 Jan 2018 19:39:35 +0000
+Tue, 02 Jan 2018 13:39:41 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 9c463fc2843f..b5ac7f387fb9 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 0d5d249bb208..0af31e19701e 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/calamares-3.1.11 b/metadata/md5-cache/app-admin/calamares-3.1.11
new file mode 100644
index 000000000000..f637f26ae0d5
--- /dev/null
+++ b/metadata/md5-cache/app-admin/calamares-3.1.11
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=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_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwebengine-5.7.1:5[widgets] >=dev-qt/qtwidgets-5.7.1:5 >=dev-cpp/yaml-cpp-0.5.1 >=dev-libs/boost-1.55:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] sys-apps/dbus sys-apps/dmidecode sys-auth/polkit-qt[qt5(+)] >=sys-libs/kpmcore-3.0.3:5= pythonqt? ( >=dev-python/PythonQt-3.1:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Distribution-independent installer framework
+EAPI=6
+HOMEPAGE=https://calamares.io
+IUSE=+networkmanager pythonqt +upower debug python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=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_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwebengine-5.7.1:5[widgets] >=dev-qt/qtwidgets-5.7.1:5 >=dev-cpp/yaml-cpp-0.5.1 >=dev-libs/boost-1.55:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] sys-apps/dbus sys-apps/dmidecode sys-auth/polkit-qt[qt5(+)] >=sys-libs/kpmcore-3.0.3:5= pythonqt? ( >=dev-python/PythonQt-3.1:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) app-admin/sudo dev-libs/libatasmart net-misc/rsync >=sys-block/parted-3.0 || ( sys-boot/grub:2 sys-boot/systemd-boot ) sys-boot/os-prober sys-fs/squashfs-tools virtual/udev networkmanager? ( net-misc/networkmanager ) upower? ( sys-power/upower ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
+SLOT=5
+SRC_URI=https://github.com/calamares/calamares/releases/download/v3.1.11/calamares-3.1.11.tar.gz
+_eclasses_=cmake-utils	77a5a8d3308359caadcdd91688f20093	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d2b7426219c5365f1891e58092f13a77
diff --git a/metadata/md5-cache/app-admin/puppetserver-5.1.4 b/metadata/md5-cache/app-admin/puppetserver-5.1.4
index 435318748d50..f648733999bd 100644
--- a/metadata/md5-cache/app-admin/puppetserver-5.1.4
+++ b/metadata/md5-cache/app-admin/puppetserver-5.1.4
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.8.0 app-admin/puppet-agent[puppetdb?] virtual/tmpfiles
 SLOT=0
 SRC_URI=https://downloads.puppetlabs.com/puppet/puppetserver-5.1.4.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	tmpfiles	8b4d2e2e77723f4b289896f699954fe9	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	tmpfiles	7bd1d7bf5261430a2d2991cff7958c52	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=b55942382f38db15edf8c550dc99703d
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 5427a040eb48..6da401c963de 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/libarchive-3.2.2-r1 b/metadata/md5-cache/app-arch/libarchive-3.2.2-r1
deleted file mode 100644
index c962fc8a9194..000000000000
--- a/metadata/md5-cache/app-arch/libarchive-3.2.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=acl? ( virtual/acl[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(-)?] ) bzip2? ( app-arch/bzip2[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(-)?] ) expat? ( 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(-)?] ) !expat? ( dev-libs/libxml2[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(-)?] ) iconv? ( virtual/libiconv[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(-)?] ) kernel_linux? ( xattr? ( sys-apps/attr[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/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl: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(-)?] ) lz4? ( >=app-arch/lz4-0_p131: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(-)?] ) lzma? ( app-arch/xz-utils[threads=,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(-)?] ) lzo? ( >=dev-libs/lzo-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(-)?] ) nettle? ( dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( 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(-)?] ) kernel_linux? ( virtual/os-headers e2fsprogs? ( sys-fs/e2fsprogs ) ) >=app-portage/elt-patches-20170422
-DESCRIPTION=BSD tar command
-EAPI=6
-HOMEPAGE=http://www.libarchive.org/
-IUSE=acl +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo nettle static-libs +threads xattr +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 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD BSD-2 BSD-4 public-domain
-RDEPEND=acl? ( virtual/acl[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(-)?] ) bzip2? ( app-arch/bzip2[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(-)?] ) expat? ( 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(-)?] ) !expat? ( dev-libs/libxml2[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(-)?] ) iconv? ( virtual/libiconv[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(-)?] ) kernel_linux? ( xattr? ( sys-apps/attr[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/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl: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(-)?] ) lz4? ( >=app-arch/lz4-0_p131: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(-)?] ) lzma? ( app-arch/xz-utils[threads=,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(-)?] ) lzo? ( >=dev-libs/lzo-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(-)?] ) nettle? ( dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( 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(-)?] )
-SLOT=0/13
-SRC_URI=http://www.libarchive.org/downloads/libarchive-3.2.2.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=b81d375a58fca602981dfa8a917f3059
diff --git a/metadata/md5-cache/app-arch/lz4-0_p106-r1 b/metadata/md5-cache/app-arch/lz4-0_p106-r1
deleted file mode 100644
index addc3094bff1..000000000000
--- a/metadata/md5-cache/app-arch/lz4-0_p106-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=Extremely Fast Compression algorithm
-EAPI=5
-HOMEPAGE=https://github.com/Cyan4973/lz4
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=BSD-2
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ryao/dist/lz4-0_p106.tar.xz
-_eclasses_=cmake-utils	77a5a8d3308359caadcdd91688f20093	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=456a32002d2efafa11addbd9a9253ecd
diff --git a/metadata/md5-cache/app-arch/lz4-0_p120 b/metadata/md5-cache/app-arch/lz4-0_p120
deleted file mode 100644
index d22941ed9a1c..000000000000
--- a/metadata/md5-cache/app-arch/lz4-0_p120
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( valgrind? ( dev-util/valgrind ) )
-DESCRIPTION=Extremely Fast Compression algorithm
-EAPI=5
-HOMEPAGE=https://github.com/Cyan4973/lz4
-IUSE=test valgrind abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux
-LICENSE=BSD-2 GPL-2
-SLOT=0
-SRC_URI=https://github.com/Cyan4973/lz4/archive/r120.tar.gz -> lz4-r120.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=90e3746d4f86ea304a878bda9e98b0d5
diff --git a/metadata/md5-cache/app-arch/lz4-0_p131-r1 b/metadata/md5-cache/app-arch/lz4-0_p131-r1
deleted file mode 100644
index c7059f533e09..000000000000
--- a/metadata/md5-cache/app-arch/lz4-0_p131-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( valgrind? ( dev-util/valgrind ) )
-DESCRIPTION=Extremely Fast Compression algorithm
-EAPI=5
-HOMEPAGE=https://github.com/Cyan4973/lz4
-IUSE=static-libs test valgrind abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD-2 GPL-2
-SLOT=0/r131
-SRC_URI=https://github.com/Cyan4973/lz4/archive/r131.tar.gz -> lz4-r131.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=74ccac628f616fd530c408323972e4d4
diff --git a/metadata/md5-cache/app-arch/lz4-1.8.0 b/metadata/md5-cache/app-arch/lz4-1.8.0
index da2c5dce3945..5a7a256dd43b 100644
--- a/metadata/md5-cache/app-arch/lz4-1.8.0
+++ b/metadata/md5-cache/app-arch/lz4-1.8.0
@@ -4,9 +4,9 @@ DESCRIPTION=Extremely Fast Compression algorithm
 EAPI=6
 HOMEPAGE=https://github.com/lz4/lz4
 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 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD-2 GPL-2
 SLOT=0/r131
 SRC_URI=https://github.com/Cyan4973/lz4/archive/v1.8.0.tar.gz -> lz4-1.8.0.tar.gz
 _eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	77a5a8d3308359caadcdd91688f20093	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8db50dc26c403dedf4cfd7804e803e7d
+_md5_=fb49ccae2822c13bb8397d7359be5a7a
diff --git a/metadata/md5-cache/app-arch/snappy-1.1.6 b/metadata/md5-cache/app-arch/snappy-1.1.6
deleted file mode 100644
index 7dc80d0f4f97..000000000000
--- a/metadata/md5-cache/app-arch/snappy-1.1.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=A high-speed compression/decompression library by Google
-EAPI=6
-HOMEPAGE=https://github.com/google/snappy
-IUSE=static-libs 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 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux
-LICENSE=BSD
-REQUIRED_USE=!static-libs
-SLOT=0/1
-SRC_URI=https://github.com/google/snappy/archive/1.1.6.tar.gz -> snappy-1.1.6.tar.gz
-_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	77a5a8d3308359caadcdd91688f20093	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e16e42c73ff09bfad6b06c340b65d4ae
diff --git a/metadata/md5-cache/app-arch/snappy-1.1.7 b/metadata/md5-cache/app-arch/snappy-1.1.7
index c0cc900962de..0bb8cd337172 100644
--- a/metadata/md5-cache/app-arch/snappy-1.1.7
+++ b/metadata/md5-cache/app-arch/snappy-1.1.7
@@ -4,10 +4,10 @@ DESCRIPTION=A high-speed compression/decompression library by Google
 EAPI=6
 HOMEPAGE=https://github.com/google/snappy
 IUSE=static-libs 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 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux
 LICENSE=BSD
 REQUIRED_USE=!static-libs
 SLOT=0/1
 SRC_URI=https://github.com/google/snappy/archive/1.1.7.tar.gz -> snappy-1.1.7.tar.gz
 _eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	77a5a8d3308359caadcdd91688f20093	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f71c4b9dfbe63abd7e8d9e80c514f0a4
+_md5_=74766f96175d6385aae7fa87464c6b1a
diff --git a/metadata/md5-cache/app-arch/unzip-6.0_p21-r2 b/metadata/md5-cache/app-arch/unzip-6.0_p21-r2
index 9cc001ec5768..7f92ac500557 100644
--- a/metadata/md5-cache/app-arch/unzip-6.0_p21-r2
+++ b/metadata/md5-cache/app-arch/unzip-6.0_p21-r2
@@ -4,10 +4,10 @@ DESCRIPTION=unzipper for pkzip-compressed files
 EAPI=6
 HOMEPAGE=http://www.info-zip.org/
 IUSE=bzip2 natspec unicode
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux
 LICENSE=Info-ZIP
 RDEPEND=bzip2? ( app-arch/bzip2 ) natspec? ( dev-libs/libnatspec )
 SLOT=0
 SRC_URI=mirror://sourceforge/infozip/unzip60.tar.gz mirror://debian/pool/main/u/unzip/unzip_6.0-21.debian.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=9896d62c4dc7349ed70e7f2a9acfb335
+_md5_=e41283bd0a736db56e665910dfe25e9c
diff --git a/metadata/md5-cache/app-arch/zip-2.32-r1 b/metadata/md5-cache/app-arch/zip-2.32-r1
deleted file mode 100644
index 1dd3a5413dc7..000000000000
--- a/metadata/md5-cache/app-arch/zip-2.32-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=Info ZIP (encryption support)
-EAPI=0
-HOMEPAGE=http://www.info-zip.org/
-IUSE=crypt
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
-LICENSE=Info-ZIP
-SLOT=0
-SRC_URI=ftp://ftp.info-zip.org/pub/infozip/src/zip232.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=aaaa2347d134d383f088b4ccb527c9de
diff --git a/metadata/md5-cache/app-arch/zip-3.0 b/metadata/md5-cache/app-arch/zip-3.0
deleted file mode 100644
index 15ef0c054181..000000000000
--- a/metadata/md5-cache/app-arch/zip-3.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=bzip2? ( app-arch/bzip2 ) app-arch/unzip
-DESCRIPTION=Info ZIP (encryption support)
-EAPI=0
-HOMEPAGE=http://www.info-zip.org/
-IUSE=bzip2 crypt unicode
-KEYWORDS=alpha amd64 arm 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=Info-ZIP
-RDEPEND=bzip2? ( app-arch/bzip2 )
-SLOT=0
-SRC_URI=mirror://sourceforge/infozip/zip30.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=9c92c1364821d27769c6b76e1d78e7b6
diff --git a/metadata/md5-cache/app-arch/zip-3.0-r1 b/metadata/md5-cache/app-arch/zip-3.0-r1
deleted file mode 100644
index c5ee8c48e7ec..000000000000
--- a/metadata/md5-cache/app-arch/zip-3.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=bzip2? ( app-arch/bzip2 ) natspec? ( dev-libs/libnatspec ) app-arch/unzip
-DESCRIPTION=Info ZIP (encryption support)
-EAPI=2
-HOMEPAGE=http://www.info-zip.org/
-IUSE=bzip2 crypt natspec unicode
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux
-LICENSE=Info-ZIP
-RDEPEND=bzip2? ( app-arch/bzip2 ) natspec? ( dev-libs/libnatspec )
-SLOT=0
-SRC_URI=mirror://sourceforge/infozip/zip30.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=b7b5a1d63a3673d5962d0007bdf72163
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index 7bb17ce5ba7e..888fdf424c9b 100644
--- a/metadata/md5-cache/app-backup/Manifest.gz
+++ b/metadata/md5-cache/app-backup/Manifest.gz
diff --git a/metadata/md5-cache/app-backup/burp-2.0.54 b/metadata/md5-cache/app-backup/burp-2.0.54
index 8662b3b7d360..4cdd093a2eff 100644
--- a/metadata/md5-cache/app-backup/burp-2.0.54
+++ b/metadata/md5-cache/app-backup/burp-2.0.54
@@ -9,5 +9,5 @@ LICENSE=AGPL-3
 RDEPEND=dev-libs/uthash net-libs/librsync sys-libs/ncurses:0= sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) acl? ( sys-apps/acl ) xattr? ( sys-apps/attr ) virtual/logger virtual/tmpfiles
 SLOT=0
 SRC_URI=https://github.com/grke/burp/archive/2.0.54.tar.gz -> burp-2.0.54.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	tmpfiles	8b4d2e2e77723f4b289896f699954fe9	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	tmpfiles	7bd1d7bf5261430a2d2991cff7958c52	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=48b449618617d5963071f96e2a3a6b86
diff --git a/metadata/md5-cache/app-backup/burp-2.0.54-r2 b/metadata/md5-cache/app-backup/burp-2.0.54-r2
index 8f49f6f672dc..a58253d8512c 100644
--- a/metadata/md5-cache/app-backup/burp-2.0.54-r2
+++ b/metadata/md5-cache/app-backup/burp-2.0.54-r2
@@ -9,5 +9,5 @@ LICENSE=AGPL-3
 RDEPEND=dev-libs/uthash net-libs/librsync sys-libs/ncurses:0= sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) acl? ( sys-apps/acl ) xattr? ( sys-apps/attr ) virtual/logger virtual/tmpfiles
 SLOT=0
 SRC_URI=https://github.com/grke/burp/archive/2.0.54.tar.gz -> burp-2.0.54.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	tmpfiles	8b4d2e2e77723f4b289896f699954fe9	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	tmpfiles	7bd1d7bf5261430a2d2991cff7958c52	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=a5154ad11be9d6426ae281fc13ae9c8e
diff --git a/metadata/md5-cache/app-backup/burp-2.1.22 b/metadata/md5-cache/app-backup/burp-2.1.22
index fa7e646cc44a..82eff30b36ab 100644
--- a/metadata/md5-cache/app-backup/burp-2.1.22
+++ b/metadata/md5-cache/app-backup/burp-2.1.22
@@ -9,5 +9,5 @@ LICENSE=AGPL-3
 RDEPEND=dev-libs/uthash net-libs/librsync sys-libs/ncurses:0= sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) acl? ( sys-apps/acl ) xattr? ( sys-apps/attr ) virtual/logger virtual/tmpfiles
 SLOT=0
 SRC_URI=https://github.com/grke/burp/archive/2.1.22.tar.gz -> burp-2.1.22.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	tmpfiles	8b4d2e2e77723f4b289896f699954fe9	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	tmpfiles	7bd1d7bf5261430a2d2991cff7958c52	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=606bf02499069cd1ec69dcf3d1c6fc2f
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index cfd79700caa5..6868e5a82c9e 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/acme-0.18.2 b/metadata/md5-cache/app-crypt/acme-0.18.2
index 7ee12efe7db9..ce01b936bbe8 100644
--- a/metadata/md5-cache/app-crypt/acme-0.18.2
+++ b/metadata/md5-cache/app-crypt/acme-0.18.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( >=dev-python/cryptography-0.8[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/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.13[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/pyrfc3339[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/pytz[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-2.10[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/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/setuptools-1.0[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(-)]
+DEPEND=test? ( >=dev-python/cryptography-0.8[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/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.13[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/pyrfc3339[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/pytz[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-2.10[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/josepy[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/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/setuptools-1.0[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=An implementation of the ACME protocol
 EAPI=6
 HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~amd64 ~arm ~ppc64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/cryptography-0.8[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/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.13[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/pyrfc3339[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/pytz[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-2.10[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(-)] 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(-)]
+RDEPEND=>=dev-python/cryptography-0.8[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/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.13[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/pyrfc3339[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/pytz[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-2.10[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/josepy[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=https://github.com/certbot/certbot/archive/v0.18.2.tar.gz -> certbot-0.18.2.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2c45b3972f8ff598584f2e8cf034db27
+_md5_=f811c81062fc2eb3bba40ab2368ceabe
diff --git a/metadata/md5-cache/app-crypt/acme-0.19.0 b/metadata/md5-cache/app-crypt/acme-0.19.0
index f1acfa3cb57d..880704470982 100644
--- a/metadata/md5-cache/app-crypt/acme-0.19.0
+++ b/metadata/md5-cache/app-crypt/acme-0.19.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( >=dev-python/cryptography-0.8[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/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.13[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/pyrfc3339[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/pytz[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-2.10[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-1.9.0[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/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/setuptools-1.0[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(-)]
+DEPEND=test? ( >=dev-python/cryptography-0.8[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/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.13[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/pyrfc3339[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/pytz[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-2.10[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-1.9.0[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/josepy[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/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/setuptools-1.0[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=An implementation of the ACME protocol
 EAPI=6
 HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=amd64 ~arm ~ppc64 x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/cryptography-0.8[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/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.13[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/pyrfc3339[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/pytz[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-2.10[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-1.9.0[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(-)]
+RDEPEND=>=dev-python/cryptography-0.8[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/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.13[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/pyrfc3339[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/pytz[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-2.10[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-1.9.0[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/josepy[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=https://github.com/certbot/certbot/archive/v0.19.0.tar.gz -> certbot-0.19.0.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=31c23eca3bbd319018df7fd3c5898fba
+_md5_=f061b592e2d03fd5a0c3ea6f1cdee762
diff --git a/metadata/md5-cache/app-crypt/acme-0.20.0 b/metadata/md5-cache/app-crypt/acme-0.20.0
index cdb795c43008..6f22c7d996a1 100644
--- a/metadata/md5-cache/app-crypt/acme-0.20.0
+++ b/metadata/md5-cache/app-crypt/acme-0.20.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( >=dev-python/cryptography-0.8[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/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.13[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/pyrfc3339[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/pytz[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-2.10[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-1.9.0[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/pytest[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/pytest-xdist[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-1.0[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(-)]
+DEPEND=test? ( >=dev-python/cryptography-0.8[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/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.13[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/pyrfc3339[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/pytz[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-2.10[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-1.9.0[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/josepy[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/pytest[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/pytest-xdist[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-1.0[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=An implementation of the ACME protocol
 EAPI=6
 HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~amd64 ~arm ~ppc64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/cryptography-0.8[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/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.13[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/pyrfc3339[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/pytz[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-2.10[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-1.9.0[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(-)]
+RDEPEND=>=dev-python/cryptography-0.8[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/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.13[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/pyrfc3339[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/pytz[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-2.10[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-1.9.0[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/josepy[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=https://github.com/certbot/certbot/archive/v0.20.0.tar.gz -> certbot-0.20.0.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6879e8098f418158193c9ef532fe19fe
+_md5_=b2debdb784b313faf1b3703c9222a4aa
diff --git a/metadata/md5-cache/app-crypt/moolticute-0.11.4_beta b/metadata/md5-cache/app-crypt/moolticute-0.11.4_beta
new file mode 100644
index 000000000000..a19c4c2023bc
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/moolticute-0.11.4_beta
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install postinst postrm prepare
+DEPEND=>=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 >=sys-apps/sed-4 virtual/pkgconfig
+DESCRIPTION=Mooltipass crossplatform daemon/tools
+EAPI=6
+HOMEPAGE=https://github.com/mooltipass/moolticute
+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.4-beta.tar.gz -> moolticute-0.11.4_beta.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4094b0144eed372137d2b47d34055410
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 100b1236febd..a6a616ff8d37 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/containerd-0.2.9_p20170605 b/metadata/md5-cache/app-emulation/containerd-0.2.9_p20170605
deleted file mode 100644
index d0c0beb823df..000000000000
--- a/metadata/md5-cache/app-emulation/containerd-0.2.9_p20170605
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-lang/go-1.8
-DESCRIPTION=A daemon to control runC
-EAPI=6
-HOMEPAGE=https://containerd.tools
-IUSE=hardened +seccomp
-KEYWORDS=amd64 ~arm ~ppc64
-LICENSE=Apache-2.0
-RDEPEND=>=app-emulation/docker-runc-1.0.0_rc3_p20170706 seccomp? ( sys-libs/libseccomp )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/containerd/containerd/archive/6e23458c129b551d5c9871e5174f6b1b7f6d1170.tar.gz -> containerd-0.2.9_p20170605.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=a6e201f082c0ce5c5ae508c7698446a2
diff --git a/metadata/md5-cache/app-emulation/containerd-0.2.9_p20170917 b/metadata/md5-cache/app-emulation/containerd-0.2.9_p20170917
index fee9ca296638..26f6c2c181f8 100644
--- a/metadata/md5-cache/app-emulation/containerd-0.2.9_p20170917
+++ b/metadata/md5-cache/app-emulation/containerd-0.2.9_p20170917
@@ -4,11 +4,11 @@ DESCRIPTION=A daemon to control runC
 EAPI=6
 HOMEPAGE=https://containerd.tools
 IUSE=hardened +seccomp
-KEYWORDS=~amd64 ~arm ~ppc64
+KEYWORDS=amd64 ~arm ~ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=app-emulation/docker-runc-1.0.0_rc4_p20170917 seccomp? ( sys-libs/libseccomp )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/containerd/containerd/archive/06b9cb35161009dcb7123345749fef02f7cea8e0.tar.gz -> containerd-0.2.9_p20170917.tar.gz
 _eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=3c461d0f6e1d29181bc612c87d1dc447
+_md5_=31c6a7313bce6e809e77add490b02490
diff --git a/metadata/md5-cache/app-emulation/docker-17.06.2 b/metadata/md5-cache/app-emulation/docker-17.06.2
deleted file mode 100644
index 94f414ba803b..000000000000
--- a/metadata/md5-cache/app-emulation/docker-17.06.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst setup unpack
-DEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1 ) apparmor? ( sys-libs/libapparmor ) dev-go/go-md2man btrfs? ( >=sys-fs/btrfs-progs-3.16.1 ) >=dev-lang/go-1.8 virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=The core functions you need to create Docker images and run Docker containers
-EAPI=6
-HOMEPAGE=https://dockerproject.org
-IUSE=apparmor aufs btrfs +container-init +device-mapper hardened overlay pkcs11 seccomp
-KEYWORDS=amd64 ~arm
-LICENSE=Apache-2.0
-RDEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1 ) apparmor? ( sys-libs/libapparmor ) >=net-firewall/iptables-1.4 sys-process/procps >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 ~app-emulation/containerd-0.2.9_p20170605 ~app-emulation/docker-runc-1.0.0_rc3_p20170706[apparmor?,seccomp?] app-emulation/docker-proxy container-init? ( >=sys-process/tini-0.15.0[static] )
-RESTRICT=installsources strip
-SLOT=0
-SRC_URI=https://github.com/docker/docker-ce/archive/v17.06.2-ce.tar.gz -> docker-17.06.2.tar.gz
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=27a270cd8848c6c23c5904f16b84b23f
diff --git a/metadata/md5-cache/app-emulation/docker-17.09.1 b/metadata/md5-cache/app-emulation/docker-17.09.1
index f518e20d9b0b..1e44b0e27e0f 100644
--- a/metadata/md5-cache/app-emulation/docker-17.09.1
+++ b/metadata/md5-cache/app-emulation/docker-17.09.1
@@ -4,11 +4,11 @@ DESCRIPTION=The core functions you need to create Docker images and run Docker c
 EAPI=6
 HOMEPAGE=https://dockerproject.org
 IUSE=apparmor aufs btrfs +container-init +device-mapper hardened overlay pkcs11 seccomp
-KEYWORDS=~amd64 ~arm
+KEYWORDS=amd64 ~arm
 LICENSE=Apache-2.0
 RDEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1 ) apparmor? ( sys-libs/libapparmor ) >=net-firewall/iptables-1.4 sys-process/procps >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 ~app-emulation/containerd-0.2.9_p20170917 ~app-emulation/docker-runc-1.0.0_rc4_p20170917[apparmor?,seccomp?] >=app-emulation/docker-proxy-0.8.0_p20170917 container-init? ( >=sys-process/tini-0.16.1[static] )
 RESTRICT=installsources strip
 SLOT=0
 SRC_URI=https://github.com/docker/docker-ce/archive/v17.09.1-ce.tar.gz -> docker-17.09.1.tar.gz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=599dea3d0aeeb5c19472efe01405666b
+_md5_=12b4c7de8b50acdd16ac97b3c1fc76e8
diff --git a/metadata/md5-cache/app-emulation/docker-17.09.0 b/metadata/md5-cache/app-emulation/docker-17.12.0
index eb8279127158..fae6752ce9f9 100644
--- a/metadata/md5-cache/app-emulation/docker-17.09.0
+++ b/metadata/md5-cache/app-emulation/docker-17.12.0
@@ -6,9 +6,9 @@ HOMEPAGE=https://dockerproject.org
 IUSE=apparmor aufs btrfs +container-init +device-mapper hardened overlay pkcs11 seccomp
 KEYWORDS=~amd64 ~arm
 LICENSE=Apache-2.0
-RDEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1 ) apparmor? ( sys-libs/libapparmor ) >=net-firewall/iptables-1.4 sys-process/procps >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 ~app-emulation/containerd-0.2.9_p20170917 ~app-emulation/docker-runc-1.0.0_rc4_p20170917[apparmor?,seccomp?] >=app-emulation/docker-proxy-0.8.0_p20170917 container-init? ( >=sys-process/tini-0.16.1[static] )
+RDEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1 ) apparmor? ( sys-libs/libapparmor ) >=net-firewall/iptables-1.4 sys-process/procps >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 dev-libs/libltdl ~app-emulation/containerd-1.0.0 ~app-emulation/docker-runc-1.0.0_rc4_p20171108[apparmor?,seccomp?] >=app-emulation/docker-proxy-0.8.0_p20170917 container-init? ( >=sys-process/tini-0.16.1[static] )
 RESTRICT=installsources strip
 SLOT=0
-SRC_URI=https://github.com/docker/docker-ce/archive/v17.09.0-ce.tar.gz -> docker-17.09.0.tar.gz
+SRC_URI=https://github.com/docker/docker-ce/archive/v17.12.0-ce.tar.gz -> docker-17.12.0.tar.gz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=a41f4d2afdf3c09c719e19df49a9646b
+_md5_=ad17601f56ce1ef912be1c6066f27324
diff --git a/metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20170917 b/metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20170917
index 152da3a4ef4f..792d055889b0 100644
--- a/metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20170917
+++ b/metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20170917
@@ -3,11 +3,11 @@ DEPEND=>=dev-lang/go-1.8
 DESCRIPTION=Docker container networking
 EAPI=6
 HOMEPAGE=https://github.com/docker/libnetwork
-KEYWORDS=~amd64 ~arm ~ppc64
+KEYWORDS=amd64 ~arm ~ppc64
 LICENSE=Apache-2.0
 RDEPEND=!<app-emulation/docker-1.13.0_rc1
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/docker/libnetwork/archive/7b2b1feb1de4817d522cc372af149ff48d25028e.tar.gz -> docker-proxy-0.8.0_p20170917.tar.gz
 _eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=6079c54432cafdbbaa04c9b90e04ae00
+_md5_=1741ec3fc5d44d00c602e32f114bd460
diff --git a/metadata/md5-cache/app-emulation/docker-runc-1.0.0_rc4_p20170917 b/metadata/md5-cache/app-emulation/docker-runc-1.0.0_rc4_p20170917
index 1bbb28c2db51..084dbc089e04 100644
--- a/metadata/md5-cache/app-emulation/docker-runc-1.0.0_rc4_p20170917
+++ b/metadata/md5-cache/app-emulation/docker-runc-1.0.0_rc4_p20170917
@@ -4,11 +4,11 @@ DESCRIPTION=runc container cli tools (docker fork)
 EAPI=6
 HOMEPAGE=http://runc.io
 IUSE=+ambient apparmor hardened +seccomp
-KEYWORDS=~amd64 ~arm ~ppc64
+KEYWORDS=amd64 ~arm ~ppc64
 LICENSE=Apache-2.0
 RDEPEND=apparmor? ( sys-libs/libapparmor ) seccomp? ( sys-libs/libseccomp ) !app-emulation/runc
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/opencontainers/runc/archive/3f2f8b84a77f73d38244dd690525642a72156c64.tar.gz -> docker-runc-1.0.0_rc4_p20170917.tar.gz
 _eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=6b0d45935c13feacdaddc2e3d853418e
+_md5_=a01a21b5f2760a144fa1c5a80790ea01
diff --git a/metadata/md5-cache/app-emulation/docker-runc-1.0.0_rc3_p20170706 b/metadata/md5-cache/app-emulation/docker-runc-1.0.0_rc4_p20171108
index 997209f58531..5f0833bcd836 100644
--- a/metadata/md5-cache/app-emulation/docker-runc-1.0.0_rc3_p20170706
+++ b/metadata/md5-cache/app-emulation/docker-runc-1.0.0_rc4_p20171108
@@ -4,11 +4,11 @@ DESCRIPTION=runc container cli tools (docker fork)
 EAPI=6
 HOMEPAGE=http://runc.io
 IUSE=+ambient apparmor hardened +seccomp
-KEYWORDS=amd64 ~arm ~ppc64
+KEYWORDS=~amd64 ~arm ~ppc64
 LICENSE=Apache-2.0
 RDEPEND=apparmor? ( sys-libs/libapparmor ) seccomp? ( sys-libs/libseccomp ) !app-emulation/runc
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/opencontainers/runc/archive/810190ceaa507aa2727d7ae6f4790c76ec150bd2.tar.gz -> docker-runc-1.0.0_rc3_p20170706.tar.gz
+SRC_URI=https://github.com/opencontainers/runc/archive/b2567b37d7b75eb4cf325b77297b140ea686ce8f.tar.gz -> docker-runc-1.0.0_rc4_p20171108.tar.gz
 _eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=3cf8f062f8ae13fd3d41ac479b5ef12d
+_md5_=b0da39bf0e3066d53e0b46ce4bd0660f
diff --git a/metadata/md5-cache/app-eselect/Manifest.gz b/metadata/md5-cache/app-eselect/Manifest.gz
index 14b520e95186..389d1d0571f1 100644
--- a/metadata/md5-cache/app-eselect/Manifest.gz
+++ b/metadata/md5-cache/app-eselect/Manifest.gz
diff --git a/metadata/md5-cache/app-eselect/eselect-lib-bin-symlink-0.1 b/metadata/md5-cache/app-eselect/eselect-lib-bin-symlink-0.1
deleted file mode 100644
index a4a376a91bda..000000000000
--- a/metadata/md5-cache/app-eselect/eselect-lib-bin-symlink-0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-portage/elt-patches-20170422
-DESCRIPTION=An eselect library to manage executable symlinks
-EAPI=5
-HOMEPAGE=https://bitbucket.org/mgorny/eselect-lib-bin-symlink/
-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=app-admin/eselect
-SLOT=0
-SRC_URI=https://www.bitbucket.org/mgorny/eselect-lib-bin-symlink/downloads/eselect-lib-bin-symlink-0.1.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=54632fee3b691d5a1fe5cf583cd73e93
diff --git a/metadata/md5-cache/app-eselect/eselect-repository-1-r1 b/metadata/md5-cache/app-eselect/eselect-repository-1-r1
deleted file mode 100644
index b511e76bab01..000000000000
--- a/metadata/md5-cache/app-eselect/eselect-repository-1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install setup
-DESCRIPTION=Manage repos.conf via eselect
-EAPI=6
-HOMEPAGE=https://github.com/mgorny/eselect-repository
-IUSE=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 ~arm ~x86
-LICENSE=BSD-2
-RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-admin/eselect dev-python/lxml[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/wget
-SLOT=0
-SRC_URI=https://github.com/mgorny/eselect-repository/archive/v1.tar.gz -> eselect-repository-1.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=7c8713fea45817525b344c2edd7eb9a3
diff --git a/metadata/md5-cache/app-eselect/eselect-repository-2 b/metadata/md5-cache/app-eselect/eselect-repository-2
index dd6d4a31c979..4ac24ad8d357 100644
--- a/metadata/md5-cache/app-eselect/eselect-repository-2
+++ b/metadata/md5-cache/app-eselect/eselect-repository-2
@@ -3,10 +3,10 @@ DESCRIPTION=Manage repos.conf via eselect
 EAPI=6
 HOMEPAGE=https://github.com/mgorny/eselect-repository
 IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD-2
 RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-admin/eselect dev-python/lxml[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/wget
 SLOT=0
 SRC_URI=https://github.com/mgorny/eselect-repository/archive/v2.tar.gz -> eselect-repository-2.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=11baa2dd6871ab2e3b67d3af70a8c379
+_md5_=7c8713fea45817525b344c2edd7eb9a3
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index bc33cc4e5453..b7d3ba72ed8c 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/qchartdiary-0.6.4.1-r2 b/metadata/md5-cache/app-office/qchartdiary-0.6.4.1-r2
deleted file mode 100644
index 37621133cf9e..000000000000
--- a/metadata/md5-cache/app-office/qchartdiary-0.6.4.1-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-qt/qtgui:4 dev-qt/qtsql:4
-DESCRIPTION=Free Qt4 diary/agenda application
-EAPI=2
-HOMEPAGE=http://qt-apps.org/content/show.php?content=99294
-IUSE=debug
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=dev-qt/qtgui:4 dev-qt/qtsql:4
-SLOT=0
-SRC_URI=mirror://sourceforge/qchartdiary/QChartDiary-0.6.4.1-src.tar.gz
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	qt4-r2	b7985a3197fbc3a22d059f19904e735b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=62fdd5240e6015e2296baf541b3cbd29
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index 3f3b88bea1d4..1712852ed758 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/cpuid2cpuflags-4 b/metadata/md5-cache/app-portage/cpuid2cpuflags-4
deleted file mode 100644
index b6a3359e5192..000000000000
--- a/metadata/md5-cache/app-portage/cpuid2cpuflags-4
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=postinst
-DESCRIPTION=Tool to guess CPU_FLAGS_X86 flags for the host
-EAPI=6
-HOMEPAGE=https://github.com/mgorny/cpuid2cpuflags
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=BSD-2
-SLOT=0
-SRC_URI=https://github.com/mgorny/cpuid2cpuflags/releases/download/v4/cpuid2cpuflags-4.tar.bz2
-_md5_=75c54698f9f416ccfcd5c9ca62ed35da
diff --git a/metadata/md5-cache/app-portage/eclass-manpages-20170428 b/metadata/md5-cache/app-portage/eclass-manpages-20170428
deleted file mode 100644
index d0b395924a25..000000000000
--- a/metadata/md5-cache/app-portage/eclass-manpages-20170428
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=app-arch/xz-utils
-DESCRIPTION=collection of Gentoo eclass manpages
-EAPI=5
-HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~mgorny/dist/eclass-manpages-20170428.tar.xz
-_md5_=554c7e7bfef39700ef93f04c6e54e062
diff --git a/metadata/md5-cache/app-portage/eclass-manpages-20170521 b/metadata/md5-cache/app-portage/eclass-manpages-20170521
deleted file mode 100644
index ca373526ee4f..000000000000
--- a/metadata/md5-cache/app-portage/eclass-manpages-20170521
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=app-arch/xz-utils
-DESCRIPTION=collection of Gentoo eclass manpages
-EAPI=5
-HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~mgorny/dist/eclass-manpages-20170521.tar.xz
-_md5_=554c7e7bfef39700ef93f04c6e54e062
diff --git a/metadata/md5-cache/app-portage/eclass-manpages-20170712 b/metadata/md5-cache/app-portage/eclass-manpages-20170712
deleted file mode 100644
index 1246ba06395b..000000000000
--- a/metadata/md5-cache/app-portage/eclass-manpages-20170712
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=app-arch/xz-utils
-DESCRIPTION=collection of Gentoo eclass manpages
-EAPI=5
-HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~mgorny/dist/eclass-manpages-20170712.tar.xz
-_md5_=554c7e7bfef39700ef93f04c6e54e062
diff --git a/metadata/md5-cache/app-portage/eclass-manpages-20170321 b/metadata/md5-cache/app-portage/eclass-manpages-20180101
index fbd29cca8d0e..2defd16dab99 100644
--- a/metadata/md5-cache/app-portage/eclass-manpages-20170321
+++ b/metadata/md5-cache/app-portage/eclass-manpages-20180101
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile install
 DEPEND=app-arch/xz-utils
-DESCRIPTION=collection of Gentoo eclass manpages
-EAPI=5
+DESCRIPTION=Collection of Gentoo eclass manpages
+EAPI=6
 HOMEPAGE=https://www.gentoo.org/
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
-SRC_URI=https://dev.gentoo.org/~mgorny/dist/eclass-manpages-20170321.tar.xz
-_md5_=554c7e7bfef39700ef93f04c6e54e062
+SRC_URI=https://dev.gentoo.org/~mgorny/dist/eclass-manpages-20180101.tar.xz
+_md5_=f7f5fa5f4ff07e5827f853a7e32f4b7f
diff --git a/metadata/md5-cache/app-portage/eclass-manpages-99999999 b/metadata/md5-cache/app-portage/eclass-manpages-99999999
index 29f21db6062b..0ccef9637357 100644
--- a/metadata/md5-cache/app-portage/eclass-manpages-99999999
+++ b/metadata/md5-cache/app-portage/eclass-manpages-99999999
@@ -1,8 +1,8 @@
 DEFINED_PHASES=compile install
 DEPEND=sys-apps/portage
-DESCRIPTION=collection of Gentoo eclass manpages
-EAPI=5
+DESCRIPTION=Collection of Gentoo eclass manpages
+EAPI=6
 HOMEPAGE=https://www.gentoo.org/
 LICENSE=GPL-2
 SLOT=0
-_md5_=026999fa15614b75e4c392a2406c41e1
+_md5_=cf6caa1e912da808028114ec6864b197
diff --git a/metadata/md5-cache/app-portage/eix-0.33.0-r1 b/metadata/md5-cache/app-portage/eix-0.33.0-r1
index f4842e0109e7..086cee4612b7 100644
--- a/metadata/md5-cache/app-portage/eix-0.33.0-r1
+++ b/metadata/md5-cache/app-portage/eix-0.33.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=nls? ( virtual/libintl ) sqlite? ( >=dev-db/sqlite-3:= ) >=app-shells/push-2.0-r1 >=app-shells/quoter-3.0_p2-r1 virtual/tmpfiles
 SLOT=0
 SRC_URI=https://github.com/vaeth/eix/releases/download/v0.33.0/eix-0.33.0.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	l10n	2c2e15383ba891d642f51896a7f0ecfe	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	tmpfiles	8b4d2e2e77723f4b289896f699954fe9	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	l10n	2c2e15383ba891d642f51896a7f0ecfe	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	tmpfiles	7bd1d7bf5261430a2d2991cff7958c52	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
 _md5_=ef7399a8ec547421748dccb79402a837
diff --git a/metadata/md5-cache/app-portage/gemato-8 b/metadata/md5-cache/app-portage/gemato-8
deleted file mode 100644
index 3f5a0a2dc3e9..000000000000
--- a/metadata/md5-cache/app-portage/gemato-8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=blake2? ( python_targets_python2_7? ( dev-python/pyblake2[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-python/pyblake2[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pyblake2[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) bzip2? ( python_targets_python2_7? ( dev-python/bz2file[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) gpg? ( app-crypt/gnupg ) lzma? ( python_targets_python2_7? ( dev-python/backports-lzma[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) sha3? ( python_targets_python2_7? ( dev-python/pysha3[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-python/pysha3[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pysha3[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Stand-alone Manifest generation & verification tool
-EAPI=6
-HOMEPAGE=https://github.com/mgorny/gemato
-IUSE=+blake2 bzip2 +gpg lzma sha3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=BSD-2
-RDEPEND=blake2? ( python_targets_python2_7? ( dev-python/pyblake2[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-python/pyblake2[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pyblake2[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) bzip2? ( python_targets_python2_7? ( dev-python/bz2file[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) gpg? ( app-crypt/gnupg ) lzma? ( python_targets_python2_7? ( dev-python/backports-lzma[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) sha3? ( python_targets_python2_7? ( dev-python/pysha3[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-python/pysha3[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pysha3[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/g/gemato/gemato-8.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d05879880e02b8af5f37974b495771b8
diff --git a/metadata/md5-cache/app-portage/gemato-9.1 b/metadata/md5-cache/app-portage/gemato-9.1
deleted file mode 100644
index 464949287237..000000000000
--- a/metadata/md5-cache/app-portage/gemato-9.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=blake2? ( python_targets_python2_7? ( dev-python/pyblake2[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-python/pyblake2[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pyblake2[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) bzip2? ( python_targets_python2_7? ( dev-python/bz2file[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) gpg? ( app-crypt/gnupg ) lzma? ( python_targets_python2_7? ( dev-python/backports-lzma[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) sha3? ( python_targets_python2_7? ( dev-python/pysha3[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-python/pysha3[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pysha3[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Stand-alone Manifest generation & verification tool
-EAPI=6
-HOMEPAGE=https://github.com/mgorny/gemato
-IUSE=+blake2 bzip2 +gpg lzma sha3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=BSD-2
-RDEPEND=blake2? ( python_targets_python2_7? ( dev-python/pyblake2[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-python/pyblake2[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pyblake2[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) bzip2? ( python_targets_python2_7? ( dev-python/bz2file[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) gpg? ( app-crypt/gnupg ) lzma? ( python_targets_python2_7? ( dev-python/backports-lzma[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) sha3? ( python_targets_python2_7? ( dev-python/pysha3[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-python/pysha3[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pysha3[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/g/gemato/gemato-9.1.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f51e0a1be6a9c85ac7b6150eb3d7e772
diff --git a/metadata/md5-cache/app-portage/gemato-9.2 b/metadata/md5-cache/app-portage/gemato-9.2
index 1307627a4a59..e03f0cd3c88c 100644
--- a/metadata/md5-cache/app-portage/gemato-9.2
+++ b/metadata/md5-cache/app-portage/gemato-9.2
@@ -4,11 +4,11 @@ DESCRIPTION=Stand-alone Manifest generation & verification tool
 EAPI=6
 HOMEPAGE=https://github.com/mgorny/gemato
 IUSE=+blake2 bzip2 +gpg lzma +portage-postsync sha3 test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD-2
 RDEPEND=blake2? ( python_targets_python2_7? ( dev-python/pyblake2[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-python/pyblake2[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pyblake2[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) bzip2? ( python_targets_python2_7? ( dev-python/bz2file[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) gpg? ( app-crypt/gnupg ) lzma? ( python_targets_python2_7? ( dev-python/backports-lzma[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) sha3? ( python_targets_python2_7? ( dev-python/pysha3[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-python/pysha3[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pysha3[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) 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(-)] portage-postsync? ( app-crypt/gentoo-keys ) 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=mirror://pypi/g/gemato/gemato-9.2.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3fb00f1b9cb1466069ebf2acb0f1e027
+_md5_=8d06cf3fd62b91105bc51e2dfe08e6db
diff --git a/metadata/md5-cache/app-portage/gpyutils-0.1.4 b/metadata/md5-cache/app-portage/gpyutils-0.1.4
deleted file mode 100644
index 53ed031a914f..000000000000
--- a/metadata/md5-cache/app-portage/gpyutils-0.1.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=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 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Utitilies for maintaining Python packages
-EAPI=5
-HOMEPAGE=https://github.com/mgorny/gpyutils/
-IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=app-portage/gentoopm-0.2.9[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=https://github.com/mgorny/gpyutils/releases/download/gpyutils-0.1.4/gpyutils-0.1.4.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=966ad32e0d72bf439bbcb09461632c0b
diff --git a/metadata/md5-cache/app-portage/unsandbox-1 b/metadata/md5-cache/app-portage/unsandbox-1
deleted file mode 100644
index be9253651d14..000000000000
--- a/metadata/md5-cache/app-portage/unsandbox-1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=The Sandbox escapist tool
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mgorny/dist/unsandbox.c
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~mgorny/dist/unsandbox.c
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=2b4c35bcfa38ce4ec30c55dab6f5a705
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index a835f0466e3f..b445072d8d51 100644
--- a/metadata/md5-cache/app-shells/Manifest.gz
+++ b/metadata/md5-cache/app-shells/Manifest.gz
diff --git a/metadata/md5-cache/app-shells/bash-completion-2.5 b/metadata/md5-cache/app-shells/bash-completion-2.5
deleted file mode 100644
index 07cf66119808..000000000000
--- a/metadata/md5-cache/app-shells/bash-completion-2.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare test
-DEPEND=app-arch/xz-utils
-DESCRIPTION=Programmable Completion for bash
-EAPI=6
-HOMEPAGE=https://github.com/scop/bash-completion
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris
-LICENSE=GPL-2
-PDEPEND=>=app-shells/gentoo-bashcomp-20140911
-RDEPEND=>=app-shells/bash-4.3_p30-r1 sys-apps/miscfiles !app-eselect/eselect-bashcomp
-SLOT=0
-SRC_URI=https://github.com/scop/bash-completion/releases/download/2.5/bash-completion-2.5.tar.xz https://bitbucket.org/mgorny/bashcomp2/downloads/bashcomp-2.0.2.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=50687892d595a8439d50c50e7998f402
diff --git a/metadata/md5-cache/app-shells/bash-completion-2.7 b/metadata/md5-cache/app-shells/bash-completion-2.7
deleted file mode 100644
index 39b0bd94d55e..000000000000
--- a/metadata/md5-cache/app-shells/bash-completion-2.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install postinst prepare test
-DEPEND=app-arch/xz-utils test? ( >=app-shells/bash-4.3_p30-r1 sys-apps/miscfiles !app-eselect/eselect-bashcomp app-misc/dtach dev-util/dejagnu dev-tcltk/tcllib )
-DESCRIPTION=Programmable Completion for bash
-EAPI=6
-HOMEPAGE=https://github.com/scop/bash-completion
-IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris
-LICENSE=GPL-2
-PDEPEND=>=app-shells/gentoo-bashcomp-20140911
-RDEPEND=>=app-shells/bash-4.3_p30-r1 sys-apps/miscfiles !app-eselect/eselect-bashcomp
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/scop/bash-completion/releases/download/2.7/bash-completion-2.7.tar.xz https://bitbucket.org/mgorny/bashcomp2/downloads/bashcomp-2.0.2.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=fe829d2b91bcced3c9af65dda3df3f90
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 6d44d4bf2b9b..443f868c3ae7 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/fbreader-0.99.4-r2 b/metadata/md5-cache/app-text/fbreader-0.99.4-r2
deleted file mode 100644
index 95a33cbdf84e..000000000000
--- a/metadata/md5-cache/app-text/fbreader-0.99.4-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=app-arch/bzip2 dev-libs/expat dev-libs/liblinebreak dev-libs/fribidi dev-db/sqlite net-misc/curl sys-libs/zlib dev-qt/qtcore:4[ssl] dev-qt/qtgui:4 virtual/pkgconfig
-DESCRIPTION=E-Book Reader. Supports many e-book formats
-EAPI=5
-HOMEPAGE=http://www.fbreader.org/
-IUSE=debug
-KEYWORDS=amd64 ~arm ~ppc x86
-LICENSE=GPL-2
-RDEPEND=app-arch/bzip2 dev-libs/expat dev-libs/liblinebreak dev-libs/fribidi dev-db/sqlite net-misc/curl sys-libs/zlib dev-qt/qtcore:4[ssl] dev-qt/qtgui:4
-SLOT=0
-SRC_URI=http://www.fbreader.org/files/desktop/fbreader-sources-0.99.4.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=879236d4f36273cbf084db586f026745
diff --git a/metadata/md5-cache/app-text/fbreader-0.99.4-r3 b/metadata/md5-cache/app-text/fbreader-0.99.4-r3
index 4fd314889041..150365983f86 100644
--- a/metadata/md5-cache/app-text/fbreader-0.99.4-r3
+++ b/metadata/md5-cache/app-text/fbreader-0.99.4-r3
@@ -4,10 +4,10 @@ DESCRIPTION=E-Book Reader. Supports many e-book formats
 EAPI=6
 HOMEPAGE=http://www.fbreader.org/
 IUSE=debug
-KEYWORDS=~amd64 ~arm ~ppc x86
+KEYWORDS=amd64 ~arm ~ppc x86
 LICENSE=GPL-2
 RDEPEND=app-arch/bzip2 dev-libs/expat dev-libs/liblinebreak dev-libs/fribidi dev-db/sqlite net-misc/curl sys-libs/zlib dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtnetwork:5[ssl]
 SLOT=0
 SRC_URI=http://www.fbreader.org/files/desktop/fbreader-sources-0.99.4.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=2cfe99cd941aff118720dba264f8f57d
+_md5_=2e94e4396f5341963e193c87bb97a0bb
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index 906557f16d5d..36fc248730b0 100644
--- a/metadata/md5-cache/dev-cpp/Manifest.gz
+++ b/metadata/md5-cache/dev-cpp/Manifest.gz
diff --git a/metadata/md5-cache/dev-cpp/catch-1.10.0 b/metadata/md5-cache/dev-cpp/catch-1.10.0
deleted file mode 100644
index 0435bdc724c1..000000000000
--- a/metadata/md5-cache/dev-cpp/catch-1.10.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=Modern C++ header-only framework for unit-tests
-EAPI=6
-HOMEPAGE=https://github.com/philsquared/Catch
-KEYWORDS=~amd64 ~x86
-LICENSE=Boost-1.0
-SLOT=0
-SRC_URI=https://github.com/philsquared/Catch/archive/v1.10.0.tar.gz -> Catch-1.10.0.tar.gz
-_eclasses_=cmake-utils	77a5a8d3308359caadcdd91688f20093	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=71e62e75fd4c2925c2e025e132f20ba1
diff --git a/metadata/md5-cache/dev-cpp/catch-2.0.0_pre6 b/metadata/md5-cache/dev-cpp/catch-2.0.0_pre6
deleted file mode 100644
index 75aca925b90a..000000000000
--- a/metadata/md5-cache/dev-cpp/catch-2.0.0_pre6
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=Modern C++ header-only framework for unit-tests
-EAPI=6
-HOMEPAGE=https://github.com/philsquared/Catch
-KEYWORDS=~amd64 ~x86
-LICENSE=Boost-1.0
-SLOT=0
-SRC_URI=https://github.com/philsquared/Catch/archive/V2.0.0-develop.6.tar.gz -> Catch-2.0.0-develop.6.tar.gz
-_eclasses_=cmake-utils	77a5a8d3308359caadcdd91688f20093	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c6669178125c755b49d3188ea8abf3e4
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index eb77a7a3d3f9..dc27c15713c6 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/pg_top-3.7.0 b/metadata/md5-cache/dev-db/pg_top-3.7.0
index 1f1faec8d339..d33b69a47541 100644
--- a/metadata/md5-cache/dev-db/pg_top-3.7.0
+++ b/metadata/md5-cache/dev-db/pg_top-3.7.0
@@ -4,10 +4,10 @@ DESCRIPTION='top' for PostgreSQL
 EAPI=5
 HOMEPAGE=http://ptop.projects.postgresql.org/
 IUSE=debug
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-db/postgresql
 SLOT=0
 SRC_URI=http://pgfoundry.org/frs/download.php/3504/pg_top-3.7.0.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=77ca4ac160363ded50ad8cae294d981b
+_md5_=284c4772aa9e6ddf83bfcb359594e859
diff --git a/metadata/md5-cache/dev-dotnet/Manifest.gz b/metadata/md5-cache/dev-dotnet/Manifest.gz
index 8e2df5e9ccf5..25b42be98030 100644
--- a/metadata/md5-cache/dev-dotnet/Manifest.gz
+++ b/metadata/md5-cache/dev-dotnet/Manifest.gz
diff --git a/metadata/md5-cache/dev-dotnet/pe-format-2.1.2 b/metadata/md5-cache/dev-dotnet/pe-format-2.1.2
deleted file mode 100644
index 453edb7db266..000000000000
--- a/metadata/md5-cache/dev-dotnet/pe-format-2.1.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=app-portage/elt-patches-20170422 virtual/pkgconfig
-DESCRIPTION=Intelligent PE executable wrapper for binfmt_misc
-EAPI=4
-HOMEPAGE=https://bitbucket.org/mgorny/pe-format2/
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=!<sys-apps/openrc-0.9.4
-SLOT=0
-SRC_URI=https://www.bitbucket.org/mgorny/pe-format2/downloads/pe-format-2.1.2.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=413328ab56634fb4c383799be221658a
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 12b297dca4d9..1ff3834943c8 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/servletapi-2.2-r4 b/metadata/md5-cache/dev-java/servletapi-2.2-r4
new file mode 100644
index 000000000000..2b0fec6953e4
--- /dev/null
+++ b/metadata/md5-cache/dev-java/servletapi-2.2-r4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=>=virtual/jdk-1.6 dev-java/ant-core:0 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=Servlet API 2.2 from jakarta.apache.org
+EAPI=6
+HOMEPAGE=http://jakarta.apache.org/
+IUSE=doc elibc_FreeBSD doc source elibc_FreeBSD
+KEYWORDS=~amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris
+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	97ce9decef1ff4b6c5be700283f67343	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=2bb2989ae472c21ee8a7adfdc10e38c4
diff --git a/metadata/md5-cache/dev-java/servletapi-2.3-r4 b/metadata/md5-cache/dev-java/servletapi-2.3-r4
new file mode 100644
index 000000000000..de7c31702264
--- /dev/null
+++ b/metadata/md5-cache/dev-java/servletapi-2.3-r4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=>=virtual/jdk-1.6 >=dev-java/ant-core-1.4 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=Servlet API 2.3 from jakarta.apache.org
+EAPI=6
+HOMEPAGE=https://jakarta.apache.org/
+IUSE=doc source elibc_FreeBSD elibc_FreeBSD
+KEYWORDS=~amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris
+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	97ce9decef1ff4b6c5be700283f67343	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=8300b0b723902f5c0a57a873521bc3ca
diff --git a/metadata/md5-cache/dev-java/servletapi-2.4-r6 b/metadata/md5-cache/dev-java/servletapi-2.4-r6
new file mode 100644
index 000000000000..0820e77b4a1c
--- /dev/null
+++ b/metadata/md5-cache/dev-java/servletapi-2.4-r6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=>=virtual/jdk-1.6 dev-java/ant-core:0 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=Servlet API 2.4 from jakarta.apache.org
+EAPI=6
+HOMEPAGE=https://jakarta.apache.org/
+IUSE=doc source elibc_FreeBSD elibc_FreeBSD
+KEYWORDS=~amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+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	97ce9decef1ff4b6c5be700283f67343	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=3bcc116ea2819adca748098c9adb1232
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index a3ef819e0deb..a9b76cb0947b 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/jsoncpp-1.8.3 b/metadata/md5-cache/dev-libs/jsoncpp-1.8.3
deleted file mode 100644
index 74aebfdd41fc..000000000000
--- a/metadata/md5-cache/dev-libs/jsoncpp-1.8.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=doc? ( app-doc/doxygen || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=C++ JSON reader and writer
-EAPI=6
-HOMEPAGE=https://github.com/open-source-parsers/jsoncpp
-IUSE=doc test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=|| ( public-domain MIT )
-RESTRICT=!test? ( test )
-SLOT=0/19
-SRC_URI=https://github.com/open-source-parsers/jsoncpp/archive/1.8.3.tar.gz -> jsoncpp-1.8.3.tar.gz
-_eclasses_=cmake-utils	77a5a8d3308359caadcdd91688f20093	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2d5dca2fc6879f1565cc25fa7cab5d2c
diff --git a/metadata/md5-cache/dev-libs/libb64-1.2 b/metadata/md5-cache/dev-libs/libb64-1.2
deleted file mode 100644
index 7035ce819178..000000000000
--- a/metadata/md5-cache/dev-libs/libb64-1.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=app-arch/unzip
-DESCRIPTION=Fast Base64 encoding/decoding routines
-EAPI=6
-HOMEPAGE=http://libb64.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=CC-PD
-SLOT=0/1.2
-SRC_URI=mirror://sourceforge/libb64/libb64-1.2.src.zip
-_md5_=1cc23daf808173642ed8917972a21845
diff --git a/metadata/md5-cache/dev-libs/libgit2-glib-0.26.0-r1 b/metadata/md5-cache/dev-libs/libgit2-glib-0.26.0-r1
deleted file mode 100644
index 4ae8fdcc30a5..000000000000
--- a/metadata/md5-cache/dev-libs/libgit2-glib-0.26.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/gobject-introspection-0.10.1:= >=dev-libs/glib-2.44.0:2 >=dev-libs/libgit2-0.26.0:0/26[ssh?] python? ( python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-util/gtk-doc-am-1.11 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Git library for GLib
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Projects/Libgit2-glib
-IUSE=python +ssh +vala python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-libs/gobject-introspection-0.10.1:= >=dev-libs/glib-2.44.0:2 >=dev-libs/libgit2-0.26.0:0/26[ssh?] python? ( python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
-REQUIRED_USE=python? ( || ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
-SLOT=0
-SRC_URI=mirror://gnome/sources/libgit2-glib/0.26/libgit2-glib-0.26.0.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c8442e918bcce4a837430f5a1d048af1
diff --git a/metadata/md5-cache/dev-libs/libunistring-0.9.8 b/metadata/md5-cache/dev-libs/libunistring-0.9.8
new file mode 100644
index 000000000000..c740d27985d2
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libunistring-0.9.8
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=app-portage/elt-patches-20170422
+DESCRIPTION=Library for manipulating Unicode and C strings according to Unicode standard
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/libunistring/
+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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=LGPL-3 GPL-3
+SLOT=0/2
+SRC_URI=mirror://gnu/libunistring/libunistring-0.9.8.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=bfed2c71ee03688298ef5b58e30fb4ee
diff --git a/metadata/md5-cache/dev-php/Manifest.gz b/metadata/md5-cache/dev-php/Manifest.gz
index d9d29d185344..dc494f32efb7 100644
--- a/metadata/md5-cache/dev-php/Manifest.gz
+++ b/metadata/md5-cache/dev-php/Manifest.gz
diff --git a/metadata/md5-cache/dev-php/PEAR-Exception-1.0.0 b/metadata/md5-cache/dev-php/PEAR-Exception-1.0.0
index f8fb59370a8a..ee8d23e083f0 100644
--- a/metadata/md5-cache/dev-php/PEAR-Exception-1.0.0
+++ b/metadata/md5-cache/dev-php/PEAR-Exception-1.0.0
@@ -4,9 +4,9 @@ DESCRIPTION=The PEAR Exception base class
 EAPI=6
 HOMEPAGE=http://pear.php.net/package/PEAR_Exception
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD-2
 RDEPEND=dev-lang/php:* !<=dev-php/PEAR-PEAR-1.10.3-r1
 SLOT=0
 SRC_URI=http://download.pear.php.net/package/PEAR_Exception-1.0.0.tgz
-_md5_=c84cc9deba253e6b9fbe929d99d58296
+_md5_=68e89a155aa3865d935c55e820ade861
diff --git a/metadata/md5-cache/dev-php/PEAR-PEAR-1.10.5 b/metadata/md5-cache/dev-php/PEAR-PEAR-1.10.5
index 399ee226d909..dc259fd3443a 100644
--- a/metadata/md5-cache/dev-php/PEAR-PEAR-1.10.5
+++ b/metadata/md5-cache/dev-php/PEAR-PEAR-1.10.5
@@ -2,9 +2,9 @@ DEFINED_PHASES=config install postinst prepare prerm setup
 DESCRIPTION=PEAR Base System
 EAPI=6
 HOMEPAGE=http://pear.php.net/package/PEAR
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=dev-lang/php:*[cli,xml,zlib] >=dev-php/PEAR-Archive_Tar-1.4.0 >=dev-php/PEAR-Console_Getopt-1.4.1 dev-php/PEAR-Exception >=dev-php/PEAR-Structures_Graph-1.1.0 >=dev-php/PEAR-XML_Util-1.3.0
 SLOT=0
 SRC_URI=http://pear.php.net/get/PEAR-1.10.5.tgz
-_md5_=330be992be6e5276aae2049870d10631
+_md5_=8d5414fd30056b684ab80005a038c28f
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 9d6a53ed654b..c2d2d264bad5 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/google-apitools-0.5.16 b/metadata/md5-cache/dev-python/google-apitools-0.5.16
new file mode 100644
index 000000000000..4eeac1e6fc36
--- /dev/null
+++ b/metadata/md5-cache/dev-python/google-apitools-0.5.16
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/httplib2-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oauth2client-1.5.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/google-apputils-0.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-gflags-3.0.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/setuptools-18.5[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 library to manipulate Google APIs
+EAPI=5
+HOMEPAGE=https://github.com/google/apitools
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/httplib2-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oauth2client-1.5.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/google-apputils-0.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-gflags-3.0.6[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=https://github.com/google/apitools/archive/v0.5.16.tar.gz -> google-apitools-0.5.16.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3ac9161b5176fb06ea54fd584581b9ab
diff --git a/metadata/md5-cache/dev-python/miniupnpc-2.0.20171102 b/metadata/md5-cache/dev-python/miniupnpc-2.0.20171102
deleted file mode 100644
index a88e95046e5d..000000000000
--- a/metadata/md5-cache/dev-python/miniupnpc-2.0.20171102
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=net-libs/miniupnpc-2.0.20171102:0= 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=Python bindings for UPnP client library
-EAPI=6
-HOMEPAGE=http://miniupnp.free.fr/
-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 ~ppc ~ppc64 ~x86
-LICENSE=BSD
-RDEPEND=>=net-libs/miniupnpc-2.0.20171102:0= 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://miniupnp.free.fr/files/miniupnpc-2.0.20171102.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=76d5ad57fb4f21ed3266f523535c057a
diff --git a/metadata/md5-cache/dev-python/protobuf-python-3.3.0-r1 b/metadata/md5-cache/dev-python/protobuf-python-3.3.0-r1
index 87bf0dadc7a7..0fe4075f8403 100644
--- a/metadata/md5-cache/dev-python/protobuf-python-3.3.0-r1
+++ b/metadata/md5-cache/dev-python/protobuf-python-3.3.0-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/namespace-google[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-libs/protobuf-3[python(-)] ~dev-libs/protobuf-3.3.0 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/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(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/namespace-google[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-libs/protobuf-3[python(-)] ~dev-libs/protobuf-3.3.0 dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Google's Protocol Buffers - official Python bindings
 EAPI=6
 HOMEPAGE=https://github.com/google/protobuf/ https://developers.google.com/protocol-buffers/
 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 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/namespace-google[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-libs/protobuf-3[python(-)] ~dev-libs/protobuf-3.3.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_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(-)]
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/namespace-google[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-libs/protobuf-3[python(-)] ~dev-libs/protobuf-3.3.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_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/13
 SRC_URI=https://github.com/google/protobuf/archive/v3.3.0.tar.gz -> protobuf-3.3.0.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0283dbb8f5623e409070775959bb0caf
+_md5_=8508e87ab00cce520693dc574bfef3e0
diff --git a/metadata/md5-cache/dev-python/pyblake2-1.0.1 b/metadata/md5-cache/dev-python/pyblake2-1.0.1
deleted file mode 100644
index f5adce5ec76e..000000000000
--- a/metadata/md5-cache/dev-python/pyblake2-1.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=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=BLAKE2 hash function extension module
-EAPI=6
-HOMEPAGE=https://github.com/dchest/pyblake2 https://pypi.python.org/pypi/pyblake2
-IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( CC0-1.0 openssl Apache-2.0 )
-RDEPEND=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(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pyblake2/pyblake2-1.0.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d0a1eeeec3cd2dfc9624ed97ad81fc69
diff --git a/metadata/md5-cache/dev-python/pygit2-0.26.1 b/metadata/md5-cache/dev-python/pygit2-0.26.1
deleted file mode 100644
index 6b02c93a6a22..000000000000
--- a/metadata/md5-cache/dev-python/pygit2-0.26.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==dev-libs/libgit2-0.26* >=dev-python/cffi-1.0:=[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(-)] 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=Python bindings for libgit2
-EAPI=6
-HOMEPAGE=https://github.com/libgit2/pygit2 https://pypi.python.org/pypi/pygit2
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2-with-linking-exception
-RDEPEND==dev-libs/libgit2-0.26* >=dev-python/cffi-1.0:=[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(-)] 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=mirror://pypi/p/pygit2/pygit2-0.26.1.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=92631bef22e509b111ff391ccf868b79
diff --git a/metadata/md5-cache/dev-python/pymountboot-0.2.1 b/metadata/md5-cache/dev-python/pymountboot-0.2.1
deleted file mode 100644
index f42293f3c8c6..000000000000
--- a/metadata/md5-cache/dev-python/pymountboot-0.2.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=sys-apps/util-linux-2.20 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 extension module to (re)mount /boot
-EAPI=5
-HOMEPAGE=https://bitbucket.org/mgorny/pymountboot/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=sys-apps/util-linux-2.20 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://www.bitbucket.org/mgorny/pymountboot/downloads/pymountboot-0.2.1.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=06e93177421ebc227bb9fae7ffe4560c
diff --git a/metadata/md5-cache/dev-python/pyrsistent-0.13.0 b/metadata/md5-cache/dev-python/pyrsistent-0.13.0
index 87800f0174e9..700481c860b7 100644
--- a/metadata/md5-cache/dev-python/pyrsistent-0.13.0
+++ b/metadata/md5-cache/dev-python/pyrsistent-0.13.0
@@ -4,11 +4,11 @@ DESCRIPTION=Persistent/Functional/Immutable data structures
 EAPI=6
 HOMEPAGE=https://github.com/tobgu/pyrsistent/ http://pypi.python.org/pypi/pyrsistent
 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-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=dev-python/six[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/p/pyrsistent/pyrsistent-0.13.0.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3c15a026fef14e89496a9e670f794952
+_md5_=ebbb39d021cb73b2b21662a3b54279db
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 18c6cd537f55..db9835704700 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/curses-1.2.3 b/metadata/md5-cache/dev-ruby/curses-1.2.3
deleted file mode 100644
index d1c4a525e51b..000000000000
--- a/metadata/md5-cache/dev-ruby/curses-1.2.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=sys-libs/ncurses: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? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( 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=Ruby binding for curses, ncurses, and PDCurses
-EAPI=6
-HOMEPAGE=https://github.com/ruby/curses
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Ruby BSD-2 )
-RDEPEND=sys-libs/ncurses: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=1
-SRC_URI=mirror://rubygems/curses-1.2.3.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=2ff0b829141d7367a8379f4acfef1dcd
diff --git a/metadata/md5-cache/dev-ruby/curses-1.2.4 b/metadata/md5-cache/dev-ruby/curses-1.2.4
index 46b9c7680754..087f1f794aee 100644
--- a/metadata/md5-cache/dev-ruby/curses-1.2.4
+++ b/metadata/md5-cache/dev-ruby/curses-1.2.4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=sys-libs/ncurses: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? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( 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=sys-libs/ncurses: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_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( 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=Ruby binding for curses, ncurses, and PDCurses
 EAPI=6
 HOMEPAGE=https://github.com/ruby/curses
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Ruby BSD-2 )
-RDEPEND=sys-libs/ncurses: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 )
+RDEPEND=sys-libs/ncurses: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_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=1
 SRC_URI=mirror://rubygems/curses-1.2.4.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=475fa47d25c436f0982cca43dbaecbf6
+_md5_=dc932c824f565ff6d862b9e6be099236
diff --git a/metadata/md5-cache/dev-ruby/request_store-1.3.1 b/metadata/md5-cache/dev-ruby/request_store-1.3.1
deleted file mode 100644
index 33f230f1829c..000000000000
--- a/metadata/md5-cache/dev-ruby/request_store-1.3.1
+++ /dev/null
@@ -1,14 +0,0 @@
-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_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=Per-request global storage for Rack
-EAPI=5
-HOMEPAGE=https://github.com/steveklabnik/request_store
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=mirror://rubygems/request_store-1.3.1.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=a0a86c50ba505fbf66eb08b38214ac3d
diff --git a/metadata/md5-cache/dev-ruby/request_store-1.4.0 b/metadata/md5-cache/dev-ruby/request_store-1.4.0
new file mode 100644
index 000000000000..d1af5205eeba
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/request_store-1.4.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/rack-1.4:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rack-1.4:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rack-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? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=Per-request global storage for Rack
+EAPI=6
+HOMEPAGE=https://github.com/steveklabnik/request_store
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/rack-1.4:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rack-1.4:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rack-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=0
+SRC_URI=mirror://rubygems/request_store-1.4.0.gem
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=71c4dd6911058d127fd321f93a45b194
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 156048a6a27c..8604e4ee52f0 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/abi-compliance-checker-2.1 b/metadata/md5-cache/dev-util/abi-compliance-checker-2.1
deleted file mode 100644
index e6669ed9587c..000000000000
--- a/metadata/md5-cache/dev-util/abi-compliance-checker-2.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-lang/perl
-DESCRIPTION=A tool for checking backward compatibility of a C/C++ library
-EAPI=6
-HOMEPAGE=http://ispras.linuxbase.org/index.php/ABI_compliance_checker
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl dev-util/abi-dumper dev-util/ctags
-SLOT=0
-SRC_URI=https://github.com/lvc/abi-compliance-checker/archive/2.1.tar.gz -> abi-compliance-checker-2.1.tar.gz
-_md5_=4680fc63c39665d6005f740b24463081
diff --git a/metadata/md5-cache/dev-util/abi-dumper-0.99.15 b/metadata/md5-cache/dev-util/abi-dumper-0.99.15
deleted file mode 100644
index 352a92b41e82..000000000000
--- a/metadata/md5-cache/dev-util/abi-dumper-0.99.15
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-lang/perl
-DESCRIPTION=Dump ABI of an ELF object containing DWARF debug info
-EAPI=6
-HOMEPAGE=https://github.com/lvc/abi-dumper
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl dev-libs/elfutils dev-util/vtable-dumper
-SLOT=0
-SRC_URI=https://github.com/lvc/abi-dumper/archive/0.99.15.tar.gz -> abi-dumper-0.99.15.tar.gz
-_md5_=720301f37b0972d1e34d2e501b1b1fa5
diff --git a/metadata/md5-cache/dev-util/abi-dumper-0.99.19 b/metadata/md5-cache/dev-util/abi-dumper-0.99.19
deleted file mode 100644
index 59c7485013ea..000000000000
--- a/metadata/md5-cache/dev-util/abi-dumper-0.99.19
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-lang/perl
-DESCRIPTION=Dump ABI of an ELF object containing DWARF debug info
-EAPI=6
-HOMEPAGE=https://github.com/lvc/abi-dumper
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl dev-libs/elfutils dev-util/vtable-dumper
-SLOT=0
-SRC_URI=https://github.com/lvc/abi-dumper/archive/0.99.19.tar.gz -> abi-dumper-0.99.19.tar.gz
-_md5_=720301f37b0972d1e34d2e501b1b1fa5
diff --git a/metadata/md5-cache/dev-util/bcc-0.4.0 b/metadata/md5-cache/dev-util/bcc-0.4.0
deleted file mode 100644
index e020362be6bc..000000000000
--- a/metadata/md5-cache/dev-util/bcc-0.4.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=>=dev-libs/elfutils-0.166:= sys-devel/clang:= >=sys-devel/llvm-3.7:=[llvm_targets_BPF(+)] 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(+)?] sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=Tools for BPF-based Linux IO analysis, networking, monitoring, and more
-EAPI=6
-HOMEPAGE=https://iovisor.github.io/bcc/
-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=Apache-2.0
-RDEPEND=>=dev-libs/elfutils-0.166:= sys-devel/clang:= >=sys-devel/llvm-3.7:=[llvm_targets_BPF(+)] 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(+)?]
-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 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/iovisor/bcc/archive/v0.4.0.tar.gz -> bcc-0.4.0.tar.gz
-_eclasses_=cmake-utils	77a5a8d3308359caadcdd91688f20093	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b10e269cf72de9e8abe1987f1527f649
diff --git a/metadata/md5-cache/dev-util/bcc-0.3.0_p20170913 b/metadata/md5-cache/dev-util/bcc-0.5.0_p20171230
index d7904c7a39f8..2785d2775fa1 100644
--- a/metadata/md5-cache/dev-util/bcc-0.3.0_p20170913
+++ b/metadata/md5-cache/dev-util/bcc-0.5.0_p20171230
@@ -10,6 +10,6 @@ RDEPEND=>=dev-libs/elfutils-0.166:= sys-devel/clang:= >=sys-devel/llvm-3.7:=[llv
 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 )
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/iovisor/bcc/archive/488c119ee7aa7598c11be876acd6761342874e68.tar.gz -> bcc-0.3.0_p20170913.tar.gz
+SRC_URI=https://github.com/iovisor/bcc/archive/82ef5a0d999b687d26059e5adfdaac3e605f2339.tar.gz -> bcc-0.5.0_p20171230.tar.gz
 _eclasses_=cmake-utils	77a5a8d3308359caadcdd91688f20093	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=155667e8e40b71e1ba2c6b9235ec126d
+_md5_=6470111f1a62480aaef2636b6995a81b
diff --git a/metadata/md5-cache/dev-util/docker-ls-0.2.1_p20161102 b/metadata/md5-cache/dev-util/docker-ls-0.2.1_p20161102
deleted file mode 100644
index 027f3722d8cc..000000000000
--- a/metadata/md5-cache/dev-util/docker-ls-0.2.1_p20161102
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=>=dev-lang/go-1.8
-DESCRIPTION=Tools for browsing and manipulating docker registries
-EAPI=6
-HOMEPAGE=https://github.com/mayflower/docker-ls
-KEYWORDS=~amd64
-LICENSE=MIT
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/mayflower/docker-ls/archive/3c5e2decd5c6717d4f375a2588179758d62bb591.tar.gz -> docker-ls-0.2.1_p20161102.tar.gz https://github.com/go-yaml/yaml/archive/a3f3340b5840cee44f372bddb5880fcbc419b46a.tar.gz -> github.com-go-yaml-yaml-a3f3340b5840cee44f372bddb5880fcbc419b46a.tar.gz https://github.com/golang/crypto/archive/728b753d0135da6801d45a38e6f43ff55779c5c2.tar.gz -> github.com-golang-crypto-728b753d0135da6801d45a38e6f43ff55779c5c2.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=1139f0420c9e6592ca7ed4e50bb5b5b9
diff --git a/metadata/md5-cache/dev-util/scons-2.3.5 b/metadata/md5-cache/dev-util/scons-2.3.5
deleted file mode 100644
index 33cb3cdc3271..000000000000
--- a/metadata/md5-cache/dev-util/scons-2.3.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
-DESCRIPTION=Extensible Python-based build utility
-EAPI=5
-HOMEPAGE=http://www.scons.org/
-IUSE=doc python_targets_pypy python_targets_python2_7
-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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://sourceforge/scons/scons-2.3.5.tar.gz doc? ( http://www.scons.org/doc/2.3.5/PDF/scons-user.pdf -> scons-2.3.5-user.pdf http://www.scons.org/doc/2.3.5/HTML/scons-user.html -> scons-2.3.5-user.html )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=93a194667e1250bcdd0846f2ef614671
diff --git a/metadata/md5-cache/dev-util/scons-2.5.0 b/metadata/md5-cache/dev-util/scons-2.5.0
deleted file mode 100644
index f981b7ea2258..000000000000
--- a/metadata/md5-cache/dev-util/scons-2.5.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
-DESCRIPTION=Extensible Python-based build utility
-EAPI=6
-HOMEPAGE=http://www.scons.org/
-IUSE=doc python_targets_pypy python_targets_python2_7
-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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://sourceforge/scons/scons-2.5.0.tar.gz doc? ( http://www.scons.org/doc/2.5.0/PDF/scons-user.pdf -> scons-2.5.0-user.pdf http://www.scons.org/doc/2.5.0/HTML/scons-user.html -> scons-2.5.0-user.html )
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1253ef6d03f1d60f5995c8c191dbd18f
diff --git a/metadata/md5-cache/dev-util/shadowman-1 b/metadata/md5-cache/dev-util/shadowman-1
deleted file mode 100644
index 3ac95e06486e..000000000000
--- a/metadata/md5-cache/dev-util/shadowman-1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=app-admin/eselect
-DESCRIPTION=Unified compiler shadow link directory updater
-EAPI=6
-HOMEPAGE=https://github.com/mgorny/shadowman
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-admin/eselect
-SLOT=0
-SRC_URI=https://github.com/mgorny/shadowman/archive/v1.tar.gz -> shadowman-1.tar.gz
-_md5_=beaeee9ab71c8cc274fb0037548b3ac6
diff --git a/metadata/md5-cache/dev-util/strace-4.19 b/metadata/md5-cache/dev-util/strace-4.19
deleted file mode 100644
index df1b55cc4531..000000000000
--- a/metadata/md5-cache/dev-util/strace-4.19
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=static? ( unwind? ( sys-libs/libunwind[static-libs(+)] ) ) aio? ( >=dev-libs/libaio-0.3.106 ) sys-kernel/linux-headers
-DESCRIPTION=A useful diagnostic, instructional, and debugging tool
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/strace/
-IUSE=aio perl static unwind
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=!static? ( unwind? ( sys-libs/libunwind ) ) perl? ( dev-lang/perl )
-SLOT=0
-SRC_URI=mirror://sourceforge/strace/strace-4.19.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=55f81289005659ed4b18e90a77872e13
diff --git a/metadata/md5-cache/dev-util/strace-4.20 b/metadata/md5-cache/dev-util/strace-4.20
index 6ef22ed495c0..53cee07898f3 100644
--- a/metadata/md5-cache/dev-util/strace-4.20
+++ b/metadata/md5-cache/dev-util/strace-4.20
@@ -1,4 +1,4 @@
-DEFINED_PHASES=configure install prepare
+DEFINED_PHASES=configure install prepare test
 DEPEND=static? ( unwind? ( sys-libs/libunwind[static-libs(+)] ) ) aio? ( >=dev-libs/libaio-0.3.106 ) sys-kernel/linux-headers
 DESCRIPTION=A useful diagnostic, instructional, and debugging tool
 EAPI=6
@@ -10,4 +10,4 @@ RDEPEND=!static? ( unwind? ( sys-libs/libunwind ) ) perl? ( dev-lang/perl )
 SLOT=0
 SRC_URI=mirror://sourceforge/strace/strace-4.20.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=d576f523416362b52da5acbfbf75fc0e
+_md5_=7e52e2abea1a1b9741205daf21d7abae
diff --git a/metadata/md5-cache/dev-util/strace-9999 b/metadata/md5-cache/dev-util/strace-9999
index d0d0d5571123..315f774bf621 100644
--- a/metadata/md5-cache/dev-util/strace-9999
+++ b/metadata/md5-cache/dev-util/strace-9999
@@ -1,4 +1,4 @@
-DEFINED_PHASES=configure install prepare unpack
+DEFINED_PHASES=configure install prepare test unpack
 DEPEND=static? ( unwind? ( sys-libs/libunwind[static-libs(+)] ) ) aio? ( >=dev-libs/libaio-0.3.106 ) sys-kernel/linux-headers >=dev-vcs/git-1.8.2.1 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=A useful diagnostic, instructional, and debugging tool
 EAPI=6
@@ -8,4 +8,4 @@ LICENSE=BSD
 RDEPEND=!static? ( unwind? ( sys-libs/libunwind ) ) perl? ( dev-lang/perl )
 SLOT=0
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=d576f523416362b52da5acbfbf75fc0e
+_md5_=b047a5f92e8d648209cbe10d6867ebea
diff --git a/metadata/md5-cache/games-board/Manifest.gz b/metadata/md5-cache/games-board/Manifest.gz
index 4c1d83cc7f24..81b7a66ddc9e 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/capicity-1.0-r1 b/metadata/md5-cache/games-board/capicity-1.0-r1
deleted file mode 100644
index 624eb42c050b..000000000000
--- a/metadata/md5-cache/games-board/capicity-1.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst unpack
-DEPEND=dev-qt/qtcore:4 dev-qt/qtscript:4 !dedicated? ( dev-qt/qtgui:4 ) >=sys-apps/sed-4
-DESCRIPTION=Monopd compatible boardgame for Monopoly-like games, previously named capitalism
-EAPI=6
-HOMEPAGE=http://linux-ecke.de/CapiCity/
-IUSE=dedicated
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtcore:4 dev-qt/qtscript:4 !dedicated? ( dev-qt/qtgui:4 )
-SLOT=0
-SRC_URI=dedicated? ( mirror://sourceforge/project/capitalism/Capi%20City/1.0/Capid_1.0.tar.gz ) !dedicated? ( mirror://sourceforge/project/capitalism/Capi%20City/1.0/CapiCity_1.0.tar.gz )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f8d5c2ac5877ae4cb4ee94ab2b3f9dd1
diff --git a/metadata/md5-cache/games-board/holdingnuts-0.0.5-r2 b/metadata/md5-cache/games-board/holdingnuts-0.0.5-r2
deleted file mode 100644
index 1646866f33d0..000000000000
--- a/metadata/md5-cache/games-board/holdingnuts-0.0.5-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!dedicated? ( dev-qt/qtcore:4 dev-qt/qtgui:4 alsa? ( >=media-libs/libsdl-1.2.10:0[alsa] ) ) >=dev-util/cmake-2.6.3 sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=An open source poker client and server
-EAPI=6
-HOMEPAGE=http://www.holdingnuts.net/
-IUSE=alsa debug dedicated
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=!dedicated? ( dev-qt/qtcore:4 dev-qt/qtgui:4 alsa? ( >=media-libs/libsdl-1.2.10:0[alsa] ) )
-SLOT=0
-SRC_URI=http://downloads.sourceforge.net/holdingnuts/holdingnuts-0.0.5.tar.bz2
-_eclasses_=cmake-utils	77a5a8d3308359caadcdd91688f20093	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f1e244a0e50cf64e63a2e492e92a62eb
diff --git a/metadata/md5-cache/games-board/kcheckers-0.8.1-r1 b/metadata/md5-cache/games-board/kcheckers-0.8.1-r1
deleted file mode 100644
index d91f0dc77138..000000000000
--- a/metadata/md5-cache/games-board/kcheckers-0.8.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-qt/qtgui:4
-DESCRIPTION=Qt version of the classic boardgame checkers
-EAPI=6
-HOMEPAGE=http://qcheckers.sourceforge.net/
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtgui:4
-SLOT=0
-SRC_URI=mirror://gentoo/kcheckers-0.8.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=437312d674341cee02c70a1c412f3f7a
diff --git a/metadata/md5-cache/games-board/qcheckers-20091230-r1 b/metadata/md5-cache/games-board/qcheckers-20091230-r1
deleted file mode 100644
index 9fe58e8d8b8a..000000000000
--- a/metadata/md5-cache/games-board/qcheckers-20091230-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=dev-qt/qtgui:4
-DESCRIPTION=Qt4 based checkers game
-EAPI=6
-HOMEPAGE=https://code.google.com/p/qcheckers/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-qt/qtgui:4
-SLOT=0
-SRC_URI=https://qcheckers.googlecode.com/files/QCheckers-20091230.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=87d5e1b0c15c3c40de610f62716719b3
diff --git a/metadata/md5-cache/games-board/qgo-1.5.4_p20100322-r1 b/metadata/md5-cache/games-board/qgo-1.5.4_p20100322-r1
deleted file mode 100644
index 35b511104781..000000000000
--- a/metadata/md5-cache/games-board/qgo-1.5.4_p20100322-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qttest:4 media-libs/alsa-lib
-DESCRIPTION=An ancient boardgame, very common in Japan, China and Korea
-EAPI=6
-HOMEPAGE=http://qgo.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qttest:4 media-libs/alsa-lib
-SLOT=0
-SRC_URI=mirror://gentoo/qgo-1.5.4_p20100322.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=6eef8939bc9f12693a0c7790b0dc17e8
diff --git a/metadata/md5-cache/games-emulation/Manifest.gz b/metadata/md5-cache/games-emulation/Manifest.gz
index 3dc7bd5d7519..33d42a16f075 100644
--- a/metadata/md5-cache/games-emulation/Manifest.gz
+++ b/metadata/md5-cache/games-emulation/Manifest.gz
diff --git a/metadata/md5-cache/games-emulation/dboxfe-0.1.3-r1 b/metadata/md5-cache/games-emulation/dboxfe-0.1.3-r1
deleted file mode 100644
index 60577245e49e..000000000000
--- a/metadata/md5-cache/games-emulation/dboxfe-0.1.3-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-qt/qtgui:4 dev-qt/qtcore:4
-DESCRIPTION=Creates and manages configuration files for DOSBox
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/dboxfe.berlios/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtgui:4 dev-qt/qtcore:4 >=games-emulation/dosbox-0.65
-SLOT=0
-SRC_URI=mirror://sourceforge/dboxfe.berlios/dboxfe-0.1.3.tar.bz2
-_md5_=ebba6aaaedb328b1f4bdf33056b07cc8
diff --git a/metadata/md5-cache/games-emulation/virtualjaguar-2.1.2-r2 b/metadata/md5-cache/games-emulation/virtualjaguar-2.1.2-r2
deleted file mode 100644
index 575bee151dd9..000000000000
--- a/metadata/md5-cache/games-emulation/virtualjaguar-2.1.2-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=dev-libs/libcdio dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtopengl:4[-egl] media-libs/libsdl[joystick,opengl,sound,video] sys-libs/zlib virtual/opengl >=sys-devel/gcc-4.4 >=sys-apps/sed-4
-DESCRIPTION=an Atari Jaguar emulator
-EAPI=6
-HOMEPAGE=http://www.icculus.org/virtualjaguar/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/libcdio dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtopengl:4[-egl] media-libs/libsdl[joystick,opengl,sound,video] sys-libs/zlib virtual/opengl
-SLOT=0
-SRC_URI=http://www.icculus.org/virtualjaguar/tarballs/virtualjaguar-2.1.2.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7f583cb3379d336f2aa74eeeabb055aa
diff --git a/metadata/md5-cache/games-kids/Manifest.gz b/metadata/md5-cache/games-kids/Manifest.gz
index b89f27f0a863..efd5d62fa881 100644
--- a/metadata/md5-cache/games-kids/Manifest.gz
+++ b/metadata/md5-cache/games-kids/Manifest.gz
diff --git a/metadata/md5-cache/games-kids/cubetest-0.9.4-r1 b/metadata/md5-cache/games-kids/cubetest-0.9.4-r1
deleted file mode 100644
index bcd710b4f454..000000000000
--- a/metadata/md5-cache/games-kids/cubetest-0.9.4-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=dev-qt/qtcore:4[qt3support] dev-qt/qtgui:4 virtual/pkgconfig
-DESCRIPTION=A program to train your spatial insight
-EAPI=6
-HOMEPAGE=http://www.vandenoever.info/software/cubetest/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtcore:4[qt3support] dev-qt/qtgui:4
-SLOT=0
-SRC_URI=http://www.vandenoever.info/software/cubetest/cubetest-0.9.4.tar.bz2
-_md5_=6547af55963e65ce578c950ffabb80d2
diff --git a/metadata/md5-cache/games-misc/Manifest.gz b/metadata/md5-cache/games-misc/Manifest.gz
index 880f823a41e9..f4ece50f3c2b 100644
--- a/metadata/md5-cache/games-misc/Manifest.gz
+++ b/metadata/md5-cache/games-misc/Manifest.gz
diff --git a/metadata/md5-cache/games-misc/ggencoder-0.91a b/metadata/md5-cache/games-misc/ggencoder-0.91a
deleted file mode 100644
index 6a91c19754db..000000000000
--- a/metadata/md5-cache/games-misc/ggencoder-0.91a
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4
-DESCRIPTION=Utility to encode and decode Game Genie (tm) codes
-EAPI=5
-HOMEPAGE=http://games.technoplaza.net/ggencoder/qt/
-IUSE=doc
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4
-SLOT=0
-SRC_URI=http://games.technoplaza.net/ggencoder/qt/history/ggencoder-0.91a.tar.bz2
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	qt4-r2	b7985a3197fbc3a22d059f19904e735b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=5be389855987886f2b78928897040093
diff --git a/metadata/md5-cache/games-misc/qlife-1.1-r1 b/metadata/md5-cache/games-misc/qlife-1.1-r1
deleted file mode 100644
index 2a9e6f6cbdc8..000000000000
--- a/metadata/md5-cache/games-misc/qlife-1.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=dev-qt/qtgui:4
-DESCRIPTION=Simulates the classical Game of Life invented by John Conway
-EAPI=6
-HOMEPAGE=http://open-maker.tuxfamily.org/blog/index.php?post/2009/03/28/QLife
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-qt/qtgui:4
-SLOT=0
-SRC_URI=http://open-maker.tuxfamily.org/blog/public/qlife_linux.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=77f8085af68f2683401555e0ad6dd690
diff --git a/metadata/md5-cache/games-puzzle/Manifest.gz b/metadata/md5-cache/games-puzzle/Manifest.gz
index 6aa49ba7c389..9cf1f0fa7b6a 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/bubble-chains-0.1.1 b/metadata/md5-cache/games-puzzle/bubble-chains-0.1.1
deleted file mode 100644
index 949a861663aa..000000000000
--- a/metadata/md5-cache/games-puzzle/bubble-chains-0.1.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=x11-libs/libXrandr dev-qt/qtgui:4 dev-qt/qtopengl:4 media-libs/libsdl[sound,video] media-libs/sdl-mixer virtual/pkgconfig app-arch/p7zip
-DESCRIPTION=Arcade-puzzle game
-EAPI=5
-HOMEPAGE=http://bubble-chains.sintegrial.com/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=x11-libs/libXrandr dev-qt/qtgui:4 dev-qt/qtopengl:4 media-libs/libsdl[sound,video] media-libs/sdl-mixer games-misc/games-envd
-SLOT=0
-SRC_URI=http://bubble-chains.sintegrial.com/files/chains-0.1.1-src.7z
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	qt4-r2	b7985a3197fbc3a22d059f19904e735b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=860893c18304be225eb6754b245a0914
diff --git a/metadata/md5-cache/games-puzzle/jag-0.3.2 b/metadata/md5-cache/games-puzzle/jag-0.3.2
deleted file mode 100644
index b62745c90c29..000000000000
--- a/metadata/md5-cache/games-puzzle/jag-0.3.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 x11-libs/libXrandr media-libs/libsdl[sound,video] media-libs/sdl-mixer app-arch/unzip
-DESCRIPTION=Arcade 2D Puzzle Game
-EAPI=5
-HOMEPAGE=http://jag.xlabsoft.com/
-IUSE=editor
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 x11-libs/libXrandr media-libs/libsdl[sound,video] media-libs/sdl-mixer games-misc/games-envd
-SLOT=0
-SRC_URI=http://jag.xlabsoft.com/files/jag-0.3.2-src.zip http://jag.xlabsoft.com/files/jag-0.3.2-data.zip
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	qt4-r2	b7985a3197fbc3a22d059f19904e735b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=c439517b6ee2b11e349d3b92f593ce30
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index 8ce2cc1bf15e..4879cadf4297 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.20050715-r7 b/metadata/md5-cache/mail-client/mailx-8.1.2.20050715-r7
deleted file mode 100644
index dad1776a3abf..000000000000
--- a/metadata/md5-cache/mail-client/mailx-8.1.2.20050715-r7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=>=net-libs/liblockfile-1.03 virtual/mta mail-client/mailx-support
-DESCRIPTION=The /bin/mail program, which is used to send mail via shell scripts
-EAPI=6
-HOMEPAGE=http://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
-LICENSE=BSD
-RDEPEND=>=net-libs/liblockfile-1.03 virtual/mta mail-client/mailx-support !mail-client/nail !net-mail/mailutils
-SLOT=0
-SRC_URI=mirror://gentoo/mailx_8.1.2-0.20050715cvs.orig.tar.gz mirror://gentoo/mailx_8.1.2-0.20050715cvs-1.diff.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=630e9e2dc4e7df0df53cf494ca66dda9
diff --git a/metadata/md5-cache/mail-client/mailx-8.1.2.20160123 b/metadata/md5-cache/mail-client/mailx-8.1.2.20160123
new file mode 100644
index 000000000000..969252ffa318
--- /dev/null
+++ b/metadata/md5-cache/mail-client/mailx-8.1.2.20160123
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=>=net-libs/liblockfile-1.03 dev-libs/libbsd virtual/mta mail-client/mailx-support
+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
+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	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=ecf3ae47cc3f977ed4c2f118ec9098d4
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index e03f746102e9..ee677e70fd73 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/displaycal-3.3.3.0 b/metadata/md5-cache/media-gfx/displaycal-3.3.3.0
deleted file mode 100644
index fc9cd9c5f1d2..000000000000
--- a/metadata/md5-cache/media-gfx/displaycal-3.3.3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=media-gfx/argyllcms-1.1.0 dev-python/wxpython:3.0 >=x11-libs/libX11-1.3.3 >=x11-apps/xrandr-1.3.2 >=x11-libs/libXxf86vm-1.1.0 >=x11-proto/xineramaproto-1.2 >=x11-libs/libXinerama-1.1 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/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Display calibration and characterization powered by Argyll CMS
-EAPI=6
-HOMEPAGE=https://displaycal.net/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=media-gfx/argyllcms-1.1.0 dev-python/wxpython:3.0 >=x11-libs/libX11-1.3.3 >=x11-apps/xrandr-1.3.2 >=x11-libs/libXxf86vm-1.1.0 >=x11-proto/xineramaproto-1.2 >=x11-libs/libXinerama-1.1 >=dev-python/numpy-1.2.1 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://sourceforge/dispcalgui/DisplayCAL-3.3.3.0.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d5ed5c42ee5aa9923264c8ca2c5f52c0
diff --git a/metadata/md5-cache/media-gfx/displaycal-3.3.4.1 b/metadata/md5-cache/media-gfx/displaycal-3.4.0.0
index a72f5532d249..f3c784102270 100644
--- a/metadata/md5-cache/media-gfx/displaycal-3.3.4.1
+++ b/metadata/md5-cache/media-gfx/displaycal-3.4.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=media-gfx/argyllcms-1.1.0 dev-python/wxpython:3.0 >=x11-libs/libX11-1.3.3 >=x11-apps/xrandr-1.3.2 >=x11-libs/libXxf86vm-1.1.0 >=x11-proto/xineramaproto-1.2 >=x11-libs/libXinerama-1.1 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/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=media-gfx/argyllcms-1.1.0 dev-python/wxpython:3.0 >=x11-libs/libX11-1.3.3 >=x11-apps/xrandr-1.3.2 >=x11-libs/libXxf86vm-1.1.0 >=x11-proto/xineramaproto-1.2 >=x11-libs/libXinerama-1.1 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(-)] >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Display calibration and characterization powered by Argyll CMS
 EAPI=6
 HOMEPAGE=https://displaycal.net/
@@ -9,6 +9,6 @@ LICENSE=GPL-3
 RDEPEND=>=media-gfx/argyllcms-1.1.0 dev-python/wxpython:3.0 >=x11-libs/libX11-1.3.3 >=x11-apps/xrandr-1.3.2 >=x11-libs/libXxf86vm-1.1.0 >=x11-proto/xineramaproto-1.2 >=x11-libs/libXinerama-1.1 >=dev-python/numpy-1.2.1 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-SRC_URI=mirror://sourceforge/dispcalgui/DisplayCAL-3.3.4.1.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d5ed5c42ee5aa9923264c8ca2c5f52c0
+SRC_URI=mirror://sourceforge/dispcalgui/DisplayCAL-3.4.0.0.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d8e1659373db7c90ee92a3beb201fba2
diff --git a/metadata/md5-cache/media-gfx/geeqie-1.4-r1 b/metadata/md5-cache/media-gfx/geeqie-1.4-r1
new file mode 100644
index 000000000000..f02d800fe7b0
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/geeqie-1.4-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst postrm prepare
+DEPEND=gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) virtual/libintl doc? ( app-text/gnome-doc-utils ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) gpu-accel? ( media-libs/clutter-gtk ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) lirc? ( app-misc/lirc ) lua? ( >=dev-lang/lua-5.1:= ) map? ( media-libs/libchamplain:0.12 ) xmp? ( >=media-gfx/exiv2-0.17:=[xmp] ) !xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) ) tiff? ( media-libs/tiff:0 ) virtual/pkgconfig dev-util/intltool sys-devel/gettext >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A lightweight GTK image viewer forked from GQview
+EAPI=6
+HOMEPAGE=http://www.geeqie.org
+IUSE=debug doc exif ffmpegthumbnailer gpu-accel gtk3 jpeg lcms lirc lua map tiff xmp
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) virtual/libintl doc? ( app-text/gnome-doc-utils ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) gpu-accel? ( media-libs/clutter-gtk ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) lirc? ( app-misc/lirc ) lua? ( >=dev-lang/lua-5.1:= ) map? ( media-libs/libchamplain:0.12 ) xmp? ( >=media-gfx/exiv2-0.17:=[xmp] ) !xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) ) tiff? ( media-libs/tiff:0 )
+REQUIRED_USE=gpu-accel? ( gtk3 ) map? ( gpu-accel )
+SLOT=0
+SRC_URI=http://www.geeqie.org/geeqie-1.4.tar.xz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=fcb6e79ccc3ce13c5aaf62e1109247bd
diff --git a/metadata/md5-cache/media-gfx/imagemagick-6.9.9.31 b/metadata/md5-cache/media-gfx/imagemagick-6.9.9.31
new file mode 100644
index 000000000000..e868dae74a6d
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/imagemagick-6.9.9.31
@@ -0,0 +1,15 @@
+DEFINED_PHASES=configure install prepare test
+DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-gfx/ufraw ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= ) !media-gfx/graphicsmagick[imagemagick] virtual/pkgconfig X? ( x11-proto/xextproto ) >=app-portage/elt-patches-20170422
+DESCRIPTION=A collection of tools and libraries for many image formats
+EAPI=6
+HOMEPAGE=http://www.imagemagick.org/
+IUSE=bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~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=imagemagick
+RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-gfx/ufraw ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
+REQUIRED_USE=corefonts? ( truetype ) test? ( corefonts )
+RESTRICT=perl? ( userpriv )
+SLOT=0/6.9.9.31
+SRC_URI=mirror://imagemagick/ImageMagick-6.9.9-31.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=d8a8892d1bf99779c9492a351c4fcde3
diff --git a/metadata/md5-cache/media-gfx/imagemagick-7.0.7.19 b/metadata/md5-cache/media-gfx/imagemagick-7.0.7.19
new file mode 100644
index 000000000000..609df09e5a68
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/imagemagick-7.0.7.19
@@ -0,0 +1,15 @@
+DEFINED_PHASES=configure install prepare test
+DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-gfx/ufraw ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= ) !media-gfx/graphicsmagick[imagemagick] virtual/pkgconfig X? ( x11-proto/xextproto ) >=app-portage/elt-patches-20170422
+DESCRIPTION=A collection of tools and libraries for many image formats
+EAPI=6
+HOMEPAGE=http://www.imagemagick.org/
+IUSE=bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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=imagemagick
+RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-gfx/ufraw ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
+REQUIRED_USE=corefonts? ( truetype ) test? ( corefonts )
+RESTRICT=perl? ( userpriv )
+SLOT=0/7.0.7.19
+SRC_URI=mirror://imagemagick/ImageMagick-7.0.7-19.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=ef3f17e2f5a56a69a3d889294715f631
diff --git a/metadata/md5-cache/media-gfx/kpovmodeler-1.1.3-r1 b/metadata/md5-cache/media-gfx/kpovmodeler-1.1.3-r1
deleted file mode 100644
index 5ac5ed56b84f..000000000000
--- a/metadata/md5-cache/media-gfx/kpovmodeler-1.1.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=media-libs/freetype virtual/glu x11-libs/libX11 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-3.7.2 dev-util/automoc virtual/pkgconfig >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto >=dev-qt/qtopengl-4.8.5:4 dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
-DESCRIPTION=A modeling and composition program for creating POV-Ray(TM) scenes
-EAPI=5
-HOMEPAGE=https://extragear.kde.org/apps/kpovmodeler/
-IUSE=debug l10n_af l10n_ar l10n_be l10n_bg l10n_br l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_el l10n_en-GB l10n_es l10n_et l10n_eu l10n_fa l10n_fi l10n_fr l10n_ga l10n_gl l10n_he l10n_hi l10n_hr l10n_hu l10n_is l10n_it l10n_ja l10n_km l10n_lt l10n_mk l10n_ms l10n_nb l10n_nds l10n_ne l10n_nl l10n_nn l10n_oc l10n_pl l10n_pt l10n_pt-BR l10n_ro l10n_ru l10n_se l10n_sk l10n_sl l10n_sv l10n_ta l10n_tg l10n_tr l10n_uk l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 LGPL-2.1 FDL-1.2
-RDEPEND=media-libs/freetype virtual/glu x11-libs/libX11 media-gfx/povray kde-frameworks/oxygen-icons l10n_af? ( >=kde-apps/kde4-l10n-4.4:4[l10n_af(+)] ) l10n_ar? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ar(+)] ) l10n_be? ( >=kde-apps/kde4-l10n-4.4:4[l10n_be(+)] ) l10n_bg? ( >=kde-apps/kde4-l10n-4.4:4[l10n_bg(+)] ) l10n_br? ( >=kde-apps/kde4-l10n-4.4:4[l10n_br(+)] ) l10n_ca? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ca(+)] ) l10n_cs? ( >=kde-apps/kde4-l10n-4.4:4[l10n_cs(+)] ) l10n_cy? ( >=kde-apps/kde4-l10n-4.4:4[l10n_cy(+)] ) l10n_da? ( >=kde-apps/kde4-l10n-4.4:4[l10n_da(+)] ) l10n_de? ( >=kde-apps/kde4-l10n-4.4:4[l10n_de(+)] ) l10n_el? ( >=kde-apps/kde4-l10n-4.4:4[l10n_el(+)] ) l10n_en-GB? ( >=kde-apps/kde4-l10n-4.4:4[l10n_en-GB(+)] ) l10n_es? ( >=kde-apps/kde4-l10n-4.4:4[l10n_es(+)] ) l10n_et? ( >=kde-apps/kde4-l10n-4.4:4[l10n_et(+)] ) l10n_eu? ( >=kde-apps/kde4-l10n-4.4:4[l10n_eu(+)] ) l10n_fa? ( >=kde-apps/kde4-l10n-4.4:4[l10n_fa(+)] ) l10n_fi? ( >=kde-apps/kde4-l10n-4.4:4[l10n_fi(+)] ) l10n_fr? ( >=kde-apps/kde4-l10n-4.4:4[l10n_fr(+)] ) l10n_ga? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ga(+)] ) l10n_gl? ( >=kde-apps/kde4-l10n-4.4:4[l10n_gl(+)] ) l10n_he? ( >=kde-apps/kde4-l10n-4.4:4[l10n_he(+)] ) l10n_hi? ( >=kde-apps/kde4-l10n-4.4:4[l10n_hi(+)] ) l10n_hr? ( >=kde-apps/kde4-l10n-4.4:4[l10n_hr(+)] ) l10n_hu? ( >=kde-apps/kde4-l10n-4.4:4[l10n_hu(+)] ) l10n_is? ( >=kde-apps/kde4-l10n-4.4:4[l10n_is(+)] ) l10n_it? ( >=kde-apps/kde4-l10n-4.4:4[l10n_it(+)] ) l10n_ja? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ja(+)] ) l10n_km? ( >=kde-apps/kde4-l10n-4.4:4[l10n_km(+)] ) l10n_lt? ( >=kde-apps/kde4-l10n-4.4:4[l10n_lt(+)] ) l10n_mk? ( >=kde-apps/kde4-l10n-4.4:4[l10n_mk(+)] ) l10n_ms? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ms(+)] ) l10n_nb? ( >=kde-apps/kde4-l10n-4.4:4[l10n_nb(+)] ) l10n_nds? ( >=kde-apps/kde4-l10n-4.4:4[l10n_nds(+)] ) l10n_ne? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ne(+)] ) l10n_nl? ( >=kde-apps/kde4-l10n-4.4:4[l10n_nl(+)] ) l10n_nn? ( >=kde-apps/kde4-l10n-4.4:4[l10n_nn(+)] ) l10n_oc? ( >=kde-apps/kde4-l10n-4.4:4[l10n_oc(+)] ) l10n_pl? ( >=kde-apps/kde4-l10n-4.4:4[l10n_pl(+)] ) l10n_pt? ( >=kde-apps/kde4-l10n-4.4:4[l10n_pt(+)] ) l10n_pt-BR? ( >=kde-apps/kde4-l10n-4.4:4[l10n_pt-BR(+)] ) l10n_ro? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ro(+)] ) l10n_ru? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ru(+)] ) l10n_se? ( >=kde-apps/kde4-l10n-4.4:4[l10n_se(+)] ) l10n_sk? ( >=kde-apps/kde4-l10n-4.4:4[l10n_sk(+)] ) l10n_sl? ( >=kde-apps/kde4-l10n-4.4:4[l10n_sl(+)] ) l10n_sv? ( >=kde-apps/kde4-l10n-4.4:4[l10n_sv(+)] ) l10n_ta? ( >=kde-apps/kde4-l10n-4.4:4[l10n_ta(+)] ) l10n_tg? ( >=kde-apps/kde4-l10n-4.4:4[l10n_tg(+)] ) l10n_tr? ( >=kde-apps/kde4-l10n-4.4:4[l10n_tr(+)] ) l10n_uk? ( >=kde-apps/kde4-l10n-4.4:4[l10n_uk(+)] ) l10n_vi? ( >=kde-apps/kde4-l10n-4.4:4[l10n_vi(+)] ) l10n_xh? ( >=kde-apps/kde4-l10n-4.4:4[l10n_xh(+)] ) l10n_zh-CN? ( >=kde-apps/kde4-l10n-4.4:4[l10n_zh-CN(+)] ) l10n_zh-TW? ( >=kde-apps/kde4-l10n-4.4:4[l10n_zh-TW(+)] ) >=dev-qt/qtopengl-4.8.5:4 dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
-SLOT=4
-SRC_URI=https://dev.gentoo.org/~kensington/kpovmodeler-1.1.3-kde4.1.1.tar.bz2
-_eclasses_=cmake-utils	77a5a8d3308359caadcdd91688f20093	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cf7eeaffa85c9f3c3eecbacf8d12de3e
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index c20200314fe4..27e6ba1071c8 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/libmypaint-1.3.0 b/metadata/md5-cache/media-libs/libmypaint-1.3.0
index 31f72b1196a1..a61128ef6caf 100644
--- a/metadata/md5-cache/media-libs/libmypaint-1.3.0
+++ b/metadata/md5-cache/media-libs/libmypaint-1.3.0
@@ -4,10 +4,10 @@ DESCRIPTION=Library for making brushstrokes
 EAPI=6
 HOMEPAGE=https://github.com/mypaint/libmypaint
 IUSE=+gegl introspection nls openmp
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~sparc ~x86
 LICENSE=ISC
 RDEPEND=dev-libs/glib:2 dev-libs/json-c:= gegl? ( media-libs/babl media-libs/gegl:0.3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-1.32 ) openmp? ( sys-devel/gcc:*[openmp] ) nls? ( sys-devel/gettext ) !<media-gfx/mypaint-1.2.1
 SLOT=0/0
 SRC_URI=https://github.com/mypaint/libmypaint/releases/download/v1.3.0/libmypaint-1.3.0.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=438ca85c6cf8cbe3c66dfa6f211adfa8
+_md5_=3770efc26cb173e724e30e5f20e51400
diff --git a/metadata/md5-cache/media-libs/libsixel-1.7.3 b/metadata/md5-cache/media-libs/libsixel-1.7.3
index 295e8c71035d..64397b2c314d 100644
--- a/metadata/md5-cache/media-libs/libsixel-1.7.3
+++ b/metadata/md5-cache/media-libs/libsixel-1.7.3
@@ -3,11 +3,11 @@ DEPEND=curl? ( net-misc/curl ) gd? ( media-libs/gd ) gtk? ( x11-libs/gdk-pixbuf:
 DESCRIPTION=A lightweight, fast implementation of DEC SIXEL graphics codec
 EAPI=6
 HOMEPAGE=https://github.com/saitoha/libsixel
-IUSE=curl gd gtk jpeg png
+IUSE=curl gd gtk jpeg png static-libs
 KEYWORDS=amd64 ia64 x86
 LICENSE=MIT public-domain
 RDEPEND=curl? ( net-misc/curl ) gd? ( media-libs/gd ) gtk? ( x11-libs/gdk-pixbuf:2 ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0 )
 SLOT=0
 SRC_URI=https://github.com/saitoha/libsixel/archive/v1.7.3.tar.gz -> libsixel-1.7.3.tar.gz
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=69e4d9e1855df2c2a01fe10f113e70a7
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=e6bfc6cb15f932036e18fc26137ad93d
diff --git a/metadata/md5-cache/media-radio/Manifest.gz b/metadata/md5-cache/media-radio/Manifest.gz
index 0c9d42e00ef5..7e719f542751 100644
--- a/metadata/md5-cache/media-radio/Manifest.gz
+++ b/metadata/md5-cache/media-radio/Manifest.gz
diff --git a/metadata/md5-cache/media-radio/fldigi-4.0.12 b/metadata/md5-cache/media-radio/fldigi-4.0.12
index 6a1452d3f59f..87b2922964ec 100644
--- a/metadata/md5-cache/media-radio/fldigi-4.0.12
+++ b/metadata/md5-cache/media-radio/fldigi-4.0.12
@@ -4,10 +4,10 @@ DESCRIPTION=Sound card based multimode software modem for Amateur Radio use
 EAPI=5
 HOMEPAGE=http://www.w1hkj.com
 IUSE=hamlib nls pulseaudio
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=x11-libs/fltk:1[threads,xft] media-libs/libsamplerate media-libs/libpng:0 x11-misc/xdg-utils dev-perl/RPC-XML dev-perl/Term-ReadLine-Perl >=media-libs/portaudio-19_pre20071207 hamlib? ( media-libs/hamlib ) pulseaudio? ( media-sound/pulseaudio ) >=media-libs/libsndfile-1.0.10
 SLOT=0
 SRC_URI=mirror://sourceforge/fldigi/fldigi-4.0.12.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=e135dc05999d37d9294b9c2febda7d1f
+_md5_=4db475e80f381083a9a2495a9a174250
diff --git a/metadata/md5-cache/media-radio/flrig-1.3.36 b/metadata/md5-cache/media-radio/flrig-1.3.36
index bfa79a97ee6b..39515baffd7d 100644
--- a/metadata/md5-cache/media-radio/flrig-1.3.36
+++ b/metadata/md5-cache/media-radio/flrig-1.3.36
@@ -4,10 +4,10 @@ DESCRIPTION=Transceiver control program for Amateur Radio use
 EAPI=5
 HOMEPAGE=http://www.w1hkj.com/flrig-help/index.html
 IUSE=nls
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/fltk:1 x11-misc/xdg-utils
 SLOT=0
 SRC_URI=mirror://sourceforge/fldigi/flrig-1.3.36.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=6cd3dfcd35b59fead001869e745e024f
+_md5_=3bfe0e9c05971092780aab48837711a5
diff --git a/metadata/md5-cache/media-radio/xlog-2.0.15 b/metadata/md5-cache/media-radio/xlog-2.0.15
index cb39e9fefd1e..2af02b9976ce 100644
--- a/metadata/md5-cache/media-radio/xlog-2.0.15
+++ b/metadata/md5-cache/media-radio/xlog-2.0.15
@@ -3,10 +3,10 @@ DEPEND=media-libs/hamlib dev-libs/glib:2 x11-libs/gtk+:2 sys-devel/gettext virtu
 DESCRIPTION=An amateur radio logging program
 EAPI=6
 HOMEPAGE=http://www.nongnu.org/xlog
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=media-libs/hamlib dev-libs/glib:2 x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases/xlog/xlog-2.0.15.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=7e3a539ae3264f31e6bc7868ea54e09d
+_md5_=5aa8985da5edf658fe19ebe93a2ad620
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index c99a2e72d3a7..d3b86cb7b261 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/clementine-1.3.1_p20171113 b/metadata/md5-cache/media-sound/clementine-1.3.1_p20171113
index 17c030dff499..75322a1286d4 100644
--- a/metadata/md5-cache/media-sound/clementine-1.3.1_p20171113
+++ b/metadata/md5-cache/media-sound/clementine-1.3.1_p20171113
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=dev-db/sqlite:= dev-libs/crypto++ dev-libs/glib:2 dev-libs/libxml2 dev-libs/protobuf:= dev-libs/qjson dev-qt/qtcore:4[ssl] dev-qt/qtgui:4 dev-qt/qtopengl:4 dev-qt/qtsql:4 media-libs/chromaprint:= media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/libmygpo-qt-1.0.9[qt4(+)] media-libs/taglib[mp4(+)] sys-libs/zlib virtual/glu virtual/opengl x11-libs/libX11 cdda? ( dev-libs/libcdio ) dbus? ( dev-qt/qtdbus:4 ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1[qt4(+)] ) moodbar? ( sci-libs/fftw:3.0 ) mtp? ( >=media-libs/libmtp-1.0.0 ) projectm? ( media-libs/glew:= >=media-libs/libprojectm-1.2.0 ) || ( >=dev-cpp/gtest-1.8.0 dev-cpp/gmock ) dev-libs/boost sys-devel/gettext virtual/pkgconfig box? ( dev-cpp/sparsehash ) dropbox? ( dev-cpp/sparsehash ) googledrive? ( dev-cpp/sparsehash ) pulseaudio? ( media-sound/pulseaudio ) seafile? ( dev-cpp/sparsehash ) skydrive? ( dev-cpp/sparsehash ) test? ( dev-qt/qttest:4 gnome-base/gsettings-desktop-schemas ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=dev-db/sqlite:= dev-libs/crypto++ dev-libs/glib:2 dev-libs/libxml2 dev-libs/protobuf:= dev-libs/qjson dev-qt/qtcore:4[ssl] dev-qt/qtgui:4 dev-qt/qtopengl:4 dev-qt/qtsql:4 media-libs/chromaprint:= media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/libmygpo-qt-1.0.9[qt4(+)] media-libs/taglib[mp4(+)] sys-libs/zlib virtual/glu virtual/opengl x11-libs/libX11 cdda? ( dev-libs/libcdio:= ) dbus? ( dev-qt/qtdbus:4 ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1[qt4(+)] ) moodbar? ( sci-libs/fftw:3.0 ) mtp? ( >=media-libs/libmtp-1.0.0 ) projectm? ( media-libs/glew:= >=media-libs/libprojectm-1.2.0 ) || ( >=dev-cpp/gtest-1.8.0 dev-cpp/gmock ) dev-libs/boost sys-devel/gettext virtual/pkgconfig box? ( dev-cpp/sparsehash ) dropbox? ( dev-cpp/sparsehash ) googledrive? ( dev-cpp/sparsehash ) pulseaudio? ( media-sound/pulseaudio ) seafile? ( dev-cpp/sparsehash ) skydrive? ( dev-cpp/sparsehash ) test? ( dev-qt/qttest:4 gnome-base/gsettings-desktop-schemas ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Modern music player and library organizer based on Amarok 1.4 and Qt
 EAPI=6
 HOMEPAGE=https://www.clementine-player.org https://github.com/clementine-player/Clementine
 IUSE=box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio seafile skydrive test +udisks wiimote linguas_af linguas_ar linguas_be linguas_bg linguas_bn linguas_br linguas_bs linguas_ca linguas_cs linguas_cy linguas_da linguas_de linguas_el linguas_en linguas_en_CA linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fr linguas_ga linguas_gl linguas_he linguas_he_IL linguas_hi linguas_hr linguas_hu linguas_hy linguas_ia linguas_id linguas_is linguas_it linguas_ja linguas_ka linguas_kk linguas_ko linguas_lt linguas_lv linguas_mk_MK linguas_mr linguas_ms linguas_my linguas_nb linguas_nl linguas_oc linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_si_LK linguas_sk linguas_sl linguas_sr linguas_sr@latin linguas_sv linguas_te linguas_tr linguas_tr_TR linguas_uk linguas_uz linguas_vi linguas_zh_CN linguas_zh_TW test
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=dev-db/sqlite:= dev-libs/crypto++ dev-libs/glib:2 dev-libs/libxml2 dev-libs/protobuf:= dev-libs/qjson dev-qt/qtcore:4[ssl] dev-qt/qtgui:4 dev-qt/qtopengl:4 dev-qt/qtsql:4 media-libs/chromaprint:= media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/libmygpo-qt-1.0.9[qt4(+)] media-libs/taglib[mp4(+)] sys-libs/zlib virtual/glu virtual/opengl x11-libs/libX11 cdda? ( dev-libs/libcdio ) dbus? ( dev-qt/qtdbus:4 ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1[qt4(+)] ) moodbar? ( sci-libs/fftw:3.0 ) mtp? ( >=media-libs/libmtp-1.0.0 ) projectm? ( media-libs/glew:= >=media-libs/libprojectm-1.2.0 ) media-plugins/gst-plugins-meta:1.0 media-plugins/gst-plugins-soup:1.0 media-plugins/gst-plugins-taglib:1.0 mms? ( media-plugins/gst-plugins-libmms:1.0 ) mtp? ( gnome-base/gvfs[mtp] ) udisks? ( sys-fs/udisks:2 )
+RDEPEND=dev-db/sqlite:= dev-libs/crypto++ dev-libs/glib:2 dev-libs/libxml2 dev-libs/protobuf:= dev-libs/qjson dev-qt/qtcore:4[ssl] dev-qt/qtgui:4 dev-qt/qtopengl:4 dev-qt/qtsql:4 media-libs/chromaprint:= media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/libmygpo-qt-1.0.9[qt4(+)] media-libs/taglib[mp4(+)] sys-libs/zlib virtual/glu virtual/opengl x11-libs/libX11 cdda? ( dev-libs/libcdio:= ) dbus? ( dev-qt/qtdbus:4 ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1[qt4(+)] ) moodbar? ( sci-libs/fftw:3.0 ) mtp? ( >=media-libs/libmtp-1.0.0 ) projectm? ( media-libs/glew:= >=media-libs/libprojectm-1.2.0 ) media-plugins/gst-plugins-meta:1.0 media-plugins/gst-plugins-soup:1.0 media-plugins/gst-plugins-taglib:1.0 mms? ( media-plugins/gst-plugins-libmms:1.0 ) mtp? ( gnome-base/gvfs[mtp] ) udisks? ( sys-fs/udisks:2 )
 REQUIRED_USE=udisks? ( dbus ) wiimote? ( dbus )
 SLOT=0
 SRC_URI=https://github.com/clementine-player/Clementine/archive/83e860eabd9f4a864c553f110742027cdd01b76f.tar.gz -> clementine-1.3.1_p20171113.tar.gz
 _eclasses_=cmake-utils	77a5a8d3308359caadcdd91688f20093	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	l10n	2c2e15383ba891d642f51896a7f0ecfe	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e7e95df628bdf9632072267285fb33ce
+_md5_=fe365fe0b4533bd988a35b50baa0d725
diff --git a/metadata/md5-cache/media-sound/clementine-9999 b/metadata/md5-cache/media-sound/clementine-9999
index 3dec6d0df2c1..30de15a3ca40 100644
--- a/metadata/md5-cache/media-sound/clementine-9999
+++ b/metadata/md5-cache/media-sound/clementine-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=app-crypt/qca:2[qt5(+)] dev-db/sqlite:= dev-libs/crypto++ dev-libs/glib:2 dev-libs/libxml2 dev-libs/protobuf:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/chromaprint:= media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/libmygpo-qt-1.0.9[qt5] media-libs/taglib[mp4(+)] sys-libs/zlib virtual/glu virtual/opengl x11-libs/libX11 cdda? ( dev-libs/libcdio ) dbus? ( dev-qt/qtdbus:5 ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1[qt5] ) moodbar? ( sci-libs/fftw:3.0 ) mtp? ( >=media-libs/libmtp-1.0.0 ) projectm? ( media-libs/glew:= >=media-libs/libprojectm-1.2.0 ) || ( >=dev-cpp/gtest-1.8.0 dev-cpp/gmock ) dev-libs/boost:= dev-qt/linguist-tools:5 sys-devel/gettext virtual/pkgconfig box? ( dev-cpp/sparsehash ) dropbox? ( dev-cpp/sparsehash ) googledrive? ( dev-cpp/sparsehash ) pulseaudio? ( media-sound/pulseaudio ) seafile? ( dev-cpp/sparsehash ) skydrive? ( dev-cpp/sparsehash ) test? ( dev-qt/qttest:5 gnome-base/gsettings-desktop-schemas ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=dev-vcs/git-1.8.2.1
+DEPEND=app-crypt/qca:2[qt5(+)] dev-db/sqlite:= dev-libs/crypto++ dev-libs/glib:2 dev-libs/libxml2 dev-libs/protobuf:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/chromaprint:= media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/libmygpo-qt-1.0.9[qt5] media-libs/taglib[mp4(+)] sys-libs/zlib virtual/glu virtual/opengl x11-libs/libX11 cdda? ( dev-libs/libcdio:= ) dbus? ( dev-qt/qtdbus:5 ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1[qt5] ) moodbar? ( sci-libs/fftw:3.0 ) mtp? ( >=media-libs/libmtp-1.0.0 ) projectm? ( media-libs/glew:= >=media-libs/libprojectm-1.2.0 ) || ( >=dev-cpp/gtest-1.8.0 dev-cpp/gmock ) dev-libs/boost:= dev-qt/linguist-tools:5 sys-devel/gettext virtual/pkgconfig box? ( dev-cpp/sparsehash ) dropbox? ( dev-cpp/sparsehash ) googledrive? ( dev-cpp/sparsehash ) pulseaudio? ( media-sound/pulseaudio ) seafile? ( dev-cpp/sparsehash ) skydrive? ( dev-cpp/sparsehash ) test? ( dev-qt/qttest:5 gnome-base/gsettings-desktop-schemas ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Modern music player and library organizer based on Amarok 1.4 and Qt
 EAPI=6
 HOMEPAGE=https://www.clementine-player.org https://github.com/clementine-player/Clementine
 IUSE=box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio seafile skydrive test +udisks wiimote linguas_af linguas_ar linguas_be linguas_bg linguas_bn linguas_br linguas_bs linguas_ca linguas_cs linguas_cy linguas_da linguas_de linguas_el linguas_en linguas_en_CA linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fr linguas_ga linguas_gl linguas_he linguas_he_IL linguas_hi linguas_hr linguas_hu linguas_hy linguas_ia linguas_id linguas_is linguas_it linguas_ja linguas_ka linguas_kk linguas_ko linguas_lt linguas_lv linguas_mk_MK linguas_mr linguas_ms linguas_my linguas_nb linguas_nl linguas_oc linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_si_LK linguas_sk linguas_sl linguas_sr linguas_sr@latin linguas_sv linguas_te linguas_tr linguas_tr_TR linguas_uk linguas_uz linguas_vi linguas_zh_CN linguas_zh_TW test
 LICENSE=GPL-3
-RDEPEND=app-crypt/qca:2[qt5(+)] dev-db/sqlite:= dev-libs/crypto++ dev-libs/glib:2 dev-libs/libxml2 dev-libs/protobuf:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/chromaprint:= media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/libmygpo-qt-1.0.9[qt5] media-libs/taglib[mp4(+)] sys-libs/zlib virtual/glu virtual/opengl x11-libs/libX11 cdda? ( dev-libs/libcdio ) dbus? ( dev-qt/qtdbus:5 ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1[qt5] ) moodbar? ( sci-libs/fftw:3.0 ) mtp? ( >=media-libs/libmtp-1.0.0 ) projectm? ( media-libs/glew:= >=media-libs/libprojectm-1.2.0 ) media-plugins/gst-plugins-meta:1.0 media-plugins/gst-plugins-soup:1.0 media-plugins/gst-plugins-taglib:1.0 mms? ( media-plugins/gst-plugins-libmms:1.0 ) mtp? ( gnome-base/gvfs[mtp] ) udisks? ( sys-fs/udisks:2 )
+RDEPEND=app-crypt/qca:2[qt5(+)] dev-db/sqlite:= dev-libs/crypto++ dev-libs/glib:2 dev-libs/libxml2 dev-libs/protobuf:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/chromaprint:= media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/libmygpo-qt-1.0.9[qt5] media-libs/taglib[mp4(+)] sys-libs/zlib virtual/glu virtual/opengl x11-libs/libX11 cdda? ( dev-libs/libcdio:= ) dbus? ( dev-qt/qtdbus:5 ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1[qt5] ) moodbar? ( sci-libs/fftw:3.0 ) mtp? ( >=media-libs/libmtp-1.0.0 ) projectm? ( media-libs/glew:= >=media-libs/libprojectm-1.2.0 ) media-plugins/gst-plugins-meta:1.0 media-plugins/gst-plugins-soup:1.0 media-plugins/gst-plugins-taglib:1.0 mms? ( media-plugins/gst-plugins-libmms:1.0 ) mtp? ( gnome-base/gvfs[mtp] ) udisks? ( sys-fs/udisks:2 )
 REQUIRED_USE=udisks? ( dbus ) wiimote? ( dbus )
 SLOT=0
 _eclasses_=cmake-utils	77a5a8d3308359caadcdd91688f20093	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	gnome2-utils	4d211d7614f303710fca59db6ec12c88	l10n	2c2e15383ba891d642f51896a7f0ecfe	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0931627af7cdc724edae747607d67662
+_md5_=768c7213773b92c67aa062bab65fc21d
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index d4e94e979d00..e50450ef455e 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/bashnapi-1.1.5 b/metadata/md5-cache/media-video/bashnapi-1.1.5
deleted file mode 100644
index 9661378023ca..000000000000
--- a/metadata/md5-cache/media-video/bashnapi-1.1.5
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=Napiprojekt.pl subtitle downloader in bash
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/bashnapi/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=mirror://sourceforge/bashnapi/napi_v1.1.5_subotage_0.15.tgz
-_md5_=0ba73f738ce4cd422689f1adac4fcee7
diff --git a/metadata/md5-cache/net-firewall/Manifest.gz b/metadata/md5-cache/net-firewall/Manifest.gz
index b46ae3b0fbe6..4cf0360df950 100644
--- a/metadata/md5-cache/net-firewall/Manifest.gz
+++ b/metadata/md5-cache/net-firewall/Manifest.gz
diff --git a/metadata/md5-cache/net-firewall/shorewall-5.1.10.2 b/metadata/md5-cache/net-firewall/shorewall-5.1.10.2
new file mode 100644
index 000000000000..5eaa44615557
--- /dev/null
+++ b/metadata/md5-cache/net-firewall/shorewall-5.1.10.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup
+DEPEND=virtual/pkgconfig
+DESCRIPTION=A high-level tool for configuring Netfilter
+EAPI=6
+HOMEPAGE=http://www.shorewall.net/
+IUSE=doc +init +ipv4 ipv6 lite4 lite6 selinux
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=net-firewall/iptables-1.4.20 >=sys-apps/iproute2-3.8.0[-minimal] >=sys-devel/bc-1.06.95 ipv4? ( >=dev-lang/perl-5.16 virtual/perl-Digest-SHA ) ipv6? ( >=dev-perl/Socket6-0.230.0 >=net-firewall/iptables-1.4.20[ipv6] >=sys-apps/iproute2-3.8.0[ipv6] ) lite6? ( >=net-firewall/iptables-1.4.20[ipv6] >=sys-apps/iproute2-3.8.0[ipv6] ) init? ( >=sys-apps/coreutils-8.20 ) selinux? ( >=sec-policy/selinux-shorewall-2.20161023-r3 ) !net-firewall/shorewall-core !net-firewall/shorewall6 !net-firewall/shorewall-lite !net-firewall/shorewall6-lite !net-firewall/shorewall-init !<sys-apps/systemd-214
+REQUIRED_USE=ipv6? ( ipv4 ) || ( ipv4 lite4 lite6 )
+SLOT=0
+SRC_URI=http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.10/shorewall-core-5.1.10.2.tar.bz2 ipv4? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.10/shorewall-5.1.10.2.tar.bz2 ) ipv6? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.10/shorewall6-5.1.10.2.tar.bz2 ) lite4? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.10/shorewall-lite-5.1.10.2.tar.bz2 ) lite6? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.10/shorewall6-lite-5.1.10.2.tar.bz2 ) init? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.10/shorewall-init-5.1.10.2.tar.bz2 ) doc? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.10/shorewall-docs-html-5.1.10.2.tar.bz2 )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=78d136dbac63d7a466ab6ecba44216d0
diff --git a/metadata/md5-cache/net-ftp/Manifest.gz b/metadata/md5-cache/net-ftp/Manifest.gz
index fe8b4820981c..c89e65c6d62d 100644
--- a/metadata/md5-cache/net-ftp/Manifest.gz
+++ b/metadata/md5-cache/net-ftp/Manifest.gz
diff --git a/metadata/md5-cache/net-ftp/filezilla-3.25.2 b/metadata/md5-cache/net-ftp/filezilla-3.25.2
index 6545d2c507c6..74938465053c 100644
--- a/metadata/md5-cache/net-ftp/filezilla-3.25.2
+++ b/metadata/md5-cache/net-ftp/filezilla-3.25.2
@@ -1,5 +1,5 @@
-DEFINED_PHASES=configure prepare pretend
-DEPEND=>=app-eselect/eselect-wxwidgets-0.7-r1 >=dev-libs/nettle-3.1:= >=dev-db/sqlite-3.7 >=dev-libs/libfilezilla-0.9.1 >=dev-libs/pugixml-1.7 net-dns/libidn >=net-libs/gnutls-3.4.0 >=x11-libs/wxGTK-3.0.2.0-r1:3.0[X] x11-misc/xdg-utils dbus? ( sys-apps/dbus ) virtual/pkgconfig >=sys-devel/libtool-1.4 nls? ( >=sys-devel/gettext-0.11 ) test? ( dev-util/cppunit ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure postinst postrm prepare pretend
+DEPEND=>=app-eselect/eselect-wxwidgets-0.7-r1 >=dev-libs/nettle-3.1:= >=dev-db/sqlite-3.7 >=dev-libs/libfilezilla-0.9.1 >=dev-libs/pugixml-1.7 net-dns/libidn >=net-libs/gnutls-3.4.0 >=x11-libs/wxGTK-3.0.2.0-r1:3.0[X] x11-misc/xdg-utils dbus? ( sys-apps/dbus ) virtual/pkgconfig >=sys-devel/libtool-1.4 nls? ( >=sys-devel/gettext-0.11 ) test? ( dev-util/cppunit ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
 DESCRIPTION=FTP client with lots of useful features and an intuitive interface
 EAPI=6
 HOMEPAGE=http://filezilla-project.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-eselect/eselect-wxwidgets-0.7-r1 >=dev-libs/nettle-3.1:= >=dev-db/sqlite-3.7 >=dev-libs/libfilezilla-0.9.1 >=dev-libs/pugixml-1.7 net-dns/libidn >=net-libs/gnutls-3.4.0 >=x11-libs/wxGTK-3.0.2.0-r1:3.0[X] x11-misc/xdg-utils dbus? ( sys-apps/dbus )
 SLOT=0
 SRC_URI=mirror://sourceforge/filezilla/FileZilla_3.25.2_src.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
-_md5_=ffdf52b3d47a5defc531a78a255ed22d
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=2a39ec9c4e0f7ce409a0cd1f81efd5cf
diff --git a/metadata/md5-cache/net-ftp/filezilla-3.25.2-r1 b/metadata/md5-cache/net-ftp/filezilla-3.25.2-r1
index c2d120e6f1b5..fc14fa5b8aaf 100644
--- a/metadata/md5-cache/net-ftp/filezilla-3.25.2-r1
+++ b/metadata/md5-cache/net-ftp/filezilla-3.25.2-r1
@@ -1,5 +1,5 @@
-DEFINED_PHASES=configure prepare pretend
-DEPEND=>=app-eselect/eselect-wxwidgets-0.7-r1 >=dev-libs/nettle-3.1:= >=dev-db/sqlite-3.7 >=dev-libs/libfilezilla-0.9.1 >=dev-libs/pugixml-1.7 net-dns/libidn >=net-libs/gnutls-3.4.0 >=x11-libs/wxGTK-3.0.2.0-r1:3.0-gtk3[X] x11-misc/xdg-utils dbus? ( sys-apps/dbus ) virtual/pkgconfig >=sys-devel/libtool-1.4 nls? ( >=sys-devel/gettext-0.11 ) test? ( dev-util/cppunit ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure postinst postrm prepare pretend
+DEPEND=>=app-eselect/eselect-wxwidgets-0.7-r1 >=dev-libs/nettle-3.1:= >=dev-db/sqlite-3.7 >=dev-libs/libfilezilla-0.9.1 >=dev-libs/pugixml-1.7 net-dns/libidn >=net-libs/gnutls-3.4.0 >=x11-libs/wxGTK-3.0.2.0-r1:3.0-gtk3[X] x11-misc/xdg-utils dbus? ( sys-apps/dbus ) virtual/pkgconfig >=sys-devel/libtool-1.4 nls? ( >=sys-devel/gettext-0.11 ) test? ( dev-util/cppunit ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
 DESCRIPTION=FTP client with lots of useful features and an intuitive interface
 EAPI=6
 HOMEPAGE=http://filezilla-project.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-eselect/eselect-wxwidgets-0.7-r1 >=dev-libs/nettle-3.1:= >=dev-db/sqlite-3.7 >=dev-libs/libfilezilla-0.9.1 >=dev-libs/pugixml-1.7 net-dns/libidn >=net-libs/gnutls-3.4.0 >=x11-libs/wxGTK-3.0.2.0-r1:3.0-gtk3[X] x11-misc/xdg-utils dbus? ( sys-apps/dbus )
 SLOT=0
 SRC_URI=mirror://sourceforge/filezilla/FileZilla_3.25.2_src.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
-_md5_=89a0984bc939fe29a26914d277677fa8
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=69bae61adb1d4439ed40b7e0679a125e
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 5857b00db7d9..2874e1eadc2f 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/coturn-4.5.0.4-r1 b/metadata/md5-cache/net-im/coturn-4.5.0.4-r1
index 3bf940c6460f..aa20b323f1a0 100644
--- a/metadata/md5-cache/net-im/coturn-4.5.0.4-r1
+++ b/metadata/md5-cache/net-im/coturn-4.5.0.4-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/libevent[ssl] dev-libs/openssl:* mongodb? ( dev-libs/mongo-c-driver ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:* ) redis? ( dev-libs/hiredis ) sqlite? ( dev-db/sqlite ) virtual/tmpfiles
 SLOT=0
 SRC_URI=https://github.com/coturn/coturn/archive/4.5.0.4.tar.gz -> coturn-4.5.0.4.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	tmpfiles	8b4d2e2e77723f4b289896f699954fe9	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	tmpfiles	7bd1d7bf5261430a2d2991cff7958c52	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=bdf236bcced3fc2b5383cf095b869c4b
diff --git a/metadata/md5-cache/net-im/coturn-4.5.0.6 b/metadata/md5-cache/net-im/coturn-4.5.0.6
index 52e7b759136e..3bae574ee2c3 100644
--- a/metadata/md5-cache/net-im/coturn-4.5.0.6
+++ b/metadata/md5-cache/net-im/coturn-4.5.0.6
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/libevent[ssl] dev-libs/openssl:* mongodb? ( dev-libs/mongo-c-driver ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:* ) redis? ( dev-libs/hiredis ) sqlite? ( dev-db/sqlite ) virtual/tmpfiles
 SLOT=0
 SRC_URI=https://github.com/coturn/coturn/archive/4.5.0.6.tar.gz -> coturn-4.5.0.6.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	tmpfiles	8b4d2e2e77723f4b289896f699954fe9	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	tmpfiles	7bd1d7bf5261430a2d2991cff7958c52	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=bdf236bcced3fc2b5383cf095b869c4b
diff --git a/metadata/md5-cache/net-im/coturn-9999 b/metadata/md5-cache/net-im/coturn-9999
index cc07d47169df..51ca6dabe6d3 100644
--- a/metadata/md5-cache/net-im/coturn-9999
+++ b/metadata/md5-cache/net-im/coturn-9999
@@ -7,5 +7,5 @@ IUSE=mongodb mysql postgres redis sqlite
 LICENSE=BSD
 RDEPEND=dev-libs/libevent[ssl] dev-libs/openssl:* mongodb? ( dev-libs/mongo-c-driver ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:* ) redis? ( dev-libs/hiredis ) sqlite? ( dev-db/sqlite ) virtual/tmpfiles
 SLOT=0
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	tmpfiles	8b4d2e2e77723f4b289896f699954fe9	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	tmpfiles	7bd1d7bf5261430a2d2991cff7958c52	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=bdf236bcced3fc2b5383cf095b869c4b
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index f80cf024ce30..f29d3a765c43 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/libssh-9999 b/metadata/md5-cache/net-libs/libssh-9999
index 209db4d3243d..f1bc609b53e5 100644
--- a/metadata/md5-cache/net-libs/libssh-9999
+++ b/metadata/md5-cache/net-libs/libssh-9999
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=!gcrypt? ( !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(-)?] ) ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3: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(-)?] ) gssapi? ( >=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(-)?] ) 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(-)?] ) doc? ( app-doc/doxygen ) test? ( >=dev-util/cmocka-0.3.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(-)?] ) sys-devel/make >=dev-util/cmake-3.7.2 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Access a working SSH implementation by means of a library
 EAPI=6
-HOMEPAGE=http://www.libssh.org/
+HOMEPAGE=https://www.libssh.org/
 IUSE=debug doc examples gcrypt gssapi libressl pcap server +sftp ssh1 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
 LICENSE=LGPL-2.1
 RDEPEND=!gcrypt? ( !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(-)?] ) ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3: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(-)?] ) gssapi? ( >=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(-)?] ) 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
 _eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	77a5a8d3308359caadcdd91688f20093	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=65a337ed37937622f7362298fa3c67dd
+_md5_=b6c8b4bdb769e3f444c0b07204e2880b
diff --git a/metadata/md5-cache/net-libs/libssh2-1.8.0 b/metadata/md5-cache/net-libs/libssh2-1.8.0
deleted file mode 100644
index ec416a018b36..000000000000
--- a/metadata/md5-cache/net-libs/libssh2-1.8.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!gcrypt? ( !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(-)?] ) ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3: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(-)?] ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Library implementing the SSH2 protocol
-EAPI=5
-HOMEPAGE=http://www.libssh2.org/
-IUSE=gcrypt libressl 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 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
-LICENSE=BSD
-RDEPEND=!gcrypt? ( !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(-)?] ) ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3: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.libssh2.org/download/libssh2-1.8.0.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-multilib	f4848d9634439c7203cb7dd3b9650fff	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=84cf20aef65cf6daf48c88b5ff99d771
diff --git a/metadata/md5-cache/net-libs/miniupnpc-2.0.20171102 b/metadata/md5-cache/net-libs/miniupnpc-2.0.20171102
deleted file mode 100644
index 6f1e16dc86f3..000000000000
--- a/metadata/md5-cache/net-libs/miniupnpc-2.0.20171102
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=kernel_linux? ( sys-apps/lsb-release sys-apps/which )
-DESCRIPTION=UPnP client library and a simple UPnP client
-EAPI=6
-HOMEPAGE=http://miniupnp.free.fr/
-IUSE=ipv6 kernel_linux static-libs
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
-LICENSE=BSD
-SLOT=0/16
-SRC_URI=http://miniupnp.free.fr/files/miniupnpc-2.0.20171102.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=7329d6be3e1050bc4e1d9d806d78de03
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 6f1e30822571..ec52309fdcc7 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/aria2-1.31.0 b/metadata/md5-cache/net-misc/aria2-1.31.0
deleted file mode 100644
index 105e1f58ac13..000000000000
--- a/metadata/md5-cache/net-misc/aria2-1.31.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=sys-libs/zlib:0= ssl? ( app-misc/ca-certificates gnutls? ( >=net-libs/gnutls-1.2.9:0= ) !gnutls? ( dev-libs/openssl:0= ) ) adns? ( >=net-dns/c-ares-1.5.0:0= ) bittorrent? ( ssl? ( gnutls? ( nettle? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-5:0= ) !nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) ) !ssl? ( nettle? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-5:0= ) !nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) ) jemalloc? ( dev-libs/jemalloc ) libuv? ( dev-libs/libuv:0= ) metalink? ( libxml2? ( >=dev-libs/libxml2-2.6.26:2= ) !libxml2? ( dev-libs/expat:0= ) ) sqlite? ( dev-db/sqlite:3= ) ssh? ( net-libs/libssh2:= ) tcmalloc? ( dev-util/google-perftools ) xmlrpc? ( libxml2? ( >=dev-libs/libxml2-2.6.26:2= ) !libxml2? ( dev-libs/expat:0= ) ) app-arch/xz-utils virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( >=dev-util/cppunit-1.12.0:0 )
-DESCRIPTION=A download utility with segmented downloading with BitTorrent support
-EAPI=6
-HOMEPAGE=https://aria2.github.io/
-IUSE=adns bittorrent +gnutls jemalloc libuv +libxml2 metalink +nettle nls sqlite scripts ssh ssl tcmalloc test xmlrpc
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=sys-libs/zlib:0= ssl? ( app-misc/ca-certificates gnutls? ( >=net-libs/gnutls-1.2.9:0= ) !gnutls? ( dev-libs/openssl:0= ) ) adns? ( >=net-dns/c-ares-1.5.0:0= ) bittorrent? ( ssl? ( gnutls? ( nettle? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-5:0= ) !nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) ) !ssl? ( nettle? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-5:0= ) !nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) ) jemalloc? ( dev-libs/jemalloc ) libuv? ( dev-libs/libuv:0= ) metalink? ( libxml2? ( >=dev-libs/libxml2-2.6.26:2= ) !libxml2? ( dev-libs/expat:0= ) ) sqlite? ( dev-db/sqlite:3= ) ssh? ( net-libs/libssh2:= ) tcmalloc? ( dev-util/google-perftools ) xmlrpc? ( libxml2? ( >=dev-libs/libxml2-2.6.26:2= ) !libxml2? ( dev-libs/expat:0= ) ) nls? ( virtual/libiconv virtual/libintl ) scripts? ( dev-lang/ruby )
-REQUIRED_USE=?? ( jemalloc tcmalloc ) metalink? ( xmlrpc )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aria2/aria2/releases/download/release-1.31.0/aria2-1.31.0.tar.xz
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=bf41fc3638bd4652d01b5996728675dc
diff --git a/metadata/md5-cache/net-misc/aria2-1.32.0 b/metadata/md5-cache/net-misc/aria2-1.32.0
deleted file mode 100644
index b5ea111717bc..000000000000
--- a/metadata/md5-cache/net-misc/aria2-1.32.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=sys-libs/zlib:0= ssl? ( app-misc/ca-certificates gnutls? ( >=net-libs/gnutls-1.2.9:0= ) !gnutls? ( dev-libs/openssl:0= ) ) adns? ( >=net-dns/c-ares-1.5.0:0= ) bittorrent? ( ssl? ( gnutls? ( nettle? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-6:0= ) !nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) ) !ssl? ( nettle? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-6:0= ) !nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) ) jemalloc? ( dev-libs/jemalloc ) libuv? ( dev-libs/libuv:0= ) metalink? ( libxml2? ( >=dev-libs/libxml2-2.6.26:2= ) !libxml2? ( dev-libs/expat:0= ) ) sqlite? ( dev-db/sqlite:3= ) ssh? ( net-libs/libssh2:= ) tcmalloc? ( dev-util/google-perftools ) xmlrpc? ( libxml2? ( >=dev-libs/libxml2-2.6.26:2= ) !libxml2? ( dev-libs/expat:0= ) ) app-arch/xz-utils virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( >=dev-util/cppunit-1.12.0:0 )
-DESCRIPTION=A download utility with segmented downloading with BitTorrent support
-EAPI=6
-HOMEPAGE=https://aria2.github.io/
-IUSE=adns bittorrent +gnutls jemalloc libuv +libxml2 metalink +nettle nls sqlite scripts ssh ssl tcmalloc test xmlrpc
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=sys-libs/zlib:0= ssl? ( app-misc/ca-certificates gnutls? ( >=net-libs/gnutls-1.2.9:0= ) !gnutls? ( dev-libs/openssl:0= ) ) adns? ( >=net-dns/c-ares-1.5.0:0= ) bittorrent? ( ssl? ( gnutls? ( nettle? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-6:0= ) !nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) ) !ssl? ( nettle? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-6:0= ) !nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) ) jemalloc? ( dev-libs/jemalloc ) libuv? ( dev-libs/libuv:0= ) metalink? ( libxml2? ( >=dev-libs/libxml2-2.6.26:2= ) !libxml2? ( dev-libs/expat:0= ) ) sqlite? ( dev-db/sqlite:3= ) ssh? ( net-libs/libssh2:= ) tcmalloc? ( dev-util/google-perftools ) xmlrpc? ( libxml2? ( >=dev-libs/libxml2-2.6.26:2= ) !libxml2? ( dev-libs/expat:0= ) ) nls? ( virtual/libiconv virtual/libintl ) scripts? ( dev-lang/ruby )
-REQUIRED_USE=?? ( jemalloc tcmalloc ) metalink? ( xmlrpc )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aria2/aria2/releases/download/release-1.32.0/aria2-1.32.0.tar.xz
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=5a50a7048c5b74dd4ae6f72bc1eba7b4
diff --git a/metadata/md5-cache/net-misc/aria2-1.33.0 b/metadata/md5-cache/net-misc/aria2-1.33.0
deleted file mode 100644
index b7aeda452dab..000000000000
--- a/metadata/md5-cache/net-misc/aria2-1.33.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=sys-libs/zlib:0= ssl? ( app-misc/ca-certificates gnutls? ( >=net-libs/gnutls-1.2.9:0= ) !gnutls? ( dev-libs/openssl:0= ) ) adns? ( >=net-dns/c-ares-1.5.0:0= ) bittorrent? ( ssl? ( gnutls? ( nettle? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-6:0= ) !nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) ) !ssl? ( nettle? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-6:0= ) !nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) ) jemalloc? ( dev-libs/jemalloc ) libuv? ( dev-libs/libuv:0= ) metalink? ( libxml2? ( >=dev-libs/libxml2-2.6.26:2= ) !libxml2? ( dev-libs/expat:0= ) ) sqlite? ( dev-db/sqlite:3= ) ssh? ( net-libs/libssh2:= ) tcmalloc? ( dev-util/google-perftools ) xmlrpc? ( libxml2? ( >=dev-libs/libxml2-2.6.26:2= ) !libxml2? ( dev-libs/expat:0= ) ) app-arch/xz-utils virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( >=dev-util/cppunit-1.12.0:0 )
-DESCRIPTION=A download utility with segmented downloading with BitTorrent support
-EAPI=6
-HOMEPAGE=https://aria2.github.io/
-IUSE=adns bittorrent +gnutls jemalloc libuv +libxml2 metalink +nettle nls sqlite scripts ssh ssl tcmalloc test xmlrpc
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=sys-libs/zlib:0= ssl? ( app-misc/ca-certificates gnutls? ( >=net-libs/gnutls-1.2.9:0= ) !gnutls? ( dev-libs/openssl:0= ) ) adns? ( >=net-dns/c-ares-1.5.0:0= ) bittorrent? ( ssl? ( gnutls? ( nettle? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-6:0= ) !nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) ) !ssl? ( nettle? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-6:0= ) !nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) ) jemalloc? ( dev-libs/jemalloc ) libuv? ( dev-libs/libuv:0= ) metalink? ( libxml2? ( >=dev-libs/libxml2-2.6.26:2= ) !libxml2? ( dev-libs/expat:0= ) ) sqlite? ( dev-db/sqlite:3= ) ssh? ( net-libs/libssh2:= ) tcmalloc? ( dev-util/google-perftools ) xmlrpc? ( libxml2? ( >=dev-libs/libxml2-2.6.26:2= ) !libxml2? ( dev-libs/expat:0= ) ) nls? ( virtual/libiconv virtual/libintl ) scripts? ( dev-lang/ruby )
-REQUIRED_USE=?? ( jemalloc tcmalloc ) metalink? ( xmlrpc )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aria2/aria2/releases/download/release-1.33.0/aria2-1.33.0.tar.xz
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=5a50a7048c5b74dd4ae6f72bc1eba7b4
diff --git a/metadata/md5-cache/net-misc/autoupnp-0.4.6 b/metadata/md5-cache/net-misc/autoupnp-0.4.6
deleted file mode 100644
index 5a52b5dbbcc3..000000000000
--- a/metadata/md5-cache/net-misc/autoupnp-0.4.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=net-libs/miniupnpc libnotify? ( x11-libs/libtinynotify ) >=app-portage/elt-patches-20170422
-DESCRIPTION=Automatic open port forwarder using UPnP
-EAPI=4
-HOMEPAGE=https://bitbucket.org/mgorny/autoupnp/
-IUSE=libnotify
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=net-libs/miniupnpc libnotify? ( x11-libs/libtinynotify )
-SLOT=0
-SRC_URI=https://www.bitbucket.org/mgorny/autoupnp/autoupnp-0.4.6.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=2914624e72a013f2ded4df8f746f2b3e
diff --git a/metadata/md5-cache/net-misc/babeld-1.8.0 b/metadata/md5-cache/net-misc/babeld-1.8.0
new file mode 100644
index 000000000000..240785647e81
--- /dev/null
+++ b/metadata/md5-cache/net-misc/babeld-1.8.0
@@ -0,0 +1,9 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=a loop-free distance-vector routing protocol
+EAPI=6
+HOMEPAGE=http://www.pps.jussieu.fr/~jch/software/babel/
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+SLOT=0
+SRC_URI=http://www.pps.jussieu.fr/~jch/software/files/babeld-1.8.0.tar.gz
+_md5_=180c47249ffe732ec9cf91e393547f27
diff --git a/metadata/md5-cache/net-misc/chrome-remote-desktop-56.0.2924.51 b/metadata/md5-cache/net-misc/chrome-remote-desktop-56.0.2924.51
deleted file mode 100644
index 5ae02e08b164..000000000000
--- a/metadata/md5-cache/net-misc/chrome-remote-desktop-56.0.2924.51
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare setup unpack
-DESCRIPTION=access remote computers via Chrome!
-EAPI=5
-HOMEPAGE=https://support.google.com/chrome/answer/1649523 https://chrome.google.com/remotedesktop
-IUSE=python_targets_python2_7
-KEYWORDS=-* ~amd64
-LICENSE=google-chrome
-RDEPEND=app-admin/sudo 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-libs/expat-2 dev-libs/glib:2 dev-libs/nspr dev-libs/nss dev-python/psutil gnome-base/gconf:2 media-libs/fontconfig media-libs/freetype:2 sys-devel/gcc sys-libs/glibc sys-libs/pam x11-libs/cairo x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXtst x11-libs/pango x11-base/xorg-server[xvfb]
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=amd64? ( https://dl.google.com/linux/chrome-remote-desktop/deb/pool/main/c/chrome-remote-desktop/chrome-remote-desktop_56.0.2924.51_amd64.deb )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=a3901a9e8eefa8d81185535d8786450d
diff --git a/metadata/md5-cache/net-misc/chrome-remote-desktop-57.0.2987.37 b/metadata/md5-cache/net-misc/chrome-remote-desktop-57.0.2987.37
index 7dca146b3631..89ca9d2094ba 100644
--- a/metadata/md5-cache/net-misc/chrome-remote-desktop-57.0.2987.37
+++ b/metadata/md5-cache/net-misc/chrome-remote-desktop-57.0.2987.37
@@ -3,11 +3,11 @@ DESCRIPTION=access remote computers via Chrome!
 EAPI=5
 HOMEPAGE=https://support.google.com/chrome/answer/1649523 https://chrome.google.com/remotedesktop
 IUSE=l10n_am l10n_ar l10n_bg l10n_bn l10n_ca l10n_cs l10n_da l10n_de l10n_el l10n_en-GB l10n_en l10n_es-419 l10n_es l10n_et l10n_fa l10n_fil l10n_fi 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 python_targets_python2_7 linguas_am
-KEYWORDS=-* ~amd64
+KEYWORDS=-* amd64
 LICENSE=google-chrome
 RDEPEND=app-admin/sudo 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-libs/expat-2 dev-libs/glib:2 dev-libs/nspr dev-libs/nss dev-python/psutil gnome-base/gconf:2 media-libs/fontconfig media-libs/freetype:2 sys-devel/gcc sys-libs/glibc sys-libs/pam x11-libs/cairo x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXtst x11-libs/pango x11-base/xorg-server[xvfb]
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=amd64? ( https://dl.google.com/linux/chrome-remote-desktop/deb/pool/main/c/chrome-remote-desktop/chrome-remote-desktop_57.0.2987.37_amd64.deb )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	l10n	2c2e15383ba891d642f51896a7f0ecfe	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=986d43d98d12c266385edea255c196db
+_md5_=7638babe1f7c06156b498423f976ad12
diff --git a/metadata/md5-cache/net-misc/gerbera-1.1.0-r1 b/metadata/md5-cache/net-misc/gerbera-1.1.0-r1
index a495f4caa150..f47663634b26 100644
--- a/metadata/md5-cache/net-misc/gerbera-1.1.0-r1
+++ b/metadata/md5-cache/net-misc/gerbera-1.1.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!!net-misc/mediatomb <=net-libs/libupnp-1.8.2:1.8[ipv6,reuseaddr] >=dev-db/sqlite-3 dev-libs/expat mysql? ( virtual/mysql ) javascript? ( dev-lang/duktape ) taglib? ( >=media-libs/taglib-1.11 ) lastfm? ( >=media-libs/lastfmlib-0.4 ) exif? ( media-libs/libexif ) ffmpeg? ( libav? ( >=media-video/libav-10:0= ) !libav? ( >=media-video/ffmpeg-2.2:0= ) ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) curl? ( net-misc/curl net-misc/youtube-dl ) magic? ( sys-apps/file ) sys-apps/util-linux sys-libs/zlib virtual/libiconv virtual/tmpfiles
 SLOT=0
 SRC_URI=https://github.com/gerbera/gerbera/archive/v1.1.0.tar.gz -> gerbera-1.1.0.tar.gz
-_eclasses_=cmake-utils	77a5a8d3308359caadcdd91688f20093	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	systemd	8f5286f89e265842f5b5189666eae88b	tmpfiles	8b4d2e2e77723f4b289896f699954fe9	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	77a5a8d3308359caadcdd91688f20093	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	systemd	8f5286f89e265842f5b5189666eae88b	tmpfiles	7bd1d7bf5261430a2d2991cff7958c52	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b873d90595d5b0eb4dc2393b675e74c4
diff --git a/metadata/md5-cache/net-misc/gerbera-9999 b/metadata/md5-cache/net-misc/gerbera-9999
index 617bbdcd1356..7dc73195fc6f 100644
--- a/metadata/md5-cache/net-misc/gerbera-9999
+++ b/metadata/md5-cache/net-misc/gerbera-9999
@@ -7,5 +7,5 @@ IUSE=curl debug +exif +ffmpeg ffmpegthumbnailer +javascript lastfm libav +magic
 LICENSE=GPL-2
 RDEPEND=!!net-misc/mediatomb net-libs/libupnp:1.8[ipv6,reuseaddr] >=dev-db/sqlite-3 dev-libs/expat mysql? ( virtual/mysql ) javascript? ( dev-lang/duktape ) taglib? ( >=media-libs/taglib-1.11 ) lastfm? ( >=media-libs/lastfmlib-0.4 ) exif? ( media-libs/libexif ) ffmpeg? ( libav? ( >=media-video/libav-10:0= ) !libav? ( >=media-video/ffmpeg-2.2:0= ) ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) curl? ( net-misc/curl net-misc/youtube-dl ) magic? ( sys-apps/file ) sys-apps/util-linux sys-libs/zlib virtual/libiconv virtual/tmpfiles
 SLOT=0
-_eclasses_=cmake-utils	77a5a8d3308359caadcdd91688f20093	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	systemd	8f5286f89e265842f5b5189666eae88b	tmpfiles	8b4d2e2e77723f4b289896f699954fe9	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	77a5a8d3308359caadcdd91688f20093	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	systemd	8f5286f89e265842f5b5189666eae88b	tmpfiles	7bd1d7bf5261430a2d2991cff7958c52	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=4e2faa3d26ee615e6a1fe752f8a76057
diff --git a/metadata/md5-cache/net-misc/gsutil-4.28 b/metadata/md5-cache/net-misc/gsutil-4.28
new file mode 100644
index 000000000000..830dde7bd18c
--- /dev/null
+++ b/metadata/md5-cache/net-misc/gsutil-4.28
@@ -0,0 +1,14 @@
+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(-)] >=dev-python/argcomplete-1.8.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/boto-2.48.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/crcmod-1.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/httplib2-0.10.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyopenssl-0.13[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/gcs-oauth2-boto-plugin-1.14[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/google-apitools-0.5.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =dev-python/oauth2client-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-gflags-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/retry-decorator-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/PySocks-1.01[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] 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=command line tool for interacting with cloud storage services
+EAPI=5
+HOMEPAGE=https://github.com/GoogleCloudPlatform/gsutil
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=Apache-2.0
+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(-)] >=dev-python/argcomplete-1.8.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/boto-2.48.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/crcmod-1.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/httplib2-0.10.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyopenssl-0.13[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/gcs-oauth2-boto-plugin-1.14[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/google-apitools-0.5.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =dev-python/oauth2client-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-gflags-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/retry-decorator-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/PySocks-1.01[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://commondatastorage.googleapis.com/pub/gsutil_4.28.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b1d3cd4e6e569adbcae2cb5af2358c6e
diff --git a/metadata/md5-cache/net-misc/icaclient-13.7.0.10276925 b/metadata/md5-cache/net-misc/icaclient-13.7.0.10276925
index 270e184c1a3c..477a33adf9a5 100644
--- a/metadata/md5-cache/net-misc/icaclient-13.7.0.10276925
+++ b/metadata/md5-cache/net-misc/icaclient-13.7.0.10276925
@@ -3,11 +3,11 @@ DESCRIPTION=ICA Client for Citrix Presentation servers
 EAPI=6
 HOMEPAGE=http://www.citrix.com/
 IUSE=gstreamer010 nsplugin linguas_de linguas_es linguas_fr linguas_ja linguas_zh_CN
-KEYWORDS=-* ~x86
+KEYWORDS=-* x86
 LICENSE=icaclient
 RDEPEND=dev-libs/atk dev-libs/glib:2 dev-libs/libxml2 media-fonts/font-adobe-100dpi media-fonts/font-misc-misc media-fonts/font-cursor-misc media-fonts/font-xfree86-type1 media-fonts/font-misc-ethiopic media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/gst-plugins-base:1.0 media-libs/gstreamer:1.0 media-libs/libcanberra[gtk] media-libs/libogg media-libs/libvorbis media-libs/speex net-dns/libidn net-libs/libsoup:2.4 net-libs/webkit-gtk:2 sys-libs/e2fsprogs-libs sys-libs/zlib virtual/krb5 x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXaw x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXmu x11-libs/libXrender x11-libs/libXt x11-libs/pango gstreamer010? ( media-libs/gst-plugins-base:0.10 media-libs/gstreamer:0.10 )
 RESTRICT=mirror strip userpriv fetch
 SLOT=0
 SRC_URI=x86? ( linuxx86-13.7.0.10276925.tar.gz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=c98562c6c6cce671b736b580ed603b2e
+_md5_=41ecd5236c6556aa0c4921e5b2205056
diff --git a/metadata/md5-cache/net-misc/icaclient-13.7.0.10276927 b/metadata/md5-cache/net-misc/icaclient-13.7.0.10276927
index 877802688859..c820641d75af 100644
--- a/metadata/md5-cache/net-misc/icaclient-13.7.0.10276927
+++ b/metadata/md5-cache/net-misc/icaclient-13.7.0.10276927
@@ -3,11 +3,11 @@ DESCRIPTION=ICA Client for Citrix Presentation servers
 EAPI=6
 HOMEPAGE=http://www.citrix.com/
 IUSE=gstreamer010 nsplugin linguas_de linguas_es linguas_fr linguas_ja linguas_zh_CN
-KEYWORDS=-* ~amd64
+KEYWORDS=-* amd64
 LICENSE=icaclient
 RDEPEND=dev-libs/atk dev-libs/glib:2 dev-libs/libxml2 media-fonts/font-adobe-100dpi media-fonts/font-misc-misc media-fonts/font-cursor-misc media-fonts/font-xfree86-type1 media-fonts/font-misc-ethiopic media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/gst-plugins-base:1.0 media-libs/gstreamer:1.0 media-libs/libcanberra[gtk] media-libs/libogg media-libs/libvorbis media-libs/speex net-dns/libidn net-libs/libsoup:2.4 net-libs/webkit-gtk:2 sys-libs/e2fsprogs-libs sys-libs/zlib virtual/krb5 x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXaw x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXmu x11-libs/libXrender x11-libs/libXt x11-libs/pango gstreamer010? ( media-libs/gst-plugins-base:0.10 media-libs/gstreamer:0.10 )
 RESTRICT=mirror strip userpriv fetch
 SLOT=0
 SRC_URI=amd64? ( linuxx64-13.7.0.10276927.tar.gz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=1f6922d7e3628aa5bcccd02a76df15b0
+_md5_=59d66217c4d9c4ee90ffe2c371643433
diff --git a/metadata/md5-cache/net-misc/icaclient-13.6.0.10243651 b/metadata/md5-cache/net-misc/icaclient-13.8.0.10299729
index bcb49989722c..e7d2338de0dd 100644
--- a/metadata/md5-cache/net-misc/icaclient-13.6.0.10243651
+++ b/metadata/md5-cache/net-misc/icaclient-13.8.0.10299729
@@ -2,12 +2,12 @@ DEFINED_PHASES=install nofetch preinst unpack
 DESCRIPTION=ICA Client for Citrix Presentation servers
 EAPI=6
 HOMEPAGE=http://www.citrix.com/
-IUSE=gstreamer010 nsplugin linguas_de linguas_es linguas_fr linguas_ja linguas_zh_CN
-KEYWORDS=-* amd64 x86
+IUSE=nsplugin linguas_de linguas_es linguas_fr linguas_ja linguas_zh_CN
+KEYWORDS=-* ~amd64 ~x86
 LICENSE=icaclient
-RDEPEND=dev-libs/atk dev-libs/glib:2 dev-libs/libxml2 media-fonts/font-adobe-100dpi media-fonts/font-misc-misc media-fonts/font-cursor-misc media-fonts/font-xfree86-type1 media-fonts/font-misc-ethiopic media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/gst-plugins-base:1.0 media-libs/gstreamer:1.0 media-libs/libcanberra[gtk] media-libs/libogg media-libs/libvorbis media-libs/speex net-dns/libidn net-libs/libsoup:2.4 net-libs/webkit-gtk:2 sys-libs/e2fsprogs-libs sys-libs/zlib virtual/krb5 x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXaw x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXmu x11-libs/libXrender x11-libs/libXt x11-libs/pango gstreamer010? ( media-libs/gst-plugins-base:0.10 media-libs/gstreamer:0.10 )
+RDEPEND=dev-libs/atk dev-libs/glib:2 dev-libs/libxml2 media-fonts/font-adobe-100dpi media-fonts/font-misc-misc media-fonts/font-cursor-misc media-fonts/font-xfree86-type1 media-fonts/font-misc-ethiopic media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/gst-plugins-base:1.0 media-libs/gstreamer:1.0 media-libs/libcanberra[gtk] media-libs/libogg media-libs/libvorbis media-libs/speex net-dns/libidn net-libs/libsoup:2.4 sys-libs/e2fsprogs-libs sys-libs/zlib virtual/krb5 x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXaw x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXmu x11-libs/libXrender x11-libs/libXt x11-libs/pango
 RESTRICT=mirror strip userpriv fetch
 SLOT=0
-SRC_URI=amd64? ( linuxx64-13.6.0.10243651.tar.gz ) x86? ( linuxx86-13.6.0.10243651.tar.gz )
+SRC_URI=amd64? ( linuxx64-13.8.0.10299729.tar.gz ) x86? ( linuxx86-13.8.0.10299729.tar.gz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=858e642d070e0f3e870ab4e4304f6745
+_md5_=5fb71391c4f7c5b1030ba374accca758
diff --git a/metadata/md5-cache/net-misc/iputils-20171016_pre b/metadata/md5-cache/net-misc/iputils-20171016_pre
index 40a706669e04..62d2ec0089c4 100644
--- a/metadata/md5-cache/net-misc/iputils-20171016_pre
+++ b/metadata/md5-cache/net-misc/iputils-20171016_pre
@@ -4,11 +4,11 @@ DESCRIPTION=Network monitoring tools including ping and ping6
 EAPI=6
 HOMEPAGE=https://wiki.linuxfoundation.org/networking/iputils
 IUSE=+arping caps clockdiff doc gcrypt idn ipv6 libressl nettle +openssl rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute +filecaps
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux
 LICENSE=BSD GPL-2+ rdisc
 RDEPEND=arping? ( !net-misc/arping ) rarpd? ( !net-misc/rarpd ) traceroute? ( !net-analyzer/traceroute ) !static? ( caps? ( sys-libs/libcap ) idn? ( net-dns/libidn ) ipv6? ( ssl? ( gcrypt? ( dev-libs/libgcrypt:0= ) nettle? ( dev-libs/nettle ) openssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) ) ) )
 REQUIRED_USE=ipv6? ( ssl? ( ^^ ( gcrypt nettle openssl ) ) )
 SLOT=0
 SRC_URI=https://github.com/iputils/iputils/archive/67e7d0daf1f231cc708217e6aec2f8d5ce7aeacf.tar.gz -> iputils-20171016_pre.tar.gz https://dev.gentoo.org/~whissi/dist/iputils/iputils-manpages-20171016_pre.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	fcaps	e80204189039ecc03f24151c518375f0	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=77dea011221d9845c8d380871081ec8c
+_md5_=e3c8eddbb9c0d7649512bf5942e0b6e2
diff --git a/metadata/md5-cache/net-misc/minissdpd-1.5.20160301 b/metadata/md5-cache/net-misc/minissdpd-1.5.20160301
deleted file mode 100644
index dc189111307c..000000000000
--- a/metadata/md5-cache/net-misc/minissdpd-1.5.20160301
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=net-libs/libnfnetlink
-DESCRIPTION=MiniSSDP Daemon
-EAPI=5
-HOMEPAGE=http://miniupnp.free.fr/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=net-libs/libnfnetlink || ( net-misc/miniupnpd net-libs/miniupnpc )
-SLOT=0
-SRC_URI=http://miniupnp.free.fr/files/minissdpd-1.5.20160301.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=2c48368339d07d5c7745f590d9d40256
diff --git a/metadata/md5-cache/net-misc/miniupnpd-2.0.20161216 b/metadata/md5-cache/net-misc/miniupnpd-2.0.20161216
deleted file mode 100644
index 15222f4b5e7f..000000000000
--- a/metadata/md5-cache/net-misc/miniupnpd-2.0.20161216
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=>=net-firewall/iptables-1.4.6:0=[ipv6?] net-libs/libnfnetlink:= net-libs/libmnl:= dev-libs/gmp:0= sys-apps/util-linux dev-libs/openssl:0= sys-apps/lsb-release
-DESCRIPTION=MiniUPnP IGD Daemon
-EAPI=6
-HOMEPAGE=http://miniupnp.free.fr/
-IUSE=+leasefile igd2 ipv6 pcp-peer portinuse strict
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD
-RDEPEND=>=net-firewall/iptables-1.4.6:0=[ipv6?] net-libs/libnfnetlink:= net-libs/libmnl:= dev-libs/gmp:0= sys-apps/util-linux dev-libs/openssl:0=
-SLOT=0
-SRC_URI=http://miniupnp.free.fr/files/miniupnpd-2.0.20161216.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=07370c603a77f395b2ca17143ab8801f
diff --git a/metadata/md5-cache/net-misc/npapi-sdk-0.27 b/metadata/md5-cache/net-misc/npapi-sdk-0.27
deleted file mode 100644
index 7a11bfdb3c54..000000000000
--- a/metadata/md5-cache/net-misc/npapi-sdk-0.27
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170422
-DESCRIPTION=NPAPI headers bundle
-EAPI=4
-HOMEPAGE=https://bitbucket.org/mgorny/npapi-sdk/
-KEYWORDS=alpha amd64 arm ~ia64 ppc ppc64 sparc x86 ~x86-fbsd
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://www.bitbucket.org/mgorny/npapi-sdk/downloads/npapi-sdk-0.27.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=1b68064f6671c250f0f8308f89e94b0f
diff --git a/metadata/md5-cache/net-misc/quagga-1.2.1 b/metadata/md5-cache/net-misc/quagga-1.2.1
index 49a371a99f06..5a3cd59e88ac 100644
--- a/metadata/md5-cache/net-misc/quagga-1.2.1
+++ b/metadata/md5-cache/net-misc/quagga-1.2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=caps? ( sys-libs/libcap ) nhrpd? ( net-dns/c-ares:0= ) protobuf? ( dev-libs/protobuf-c:0= ) readline? ( sys-libs/readline:0= pam? ( sys-libs/pam ) ) snmp? ( net-analyzer/net-snmp ) !elibc_glibc? ( dev-libs/libpcre ) sys-apps/iproute2 virtual/tmpfiles
 SLOT=0
 SRC_URI=mirror://nongnu/quagga/quagga-1.2.1.tar.gz bgpclassless? ( http://hasso.linux.ee/stuff/patches/quagga/ht-20040304-classless-bgp.patch )
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	8f5286f89e265842f5b5189666eae88b	tmpfiles	8b4d2e2e77723f4b289896f699954fe9	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	8f5286f89e265842f5b5189666eae88b	tmpfiles	7bd1d7bf5261430a2d2991cff7958c52	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=02aceb8b41e0bb258e05a04aa88bfe4f
diff --git a/metadata/md5-cache/net-misc/quagga-1.2.2 b/metadata/md5-cache/net-misc/quagga-1.2.2
index adf6f5dd8a52..8c587765fe0c 100644
--- a/metadata/md5-cache/net-misc/quagga-1.2.2
+++ b/metadata/md5-cache/net-misc/quagga-1.2.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=caps? ( sys-libs/libcap ) nhrpd? ( net-dns/c-ares:0= ) protobuf? ( dev-libs/protobuf-c:0= ) readline? ( sys-libs/readline:0= pam? ( sys-libs/pam ) ) snmp? ( net-analyzer/net-snmp ) !elibc_glibc? ( dev-libs/libpcre ) sys-apps/iproute2 virtual/tmpfiles
 SLOT=0
 SRC_URI=mirror://nongnu/quagga/quagga-1.2.2.tar.gz bgpclassless? ( http://hasso.linux.ee/stuff/patches/quagga/ht-20040304-classless-bgp.patch )
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	8f5286f89e265842f5b5189666eae88b	tmpfiles	8b4d2e2e77723f4b289896f699954fe9	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	8f5286f89e265842f5b5189666eae88b	tmpfiles	7bd1d7bf5261430a2d2991cff7958c52	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
 _md5_=d8fda51643d98ca3841ced22369711be
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2017.12.14 b/metadata/md5-cache/net-misc/youtube-dl-2017.12.31
index 7246ff9d4192..263c3494c48e 100644
--- a/metadata/md5-cache/net-misc/youtube-dl-2017.12.14
+++ b/metadata/md5-cache/net-misc/youtube-dl-2017.12.31
@@ -9,6 +9,6 @@ LICENSE=public-domain
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
-SRC_URI=http://youtube-dl.org/downloads/2017.12.14/youtube-dl-2017.12.14.tar.gz
+SRC_URI=http://youtube-dl.org/downloads/2017.12.31/youtube-dl-2017.12.31.tar.gz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=dc65130309857818b981580dd61fc4e3
+_md5_=9ede6c578c939c2592ea2933977a5399
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 6484b61436ac..f1bea6919a65 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/fftw-9999 b/metadata/md5-cache/sci-libs/fftw-9999
index 9250ac6c4484..1ba8a3fb7358 100644
--- a/metadata/md5-cache/sci-libs/fftw-9999
+++ b/metadata/md5-cache/sci-libs/fftw-9999
@@ -8,4 +8,4 @@ LICENSE=GPL-2+
 RDEPEND=mpi? ( virtual/mpi ) fortran? ( virtual/fortran )
 SLOT=3.0/3
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=91952a91bf46aeba4c8af67e4db734ec
+_md5_=beb32cf207a42263094411f066924aeb
diff --git a/metadata/md5-cache/sci-misc/Manifest.gz b/metadata/md5-cache/sci-misc/Manifest.gz
index 8b6f32e064ba..72a2e9f96508 100644
--- a/metadata/md5-cache/sci-misc/Manifest.gz
+++ b/metadata/md5-cache/sci-misc/Manifest.gz
diff --git a/metadata/md5-cache/sci-misc/nco-3.9.9 b/metadata/md5-cache/sci-misc/nco-3.9.9
deleted file mode 100644
index 227794b9939d..000000000000
--- a/metadata/md5-cache/sci-misc/nco-3.9.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install setup
-DEPEND=sci-libs/netcdf mpi? ( virtual/mpi ) udunits? ( >=sci-libs/udunits-2 ) ncap2? ( !mpi? ( dev-java/antlr:0 ) ) doc? ( virtual/latex-base )
-DESCRIPTION=Command line utilities for operating on netCDF files
-EAPI=2
-HOMEPAGE=http://nco.sourceforge.net/
-IUSE=doc mpi ncap2 udunits
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=sci-libs/netcdf mpi? ( virtual/mpi ) udunits? ( >=sci-libs/udunits-2 )
-SLOT=0
-SRC_URI=http://dust.ess.uci.edu/nco/src/nco-3.9.9.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=ba1f6db70e3414cd2391cb5ed0c4b668
diff --git a/metadata/md5-cache/sci-misc/nco-4.5.1-r2 b/metadata/md5-cache/sci-misc/nco-4.5.1-r2
index 0ba56d151d51..9894012b0c04 100644
--- a/metadata/md5-cache/sci-misc/nco-4.5.1-r2
+++ b/metadata/md5-cache/sci-misc/nco-4.5.1-r2
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=sci-libs/netcdf-4:=[dap=,tools] gsl? ( sci-libs/gsl:= ) ncap2? ( dev-cpp/antlr-cpp:2= ) udunits? ( >=sci-libs/udunits-2 ) test? ( >=sci-libs/netcdf-4[tools] ) >=app-portage/elt-patches-20170422
+DEFINED_PHASES=configure install pretend setup
+DEPEND=>=sci-libs/netcdf-4:=[dap=,hdf5?,tools] gsl? ( sci-libs/gsl:= ) ncap2? ( dev-cpp/antlr-cpp:2= ) udunits? ( >=sci-libs/udunits-2 ) test? ( >=sci-libs/netcdf-4[tools] )
 DESCRIPTION=Command line utilities for operating on netCDF files
-EAPI=5
+EAPI=6
 HOMEPAGE=http://nco.sourceforge.net/
-IUSE=dap doc gsl ncap2 openmp static-libs test udunits
+IUSE=dap gsl hdf5 ncap2 openmp static-libs test udunits
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
-RDEPEND=>=sci-libs/netcdf-4:=[dap=,tools] gsl? ( sci-libs/gsl:= ) ncap2? ( dev-cpp/antlr-cpp:2= ) udunits? ( >=sci-libs/udunits-2 )
+RDEPEND=>=sci-libs/netcdf-4:=[dap=,hdf5?,tools] gsl? ( sci-libs/gsl:= ) ncap2? ( dev-cpp/antlr-cpp:2= ) udunits? ( >=sci-libs/udunits-2 )
 SLOT=0/4.5.1
 SRC_URI=http://nco.sf.net/src/nco-4.5.1.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=9dfad93cabd3a403328c5746354cdb61
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=77d4d7066b37b66edab1b195c05f8950
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 2f290507f3b4..c285fea6e082 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/debianutils-4.8.4 b/metadata/md5-cache/sys-apps/debianutils-4.8.4
new file mode 100644
index 000000000000..0807038eed9e
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/debianutils-4.8.4
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure install
+DESCRIPTION=A selection of tools from Debian
+EAPI=6
+HOMEPAGE=https://packages.qa.debian.org/d/debianutils.html
+IUSE=+installkernel static
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux
+LICENSE=BSD GPL-2 SMAIL
+SLOT=0
+SRC_URI=mirror://debian/pool/main/d/debianutils/debianutils_4.8.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=b036eee385c3157f6205c7367cc587f7
diff --git a/metadata/md5-cache/sys-apps/less-529 b/metadata/md5-cache/sys-apps/less-529
index 40e3e987c0ee..6b4760829068 100644
--- a/metadata/md5-cache/sys-apps/less-529
+++ b/metadata/md5-cache/sys-apps/less-529
@@ -4,9 +4,9 @@ DESCRIPTION=Excellent text file viewer
 EAPI=6
 HOMEPAGE=http://www.greenwoodsoftware.com/less/
 IUSE=pcre unicode
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( GPL-3 BSD-2 )
 RDEPEND=>=app-misc/editor-wrapper-3 >=sys-libs/ncurses-5.2:0= pcre? ( dev-libs/libpcre )
 SLOT=0
 SRC_URI=http://www.greenwoodsoftware.com/less/less-529.tar.gz
-_md5_=166713ba356bc8fec1a17352d52eaf58
+_md5_=6fef73186355828c943a7bf6744230db
diff --git a/metadata/md5-cache/sys-apps/logwatch-7.4.3_p20171025 b/metadata/md5-cache/sys-apps/logwatch-7.4.3_p20171025
index 0654fa6e21c5..f883fa30c1e8 100644
--- a/metadata/md5-cache/sys-apps/logwatch-7.4.3_p20171025
+++ b/metadata/md5-cache/sys-apps/logwatch-7.4.3_p20171025
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=virtual/cron virtual/mta virtual/mailx dev-lang/perl dev-perl/Date-Calc dev-perl/Date-Manip dev-perl/Tie-IxHash dev-perl/Sys-CPU dev-perl/Sys-MemInfo virtual/tmpfiles
 SLOT=0
 SRC_URI=https://sourceforge.net/code-snapshots/git/l/lo/logwatch/git.git/logwatch-git-d36589f22a322a5ec4d77618b408803f4d193c2e.zip -> logwatch-7.4.3_p20171025.zip
-_eclasses_=tmpfiles	8b4d2e2e77723f4b289896f699954fe9
+_eclasses_=tmpfiles	7bd1d7bf5261430a2d2991cff7958c52
 _md5_=57bacf4bcc327d83bcb79470e06b252b
diff --git a/metadata/md5-cache/sys-apps/logwatch-9999 b/metadata/md5-cache/sys-apps/logwatch-9999
index 5c9e8b1c15d4..a0614f41d081 100644
--- a/metadata/md5-cache/sys-apps/logwatch-9999
+++ b/metadata/md5-cache/sys-apps/logwatch-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.logwatch.org/
 LICENSE=MIT
 RDEPEND=virtual/cron virtual/mta virtual/mailx dev-lang/perl dev-perl/Date-Calc dev-perl/Date-Manip dev-perl/Tie-IxHash dev-perl/Sys-CPU dev-perl/Sys-MemInfo virtual/tmpfiles
 SLOT=0
-_eclasses_=git-r3	fec09a83ae965b041b47f5ff7c8ba29a	tmpfiles	8b4d2e2e77723f4b289896f699954fe9
+_eclasses_=git-r3	fec09a83ae965b041b47f5ff7c8ba29a	tmpfiles	7bd1d7bf5261430a2d2991cff7958c52
 _md5_=af91a6161fa761dc338c3edc311a3461
diff --git a/metadata/md5-cache/sys-apps/mawk-1.3.4_p20161120 b/metadata/md5-cache/sys-apps/mawk-1.3.4_p20161120
index 319c068c513e..858e6f8a2e53 100644
--- a/metadata/md5-cache/sys-apps/mawk-1.3.4_p20161120
+++ b/metadata/md5-cache/sys-apps/mawk-1.3.4_p20161120
@@ -3,10 +3,10 @@ DEPEND=app-eselect/eselect-awk
 DESCRIPTION=an (often faster than gawk) awk-interpreter
 EAPI=6
 HOMEPAGE=https://invisible-island.net/mawk/mawk.html
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=GPL-2
 RDEPEND=app-eselect/eselect-awk
 SLOT=0
 SRC_URI=ftp://invisible-island.net/mawk/mawk-1.3.4-20161120.tgz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=7388493072246d9d7d63617bfba3d450
+_md5_=935b100771df94cdf428a68749dc4e76
diff --git a/metadata/md5-cache/sys-apps/mawk-1.3.4_p20171017-r1 b/metadata/md5-cache/sys-apps/mawk-1.3.4_p20171017-r1
new file mode 100644
index 000000000000..03c8b05c7632
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/mawk-1.3.4_p20171017-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm
+DEPEND=app-eselect/eselect-awk
+DESCRIPTION=an (often faster than gawk) awk-interpreter
+EAPI=6
+HOMEPAGE=https://invisible-island.net/mawk/mawk.html
+IUSE=forced-sandbox
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
+LICENSE=GPL-2
+RDEPEND=app-eselect/eselect-awk
+SLOT=0
+SRC_URI=ftp://ftp.invisible-island.net/mawk/mawk-1.3.4-20171017.tgz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=0c0c30a3dc83d5f45770e99ea4c91c5a
diff --git a/metadata/md5-cache/sys-apps/portage-2.3.19 b/metadata/md5-cache/sys-apps/portage-2.3.19-r1
index bbc94204cfe6..430f5cd44c99 100644
--- a/metadata/md5-cache/sys-apps/portage-2.3.19
+++ b/metadata/md5-cache/sys-apps/portage-2.3.19-r1
@@ -7,9 +7,9 @@ IUSE=build doc epydoc +ipc linguas_ru +native-extensions selinux xattr python_ta
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
-RDEPEND=>=app-arch/tar-1.27 dev-lang/python-exec:2 !build? ( >=sys-apps/sed-4.0.5 app-shells/bash:0[readline] >=app-admin/eselect-1.2 python_targets_pypy? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python2_7? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_musl? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) >=app-misc/pax-utils-0.1.17 selinux? ( >=sys-libs/libselinux-2.0.94[python,python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) xattr? ( kernel_linux? ( >=sys-apps/install-xattr-0.3 python_targets_pypy? ( dev-python/pyxattr[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pyxattr[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) ) !<app-admin/logrotate-3.8.0 python_targets_pypy? ( >=virtual/pypy-5:0=[bzip2(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+RDEPEND=>=app-arch/tar-1.27 dev-lang/python-exec:2 !build? ( >=sys-apps/sed-4.0.5 app-shells/bash:0[readline] >=app-admin/eselect-1.2 python_targets_pypy? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python2_7? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_musl? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) >=app-misc/pax-utils-0.1.17 selinux? ( >=sys-libs/libselinux-2.0.94[python,python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) xattr? ( kernel_linux? ( >=sys-apps/install-xattr-0.3 python_targets_pypy? ( dev-python/pyxattr[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pyxattr[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) ) !<app-admin/logrotate-3.8.0 python_targets_pypy? ( >=virtual/pypy-5:0=[bzip2(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/tmpfiles
 REQUIRED_USE=epydoc? ( python_targets_python2_7 ) || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://gentoo/portage-2.3.19.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-2.3.19.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c0be31a5d617a475fb3bcf28fe21cb69
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	tmpfiles	7bd1d7bf5261430a2d2991cff7958c52	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d1fc43d946a36a42b7c53624f28433a2
diff --git a/metadata/md5-cache/sys-apps/portage-9999 b/metadata/md5-cache/sys-apps/portage-9999
index 00b41be440b5..891b378ce325 100644
--- a/metadata/md5-cache/sys-apps/portage-9999
+++ b/metadata/md5-cache/sys-apps/portage-9999
@@ -6,8 +6,8 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
 IUSE=build doc epydoc +ipc linguas_ru +native-extensions selinux xattr python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 LICENSE=GPL-2
 PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
-RDEPEND=>=app-arch/tar-1.27 dev-lang/python-exec:2 !build? ( >=sys-apps/sed-4.0.5 app-shells/bash:0[readline] >=app-admin/eselect-1.2 python_targets_pypy? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python2_7? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_musl? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) >=app-misc/pax-utils-0.1.17 selinux? ( >=sys-libs/libselinux-2.0.94[python,python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) xattr? ( kernel_linux? ( >=sys-apps/install-xattr-0.3 python_targets_pypy? ( dev-python/pyxattr[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pyxattr[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) ) !<app-admin/logrotate-3.8.0 python_targets_pypy? ( >=virtual/pypy-5:0=[bzip2(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+RDEPEND=>=app-arch/tar-1.27 dev-lang/python-exec:2 !build? ( >=sys-apps/sed-4.0.5 app-shells/bash:0[readline] >=app-admin/eselect-1.2 python_targets_pypy? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python2_7? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_musl? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) >=app-misc/pax-utils-0.1.17 selinux? ( >=sys-libs/libselinux-2.0.94[python,python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) xattr? ( kernel_linux? ( >=sys-apps/install-xattr-0.3 python_targets_pypy? ( dev-python/pyxattr[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pyxattr[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) ) !<app-admin/logrotate-3.8.0 python_targets_pypy? ( >=virtual/pypy-5:0=[bzip2(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/tmpfiles
 REQUIRED_USE=epydoc? ( python_targets_python2_7 ) || ( python_targets_pypy 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	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5f5a4b422d67e12a4dd4adf4511b1bdd
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	tmpfiles	7bd1d7bf5261430a2d2991cff7958c52	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=51f8f57f1ab275f612679e16d893db28
diff --git a/metadata/md5-cache/sys-apps/sparc-utils-1.9-r5 b/metadata/md5-cache/sys-apps/sparc-utils-1.9-r5
new file mode 100644
index 000000000000..cea494207d89
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/sparc-utils-1.9-r5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst
+DEPEND=virtual/os-headers
+DESCRIPTION=Various sparc utilities from Debian GNU/Linux
+EAPI=6
+HOMEPAGE=https://packages.debian.org/sparc-utils
+KEYWORDS=-* ~sparc
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/util-linux-2.13-r1
+SLOT=0
+SRC_URI=mirror://debian/pool/main/s/sparc-utils/sparc-utils_1.9.orig.tar.gz mirror://debian/pool/main/s/sparc-utils/sparc-utils_1.9-4.diff.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=dd43ed5acfd6bf4d4c8820e790d2e024
diff --git a/metadata/md5-cache/sys-apps/uam-0.3 b/metadata/md5-cache/sys-apps/uam-0.3
deleted file mode 100644
index b2bff0a2a720..000000000000
--- a/metadata/md5-cache/sys-apps/uam-0.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=virtual/udev virtual/pkgconfig >=app-portage/elt-patches-20170422
-DESCRIPTION=Simple udev-based automounter for removable USB media
-EAPI=4
-HOMEPAGE=https://bitbucket.org/mgorny/uam/
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=virtual/udev
-SLOT=0
-SRC_URI=https://www.bitbucket.org/mgorny/uam/downloads/uam-0.3.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=847e80717314a5a14027712776ca65bb
diff --git a/metadata/md5-cache/sys-apps/uam-0.3.1 b/metadata/md5-cache/sys-apps/uam-0.3.1
deleted file mode 100644
index 0b42f2f678fe..000000000000
--- a/metadata/md5-cache/sys-apps/uam-0.3.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=virtual/udev virtual/pkgconfig >=app-portage/elt-patches-20170422 virtual/pkgconfig
-DESCRIPTION=Simple udev-based automounter for removable USB media
-EAPI=5
-HOMEPAGE=https://bitbucket.org/mgorny/uam/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=virtual/udev
-SLOT=0
-SRC_URI=https://www.bitbucket.org/mgorny/uam/downloads/uam-0.3.1.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=bbf6c2327522e4c7139f82a7430c48c5
diff --git a/metadata/md5-cache/sys-boot/Manifest.gz b/metadata/md5-cache/sys-boot/Manifest.gz
index 19b7eb1c1f8c..c5c06355bcbd 100644
--- a/metadata/md5-cache/sys-boot/Manifest.gz
+++ b/metadata/md5-cache/sys-boot/Manifest.gz
diff --git a/metadata/md5-cache/sys-boot/silo-1.4.14_p20120819-r1 b/metadata/md5-cache/sys-boot/silo-1.4.14_p20120819-r1
new file mode 100644
index 000000000000..67123fc66e44
--- /dev/null
+++ b/metadata/md5-cache/sys-boot/silo-1.4.14_p20120819-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare prerm pretend
+DEPEND=sys-fs/e2fsprogs sys-apps/sparc-utils
+DESCRIPTION=SPARC/UltraSPARC Improved Loader, a boot loader for sparc
+EAPI=6
+HOMEPAGE=https://git.kernel.org/?p=linux/kernel/git/davem/silo.git;a=summary
+KEYWORDS=-* ~sparc
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://debian/pool/main/s/silo/silo_1.4.14+git20120819.orig.tar.gz mirror://debian/pool/main/s/silo/silo_1.4.14+git20120819-1.diff.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	mount-boot	1e82d96b7a7dcb483b412497a90bb646	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=a8e335c7d095f7d4d123931f534162a9
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index dfe876e611c7..87145cdf56a1 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/duperemove-0.09.1 b/metadata/md5-cache/sys-fs/duperemove-0.09.1
deleted file mode 100644
index 20ba8fa8f3bd..000000000000
--- a/metadata/md5-cache/sys-fs/duperemove-0.09.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-libs/glib:2=
-DESCRIPTION=Btrfs deduplication utility.
-EAPI=5
-HOMEPAGE=https://github.com/markfasheh/duperemove
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2=
-SLOT=0
-SRC_URI=https://github.com/markfasheh/duperemove/archive/v0.09.1.tar.gz -> duperemove-0.09.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=72e6647c90f2980903a03a0fcef43d45
diff --git a/metadata/md5-cache/sys-fs/duperemove-0.09.2 b/metadata/md5-cache/sys-fs/duperemove-0.09.2
deleted file mode 100644
index 56c8679aecd5..000000000000
--- a/metadata/md5-cache/sys-fs/duperemove-0.09.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=dev-libs/glib:2= dev-libs/libgcrypt:0=
-DESCRIPTION=Btrfs deduplication utility
-EAPI=5
-HOMEPAGE=https://github.com/markfasheh/duperemove
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2= dev-libs/libgcrypt:0=
-SLOT=0
-SRC_URI=https://github.com/markfasheh/duperemove/archive/v0.09.2.tar.gz -> duperemove-0.09.2.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=e65a50973c203d89b6d48283a77f73cc
diff --git a/metadata/md5-cache/sys-fs/duperemove-0.09.3 b/metadata/md5-cache/sys-fs/duperemove-0.09.3
deleted file mode 100644
index c2d30c6fe09e..000000000000
--- a/metadata/md5-cache/sys-fs/duperemove-0.09.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-libs/glib:2= dev-libs/libgcrypt:0=
-DESCRIPTION=Btrfs deduplication utility
-EAPI=5
-HOMEPAGE=https://github.com/markfasheh/duperemove
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2= dev-libs/libgcrypt:0=
-SLOT=0
-SRC_URI=https://github.com/markfasheh/duperemove/archive/v0.09.3.tar.gz -> duperemove-0.09.3.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=de00a8e358bfb5209558fff55b1e1f44
diff --git a/metadata/md5-cache/sys-fs/duperemove-0.09.4 b/metadata/md5-cache/sys-fs/duperemove-0.09.4
deleted file mode 100644
index 5698957b0f2b..000000000000
--- a/metadata/md5-cache/sys-fs/duperemove-0.09.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-libs/glib:2= dev-libs/libgcrypt:0=
-DESCRIPTION=Btrfs deduplication utility
-EAPI=5
-HOMEPAGE=https://github.com/markfasheh/duperemove
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2= dev-libs/libgcrypt:0=
-SLOT=0
-SRC_URI=https://github.com/markfasheh/duperemove/archive/v0.09.4.tar.gz -> duperemove-0.09.4.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=de00a8e358bfb5209558fff55b1e1f44
diff --git a/metadata/md5-cache/sys-fs/duperemove-0.09.5 b/metadata/md5-cache/sys-fs/duperemove-0.09.5
deleted file mode 100644
index 6a79bf79849f..000000000000
--- a/metadata/md5-cache/sys-fs/duperemove-0.09.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-libs/glib:2= dev-libs/libgcrypt:0=
-DESCRIPTION=Btrfs deduplication utility
-EAPI=5
-HOMEPAGE=https://github.com/markfasheh/duperemove
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2= dev-libs/libgcrypt:0=
-SLOT=0
-SRC_URI=https://github.com/markfasheh/duperemove/archive/v0.09.5.tar.gz -> duperemove-0.09.5.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=de00a8e358bfb5209558fff55b1e1f44
diff --git a/metadata/md5-cache/sys-fs/e2fsprogs-1.43.8 b/metadata/md5-cache/sys-fs/e2fsprogs-1.43.8
new file mode 100644
index 000000000000..83db8d07b22c
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/e2fsprogs-1.43.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=~sys-libs/e2fsprogs-libs-1.43.8 >=sys-apps/util-linux-2.16 fuse? ( sys-fs/fuse ) 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.43.8 >=sys-apps/util-linux-2.16 fuse? ( sys-fs/fuse ) nls? ( virtual/libintl )
+SLOT=0
+SRC_URI=mirror://sourceforge/e2fsprogs/e2fsprogs-1.43.8.tar.gz mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v1.43.8/e2fsprogs-1.43.8.tar.gz elibc_mintlib? ( mirror://gentoo/e2fsprogs-1.42.9-mint-r1.patch.xz )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=c887cc31421c8db747462e28592cc57f
diff --git a/metadata/md5-cache/sys-fs/xfsprogs-4.14.0 b/metadata/md5-cache/sys-fs/xfsprogs-4.14.0
index c404f2445ead..d448436317e4 100644
--- a/metadata/md5-cache/sys-fs/xfsprogs-4.14.0
+++ b/metadata/md5-cache/sys-fs/xfsprogs-4.14.0
@@ -4,11 +4,11 @@ DESCRIPTION=xfs filesystem utilities
 EAPI=6
 HOMEPAGE=http://oss.sgi.com/projects/xfs/
 IUSE=libedit nls readline static static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=LGPL-2.1
 RDEPEND=!static? ( >=sys-apps/util-linux-2.17.2 readline? ( sys-libs/readline:0= ) !readline? ( libedit? ( dev-libs/libedit ) ) ) !<sys-fs/xfsdump-3
 REQUIRED_USE=static? ( static-libs )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-4.14.0.tar.xz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=8d57c7f68bba4875fce7cee8c5b527ed
+_md5_=455151deab40ea71f6886b2916095b62
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 74fdd092a475..506349f68f7c 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/linux-headers-4.13 b/metadata/md5-cache/sys-kernel/linux-headers-4.13
index d68221cd9617..0688bc3939ba 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.13
+++ b/metadata/md5-cache/sys-kernel/linux-headers-4.13
@@ -4,11 +4,11 @@ DESCRIPTION=Linux system headers
 EAPI=5
 HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/
 IUSE=crosscompile_opts_headers-only
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=!!media-sound/alsa-headers
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-4.13.tar.xz mirror://gentoo/gentoo-headers-4.13-1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=de9656d53855152f8ba91ccd5f7b27dd
+_md5_=1688bd86ddb9ab5d3d06f859caf9d3a8
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 454743420ba7..14d823b8c1f7 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.43.8 b/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.43.8
new file mode 100644
index 000000000000..229f4734f85b
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.43.8
@@ -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.43.8.tar.gz mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v1.43.8/e2fsprogs-libs-1.43.8.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=c8cf9adf726d1dde5f4e892faa619782
diff --git a/metadata/md5-cache/sys-libs/gdbm-1.12 b/metadata/md5-cache/sys-libs/gdbm-1.12
deleted file mode 100644
index cd26986e6e95..000000000000
--- a/metadata/md5-cache/sys-libs/gdbm-1.12
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare test
-DEPEND=>=app-portage/elt-patches-20170422
-DESCRIPTION=Standard GNU database libraries
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/gdbm/
-IUSE=+berkdb exporter 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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-3
-RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r4 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
-SLOT=0
-SRC_URI=mirror://gnu/gdbm/gdbm-1.12.tar.gz exporter? ( mirror://gnu/gdbm/gdbm-1.8.3.tar.gz )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=06d1ef76aa233964e71faac89b7d0f49
diff --git a/metadata/md5-cache/sys-libs/gdbm-1.13 b/metadata/md5-cache/sys-libs/gdbm-1.14
index b4d27cdf6767..d526446dbfda 100644
--- a/metadata/md5-cache/sys-libs/gdbm-1.13
+++ b/metadata/md5-cache/sys-libs/gdbm-1.14
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare test
-DEPEND=readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=app-portage/elt-patches-20170422
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Standard GNU database libraries
-EAPI=5
+EAPI=6
 HOMEPAGE=https://www.gnu.org/software/gdbm/
 IUSE=+berkdb exporter nls +readline 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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
-SRC_URI=mirror://gnu/gdbm/gdbm-1.13.tar.gz exporter? ( mirror://gnu/gdbm/gdbm-1.8.3.tar.gz )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=d4ba744bbf860f631c026677d1074192
+SRC_URI=mirror://gnu/gdbm/gdbm-1.14.tar.gz exporter? ( mirror://gnu/gdbm/gdbm-1.8.3.tar.gz )
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=8e6a03f5f1dfb0637d36c675bdfe6156
diff --git a/metadata/md5-cache/sys-libs/libcap-2.24-r2 b/metadata/md5-cache/sys-libs/libcap-2.24-r2
index 48d900cbed1b..cf5f64ed4f6f 100644
--- a/metadata/md5-cache/sys-libs/libcap-2.24-r2
+++ b/metadata/md5-cache/sys-libs/libcap-2.24-r2
@@ -10,4 +10,4 @@ RDEPEND=>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 SLOT=0
 SRC_URI=mirror://kernel/linux/libs/security/linux-privs/libcap2/libcap-2.24.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pam	3e788d86170dfcd5b06824d898315e18	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=4783c2c4fffe35a2ac477746d66cf0df
+_md5_=b40a0d42d5430c2f621d921450ec5d28
diff --git a/metadata/md5-cache/sys-libs/libcap-2.25 b/metadata/md5-cache/sys-libs/libcap-2.25
index 9106ce5e3c3f..2fbca65bf19a 100644
--- a/metadata/md5-cache/sys-libs/libcap-2.25
+++ b/metadata/md5-cache/sys-libs/libcap-2.25
@@ -10,4 +10,4 @@ RDEPEND=>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 SLOT=0
 SRC_URI=mirror://kernel/linux/libs/security/linux-privs/libcap2/libcap-2.25.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pam	3e788d86170dfcd5b06824d898315e18	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=3c04cc4bf1c5481d190dc08b1c78d09a
+_md5_=5ba615c10dafad8993d0c2a90be65ff8
diff --git a/metadata/md5-cache/sys-libs/libstdc++-v3-3.3.6-r1 b/metadata/md5-cache/sys-libs/libstdc++-v3-3.3.6-r1
index 3b643dfc7871..6c86f51697fe 100644
--- a/metadata/md5-cache/sys-libs/libstdc++-v3-3.3.6-r1
+++ b/metadata/md5-cache/sys-libs/libstdc++-v3-3.3.6-r1
@@ -9,4 +9,4 @@ LICENSE=GPL-2 LGPL-2.1
 SLOT=5
 SRC_URI=ftp://gcc.gnu.org/pub/gcc/releases/gcc-3.3.6/gcc-3.3.6.tar.bz2 mirror://gentoo/gcc-3.3.6-patches-1.9.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=dc46aff3c19be988159b7c4b14f87906
+_md5_=1cb5e7edc5343df58e61b15f8a34b3ed
diff --git a/metadata/md5-cache/sys-libs/ncurses-6.0-r2 b/metadata/md5-cache/sys-libs/ncurses-6.0-r2
new file mode 100644
index 000000000000..96f1338ee729
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/ncurses-6.0-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare test
+DEPEND=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(-)?] )
+DESCRIPTION=console display library
+EAPI=5
+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 ~sparc-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 !<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.0.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=de0eff56124bc29333394b20cfb21628
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 803f716e26c4..b06e60668974 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-64.0.3282.39 b/metadata/md5-cache/www-client/chromium-64.0.3282.39
index a9a707fe1ecf..028db9ec5ab7 100644
--- a/metadata/md5-cache/www-client/chromium-64.0.3282.39
+++ b/metadata/md5-cache/www-client/chromium-64.0.3282.39
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
-DEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) 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.14.3:= >=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.5.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 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
+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.14.3:= >=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.5.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 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 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 ~arm ~arm64 ~x86
 LICENSE=BSD
-RDEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) 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.14.3:= >=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.5.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(-)] )
+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.14.3:= >=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.5.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-64.0.3282.39.tar.xz
 _eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	chromium-2	fcd0e1c5eaae64392927ca67cdb13e0c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	portability	2b88d3ecc35035a3b8ab628b49cafb0e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5261c63abd3d6c599536ab8ee586de35
+_md5_=2202cc14151dfe51eb804c4ad199cecb
diff --git a/metadata/md5-cache/www-client/chromium-65.0.3298.3 b/metadata/md5-cache/www-client/chromium-65.0.3298.3
index 5106153d9f7f..c8df40ab2b75 100644
--- a/metadata/md5-cache/www-client/chromium-65.0.3298.3
+++ b/metadata/md5-cache/www-client/chromium-65.0.3298.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
-DEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) 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.14.3:= >=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 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
+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.14.3:= >=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 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 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 ~arm ~arm64 ~x86
 LICENSE=BSD
-RDEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) 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.14.3:= >=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(-)] )
+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.14.3:= >=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.3298.3.tar.xz
 _eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	chromium-2	fcd0e1c5eaae64392927ca67cdb13e0c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	portability	2b88d3ecc35035a3b8ab628b49cafb0e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=abaf82c09cf1ca3b6b5da1c30d7cf0c8
+_md5_=af921670787b68d1513363f129f90b86
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-64.0.3282.39 b/metadata/md5-cache/www-client/google-chrome-beta-64.0.3282.39
index 93f9a680e0ff..16931b4a3281 100644
--- a/metadata/md5-cache/www-client/google-chrome-beta-64.0.3282.39
+++ b/metadata/md5-cache/www-client/google-chrome-beta-64.0.3282.39
@@ -6,9 +6,9 @@ HOMEPAGE=https://www.google.com/chrome
 IUSE=+plugins +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
 LICENSE=google-chrome
-RDEPEND=app-arch/bzip2 app-misc/ca-certificates dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 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
+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 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-beta/google-chrome-beta_64.0.3282.39-1_amd64.deb
 _eclasses_=chromium-2	fcd0e1c5eaae64392927ca67cdb13e0c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0b462c02b1c3418f2928553e9d51a362
+_md5_=487c5fb7002e212f7edd9bf108d5e8a1
diff --git a/metadata/md5-cache/www-client/seamonkey-2.46-r1 b/metadata/md5-cache/www-client/seamonkey-2.46-r1
deleted file mode 100644
index 74544ac6aeae..000000000000
--- a/metadata/md5-cache/www-client/seamonkey-2.46-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup unpack
-DEPEND=>=dev-libs/nss-3.25 >=dev-libs/nspr-4.12 crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt5] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( dev-libs/libexecinfo ) ) ) crypt? ( dev-lang/perl ) 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 >=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.21:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) 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-56.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.13.0:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.2.6:0=[graphite,icu] >=media-gfx/graphite2-1.3.8 ) 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.15: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 minimal pulseaudio +roaming selinux test custom-cflags custom-optimization dbus debug +jemalloc neon pulseaudio selinux +skia startup-notification system-cairo system-harfbuzz system-icu system-jpeg system-libevent system-sqlite system-libvpx gtk3 wifi +jit l10n_be l10n_ca l10n_cs l10n_de l10n_en-GB l10n_es-AR l10n_es-ES l10n_fi l10n_fr l10n_gl l10n_hu l10n_it l10n_ja l10n_lt l10n_nb l10n_nl l10n_pl l10n_pt-PT l10n_ru l10n_sk l10n_sv l10n_tr l10n_uk 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.25 >=dev-libs/nspr-4.12 crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt5] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) >=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.21:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) 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-56.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.13.0:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.2.6:0=[graphite,icu] >=media-gfx/graphite2-1.3.8 ) 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 ) ) selinux? ( sec-policy/selinux-mozilla )
-REQUIRED_USE=system-harfbuzz? ( system-icu )
-SLOT=0
-SRC_URI=https://archive.mozilla.org/pub/seamonkey/releases/2.46/source/seamonkey-2.46.source.tar.xz -> seamonkey-2.46.source.tar.xz l10n_be? ( https://archive.mozilla.org/pub/seamonkey/releases/2.46/langpack/seamonkey-2.46.be.langpack.xpi -> seamonkey-2.46-be.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/seamonkey/releases/2.46/langpack/seamonkey-2.46.ca.langpack.xpi -> seamonkey-2.46-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/seamonkey/releases/2.46/langpack/seamonkey-2.46.cs.langpack.xpi -> seamonkey-2.46-cs.xpi ) l10n_de? ( https://archive.mozilla.org/pub/seamonkey/releases/2.46/langpack/seamonkey-2.46.de.langpack.xpi -> seamonkey-2.46-de.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/seamonkey/releases/2.46/langpack/seamonkey-2.46.en-GB.langpack.xpi -> seamonkey-2.46-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/seamonkey/releases/2.46/langpack/seamonkey-2.46.es-AR.langpack.xpi -> seamonkey-2.46-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/seamonkey/releases/2.46/langpack/seamonkey-2.46.es-ES.langpack.xpi -> seamonkey-2.46-es-ES.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/seamonkey/releases/2.46/langpack/seamonkey-2.46.fi.langpack.xpi -> seamonkey-2.46-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/seamonkey/releases/2.46/langpack/seamonkey-2.46.fr.langpack.xpi -> seamonkey-2.46-fr.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/seamonkey/releases/2.46/langpack/seamonkey-2.46.gl.langpack.xpi -> seamonkey-2.46-gl.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/seamonkey/releases/2.46/langpack/seamonkey-2.46.hu.langpack.xpi -> seamonkey-2.46-hu.xpi ) l10n_it? ( https://archive.mozilla.org/pub/seamonkey/releases/2.46/langpack/seamonkey-2.46.it.langpack.xpi -> seamonkey-2.46-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/seamonkey/releases/2.46/langpack/seamonkey-2.46.ja.langpack.xpi -> seamonkey-2.46-ja.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/seamonkey/releases/2.46/langpack/seamonkey-2.46.lt.langpack.xpi -> seamonkey-2.46-lt.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/seamonkey/releases/2.46/langpack/seamonkey-2.46.nb-NO.langpack.xpi -> seamonkey-2.46-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/seamonkey/releases/2.46/langpack/seamonkey-2.46.nl.langpack.xpi -> seamonkey-2.46-nl.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/seamonkey/releases/2.46/langpack/seamonkey-2.46.pl.langpack.xpi -> seamonkey-2.46-pl.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/seamonkey/releases/2.46/langpack/seamonkey-2.46.pt-PT.langpack.xpi -> seamonkey-2.46-pt-PT.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/seamonkey/releases/2.46/langpack/seamonkey-2.46.ru.langpack.xpi -> seamonkey-2.46-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/seamonkey/releases/2.46/langpack/seamonkey-2.46.sk.langpack.xpi -> seamonkey-2.46-sk.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/seamonkey/releases/2.46/langpack/seamonkey-2.46.sv-SE.langpack.xpi -> seamonkey-2.46-sv-SE.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/seamonkey/releases/2.46/langpack/seamonkey-2.46.tr.langpack.xpi -> seamonkey-2.46-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/seamonkey/releases/2.46/langpack/seamonkey-2.46.uk.langpack.xpi -> seamonkey-2.46-uk.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/seamonkey/releases/2.46/langpack/seamonkey-2.46.zh-CN.langpack.xpi -> seamonkey-2.46-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/seamonkey/releases/2.46/langpack/seamonkey-2.46.zh-TW.langpack.xpi -> seamonkey-2.46-zh-TW.xpi ) https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-49.0-patches-04.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-49.0-patches-04.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-49.0-patches-04.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/seamonkey-2.46-patches-02.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/seamonkey-2.46-patches-02.tar.xz crypt? ( https://www.enigmail.net/download/source/enigmail-1.9.6.1.tar.gz )
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	check-reqs	bd050ce908e4637604ee604ed4b78e8f	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mozconfig-v6.49	d6bfb8966c167ba6d7a8084f4f8104e7	mozcoreconf-v4	6492fb2259ea94a750f79656278d8218	mozextension	42c5ed513e5325a5d0629ad85bb27c23	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=b2c13b1833491d2280f09545a3688364
diff --git a/metadata/md5-cache/www-client/seamonkey-2.48 b/metadata/md5-cache/www-client/seamonkey-2.48
deleted file mode 100644
index 76dfd40a12db..000000000000
--- a/metadata/md5-cache/www-client/seamonkey-2.48
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup unpack
-DEPEND=>=dev-libs/nss-3.28.1 >=dev-libs/nspr-4.13 crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt5] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) jack? ( virtual/jack ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( dev-libs/libexecinfo ) ) ) crypt? ( dev-lang/perl ) 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 >=app-text/hunspell-1.2:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] 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? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) 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-56.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.14.1:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.2.6:0=[graphite,icu] >=media-gfx/graphite2-1.3.8 ) gtk3? ( >=x11-libs/gtk+-3.4.0:3 ) !gtk3? ( >=x11-libs/gtk+-2.18:2 ) 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.15: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 +skia startup-notification system-cairo system-harfbuzz system-icu system-jpeg system-libevent system-sqlite system-libvpx 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.1 >=dev-libs/nspr-4.13 crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt5] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) jack? ( virtual/jack ) >=app-text/hunspell-1.2:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] 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? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) 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-56.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.14.1:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.2.6:0=[graphite,icu] >=media-gfx/graphite2-1.3.8 ) gtk3? ( >=x11-libs/gtk+-3.4.0:3 ) !gtk3? ( >=x11-libs/gtk+-2.18:2 ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) selinux? ( sec-policy/selinux-mozilla )
-REQUIRED_USE=system-harfbuzz? ( system-icu )
-SLOT=0
-SRC_URI=https://archive.mozilla.org/pub/seamonkey/releases/2.48/source/seamonkey-2.48.source.tar.xz -> seamonkey-2.48.source.tar.xz l10n_cs? ( https://archive.mozilla.org/pub/seamonkey/releases/2.48/langpack/seamonkey-2.48.cs.langpack.xpi -> seamonkey-2.48-cs.xpi ) l10n_de? ( https://archive.mozilla.org/pub/seamonkey/releases/2.48/langpack/seamonkey-2.48.de.langpack.xpi -> seamonkey-2.48-de.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/seamonkey/releases/2.48/langpack/seamonkey-2.48.en-GB.langpack.xpi -> seamonkey-2.48-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/seamonkey/releases/2.48/langpack/seamonkey-2.48.es-AR.langpack.xpi -> seamonkey-2.48-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/seamonkey/releases/2.48/langpack/seamonkey-2.48.es-ES.langpack.xpi -> seamonkey-2.48-es-ES.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/seamonkey/releases/2.48/langpack/seamonkey-2.48.fr.langpack.xpi -> seamonkey-2.48-fr.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/seamonkey/releases/2.48/langpack/seamonkey-2.48.hu.langpack.xpi -> seamonkey-2.48-hu.xpi ) l10n_it? ( https://archive.mozilla.org/pub/seamonkey/releases/2.48/langpack/seamonkey-2.48.it.langpack.xpi -> seamonkey-2.48-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/seamonkey/releases/2.48/langpack/seamonkey-2.48.ja.langpack.xpi -> seamonkey-2.48-ja.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/seamonkey/releases/2.48/langpack/seamonkey-2.48.lt.langpack.xpi -> seamonkey-2.48-lt.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/seamonkey/releases/2.48/langpack/seamonkey-2.48.nl.langpack.xpi -> seamonkey-2.48-nl.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/seamonkey/releases/2.48/langpack/seamonkey-2.48.pl.langpack.xpi -> seamonkey-2.48-pl.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/seamonkey/releases/2.48/langpack/seamonkey-2.48.pt-PT.langpack.xpi -> seamonkey-2.48-pt-PT.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/seamonkey/releases/2.48/langpack/seamonkey-2.48.ru.langpack.xpi -> seamonkey-2.48-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/seamonkey/releases/2.48/langpack/seamonkey-2.48.sk.langpack.xpi -> seamonkey-2.48-sk.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/seamonkey/releases/2.48/langpack/seamonkey-2.48.sv-SE.langpack.xpi -> seamonkey-2.48-sv-SE.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/seamonkey/releases/2.48/langpack/seamonkey-2.48.zh-CN.langpack.xpi -> seamonkey-2.48-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/seamonkey/releases/2.48/langpack/seamonkey-2.48.zh-TW.langpack.xpi -> seamonkey-2.48-zh-TW.xpi ) https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-51.0-patches-06.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-51.0-patches-06.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-51.0-patches-06.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 crypt? ( https://www.enigmail.net/download/source/enigmail-1.9.8.1.tar.gz )
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	check-reqs	bd050ce908e4637604ee604ed4b78e8f	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mozconfig-v6.51	bac75600794ea0715d36d53e74a1bf65	mozcoreconf-v4	6492fb2259ea94a750f79656278d8218	mozextension	42c5ed513e5325a5d0629ad85bb27c23	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a39b44ea1dd31eab02f01b940b420ca6
diff --git a/metadata/md5-cache/www-client/seamonkey-2.48-r1 b/metadata/md5-cache/www-client/seamonkey-2.48-r1
deleted file mode 100644
index 2abdbcac8b41..000000000000
--- a/metadata/md5-cache/www-client/seamonkey-2.48-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup unpack
-DEPEND=>=dev-libs/nss-3.28.1 >=dev-libs/nspr-4.13 crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt5] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) x11-plugins/enigmail ) jack? ( virtual/jack ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( dev-libs/libexecinfo ) ) ) crypt? ( dev-lang/perl ) 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 >=app-text/hunspell-1.2:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] 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? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) 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-56.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.14.1:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.2.6:0=[graphite,icu] >=media-gfx/graphite2-1.3.8 ) gtk3? ( >=x11-libs/gtk+-3.4.0:3 ) !gtk3? ( >=x11-libs/gtk+-2.18:2 ) 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.15: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 +skia startup-notification system-cairo system-harfbuzz system-icu system-jpeg system-libevent system-sqlite system-libvpx 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.1 >=dev-libs/nspr-4.13 crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt5] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) x11-plugins/enigmail ) jack? ( virtual/jack ) >=app-text/hunspell-1.2:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] 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? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) 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-56.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.14.1:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.2.6:0=[graphite,icu] >=media-gfx/graphite2-1.3.8 ) gtk3? ( >=x11-libs/gtk+-3.4.0:3 ) !gtk3? ( >=x11-libs/gtk+-2.18:2 ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) selinux? ( sec-policy/selinux-mozilla )
-REQUIRED_USE=system-harfbuzz? ( system-icu )
-SLOT=0
-SRC_URI=https://archive.mozilla.org/pub/seamonkey/releases/2.48/source/seamonkey-2.48.source.tar.xz -> seamonkey-2.48.source.tar.xz l10n_cs? ( https://archive.mozilla.org/pub/seamonkey/releases/2.48/langpack/seamonkey-2.48.cs.langpack.xpi -> seamonkey-2.48-cs.xpi ) l10n_de? ( https://archive.mozilla.org/pub/seamonkey/releases/2.48/langpack/seamonkey-2.48.de.langpack.xpi -> seamonkey-2.48-de.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/seamonkey/releases/2.48/langpack/seamonkey-2.48.en-GB.langpack.xpi -> seamonkey-2.48-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/seamonkey/releases/2.48/langpack/seamonkey-2.48.es-AR.langpack.xpi -> seamonkey-2.48-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/seamonkey/releases/2.48/langpack/seamonkey-2.48.es-ES.langpack.xpi -> seamonkey-2.48-es-ES.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/seamonkey/releases/2.48/langpack/seamonkey-2.48.fr.langpack.xpi -> seamonkey-2.48-fr.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/seamonkey/releases/2.48/langpack/seamonkey-2.48.hu.langpack.xpi -> seamonkey-2.48-hu.xpi ) l10n_it? ( https://archive.mozilla.org/pub/seamonkey/releases/2.48/langpack/seamonkey-2.48.it.langpack.xpi -> seamonkey-2.48-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/seamonkey/releases/2.48/langpack/seamonkey-2.48.ja.langpack.xpi -> seamonkey-2.48-ja.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/seamonkey/releases/2.48/langpack/seamonkey-2.48.lt.langpack.xpi -> seamonkey-2.48-lt.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/seamonkey/releases/2.48/langpack/seamonkey-2.48.nl.langpack.xpi -> seamonkey-2.48-nl.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/seamonkey/releases/2.48/langpack/seamonkey-2.48.pl.langpack.xpi -> seamonkey-2.48-pl.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/seamonkey/releases/2.48/langpack/seamonkey-2.48.pt-PT.langpack.xpi -> seamonkey-2.48-pt-PT.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/seamonkey/releases/2.48/langpack/seamonkey-2.48.ru.langpack.xpi -> seamonkey-2.48-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/seamonkey/releases/2.48/langpack/seamonkey-2.48.sk.langpack.xpi -> seamonkey-2.48-sk.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/seamonkey/releases/2.48/langpack/seamonkey-2.48.sv-SE.langpack.xpi -> seamonkey-2.48-sv-SE.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/seamonkey/releases/2.48/langpack/seamonkey-2.48.zh-CN.langpack.xpi -> seamonkey-2.48-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/seamonkey/releases/2.48/langpack/seamonkey-2.48.zh-TW.langpack.xpi -> seamonkey-2.48-zh-TW.xpi ) https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-51.0-patches-06.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-51.0-patches-06.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-51.0-patches-06.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	dc412f38566b91012efd58b9c203e6c3	check-reqs	bd050ce908e4637604ee604ed4b78e8f	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mozconfig-v6.51	bac75600794ea0715d36d53e74a1bf65	mozcoreconf-v4	6492fb2259ea94a750f79656278d8218	mozextension	42c5ed513e5325a5d0629ad85bb27c23	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=45fad83204290053a93513d8cdc26b22
diff --git a/metadata/md5-cache/www-client/seamonkey-2.49.4.0_p0 b/metadata/md5-cache/www-client/seamonkey-2.49.4.0_p0
deleted file mode 100644
index e6f63ad1b687..000000000000
--- a/metadata/md5-cache/www-client/seamonkey-2.49.4.0_p0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup unpack
-DEPEND=>=dev-libs/nss-3.28.1 >=dev-libs/nspr-4.13 crypt? ( x11-plugins/enigmail ) jack? ( virtual/jack ) !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.15: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.1 >=dev-libs/nspr-4.13 crypt? ( x11-plugins/enigmail ) jack? ( virtual/jack ) >=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.4.0/source/thunderbird-52.4.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.4.0/../../../seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/cs.xpi -> seamonkey-2.49.4.0-cs.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/52.4.0/../../../seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/de.xpi -> seamonkey-2.49.4.0-de.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/52.4.0/../../../seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/en-GB.xpi -> seamonkey-2.49.4.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/52.4.0/../../../seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/es-AR.xpi -> seamonkey-2.49.4.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/52.4.0/../../../seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/es-ES.xpi -> seamonkey-2.49.4.0-es-ES.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.4.0/../../../seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/fr.xpi -> seamonkey-2.49.4.0-fr.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/52.4.0/../../../seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/hu.xpi -> seamonkey-2.49.4.0-hu.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/52.4.0/../../../seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/it.xpi -> seamonkey-2.49.4.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/52.4.0/../../../seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/ja.xpi -> seamonkey-2.49.4.0-ja.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/52.4.0/../../../seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/lt.xpi -> seamonkey-2.49.4.0-lt.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.4.0/../../../seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/nl.xpi -> seamonkey-2.49.4.0-nl.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.4.0/../../../seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/pl.xpi -> seamonkey-2.49.4.0-pl.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/52.4.0/../../../seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/pt-PT.xpi -> seamonkey-2.49.4.0-pt-PT.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/52.4.0/../../../seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/ru.xpi -> seamonkey-2.49.4.0-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/52.4.0/../../../seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/sk.xpi -> seamonkey-2.49.4.0-sk.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/52.4.0/../../../seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/sv-SE.xpi -> seamonkey-2.49.4.0-sv-SE.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/52.4.0/../../../seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/zh-CN.xpi -> seamonkey-2.49.4.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/52.4.0/../../../seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/zh-TW.xpi -> seamonkey-2.49.4.0-zh-TW.xpi ) https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-52.2-patches-03.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-52.2-patches-03.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-52.2-patches-03.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	dc412f38566b91012efd58b9c203e6c3	check-reqs	bd050ce908e4637604ee604ed4b78e8f	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mozconfig-v6.52	aeba761913d03fc45f4d6ae2b89165ca	mozcoreconf-v5	dfc58397c1e9ecd4420428e695cf8dc8	mozextension	42c5ed513e5325a5d0629ad85bb27c23	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9ce5f5138f2fd1cf7d8ef0afc9e14f38
diff --git a/metadata/md5-cache/www-client/seamonkey-2.49.5.0_p0 b/metadata/md5-cache/www-client/seamonkey-2.49.5.0_p0
index 4dc783ae0368..4ddd9e8a7450 100644
--- a/metadata/md5-cache/www-client/seamonkey-2.49.5.0_p0
+++ b/metadata/md5-cache/www-client/seamonkey-2.49.5.0_p0
@@ -4,10 +4,10 @@ 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
+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.0/source/thunderbird-52.5.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.5.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/cs.xpi -> seamonkey-2.49.5.0-cs.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/de.xpi -> seamonkey-2.49.5.0-de.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/en-GB.xpi -> seamonkey-2.49.5.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/es-AR.xpi -> seamonkey-2.49.5.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/es-ES.xpi -> seamonkey-2.49.5.0-es-ES.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/fr.xpi -> seamonkey-2.49.5.0-fr.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/hu.xpi -> seamonkey-2.49.5.0-hu.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/it.xpi -> seamonkey-2.49.5.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/ja.xpi -> seamonkey-2.49.5.0-ja.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/lt.xpi -> seamonkey-2.49.5.0-lt.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/nl.xpi -> seamonkey-2.49.5.0-nl.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/pl.xpi -> seamonkey-2.49.5.0-pl.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/pt-PT.xpi -> seamonkey-2.49.5.0-pt-PT.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/ru.xpi -> seamonkey-2.49.5.0-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/sk.xpi -> seamonkey-2.49.5.0-sk.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/sv-SE.xpi -> seamonkey-2.49.5.0-sv-SE.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/zh-CN.xpi -> seamonkey-2.49.5.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/52.5.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/zh-TW.xpi -> seamonkey-2.49.5.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	dc412f38566b91012efd58b9c203e6c3	check-reqs	bd050ce908e4637604ee604ed4b78e8f	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mozconfig-v6.52	aeba761913d03fc45f4d6ae2b89165ca	mozcoreconf-v5	dfc58397c1e9ecd4420428e695cf8dc8	mozextension	42c5ed513e5325a5d0629ad85bb27c23	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=30a16d82c91c4326640e0c6b9dab3939
+_md5_=03612936bd710ab160c94e7c3d37d0d1
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
new file mode 100644
index 000000000000..afead0f88fdd
--- /dev/null
+++ b/metadata/md5-cache/www-client/seamonkey-2.49.5.2_p0
@@ -0,0 +1,13 @@
+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.15: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	dc412f38566b91012efd58b9c203e6c3	check-reqs	bd050ce908e4637604ee604ed4b78e8f	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mozconfig-v6.52	aeba761913d03fc45f4d6ae2b89165ca	mozcoreconf-v5	dfc58397c1e9ecd4420428e695cf8dc8	mozextension	42c5ed513e5325a5d0629ad85bb27c23	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ebb109ec43769e084011ece1eb007b56
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index d901e8985d94..26a3537d87dc 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/boa-0.94.14_rc21-r1 b/metadata/md5-cache/www-servers/boa-0.94.14_rc21-r1
deleted file mode 100644
index 1ea46873e350..000000000000
--- a/metadata/md5-cache/www-servers/boa-0.94.14_rc21-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=sys-devel/bison sys-devel/flex doc? ( virtual/latex-base ) virtual/pkgconfig
-DESCRIPTION=A very small and very fast http daemon
-EAPI=5
-HOMEPAGE=http://www.boa.org/
-IUSE=doc
-KEYWORDS=~amd64 ~mips ~ppc ~sparc ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www.boa.org/boa-0.94.14rc21.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=f47486af4af0a96a3d4a782254502f2c
diff --git a/metadata/md5-cache/www-servers/nginx-1.12.2-r1 b/metadata/md5-cache/www-servers/nginx-1.12.2-r1
index 554f7ef796ae..9d92e8c8b110 100644
--- a/metadata/md5-cache/www-servers/nginx-1.12.2-r1
+++ b/metadata/md5-cache/www-servers/nginx-1.12.2-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Robust, small and high performance http and reverse proxy server
 EAPI=6
 HOMEPAGE=https://nginx.org
 IUSE=aio debug +http +http2 +http-cache +ipv6 libatomic libressl luajit +pcre pcre-jit rtmp selinux ssl threads userland_GNU vim-syntax +nginx_modules_http_access +nginx_modules_http_auth_basic +nginx_modules_http_autoindex +nginx_modules_http_browser +nginx_modules_http_charset +nginx_modules_http_empty_gif +nginx_modules_http_fastcgi +nginx_modules_http_geo +nginx_modules_http_gzip +nginx_modules_http_limit_req +nginx_modules_http_limit_conn +nginx_modules_http_map +nginx_modules_http_memcached +nginx_modules_http_proxy +nginx_modules_http_referer +nginx_modules_http_rewrite +nginx_modules_http_scgi +nginx_modules_http_ssi +nginx_modules_http_split_clients +nginx_modules_http_upstream_hash +nginx_modules_http_upstream_ip_hash +nginx_modules_http_upstream_keepalive +nginx_modules_http_upstream_least_conn +nginx_modules_http_upstream_zone +nginx_modules_http_userid +nginx_modules_http_uwsgi nginx_modules_http_addition nginx_modules_http_auth_request nginx_modules_http_dav nginx_modules_http_degradation nginx_modules_http_flv nginx_modules_http_geoip nginx_modules_http_gunzip nginx_modules_http_gzip_static nginx_modules_http_image_filter nginx_modules_http_mp4 nginx_modules_http_perl nginx_modules_http_random_index nginx_modules_http_realip nginx_modules_http_secure_link nginx_modules_http_slice nginx_modules_http_stub_status nginx_modules_http_sub nginx_modules_http_xslt nginx_modules_stream_access nginx_modules_stream_geo nginx_modules_stream_limit_conn nginx_modules_stream_map nginx_modules_stream_return nginx_modules_stream_split_clients nginx_modules_stream_upstream_hash nginx_modules_stream_upstream_least_conn nginx_modules_stream_upstream_zone nginx_modules_stream_geoip nginx_modules_stream_realip nginx_modules_stream_ssl_preread nginx_modules_mail_imap nginx_modules_mail_pop3 nginx_modules_mail_smtp nginx_modules_http_upload_progress nginx_modules_http_headers_more nginx_modules_http_cache_purge nginx_modules_http_slowfs_cache nginx_modules_http_fancyindex nginx_modules_http_lua nginx_modules_http_auth_pam nginx_modules_http_upstream_check nginx_modules_http_metrics nginx_modules_http_naxsi nginx_modules_http_dav_ext nginx_modules_http_echo nginx_modules_http_security nginx_modules_http_push_stream nginx_modules_http_sticky nginx_modules_http_mogilefs nginx_modules_http_memc nginx_modules_http_auth_ldap nginx_modules_http_spdy
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=BSD-2 BSD SSLeay MIT GPL-2 GPL-2+ nginx_modules_http_security? ( Apache-2.0 ) nginx_modules_http_push_stream? ( GPL-3 )
 PDEPEND=vim-syntax? ( app-vim/nginx-syntax )
 RDEPEND=pcre? ( dev-libs/libpcre:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) http2? ( !libressl? ( >=dev-libs/openssl-1.0.1c:0= ) libressl? ( dev-libs/libressl:= ) ) http-cache? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( !luajit? ( dev-lang/lua:0= ) luajit? ( dev-lang/luajit:2= ) ) nginx_modules_http_auth_pam? ( virtual/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/expat ) nginx_modules_http_security? ( dev-libs/apr:= dev-libs/apr-util:= dev-libs/libxml2:= net-misc/curl www-servers/apache ) nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] ) selinux? ( sec-policy/selinux-nginx ) !www-servers/nginx:mainline
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://nginx.org/download/nginx-1.12.2.tar.gz https://github.com/simpl/ngx_devel_kit/archive/v0.3.0.tar.gz -> ngx_devel_kit-0.3.0-r1.tar.gz nginx_modules_http_upload_progress? ( https://github.com/masterzen/nginx-upload-progress-module/archive/v0.9.2.tar.gz -> ngx_http_upload_progress-0.9.2-r1.tar.gz ) nginx_modules_http_headers_more? ( https://github.com/agentzh/headers-more-nginx-module/archive/v0.32.tar.gz -> ngx_http_headers_more-0.32.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-2.3.tar.gz -> ngx_http_cache_purge-2.3.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.10.tar.gz -> ngx_http_slowfs_cache-1.10.tar.gz ) nginx_modules_http_fancyindex? ( https://github.com/aperezdc/ngx-fancyindex/archive/v0.4.2.tar.gz -> ngx_http_fancyindex-0.4.2.tar.gz ) nginx_modules_http_lua? ( https://github.com/openresty/lua-nginx-module/archive/v0.10.10.tar.gz -> ngx_http_lua-0.10.10.tar.gz ) nginx_modules_http_auth_pam? ( https://github.com/stogh/ngx_http_auth_pam_module/archive/v1.5.1.tar.gz -> ngx_http_auth_pam-1.5.1.tar.gz ) nginx_modules_http_upstream_check? ( https://github.com/yaoweibin/nginx_upstream_check_module/archive/31b1b42873fa56620d8a873ac13f5f26b52d0cd6.tar.gz -> ngx_http_upstream_check-31b1b42873fa56620d8a873ac13f5f26b52d0cd6.tar.gz ) nginx_modules_http_metrics? ( https://github.com/madvertise/ngx_metrics/archive/v0.1.1.tar.gz -> ngx_metrics-0.1.1.tar.gz ) nginx_modules_http_naxsi? ( https://github.com/nbs-system/naxsi/archive/0.55.3.tar.gz -> ngx_http_naxsi-0.55.3.tar.gz ) rtmp? ( https://github.com/arut/nginx-rtmp-module/archive/v1.2.0.tar.gz -> ngx_rtmp-1.2.0.tar.gz ) nginx_modules_http_dav_ext? ( https://github.com/arut/nginx-dav-ext-module/archive/v0.1.0.tar.gz -> ngx_http_dav_ext-0.1.0.tar.gz ) nginx_modules_http_echo? ( https://github.com/openresty/echo-nginx-module/archive/v0.61.tar.gz -> ngx_http_echo-0.61.tar.gz ) nginx_modules_http_security? ( https://www.modsecurity.org/tarball/2.9.2/modsecurity-2.9.2.tar.gz -> modsecurity-2.9.2.tar.gz ) nginx_modules_http_push_stream? ( https://github.com/wandenberg/nginx-push-stream-module/archive/0.5.2.tar.gz -> ngx_http_push_stream-0.5.2.tar.gz ) nginx_modules_http_sticky? ( https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/1.2.6-10-g08a395c66e42.tar.bz2 -> nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 ) nginx_modules_http_mogilefs? ( https://github.com/vkholodkov/nginx-mogilefs-module/archive/1.0.4.tar.gz -> ngx_mogilefs_module-1.0.4.tar.gz ) nginx_modules_http_memc? ( https://github.com/openresty/memc-nginx-module/archive/v0.18.tar.gz -> ngx_memc_module-0.18.tar.gz ) nginx_modules_http_auth_ldap? ( https://github.com/kvspb/nginx-auth-ldap/archive/49a8b4d28fc4a518563c82e0b52821e5f37db1fc.tar.gz -> nginx-auth-ldap-49a8b4d28fc4a518563c82e0b52821e5f37db1fc.tar.gz )
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	ssl-cert	b5e85f9a834c71d8bd532de477fe4ce2	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=a36900d680e58126539e74622bb63d52
+_md5_=6ce311788826e7840e9df4338f2f7c64
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index 86d5f28c6c8d..b1dabf31d824 100644
--- a/metadata/md5-cache/x11-drivers/Manifest.gz
+++ b/metadata/md5-cache/x11-drivers/Manifest.gz
diff --git a/metadata/md5-cache/x11-drivers/afb-ucode-1.3.11 b/metadata/md5-cache/x11-drivers/afb-ucode-1.3.11
deleted file mode 100644
index 9dc6ec0f950a..000000000000
--- a/metadata/md5-cache/x11-drivers/afb-ucode-1.3.11
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Binary blob microcode for Elite3D framebuffers, required by xf86-video-sunffb
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=-* sparc
-LICENSE=MIT
-RDEPEND=x11-misc/afbinit
-SLOT=0
-SRC_URI=http://dlc.sun.com/osol/sparc-gfx/downloads/afb-ucode.tar.bz2 mirror://gentoo/afb-ucode.tar.bz2
-_md5_=5bd051c5a40e6d456d54657288184585
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-apm-1.2.4 b/metadata/md5-cache/x11-drivers/xf86-video-apm-1.2.4
deleted file mode 100644
index a0499ead6cf1..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-video-apm-1.2.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
-DESCRIPTION=Alliance ProMotion video driver
-EAPI=4
-HOMEPAGE=https://www.x.org/wiki/
-KEYWORDS=amd64 ia64 x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=MIT
-RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-apm-1.2.4.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xorg-2	234cf45e2565fab7c0dff5bd8d1f9177
-_md5_=cbd17804cc20e80ac4f0b043ce136848
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-apm-1.2.5 b/metadata/md5-cache/x11-drivers/xf86-video-apm-1.2.5
deleted file mode 100644
index faf170de2bcd..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-video-apm-1.2.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
-DESCRIPTION=Alliance ProMotion video driver
-EAPI=4
-HOMEPAGE=https://www.x.org/wiki/
-KEYWORDS=amd64 ia64 x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=MIT
-RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-apm-1.2.5.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xorg-2	234cf45e2565fab7c0dff5bd8d1f9177
-_md5_=cbd17804cc20e80ac4f0b043ce136848
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-apm-1.2.5-r1 b/metadata/md5-cache/x11-drivers/xf86-video-apm-1.2.5-r1
deleted file mode 100644
index a7d6c51f8af2..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-video-apm-1.2.5-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
-DESCRIPTION=Alliance ProMotion video driver
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/
-KEYWORDS=amd64 ia64 x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=MIT
-RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server:= x11-base/xorg-server[xorg] x11-libs/libpciaccess
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-apm-1.2.5.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xorg-2	234cf45e2565fab7c0dff5bd8d1f9177
-_md5_=b5e9bd236036ee8ea0b1d9cef9546d40
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-ark-0.7.5 b/metadata/md5-cache/x11-drivers/xf86-video-ark-0.7.5
deleted file mode 100644
index 5e8013e1164f..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-video-ark-0.7.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 >=x11-libs/libpciaccess-0.12.901 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
-DESCRIPTION=X.Org driver for ark cards
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/
-KEYWORDS=amd64 ia64 x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=MIT
-RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server:= x11-base/xorg-server[xorg] x11-libs/libpciaccess
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-ark-0.7.5.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xorg-2	234cf45e2565fab7c0dff5bd8d1f9177
-_md5_=4ab36e6fd70d0b7257ee4a4657800976
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-chips-1.2.7 b/metadata/md5-cache/x11-drivers/xf86-video-chips-1.2.7
deleted file mode 100644
index 2d29d5adb664..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-video-chips-1.2.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
-DESCRIPTION=Chips and Technologies video driver
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/
-KEYWORDS=amd64 ia64 ppc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=MIT
-RDEPEND=x11-base/xorg-server:= x11-base/xorg-server[xorg] x11-libs/libpciaccess
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-chips-1.2.7.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xorg-2	234cf45e2565fab7c0dff5bd8d1f9177
-_md5_=21fbe2554464efaff80da12039207865
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-cirrus-1.5.1 b/metadata/md5-cache/x11-drivers/xf86-video-cirrus-1.5.1
deleted file mode 100644
index 4f9e2ae4372e..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-video-cirrus-1.5.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
-DESCRIPTION=Cirrus Logic video driver
-EAPI=4
-HOMEPAGE=https://www.x.org/wiki/
-KEYWORDS=alpha amd64 ia64 ppc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=MIT
-RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-cirrus-1.5.1.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xorg-2	234cf45e2565fab7c0dff5bd8d1f9177
-_md5_=cad57e8a62d967698f19fe01f2e55770
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-cirrus-1.5.2 b/metadata/md5-cache/x11-drivers/xf86-video-cirrus-1.5.2
deleted file mode 100644
index 8d249983eb3d..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-video-cirrus-1.5.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
-DESCRIPTION=Cirrus Logic video driver
-EAPI=4
-HOMEPAGE=https://www.x.org/wiki/
-KEYWORDS=alpha amd64 ia64 ppc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=MIT
-RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-cirrus-1.5.2.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xorg-2	234cf45e2565fab7c0dff5bd8d1f9177
-_md5_=cad57e8a62d967698f19fe01f2e55770
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-cirrus-1.5.3 b/metadata/md5-cache/x11-drivers/xf86-video-cirrus-1.5.3
deleted file mode 100644
index d36d5f4499be..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-video-cirrus-1.5.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
-DESCRIPTION=Cirrus Logic video driver
-EAPI=4
-HOMEPAGE=https://www.x.org/wiki/
-KEYWORDS=alpha amd64 ia64 ppc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=MIT
-RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xorg-2	234cf45e2565fab7c0dff5bd8d1f9177
-_md5_=28dc084b3a1edfb77b99312a6922cc52
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-freedreno-1.0.0 b/metadata/md5-cache/x11-drivers/xf86-video-freedreno-1.0.0
deleted file mode 100644
index a3ca02a9e69d..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-video-freedreno-1.0.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libdrm[video_cards_freedreno] >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
-DESCRIPTION=Driver for Adreno mobile GPUs
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/
-KEYWORDS=arm
-LICENSE=MIT
-RDEPEND=x11-libs/libdrm[video_cards_freedreno] x11-base/xorg-server:= x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-freedreno-1.0.0.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xorg-2	234cf45e2565fab7c0dff5bd8d1f9177
-_md5_=5c8cc67b3d6f4636803c7e962a6ac74b
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-freedreno-1.1.0 b/metadata/md5-cache/x11-drivers/xf86-video-freedreno-1.1.0
deleted file mode 100644
index 0e6d10fe67c6..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-video-freedreno-1.1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=media-libs/mesa-10.2[xa] virtual/libudev >=x11-libs/libdrm-2.4.54[video_cards_freedreno] >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
-DESCRIPTION=Driver for Adreno mobile GPUs
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/
-KEYWORDS=~arm
-LICENSE=MIT
-RDEPEND=>=media-libs/mesa-10.2[xa] virtual/libudev >=x11-libs/libdrm-2.4.54[video_cards_freedreno] x11-base/xorg-server:= x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-freedreno-1.1.0.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xorg-2	234cf45e2565fab7c0dff5bd8d1f9177
-_md5_=34925df77c86ab002b21b1f36b38e46b
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-freedreno-1.3.0 b/metadata/md5-cache/x11-drivers/xf86-video-freedreno-1.3.0
deleted file mode 100644
index baeb597be9bc..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-video-freedreno-1.3.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=media-libs/mesa-10.2[xa] virtual/libudev >=x11-libs/libdrm-2.4.54[video_cards_freedreno] >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
-DESCRIPTION=Driver for Adreno mobile GPUs
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/
-KEYWORDS=arm
-LICENSE=MIT
-RDEPEND=>=media-libs/mesa-10.2[xa] virtual/libudev >=x11-libs/libdrm-2.4.54[video_cards_freedreno] x11-base/xorg-server:= x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-freedreno-1.3.0.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xorg-2	234cf45e2565fab7c0dff5bd8d1f9177
-_md5_=5a7bb0bfe6dde3f05ae59b4c8d29745c
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-freedreno-1.4.0 b/metadata/md5-cache/x11-drivers/xf86-video-freedreno-1.4.0
deleted file mode 100644
index 85027e2bc695..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-video-freedreno-1.4.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=media-libs/mesa-10.2[xa] virtual/libudev >=x11-libs/libdrm-2.4.54[video_cards_freedreno] >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
-DESCRIPTION=Driver for Adreno mobile GPUs
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/
-KEYWORDS=arm
-LICENSE=MIT
-RDEPEND=>=media-libs/mesa-10.2[xa] virtual/libudev >=x11-libs/libdrm-2.4.54[video_cards_freedreno] x11-base/xorg-server:= x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-freedreno-1.4.0.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xorg-2	234cf45e2565fab7c0dff5bd8d1f9177
-_md5_=5a7bb0bfe6dde3f05ae59b4c8d29745c
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-i128-1.3.5 b/metadata/md5-cache/x11-drivers/xf86-video-i128-1.3.5
deleted file mode 100644
index d6a3ed3058be..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-video-i128-1.3.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
-DESCRIPTION=Number 9 I128 video driver
-EAPI=4
-HOMEPAGE=https://www.x.org/wiki/
-KEYWORDS=amd64 ia64 x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=MIT
-RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-i128-1.3.5.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xorg-2	234cf45e2565fab7c0dff5bd8d1f9177
-_md5_=6a8821c5f76c854cba21dd03e5496189
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-i128-1.3.6 b/metadata/md5-cache/x11-drivers/xf86-video-i128-1.3.6
deleted file mode 100644
index 636cc97fc891..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-video-i128-1.3.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
-DESCRIPTION=Number 9 I128 video driver
-EAPI=4
-HOMEPAGE=https://www.x.org/wiki/
-KEYWORDS=amd64 ia64 x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=MIT
-RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-i128-1.3.6.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xorg-2	234cf45e2565fab7c0dff5bd8d1f9177
-_md5_=6a8821c5f76c854cba21dd03e5496189
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-i128-1.3.6-r1 b/metadata/md5-cache/x11-drivers/xf86-video-i128-1.3.6-r1
deleted file mode 100644
index 20d1a64a05d0..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-video-i128-1.3.6-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
-DESCRIPTION=Number 9 I128 video driver
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/
-KEYWORDS=amd64 ia64 x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=MIT
-RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server:= x11-base/xorg-server[xorg] x11-libs/libpciaccess
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-i128-1.3.6.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xorg-2	234cf45e2565fab7c0dff5bd8d1f9177
-_md5_=cc524069cef6f6fe8647d0dc4c068004
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-i740-1.3.6 b/metadata/md5-cache/x11-drivers/xf86-video-i740-1.3.6
deleted file mode 100644
index b27f2641a0b9..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-video-i740-1.3.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
-DESCRIPTION=Intel i740 video driver
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/
-KEYWORDS=amd64 ia64 x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=MIT
-RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server:= x11-base/xorg-server[xorg] x11-libs/libpciaccess
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-i740-1.3.6.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xorg-2	234cf45e2565fab7c0dff5bd8d1f9177
-_md5_=7c3a2a609178a32febe5c81158beac0a
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-mach64-6.9.5 b/metadata/md5-cache/x11-drivers/xf86-video-mach64-6.9.5
deleted file mode 100644
index 6f8bcbdc6abc..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-video-mach64-6.9.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=x11-base/xorg-server-1.10 >=x11-libs/libpciaccess-0.12.901 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig dri? ( x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto ) x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
-DESCRIPTION=ATI Mach64 video driver
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/
-IUSE=dri
-KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=MIT
-RDEPEND=>=x11-base/xorg-server-1.10 >=x11-libs/libpciaccess-0.12.901 x11-base/xorg-server:= dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-mach64-6.9.5.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xorg-2	234cf45e2565fab7c0dff5bd8d1f9177
-_md5_=84550a1b54f09f85cc46bd689c0cb97e
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-neomagic-1.2.9 b/metadata/md5-cache/x11-drivers/xf86-video-neomagic-1.2.9
deleted file mode 100644
index 8661c46e6199..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-video-neomagic-1.2.9
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
-DESCRIPTION=Neomagic video driver
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/
-KEYWORDS=amd64 ia64 x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=MIT
-RDEPEND=x11-base/xorg-server:= x11-base/xorg-server[xorg] x11-libs/libpciaccess
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-neomagic-1.2.9.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xorg-2	234cf45e2565fab7c0dff5bd8d1f9177
-_md5_=1fe58886baa7aaa0b478d5eb9e3d88ca
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-opentegra-0.7.0 b/metadata/md5-cache/x11-drivers/xf86-video-opentegra-0.7.0
deleted file mode 100644
index 44fbdb763659..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-video-opentegra-0.7.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libdrm[video_cards_tegra] >=x11-base/xorg-server-1.13 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
-DESCRIPTION=X.Org video driver for NVIDIA Tegra
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/
-KEYWORDS=arm
-LICENSE=MIT
-RDEPEND=x11-libs/libdrm[video_cards_tegra] >=x11-base/xorg-server-1.13 x11-base/xorg-server:= x11-base/xorg-server[xorg] x11-libs/libpciaccess
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-opentegra-0.7.0.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xorg-2	234cf45e2565fab7c0dff5bd8d1f9177
-_md5_=d2e49d0918ce97496c442f9845fcf2c6
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-rendition-4.2.6 b/metadata/md5-cache/x11-drivers/xf86-video-rendition-4.2.6
deleted file mode 100644
index 4230b52bc5eb..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-video-rendition-4.2.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
-DESCRIPTION=Rendition video driver
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/
-KEYWORDS=alpha amd64 ia64 x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=MIT
-RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server:= x11-base/xorg-server[xorg] x11-libs/libpciaccess
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-rendition-4.2.6.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xorg-2	234cf45e2565fab7c0dff5bd8d1f9177
-_md5_=1c783e7598fbce25eac2897c50a63e26
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-s3-0.6.5 b/metadata/md5-cache/x11-drivers/xf86-video-s3-0.6.5
deleted file mode 100644
index f304330af722..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-video-s3-0.6.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
-DESCRIPTION=X.Org driver for s3 cards
-EAPI=4
-HOMEPAGE=https://www.x.org/wiki/
-KEYWORDS=alpha amd64 ia64 ppc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=MIT
-RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-s3-0.6.5.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xorg-2	234cf45e2565fab7c0dff5bd8d1f9177
-_md5_=aa04d203d4d6a58ea63cd6ae8194a145
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-s3-0.6.5-r1 b/metadata/md5-cache/x11-drivers/xf86-video-s3-0.6.5-r1
deleted file mode 100644
index d3e6737a38f2..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-video-s3-0.6.5-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
-DESCRIPTION=X.Org driver for s3 cards
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/
-KEYWORDS=alpha amd64 ia64 ppc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=MIT
-RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server:= x11-base/xorg-server[xorg] x11-libs/libpciaccess
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-s3-0.6.5.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xorg-2	234cf45e2565fab7c0dff5bd8d1f9177
-_md5_=c4e7e0c5e395ef7e2c9253baa96b4093
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-s3virge-1.10.7 b/metadata/md5-cache/x11-drivers/xf86-video-s3virge-1.10.7
deleted file mode 100644
index a76eaea987fc..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-video-s3virge-1.10.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
-DESCRIPTION=S3 ViRGE video driver
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/
-KEYWORDS=alpha amd64 ia64 ppc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=MIT
-RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server:= x11-base/xorg-server[xorg] x11-libs/libpciaccess
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-s3virge-1.10.7.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xorg-2	234cf45e2565fab7c0dff5bd8d1f9177
-_md5_=90071cf6599ddde8efeeb759f5ef90f5
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-savage-2.3.9 b/metadata/md5-cache/x11-drivers/xf86-video-savage-2.3.9
deleted file mode 100644
index c449727183fe..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-video-savage-2.3.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 >=x11-proto/xextproto-7.0.99.1 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig dri? ( x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto ) x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
-DESCRIPTION=S3 Savage video driver
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/
-IUSE=dri dri
-KEYWORDS=alpha amd64 ia64 ppc sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=MIT
-RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server:= dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-savage-2.3.9.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xorg-2	234cf45e2565fab7c0dff5bd8d1f9177
-_md5_=258ee9a960f029f2c074dd6587449a53
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-sis-0.10.9 b/metadata/md5-cache/x11-drivers/xf86-video-sis-0.10.9
deleted file mode 100644
index 22a7836a7094..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-video-sis-0.10.9
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-proto/xf86dgaproto-2.1 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
-DESCRIPTION=SiS and XGI video driver
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/
-KEYWORDS=amd64 ia64 ppc x86 ~x86-fbsd
-LICENSE=MIT
-RDEPEND=x11-base/xorg-server:= x11-base/xorg-server[xorg] x11-libs/libpciaccess
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-sis-0.10.9.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xorg-2	234cf45e2565fab7c0dff5bd8d1f9177
-_md5_=06882988e11b7d6d3f6a1d675b2032e2
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-sisusb-0.9.7 b/metadata/md5-cache/x11-drivers/xf86-video-sisusb-0.9.7
deleted file mode 100644
index 0aba89cdab07..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-video-sisusb-0.9.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.6 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
-DESCRIPTION=SiS USB video driver
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/
-KEYWORDS=alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sh sparc x86
-LICENSE=MIT
-RDEPEND=>=x11-base/xorg-server-1.6 x11-base/xorg-server:= x11-base/xorg-server[xorg] x11-libs/libpciaccess
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-sisusb-0.9.7.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xorg-2	234cf45e2565fab7c0dff5bd8d1f9177
-_md5_=6b565897f28603bb9d8870122ac3c7c5
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-suncg14-1.1.1 b/metadata/md5-cache/x11-drivers/xf86-video-suncg14-1.1.1
deleted file mode 100644
index 1bb86751a23c..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-video-suncg14-1.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/xproto >=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 >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
-DESCRIPTION=CG14 video driver
-EAPI=0
-HOMEPAGE=https://www.x.org/wiki/
-IUSE=debug
-KEYWORDS=-* sparc
-LICENSE=MIT
-RDEPEND=>=x11-base/xorg-server-1.0.99 !<=x11-base/xorg-x11-6.9
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-suncg14-1.1.1.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	x-modular	86e1c261fa29a3c90ba68eb9f9d45ce4
-_md5_=8266504eface45d02258810a4145d14e
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-suncg14-1.1.2 b/metadata/md5-cache/x11-drivers/xf86-video-suncg14-1.1.2
deleted file mode 100644
index 4f00eb7b1353..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-video-suncg14-1.1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/xproto >=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 >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
-DESCRIPTION=CG14 video driver
-EAPI=0
-HOMEPAGE=https://www.x.org/wiki/
-IUSE=debug
-KEYWORDS=-* sparc
-LICENSE=MIT
-RDEPEND=>=x11-base/xorg-server-1.0.99 !<=x11-base/xorg-x11-6.9
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-suncg14-1.1.2.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	x-modular	86e1c261fa29a3c90ba68eb9f9d45ce4
-_md5_=4f3f0e457770eed9dcc82d1f651a8104
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-suncg3-1.1.1 b/metadata/md5-cache/x11-drivers/xf86-video-suncg3-1.1.1
deleted file mode 100644
index b1467da452f6..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-video-suncg3-1.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/xproto >=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 >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
-DESCRIPTION=CG3 video driver
-EAPI=0
-HOMEPAGE=https://www.x.org/wiki/
-IUSE=debug
-KEYWORDS=-* sparc
-LICENSE=MIT
-RDEPEND=>=x11-base/xorg-server-1.0.99 !<=x11-base/xorg-x11-6.9
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-suncg3-1.1.1.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	x-modular	86e1c261fa29a3c90ba68eb9f9d45ce4
-_md5_=862ce54d5bf62ffbb0f247c9bf755e91
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-suncg3-1.1.2 b/metadata/md5-cache/x11-drivers/xf86-video-suncg3-1.1.2
deleted file mode 100644
index 92365f1fea16..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-video-suncg3-1.1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/xproto >=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 >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
-DESCRIPTION=CG3 video driver
-EAPI=0
-HOMEPAGE=https://www.x.org/wiki/
-IUSE=debug
-KEYWORDS=-* sparc
-LICENSE=MIT
-RDEPEND=>=x11-base/xorg-server-1.0.99 !<=x11-base/xorg-x11-6.9
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-suncg3-1.1.2.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	x-modular	86e1c261fa29a3c90ba68eb9f9d45ce4
-_md5_=9e68baa2023b6df34bdbb99ab8f789eb
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-suncg6-1.1.1 b/metadata/md5-cache/x11-drivers/xf86-video-suncg6-1.1.1
deleted file mode 100644
index c26e7d3e509c..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-video-suncg6-1.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/xproto >=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 >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
-DESCRIPTION=GX/Turbo GX video driver
-EAPI=0
-HOMEPAGE=https://www.x.org/wiki/
-IUSE=debug
-KEYWORDS=-* sparc
-LICENSE=MIT
-RDEPEND=>=x11-base/xorg-server-1.0.99 !<=x11-base/xorg-x11-6.9
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-suncg6-1.1.1.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	x-modular	86e1c261fa29a3c90ba68eb9f9d45ce4
-_md5_=6e2c710e109d97bb20be4c0bc815ac92
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-suncg6-1.1.2 b/metadata/md5-cache/x11-drivers/xf86-video-suncg6-1.1.2
deleted file mode 100644
index 1a232874ab05..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-video-suncg6-1.1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/xproto >=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 >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
-DESCRIPTION=GX/Turbo GX video driver
-EAPI=0
-HOMEPAGE=https://www.x.org/wiki/
-IUSE=debug
-KEYWORDS=-* sparc
-LICENSE=MIT
-RDEPEND=>=x11-base/xorg-server-1.0.99 !<=x11-base/xorg-x11-6.9
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-suncg6-1.1.2.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	x-modular	86e1c261fa29a3c90ba68eb9f9d45ce4
-_md5_=08b5dd95ecc967f9f66e43fab5f96aad
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-sunffb-1.2.1 b/metadata/md5-cache/x11-drivers/xf86-video-sunffb-1.2.1
deleted file mode 100644
index 6838b45310ff..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-video-sunffb-1.2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/xextproto x11-proto/xproto >=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 >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
-DESCRIPTION=SUNFFB video driver
-EAPI=0
-HOMEPAGE=https://www.x.org/wiki/
-IUSE=debug
-KEYWORDS=-* sparc
-LICENSE=MIT
-RDEPEND=>=x11-base/xorg-server-1.0.99 !<=x11-base/xorg-x11-6.9
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-sunffb-1.2.1.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	x-modular	86e1c261fa29a3c90ba68eb9f9d45ce4
-_md5_=6f0eb1b1488cf1c9793c86caa82efa27
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-sunffb-1.2.2-r1 b/metadata/md5-cache/x11-drivers/xf86-video-sunffb-1.2.2-r1
deleted file mode 100644
index 849e14297490..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-video-sunffb-1.2.2-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
-DESCRIPTION=SUNFFB video driver
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/
-KEYWORDS=-* sparc
-LICENSE=MIT
-RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server:= x11-base/xorg-server[xorg] x11-libs/libpciaccess
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-sunffb-1.2.2.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xorg-2	234cf45e2565fab7c0dff5bd8d1f9177
-_md5_=14ce20686a046bf5273bf5b8614dc00b
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-sunleo-1.2.0 b/metadata/md5-cache/x11-drivers/xf86-video-sunleo-1.2.0
deleted file mode 100644
index 1564970789b2..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-video-sunleo-1.2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/xproto >=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 >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
-DESCRIPTION=Leo video driver
-EAPI=0
-HOMEPAGE=https://www.x.org/wiki/
-IUSE=debug
-KEYWORDS=-* sparc
-LICENSE=MIT
-RDEPEND=>=x11-base/xorg-server-1.0.99 !<=x11-base/xorg-x11-6.9
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-sunleo-1.2.0.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	x-modular	86e1c261fa29a3c90ba68eb9f9d45ce4
-_md5_=8767b269890706142f25211025db5194
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-sunleo-1.2.1 b/metadata/md5-cache/x11-drivers/xf86-video-sunleo-1.2.1
deleted file mode 100644
index 9cc225ee9698..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-video-sunleo-1.2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/xproto >=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 >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
-DESCRIPTION=Leo video driver
-EAPI=0
-HOMEPAGE=https://www.x.org/wiki/
-IUSE=debug
-KEYWORDS=-* sparc
-LICENSE=MIT
-RDEPEND=>=x11-base/xorg-server-1.0.99 !<=x11-base/xorg-x11-6.9
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-sunleo-1.2.1.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	x-modular	86e1c261fa29a3c90ba68eb9f9d45ce4
-_md5_=f27d0c407a9b087c8a878a843f441e84
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-sunleo-1.2.2 b/metadata/md5-cache/x11-drivers/xf86-video-sunleo-1.2.2
deleted file mode 100644
index 3b4b23383725..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-video-sunleo-1.2.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/xproto >=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 >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
-DESCRIPTION=Leo video driver
-EAPI=0
-HOMEPAGE=https://www.x.org/wiki/
-IUSE=debug
-KEYWORDS=-* sparc
-LICENSE=MIT
-RDEPEND=>=x11-base/xorg-server-1.0.99 !<=x11-base/xorg-x11-6.9
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-sunleo-1.2.2.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	x-modular	86e1c261fa29a3c90ba68eb9f9d45ce4
-_md5_=f27d0c407a9b087c8a878a843f441e84
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-suntcx-1.1.1 b/metadata/md5-cache/x11-drivers/xf86-video-suntcx-1.1.1
deleted file mode 100644
index 3e50c57c4590..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-video-suntcx-1.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/xproto >=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 >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
-DESCRIPTION=TCX video driver
-EAPI=0
-HOMEPAGE=https://www.x.org/wiki/
-IUSE=debug
-KEYWORDS=-* sparc
-LICENSE=MIT
-RDEPEND=>=x11-base/xorg-server-1.0.99 !<=x11-base/xorg-x11-6.9
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-suntcx-1.1.1.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	x-modular	86e1c261fa29a3c90ba68eb9f9d45ce4
-_md5_=066df26d7e241e417c5fd75937918d89
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-suntcx-1.1.2 b/metadata/md5-cache/x11-drivers/xf86-video-suntcx-1.1.2
deleted file mode 100644
index 6bedbc748b95..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-video-suntcx-1.1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/xproto >=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 >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0
-DESCRIPTION=TCX video driver
-EAPI=0
-HOMEPAGE=https://www.x.org/wiki/
-IUSE=debug
-KEYWORDS=-* sparc
-LICENSE=MIT
-RDEPEND=>=x11-base/xorg-server-1.0.99 !<=x11-base/xorg-x11-6.9
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-suntcx-1.1.2.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	x-modular	86e1c261fa29a3c90ba68eb9f9d45ce4
-_md5_=83ff590df31744fb086cc78b788558e8
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-tga-1.2.2 b/metadata/md5-cache/x11-drivers/xf86-video-tga-1.2.2
deleted file mode 100644
index f6da3df74e33..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-video-tga-1.2.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/xf86dgaproto >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
-DESCRIPTION=X.Org driver for tga cards
-EAPI=4
-HOMEPAGE=https://www.x.org/wiki/
-KEYWORDS=alpha amd64 ia64 x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=MIT
-RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-tga-1.2.2.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xorg-2	234cf45e2565fab7c0dff5bd8d1f9177
-_md5_=565d99cd571600f2ff0fe665bfcb65b8
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-tga-1.2.2-r1 b/metadata/md5-cache/x11-drivers/xf86-video-tga-1.2.2-r1
deleted file mode 100644
index 3565ded19100..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-video-tga-1.2.2-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/xf86dgaproto >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
-DESCRIPTION=X.Org driver for tga cards
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/
-KEYWORDS=alpha amd64 ia64 x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=MIT
-RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server:= x11-base/xorg-server[xorg] x11-libs/libpciaccess
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-tga-1.2.2.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xorg-2	234cf45e2565fab7c0dff5bd8d1f9177
-_md5_=f77784b8bf3224d0c44276f6eb591a97
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-trident-1.3.8 b/metadata/md5-cache/x11-drivers/xf86-video-trident-1.3.8
deleted file mode 100644
index ca0b75d4a93e..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-video-trident-1.3.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
-DESCRIPTION=Trident video driver
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/
-KEYWORDS=amd64 ia64 ppc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=MIT
-RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server:= x11-base/xorg-server[xorg] x11-libs/libpciaccess
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-trident-1.3.8.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xorg-2	234cf45e2565fab7c0dff5bd8d1f9177
-_md5_=98cad13b5352ca10bba8747f1d4287ab
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-tseng-1.2.5-r1 b/metadata/md5-cache/x11-drivers/xf86-video-tseng-1.2.5-r1
deleted file mode 100644
index 40faf0917f89..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-video-tseng-1.2.5-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[xorg] x11-libs/libpciaccess
-DESCRIPTION=Tseng Labs video driver
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/
-KEYWORDS=amd64 ia64 x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=MIT
-RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server:= x11-base/xorg-server[xorg] x11-libs/libpciaccess
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-tseng-1.2.5.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xorg-2	234cf45e2565fab7c0dff5bd8d1f9177
-_md5_=dbbc2bf057a3c032f8312b3f85af8daa
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index c1c6d711ab2e..a2533971029f 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/afbinit-1.0.1-r7 b/metadata/md5-cache/x11-misc/afbinit-1.0.1-r7
deleted file mode 100644
index 9f46616b7b85..000000000000
--- a/metadata/md5-cache/x11-misc/afbinit-1.0.1-r7
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install postinst unpack
-DESCRIPTION=loads the microcode for Elite3D framebuffers to use X
-EAPI=0
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=-* sparc
-LICENSE=GPL-1
-RDEPEND=sys-apps/util-linux
-SLOT=0
-SRC_URI=mirror://gentoo/afbinit-1.0.1.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=a31ab4dd743bd0ea8ec9a4d7ba00d75c
diff --git a/metadata/md5-cache/x11-misc/qtnotifydaemon-1.0.14 b/metadata/md5-cache/x11-misc/qtnotifydaemon-1.0.14
deleted file mode 100644
index 3c278296a6d4..000000000000
--- a/metadata/md5-cache/x11-misc/qtnotifydaemon-1.0.14
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=x11-libs/libX11 dev-qt/qtdbus:4 dev-qt/qtgui:4 dev-qt/qt3support:4 !x11-misc/notification-daemon !x11-misc/notify-osd
-DESCRIPTION=A flexible and configurable notification daemon
-EAPI=4
-HOMEPAGE=https://sourceforge.net/projects/qtnotifydaemon/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=x11-libs/libX11 dev-qt/qtdbus:4 dev-qt/qtgui:4 dev-qt/qt3support:4 !x11-misc/notification-daemon !x11-misc/notify-osd
-SLOT=0
-SRC_URI=mirror://sourceforge/qtnotifydaemon/qtnotifydaemon_1.0.14.orig.tar.gz
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	qt4-r2	b7985a3197fbc3a22d059f19904e735b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=3077e4ece4c1b0be421fa8d60e07950d
diff --git a/metadata/md5-cache/x11-plugins/Manifest.gz b/metadata/md5-cache/x11-plugins/Manifest.gz
index 28ce6abd20c6..0d850e8a3ec1 100644
--- a/metadata/md5-cache/x11-plugins/Manifest.gz
+++ b/metadata/md5-cache/x11-plugins/Manifest.gz
diff --git a/metadata/md5-cache/x11-plugins/enigmail-1.9.6.1-r1 b/metadata/md5-cache/x11-plugins/enigmail-1.9.6.1-r1
deleted file mode 100644
index 74bbdd196da1..000000000000
--- a/metadata/md5-cache/x11-plugins/enigmail-1.9.6.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst setup
-DEPEND=|| ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk(-)] app-crypt/pinentry[qt4(-)] app-crypt/pinentry[qt5(-)] ) ) =app-crypt/gnupg-1.4* ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) app-arch/zip dev-lang/perl
-DESCRIPTION=Mozilla extension to provide GPG support in mail clients
-EAPI=6
-HOMEPAGE=http://www.enigmail.net/
-KEYWORDS=~alpha amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=MPL-2.0 GPL-3
-RDEPEND=|| ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk(-)] app-crypt/pinentry[qt4(-)] app-crypt/pinentry[qt5(-)] ) ) =app-crypt/gnupg-1.4* )
-SLOT=0
-SRC_URI=http://www.enigmail.net/download/source/enigmail-1.9.6.1.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=9eae1404364d468f5f995bb680f7a76b
diff --git a/metadata/md5-cache/x11-plugins/enigmail-1.9.8.1 b/metadata/md5-cache/x11-plugins/enigmail-1.9.8.1
deleted file mode 100644
index e6aaaafc41b6..000000000000
--- a/metadata/md5-cache/x11-plugins/enigmail-1.9.8.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst setup
-DEPEND=|| ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk(-)] app-crypt/pinentry[qt4(-)] app-crypt/pinentry[qt5(-)] ) ) =app-crypt/gnupg-1.4* ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) app-arch/zip dev-lang/perl
-DESCRIPTION=Mozilla extension to provide GPG support in mail clients
-EAPI=6
-HOMEPAGE=http://www.enigmail.net/
-KEYWORDS=~alpha amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=MPL-2.0 GPL-3
-RDEPEND=|| ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk(-)] app-crypt/pinentry[qt4(-)] app-crypt/pinentry[qt5(-)] ) ) =app-crypt/gnupg-1.4* )
-SLOT=0
-SRC_URI=http://www.enigmail.net/download/source/enigmail-1.9.8.1.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=9eae1404364d468f5f995bb680f7a76b
diff --git a/metadata/md5-cache/x11-plugins/enigmail-1.9.8.2 b/metadata/md5-cache/x11-plugins/enigmail-1.9.8.2
deleted file mode 100644
index ff369a79a52a..000000000000
--- a/metadata/md5-cache/x11-plugins/enigmail-1.9.8.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst setup
-DEPEND=|| ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk(-)] app-crypt/pinentry[qt4(-)] app-crypt/pinentry[qt5(-)] ) ) =app-crypt/gnupg-1.4* ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) app-arch/zip dev-lang/perl
-DESCRIPTION=Mozilla extension to provide GPG support in mail clients
-EAPI=6
-HOMEPAGE=http://www.enigmail.net/
-KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=MPL-2.0 GPL-3
-RDEPEND=|| ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk(-)] app-crypt/pinentry[qt4(-)] app-crypt/pinentry[qt5(-)] ) ) =app-crypt/gnupg-1.4* )
-SLOT=0
-SRC_URI=http://www.enigmail.net/download/source/enigmail-1.9.8.2.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=c35d41cf77ca00d7a1f41481e570b664
diff --git a/metadata/md5-cache/x11-plugins/enigmail-1.9.8.3 b/metadata/md5-cache/x11-plugins/enigmail-1.9.8.3
deleted file mode 100644
index cd5335415d98..000000000000
--- a/metadata/md5-cache/x11-plugins/enigmail-1.9.8.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst setup
-DEPEND=|| ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk(-)] app-crypt/pinentry[qt4(-)] app-crypt/pinentry[qt5(-)] ) ) =app-crypt/gnupg-1.4* ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) app-arch/zip dev-lang/perl
-DESCRIPTION=Mozilla extension to provide GPG support in mail clients
-EAPI=6
-HOMEPAGE=http://www.enigmail.net/
-KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=MPL-2.0 GPL-3
-RDEPEND=|| ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk(-)] app-crypt/pinentry[qt4(-)] app-crypt/pinentry[qt5(-)] ) ) =app-crypt/gnupg-1.4* )
-SLOT=0
-SRC_URI=http://www.enigmail.net/download/source/enigmail-1.9.8.3.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=c35d41cf77ca00d7a1f41481e570b664
diff --git a/metadata/md5-cache/x11-plugins/enigmail-1.9.8.3-r1 b/metadata/md5-cache/x11-plugins/enigmail-1.9.8.3-r1
deleted file mode 100644
index f309bcd1d956..000000000000
--- a/metadata/md5-cache/x11-plugins/enigmail-1.9.8.3-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst setup
-DEPEND=|| ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk(-)] app-crypt/pinentry[qt4(-)] app-crypt/pinentry[qt5(-)] ) ) =app-crypt/gnupg-1.4* ) !<mail-client/thunderbird-52.5.0 !<www-client/seamonkey-2.49.5.0_p0 || ( >=dev-lang/python-2.7.5-r2:2.7 ) app-arch/zip dev-lang/perl
-DESCRIPTION=Mozilla extension to provide GPG support in mail clients
-EAPI=6
-HOMEPAGE=http://www.enigmail.net/
-KEYWORDS=~alpha amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=MPL-2.0 GPL-3
-RDEPEND=|| ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk(-)] app-crypt/pinentry[qt4(-)] app-crypt/pinentry[qt5(-)] ) ) =app-crypt/gnupg-1.4* ) !<mail-client/thunderbird-52.5.0 !<www-client/seamonkey-2.49.5.0_p0
-SLOT=0
-SRC_URI=http://www.enigmail.net/download/source/enigmail-1.9.8.3.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=5092bc2784f0d39f07c35db64006a537
diff --git a/metadata/md5-cache/x11-plugins/qled-0.6.2 b/metadata/md5-cache/x11-plugins/qled-0.6.2
deleted file mode 100644
index b1480d76c5e9..000000000000
--- a/metadata/md5-cache/x11-plugins/qled-0.6.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=|| ( ( >=dev-qt/qtgui-4.8.5:4 dev-qt/designer:4 ) <dev-qt/qtgui-4.8.5:4 ) dev-qt/qtsvg:4 app-arch/unzip
-DESCRIPTION=Custom Led widget plugin for Qt-Designer
-EAPI=3
-HOMEPAGE=http://qt-apps.org/content/show.php?content=72482
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=|| ( ( >=dev-qt/qtgui-4.8.5:4 dev-qt/designer:4 ) <dev-qt/qtgui-4.8.5:4 ) dev-qt/qtsvg:4
-SLOT=0
-SRC_URI=http://qt-apps.org/CONTENT/content-files/72482-QLed-0.6.2.zip
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	qt4-r2	b7985a3197fbc3a22d059f19904e735b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=ec60ecef591f2943532d1ff3b7b307e0
diff --git a/metadata/md5-cache/x11-plugins/wmcpuwatch-0.2 b/metadata/md5-cache/x11-plugins/wmcpuwatch-0.2-r1
index 9fe846b17305..048a36938f81 100644
--- a/metadata/md5-cache/x11-plugins/wmcpuwatch-0.2
+++ b/metadata/md5-cache/x11-plugins/wmcpuwatch-0.2-r1
@@ -1,12 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=x11-libs/libdockapp-0.7:= sys-devel/make >=dev-util/cmake-3.7.2
+DEPEND=>=x11-libs/libdockapp-0.7:= doc? ( app-doc/doxygen[dot] ) sys-devel/make >=dev-util/cmake-3.7.2
 DESCRIPTION=dockapp showing the load of every logical CPU on the system
 EAPI=6
 HOMEPAGE=https://bitbucket.org/StarFire/wmcpuwatch
+IUSE=doc
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=>=x11-libs/libdockapp-0.7:=
 SLOT=0
 SRC_URI=https://bitbucket.org/StarFire/wmcpuwatch/downloads/wmcpuwatch-0.2.tar.bz2
 _eclasses_=cmake-utils	77a5a8d3308359caadcdd91688f20093	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=996fe2c35968a45c5ffe8cda35ee6f72
+_md5_=f1c2a11b2866e28d63456766c688b6e3
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index 1a4bd52e8442..235861363734 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/xpra-1.0.6 b/metadata/md5-cache/x11-wm/xpra-1.0.6
index 99557b8f76b0..db649cfc6e58 100644
--- a/metadata/md5-cache/x11-wm/xpra-1.0.6
+++ b/metadata/md5-cache/x11-wm/xpra-1.0.6
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
 REQUIRED_USE=|| ( python_targets_python2_7 ) clipboard? ( || ( server client ) ) cups? ( dbus ) opengl? ( client ) || ( client server ) client? ( enc_x264? ( dec_avcodec2 ) enc_x265? ( dec_avcodec2 ) ) || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://xpra.org/src/xpra-1.0.6.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	tmpfiles	8b4d2e2e77723f4b289896f699954fe9	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	tmpfiles	7bd1d7bf5261430a2d2991cff7958c52	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=7955174f20796f3b568ade0afe0219d9
diff --git a/metadata/md5-cache/x11-wm/xpra-1.0.9 b/metadata/md5-cache/x11-wm/xpra-1.0.9
index c09511a30502..c36e49137e6f 100644
--- a/metadata/md5-cache/x11-wm/xpra-1.0.9
+++ b/metadata/md5-cache/x11-wm/xpra-1.0.9
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
 REQUIRED_USE=|| ( python_targets_python2_7 ) clipboard? ( || ( server client ) ) cups? ( dbus ) opengl? ( client ) || ( client server ) client? ( enc_x264? ( dec_avcodec2 ) enc_x265? ( dec_avcodec2 ) ) || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://xpra.org/src/xpra-1.0.9.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	tmpfiles	8b4d2e2e77723f4b289896f699954fe9	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	tmpfiles	7bd1d7bf5261430a2d2991cff7958c52	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=695b982ee94986daff456881635f63e0
diff --git a/metadata/md5-cache/x11-wm/xpra-2.0.2 b/metadata/md5-cache/x11-wm/xpra-2.0.2
index ad367f3dc806..db315ef3d0f8 100644
--- a/metadata/md5-cache/x11-wm/xpra-2.0.2
+++ b/metadata/md5-cache/x11-wm/xpra-2.0.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
 REQUIRED_USE=|| ( python_targets_python2_7 ) clipboard? ( || ( server client ) ) cups? ( dbus ) opengl? ( client ) || ( client server ) client? ( enc_x264? ( dec_avcodec2 ) enc_x265? ( dec_avcodec2 ) ) || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://xpra.org/src/xpra-2.0.2.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	tmpfiles	8b4d2e2e77723f4b289896f699954fe9	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	tmpfiles	7bd1d7bf5261430a2d2991cff7958c52	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b86c48fb3afa4f71eea483c5ccf2bd33
diff --git a/metadata/md5-cache/x11-wm/xpra-2.1.3 b/metadata/md5-cache/x11-wm/xpra-2.1.3
index 45af00b29e25..dfdde1ef65b1 100644
--- a/metadata/md5-cache/x11-wm/xpra-2.1.3
+++ b/metadata/md5-cache/x11-wm/xpra-2.1.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
 REQUIRED_USE=|| ( python_targets_python2_7 ) clipboard? ( || ( server client ) ) cups? ( dbus ) opengl? ( client ) || ( client server ) client? ( enc_x264? ( dec_avcodec2 ) enc_x265? ( dec_avcodec2 ) ) || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://xpra.org/src/xpra-2.1.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	tmpfiles	8b4d2e2e77723f4b289896f699954fe9	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	tmpfiles	7bd1d7bf5261430a2d2991cff7958c52	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=23fc81aa504ab641c4c48b8219e710db
diff --git a/metadata/md5-cache/x11-wm/xpra-2.2.1 b/metadata/md5-cache/x11-wm/xpra-2.2.1
index c7960b412050..90dbf6ad7d8c 100644
--- a/metadata/md5-cache/x11-wm/xpra-2.2.1
+++ b/metadata/md5-cache/x11-wm/xpra-2.2.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
 REQUIRED_USE=|| ( python_targets_python2_7 ) clipboard? ( || ( server client ) ) cups? ( dbus ) opengl? ( client ) || ( client server ) client? ( enc_x264? ( dec_avcodec2 ) enc_x265? ( dec_avcodec2 ) ) || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://xpra.org/src/xpra-2.2.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	tmpfiles	8b4d2e2e77723f4b289896f699954fe9	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	tmpfiles	7bd1d7bf5261430a2d2991cff7958c52	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8d917198b11e7edf540dd8168804c7fd
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 0f3366ebae9c..0200c6a477a9 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 18681 BLAKE2B 4f85adba586bfd437a0328673a50f9ff929b291451a2e78ff32d7e1f6aeac36cbfce721d56e702e4af82ecaf36e51941bee4738c97c7436334b0e3e6e9ae2aab SHA512 cba0a30e14d7bfc769327a97e3bc72f859d18d8b00b3bdc01eaf9cbbd4082a156ae3b4a82bb820804f4255af798ad3bc668cd148a3a069fc90a374cb5f377fe0
-TIMESTAMP 2018-01-01T19:39:39Z
+TIMESTAMP 2018-01-02T13:39:45Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlpKjntfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlpLi6FfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAmwg//UVyGOE+5ErXuke1V8OZaHGpS/cmyuWA7BJSeFRQJGWKOWhjEM+x8cSW6
-/6Gl+Qj1F4SFSAsakYXqZL8mTCwovvHfILGA8FOVVumv+eruKMHdhNI0AankpVVn
-RYgUo449+HrKyEVEYFoOfATLkimUK7o/dT6i/w5boGgKplrciGeAEY9M4evCuxOv
-+B0B4Kvk1gErx/m7plFTpbr8HVmmNByWA2wyG+vB7i0iBJN0L+jk46meK+oSEqb3
-2pJi6XgvF1xUc7bhNQWURUB27Yu9XBjM8iGu8EK7FKpX2+6I53muy0FAvIWzMI0Z
-qy4ItAmWCtAhq5xIKPuZ+JO2Op89X0727PshiKTuiO1K31EKBc0zIXETEUQx1hhf
-/lNNbZUFpL08G7z0pDIyFyZXUOOOGRU1K6Nxj6n515IgSJeuCnzME898NT/Dge7l
-mI89Eul8quQIVwkH9+4OTplUaWcuVFk4nWxFuR9gSRlOCj0N9jzvfx9cXMywLx6g
-Sz/Zos0ueoS+V7R8uYMw4X5hpIaG03ylk5+px+Z94N+QOwTvoiEGmOyahAI0rOTW
-4ox035Z1+kpvqHbilk3K4516SnDajHtJOlDD8qaJM+2qPCElPULOZPEOdLP2F41F
-T9Sv7MLlyJgzW5Ky63h7XMowh8Bny6eP0FIuaxi+ZAyKUPDHeYk=
-=aUKt
+klCahhAAlx787J0fH13jNhDXtu/XEVlF/NSFLBZD2N+AkuoQf3OyoVdMcGAOMoBo
+4Il5gl3wW2kYGNeEz7zUhtG4+UlEtp0NfHzv+zdqrt4nKHxlWa1svMl3LV25tWWW
+nnpuAtM6O4GQxmSMNV8u7IibO1ADV8dyxtupc/gh6ZcuIrHZ3eXoiy1v6gTu9/sR
+lydMYPRxoaWoWmnVQqGAeJgGrTjt+y1Ewpb0pomtP+4lDerBaNIhyvCLbaFy4/Et
+IXT/c5AGE63K+UR7Y3dUqYLP1kdETzeTIAw5d8uIPM8Q79w7zKiwqzuOvGib4bII
+EENdcVPD55tShHKvFjZc3pFeAaSKoUfQvu3Rz8tRBeyBLn3ls8LkrN2Yop/ZvFby
+45NRUxqXzb5ULkv9r3b+oDf/E0ZFRcBmTZZF+IkHuOyZ42IyrMlCpEmsby53KCHe
+BCPDlNVrCie2FRZalypWezuz3o4L24JF+reducxbCGj1Fmherp6JmV3FbE64hHmF
+HmVv8m996l2X9xHr1KyMBnVMoGYwFhfQkcGzFLtoPmXsAtE3A7zdS0ZLvFW7N9Ny
+5IOQiy/v+NKCaweP+XYO7uYUUk6SfRAhbrGmacD84DWqQeK6HJ4wBnLlJXC0tiZY
+RPXXyVRnhaOKuavZaOhZ4clmGxJPesH9foe28lq4Y3yRipNuZUs=
+=AqhW
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 4eb6604db6eb..5eb5ad3930e4 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Mon, 01 Jan 2018 19:39:35 +0000
+Tue, 02 Jan 2018 13:39:41 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 2f8ac5a9803c..9937b9ff0cd4 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Mon Jan  1 19:39:35 UTC 2018
+Tue Jan  2 13:39:41 UTC 2018
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index d7f33a42e6a7..c1f6ca761ede 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 01 Jan 2018 19:45:01 +0000
+Tue, 02 Jan 2018 13:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index d3744fda27a8..34a702274f64 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-a82ed1401311281ac33d6589a64a6cc6269a28e8 1514835091 2018-01-01T19:31:31+00:00
+8845fb86370df98660919bfad9445df896322356 1514899974 2018-01-02T13:32:54+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index ddc0f336ddf8..4c4ee2e6a903 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1514835601 Mon 01 Jan 2018 07:40:01 PM UTC
+1514900401 Tue 02 Jan 2018 01:40:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 4eb6604db6eb..5eb5ad3930e4 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Mon, 01 Jan 2018 19:39:35 +0000
+Tue, 02 Jan 2018 13:39:41 +0000
diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index 05b1063beec4..2caaba65c5ff 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index d78e8f19cf48..3ee26e2ea6cf 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -15,20 +15,28 @@ AUX shorewall6-lite.systemd 612 BLAKE2B e658af2b6d399fe527a58201b80997651954df67
 AUX shorewall6.systemd 577 BLAKE2B 5c755c0105954a34e39e077af0e012d9d6e647715a4b12fbae4fc47f4ae19afd6a63266b3684ddead689b2d4f7450b7a12906258fc86ef33fc36a4dac3771274 SHA512 96b69df246a18e8b7dbfdbe78959da1baa8f2a97eb290853d4040a895f2ae91b97addd2ab4e4e19345960ffe8f1b099442f40ce319b27f0d4d8d7d4780d2e78d
 AUX shorewallrc-r1 2075 BLAKE2B 7aeaa263ea5c318d3c2b29262e655929f87e36de17e347e613bb9ac4141deea5ba983695b4279effb3ba8b4a5da706a2213209571866e8bdb844c9619f1df85d SHA512 9cf87d5b5807b224a325c9d038f159e55d277ad3eca62a1fd82d06d9ec1d0f71e58b239c57532b9b081271c7ab6f90b281cea1dca0bb9ea26e1e1c8ddaf3a691
 DIST shorewall-5.1.10.1.tar.bz2 535652 BLAKE2B afeb0c79e5e191e923f0e44f9925ec32f2d97a5962dd6fcc75e28ded1b3b13f33ddcbd4f60f261b2b7b4cf2112ff9074545d88c8dfc02bf2147c3c0c2b941c97 SHA512 75b63b418bfacf3151f1833547ca187a9d87e1657bf02f9225d5067bc05a137cabb74709cf6d64c37e2f8fd8d5304154f265968e8b707ba08167d91be93f4ef5
+DIST shorewall-5.1.10.2.tar.bz2 535735 BLAKE2B 49594b997e90859db4fd94f3017ea47696579791cca881460fd916eba1c477d62f9ed2fbc25b22a3ff425084a169260cf6a6d00f1f59e574c996b97dfccb7232 SHA512 6f0d88ecef130be4283103ebf2c31ddad6791caf113448fcf29664a951067a070a7becf495e4a5cbe96aff81aff7d2028011421208e6d0dbbfa4608f3350f401
 DIST shorewall-5.1.9.tar.bz2 529237 BLAKE2B abf9b54ef6083d322bd2e4fc00f98c2058759b2bf0e30f4aeebbc3cbb0e943543c7c304c8fb3b00ed7fd60391d1afa7d713cb88040a76eb8db549426ba3450e3 SHA512 a29155d8d92e21b7fc6d3fb3ec0be5ff4a648237317ff83aac523ce6d04c863c2ff48a14d368130431c41897e15068a54a2c0d3d0d9867017c11ba50a14e02b5
 DIST shorewall-core-5.1.10.1.tar.bz2 83398 BLAKE2B 4c0f2321cecd35f7590cdb533e7ae08616f9f9c2a1e125382d568f681e0459dd9bf027c1f2a23531830ca9dbed181f5b57e0c688c6eb0eff5653fc199a78d4d2 SHA512 5f7b924505f3c78df2602c3dc637983f21b0f15383bf1b346205cb54ddf129c04a7a7e10617aeb624a2b1fc770d23b0f5e844db5ec639eab7af468942e3eda3e
+DIST shorewall-core-5.1.10.2.tar.bz2 83729 BLAKE2B 774aab1eb21c73f5d1ad116b2fdbc91d7fe692124aad527c59fb2f88cfb38529d43fbf8a20e95d9b3679f8c5690a6d31bc3b474f0f9ccc65b2d160d809754021 SHA512 3977ee81d37107889c51a1d68c450073e16558ef84518a083932134abdbce195ca00f3149691dd42f224bea5f87d4d18a4456d440ac7759ab1418ebf54c76bef
 DIST shorewall-core-5.1.9.tar.bz2 81533 BLAKE2B 5c47197c6dc6d43c63efef4806707948c0edfb39b237a214249522200a6b0429b0a2a0e8350af5cf448f28ca2b07a9258f91a88d8e9fb7112b2f265100fdc666 SHA512 633ac2f5bd25946f90d6351ea510976b01a61292616856f119602813510e1c24b55e8d86531a854fdbca03572d9eb2865a8e94a1566d36bf286c411e92182877
 DIST shorewall-docs-html-5.1.10.1.tar.bz2 4279932 BLAKE2B 64ec2a5b544e3f8ded23271022599799190cce0653b35e7183f9e56ae94f6ecec1fd8633a7c5ccef4b5dafcef0cdfe59e317f2aab46e8dce6bec433545f2241f SHA512 22bbf18fabd63edc605b1f25c8a3a34e3677554beafa0b3e698d73675a566a134b8a6d1389fca4e2d98fe984ec92a3540ab1fc720ecd78a4b75587c53ce59cb0
+DIST shorewall-docs-html-5.1.10.2.tar.bz2 4280287 BLAKE2B 7db8c9d9f2f8793ab9c318f3d2a4983792b72e84d6b81f7509ce36143c8540aec805733e428d507d3effe43928f7b83404b59530aae99092e240db4b57b6df96 SHA512 8991d41c22d7c1771a328fa94cd76069a6e6d54c0db48866e3b5638f96ea9eeb91df96caff266a437017802fd2f85b09fbca89baa161eb8677b3035e41907234
 DIST shorewall-docs-html-5.1.9.tar.bz2 4279854 BLAKE2B 49a5285b19fd14a739090ebda718b936fe4be5222d32a23600c8acceb598ed7539c471ba02464c8c5e7aeb8944277d740dd05c99a09486b8d4933c8676e0f724 SHA512 38bfb3aa680c3e8eb2916aed63800396cd1ae1bac3e084e0d9aecf89ba457f10b578e1122a36d486095028a39f17bfaa1bc85e92fdf324e7d53b10fb5f3b61fe
 DIST shorewall-init-5.1.10.1.tar.bz2 38560 BLAKE2B 0f3e40914509814ed274840ce5effaa0c6fdc61d15ac94a15182adbece5a553e537191660f05aa5edb8443a89ee49f0ca98cc271bd56dc7b0a052ffbcd13029c SHA512 fa1ebdfd852e556a1e9bb3b550ad1e6fa9d256db39e8515d515f1d8a133c5956beb4e7fcc24da0dc776f1d418d2ca607232bbd2c6cc2585d00f858eb649af1fa
+DIST shorewall-init-5.1.10.2.tar.bz2 38857 BLAKE2B e82d22fd232a3990cb62548a7a637557326e2d6895516e41d9cc87d5b6ab9cc102a07e7590ab105ee8d12ab235db2e4a7e78f03220cbf3c03590b204f0c25867 SHA512 c18267d920033540169c7b02f1c09450e3dce6a6bbadc88c82897703f5706003ac59e766bd8cf09ff22ad47116028873cb6fc35d1d601e1e57e9175f8069a128
 DIST shorewall-init-5.1.9.tar.bz2 36834 BLAKE2B 6e8ebdda40e547e528df1faec4174f757b7922f7f06fae07dcc4a5c11005d2da5df387c900a9aa07715c9d99940b62f4fef28aed6b845b93f3172eca88e091fa SHA512 b7dd4394e4b48d225acff6f81d559b4020bca0f80447a179ad0a87536ce6a4c75af2f0bd9eca313bcede14c73d29c3a18a2c48cd230103b3ab656ed76747a95b
 DIST shorewall-lite-5.1.10.1.tar.bz2 44231 BLAKE2B 46cec387c7f7ccc862dba3575c272dbab038ada62aae32617d53262aff9751ebe95c6ba32ea365ee4a8d28e4775f3802282fe08fa07eeb7036e1064a1eaa3260 SHA512 8d25ca48fdf8a5f96060a3510b475144935ed15625847542f879e4cd1d6b5e7c9e7b333f299c59920f8cccb32685e9dd8f118942e0f8224c1c5deffffbaad146
+DIST shorewall-lite-5.1.10.2.tar.bz2 44515 BLAKE2B 44e9c432f818fe372841a5f80c39520142cbaee2d8fc5aa2573958b0c9321588266e63d0fbdf32d476e34fcc61cf896625e9c60b61e41129c7a6a2ce25143738 SHA512 9fa6809d79d90513512e11ee5d2a278d6a3104ce86f50073819276068f00159288f2f5dc38af6ef5f564d9bc47de7cc01c4a21aafb4860a029022410fd8b92e0
 DIST shorewall-lite-5.1.9.tar.bz2 42487 BLAKE2B 6a8c41f87c0f60f7ec453ea61490560da7640a37839d0c6be004cad48aad53143e3ee327690a18cbbfbb9292a4d998ece2500fc5274a036a82d2406eb27cba1d SHA512 61eb359155fd261bf7aaf5ce03a04aead297a17e80ba9ab45a3a8e23cd0deadef780c18b2d39ffe19bce9eb0a81ad64abb9643e466af4a9e78f3464f27f95092
 DIST shorewall6-5.1.10.1.tar.bz2 199827 BLAKE2B efc888e098c36045da426441f33ea7d46c39e2e7496ab81a3301f64e5ce3eaa5f741ade8a3a1d29c620b1970a8c9c835fa7e9c51c54737bfb38a94ed73be4546 SHA512 2a8c5f5c1b3ca85d873a9832bde3b2588c5158c6a5af129f2a5ee2fd18042e766e5c37e9246c2f42217527372a359fef2e1cb87e5591271669ab8759eb3b3c35
+DIST shorewall6-5.1.10.2.tar.bz2 200310 BLAKE2B 3b5ae332b275388edfc42dc8abd6961ac1f77ccce75c75370a51ab835c516903c05781ed240854e8a54fac571bf08d0410e23d1a1bd29933fce1a06b60491e0c SHA512 9613869fd9452d5c3db0305b5a13b92f39c7881ffb0e15db6ebb1bf87df2e801616510f5685b5cadf9e4c49cc42276815c65f36f7599d6d2e2f7fa6590dc3820
 DIST shorewall6-5.1.9.tar.bz2 194504 BLAKE2B d849470c9f737f16b47d4a0288767d7a5c6fcd48dacf4d2f51df434e43f34b9e71188a01e8b893ed64d84c1afc41a7d40e9f37ed2b6ad6b4b2b57e118ec28565 SHA512 e086dc8721865b2ddf891842838ed2ae6683154977ec1005d5c1327f76e7441b6056bd2bd53bb5ee9b95ff8dd50e5ae5b821ddbf8e5fe8f5543ff0028b7eda49
 DIST shorewall6-lite-5.1.10.1.tar.bz2 43906 BLAKE2B 42b58bf34ebad66efacbe964cb40dc37f04c559c9fa0e0396490dad8a3212c6c9af6cffe640a4cafef80905540e440ef5b77a69e5c4675d80b1c64164939aec2 SHA512 f4eb540f1c8dbb163b97d6f6c90609fd0d2513c64803cc2362842665bad382023d703e605e159fd5759135934890b46d10f4555da19e1d28e87926d41f5b9253
+DIST shorewall6-lite-5.1.10.2.tar.bz2 44219 BLAKE2B a11f015021aa47f6421389dae127e7e42ed0941b31563f6251be1450e05f78a6504007bc4c2df1bf7ab0183fc285e85feb8c8b39407ef4299fca6b58847a43c1 SHA512 f067a45a635ddcd2c357953feaeefd881f1a57c4fd129c51ca62c025b8966da935961fc938e84070b93c278b5872c4dd58eaf7aff43bdcf1d838feed91141be8
 DIST shorewall6-lite-5.1.9.tar.bz2 42198 BLAKE2B 7854a1f4221241c3e91ba2fa4ea40ee4f78e320fd251fe9f491c32b4847aa1608bc56f53ccf0e573f77240693881fa18a006b6e2d0dfd88971a83c0b292ed2fe SHA512 a3fefc75ad6cfe461943e9d3390b08f214c493724060d710e104dd44345c3913a3a2c9d28ce26288042329581a9e4630aeb3ae4db49e915e8c073dde48cdf975
 EBUILD shorewall-5.1.10.1-r2.ebuild 16190 BLAKE2B 5953e5fbfaacd1bc2bb37e2c83564fc173f292ad3912731ad4b9fcab8db0d6676d8dcbc9d19ab9698d471a36536ef09f219e5f1cf9053ed2cc1bae046f154b53 SHA512 b9af71fab802e904062cd2f28c04511f95541de81679314766a4b6ebb06c3a8236f39988846603129da1656c2be2343549b9c88dd0962ce9e84e4bedf0d732f8
 EBUILD shorewall-5.1.10.1.ebuild 16138 BLAKE2B 773362be92a5387b429438909a85900c0b0c44860149693ff3e1bc5b0262585160b309166b0e1fce6ef66f577e0ebfbfd9190c7745cadf9c2d541a0ae9729ded SHA512 0eed0236de6f7a2f336e052cbfd7c57a95687520df51b580557bc5ba11aabd5d6dd8ac23809950ec76dcce24e78922d254f52187df5d82bd4e70c6af020a9893
+EBUILD shorewall-5.1.10.2.ebuild 16138 BLAKE2B 1e94a98a4907f0187b824bac38ced587df41e912b990b0777e3e184ea68d6b7529c9b5f13fe47a70d9f920b791db47ffb0f53ee838d772deb5695f76436c44b8 SHA512 1652569e4558621ec9c3e163081829dddf304a862f7cfef5bbd96c68426b792fa57d2ff9b206340605de6cf702aeef400e0d3595415c41498ad391942b25a246
 EBUILD shorewall-5.1.9-r1.ebuild 16199 BLAKE2B 99451766a294d056ba5c0a0ea807584c241e187abe425c7d42473a8fd92a743c68cb1bb6aec6fc9df1551ec35a3aa25a45f17fd86a5ca98c63ad982ed4a19617 SHA512 2282ce7bd8962f0733fe1e2d2c0696b40c29abf0519f058fec6d87b0cce2ff164a1658935aa59f4f22c04095e1cb70dd19800d1518f0b390f3d5de8c24d675c4
 MISC metadata.xml 2254 BLAKE2B e9d48407a0f055415070f5b0266ed9f534768f6d17d52b7070de30a037b89dbd08daac40b0ec313b8dfc65ba40ff38dae96c9758b78ec66d100ac8fa6b870d5f SHA512 0a201cf40dd1282b52897f751903baf28a2eb284b94316a45d8af6879f995dde1cdd4a7d474293835a0bde801ce41497bde558a51035a5e3650f0ec098688f33
diff --git a/net-firewall/shorewall/shorewall-5.1.10.2.ebuild b/net-firewall/shorewall/shorewall-5.1.10.2.ebuild
new file mode 100644
index 000000000000..4e94df20e83a
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-5.1.10.2.ebuild
@@ -0,0 +1,456 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit linux-info prefix systemd versionator
+
+DESCRIPTION='A high-level tool for configuring Netfilter'
+HOMEPAGE="http://www.shorewall.net/"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc +init +ipv4 ipv6 lite4 lite6 selinux"
+
+MY_PV=${PV/_rc/-RC}
+MY_PV=${MY_PV/_beta/-Beta}
+MY_P=${PN}-${MY_PV}
+
+MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
+MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 1-3)
+
+# shorewall
+MY_PN_IPV4=Shorewall
+MY_P_IPV4=${MY_PN_IPV4/#S/s}-${MY_PV}
+
+# shorewall6
+MY_PN_IPV6=Shorewall6
+MY_P_IPV6=${MY_PN_IPV6/#S/s}-${MY_PV}
+
+# shorewall-lite
+MY_PN_LITE4=Shorewall-lite
+MY_P_LITE4=${MY_PN_LITE4/#S/s}-${MY_PV}
+
+# shorewall6-lite
+MY_PN_LITE6=Shorewall6-lite
+MY_P_LITE6=${MY_PN_LITE6/#S/s}-${MY_PV}
+
+# shorewall-init
+MY_PN_INIT=Shorewall-init
+MY_P_INIT=${MY_PN_INIT/#S/s}-${MY_PV}
+
+# shorewall-core
+MY_PN_CORE=Shorewall-core
+MY_P_CORE=${MY_PN_CORE/#S/s}-${MY_PV}
+
+# shorewall-docs-html
+MY_PN_DOCS=Shorewall-docs-html
+MY_P_DOCS=${MY_PN_DOCS/#S/s}-${MY_PV}
+
+# Upstream URL schema:
+# Beta:    $MIRROR/pub/shorewall/development/4.6/shorewall-4.6.4-Beta2/shorewall-4.6.4-Beta2.tar.bz2
+# RC:      $MIRROR/pub/shorewall/development/4.6/shorewall-4.6.4-RC1/shorewall-4.6.4-RC1.tar.bz2
+# Release: $MIRROR/pub/shorewall/4.6/shorewall-4.6.3/shorewall-4.6.3.3.tar.bz2
+
+MY_URL_PREFIX=
+MY_URL_SUFFIX=
+if [[ ${MY_PV} = *-Beta* ]] || [[ ${MY_PV} = *-RC* ]]; then
+	MY_URL_PREFIX='development/'
+
+	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
+	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
+	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
+		MY_URL_SUFFIX="-${_tmp_suffix}"
+	fi
+
+	# Cleaning up temporary variables
+	unset _tmp_last_index
+	unset _tmp_suffix
+else
+	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+SRC_URI="
+	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
+	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
+	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
+	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
+	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
+	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
+	doc? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/${MY_P_DOCS}.tar.bz2 )
+"
+
+# - Shorewall6 requires Shorewall
+# - Installing Shorewall-init or just the documentation doesn't make any sense,
+#   that's why we force the user to select at least one "real" Shorewall product
+#
+# See http://shorewall.net/download.htm#Which
+REQUIRED_USE="
+	ipv6? ( ipv4 )
+	|| ( ipv4 lite4 lite6 )
+"
+
+# No build dependencies! Just plain shell scripts...
+DEPEND=""
+
+RDEPEND="
+	>=net-firewall/iptables-1.4.20
+	>=sys-apps/iproute2-3.8.0[-minimal]
+	>=sys-devel/bc-1.06.95
+	ipv4? (
+		>=dev-lang/perl-5.16
+		virtual/perl-Digest-SHA
+	)
+	ipv6? (
+		>=dev-perl/Socket6-0.230.0
+		>=net-firewall/iptables-1.4.20[ipv6]
+		>=sys-apps/iproute2-3.8.0[ipv6]
+	)
+	lite6? (
+		>=net-firewall/iptables-1.4.20[ipv6]
+		>=sys-apps/iproute2-3.8.0[ipv6]
+	)
+	init? ( >=sys-apps/coreutils-8.20 )
+	selinux? ( >=sec-policy/selinux-shorewall-2.20161023-r3 )
+	!net-firewall/shorewall-core
+	!net-firewall/shorewall6
+	!net-firewall/shorewall-lite
+	!net-firewall/shorewall6-lite
+	!net-firewall/shorewall-init
+	!<sys-apps/systemd-214
+"
+
+S=${WORKDIR}
+
+pkg_pretend() {
+	local CONFIG_CHECK="~NF_CONNTRACK"
+
+	local WARNING_CONNTRACK="Without NF_CONNTRACK support, you will be unable"
+	local WARNING_CONNTRACK+=" to run any shorewall-based firewall on the local system."
+
+	if use ipv4 || use lite4; then
+		CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK_IPV4"
+
+		local WARNING_CONNTRACK_IPV4="Without NF_CONNTRACK_IPV4 support, you will"
+		local WARNING_CONNTRACK_IPV4+=" be unable to run any shorewall-based IPv4 firewall on the local system."
+	fi
+
+	if use ipv6 || use lite6; then
+		CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK_IPV6"
+
+		local WARNING_CONNTRACK_IPV6="Without NF_CONNTRACK_IPV6 support, you will"
+		local WARNING_CONNTRACK_IPV6+=" be unable to run any shorewall-based IPv6 firewall on the local system."
+	fi
+
+	check_extra_config
+}
+
+pkg_setup() {
+	if [[ -n "${DIGEST}" ]]; then
+		einfo "Unsetting environment variable \"DIGEST\" to prevent conflicts with package's \"install.sh\" script ..."
+		unset DIGEST
+	fi
+}
+
+src_prepare() {
+	# We are moving each unpacked source from MY_P_* to MY_PN_*.
+	# This allows us to use patches from upstream and keeps epatch_user working
+
+	einfo "Preparing shorewallrc ..."
+	cp "${FILESDIR}"/shorewallrc-r1 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
+	eprefixify "${S}"/shorewallrc.gentoo
+
+	# shorewall-core
+	mv "${S}"/${MY_P_CORE} "${S}"/${MY_PN_CORE} || die "Failed to move '${S}/${MY_P_CORE}' to '${S}/${MY_PN_CORE}'"
+	ebegin "Applying Gentoo-specific changes to ${MY_P_CORE} ..."
+	ln -s ../shorewallrc.gentoo ${MY_PN_CORE}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
+	eend 0
+
+	# shorewall
+	if use ipv4; then
+		mv "${S}"/${MY_P_IPV4} "${S}"/${MY_PN_IPV4} || die "Failed to move '${S}/${MY_P_IPV4}' to '${S}/${MY_PN_IPV4}'"
+		ebegin "Applying Gentoo-specific changes to ${MY_P_IPV4}"
+		ln -s ../shorewallrc.gentoo ${MY_PN_IPV4}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
+		cp "${FILESDIR}"/shorewall.confd-r1 "${S}"/${MY_PN_IPV4}/default.gentoo || die "Copying shorewall.confd-r1 failed"
+		cp "${FILESDIR}"/shorewall.initd-r2 "${S}"/${MY_PN_IPV4}/init.gentoo.sh || die "Copying shorewall.initd-r2 failed"
+		cp "${FILESDIR}"/shorewall.systemd "${S}"/${MY_PN_IPV4}/gentoo.service || die "Copying shorewall.systemd failed"
+		eend 0
+	fi
+
+	# shorewall6
+	if use ipv6; then
+		mv "${S}"/${MY_P_IPV6} "${S}"/${MY_PN_IPV6} || die "Failed to move '${S}/${MY_P_IPV6}' to '${S}/${MY_PN_IPV6}'"
+		ebegin "Applying Gentoo-specific changes to ${MY_P_IPV6}"
+		ln -s ../shorewallrc.gentoo ${MY_PN_IPV6}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
+		cp "${FILESDIR}"/shorewall.confd-r1 "${S}"/${MY_PN_IPV6}/default.gentoo || die "Copying shorewall.confd-r1 failed"
+		cp "${FILESDIR}"/shorewall.initd-r2 "${S}"/${MY_PN_IPV6}/init.gentoo.sh || die "Copying shorewall.initd-r2 failed"
+		cp "${FILESDIR}"/shorewall6.systemd "${S}"/${MY_PN_IPV6}/gentoo.service || die "Copying shorewall6.systemd failed"
+		eend 0
+	fi
+
+	# shorewall-lite
+	if use lite4; then
+		mv "${S}"/${MY_P_LITE4} "${S}"/${MY_PN_LITE4} || die "Failed to move '${S}/${MY_P_LITE4}' to '${S}/${MY_PN_LITE4}'"
+		ebegin "Applying Gentoo-specific changes to ${MY_P_LITE4}"
+		ln -s ../shorewallrc.gentoo ${MY_PN_LITE4}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
+		cp "${FILESDIR}"/shorewall-lite.confd-r1 "${S}"/${MY_PN_LITE4}/default.gentoo || die "Copying shorewall-lite.confd-r1 failed"
+		cp "${FILESDIR}"/shorewall-lite.initd-r2 "${S}"/${MY_PN_LITE4}/init.gentoo.sh || die "Copying shorewall-lite.initd-r2 failed"
+		cp "${FILESDIR}"/shorewall-lite.systemd "${S}"/${MY_PN_LITE4}/gentoo.service || die "Copying shorewall-lite.systemd failed"
+		eend 0
+	fi
+
+	# shorewall6-lite
+	if use lite6; then
+		mv "${S}"/${MY_P_LITE6} "${S}"/${MY_PN_LITE6} || die "Failed to move '${S}/${MY_P_LITE6}' to '${S}/${MY_PN_LITE6}'"
+		ebegin "Applying Gentoo-specific changes to ${MY_P_LITE6}"
+		ln -s ../shorewallrc.gentoo ${MY_PN_LITE6}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
+		cp "${FILESDIR}"/shorewall-lite.confd-r1 "${S}"/${MY_PN_LITE6}/default.gentoo || die "Copying shorewall-lite.confd-r1 failed"
+		cp "${FILESDIR}"/shorewall-lite.initd-r2 "${S}"/${MY_PN_LITE6}/init.gentoo.sh || die "Copying shorewall-lite.initd-r2 failed"
+		cp "${FILESDIR}"/shorewall6-lite.systemd "${S}"/${MY_PN_LITE6}/gentoo.service || die "Copying shorewall6-lite.systemd failed"
+		eend 0
+	fi
+
+	# shorewall-init
+	if use init; then
+		mv "${S}"/${MY_P_INIT} "${S}"/${MY_PN_INIT} || die "Failed to move '${S}/${MY_P_INIT}' to '${S}/${MY_PN_INIT}'"
+		ebegin "Applying Gentoo-specific changes to ${MY_P_INIT}"
+		ln -s ../shorewallrc.gentoo ${MY_PN_INIT}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
+		cp "${FILESDIR}"/shorewall-init.confd "${S}"/${MY_PN_INIT}/default.gentoo || die "Copying shorewall-init.confd failed"
+		cp "${FILESDIR}"/shorewall-init.initd "${S}"/${MY_PN_INIT}/init.gentoo.sh || die "Copying shorewall-init.initd failed"
+		cp "${FILESDIR}"/shorewall-init.systemd "${S}"/${MY_PN_INIT}/gentoo.service || die "Copying shorewall-init.systemd failed"
+		cp "${FILESDIR}"/shorewall-init.readme "${S}"/${MY_PN_INIT}/shorewall-init.README.Gentoo.txt || die "Copying shorewall-init.systemd failed"
+		eend 0
+
+		eprefixify "${S}"/${MY_PN_INIT}/init.gentoo.sh
+
+		cd "${S}"/${MY_PN_INIT} || die
+		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality-r1.patch
+		cd "${S}" || die
+	fi
+
+	# shorewall-docs-html
+	if use doc; then
+		mv "${S}"/${MY_P_DOCS} "${S}"/${MY_PN_DOCS} || die "Failed to move '${S}/${MY_P_DOCS}' to '${S}/${MY_PN_DOCS}'"
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	:;
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	# shorewall-core
+	einfo "Installing ${MY_P_CORE} ..."
+	DESTDIR="${D%/}" ${MY_PN_CORE}/install.sh shorewallrc.gentoo || die "${MY_PN_CORE}/install.sh failed"
+	dodoc "${S}"/${MY_PN_CORE}/changelog.txt "${S}"/${MY_PN_CORE}/releasenotes.txt
+
+	# shorewall
+	if use ipv4; then
+		einfo "Installing ${MY_P_IPV4} ..."
+		keepdir /var/lib/shorewall
+		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
+		fi
+	fi
+
+	# shorewall6
+	if use ipv6; then
+		einfo "Installing ${MY_P_IPV6} ..."
+		keepdir /var/lib/shorewall6
+		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
+
+		if use doc; then
+			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
+		fi
+	fi
+
+	# shorewall-lite
+	if use lite4; then
+		einfo "Installing ${MY_P_LITE4} ..."
+		keepdir /var/lib/shorewall-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
+	fi
+
+	# shorewall6-lite
+	if use lite6; then
+		einfo "Installing ${MY_P_LITE6} ..."
+		keepdir /var/lib/shorewall6-lite
+		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
+	fi
+
+	# shorewall-init
+	if use init; then
+		einfo "Installing ${MY_P_INIT} ..."
+		DESTDIR="${D%/}" ${MY_PN_INIT}/install.sh shorewallrc.gentoo || die "${MY_PN_INIT}/install.sh failed"
+		dodoc "${S}"/${MY_PN_INIT}/shorewall-init.README.Gentoo.txt
+
+		if [[ -f "${D}etc/logrotate.d/shorewall-init" ]]; then
+			# On Gentoo, shorewall-init will not create shorewall-ifupdown.log,
+			# so we don't need a logrotate configuration file for shorewall-init
+			einfo "Removing unused \"${D}etc/logrotate.d/shorewall-init\" ..."
+			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
+		fi
+
+		if [[ -d "${D}etc/NetworkManager" ]]; then
+			# On Gentoo, we don't support NetworkManager
+			# so we don't need this folder at all
+			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
+			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
+		fi
+
+		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
+			# This script isn't supported on Gentoo
+			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}usr/share/shorewall-init/ifupdown\" failed"
+		fi
+	fi
+
+	if use doc; then
+		einfo "Installing ${MY_P_DOCS} ..."
+		docinto html && dodoc -r "${S}"/${MY_PN_DOCS}/*
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+
+		# Show first steps for shorewall/shorewall6
+		local _PRODUCTS=""
+		if use ipv4; then
+			_PRODUCTS="shorewall"
+
+			if use ipv6; then
+				_PRODUCTS="${_PRODUCTS}/shorewall6"
+			fi
+		fi
+
+		if [[ -n "${_PRODUCTS}" ]]; then
+			elog "Before you can use ${_PRODUCTS}, you need to edit its configuration in:"
+			elog ""
+			elog "  /etc/shorewall/shorewall.conf"
+
+			if use ipv6; then
+				elog "  /etc/shorewall6/shorewall6.conf"
+			fi
+
+			elog ""
+			elog "To activate your shorewall-based firewall on system start, please add ${_PRODUCTS} to your default runlevel:"
+			elog ""
+			elog "  # rc-update add shorewall default"
+
+			if use ipv6; then
+				elog "  # rc-update add shorewall6 default"
+			fi
+		fi
+
+		# Show first steps for shorewall-lite/shorewall6-lite
+		_PRODUCTS=""
+		if use lite4; then
+			_PRODUCTS="shorewall-lite"
+		fi
+
+		if use lite6; then
+			if [[ -z "${_PRODUCTS}" ]]; then
+				_PRODUCTS="shorewall6-lite"
+			else
+				_PRODUCTS="${_PRODUCTS}/shorewall6-lite"
+			fi
+		fi
+
+		if [[ -n "${_PRODUCTS}" ]]; then
+			if use ipv4; then
+				elog ""
+			fi
+
+			elog "Before you can use ${_PRODUCTS}, you need to provide a configuration, which you can"
+			elog "create using ${CATEGORY}/shorewall (with \"ipv4\" and or \"ipv6\" USE flag)."
+			elog ""
+			elog "To read more about ${_PRODUCTS}, please visit"
+			elog "  http://shorewall.net/CompiledPrograms.html"
+			elog ""
+			elog "To activate your shorewall-lite-based firewall on system start, please add ${PRODUCTS} to your default runlevel:"
+			elog ""
+
+			if use lite4; then
+				elog "  # rc-update add shorewall-lite default"
+			fi
+
+			if use lite6; then
+				elog "  # rc-update add shorewall6-lite default"
+			fi
+		fi
+
+		if use init; then
+			elog ""
+			elog "To secure your system on boot, please add shorewall-init to your boot runlevel:"
+			elog ""
+			elog "  # rc-update add shorewall-init boot"
+			elog ""
+			elog "and review \$PRODUCTS in"
+			elog ""
+			elog "  /etc/conf.d/shorewall-init"
+		fi
+
+	fi
+
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if ! version_is_at_least ${MY_MAJOR_RELEASE_NUMBER} ${v}; then
+			# This is an upgrade
+
+			elog "You are upgrading from a previous major version. It is highly recommended that you read"
+			elog ""
+			elog "  - /usr/share/doc/shorewall*/releasenotes.tx*"
+			elog "  - http://shorewall.net/Shorewall-5.html#idp51151872"
+
+			if use ipv4; then
+				elog ""
+				elog "You can auto-migrate your configuration using"
+				elog ""
+				elog "  # shorewall update -A"
+
+				if use ipv6; then
+					elog "  # shorewall6 update -A"
+				fi
+
+				elog ""
+				elog "*after* you have merged the changed files using one of the configuration"
+				elog "files update tools of your choice (dispatch-conf, etc-update...)."
+
+				elog ""
+				elog "But if you are not familiar with the \"shorewall[6] update\" command,"
+				elog "please read the shorewall[6] man page first."
+			fi
+
+			# Show this elog only once
+			break
+		fi
+	done
+
+	if ! use init; then
+		elog ""
+		elog "Consider emerging ${CATEGORY}/${PN} with USE flag \"init\" to secure your system on boot"
+		elog "before your shorewall-based firewall is ready to start."
+		elog ""
+		elog "To read more about shorewall-init, please visit"
+		elog "  http://www.shorewall.net/Shorewall-init.html"
+	fi
+
+	if ! has_version "net-firewall/conntrack-tools"; then
+		elog ""
+		elog "Your Shorewall firewall can utilize \"conntrack\" from the \"net-firewall/conntrack-tools\""
+		elog "package. if you want to use this feature, you need to install \"net-firewall/conntrack-tools\"!"
+	fi
+
+	if ! has_version "dev-perl/Devel-NYTProf"; then
+		elog ""
+		elog "If you want to profile your Shorewall firewall you need to install \"dev-perl/Devel-NYTProf\"!"
+	fi
+}
diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index ba48849b0b00..186e9fa7d155 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest
index 9e11b68f59aa..a1873f27ec2d 100644
--- a/net-ftp/filezilla/Manifest
+++ b/net-ftp/filezilla/Manifest
@@ -1,5 +1,5 @@
 AUX filezilla-3.22.1-debug.patch 349 BLAKE2B 2a38aba4ddc49cbe97d3d6ce1348d94588a3bb2821ad1643e5e5d43cd18adfe5911309a24822368fd38176aaf2af99d7b098864bc5ae2d6f94ffb481a4d25340 SHA512 009946fbb676698e404b1c91bb6b14767234751cbecb7faa097692b382a65af7ab31b54f1aac81fdb72c1492db4698d24f5fa9b1966f69bffa1f4b6073283e00
 DIST FileZilla_3.25.2_src.tar.bz2 4712781 BLAKE2B c4e346442596eb2c1c7f5b541dc1386be5be13a3564187d5d7f275b5e1223cf1c95e11e27120c98276ea550d0b1c65122ffd62b5471a886faf1ebea0ab217522 SHA512 6c6feeec0b1bd15ff2c3fecbec22bca9c79f4263e0d1855c6d27a3df54128cfd837f0a546d1540b87b4645e620b57961b8ac0f01bd52748832f5625139c39764
-EBUILD filezilla-3.25.2-r1.ebuild 1679 BLAKE2B 8c5b035c969bce6bbedea527dae642667642a99f9a4ec8c797bdc8f4664adecc29829a97fc0ecbdc37fa20423c70b6469a9cf39ab277764a576b8bbbf63166a9 SHA512 dff45fc13c5b7684c7f4798bde7d99cc6fab20a10d36474db7987b2753f06fd30032d2ce73077b14814e10441c955f1d137e7e8f9f0692f929e92fc243b27e65
-EBUILD filezilla-3.25.2.ebuild 1662 BLAKE2B 20aee822388b101aa28fcbb284caaca71fdc6fe113e2e0a414c7bc49b0a0046d7d057d49677db6724150a8c5eb6ac5b4eb5622660472436848f540e540cc6a35 SHA512 e541d8b29ae7a8b66deaa72a4f489b2d863014fe1f834231e87c19a1265ab691372863d74cf83e98ab511f379d6a480bb9a76e6b04a9e6796c6fc0a0c3b2645d
+EBUILD filezilla-3.25.2-r1.ebuild 1782 BLAKE2B 7bc563a728e775851208f1b35af2adda3c7e73373d60826affb756d9b45d656f70306a594a2d4c7c8286d21996ceb677b0fbd2d52ab0dcc8b74a7e58cac99773 SHA512 ca7850798b85a029c09feee2b528d3fe6bf470775eaf2335e21db62a593b95eecccb214f25edfb998ba010c859b9cd7eb7997d8de0df69df4065fc20b2e84d5f
+EBUILD filezilla-3.25.2.ebuild 1765 BLAKE2B 9dabcdb6b12a290533c45c802100034c84b2ce93bc9456256e976b71ea24c103fce931d0b5a0ff78e808de48fd9c5796363d768d60a72166e56917d747949612 SHA512 f285161a89138b5f5be8f138612408b133a87bc9b86afdf887282b6a5f285ac65253b7e52f3de87495df0a5a7e452462feb871062bf926446693cee84a4f5d7b
 MISC metadata.xml 562 BLAKE2B ef75eb5e07f57db7de0a8e90dc2ad86c84b65776c674a1e282443029101d05c3292bf0d5786ab97d846de984aedc6ed59640a256dcce29c65aef537adf18c348 SHA512 a69afbf6f03dec20a4ec61e39bcfbc964e09e0d74496b383a348764a61d83e54fea2cd715a4bcc239ca0f3ed0c2e1c5d46dcfeb99f7cc4feea488663a0931544
diff --git a/net-ftp/filezilla/filezilla-3.25.2-r1.ebuild b/net-ftp/filezilla/filezilla-3.25.2-r1.ebuild
index 27a892849dad..a39e198691d0 100644
--- a/net-ftp/filezilla/filezilla-3.25.2-r1.ebuild
+++ b/net-ftp/filezilla/filezilla-3.25.2-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 WX_GTK_VER="3.0-gtk3"
 
-inherit autotools eutils flag-o-matic multilib wxwidgets
+inherit autotools eutils flag-o-matic gnome2-utils multilib wxwidgets
 
 MY_PV=${PV/_/-}
 MY_P="FileZilla_${MY_PV}"
@@ -66,3 +66,11 @@ src_configure() {
 		--with-pugixml=system \
 		--disable-autoupdatecheck
 }
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-ftp/filezilla/filezilla-3.25.2.ebuild b/net-ftp/filezilla/filezilla-3.25.2.ebuild
index 9273ca52e53c..61eb63e204bc 100644
--- a/net-ftp/filezilla/filezilla-3.25.2.ebuild
+++ b/net-ftp/filezilla/filezilla-3.25.2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 WX_GTK_VER="3.0"
 
-inherit autotools eutils flag-o-matic multilib wxwidgets
+inherit autotools eutils flag-o-matic gnome2-utils multilib wxwidgets
 
 MY_PV=${PV/_/-}
 MY_P="FileZilla_${MY_PV}"
@@ -66,3 +66,11 @@ src_configure() {
 		--with-pugixml=system \
 		--disable-autoupdatecheck
 }
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 7cc19e881832..4c28dc16e9f8 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index 2fa1f9b80931..1529476b2894 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -5,5 +5,5 @@ DIST libssh-0.7.4.tar.xz 351892 BLAKE2B 5427faa04eac7b57f73909f113d933daf667f831
 DIST libssh-0.7.5.tar.xz 351632 BLAKE2B b41cccb6215c5b7e66742171d91e1081d3c1bf44455b65a5992093d31b28db7a6375e815303e115e02b2458c734d9c61e4b1528ba905bf8a421ca2bbb7221ce6 SHA512 6c7f539899caaedf13d66fa2e0fac1a475ecdfe389131abcbdf908bdebc50a0b9e6b0d43e67e52aea85c32f6aa68e46ca2f50695992f82ded83489f445a8e775
 EBUILD libssh-0.7.4.ebuild 2478 BLAKE2B 86cdd0d7445a37fbff25a82b79cd910645525a668e534abcf96a6e4ca9846d5d20fbe8c4891bd4878f0bfb315a283b3a970565963c59fe6a51d5d56d9382994a SHA512 1c7b902fd9dbd2e4826be08c9d326dd3bf858e8ebedfe489ddcef917c888f225742967b93cdf8d647bb42ff4e5938b463e3e7526afd76986b7561399ffb10079
 EBUILD libssh-0.7.5-r1.ebuild 2572 BLAKE2B 69e64c210aa7948dc9c8d04b1603768eb87cd5ef12ef79d8f7d41654f781476c6d7f2d06f5ec0e9517ecaa6387e9736d482c9facc10c8410b2d50baf47ec99fc SHA512 6653cd6ca61bea75ab815e219c8a8f4bf03d99a8b25c3d948f3bf6ecd363b0ffded197a57cef7bf392a4dd08069d58992155b5fef38121d9e4eb524459a703f4
-EBUILD libssh-9999.ebuild 2125 BLAKE2B 6223d1b45116af8db14325eeb11e1fbb40f8086235c2692fe73f02d95e30017149ea8526b710fda0e5ec30457befb74b567f5f4cf3014e55d2fb77ae9fdbae2e SHA512 9dbb0ee5cafac2165d993d204b52d49425a1257ccc27e4c1631c152c97849a03273a4a996b5e03c365c19ebad6130d14d96edad2d086116dc5a01d8bbd79fa01
+EBUILD libssh-9999.ebuild 2128 BLAKE2B 394967b5e90dbeddbfa8f2fc9fcf17afc0f2c282bf25c5efc8a0e3786573dd9750bcdc63732610bc87e9b779c29014753acc95d239d6b9c3b67a412f908d09a9 SHA512 49e17db7bce80cc8b70ac3ba51f874007e0f09b8407a7e2af3cde79c5d2ec713aed317d258b4cefb7b753b790219c882931cc06154187683dacc83e2a5ab7cb5
 MISC metadata.xml 648 BLAKE2B bd4e4be029fdb3ef1e5ce2e16b6f5b922bf43c32ff4ecd50a67db98f9f7669022caf96d965fc85065b5ea8ac65b5547bc3d62d1da6bebdbc5a9a877be5a23c18 SHA512 4e99644645a43ccf7c479c6808ecb2dfe9f9aba69518ab1e2a1289732b926d853ff5554c69fff71e4bb572d12af298ebe19ecb1086da2e8675153b5c42faf589
diff --git a/net-libs/libssh/libssh-9999.ebuild b/net-libs/libssh/libssh-9999.ebuild
index 193f9eb86e6f..2e283ca1245c 100644
--- a/net-libs/libssh/libssh-9999.ebuild
+++ b/net-libs/libssh/libssh-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,8 +6,8 @@ EAPI=6
 inherit cmake-multilib git-r3
 
 DESCRIPTION="Access a working SSH implementation by means of a library"
-HOMEPAGE="http://www.libssh.org/"
-EGIT_REPO_URI="git://git.libssh.org/projects/libssh.git"
+HOMEPAGE="https://www.libssh.org/"
+EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git"
 
 LICENSE="LGPL-2.1"
 KEYWORDS=""
diff --git a/net-libs/libssh2/Manifest b/net-libs/libssh2/Manifest
index 3a93521e9f03..9d0d84b4a3bc 100644
--- a/net-libs/libssh2/Manifest
+++ b/net-libs/libssh2/Manifest
@@ -4,6 +4,5 @@ DIST libssh2-1.7.0.tar.gz 811714 BLAKE2B 488f6b9ea2bf072aba17e8d70136e9bf64b38a4
 DIST libssh2-1.8.0.tar.gz 854916 BLAKE2B 618c4a19789f2e5eda85852760dffff5672d420d2fa50393b05b7398a1913f74e5f6695f078628050ac9851965d6e45cf410b7c4590a8f18d67c718c829ab352 SHA512 289aa45c4f99653bebf5f99565fe9c519abc204feb2084b47b7cc3badc8bf4ecdedd49ea6acdce8eb902b3c00995d5f92a3ca77b2508b92f04ae0e7de7287558
 EBUILD libssh2-1.7.0.ebuild 1210 BLAKE2B cdddf4b8ed193788df0129598198a626053e53a47e7d13910ce4ba5eaf9587f5c3d6abbbd087fbbc939687b7a96ebc9ee7f6425ff807836cda5d59c963084f8c SHA512 feed1680c4b5909b5bacbc12e30a43e9e0e15279643ca118f76a8216c7ec29a25475fb5c6e2f76a37c87d243135c66ad8c9b42a96634628acf2eb28c97462615
 EBUILD libssh2-1.8.0-r1.ebuild 1288 BLAKE2B 4db050dec0f5a23329cdd0d7714464b61c9880b196f15277b50df616194d0cdde0065d396bbbb38ed88600afdfb42140909a2158c7d2244686b77ffe78e8671a SHA512 ea7e26409aea9709824b276095ab2269b916a6df69619bf979d61752d8340bc55fdfa8119a953d8e559cfb5c8af2d96cf26f1e9bcc449132c9981a507a1780b8
-EBUILD libssh2-1.8.0.ebuild 1290 BLAKE2B c3ace9749345e641f1d5927adad97002c96ae5345f79056b036e9a7327e004f828b049fab0d2098c836d329adfd102215410cf4faab5964ad19f27cd0a7e2155 SHA512 016ba030248775b968094fc2e0edad87268801a7350e1cea405347ac508e31fd81fce560b82b12aaf58bcfe7a27a176c0cee3a4c2c0e1622019140ed15e6e237
 EBUILD libssh2-9999.ebuild 1131 BLAKE2B c0bba5c19c03822bc3734f2504bef8239e330be3570af8a29abacd90cf1149e2b575156d4d2cd0f9dc3a571abf8c9008fcaaf0587a86c74cb92b9cfeff8671d3 SHA512 ee0431b63ddf905e1efe49eac35a48c7e956a8a3bc03ec48de73f076a226699ae3eba22b1b0798f458d414ff46cc2f29815b0cbed96609021050e510290ea9f1
 MISC metadata.xml 432 BLAKE2B b528bab0bd90699af37096d4b6a4e06767e39011b4ef299600c8d35987768693224869ef5e05255ff28edb0ae8e14c38a04e20df953391a3df527d8609700a8f SHA512 c0fd5dce9a697c02886aeea4e001695bf51c6cec82a1c32d58a839dbd63f0085f9005c3504d40bd858bcca80ec2018bbf44bca64dd7692029e158612da39cabd
diff --git a/net-libs/libssh2/libssh2-1.8.0.ebuild b/net-libs/libssh2/libssh2-1.8.0.ebuild
deleted file mode 100644
index 3cc10e06541a..000000000000
--- a/net-libs/libssh2/libssh2-1.8.0.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
-
-AUTOTOOLS_AUTORECONF=true
-inherit autotools-multilib
-
-DESCRIPTION="Library implementing the SSH2 protocol"
-HOMEPAGE="http://www.libssh2.org/"
-SRC_URI="http://www.${PN}.org/download/${P}.tar.gz"
-
-LICENSE="BSD"
-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-solaris"
-IUSE="gcrypt libressl static-libs test zlib"
-
-DEPEND="
-	!gcrypt? (
-		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
-	)
-	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-"
-RDEPEND="
-	${DEPEND}
-"
-
-DOCS=( NEWS README )
-
-PATCHES=( "${FILESDIR}"/${PN}-1.8.0-libgcrypt-prefix.patch )
-
-src_prepare() {
-	sed -i -e 's|mansyntax.sh||g' tests/Makefile.am || die
-	autotools-multilib_src_prepare
-}
-
-multilib_src_configure() {
-	# Disable tests that require extra permissions (bug #333319)
-	use test && local -x ac_cv_path_SSHD=
-
-	local myeconfargs=(
-		$(use_with zlib libz)
-		$(usex gcrypt --with-libgcrypt --with-openssl)
-	)
-	autotools-utils_src_configure
-}
diff --git a/net-libs/miniupnpc/Manifest b/net-libs/miniupnpc/Manifest
index 35f673c0c035..9077bf767c24 100644
--- a/net-libs/miniupnpc/Manifest
+++ b/net-libs/miniupnpc/Manifest
@@ -1,7 +1,5 @@
 DIST miniupnpc-2.0.20170509.tar.gz 86055 BLAKE2B 7da640c4baac58aa26965a670877953b4c2d27aff08b604366bad6913b30c152d52120099f37c6250eeed97396ff412a4dd6000179070a82eebd3c052596b0d0 SHA512 71ec052ef6c8ad0d529e467ddae6eae19a93b9816174eeac753aa90e036cc2f00cf7e8d1cdb188ef8280849a988fe2995e37b63f8e2a361e021c1d1b306bff6f
-DIST miniupnpc-2.0.20171102.tar.gz 86363 BLAKE2B 755cc85bbac7f7c9b480612c12c46c09eaa7089dc9f458027805ffb4836631efafbead4bbb5e5313d1267e3110bc4b24c726c34250da3afd1ab0f1f96d53a654 SHA512 5af68a58bef587ea5cc405155b1aca4438de3b56d5fb7e11945edd79e5cbdbf44c708b7f1ad3c3fde6bf4710de69782acf30cfcce327c5a906f4eb8f76a6ba37
 DIST miniupnpc-2.0.20171212.tar.gz 86607 BLAKE2B fce582c4125192f74f6ffb174295020af1c9b574b2094f5565a5e49641820a2d9cef719de59cb94bfd207182505237c22cf58425e1a7b47f5dfe2eb84c07d3c5 SHA512 d25708f4e2ef7311878ba6d17cb506f4bfe5c9cc6b7a79e4168f143ca9da8b96beb018c42dd735f0b23806668eba2308b7de26d1b506d91c23f79c7ed77399a0
 EBUILD miniupnpc-2.0.20170509.ebuild 1266 BLAKE2B 275a77b2813007c8055df57d2e8d74c05c02e7f81af1b1ad766a4c9f274f955c7d56779184983a1e45962bbc38e9ff58f15f4bfc076ed86cc1400eabac4f2dcb SHA512 aeeaba172f38162342256afc17223e1efce42f149561ca0e19bcd8336d32dd74d51a55951f4df79663d1999702930eb4dcd6ceebeea9afe82d9f376432dd7271
-EBUILD miniupnpc-2.0.20171102.ebuild 1273 BLAKE2B 2fff06efc3482305a3a45a9e94bf1dca939c234d66d26ed9649d547b0e98c517cb1018bb1bd14209b88129fd113a4b64fce712f782da10dcb4a860e1d8d1497e SHA512 9de720f270d9a5d214ce314b85722b0b8a0db75d2e6624a7528d0fee12e993ac40ee5442ce0ec89bf65d03a018015b86894425b43a2d547e98e6ac25a99e1012
 EBUILD miniupnpc-2.0.20171212.ebuild 1273 BLAKE2B 2fff06efc3482305a3a45a9e94bf1dca939c234d66d26ed9649d547b0e98c517cb1018bb1bd14209b88129fd113a4b64fce712f782da10dcb4a860e1d8d1497e SHA512 9de720f270d9a5d214ce314b85722b0b8a0db75d2e6624a7528d0fee12e993ac40ee5442ce0ec89bf65d03a018015b86894425b43a2d547e98e6ac25a99e1012
 MISC metadata.xml 243 BLAKE2B 997913e51bb9c2ba601c78673246d3845d1078f5be11ff209532c5afc9f433d4cfe7a0066ba23677d23ffe368d7ee718df71d28301d45c0473f50e931f674165 SHA512 ded2bb7e056d9081e11b0470aa2874fbe9b5e63f0178bec611291f639763a9bd85a076dbc526e01df1403dea4d0eb28913addb346b676084e690e063b68eca28
diff --git a/net-libs/miniupnpc/miniupnpc-2.0.20171102.ebuild b/net-libs/miniupnpc/miniupnpc-2.0.20171102.ebuild
deleted file mode 100644
index 918bc210ceaf..000000000000
--- a/net-libs/miniupnpc/miniupnpc-2.0.20171102.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="UPnP client library and a simple UPnP client"
-HOMEPAGE="http://miniupnp.free.fr/"
-SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/16"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="ipv6 kernel_linux static-libs"
-
-RDEPEND=""
-DEPEND="kernel_linux? ( sys-apps/lsb-release sys-apps/which )"
-
-src_prepare() {
-	eapply_user
-
-	# These bins are not installed, upnpc-static requires building static lib
-	sed -i -e '/EXECUTABLES =/s/ upnpc-static listdevices//' Makefile || die
-
-	if ! use static-libs; then
-		sed -i \
-			-e '/FILESTOINSTALL =/s/ $(LIBRARY)//' \
-			-e '/$(INSTALL) -m 644 $(LIBRARY) $(DESTDIR)$(INSTALLDIRLIB)/d' \
-			Makefile || die
-	fi
-}
-
-# Upstream cmake causes more trouble than it fixes,
-# so we'll just stay with the Makefile for now.
-
-src_compile() {
-	tc-export CC AR
-	emake upnpc-shared $(usex static-libs upnpc-static '')
-}
-
-src_test() {
-	emake -j1 HAVE_IPV6=$(usex ipv6) check
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		PREFIX="${EPREFIX}/usr" \
-		INSTALLDIRLIB="${EPREFIX}/usr/$(get_libdir)" \
-		install
-
-	dodoc README Changelog.txt
-}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index e57c24a73850..7bb6751a008f 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/aria2/Manifest b/net-misc/aria2/Manifest
index 17dcc3634bb0..6aad6a5a9e50 100644
--- a/net-misc/aria2/Manifest
+++ b/net-misc/aria2/Manifest
@@ -1,11 +1,5 @@
 DIST aria2-1.30.0.tar.xz 1497124 BLAKE2B 99bce103f1bd89b94e202cb7b2d9dc427398e0dec3517b25a3870515433b7be35fe2841b5ace049771181e6ce44acb82f8715c72347e7069acd6b003e33522ac SHA512 8c3deb4b58b9db9e8de52f48f6e863e07743ae4af14e2b2d64ddcac94b6aec16ff8d4f27e7d6076426d597af9e6e0988289f3a1c156796c9d79ee7f60f5edc38
-DIST aria2-1.31.0.tar.xz 1501388 BLAKE2B 6decd9a1ba658e27ada5137747a36764cedd37dd9caccd609dcfeb284f040d72a021a0bf79731a65e33a29cea0dc0e31f3e08dd633d6d0c44e95bea60a7c7182 SHA512 a0a1312522324dc0bc24cf1a5cceaef49d40445668ed0bd98dc3cdd5e2edb428552e97504c8c072f5d1180d6bbd252de01d290ef5c94d1803b8ade330bc2710f
-DIST aria2-1.32.0.tar.xz 1502192 BLAKE2B 8b515cb91dc30ee598bdae0f96c53448b22af73983fdc105e85e9a2feb68c33fcb3f3440c1808cedbba421d145f37022e876af9f0ab12dfaec5a59aa87f43787 SHA512 7c14c395fab3024191145b5c965c6c89211cd36ce405cafeef350aa6df9850bee9de65e756eab7d0bdeccb9409b829ea21552b9aac0166f50dcc17501b3dca8b
-DIST aria2-1.33.0.tar.xz 1526936 BLAKE2B 69012e3221afe6e510a3fabe68236526fa64c982b84b2894c61a847084bd151b607bbfc46ac8b4e802ff796e1a2d4d056209e36e9273f20d3acd22e6cc5db978 SHA512 6b28282b5688444c99c3219d185c5c87f1760300f47fb9a87f9ee5eb62dd366d55a7706bb6edb16957f0a6926b354b0c6cbbe9887c94980c3027775d06589fea
 DIST aria2-1.33.1.tar.xz 1505208 BLAKE2B fb74add042d0cda81ca1b9c9d9b27b559ba859829c681520d6ece6322411f139667a1eaddc6f8aef23931e301ba4aab599ab17595df8d6ef477000f5e8fa83f0 SHA512 5379768a0960e46ed616a2540508d0dda4172c8d1a05021e50243241adb64448f5fa01878868ea206ec6b462fea39fa82284bb0f78ceec299eb289f94815b94a
 EBUILD aria2-1.30.0.ebuild 4270 BLAKE2B a3dd69cd5a6dce0c86e48c3abad321d16223834508778e2a850aa89fdfc2871b8f6b7d21ed15af9fd0572f4875119f23766e8fb4844f8ceb4008e551afcfc975 SHA512 308fffeca540ccef4f9b2c86c895d1783e73ef138274b8d4a3d9f4eec7a921c7dd51ec6e0e0fdd1f08a4b988e1a8bc3edfa11c3ab3499d8009980c29ebe7af9a
-EBUILD aria2-1.31.0.ebuild 4272 BLAKE2B c270e7767410eb060d964450b0a83ae6f9c756e75ff911aca55d7efb297ee01bb4c7affe456655f629e66c89e01db4fcf366afb081329ed97e9e1a7c25b6b7a7 SHA512 bf640ec2df8a7949ae45e02f9ae6902e2e1580b02806c47e6aebb68d4042c5babe077e3f0e77d7afcac411afcfc09c5990840b04a9606fde7205630352d41620
-EBUILD aria2-1.32.0.ebuild 4272 BLAKE2B 8a4073814b1905196436cd50e03f57a1655c45d31031508e530fa461976d54ebfe6e9607d065ca45963b767ae04020efe637a165dab3af2297bad06966974fbd SHA512 4f73b5e35ddfea0db6a6c2dde96fa0515081035d85b4de94e1c9e422b5809ebd794c3a43ab4ec92598a5d87245784a85573b476b6c289a6f47c0f3ce8d4f2de0
-EBUILD aria2-1.33.0.ebuild 4272 BLAKE2B 8a4073814b1905196436cd50e03f57a1655c45d31031508e530fa461976d54ebfe6e9607d065ca45963b767ae04020efe637a165dab3af2297bad06966974fbd SHA512 4f73b5e35ddfea0db6a6c2dde96fa0515081035d85b4de94e1c9e422b5809ebd794c3a43ab4ec92598a5d87245784a85573b476b6c289a6f47c0f3ce8d4f2de0
 EBUILD aria2-1.33.1.ebuild 4272 BLAKE2B 8a4073814b1905196436cd50e03f57a1655c45d31031508e530fa461976d54ebfe6e9607d065ca45963b767ae04020efe637a165dab3af2297bad06966974fbd SHA512 4f73b5e35ddfea0db6a6c2dde96fa0515081035d85b4de94e1c9e422b5809ebd794c3a43ab4ec92598a5d87245784a85573b476b6c289a6f47c0f3ce8d4f2de0
 MISC metadata.xml 1325 BLAKE2B 83433182337142e2aa760993e9b259c375158d834537052c816fdf81543aec6bb1786e3fe88dcc5d9f2fa9939ee357e470de2043998b30ffc5864d46e8cb5c86 SHA512 2fd19122ed71fd5bb2a50285bfa022f6f69fb0b5f610536d7fb71da5ef923c97743c0e2d228ba8712b818da526abe0bc60cb6829bb564d33d2cbe0b8aa93613f
diff --git a/net-misc/aria2/aria2-1.31.0.ebuild b/net-misc/aria2/aria2-1.31.0.ebuild
deleted file mode 100644
index b0c010ec8637..000000000000
--- a/net-misc/aria2/aria2-1.31.0.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit bash-completion-r1
-
-DESCRIPTION="A download utility with segmented downloading with BitTorrent support"
-HOMEPAGE="https://aria2.github.io/"
-SRC_URI="https://github.com/aria2/${PN}/releases/download/release-${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="adns bittorrent +gnutls jemalloc libuv +libxml2 metalink +nettle nls sqlite scripts ssh ssl tcmalloc test xmlrpc"
-
-CDEPEND="sys-libs/zlib:0=
-	ssl? (
-		app-misc/ca-certificates
-		gnutls? ( >=net-libs/gnutls-1.2.9:0= )
-		!gnutls? ( dev-libs/openssl:0= ) )
-	adns? ( >=net-dns/c-ares-1.5.0:0= )
-	bittorrent? (
-		ssl? (
-			gnutls? (
-				nettle? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-5:0= )
-				!nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) )
-		!ssl? (
-			nettle? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-5:0= )
-			!nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) )
-	jemalloc? ( dev-libs/jemalloc )
-	libuv? ( dev-libs/libuv:0= )
-	metalink? (
-		libxml2? ( >=dev-libs/libxml2-2.6.26:2= )
-		!libxml2? ( dev-libs/expat:0= ) )
-	sqlite? ( dev-db/sqlite:3= )
-	ssh? ( net-libs/libssh2:= )
-	tcmalloc? ( dev-util/google-perftools )
-	xmlrpc? (
-		libxml2? ( >=dev-libs/libxml2-2.6.26:2= )
-		!libxml2? ( dev-libs/expat:0= ) )"
-
-DEPEND="${CDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( >=dev-util/cppunit-1.12.0:0 )"
-RDEPEND="${CDEPEND}
-	nls? ( virtual/libiconv virtual/libintl )
-	scripts? ( dev-lang/ruby )"
-
-# xmlrpc has no explicit switch, it's turned out by any XML library
-# so metalink implicitly forces it on
-REQUIRED_USE="?? ( jemalloc tcmalloc )
-	metalink? ( xmlrpc )"
-RESTRICT="!test? ( test )"
-
-pkg_setup() {
-	if use scripts && ! use xmlrpc; then
-		ewarn "Please note that you may need to enable USE=xmlrpc to run the aria2rpc"
-		ewarn "and aria2mon scripts against the local aria2."
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i -e "s|/tmp|${T}|" test/*.cc test/*.txt || die "sed failed"
-}
-
-src_configure() {
-	local myconf=(
-		# threads, epoll: check for best portability
-
-		# do not try to compile and run a test LIBXML program
-		--disable-xmltest
-		# enable the shared library
-		--enable-libaria2
-		# zlib should always be available anyway
-		--with-libz
-		--with-ca-bundle="${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
-
-		# optional features
-		$(use_enable bittorrent)
-		$(use_enable metalink)
-		$(use_enable nls)
-		$(use_with adns libcares)
-		$(use_with jemalloc)
-		$(use_with libuv)
-		$(use_with sqlite sqlite3)
-		$(use_with ssh libssh2)
-		$(use_with tcmalloc)
-	)
-
-	# SSL := gnutls / openssl
-	# USE=ssl
-	#  + USE=gnutls -> gnutls
-	#  + USE=-gnutls -> openssl
-
-	if use ssl; then
-		myconf+=( $(use_with gnutls) $(use_with !gnutls openssl) )
-	else
-		myconf+=( --without-gnutls --without-openssl )
-	fi
-
-	# message-digest := nettle / gcrypt / openssl
-	# bignum := nettle+gmp / gcrypt / openssl
-	# bittorrent := message-digest + bignum
-	# USE=bittorrent
-	#  + USE=(ssl -gnutls) -> openssl
-	#  + USE=nettle -> nettle+gmp
-	#  + USE=-nettle -> gcrypt
-
-	if use !bittorrent || use ssl && use !gnutls; then
-		myconf+=( --without-libgcrypt --without-libnettle --without-libgmp )
-	else
-		myconf+=( $(use_with !nettle libgcrypt)
-			$(use_with nettle libnettle) $(use_with nettle libgmp) )
-	fi
-
-	# metalink+xmlrpc := libxml2 / expat
-	# USE=(metalink || xmlrpc)
-	#  + USE=libxml2 -> libxml2
-	#  + USE=-libxml2 -> expat
-
-	if use metalink || use xmlrpc; then
-		myconf+=( $(use_with !libxml2 libexpat) $(use_with libxml2) )
-	else
-		myconf+=( --without-libexpat --without-libxml2 )
-	fi
-
-	# Note:
-	# - always enable gzip/http compression since zlib should always be available anyway
-	# - always enable epoll since we can assume kernel 2.6.x
-	# - other options for threads: solaris, pth, win32
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	rm -rf "${D}"/usr/share/doc/aria2 \
-		"${D}"/usr/share/doc/${PF}/README{,.html}
-
-	dobashcomp doc/bash_completion/aria2c
-	use scripts && dobin doc/xmlrpc/aria2{mon,rpc}
-}
-
-pkg_postinst() {
-	if use xmlrpc; then
-		elog "If you would like to use the additional aria2mon and aria2rpc tools,"
-		elog "you need to have \033[1mdev-lang/ruby\033[0m installed."
-	fi
-}
diff --git a/net-misc/aria2/aria2-1.32.0.ebuild b/net-misc/aria2/aria2-1.32.0.ebuild
deleted file mode 100644
index de956e8d1695..000000000000
--- a/net-misc/aria2/aria2-1.32.0.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit bash-completion-r1
-
-DESCRIPTION="A download utility with segmented downloading with BitTorrent support"
-HOMEPAGE="https://aria2.github.io/"
-SRC_URI="https://github.com/aria2/${PN}/releases/download/release-${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="adns bittorrent +gnutls jemalloc libuv +libxml2 metalink +nettle nls sqlite scripts ssh ssl tcmalloc test xmlrpc"
-
-CDEPEND="sys-libs/zlib:0=
-	ssl? (
-		app-misc/ca-certificates
-		gnutls? ( >=net-libs/gnutls-1.2.9:0= )
-		!gnutls? ( dev-libs/openssl:0= ) )
-	adns? ( >=net-dns/c-ares-1.5.0:0= )
-	bittorrent? (
-		ssl? (
-			gnutls? (
-				nettle? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-6:0= )
-				!nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) )
-		!ssl? (
-			nettle? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-6:0= )
-			!nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) )
-	jemalloc? ( dev-libs/jemalloc )
-	libuv? ( dev-libs/libuv:0= )
-	metalink? (
-		libxml2? ( >=dev-libs/libxml2-2.6.26:2= )
-		!libxml2? ( dev-libs/expat:0= ) )
-	sqlite? ( dev-db/sqlite:3= )
-	ssh? ( net-libs/libssh2:= )
-	tcmalloc? ( dev-util/google-perftools )
-	xmlrpc? (
-		libxml2? ( >=dev-libs/libxml2-2.6.26:2= )
-		!libxml2? ( dev-libs/expat:0= ) )"
-
-DEPEND="${CDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( >=dev-util/cppunit-1.12.0:0 )"
-RDEPEND="${CDEPEND}
-	nls? ( virtual/libiconv virtual/libintl )
-	scripts? ( dev-lang/ruby )"
-
-# xmlrpc has no explicit switch, it's turned out by any XML library
-# so metalink implicitly forces it on
-REQUIRED_USE="?? ( jemalloc tcmalloc )
-	metalink? ( xmlrpc )"
-RESTRICT="!test? ( test )"
-
-pkg_setup() {
-	if use scripts && ! use xmlrpc; then
-		ewarn "Please note that you may need to enable USE=xmlrpc to run the aria2rpc"
-		ewarn "and aria2mon scripts against the local aria2."
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i -e "s|/tmp|${T}|" test/*.cc test/*.txt || die "sed failed"
-}
-
-src_configure() {
-	local myconf=(
-		# threads, epoll: check for best portability
-
-		# do not try to compile and run a test LIBXML program
-		--disable-xmltest
-		# enable the shared library
-		--enable-libaria2
-		# zlib should always be available anyway
-		--with-libz
-		--with-ca-bundle="${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
-
-		# optional features
-		$(use_enable bittorrent)
-		$(use_enable metalink)
-		$(use_enable nls)
-		$(use_with adns libcares)
-		$(use_with jemalloc)
-		$(use_with libuv)
-		$(use_with sqlite sqlite3)
-		$(use_with ssh libssh2)
-		$(use_with tcmalloc)
-	)
-
-	# SSL := gnutls / openssl
-	# USE=ssl
-	#  + USE=gnutls -> gnutls
-	#  + USE=-gnutls -> openssl
-
-	if use ssl; then
-		myconf+=( $(use_with gnutls) $(use_with !gnutls openssl) )
-	else
-		myconf+=( --without-gnutls --without-openssl )
-	fi
-
-	# message-digest := nettle / gcrypt / openssl
-	# bignum := nettle+gmp / gcrypt / openssl
-	# bittorrent := message-digest + bignum
-	# USE=bittorrent
-	#  + USE=(ssl -gnutls) -> openssl
-	#  + USE=nettle -> nettle+gmp
-	#  + USE=-nettle -> gcrypt
-
-	if use !bittorrent || use ssl && use !gnutls; then
-		myconf+=( --without-libgcrypt --without-libnettle --without-libgmp )
-	else
-		myconf+=( $(use_with !nettle libgcrypt)
-			$(use_with nettle libnettle) $(use_with nettle libgmp) )
-	fi
-
-	# metalink+xmlrpc := libxml2 / expat
-	# USE=(metalink || xmlrpc)
-	#  + USE=libxml2 -> libxml2
-	#  + USE=-libxml2 -> expat
-
-	if use metalink || use xmlrpc; then
-		myconf+=( $(use_with !libxml2 libexpat) $(use_with libxml2) )
-	else
-		myconf+=( --without-libexpat --without-libxml2 )
-	fi
-
-	# Note:
-	# - always enable gzip/http compression since zlib should always be available anyway
-	# - always enable epoll since we can assume kernel 2.6.x
-	# - other options for threads: solaris, pth, win32
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	rm -rf "${D}"/usr/share/doc/aria2 \
-		"${D}"/usr/share/doc/${PF}/README{,.html}
-
-	dobashcomp doc/bash_completion/aria2c
-	use scripts && dobin doc/xmlrpc/aria2{mon,rpc}
-}
-
-pkg_postinst() {
-	if use xmlrpc; then
-		elog "If you would like to use the additional aria2mon and aria2rpc tools,"
-		elog "you need to have \033[1mdev-lang/ruby\033[0m installed."
-	fi
-}
diff --git a/net-misc/aria2/aria2-1.33.0.ebuild b/net-misc/aria2/aria2-1.33.0.ebuild
deleted file mode 100644
index de956e8d1695..000000000000
--- a/net-misc/aria2/aria2-1.33.0.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit bash-completion-r1
-
-DESCRIPTION="A download utility with segmented downloading with BitTorrent support"
-HOMEPAGE="https://aria2.github.io/"
-SRC_URI="https://github.com/aria2/${PN}/releases/download/release-${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="adns bittorrent +gnutls jemalloc libuv +libxml2 metalink +nettle nls sqlite scripts ssh ssl tcmalloc test xmlrpc"
-
-CDEPEND="sys-libs/zlib:0=
-	ssl? (
-		app-misc/ca-certificates
-		gnutls? ( >=net-libs/gnutls-1.2.9:0= )
-		!gnutls? ( dev-libs/openssl:0= ) )
-	adns? ( >=net-dns/c-ares-1.5.0:0= )
-	bittorrent? (
-		ssl? (
-			gnutls? (
-				nettle? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-6:0= )
-				!nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) )
-		!ssl? (
-			nettle? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-6:0= )
-			!nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) )
-	jemalloc? ( dev-libs/jemalloc )
-	libuv? ( dev-libs/libuv:0= )
-	metalink? (
-		libxml2? ( >=dev-libs/libxml2-2.6.26:2= )
-		!libxml2? ( dev-libs/expat:0= ) )
-	sqlite? ( dev-db/sqlite:3= )
-	ssh? ( net-libs/libssh2:= )
-	tcmalloc? ( dev-util/google-perftools )
-	xmlrpc? (
-		libxml2? ( >=dev-libs/libxml2-2.6.26:2= )
-		!libxml2? ( dev-libs/expat:0= ) )"
-
-DEPEND="${CDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( >=dev-util/cppunit-1.12.0:0 )"
-RDEPEND="${CDEPEND}
-	nls? ( virtual/libiconv virtual/libintl )
-	scripts? ( dev-lang/ruby )"
-
-# xmlrpc has no explicit switch, it's turned out by any XML library
-# so metalink implicitly forces it on
-REQUIRED_USE="?? ( jemalloc tcmalloc )
-	metalink? ( xmlrpc )"
-RESTRICT="!test? ( test )"
-
-pkg_setup() {
-	if use scripts && ! use xmlrpc; then
-		ewarn "Please note that you may need to enable USE=xmlrpc to run the aria2rpc"
-		ewarn "and aria2mon scripts against the local aria2."
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i -e "s|/tmp|${T}|" test/*.cc test/*.txt || die "sed failed"
-}
-
-src_configure() {
-	local myconf=(
-		# threads, epoll: check for best portability
-
-		# do not try to compile and run a test LIBXML program
-		--disable-xmltest
-		# enable the shared library
-		--enable-libaria2
-		# zlib should always be available anyway
-		--with-libz
-		--with-ca-bundle="${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
-
-		# optional features
-		$(use_enable bittorrent)
-		$(use_enable metalink)
-		$(use_enable nls)
-		$(use_with adns libcares)
-		$(use_with jemalloc)
-		$(use_with libuv)
-		$(use_with sqlite sqlite3)
-		$(use_with ssh libssh2)
-		$(use_with tcmalloc)
-	)
-
-	# SSL := gnutls / openssl
-	# USE=ssl
-	#  + USE=gnutls -> gnutls
-	#  + USE=-gnutls -> openssl
-
-	if use ssl; then
-		myconf+=( $(use_with gnutls) $(use_with !gnutls openssl) )
-	else
-		myconf+=( --without-gnutls --without-openssl )
-	fi
-
-	# message-digest := nettle / gcrypt / openssl
-	# bignum := nettle+gmp / gcrypt / openssl
-	# bittorrent := message-digest + bignum
-	# USE=bittorrent
-	#  + USE=(ssl -gnutls) -> openssl
-	#  + USE=nettle -> nettle+gmp
-	#  + USE=-nettle -> gcrypt
-
-	if use !bittorrent || use ssl && use !gnutls; then
-		myconf+=( --without-libgcrypt --without-libnettle --without-libgmp )
-	else
-		myconf+=( $(use_with !nettle libgcrypt)
-			$(use_with nettle libnettle) $(use_with nettle libgmp) )
-	fi
-
-	# metalink+xmlrpc := libxml2 / expat
-	# USE=(metalink || xmlrpc)
-	#  + USE=libxml2 -> libxml2
-	#  + USE=-libxml2 -> expat
-
-	if use metalink || use xmlrpc; then
-		myconf+=( $(use_with !libxml2 libexpat) $(use_with libxml2) )
-	else
-		myconf+=( --without-libexpat --without-libxml2 )
-	fi
-
-	# Note:
-	# - always enable gzip/http compression since zlib should always be available anyway
-	# - always enable epoll since we can assume kernel 2.6.x
-	# - other options for threads: solaris, pth, win32
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	rm -rf "${D}"/usr/share/doc/aria2 \
-		"${D}"/usr/share/doc/${PF}/README{,.html}
-
-	dobashcomp doc/bash_completion/aria2c
-	use scripts && dobin doc/xmlrpc/aria2{mon,rpc}
-}
-
-pkg_postinst() {
-	if use xmlrpc; then
-		elog "If you would like to use the additional aria2mon and aria2rpc tools,"
-		elog "you need to have \033[1mdev-lang/ruby\033[0m installed."
-	fi
-}
diff --git a/net-misc/autoupnp/Manifest b/net-misc/autoupnp/Manifest
index c9da67759d1d..894459c0f6d2 100644
--- a/net-misc/autoupnp/Manifest
+++ b/net-misc/autoupnp/Manifest
@@ -1,6 +1,4 @@
-DIST autoupnp-0.4.6.tar.bz2 240257 BLAKE2B 964f1c9fb7c07b7577a769064b3bb51a4edc6d5f924dafcc8d1882dfd9fe655eaabf9184a230c185dadc157613084c6fa8da03dc3b8591a93ae77f11c9606f9f SHA512 570ae76d940879a375e9336cb62cce8b2e007c57df6cbebee5878cf6a71d1fe5853218166ba0ee794586fa20a7c62b158aae9242b30880f6fe110c9bb1502ba1
 DIST autoupnp-0.4.7.tar.bz2 264916 BLAKE2B 3542c577a32f5ba3a8ea60c6f2ebb3d5cea76fa440d281e6895c246252d3ba70720aaafa4d843f06a23f1b022942cddb2a0b37b41eff91919db55fbbd87f28b5 SHA512 2c6bb3421fecbffea2a63ea1e930b7c789459d4626a0f281abe0e9bb62e5efc772475d4bf0c9f13fe2e9e13417940c6eb17408e6aae28bc24a4fc2e16d4dc8de
-EBUILD autoupnp-0.4.6.ebuild 638 BLAKE2B 71a4c3e7345200286f69cff92c87900d07f3480ac301525086fc6feed8e2dd0bcf7896821f0ec5402eeb843855e6e00aa83239046bc3c20a7f307bdcb67c0c82 SHA512 2f71d39e33cd92b7a856edb00fb8409661bfc9695e9bd54d323dbd8dad854fde137c675f13b978828877da5dcccb2691d3e13195f5baff32346016c98f114332
 EBUILD autoupnp-0.4.7.ebuild 610 BLAKE2B 0ef201d9447206f72f7d081245f7ce756ec59e2c1e13e8ec88bf555709f5406a97f105ee067e60cd5627fe69d04c686e78499d30d4362fc15da2bedc7438e5f1 SHA512 a433cd85eb23299a5ae377ddeccdc41bcaa2875b81fd9e09092647e5eee15aded956a24d6d9120c829491ec8dde370ac64b9917f98cbf4f7e8159e32a099d033
 EBUILD autoupnp-9999.ebuild 776 BLAKE2B c772f18299b242de3a22ea8d7babe829d4584cc8474d2cdc0a68301ca80b490bc245a7db07647010635bb0f01647084df3edcc3e793bddd33163bea4f88bbd4e SHA512 714a716c73c950068a91659593d82493eec249da7d9b8f38074eeaa377f5f0920a62418c426a7d5dc511ce888e6d06672a8825000d68fda1e1f5540fd30c5008
 MISC metadata.xml 511 BLAKE2B 75ced551d168b8262824bb7393f8289c57c57dbd6feedc922b44e083e5bb13e5acdcaee6c6b24ff8d40e919d3bbb2a2b59004cf2879e4f2e3082a95a1585e291 SHA512 91af116a031d29419468e6d690a12aa9dda0095cab46e529634e2eb3cd486e069a8ff0ab59637cf0ced97aedac86afe0ae4469226ea49f1b637d65931e090b22
diff --git a/net-misc/autoupnp/autoupnp-0.4.6.ebuild b/net-misc/autoupnp/autoupnp-0.4.6.ebuild
deleted file mode 100644
index e28dde826431..000000000000
--- a/net-misc/autoupnp/autoupnp-0.4.6.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools-utils eutils
-
-DESCRIPTION="Automatic open port forwarder using UPnP"
-HOMEPAGE="https://bitbucket.org/mgorny/autoupnp/"
-SRC_URI="https://www.bitbucket.org/mgorny/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libnotify"
-
-RDEPEND="net-libs/miniupnpc
-	libnotify? ( x11-libs/libtinynotify )"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	myeconfargs=(
-		$(use_with libnotify)
-	)
-
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-	prune_libtool_files --all
-}
diff --git a/net-misc/babeld/Manifest b/net-misc/babeld/Manifest
new file mode 100644
index 000000000000..800f01b20987
--- /dev/null
+++ b/net-misc/babeld/Manifest
@@ -0,0 +1,3 @@
+DIST babeld-1.8.0.tar.gz 92124 BLAKE2B 43f24c64280597201880a257095235447a49b97e7fcfc4f53db1c6e45564e41dc751017ce664779e4accdf03cb134cb33856288e2deebc6f194ae1e3744bad4e SHA512 6665ea5108200fe9d158a221ee5697c35fa1bf1d59e99a354aabea844342505731d77c1e3dff3917d048c2154bbadcdda5904ad6e46f16c43f52b5c297480b7d
+EBUILD babeld-1.8.0.ebuild 502 BLAKE2B a4bfaffc4f94305fc43d06ed1f5752e6f7664478ea395b23cedc54575e61fdd092169bde83cb19f0759cc30b19b3b68af8f024c3596f0fa2de9f26dbd68ed614 SHA512 b9bbc8a876416320d2e1deeb01bea933ba5e8e2682e606d06c45e43b35a6d46d4118a520f87f21ae9f61db43ce7a854d42ec640a5411ea769c23b1e85c613819
+MISC metadata.xml 213 BLAKE2B 21f4d23acabbf3b15cd7161a8b3d63b042b273a0839be30ed713eb9cf4f0e36d2a579264fb35fc66b12168288ef24b5abd2418e85abdf4e1ea5f7de1a26ef28f SHA512 e8aad49b782740278a85d29c45a05a6545fb67fe68cd4b47ba72a759ea822eff4eb5ac8e620cfa0fa44840ecc134d89d2f7281e88434527c78cd6c9c92f704ed
diff --git a/net-misc/babeld/babeld-1.8.0.ebuild b/net-misc/babeld/babeld-1.8.0.ebuild
new file mode 100644
index 000000000000..c39edc852990
--- /dev/null
+++ b/net-misc/babeld/babeld-1.8.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="a loop-free distance-vector routing protocol"
+HOMEPAGE="http://www.pps.jussieu.fr/~jch/software/babel/"
+SRC_URI="http://www.pps.jussieu.fr/~jch/software/files/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_compile() {
+	emake CDEBUGFLAGS="${CFLAGS}"
+}
+
+src_install(){
+	emake "TARGET=${D}"  PREFIX="${EPREFIX}"/usr install
+	dodoc CHANGES README
+}
diff --git a/x11-misc/qtnotifydaemon/metadata.xml b/net-misc/babeld/metadata.xml
index 4d5a0437a84e..a492b8f65591 100644
--- a/x11-misc/qtnotifydaemon/metadata.xml
+++ b/net-misc/babeld/metadata.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <upstream>
-    <remote-id type="sourceforge">qtnotifydaemon</remote-id>
-  </upstream>
+	<maintainer type="person"><email>heroxbd@gentoo.org</email></maintainer>
 </pkgmetadata>
diff --git a/net-misc/chrome-remote-desktop/Manifest b/net-misc/chrome-remote-desktop/Manifest
index 519bf3869ae4..7fc235ed8cb0 100644
--- a/net-misc/chrome-remote-desktop/Manifest
+++ b/net-misc/chrome-remote-desktop/Manifest
@@ -4,10 +4,8 @@ AUX chrome-remote-desktop.rc 1388 BLAKE2B 937378e8ad7bb295333dc537a9c333e1a1041a
 DIST chrome-remote-desktop_49.0.2623.40_amd64.deb 20315570 BLAKE2B 03725450590fad81105ae5314f9a1c9c9acc1b3f2d294ee1401379c264d59d737c2c39333ab5cb7a77e5885855ca484db360f0936be6c5bc2c84aa0cb38afe72 SHA512 d936885a986a749a0b4ebb1bb68fe0bc14d10d21363a409abbbb224b4f3ee048ef030ee81469be9bbb8c3852d7c6793fcab1f51d52fcaf5b02cda07550b72330
 DIST chrome-remote-desktop_49.0.2623.40_i386.deb 20941574 BLAKE2B 7f86e734fdc9c95f8820912aa075d4be805896f4f045ba39fb1fedc9ba6e3b576d71ce67692f683009ff005c2c248ed067ef4980906ae9e158c107aa96b58470 SHA512 00cf6641ee993fb8c295ca99cb57cde42eb3dd6cc34ae4684f858279615695d5b1a257081e8988293f94e887986492e112bc0276f572cd592d9879dec88eace8
 DIST chrome-remote-desktop_55.0.2883.50_amd64.deb 21636452 BLAKE2B 34ec5d7d5f01610161613921b685166be1f8c78eb8fdece45ea66fb83e05784adb33750fc9612cf77fd6a7b9c0bea8568c784d5b0ecd518e3f60ae2154295407 SHA512 3e140407d6e34caed18f3280d2136ea924ba7c9fc0159cde4981927be9c0bd090c58581ed01b3a99b8a796211500ff1588a847d5d3273ec814d9fb10285a97f8
-DIST chrome-remote-desktop_56.0.2924.51_amd64.deb 13879608 BLAKE2B 2ccc6d4c8b9d20992cdc84ccdf28fba54f2d18014225a6cdafb0a4ee6ab1e202eadbf6b039bbb2860c81fb7a9356bff8dc3b759f44c8a270f314e207bdd9f11a SHA512 0578f430d93270b398c7341515e10e25ffe4c8827b3a8dc01b789fc530eb0919cd560bfa8377d5e1f0c74c53db7ba2f60354c57e2c435dcb411d9168610a3b7f
 DIST chrome-remote-desktop_57.0.2987.37_amd64.deb 15677362 BLAKE2B aa92ef2a6c89043ff7e1a39c186edc57dabd9b5a629391aa0603f51b527131a94cea501a9929a5cacd951b8204959ed93203b81bdadf677af5d937774d110f69 SHA512 df470d9f69545dd2793b5d97674bb8724f5ad3dfad05b4d5572b01a21443d79e6776fb72ca14044d7ee00660b7d040023c9716e2568551e2862bdfd3cff99d88
 EBUILD chrome-remote-desktop-49.0.2623.40.ebuild 3668 BLAKE2B f149fbab2512737be2bf8668ac1aa6b0c2873a23afcbbef60fbb7d67fafd3ce213496860ff4266a05527712a26f6f9cf964258f8c8b5bb5c6638034c4f19ff5c SHA512 7486227050481ba09ac2f5a0c1fa205d1461210354bbbd2b1fdcd40195fc223ed018b439ad421c1f93c825e67106042e867f57552b68c26134fd185daa4126be
 EBUILD chrome-remote-desktop-55.0.2883.50.ebuild 3403 BLAKE2B a84618438a3ff2fc32e0cec93d45e3acbdb6f36b3fbbd400f7944deed4ee0bf406aa2f7d662da4c69388714ddf702afd9b139628ed80ef8c7542ce03c3357f88 SHA512 bc100be9a1d350e8e2068d7fc9cccefa54f846a7703222d6371a5b3b6f7a012e9c8de406518c69935999b03a45480ac8028820a601a1bcc9ccf7a1ecd5cdbf3c
-EBUILD chrome-remote-desktop-56.0.2924.51.ebuild 3405 BLAKE2B 0e5fe524121ac746cc2e070f364e58056534cfd949c106bf6ba7ad6c1d2c8b44e25a3d70fd14831c24a1adbb4d77f06b425d53beb8008e957e9892b8c79d3600 SHA512 f82404cef04d54b7e99b8fc271d8403e2e4bc659bb1c2b701794d1fc8823174b5e889622ca1873a37ffd56a121f9cb4e4b6ddce5b1253746fead511423400a9b
-EBUILD chrome-remote-desktop-57.0.2987.37.ebuild 3826 BLAKE2B 859a9ab7812e03d494eb789ff5baf7b531cc5e20270c149d4fbcc8e7748d236dff22216a9e361a9f2c0c175e455a5a73a9ca1c6c000eb7013bdf0f4696e0f0e7 SHA512 009b75c18f84a40d5d10a40704b12cd31cce0402c07740d6a906d7767239d8914f5744d25649ecc6037c7049f15e353668229ac27e49f728b7feb87ecf930cfe
+EBUILD chrome-remote-desktop-57.0.2987.37.ebuild 3825 BLAKE2B c5d0b10e2c3685b6152c5e35631d223e5993078365a9d54dbc336455d51c1c4d5d213db0b29f3cd4e84845fa0f35a1606a51aacc91b632ea651fb1322cfc8249 SHA512 0e275cce491f42c3ab65e9d3fce723bea92edfa6354ad20203f347e9b39c152deea52429bb3c055d02d8ac4d913d37c6ce1855bc7ad5db36afa851447a8ec42d
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-misc/chrome-remote-desktop/chrome-remote-desktop-56.0.2924.51.ebuild b/net-misc/chrome-remote-desktop/chrome-remote-desktop-56.0.2924.51.ebuild
deleted file mode 100644
index a2172a6f3a1b..000000000000
--- a/net-misc/chrome-remote-desktop/chrome-remote-desktop-56.0.2924.51.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Base URL: https://dl.google.com/linux/chrome-remote-desktop/deb/
-# Fetch the Release file:
-#  https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/Release
-# Which gives you the Packages file:
-#  https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/main/binary-i386/Packages
-#  https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/main/binary-amd64/Packages
-# And finally gives you the file name:
-#  pool/main/c/chrome-remote-desktop/chrome-remote-desktop_29.0.1547.32_amd64.deb
-#
-# Use curl to find the answer:
-#  curl -q https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/main/binary-amd64/Packages | grep ^Filename
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit unpacker eutils python-single-r1
-
-DESCRIPTION="access remote computers via Chrome!"
-PLUGIN_URL="https://chrome.google.com/remotedesktop"
-HOMEPAGE="https://support.google.com/chrome/answer/1649523 ${PLUGIN_URL}"
-BASE_URI="https://dl.google.com/linux/chrome-remote-desktop/deb/pool/main/c/${PN}/${PN}_${PV}"
-SRC_URI="amd64? ( ${BASE_URI}_amd64.deb )"
-
-LICENSE="google-chrome"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# All the libs this package links against.
-RDEPEND="app-admin/sudo
-	${PYTHON_DEPS}
-	>=dev-libs/expat-2
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	dev-python/psutil
-	gnome-base/gconf:2
-	media-libs/fontconfig
-	media-libs/freetype:2
-	sys-devel/gcc
-	sys-libs/glibc
-	sys-libs/pam
-	x11-libs/cairo
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXtst
-	x11-libs/pango"
-# Settings we just need at runtime.
-RDEPEND+="
-	x11-base/xorg-server[xvfb]"
-DEPEND=""
-
-S=${WORKDIR}
-
-QA_PREBUILT="/opt/google/chrome-remote-desktop/*"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-44.0.2403.44-always-sudo.patch #541708
-	python_fix_shebang opt/google/chrome-remote-desktop/chrome-remote-desktop
-}
-
-src_install() {
-	insinto /etc
-	doins -r etc/opt
-
-	insinto /opt
-	doins -r opt/google
-	chmod a+rx "${ED}"/opt/google/${PN}/* || die
-
-	dodir /etc/pam.d
-	dosym system-remote-login /etc/pam.d/${PN}
-
-	dodoc usr/share/doc/${PN}/changelog*
-
-	newinitd "${FILESDIR}"/${PN}.rc ${PN}
-	newconfd "${FILESDIR}"/${PN}.conf.d ${PN}
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "Two ways to launch the server:"
-		elog "(1) access an existing desktop"
-		elog "    (a) install the Chrome plugin on the server & client:"
-		elog "        ${PLUGIN_URL}"
-		elog "    (b) on the server, run the Chrome plugin & enable remote access"
-		elog "    (c) on the client, connect to the server"
-		elog "(2) headless system"
-		elog "    (a) install the Chrome plugin on the client:"
-		elog "        ${PLUGIN_URL}"
-		elog "    (b) run ${EPREFIX}opt/google/chrome-remote-desktop/start-host --help to get the auth URL"
-		elog "    (c) when it redirects you to a blank page, look at the URL for a code=XXX field"
-		elog "    (d) run start-host again, and past the code when asked for an authorization code"
-		elog "    (e) on the client, connect to the server"
-		elog
-		elog "Configuration settings you might want to be aware of:"
-		elog "  ~/.${PN}-session - shell script to start your session"
-		elog "  /etc/init.d/${PN} - script to auto-restart server"
-	fi
-}
diff --git a/net-misc/chrome-remote-desktop/chrome-remote-desktop-57.0.2987.37.ebuild b/net-misc/chrome-remote-desktop/chrome-remote-desktop-57.0.2987.37.ebuild
index 47641db6d60e..fc00cdec2c72 100644
--- a/net-misc/chrome-remote-desktop/chrome-remote-desktop-57.0.2987.37.ebuild
+++ b/net-misc/chrome-remote-desktop/chrome-remote-desktop-57.0.2987.37.ebuild
@@ -32,7 +32,7 @@ SRC_URI="amd64? ( ${BASE_URI}_amd64.deb )"
 
 LICENSE="google-chrome"
 SLOT="0"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 IUSE="${PLOCALES[*]/#/l10n_}"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/net-misc/gsutil/Manifest b/net-misc/gsutil/Manifest
index 75976225ca7a..8f68c9768ea3 100644
--- a/net-misc/gsutil/Manifest
+++ b/net-misc/gsutil/Manifest
@@ -1,5 +1,8 @@
 AUX dummy.boto 128 BLAKE2B f366c006392ef65857a3af2334f6776ce9609841fab260e27c15579b7f2603cc547f55f97ad053027aef670616e2e8c65c0c932ca930cb2a59de1428c62c3887 SHA512 9e420dde9d7e8e9fe2513529fd2681994763e8b9069ae9911c56a3ee72d77e40a8e5c8b0e7c006fe5c336ccb78935d908b20bd1bd275dded317a0c5d2b7bc97d
 AUX gsutil-4.27-use-friendy-version-checks.patch 745 BLAKE2B 71c404d864f38528836c635b36a49dfa67b7d0370da5ed5486539a8bf5a79130bee1c950d012053fd610ea101be16ce120468221a343e893cbaa6a6507c95d8c SHA512 ed060d08fe58c171df591c010aec1c597a4ba2f08ecf4d5806a78437b90aedd9309f16f48a7cc24143c508b9cac44d865aa3b4499cd11ab8fa1cc0c6196796ad
+AUX gsutil-4.28-use-friendy-version-checks.patch 750 BLAKE2B a4b2e54e3d0d983f5ed2ed41ae092b2ef398a8702830a890c97aef4f6ac1655689f96537c0cf6c99dfb4e2fdca29537aabc09cab2a9a772e5d71c3f303c82aa9 SHA512 461668e10d4480f21144af93f14d4059a2cdfc15b739bc58f7fe9547a96dd38a8bf0f6c7f10b9928fdc1c5e1e402292eaabbbcfb808a4b5dae09cfac1c797e27
 DIST gsutil_4.27.tar.gz 3107288 BLAKE2B 4322335779645caf8d1ce717140a92a2173871e3c572c70a1a07cfe3f2c3b054becb74a3b4cdd2cfac912b3f84758b1b40e65223cc9e3582653392bc3fc180d5 SHA512 0c05e3f1baa8e11e89fc5af2a42474984fc4d5b3cfbd28f3a0efd7603aeee9062f55899c8325579a10e37a6b70a2ad770daf03589f43d0a8a696595c1cdf7b57
+DIST gsutil_4.28.tar.gz 3410500 BLAKE2B ef6d5460f9f04d27c0f172db5880e02cc88f461455ca05c3eb125656f80c29cba9fcf96ceb0c5958f14a7dc1ac85fcae3a2234a2876c7757ece5e756e910da08 SHA512 fbba505f58bc46a737ae8c02aa6a112f71f2543e3aaa4d45afd8e81cda0850c7180216827f3510858b90dfcad85c2d4b54a8c74a04c9b4ab580e966fee7bde0a
 EBUILD gsutil-4.27.ebuild 1740 BLAKE2B c3e503d3d77e86fd0b1348c8874e77d6dc98a13f4eb2800dac4af762fdfc46e1ccafe2ec18a90ab5977dbfd3fc4b77bea90c3b1ad6fd1cbaf8b626c80dd93dbf SHA512 bcdd47cd2b3a021b47e16a783e6ef805bdf89bddb08df894f0919972a801fa2a09eee724ca55ce15c316b7be371c643a17955eef4570701b4d4939bd41e20595
+EBUILD gsutil-4.28.ebuild 1744 BLAKE2B 94f21ca272815ef6dfb33670f4c9f62a3b3214b4028a6d017ddeea250aa08c77d1cdf443981fbbd52b1dfb3b66699e886ebad7b8161847c62ff35236f4db6c65 SHA512 5eb59880ae5a14af04c8714ef697795d62f0f831570729a8e7ee775f7355e3253dfb1d9f33617817e4d59e91c99839ef54737d869ebd84bde5bfe621dd017d17
 MISC metadata.xml 309 BLAKE2B 2e96100ac1f7d7ec8002836564ada61c1f60527f13dedb03063940bbed304147766406ad2dfe3269385320f1f81d3f7ce0979077c6f43ec49d6e8f99d5913cd7 SHA512 9ef28b80fa82fb11b954bdaf65bb385203f18a44dcfa53f2f8cdf47f62ece37eea0ecec1c83e067485d16fc0dd6b8bfb8a0fe625b5af8e5d07cb48a1e52b3178
diff --git a/net-misc/gsutil/files/gsutil-4.28-use-friendy-version-checks.patch b/net-misc/gsutil/files/gsutil-4.28-use-friendy-version-checks.patch
new file mode 100644
index 000000000000..93b529a3003b
--- /dev/null
+++ b/net-misc/gsutil/files/gsutil-4.28-use-friendy-version-checks.patch
@@ -0,0 +1,29 @@
+--- a/setup.py
++++ b/setup.py
+@@ -36,21 +36,21 @@
+ 
+ requires = [
+     'argcomplete>=1.8.2',
+-    'boto==2.48.0',
++    'boto>=2.48.0',
+     'crcmod>=1.7',
+     'gcs-oauth2-boto-plugin>=1.14',
+-    'google-apitools==0.5.16',
++    'google-apitools>=0.5.16',
+     'httplib2>=0.10.3',
+     # TODO: Sync submodule with tag referenced here once #339 is fixed in mock.
+-    'mock==2.0.0',
+-    'oauth2client==2.2.0',
++    'mock>=2.0.0',
++    'oauth2client>=2.2.0',
+     'pyOpenSSL>=0.13',
+     'python-gflags>=2.0',
+     'retry_decorator>=1.0.0',
+     'six>=1.9.0',
+     # Not using 1.02 because of:
+     #   https://code.google.com/p/socksipy-branch/issues/detail?id=3
+-    'SocksiPy-branch==1.01',
++    'SocksiPy-branch>=1.01',
+ ]
+ 
+ dependency_links = [
diff --git a/net-misc/gsutil/gsutil-4.28.ebuild b/net-misc/gsutil/gsutil-4.28.ebuild
new file mode 100644
index 000000000000..452ebb5e0681
--- /dev/null
+++ b/net-misc/gsutil/gsutil-4.28.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="command line tool for interacting with cloud storage services"
+HOMEPAGE="https://github.com/GoogleCloudPlatform/gsutil"
+SRC_URI="http://commondatastorage.googleapis.com/pub/${PN}_${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+# The oauth2client-2 dep sucks.
+# https://github.com/GoogleCloudPlatform/gsutil/issues/355
+RDEPEND="${PYTHON_DEPS}
+	>=dev-python/argcomplete-1.8.2[${PYTHON_USEDEP}]
+	>=dev-python/boto-2.48.0[${PYTHON_USEDEP}]
+	>=dev-python/crcmod-1.7[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.10.3[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
+	>=dev-python/gcs-oauth2-boto-plugin-1.14[${PYTHON_USEDEP}]
+	>=dev-python/google-apitools-0.5.16[${PYTHON_USEDEP}]
+	=dev-python/oauth2client-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/python-gflags-2.0[${PYTHON_USEDEP}]
+	>=dev-python/retry-decorator-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/PySocks-1.01[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/${PN}
+
+DOCS=( README.md CHANGES.md )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.28-use-friendy-version-checks.patch
+)
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	sed -i \
+		-e '/SocksiPy-branch/d' \
+		setup.py || die
+
+	# Package installs 'test' package which is forbidden and likely a bug in the build system
+	rm -rf "${S}/test" || die
+	sed -i -e '/recursive-include test/d' MANIFEST.in || die
+}
+
+python_test() {
+	export BOTO_CONFIG=${FILESDIR}/dummy.boto
+	${PYTHON} gslib/__main__.py test -u || die "tests failed"
+}
diff --git a/net-misc/icaclient/Manifest b/net-misc/icaclient/Manifest
index 2ababecfd5ec..878dbf541475 100644
--- a/net-misc/icaclient/Manifest
+++ b/net-misc/icaclient/Manifest
@@ -1,9 +1,9 @@
 AUX 10ICAClient 88 BLAKE2B de89e73ff93f7b7a78b4d20bb3233471e29b448727de46c51859153af6754d8c3f0d6343c84671b706f0921c573703593342580855ae6e9ae04220848a5f872b SHA512 1a9c405dd4e5629595cdbbd5a712432fd40531ef094c84fb64849a49885dca2e9e27687fe01568735a12c11282fa851aab7d26d0db8606acd7b577eae8339e57
-DIST linuxx64-13.6.0.10243651.tar.gz 20685306 BLAKE2B 75c963cbbc1a907697938b0ffa82908a17a2aa0d6ba883b2f850a8f30d7d6e7ca78688ed3ee3a143644a76e956fa3255627ff5bdf925d865a8feecd63cdd4ba5 SHA512 e28e417a3a4e8d292b243d894f954692a6042adc0851c595ae25107ac9d6e84cc8e6d232c759ba2a45d9571b3f673e0e3f8431bb6736508f310f990799e6f58f
 DIST linuxx64-13.7.0.10276927.tar.gz 19647618 BLAKE2B 28106ee1223ad41b2a73f2b115bdec52cf87cb851cf8f481082ba24c5d6fc87f381d01c7170f15ac300f1e4656a5637cb579fa291712d32704ff8ca9fcd8a3bc SHA512 30b05ca67ed5d53d01bd8e83473f9b71613562186c40479797d19ad665f9d73ba43f2af974878b78d9d86c67b7b5c6e88701427daaf0a46c45e13ba915e0fe58
-DIST linuxx86-13.6.0.10243651.tar.gz 22560063 BLAKE2B eb5eb856045c25aed317308de950bfb9e91c155b9e1f4fc36d7385a96eef2c19a8504b8138d227a8d41e319f59edd4b9523ccf59c600f096c26d317d18dc6799 SHA512 06fd3d738be851c8b75790bf5dac3897b71ebffb028864119a43053ab45815c6ffb04d3b8e37d79673d85179034d22da923e2972dc12807ac409e087e18919cd
+DIST linuxx64-13.8.0.10299729.tar.gz 19855914 BLAKE2B 62029b75a2c77f3c58ca272a3cf8b91094f1328e9378ae66bf38ea94b7a0d14ccee392efd983cd1f2c7af822d488358b1db7c97569f866cb0381c9f5b3188bb8 SHA512 dc43587b7ca35d12ff2772618f8fa1154ee26081e315d381cf603976a7c2f4e395c8d8f134f7ad7238a3c390fdb085291f92ff3da2b4755d903fcd15d0c738df
 DIST linuxx86-13.7.0.10276925.tar.gz 21531393 BLAKE2B 31c132358c9ef7c8bc9b413084867fc1885e3f8939b2793c2166aaea39c1e309c9ad22521db16680bd0b816f81999d505645cd3ea97a7491b5b8cc20e915f1de SHA512 7fb6efffe0fc7681197de00a86e15c7b2de30bcd8c581d4da59a8fdebcea4f2da41ad1f573e81761c5bcf554718a75716aa75b28b8c3ac77461246a5c9f48cd1
-EBUILD icaclient-13.6.0.10243651.ebuild 4632 BLAKE2B 8096d3579022f55638e95a399418b0d6f211b3c805c2542fff5c1661cafdcd0d9728f139cc1d86739b96809e5d7e5c997fda2710b509d134b1523de71d3a87f7 SHA512 1bd702b09ed0e9c2265f0d40ff1451d510ec9de6a64384c5a0dcc51b9909e726edb93e8e2e7a37828568f77f1a143af070b8af0cbcf50d54b8a29aa86714886c
-EBUILD icaclient-13.7.0.10276925.ebuild 4636 BLAKE2B 21947e8e4ed88a07b71ec2a596565d0716813683142340b81731760391464dbf1d1496c68a40c36243924949dfd429ea16a87eff73fd20d810261a9a9de9bf68 SHA512 3273c929b5c1c5cf003ca61038d78c2615ac3d1484c74009550b7ad4adad1dcf86e413ecda99839172abea19242e92acb3502fe6eb7f83ab6f3b28d71501378e
-EBUILD icaclient-13.7.0.10276927.ebuild 4631 BLAKE2B 96766a115c02f1bd096fbe9baf529aac1ab00254e708173cfd697f099c0e7f9652a7271eb4af43417fa8c21dead4324c9c7d51d1dc9a819f5b089a183b8bc449 SHA512 d7da197d63cd566abcb85a57ffd2aa967a656201c957c36b97fe414fea5c7fa318d03d9405ada93a996537778208b276a8ee0152852f391be2fa059ac2e8e16c
+DIST linuxx86-13.8.0.10299729.tar.gz 21763683 BLAKE2B fb8238dd256bbeff59df73e1ee495579ffa315d5d38d857436ebdafc2d5e4f9e3bf3c760a66005fbd82657ddbe418849a28532b15b757937d0892e4be33a1905 SHA512 7e6c70e3600cc56c85722f37e473cf3c422daded0f7e755c47bf8b17f224be0676f5ef09c594c058eae6760dc4633c13a02f4d75c3870a4a10a04d29159a670a
+EBUILD icaclient-13.7.0.10276925.ebuild 4635 BLAKE2B f51c1d52f61efbb39183272b2b6a38e5443793eafe1d55bc8b950364b3aa46b6a9e1b7a83a7a976db306e49756cf017a1bd135ae5ed8f28acb3bae2e34056995 SHA512 c3c89d17483a8ce1bad1c2513a6e2e3a2a96e3442d7e64a2d0b44e9f73c2077a417db453b97ba6bea5a610f0b41216552ee0f9f0671333f8c213976ce5857684
+EBUILD icaclient-13.7.0.10276927.ebuild 4630 BLAKE2B c465ec17d70c4096c287b4d1c57a9f71e80fcf96867cfed4e09bf18a0fbc6ade4796db324f51c7e3648f6bc7edd58d52e2b0bffb7cd19cd628629dc894b37a97 SHA512 6350dbf895eec5808ffb9abd698f69aadbebea7577596b37815f778f641d9cbf12636bbb35d6a80c16c455e5d350041ef97cba4674868390a93baa7673804ea2
+EBUILD icaclient-13.8.0.10299729.ebuild 4320 BLAKE2B 0eeafa010a5978ae71b5db5219e35cc44a87c4aa42395fda7a9cdd3db142684d6bc2f8c3e6e73facbf0b0e04e03102378df2f7447d3ebd999d2a6e0bed1195b5 SHA512 ba3ae1816dc22d8b6fae74615c31bb75c1d61730121b4201ac047cc835b5f0adb02e9171535fb74e42a254b86aeea344919f0ef4a470fb7b35483b84547caa59
 MISC metadata.xml 731 BLAKE2B 0591439b7ee7542c2e23cb0421d0e51141db3ae4405cd865a9d6ca58742c7438645d496a55428598be89c92f69fdec881d60674b52eaedca802894b490954dc3 SHA512 dab4b211f7d0b6e4c1b25ea2009de42a50d1ae69b05a5aeada2870282c2049e8212bf88a879a349b92a00669f8f3ab348e8513f12b5e8143b1258b58f0f610b0
diff --git a/net-misc/icaclient/icaclient-13.7.0.10276925.ebuild b/net-misc/icaclient/icaclient-13.7.0.10276925.ebuild
index dd9cf49c6f73..f406a1729dd9 100644
--- a/net-misc/icaclient/icaclient-13.7.0.10276925.ebuild
+++ b/net-misc/icaclient/icaclient-13.7.0.10276925.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
@@ -12,7 +12,7 @@ SRC_URI="x86? ( linuxx86-${PV}.tar.gz )"
 
 LICENSE="icaclient"
 SLOT="0"
-KEYWORDS="-* ~x86"
+KEYWORDS="-* x86"
 IUSE="gstreamer010 nsplugin linguas_de linguas_es linguas_fr linguas_ja linguas_zh_CN"
 RESTRICT="mirror strip userpriv fetch"
 
diff --git a/net-misc/icaclient/icaclient-13.7.0.10276927.ebuild b/net-misc/icaclient/icaclient-13.7.0.10276927.ebuild
index cdd7f6ba8c6a..204c38fbec90 100644
--- a/net-misc/icaclient/icaclient-13.7.0.10276927.ebuild
+++ b/net-misc/icaclient/icaclient-13.7.0.10276927.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
@@ -12,7 +12,7 @@ SRC_URI="amd64? ( linuxx64-${PV}.tar.gz )"
 
 LICENSE="icaclient"
 SLOT="0"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 IUSE="gstreamer010 nsplugin linguas_de linguas_es linguas_fr linguas_ja linguas_zh_CN"
 RESTRICT="mirror strip userpriv fetch"
 
diff --git a/net-misc/icaclient/icaclient-13.6.0.10243651.ebuild b/net-misc/icaclient/icaclient-13.8.0.10299729.ebuild
index 5a7c8f00a2d6..590f4019bb37 100644
--- a/net-misc/icaclient/icaclient-13.6.0.10243651.ebuild
+++ b/net-misc/icaclient/icaclient-13.8.0.10299729.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
@@ -12,8 +12,8 @@ SRC_URI="amd64? ( linuxx64-${PV}.tar.gz )
 
 LICENSE="icaclient"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="gstreamer010 nsplugin linguas_de linguas_es linguas_fr linguas_ja linguas_zh_CN"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="nsplugin linguas_de linguas_es linguas_fr linguas_ja linguas_zh_CN"
 RESTRICT="mirror strip userpriv fetch"
 
 ICAROOT="/opt/Citrix/ICAClient"
@@ -40,7 +40,6 @@ RDEPEND="
 	media-libs/speex
 	net-dns/libidn
 	net-libs/libsoup:2.4
-	net-libs/webkit-gtk:2
 	sys-libs/e2fsprogs-libs
 	sys-libs/zlib
 	virtual/krb5
@@ -56,10 +55,6 @@ RDEPEND="
 	x11-libs/libXrender
 	x11-libs/libXt
 	x11-libs/pango
-	gstreamer010? (
-		media-libs/gst-plugins-base:0.10
-		media-libs/gstreamer:0.10
-	)
 "
 DEPEND=""
 
@@ -173,10 +168,6 @@ src_install() {
 	dosym /etc/ssl/certs "${ICAROOT}"/keystore/cacerts
 
 	exeinto "${ICAROOT}"/util
-	# echo_cmd, gst_aud_play and gst_aud_read still require gst-0.10
-	if use gstreamer010 ; then
-		doexe util/{echo_cmd,gst_aud_play,gst_aud_read,gst_play0.10,gst_read0.10,libgstflatstm0.10.so}
-	fi
 	doexe util/{configmgr,conncenter,gst_play1.0,gst_read1.0,hdxcheck.sh,icalicense.sh,libgstflatstm1.0.so}
 	doexe util/{lurdump,new_store,nslaunch,pnabrowse,storebrowse,sunraymac.sh,what,xcapture}
 
diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
index d71ac82c1b9a..972f9e954104 100644
--- a/net-misc/iputils/Manifest
+++ b/net-misc/iputils/Manifest
@@ -32,6 +32,6 @@ EBUILD iputils-20121221-r2.ebuild 4051 BLAKE2B 05bb4832d99c0c065b5caffb695929c91
 EBUILD iputils-20151218.ebuild 3977 BLAKE2B 1b51c297b6231fcc7edac3c28ffd5347263ed8cb8fa30aca729c9bf85d301b290123b99b82c9abb279e80f8a39c4721987fb3c1cbd5a3a286cc3708f9f25aa2e SHA512 b07ffea44d85ea3aa0a92ab606386d7d1a917eed700c421aabb4af6ae4b46b1fc5e9ef1f942a441441ec4171548b9dc04f7bd73b75804568579ec044b297dbc0
 EBUILD iputils-20160308.ebuild 3838 BLAKE2B 62aa96ba316885c62f9716a6ae488c349bb0b530a81f2b8497c70d92d235034b3556ed2256c588a979cd198de8d11665b6c1d83ac59cabce0a22ba25ab4f33cf SHA512 596ab450370cb8883d3480e8e0a21cc27ecaa19ba7499296a0c67e84fa8bce3c085f66d87eea03be19d54b780a8933f752999196b13d2b3d0a66faec2f756d08
 EBUILD iputils-20161105.ebuild 3870 BLAKE2B 800dd0dacaf970aed7a2d21d2f3931be41d0e2469dc7a2b9cd1fc1c3c58266759669cf393d0832ad1e27a8e550960bc6f7ede6fd0967f8b2c83526e004dd25ff SHA512 64f9077c8e69b02db0560a1213293d27cfebbd5a02d62f75b53f6ee3d76b46c64ce2995ca1c6e7b3fb22185f33fd40a0da4a1796307883adcbbb47ed123b9611
-EBUILD iputils-20171016_pre.ebuild 4089 BLAKE2B 4456817c48fd681945bf2f733bc57288bfb4bf35d42c072d849a96f7c47c0cdaa1ad82956b9a3a1ce0f6229ad7a3ab092086ccb3dde455d6d727f70da592fa99 SHA512 41b570b7aca636f33fc434cb6ec93f7ab9022398dec0562b20b9b82cff0bda52066e58cb55f3c0d68ab54de78ee2354e35e3ac9d4c1e3403726ae3c0997a52e3
+EBUILD iputils-20171016_pre.ebuild 4084 BLAKE2B 217410d195fa51635cdb841dfc48d84d256533cb7ade5ebb780edc8cd5d0ca98ba76a9fe3c75c14c38b44eaff470b2dd1c8757795fe3b925fca0be19fbc8889f SHA512 0eb0108e155aa28a54f4eaaa4a5d540f784644187e3a9708aa6f2d864690aa8655e4f506332476db6c293eaa657373775e2eda540bb2296df3b487443f29a496
 EBUILD iputils-99999999.ebuild 3905 BLAKE2B eee7bf20dc61ad938df5535fafbb197f94e0a1de5dd1e514d981bff627ec285f456e3f2b28e5a587ad763d206236cd0f72e61d9039100a5a3e030d4cc3159f5a SHA512 a7f056364c5394b6b9845930ba721492f1d8a4dc2a0231fbca9b5cdae14d8fa5d2f47460a85d2c6189c4f4288c26798b4c475c515cd441ed80114c510b82a437
 MISC metadata.xml 1698 BLAKE2B 0351c77626f66e4a50d83072124088cc7195c4666f6a66f6a981fa66b16b3740da6a08d63da9db0b2a4d02f8a75a04f97142e5b78099525ee8ed4921738d0236 SHA512 f1d211dbe4212072614039c5aea1996270560a24dfa3734af86c4f1f4254cc3abf8440c03d8894b925b71b970e70fb60e79682753655a68b82203cdc401f6ebc
diff --git a/net-misc/iputils/iputils-20171016_pre.ebuild b/net-misc/iputils/iputils-20171016_pre.ebuild
index fb555325457d..21e214f7506c 100644
--- a/net-misc/iputils/iputils-20171016_pre.ebuild
+++ b/net-misc/iputils/iputils-20171016_pre.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
 
 # For released versions, we precompile the man/html pages and store
@@ -24,7 +24,7 @@ if [[ ${PV} == "99999999" ]] ; then
 else
 	SRC_URI="https://github.com/iputils/iputils/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz
 		https://dev.gentoo.org/~whissi/dist/iputils/${PN}-manpages-${PV}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Network monitoring tools including ping and ping6"
diff --git a/net-misc/minissdpd/Manifest b/net-misc/minissdpd/Manifest
index 20bb89de706f..f39227fd251a 100644
--- a/net-misc/minissdpd/Manifest
+++ b/net-misc/minissdpd/Manifest
@@ -1,8 +1,6 @@
 AUX minissdpd-1.2-remove-initd.patch 595 BLAKE2B 420f456bcd5d0e1df0d857a142d463020716f9d8e1480b523ae5634ddb00c855efc4fef94ce683a3f136faa964dedeccd95877177182d4009b72bf91e1b4830c SHA512 20306ae9870659c9d5c07643f3d95ce56961a57a119d3f15b6aa6ef4ad6ab4c8f32bff9d11af3445f1c94fc9b628faf0a9c9b7e1fb1924f5bd20697bc39d438f
 AUX minissdpd.confd 487 BLAKE2B aeb624644debe2e9ba438f9839f526fc9411e6f4d355bf46764c5b7b59a62776c16c93d4112821159835e9d9f174f2af443c0d07a10823b41182910d12899947 SHA512 5ac723cb5b3d3f8bb97989cffb174f22566fcebff304e40f12ca5144cfa94b00614fdf6925e2c5a1dd0f8fa533aac12e991bad0d0909cbdd90a9b7ed73e0c296
 AUX minissdpd.initd-r2 1522 BLAKE2B 35bde96e182529f0dd10ec4081c495ba1f52706dc191e29fa99ebb7d37b302578e492f705d4f724744ec3a9ca455730f01294e2a781529c3750193fd8e84cf50 SHA512 6d14fa0730b4c1f0e6a6765c80250ebd01d69c6fd3341049fae276a3d0ae2ec806cdfeb3b7897be0b62e426c7c9d7fb59514a0d67bb751a2e41f9b9616cc9ade
-DIST minissdpd-1.5.20160301.tar.gz 34827 BLAKE2B 4330bb100a5ffcddc2569507895cbde6be408496ba6bcf027abdd2814d35c6a917be797e1b66d7f526a4f7795c4ee6db1afc755413c718938f33b19cd847b652 SHA512 b8dbfa7ce05fc006c09378fe53fb3345cd8d4aad486ba0bd4adb4d7f5d662e34ba04d82ad48bdc721eca1a7d1d083a9f42be69c5d1086223a0e8803068c15426
 DIST minissdpd-1.5.20161216.tar.gz 35078 BLAKE2B c8e681e812869ddc15cece499356e7852a4b2e86b661bd80d62a840c8a9a01f321d4616013fec49d4abd834c75378014b52e605ad3fa116c0dc863e5a389a9fc SHA512 4fe1dbc14a39a18bcc834c73cc0150cda656b2be7ffcc0a72dc2854dbd698f3528bfdcd80af741124546f916d914921ffc428bb4f19b34e7493f0cbf9ff54928
-EBUILD minissdpd-1.5.20160301.ebuild 710 BLAKE2B 2cd828a3045c2bd1adcb39de4ae0720cce1e5fe363771e1501116a6aa2738202f8fdf43201273fc26e7700c7daba3747449f54fc64212420547b1a618893b5a9 SHA512 5ffaf520ae16275f29245211dc505e4c99185f2afd10525921095ada1f58154c588dd82de33a5409821f5b0b1e43b5c1eacf5c36b9b8f1eb80975f887e33598e
 EBUILD minissdpd-1.5.20161216.ebuild 694 BLAKE2B a1e1cd336d2993c5384f923f7d74e021d0f5e8db1b437fb7610fdc5858254c2d0f0f8707870bc8f7971ea99e6da1c0d84367c4ee1cffd339fb11f176b9942275 SHA512 7d5738d4fec110c526ea32aa830b2dda2f0c4a8dfecbb77e5e5fd1201be01063ff32cec1206e4b635f35592d51b800e006fe096abd4e8d65aad56d3526f5933d
 MISC metadata.xml 360 BLAKE2B 7e083fa0362b52310ab298a0684308dbe220a6f6acb7b99c99cf6bf22cb9406da9d34e021a367d50eaefa67f133c5b57f01d4b63aa46887ea15bf4c66ad5e5e4 SHA512 fbf209d07841a834e1d216090879be7a1e739f7ddd1e649d40d24aabe8782d2ed55a37fe8525453cb96137f1c76044087a6b435c786877349bbe939485d7b855
diff --git a/net-misc/minissdpd/minissdpd-1.5.20160301.ebuild b/net-misc/minissdpd/minissdpd-1.5.20160301.ebuild
deleted file mode 100644
index aed15e6c5e32..000000000000
--- a/net-misc/minissdpd/minissdpd-1.5.20160301.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-inherit eutils toolchain-funcs
-
-DESCRIPTION="MiniSSDP Daemon"
-SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
-HOMEPAGE="http://miniupnp.free.fr/"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="net-libs/libnfnetlink"
-
-RDEPEND="$DEPEND
-	|| ( net-misc/miniupnpd net-libs/miniupnpc )"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.2-remove-initd.patch"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install () {
-	einstall PREFIX="${D}"
-	newinitd "${FILESDIR}/${PN}.initd-r2" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	dodoc Changelog.txt README
-	doman minissdpd.1
-}
diff --git a/net-misc/miniupnpd/Manifest b/net-misc/miniupnpd/Manifest
index 72356b68d457..580a6038c719 100644
--- a/net-misc/miniupnpd/Manifest
+++ b/net-misc/miniupnpd/Manifest
@@ -1,7 +1,5 @@
 AUX miniupnpd-conf.d-r1 301 BLAKE2B 90ead95141ec0ef6591113a352a6a1341496f273d33c5d8ba66756349af8e7b9e1d8dc1b1ec585e32c3c783d9d9ecc456383375527f14c1d48bebfb170eabacd SHA512 47ab1626f5102e26ef8788bb5f90138d178a798c106e377139453d80e687b61bea1262a8429b39fa6f2dee5fc5f112628e580975d8e2e5ab40d43473d38a6c5b
 AUX miniupnpd-init.d-r1 659 BLAKE2B fc2cfeabf10b4e163ea47fb5ba814df0a52a181380bc6c8485daf007a40a352d413833586ea537195bd87e5303a262363bbf71ec71119280329a4996d2a08342 SHA512 11b05eb9d33afbce7b1bee1bf0159875ee0dfb52048aa4f379a0d21b117b04cf0775885d06cc24735d46611aae4a78cc66ba19cf3d8f7db3611909a565e75771
-DIST miniupnpd-2.0.20161216.tar.gz 218119 BLAKE2B 9d09f4d2b19c4f808bf527c90a73739baa0eac924f461f6cbbf20866ee851f85248efa920bd6a770173d4a3a8f9e8d771ffacdb17aa684d329295502278f7963 SHA512 af82f060d28033dd670fcc96c8e2895f92d249a8a79d991e0215159eeb57715d7a9152d7d751b836091f7a623ce8a194ea243d1a2fb639349e320c02ce187c27
 DIST miniupnpd-2.0.20171212.tar.gz 222617 BLAKE2B 6ac33048b18d9f8aeb5103f57c9982fec956a61155f8592118c38dea70801597d9e867690ef2f1cdfaf848a25d7ddb4891b3ebf37cd391b33518d6b02e6f9b4a SHA512 3ab81c840953736c662bcb6f074421052a846c7827768acd7a961a23906b9e3d3389f5b593fb6f8011c8e717dae6cd3907b6d34e7904d560378671a7fc1dd3b2
-EBUILD miniupnpd-2.0.20161216.ebuild 1468 BLAKE2B 646f5b6e83f38035a0658a43659645fe1df0ce75b29e2422c758c2240d73f74bdab91abd7ebdb78b030808285edd73aba09e284058e159405292b096dbda6f31 SHA512 ef1a6777848cc09930a15321ec2ad90fc458a3ce2bbc5e0387de5f4093583eaa69911ec0c8f79c5fb56f2fa916759553ce3b78606111be5aba8c36c9c224460e
 EBUILD miniupnpd-2.0.20171212.ebuild 1468 BLAKE2B 646f5b6e83f38035a0658a43659645fe1df0ce75b29e2422c758c2240d73f74bdab91abd7ebdb78b030808285edd73aba09e284058e159405292b096dbda6f31 SHA512 ef1a6777848cc09930a15321ec2ad90fc458a3ce2bbc5e0387de5f4093583eaa69911ec0c8f79c5fb56f2fa916759553ce3b78606111be5aba8c36c9c224460e
 MISC metadata.xml 1043 BLAKE2B 1ea4668279d5b43c5ffa7a2c95f3fec6532a2a6918fa0f1a9b6fc60f37af5524929d434da3a346aa093bc7ba8e5bde644342500606d753f43499f0df164e4782 SHA512 2f825098e0257d3242abfdbaa0ba3ae7e669912a1b81e7c0f559e208297e2bc0e82c07698f1e63c01b15170eae3560e27e8a67c3fc91598cf81b5b70f8e5101d
diff --git a/net-misc/miniupnpd/miniupnpd-2.0.20161216.ebuild b/net-misc/miniupnpd/miniupnpd-2.0.20161216.ebuild
deleted file mode 100644
index cbdc231611f5..000000000000
--- a/net-misc/miniupnpd/miniupnpd-2.0.20161216.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 toolchain-funcs
-
-DESCRIPTION="MiniUPnP IGD Daemon"
-HOMEPAGE="http://miniupnp.free.fr/"
-SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+leasefile igd2 ipv6 pcp-peer portinuse strict"
-
-RDEPEND=">=net-firewall/iptables-1.4.6:0=[ipv6?]
-	net-libs/libnfnetlink:=
-	net-libs/libmnl:=
-	dev-libs/gmp:0=
-	sys-apps/util-linux
-	dev-libs/openssl:0="
-DEPEND="${RDEPEND}
-	sys-apps/lsb-release"
-
-src_prepare() {
-	default
-	mv Makefile.linux Makefile || die
-}
-
-src_configure() {
-	local -a opts
-	opts=(
-		--vendorcfg
-		$(use igd2 && printf -- '--igd2\n')
-		$(use ipv6 && printf -- '--ipv6\n')
-		$(use leasefile && printf -- '--leasefile\n')
-		$(use portinuse && printf -- '--portinuse\n')
-		$(use pcp-peer && printf -- '--pcp-peer\n')
-		$(use strict && printf -- '--strict\n')
-	)
-
-	emake CONFIG_OPTIONS="${opts[*]}" config.h
-}
-
-src_compile() {
-	# By default, it builds a bunch of unittests that are missing wrapper
-	# scripts in the tarball
-	emake CC="$(tc-getCC)" STRIP=true miniupnpd
-}
-
-src_install() {
-	emake PREFIX="${ED}" STRIP=true install
-
-	newinitd "${FILESDIR}"/${PN}-init.d-r1 ${PN}
-	newconfd "${FILESDIR}"/${PN}-conf.d-r1 ${PN}
-}
-
-pkg_postinst() {
-	elog "Please correct the external interface in the top of the two"
-	elog "scripts in /etc/miniupnpd and edit the config file in there too"
-}
diff --git a/net-misc/npapi-sdk/Manifest b/net-misc/npapi-sdk/Manifest
index 2202ded4558a..c73e7b6c69f4 100644
--- a/net-misc/npapi-sdk/Manifest
+++ b/net-misc/npapi-sdk/Manifest
@@ -1,6 +1,4 @@
 DIST npapi-sdk-0.27.2.tar.bz2 65811 BLAKE2B 7f746f077bb87ef8de31499cc3ba0f0c15197ebd9da7891096ecb368d66ca2a7a54fc2b27e7ecc78e942c74e1623b09ca1d39df8f4fbb0843a5cc0ab98b9caa9 SHA512 827d52fbc8eb601ac0e486aed267b1ca6cb8732c92f1224f4b38e039288b77d07d47c5d4cf384a3114403b85e7f086f345912f1b20b41d27785c9bb367514842
-DIST npapi-sdk-0.27.tar.bz2 64040 BLAKE2B bfdc271c5968692bc32ea6bfc1db99a9ff8186b572c881ee4b7caf90cc964cb04d5a280495c11ea6b0e9dc957e9a7636609257ad32db7abf7f307c16057d37df SHA512 12e28c354cca36a15578cd507d78644e016dff03e4940140d11ecb598a89464898e8be9fb17e7e86a696906fe9992f3c55da18c41dd1b0b8d33cb049e2056607
 EBUILD npapi-sdk-0.27.2.ebuild 429 BLAKE2B c2fc61cd4cca11e4ada272203874ace0d7e54ae331e025466d55943dcfc558296780d5e7702b7df9b99ced0d6d1660bb1221d8b36b32ab428ac75b5b64ea3c64 SHA512 93358b8b28f8d61accc7288514469458e8b3832a7f125dd9e68d4680fe034efc09312b397e29220fb78b9de2a379921a00d51b0abbab8b6177c15ae01b43ce1b
-EBUILD npapi-sdk-0.27.ebuild 421 BLAKE2B 54736a2eb7bc7be68f6e9f18d073ec4e0855c8f98905a840a79568c86ab2649454f8f3cd85e6486723e91a73edf12c4938821a95ce6719be7252940b5d09f36d SHA512 7d682da51c4d174ce44af8f3a8e61d37fcbdee7f8d7201568c372298223aac892f50adb9528e7db4f2230016712ac0d56013a49357d6fddc832a2f8cfc2e4804
 EBUILD npapi-sdk-9999.ebuild 587 BLAKE2B cd88e534e1a79dfe6c3d76936305c31c7fbe92e48610c4a7df33f3dd9a7fe6c21b1b756dd1d79babb1ac3299fb4b979d70fd6c6b3198a46f679edd09d0d55ae6 SHA512 fac1cd12c7ce982fbc2bb4507b39d5a41a8d34cd6c5a7ffa886d0423eeeb17d7b034d6337215ec5f20ce7c91b3fa8957e8f022ad0e7157169c09bd60b6aec145
 MISC metadata.xml 554 BLAKE2B 59d5b3ef0386ace117d29123793e45f78d3dd8998069a25341c9f56fce1438cd1d5af3fafd84cffd09c6c956496fc493ac0e3af4d010e63e3a01788cbc125f8c SHA512 f64e6e5dcb310e3529ccee303071fe765de9dc1df0230969b654a11e0df90ce011cb6c999151db0e913f4fbaa2b5456395c32fe08ac50885dd92762da7d9e2bb
diff --git a/net-misc/npapi-sdk/npapi-sdk-0.27.ebuild b/net-misc/npapi-sdk/npapi-sdk-0.27.ebuild
deleted file mode 100644
index f6975d378fcb..000000000000
--- a/net-misc/npapi-sdk/npapi-sdk-0.27.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit autotools-utils
-
-DESCRIPTION="NPAPI headers bundle"
-HOMEPAGE="https://bitbucket.org/mgorny/npapi-sdk/"
-SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="virtual/pkgconfig"
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index ac989347076a..bd1cb8f0fcfb 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,10 +1,10 @@
 DIST youtube-dl-2017.03.16.tar.gz 2631620 BLAKE2B 2aff8710a296140a4329b0f8e7f57526684ca114ba39a7397eef81b1b79b4b5dfae685c1f0011cddf8569d8df1e50111bbce7f12647c067972c79ea3b116b2ff SHA512 f3b8942f6b2be3b1cfd4bddfb74c17bad48c8ef4bea34114970ecb9d65b5a3dcbe71beba6d7c2dbda168371bbb2e8bbaddce58039bd9d158bf23950a2a88123c
 DIST youtube-dl-2017.11.15.tar.gz 2834012 BLAKE2B fd93e3923f99874be58681a886c09e31ac10063975ab636badf27e59b44743c72cddf05e3a431c49ffd0f7b40f9b005f4d90feff85d4ca889dee80833300b076 SHA512 e10c0d53db7fdfb02610b53f54046c0a9354b305ba05c5d00a43649a283a6449263f66ff56171d52cf18f906c6aeccc25dc48ea708b4b1bb2b8323b937abca96
-DIST youtube-dl-2017.12.14.tar.gz 2850664 BLAKE2B 29a3f4fcefaa970e9bc291ab47c5faa28252086aa284e9461f6c061d0e230680fa09ab654520c0cb4080279dba2c96b06412b6e5f4129fe44bcf972967eb57f6 SHA512 b23ffe0e30ba32c80de627305409d5aab73c6337ac6b253fa1c116a4aadf7ddd6853cd612941d9ae0d9ca3bfa5fc982e43cf2cdec3ebb90d2919f3faa47b58c5
 DIST youtube-dl-2017.12.23.tar.gz 2859430 BLAKE2B 55d30e77e1689b221d554ea0fd6327b42043c9410f74ce35f87956dfbf3da986b254657ca4c71cd4c7bf8bbddb2477cdbd96caebd0d52803b14e5466ac43988a SHA512 f8aa96e2cc328453abaaa84b9a0c0f28ea929a9c3877128d398ec5eb080b187bd01bcfc07ed590e84d1f58af00f0cbb219b4ac3f01045486c0472c6d707e4d9c
+DIST youtube-dl-2017.12.31.tar.gz 2872519 BLAKE2B cbf06f545f580d4bb3c5f58ea9a38291cdb358114787a93a1889e3c07c17fb2a832b7a25fecb6f92cdba8731fc32b9eed5ae4f5a52d0d6a103c3d3d4ef6b9ba5 SHA512 c6cd663627d2291c0eb6e1d711772f6640555d19f34533e1784cba4e6c983522db6dc3e44140dfcdad900db12024548bd5b16f89e60a5531538d7dcb36a8cd93
 EBUILD youtube-dl-2017.03.16.ebuild 2381 BLAKE2B bbf217461544a08786e3ba044e9b704354133dde4197d05ad92a8cdfd2e402dd0c013964da8b7971475a31ced7db734c89ef3ea33991b0227980d4025490c0fa SHA512 b47b7f8c00e04879aaac6bc70621d28f9e6e153b618bd246f95a2b11f8f09bf77cfefc5f0869b379759edf68a8f5d4afded6425032a9efdb8a1cbf44a23e9862
 EBUILD youtube-dl-2017.11.15.ebuild 2379 BLAKE2B 34ee4dfda07511e1f1e27576b967341bba6329312751cf5bc49fd54fe1bd6c2a5444ca0b82a25c15a40901b7a2edf743cfbb08e3bfcfca72e9dc5afe420605ed SHA512 f3996f3fe5ff5d92025a1adf594db099114e1a9a2e831d26fa8472c1cea1e3792a81996407b0349f244aeba1489f6ea1b757aaab827d5af55a6cad5a18a8eddf
-EBUILD youtube-dl-2017.12.14.ebuild 3286 BLAKE2B 27dc317b224b7be4752e59ada595412101e6b5d5efa8baf703a61d690b92cc128a6c18e67a741cbced16a7be017555d038e54cebe832cc8980e0314ef3657c78 SHA512 0d49a470d4be463db904d18b3d37adbd5445900f2e0be45912c86a951942c158e3bba9fe4faa8976432d76e6438f199915583c6fb7cec9e5323680363a442d34
 EBUILD youtube-dl-2017.12.23.ebuild 3286 BLAKE2B 27dc317b224b7be4752e59ada595412101e6b5d5efa8baf703a61d690b92cc128a6c18e67a741cbced16a7be017555d038e54cebe832cc8980e0314ef3657c78 SHA512 0d49a470d4be463db904d18b3d37adbd5445900f2e0be45912c86a951942c158e3bba9fe4faa8976432d76e6438f199915583c6fb7cec9e5323680363a442d34
+EBUILD youtube-dl-2017.12.31.ebuild 3286 BLAKE2B e846a48522924ae983a0b5b078b42523a2dccf22d23340e52348507f8718d01965a1a97c7a0c5ab10caaee1133536f8932d327d08eddf8f8982958aa84c29456 SHA512 67e4d6e79fd04259bf95d30ecb051527d0c864002b80f28734f37cd38ad9728743334b2fc786c652582c9ff9d79bde6f46507e68de41e84decefb87db8e8e0d0
 EBUILD youtube-dl-99999999.ebuild 2089 BLAKE2B df876c715ffaa403d175515951e751611df0cb89e815515b045bebb29add327aa0df50f25303864e1ff0abe8f19a53718e9d20c64dd9d3ead549ad57125376d0 SHA512 a390ee79a77aa98603ca01a702df6621ac4630e62e7afd089e065bd4468fc38bfd13bba365e28916024f0eb9e92627133281985f57692432522aeb4671a0cf11
 MISC metadata.xml 218 BLAKE2B 717fcfd86a1f75e0ad21845c9b496cf01d7bc7c80b6be8c08143ea304a08fbb75352e82e8fc883398e96da9c037f8912c4a9612b5cf85ffb25b3a5f041b02fe2 SHA512 d36d668a636222ce6394eca2598850e68139819543fd3cf0e76301e2a61c9b9303026b49536d1ed1b52f44d5703dc5e4247df786e0b4a704b28872e0a4a71b27
diff --git a/net-misc/youtube-dl/youtube-dl-2017.12.14.ebuild b/net-misc/youtube-dl/youtube-dl-2017.12.31.ebuild
index b94326c98c67..80eb0bafbd83 100644
--- a/net-misc/youtube-dl/youtube-dl-2017.12.14.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2017.12.31.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
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index e576348b88a0..7db6af06ddcb 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/package.mask b/profiles/package.mask
index a8b22f912121..e799d2fb775c 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -504,36 +504,8 @@ x11-plugins/wmwave
 net-misc/mediatomb
 
 # Andreas Sturmlechner <asturm@gentoo.org> (03 Dec 2017)
-# Dead upstreams, depending on dead qt3support/qt4.
-# Masked for removal in 30 days. Bug #631788
-games-board/capicity
-games-board/kcheckers
-games-board/qgo
-games-board/holdingnuts
-games-board/qcheckers
-games-emulation/virtualjaguar
-games-emulation/dboxfe
-games-kids/cubetest
+# Dead upstream, depending on dead qt3support/qt4. Bug #631788
 games-kids/crayon-physics
-games-misc/ggencoder
-games-misc/qlife
-games-puzzle/bubble-chains
-games-puzzle/jag
-
-# Andreas Sturmlechner <asturm@gentoo.org> (03 Dec 2017)
-# Dead upstream, depends on dead qt4.
-# Masked for removal in 30 days. Bug #639254
-x11-misc/qtnotifydaemon
-
-# Andreas Sturmlechner <asturm@gentoo.org> (03 Dec 2017)
-# Dead upstream, depends on dead qt4.
-# Masked for removal in 30 days. Bug #637098
-app-office/qchartdiary
-
-# Andreas Sturmlechner <asturm@gentoo.org> (03 Dec 2017)
-# Dead upstream, depends on dead qt4.
-# Masked for removal in 30 days. Bug #638688
-x11-plugins/qled
 
 # Michael Palimaka <kensington@gentoo.org> (02 Dec 2017)
 # Depends on dead Qt 4. Dead upstream.
@@ -544,11 +516,6 @@ dev-vcs/qsvn
 # Mask beta gromacs version
 =sci-chemistry/gromacs-2018_beta*
 
-# Andreas Sturmlechner <asturm@gentoo.org> (01 Dec 2017)
-# Dead upstream, depends on dead kdelibs4/qt4.
-# Masked for removal in 30 days. Bug #634138
-media-gfx/kpovmodeler
-
 # Sergey Popov <pinkbyte@gentoo.org> (30 Nov 2017)
 # Depends on dead Qt4, no release in two years
 # Masked for removal in 30 days, bug #625110
@@ -611,37 +578,6 @@ dev-tex/notoccite
 # Bug #606132.
 x11-drivers/xf86-video-modesetting
 
-# Matt Turner <mattst88@gentoo.org> (23 Nov 2017)
-# For ancient hardware. Tired of maintaining. Masked for removal in 30 days.
-# Bug #606132.
-x11-misc/afbinit
-x11-drivers/afb-ucode
-x11-drivers/xf86-video-apm
-x11-drivers/xf86-video-ark
-x11-drivers/xf86-video-chips
-x11-drivers/xf86-video-cirrus
-x11-drivers/xf86-video-freedreno
-x11-drivers/xf86-video-i128
-x11-drivers/xf86-video-i740
-x11-drivers/xf86-video-mach64
-x11-drivers/xf86-video-neomagic
-x11-drivers/xf86-video-opentegra
-x11-drivers/xf86-video-rendition
-x11-drivers/xf86-video-s3
-x11-drivers/xf86-video-s3virge
-x11-drivers/xf86-video-savage
-x11-drivers/xf86-video-sis
-x11-drivers/xf86-video-sisusb
-x11-drivers/xf86-video-suncg14
-x11-drivers/xf86-video-suncg3
-x11-drivers/xf86-video-suncg6
-x11-drivers/xf86-video-sunffb
-x11-drivers/xf86-video-sunleo
-x11-drivers/xf86-video-suntcx
-x11-drivers/xf86-video-tga
-x11-drivers/xf86-video-trident
-x11-drivers/xf86-video-tseng
-
 # Jonas Stein <jstein@gentoo.org> (23 Nov 2017)
 # Depends on the AIM service which will be discontinued on 2017-12-15.
 # See also bug #638564. Masked for removal on 2017-12-20
diff --git a/profiles/updates/1Q-2014 b/profiles/updates/1Q-2014
index 41aaca32e20b..556dfb6b279c 100644
--- a/profiles/updates/1Q-2014
+++ b/profiles/updates/1Q-2014
@@ -1,5 +1,3 @@
-move games-board/capitalism games-board/capicity
-move games-board/CapiCity games-board/capicity
 move net-misc/mirall net-misc/owncloud-client
 slotmove sys-block/kvpm 0 4
 move media-sound/audio-entropyd sys-apps/audio-entropyd
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 7066dfc3bd53..6a7f06e8126c 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -3249,7 +3249,6 @@ games-mud/tf:atcp - enable ATCP support.
 games-mud/tf:gmcp - enable GMCP support.
 games-mud/tf:option102 - enable telnet option 102 support.
 games-puzzle/cuyo:music - Enable playing of background music
-games-puzzle/jag:editor - Install level editor
 games-puzzle/nightsky:bundled-libs - Use the upstream provided bundled libraries.
 games-puzzle/numptyphysics:user-levels - Install some fun user-created levels
 games-puzzle/pingus:music - Enable playing of background music
@@ -3999,6 +3998,7 @@ media-gfx/freewrl:libeai - Build EAI C library
 media-gfx/freewrl:opencl - Enable OpenCL support
 media-gfx/freewrl:osc - Allows for OSC-based control and communication between multiple freewrl instances
 media-gfx/freewrl:rbp - Enable support for Rigid Body Physics
+media-gfx/geeqie:ffmpegthumbnailer - Enable video thumbnail support with media-video/ffmpegthumbnailer
 media-gfx/geeqie:gpu-accel - Enable GPU acceleration support - experimental
 media-gfx/geeqie:gtk3 - Link against x11-libs/gtk+:3 instead of x11-libs/gtk+:2
 media-gfx/geeqie:map - Enable items map display - experimental
@@ -7545,6 +7545,7 @@ sys-apps/dbus:elogind - Use sys-auth/elogind for session tracking.
 sys-apps/dbus:systemd - Build with sys-apps/systemd at_console support
 sys-apps/dbus:user-session - Enable user-session semantics for session bus under systemd
 sys-apps/dbus-broker:launcher - dbus-daemon compatibility launcher
+sys-apps/debianutils:installkernel - Install /sbin/installkernel script (for Linux)
 sys-apps/dstat:wifi - Enable wireless network functions
 sys-apps/duc:X - Use X11 for the GUI instead of OpenGL. This is the recommended option
 sys-apps/duc:cairo - Build support for exporting to PNG and PDF with x11-libs/cairo
@@ -7638,6 +7639,7 @@ sys-apps/linux-misc-apps:usbip - Include USB/IP binaries to replace net-misc/usb
 sys-apps/lm_sensors:contrib - Installs user contributed configuration files so you don't need to find settings on your own for your system if somebody else has already created such a configuration for sensors/mainboards you are using.
 sys-apps/lm_sensors:sensord - Enable sensord - a daemon that can be used to periodically log sensor readings from hardware health-monitoring chips
 sys-apps/man-db:manpager - Enable manpager wrapper for colorizing output
+sys-apps/mawk:forced-sandbox - Always enable -W sandbox mode for simpler/secure runtime
 sys-apps/memtest86:serial - Compile with serial console support
 sys-apps/memtest86+:floppy - Install a script to create floppy disks containing memtest86+ binaries.
 sys-apps/memtest86+:iso - Compile an ISO image
@@ -8451,11 +8453,9 @@ www-client/seamonkey:chatzilla - Build Mozilla's IRC client (default on)
 www-client/seamonkey:custom-optimization - Build with user-specified compiler optimizations (-Os, -O0, -O1, -O2, -O3) from CFLAGS (unsupported)
 www-client/seamonkey:force-gtk3 - Use the cairo-gtk3 rendering engine
 www-client/seamonkey:gmp-autoupdate - Allow Gecko Media Plugins (binary blobs) to be automatically downloaded and kept up-to-date in user profiles
-www-client/seamonkey:gtk3 - Use the cairo-gtk3 rendering engine
 www-client/seamonkey:ipc - Use inter-process communication between tabs and plugins. Allows for greater stability in case of plugin crashes
 www-client/seamonkey:jemalloc - Enable or disable jemalloc
 www-client/seamonkey:roaming - Build roaming extension support (default on)
-www-client/seamonkey:skia - Enable the SKIA engine for 2D rendering as an alternative to cairo
 www-client/seamonkey:system-cairo - Use the system-wide x11-libs/cairo instead of bundled
 www-client/seamonkey:system-harfbuzz - Use the system-wide media-libs/harfbuzz instead of bundled
 www-client/seamonkey:system-icu - Use the sytem-wide dev-libs/icu instead of bundled
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 419123b350c4..171f1fee71c1 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest
index d028d976297b..92906a3ab587 100644
--- a/sci-libs/fftw/Manifest
+++ b/sci-libs/fftw/Manifest
@@ -8,5 +8,5 @@ DIST fftw-2.1.5.tar.gz 1256888 BLAKE2B 61e2eed91459479ab893a423c1a6f38dd7e9637e0
 DIST fftw-3.3.6-pl2.tar.gz 4185261 BLAKE2B e2f877c13ab441ddf1ae731cf3ebdc5d1565f8216f497694ea1fccc43b6a53fc02d39e17f97c56d15d03410b2005e6c693cb4b639399aac0f6ebdc63fed32d2e SHA512 e130309856752a1555b6d151c4d0ce9eb4b2c208fff7e3e89282ca8ef6104718f865cbb5e9c4af4367b3615b69b0d50fd001a26d74fd5324ff2faabe14fe3472
 EBUILD fftw-2.1.5-r9.ebuild 3148 BLAKE2B c6b8afd87370e5f46aa702cebf74f7daaed6234ec175e013046a9bf13c8168a3a8b223c8bd72cba2aabbee19f9a246bdf1954865945a90a94afdb4de21e09936 SHA512 bced55608e2635cb945ff22ccdcfd1aab37313edbf64728f53fc6653cde54c7863f2dee32f8a198205c46906363a1503ad604f2a3d47f79fdd97634a67caed59
 EBUILD fftw-3.3.6_p2.ebuild 4433 BLAKE2B ba57766a5fc3f4dbf6eb5545b55e2c8eeed8a5e63cc35746fb78d9b583f2ba7831062ccc471cc426f12c1635cd5b259967e1a855a9465d2b566847d7ce896322 SHA512 61dd69bd2e7d1b0aee3907775a231837b3012d6e31ed1cd02436e74d53c4d8db5e7dceea9cc4debde00d9a3390f58418047801202a616691cda6e4274e67f94b
-EBUILD fftw-9999.ebuild 4741 BLAKE2B 2ffed9585310b567fc285423d8198fdc71b1ae76ccffd9af7d541b47930a6417f2ccd22700bbbb78b1eb73ac54c0d99ee7b20d70fa53baa5f3ba058446db3fd3 SHA512 f7af96b322dd7f965cdc392e53c634ab8e503a29d7008da724984ac4b93f65e1361461190ee1fe2e620bd349139324564fa13f452aca875098d34583e2fc0f00
+EBUILD fftw-9999.ebuild 4626 BLAKE2B cc8e04d30ea75aa0aec2e981b7ba79cd2ff2b96d84ad7014b9afd0287399bea3de801cfd6fb2f5ae0078059a740e24ae50f499092416888d94cde5174d0805c9 SHA512 361ca8659ee47d12a9964f5a12fc5552dc63f6dd493189bf776a8321358afe958e71ed297a61896db739bd3eb999b75a6e778b690dac77939ada9cd31da69d4d
 MISC metadata.xml 1088 BLAKE2B 308c6b8e2b7388d41c5ee6c3336b7b61037277b4563cb212cccaf25c894d350434eaa0f282172f943cf26496345b4c7e58afa55f50b9cf07fc04aea7a5d25244 SHA512 df52860deccf7e7139affaad8cfb837b7f3770a22c621f668db24d916cee5b27acc1486884797e8d0881d8887874627b919816f8245101982e963a8db43f3c98
diff --git a/sci-libs/fftw/fftw-9999.ebuild b/sci-libs/fftw/fftw-9999.ebuild
index 53961f54350e..af34cba86168 100644
--- a/sci-libs/fftw/fftw-9999.ebuild
+++ b/sci-libs/fftw/fftw-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -59,10 +59,6 @@ src_prepare() {
 
 	# fix info file for category directory
 	if [[ ${PV} = *9999 ]]; then
-		sed -i -e
-			's/Texinfo documentation system/Libraries/' \
-			doc/fftw3."info" || die "failed to fix info file"
-
 		eautoreconf
 	fi
 }
diff --git a/sci-misc/Manifest.gz b/sci-misc/Manifest.gz
index 673d8d5eeca3..6cb27e97daa0 100644
--- a/sci-misc/Manifest.gz
+++ b/sci-misc/Manifest.gz
diff --git a/sci-misc/nco/Manifest b/sci-misc/nco/Manifest
index a3a7c2fc9194..70ba1a14297b 100644
--- a/sci-misc/nco/Manifest
+++ b/sci-misc/nco/Manifest
@@ -1,5 +1,3 @@
-DIST nco-3.9.9.tar.gz 4109201 BLAKE2B 1249963c2f884326811502b01d02b2ef9c19c4bd0e6e61ddd823661a43e53a895f16f2870d00c02f732a44d7f93b0b4794efe591c95ed4fca1bc168ac13ecb9c SHA512 883d77413aed29982df3be531c458bbbc8c46201783593a71745b993287356aec4c664a080f05da1f2d550d32d2553d55eff7372807d20b4e6dba7bdff282400
 DIST nco-4.5.1.tar.gz 4406757 BLAKE2B f2e203f1c38f5575fe4affb9122c91c61db8a2c2604cbcf9cd1eec6330e4771b8ff4325fcc19cfa292508e9b7a3107ae20e6230397f1269441e4efb883f8e4e9 SHA512 69c19cc9502272adada329dae669fc1c263a360789963253315e81ce1534647b9172b39a0fd3c0f0f453bf903c8a8a4b0e3f0eb778390e43b64eede3a0478485
-EBUILD nco-3.9.9.ebuild 1599 BLAKE2B 5e8a46d85fb4fd2e068e59aee88841d7942380fca65bbf32b9031a17977c7eaf1da54f6c57e28f91969184ea63a56d7ad60b3abbc4be8354c383396ab12cbed0 SHA512 9601e68f6432ab1f8e1df0aaf4718213acdf7c14455be67588fe451fde7c8d7fd9ca8a770e12704e4bcdeaa7a3f1a4460e2173b7a2cd126b589a801e4e471a52
-EBUILD nco-4.5.1-r2.ebuild 1196 BLAKE2B d892c4e1ab687015e0afe7a30314cf8547cd281757609d8dd3b169530db0dbcfc1c7ebdb339c24b404cc75a8bfec2764a49242cb2b80058a319571555ae69e5c SHA512 1bed70fbed0f83edb7e54ac3bfaa8a670b3cf8cc3bc8060335b775b9b8db90fe6b91ffb40a758367c8a238a6b2d48ea684bfd6e11c26d459ee453782fe8fd623
+EBUILD nco-4.5.1-r2.ebuild 1223 BLAKE2B f2455e5507b981f6f069f61f6e608d856fc1b935cf7fdfeb71d710a02e61fa82b273ac0ec849e7e2facb2de76c65aa102ae285241600a6963bebf4fe8262a81b SHA512 71ff58f5613bf2f5297d8751cd19681d659a47d58fd8c994a2666ac04d262f839e2cade69ac7886fbb5662be6b5b14bac915bd3c4747d3f35364e52532198270
 MISC metadata.xml 1144 BLAKE2B 934f8e3e9219b8fda5106cec02a957b0f7b6eb4838c802e37be0796602ab332ee30c6ad53113e347ee639ff9a91191ad1ab8d0282e7937039139d7910948a010 SHA512 8fe5125db677eb40be700176d5aba6f7f59f345a79c2b07aad5892ec18abe43c176be8bc2b2a02c4daa9b10c4ba908c6028d33faae521653c32a71964daaa880
diff --git a/sci-misc/nco/nco-3.9.9.ebuild b/sci-misc/nco/nco-3.9.9.ebuild
deleted file mode 100644
index 17372725724e..000000000000
--- a/sci-misc/nco/nco-3.9.9.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit eutils flag-o-matic
-
-DESCRIPTION="Command line utilities for operating on netCDF files"
-SRC_URI="http://dust.ess.uci.edu/nco/src/${P}.tar.gz"
-HOMEPAGE="http://nco.sourceforge.net/"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="doc mpi ncap2 udunits"
-
-RDEPEND="sci-libs/netcdf
-	mpi? ( virtual/mpi )
-	udunits? ( >=sci-libs/udunits-2 )"
-
-DEPEND="${RDEPEND}
-	ncap2? ( !mpi? ( dev-java/antlr:0 ) )
-	doc? ( virtual/latex-base )"
-
-pkg_setup() {
-	if use mpi && use ncap2; then
-		elog
-		elog "mpi and ncap2 are still incompatible flags"
-		elog "nco configure will automatically disables ncap2"
-		elog
-	fi
-}
-
-src_configure() {
-	local myconf
-	if has_version ">=sci-libs/netcdf-4" && built_with_use sci-libs/netcdf hdf5; then
-		append-cppflags -DHAVE_NETCDF4_H
-		myconf="--enable-netcdf4"
-	else
-		myconf="--disable-netcdf4"
-	fi
-	econf \
-		${myconf} \
-		--disable-udunits \
-		$(use_enable ncap2) \
-		$(use_enable udunits udunits2) \
-		$(use_enable mpi)
-}
-
-src_compile() {
-	emake || die "emake failed"
-	cd doc
-	emake clean info
-	if use doc; then
-		VARTEXFONTS="${T}/fonts" emake html pdf || die "emake doc failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	cd doc
-	dodoc ANNOUNCE ChangeLog MANIFEST NEWS README TAG TODO VERSION *.txt \
-		|| die "dodoc failed"
-	doinfo *.info* || die "doinfo failed"
-	if use doc; then
-		dohtml nco.html/* || die "dohtml failed"
-		insinto /usr/share/doc/${PF}
-		doins nco.pdf || die "pdf install failed"
-	fi
-}
diff --git a/sci-misc/nco/nco-4.5.1-r2.ebuild b/sci-misc/nco/nco-4.5.1-r2.ebuild
index 850672c5b053..a1cd22244bb6 100644
--- a/sci-misc/nco/nco-4.5.1-r2.ebuild
+++ b/sci-misc/nco/nco-4.5.1-r2.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-AUTOTOOLS_IN_SOURCE_BUILD=1
-inherit autotools-utils eutils flag-o-matic
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Command line utilities for operating on netCDF files"
 HOMEPAGE="http://nco.sourceforge.net/"
@@ -13,37 +12,43 @@ SRC_URI="http://nco.sf.net/src/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0/${PV}"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="dap doc gsl ncap2 openmp static-libs test udunits"
+IUSE="dap gsl hdf5 ncap2 openmp static-libs test udunits"
 
 RDEPEND="
-	>=sci-libs/netcdf-4:=[dap=,tools]
+	>=sci-libs/netcdf-4:=[dap=,hdf5?,tools]
 	gsl? ( sci-libs/gsl:= )
 	ncap2? ( dev-cpp/antlr-cpp:2= )
 	udunits? ( >=sci-libs/udunits-2 )"
-
 DEPEND="${RDEPEND}
 	test? ( >=sci-libs/netcdf-4[tools] )"
 
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
 src_configure() {
-	local myeconfargs=(
-		--disable-udunits
-		$(use_enable dap dap-netcdf)
-		$(use_enable gsl)
-		$(use_enable ncap2)
-		$(use_enable openmp)
+	use hdf5 && append-cppflags -DHAVE_NETCDF4_H
+
+	econf \
+		--disable-udunits \
+		$(use_enable dap) \
+		$(use_enable gsl) \
+		$(use_enable hdf5 netcdf4) \
+		$(use_enable ncap2) \
+		$(use_enable openmp) \
+		$(use_enable static-libs static) \
 		$(use_enable udunits udunits2)
-	)
-	if has_version '>=sci-libs/netcdf-4[hdf5]'; then
-		myeconfargs+=( --enable-netcdf4 )
-		append-cppflags -DHAVE_NETCDF4_H
-	else
-		myeconfargs+=( --disable-netcdf4 )
-	fi
-	autotools-utils_src_configure
 }
 
 src_install() {
-	use doc && DOCS=( doc/nco.pdf ) && HTML_DOCS=( doc/nco.html )
-	autotools-utils_src_install
+	default
 	doinfo doc/*.info*
+
+	if ! use static-libs; then
+		find "${D}" -name '*.la' -delete || die
+	fi
 }
diff --git a/skel.ebuild b/skel.ebuild
index 591b58e8d367..129f61dcdb29 100644
--- a/skel.ebuild
+++ b/skel.ebuild
@@ -13,9 +13,9 @@
 EAPI=6
 
 # inherit lists eclasses to inherit functions from. For example, an ebuild
-# that needs the epatch function from eutils.eclass won't work without the
-# following line:
-inherit eutils
+# that needs the eautoreconf function from autotools.eclass won't work
+# without the following line:
+#inherit autotools
 #
 # eclasses tend to list descriptions of how to use their functions properly.
 # take a look at /usr/portage/eclass/ for more examples.
@@ -46,7 +46,7 @@ LICENSE=""
 # of each SLOT and remove everything else.
 # Note that normal applications should use SLOT="0" if possible, since
 # there should only be exactly one version installed at a time.
-# DO NOT USE SLOT=""! This tells Portage to disable SLOTs for this package.
+# Do not use SLOT="", because the SLOT variable must not be empty.
 SLOT="0"
 
 # Using KEYWORDS, we can record masking information *inside* an ebuild
@@ -54,22 +54,21 @@ SLOT="0"
 # set the KEYWORDS variable for every ebuild so that it contains the names of
 # all the architectures with which the ebuild works.  All of the official
 # architectures can be found in the arch.list file which is in
-# /usr/portage/profiles/.  Usually you should just set this to "~x86".  The ~
-# in front of the architecture indicates that the package is new and should be
-# considered unstable until testing proves its stability.  So, if you've
-# confirmed that your ebuild works on x86 and ppc, you'd specify:
-# KEYWORDS="~x86 ~ppc"
+# /usr/portage/profiles/.  Usually you should just set this to "~amd64".
+# The ~ in front of the architecture indicates that the package is new and
+# should be considered unstable until testing proves its stability.  So, if
+# you've confirmed that your ebuild works on amd64 and ppc, you'd specify:
+# KEYWORDS="~amd64 ~ppc"
 # Once packages go stable, the ~ prefix is removed.
 # For binary packages, use -* and then list the archs the bin package
 # exists for.  If the package was for an x86 binary package, then
 # KEYWORDS would be set like this: KEYWORDS="-* x86"
-# DO NOT USE KEYWORDS="*".  This is deprecated and only for backward
-# compatibility reasons.
-KEYWORDS="~x86"
+# Do not use KEYWORDS="*"; this is not valid in an ebuild context.
+KEYWORDS="~amd64"
 
 # Comprehensive list of any and all USE flags leveraged in the ebuild,
-# with the exception of any ARCH specific flags, i.e. "ppc", "sparc",
-# "x86" and "alpha".  Not needed if the ebuild doesn't use any USE flags.
+# with some exceptions, e.g., ARCH specific flags like "amd64" or "ppc".
+# Not needed if the ebuild doesn't use any USE flags.
 IUSE="gnome X"
 
 # A space delimited list of portage features to restrict. man 5 ebuild
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 1c47409d584b..71cbc4cc1e4c 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/debianutils/Manifest b/sys-apps/debianutils/Manifest
index 148f2b0aa108..28e68fa00bc7 100644
--- a/sys-apps/debianutils/Manifest
+++ b/sys-apps/debianutils/Manifest
@@ -3,8 +3,10 @@ DIST debianutils_4.7.tar.xz 156276 BLAKE2B 9d32dc8222b67d4f1f91d58af0811412924f5
 DIST debianutils_4.8.1.1.tar.xz 156256 BLAKE2B fba83e834486da25004a0d45b6cf20e84d66ac6843b3dbb30fcb334de8d08468f986dd8bff7a8da91f4924d61dc3fe143494bc8a33809f0412ceb107bea4e2d0 SHA512 22f27692a7d3847fad1be223d73e5575581db8621771e92e68fe91bd31e67084fd655fef857905be46ab3a45340503b0af9399b8fe28f221ea5cee4b49970821
 DIST debianutils_4.8.2.tar.xz 155944 BLAKE2B 4cfdf43ad2e3fe35578fe980a9d18bf8f4c8b3cc581a6778b9a32fef21d308e40ffbfa5df5cc3cfc72090047bd8bbdbd824c7955b320e955d4cd390b76f98f82 SHA512 40bad124e99c5a315b7ddf181afc2db216c85ddfe5603a16fbd21bd01091d3631b18826ddf799ba232ecaa1c2b3ff389a26a533f392918eb0733efdd75749759
 DIST debianutils_4.8.3.tar.xz 159292 BLAKE2B e655741f42594ff12b4f349331da57ec09073802c9778594619686c93fc3061cf5248ac8e9e2c1b391eb49dd572f3033b1db206ff43f373b17caf7f3c835111f SHA512 468b8f001c0338f166cbc2fe25079edc5feeaa38dce2f5c7e6724c691d6cb35f4843e987695e33ead557bb11887e78ff8a5e3e1f52a266a0f32fb978fa643897
+DIST debianutils_4.8.4.tar.xz 156344 BLAKE2B 069d15039579d4ce03d2ca4bfd0df199f0044049e7cd6ca899104eec5d917f3db290649bfdd851d8b14519df2750fb975bc6d96e98e14cdb626a610d44da80b0 SHA512 7d7b2d12d4907f6032477b4cd5b5dc94d8093724af8a97859c1d4cf229479e2dfe6d44143b454ed9b1990ca2d4833eaeb059659d8c305623875fdc8420659855
 EBUILD debianutils-4.7.ebuild 955 BLAKE2B 62f8d18a91a707314302473daab1d2e4645261e552036378271500238251cca8b8c9c9156532832637aeab5045ef1b8528c21fca9ceae8d4424a826862145bb9 SHA512 581e2efee6fc722bb26cb3f5072758f119927455e584c41be27562906d405309d121e9e7cde3d5427d6399f7e9519423ad4a7e99650a2214a142963b27f22cca
 EBUILD debianutils-4.8.1.1.ebuild 947 BLAKE2B 454e4df56bef1fbd808711c7ece169ed67f7d072994a7fb9e283241964d1779d1196e6153fac83fa3211426f7aee3dc6c396063cf969eb16b379b0af9934ecd3 SHA512 7d577f9653dd24d11f32282e5fa446d0d759442471a939501459838aa7fb25d409425caff6ff439cebe1dfd5ed1494214a1a59f473cd423b31f99aa63687843f
 EBUILD debianutils-4.8.2.ebuild 947 BLAKE2B 454e4df56bef1fbd808711c7ece169ed67f7d072994a7fb9e283241964d1779d1196e6153fac83fa3211426f7aee3dc6c396063cf969eb16b379b0af9934ecd3 SHA512 7d577f9653dd24d11f32282e5fa446d0d759442471a939501459838aa7fb25d409425caff6ff439cebe1dfd5ed1494214a1a59f473cd423b31f99aa63687843f
 EBUILD debianutils-4.8.3.ebuild 971 BLAKE2B 834ee8bbbfd572fe0b7ca9e229cadfbd4541a49d042c0edf5fa24bf42aae9f14230296f7788c1339b0590adcc4d735f5032c58598c4821e702f0e0a7293d22e2 SHA512 fc51841b5a3858fd7dded29e9d72ab552585078fd8bf0e7fce79bc891f5b61ff947923c12a582aa9efdf161ab85ac2a48526d00c9e0f655ddae6fb1215f390e1
-MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
+EBUILD debianutils-4.8.4.ebuild 975 BLAKE2B b0578fe970dc5497fd7989f35e5b0e111ab901a660e996e5ee067a3f6d8fddafdb528d45ecfbed166bf5cba006552265269d18fd9cee6fd20d7af9a38d563947 SHA512 17f0039fc61ffe48e27a993465d208397abed8d50c823af3cab45749c6d841a96e2b1717b970d0ae98853b8b65f4b201d85012d9dceddf7dd21f64fceec1c7a5
+MISC metadata.xml 355 BLAKE2B 9f0e6370bbf41d0180e561b2a747f2d3b9e400ea2f9396c059f0b03ad5293032554135573e5fc02f4d91b68d41bdb6722946662eb1c94ac10b1e0384aaeeeeb3 SHA512 967535ef4f2ce2ae377f05548d1cd15589b6e9ceb0b76c49a3ceec1d464aaff2aea43c98be4d8ffd7a8566f77dbce41a75d4b5dc489bc03b4f7562af656b3f84
diff --git a/sys-apps/debianutils/debianutils-4.8.4.ebuild b/sys-apps/debianutils/debianutils-4.8.4.ebuild
new file mode 100644
index 000000000000..6932bae8d611
--- /dev/null
+++ b/sys-apps/debianutils/debianutils-4.8.4.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit flag-o-matic
+
+DESCRIPTION="A selection of tools from Debian"
+HOMEPAGE="https://packages.qa.debian.org/d/debianutils.html"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
+
+LICENSE="BSD GPL-2 SMAIL"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+IUSE="+installkernel static"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.4.2-no-bs-namespace.patch )
+
+S="${WORKDIR}/${PN}"
+
+src_configure() {
+	use static && append-ldflags -static
+	default
+}
+
+src_install() {
+	into /
+	dobin tempfile run-parts
+	if use installkernel ; then
+		dosbin installkernel
+	fi
+
+	into /usr
+	dosbin savelog
+
+	doman tempfile.1 run-parts.8 savelog.8
+	use installkernel && doman installkernel.8
+	cd debian || die
+	dodoc changelog control
+	keepdir /etc/kernel/postinst.d
+}
diff --git a/sys-apps/debianutils/metadata.xml b/sys-apps/debianutils/metadata.xml
index 56c124413057..f6690ff31371 100644
--- a/sys-apps/debianutils/metadata.xml
+++ b/sys-apps/debianutils/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<use>
+		<flag name='installkernel'>Install /sbin/installkernel script (for Linux)</flag>
+	</use>
 </pkgmetadata>
diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest
index 6573f8161bb1..681d2305eb7f 100644
--- a/sys-apps/less/Manifest
+++ b/sys-apps/less/Manifest
@@ -6,5 +6,5 @@ DIST less-520.tar.gz 337959 BLAKE2B e3008ec61b9095c7e0f696a662478e1aaeb9108dc26a
 DIST less-529.tar.gz 339651 BLAKE2B 745146fd584c6144b4052d18bae07a2b4c7a719d36c556c69837f2018ef95efeea35acadcb9946bdde0272848d1bd8537c847e89591d980ceb2eda5a4c5963c4 SHA512 902e3ed86161c5a9eb3c08567b6b702371b5c88a85ef0b21beada223eaa47e0abf4d4d166a4a7a195caef67509fa683d07d0b6a40b529d703ee26aa8910c360a
 EBUILD less-487.ebuild 1440 BLAKE2B dded5fb96b09a7de894e13c701ecd479ad1b1569094500f3701aa58f58b8f2d46106b8d9c82ac16f9b9e648655f87d788de5a71d7d0f69d357184a656a1bec51 SHA512 b7a1ee3d58a3ad29c3ef7d50f5f37c9fea7bbd0bf15a157f323ced895daf6a1aa31544374428df2ebd4e3385897e6721cf530b0c21de688e3cd0dee9c7e2939c
 EBUILD less-520.ebuild 1404 BLAKE2B 3a09547f4565168340d4a2c33b84a1380af245d6e949fc4a88f7be0c6829c8470ad4d20a59682268adb32592deff948f8f86ec2f05f3e023708d2a8ba62c0f8c SHA512 10b5c220228b1adf41271de6d7ffc3b222ad2b417194b4f47f0d96f682b73dc0644c1a6ca6d8d8ca2e0712c05cf66d0fa19d0aa612e568d04c95cda763288ac5
-EBUILD less-529.ebuild 1404 BLAKE2B 3a09547f4565168340d4a2c33b84a1380af245d6e949fc4a88f7be0c6829c8470ad4d20a59682268adb32592deff948f8f86ec2f05f3e023708d2a8ba62c0f8c SHA512 10b5c220228b1adf41271de6d7ffc3b222ad2b417194b4f47f0d96f682b73dc0644c1a6ca6d8d8ca2e0712c05cf66d0fa19d0aa612e568d04c95cda763288ac5
+EBUILD less-529.ebuild 1402 BLAKE2B bf76dfbaad663a235de3e07524ad5d96d4b01ede632c8514318a0792d6c7828524e3983fccf6d19be802a24fdfcaf901512a9a16437cda28512c3bc701bb82e9 SHA512 4baaf7654ae9d8d5ec7b68555a4e992f610e3e65e57db80e9d60e803348a556d6b20dc75cd69a898d0f1bd411a32035b8ee254c795fa2a203ee5d5b988017da1
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/less/less-529.ebuild b/sys-apps/less/less-529.ebuild
index 643a59bc2b71..f2b37d773330 100644
--- a/sys-apps/less/less-529.ebuild
+++ b/sys-apps/less/less-529.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.greenwoodsoftware.com/less/${P}.tar.gz"
 
 LICENSE="|| ( GPL-3 BSD-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="pcre unicode"
 
 DEPEND=">=app-misc/editor-wrapper-3
diff --git a/sys-apps/mawk/Manifest b/sys-apps/mawk/Manifest
index 24c529665aa2..ec157d49d770 100644
--- a/sys-apps/mawk/Manifest
+++ b/sys-apps/mawk/Manifest
@@ -1,9 +1,12 @@
+AUX mawk-1.3.4-sandbox-default.patch 2720 BLAKE2B 3f0a25b06f1045659b9dc7decbbd54c9355f94a6879cad0f121e825cb705652b14b7a4c4655f2fe89c2f921aea511f8b8755cd398d28ce9a47ffa6bfef158953 SHA512 bdceb22a51464de5786d469ffcc6fc7157a0aca3e3dc89553418a401de3735b95439691ccf5553d0746b3e793824821db85a2dfe14633db1ad5f1256fa3e65ab
+AUX mawk-1.3.4-sandbox.patch 3805 BLAKE2B a7d55816bea03fb949387c8a1acf310b6dbae60014601bc514f44cbf3a8632c275bf6b786b016e93450ecf60d61052b14b029e56d559656dc87fed72a66239af SHA512 03149ba3d3e0cd5fa6d50573cc50260346e91d82bfd510d8a069a3e076df49d2b85edd2b42632a34e21f9d82c384212272e99b1cf305b4c1a78e252b75da4eb3
 DIST mawk-1.3.4-20150503.tgz 468794 BLAKE2B 10a2942f990d67ebea3cf75c83beefbc58f6ad4ffc560260f8206a8fc79b03d1e4cb8bb4ad23b256a547b10e4885c1a0813f054aa60ab5cb1b20c8d974a508d8 SHA512 ac9dde6948328d8db94458448abdf7389f8862ae6093315dd19ed9d1cbeab60fca1fc7b084cda4ce09505010f7108612585e3c4ba9663ddf3adb869bf1d9d7b6
 DIST mawk-1.3.4-20160615.tgz 466312 BLAKE2B ad8077e44a069b4ba19d1c1051d488ee7234b834aa0a04be6bda72cd5726c84185d4bb7de564e1a862c43de1de81d36ff8d2b11ee001ebbcaf624de6aabe19ab SHA512 97062fe278f1ec30db2233f9bd5a2f60557e2362a2c785bce94a7b9eec9065138cf1349bc145c18194b5af56c8e943e63c95baea839282a65ba09062bdcca2ae
 DIST mawk-1.3.4-20161120.tgz 461464 BLAKE2B 7481345b391198cc9ec47f6ad84f0f07e31c931a40d59bde401d00ea7bc74b728c8149f80187e5d73923496e2eef1ec70bc097aedf0b68630f73264d45d96ebd SHA512 c5edcbff4ab1e40eb9b178a045fcd426a5f3c93a3ab5bc1ca1fa85a0977b8c9060967fcbda4e4a6e9e68628f50a2814e22939676008dced529377d2cf9bda5b2
 DIST mawk-1.3.4-20171017.tgz 460819 BLAKE2B 91cb4cd039ea7773b788db87389f8ec34914afc8b299fecfdd579fe89fc4e6d731bfdc9c06a2c6c3d75ab9e1022bf5dbe1c662962d6ccd8a8f6fe4f8589927ca SHA512 4ed6ca0ecca12e7409d3d364b72dc6a2b411c61bf53fe8aa0b0cac65a3bdb941921c0b81d94f34c8ac9f4922c8c7566d347b5e6b5c74518ae3a88904f9e20f27
 EBUILD mawk-1.3.4_p20150503.ebuild 825 BLAKE2B 1d5b1fb1ac43e06b019f86bdf8ca9fa2d4392e27fee2160e13b46c90ee567979d70442be3aea5d96f73497502238d919da684a6268d7918802f8d57aa7389db8 SHA512 7f7b0386ae02ee8bd6b2a3df4218f3dd732b22e9154b8bd37ed15afbeba2a145aa02161e64b8e2be78d4e6d9c2b58e3d4fa4c7d5b557f434c1cdf21e593bd749
 EBUILD mawk-1.3.4_p20160615.ebuild 870 BLAKE2B c25882ed451d83bfea7ca5dd731a6d532396c91f7a38236ae2b884cb5f504341a937da1dd4bb22805b6f94488414756a182bcd6e3e5eaa21ef74e8c90805e7f0 SHA512 5841a8486c4a59f16c1add9e9aceb89fc428b29a29359ce17e451dd46f66c0501b4260463f4b152e1403e391d86c30638edef328ee31ae9ec1b0b4aa0238afe8
-EBUILD mawk-1.3.4_p20161120.ebuild 879 BLAKE2B 26329579de34f167e6ce3ac06cb6aa2b8d9a941535fc66422fa62efd6c7d9f25f1aad2cfe4ddcfe157eaceae20d11cb0fc2d8f514101525d15fc49003ab24cdf SHA512 8479121ba985077b8002fe730ede99f548dfb806846ecb221aed06386e0c39879d915f6346ba9f71c16f864f315c0391bc4e6b8c2a1e105b826c0fe4bef8a670
+EBUILD mawk-1.3.4_p20161120.ebuild 878 BLAKE2B 438ed36e28fe7fc1fa09fbdbaad36d6f8ce5780972170ebb3fdfe04dd66da5ccaed8d8910bffd0841f732336e2cba0437dbe37b642abb2e35f151ca9205ea820 SHA512 0606dd2ad1d6f4e4ee59bed3c67d475da4f63b2ea7df8f84c045deb1afe919ee140c4a76da73cbc5dfe62c41df46b3faddfb0b20307b02bf2e6d41892d92927e
+EBUILD mawk-1.3.4_p20171017-r1.ebuild 1037 BLAKE2B 9c36e6b12d6a7b1c6448ed423509032464388849efc66312b24c8e7ba3efc11d94c3f425077f949514609bfcabb10da2d849a1977c919d068350c8137c942d14 SHA512 550d5d3f9123d402ecf442a94c8ccd87959eb8669a490e766e16d7b93acb5d3d23562527c5aac727cec44f1d068b339016dd901ac192662f06da3803f7ecd6a6
 EBUILD mawk-1.3.4_p20171017.ebuild 883 BLAKE2B deb941193402b058ecf23a7523698416660b09cfefcda6a51b2f2f50aaa72ba5b9230459826d82f9066b4bc8766c72f2a55583e21705f848df0ffa4d966509a5 SHA512 e072d0a8bb7125965bd3e0edea01eff17ef53b17baaf117fa7f5cd910acebd4cbc57f6725a6ae0419cf2eb177fcd3b8f4cdf5c5f0e7bb4d86fdbe86f7b75c9de
-MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
+MISC metadata.xml 359 BLAKE2B 988733eff41a4556cdb4f8d66adbe2864f33f4245ab1ba3a1456cb3b189fd12138cec7666d2fc125d275865a028274aaf5a41396430721ac96b913dc2f667f94 SHA512 bb64e60075207240fabd037108c2885b934d0dc0a72bdcce4c8c138555b1ebb4de811745235ee11fde75559ddf55f9488b71f53aab7e92df61099cba5ec28d2f
diff --git a/sys-apps/mawk/files/mawk-1.3.4-sandbox-default.patch b/sys-apps/mawk/files/mawk-1.3.4-sandbox-default.patch
new file mode 100644
index 000000000000..c3b0fc1c892d
--- /dev/null
+++ b/sys-apps/mawk/files/mawk-1.3.4-sandbox-default.patch
@@ -0,0 +1,91 @@
+https://github.com/ThomasDickey/original-mawk/issues/49
+
+Note: We hand modify the configure file here because the version of autotools
+used by upstream is very old/finicky, and it's a simple enough change.
+
+From 1ac333b97615c451d7a4743b4724edd46d37a8b2 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@chromium.org>
+Date: Tue, 7 Nov 2017 01:07:47 -0500
+Subject: [PATCH 2/2] add a configure flag to lock sandbox by default
+
+This lets us deploy systems with the sandbox always enabled.
+---
+ configure    | 23 +++++++++++++++++++++++
+ configure.in | 11 +++++++++++
+ init.c       |  4 ++++
+ 3 files changed, 38 insertions(+)
+
+diff --git a/configure.in b/configure.in
+index 8b795fbd264b..770092005386 100644
+--- a/configure.in
++++ b/configure.in
+@@ -112,6 +112,17 @@ fi
+ AC_MSG_RESULT($with_init_srand)
+ 
+ ###############################################################################
++AC_MSG_CHECKING(if you want mawk to always run in sandbox mode)
++CF_ARG_ENABLE([forced-sandbox],
++[  --enable-forced-sandbox always run in sandbox mode],
++	[with_forced_sandbox=yes],
++	[with_forced_sandbox=no])
++if test "x${with_forced_sandbox}" != xno; then
++	CPPFLAGS="$CPPFLAGS -DFORCED_SANDBOX"
++fi
++AC_MSG_RESULT($with_forced_sandbox)
++
++###############################################################################
+ 
+ AC_PROG_YACC
+ CF_PROG_LINT
+diff --git a/init.c b/init.c
+index f7babb337e04..e035d6ea2fc0 100644
+--- a/init.c
++++ b/init.c
+@@ -492,6 +492,10 @@ process_cmdline(int argc, char **argv)
+ 
+   no_more_opts:
+ 
++#ifdef FORCED_SANDBOX
++    sandbox_flag = 1;
++#endif
++
+     tail->link = (PFILE *) 0;
+     pfile_list = dummy.link;
+ 
+diff --git a/configure b/configure
+index a3bf42fe9245..442875b8e58a 100755
+--- a/configure
++++ b/configure
+@@ -4132,6 +4132,29 @@ echo "$as_me:4131: result: $with_init_srand" >&5
+ echo "${ECHO_T}$with_init_srand" >&6
+ 
+ ###############################################################################
++echo "$as_me:4109: checking if you want mawk to always run in sandbox mode" >&5
++echo $ECHO_N "checking if you want mawk to always run in sandbox mode... $ECHO_C" >&6
++
++if test "${enable_forced_sandbox+set}" = set; then
++  enableval="$enable_forced_sandbox"
++  test "$enableval" != yes && enableval=no
++	if test "$enableval" != "no" ; then
++    with_forced_sandbox=yes
++	else
++		with_forced_sandbox=no
++	fi
++else
++  enableval=no
++	with_forced_sandbox=no
++
++fi;
++if test "x${with_forced_sandbox}" != xno; then
++	CPPFLAGS="$CPPFLAGS -DFORCED_SANDBOX"
++fi
++echo "$as_me:4131: result: $with_forced_sandbox" >&5
++echo "${ECHO_T}$with_forced_sandbox" >&6
++
++###############################################################################
+ 
+ for ac_prog in 'bison -y' byacc
+ do
+-- 
+2.13.5
+
diff --git a/sys-apps/mawk/files/mawk-1.3.4-sandbox.patch b/sys-apps/mawk/files/mawk-1.3.4-sandbox.patch
new file mode 100644
index 000000000000..ae2ccbd50ec1
--- /dev/null
+++ b/sys-apps/mawk/files/mawk-1.3.4-sandbox.patch
@@ -0,0 +1,141 @@
+https://github.com/ThomasDickey/original-mawk/issues/49
+
+From ae3a324a5af1350aa1a6f648e10b9d6656d9fde4 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@chromium.org>
+Date: Tue, 7 Nov 2017 00:41:36 -0500
+Subject: [PATCH 1/2] add a -W sandbox mode
+
+This is like gawk's sandbox mode where arbitrary code execution and
+file redirection are locked down.  This way awk can be a more secure
+input/output mode.
+---
+ bi_funct.c | 3 +++
+ init.c     | 8 ++++++++
+ man/mawk.1 | 4 ++++
+ mawk.h     | 2 +-
+ scan.c     | 6 ++++++
+ 5 files changed, 22 insertions(+), 1 deletion(-)
+
+diff --git a/bi_funct.c b/bi_funct.c
+index 7742308c72a5..b524ac8dac8b 100644
+--- a/bi_funct.c
++++ b/bi_funct.c
+@@ -908,6 +908,9 @@ bi_system(CELL *sp GCC_UNUSED)
+ #ifdef HAVE_REAL_PIPES
+     int ret_val;
+ 
++    if (sandbox_flag)
++	rt_error("'system' function not allowed in sandbox mode");
++
+     TRACE_FUNC("bi_system", sp);
+ 
+     if (sp->type < C_STRING)
+diff --git a/init.c b/init.c
+index 0ab17b003f20..f7babb337e04 100644
+--- a/init.c
++++ b/init.c
+@@ -40,6 +40,7 @@ typedef enum {
+     W_RANDOM,
+     W_SPRINTF,
+     W_POSIX_SPACE,
++    W_SANDBOX,
+     W_USAGE
+ } W_OPTIONS;
+ 
+@@ -96,6 +97,7 @@ initialize(int argc, char **argv)
+ 
+ int dump_code_flag;		/* if on dump internal code */
+ short posix_space_flag;
++short sandbox_flag;
+ 
+ #ifdef	 DEBUG
+ int dump_RE = 1;		/* if on dump compiled REs  */
+@@ -153,6 +155,7 @@ usage(void)
+ 	"    -W random=number set initial random seed.",
+ 	"    -W sprintf=number adjust size of sprintf buffer.",
+ 	"    -W posix_space   do not consider \"\\n\" a space.",
++	"    -W sandbox       disable system() and I/O redirection.",
+ 	"    -W usage         show this message and exit.",
+     };
+     size_t n;
+@@ -255,6 +258,7 @@ parse_w_opt(char *source, char **next)
+ 	    DATA(RANDOM),
+ 	    DATA(SPRINTF),
+ 	    DATA(POSIX_SPACE),
++	    DATA(SANDBOX),
+ 	    DATA(USAGE)
+     };
+ #undef DATA
+@@ -389,6 +393,10 @@ process_cmdline(int argc, char **argv)
+ 		    posix_space_flag = 1;
+ 		    break;
+ 
++		case W_SANDBOX:
++		    sandbox_flag = 1;
++		    break;
++
+ 		case W_RANDOM:
+ 		    if (haveValue(optNext)) {
+ 			int x = atoi(optNext + 1);
+diff --git a/man/mawk.1 b/man/mawk.1
+index a3c794167dc9..0915d9d7ed5d 100644
+--- a/man/mawk.1
++++ b/man/mawk.1
+@@ -150,6 +150,10 @@ forces
+ \fB\*n\fP
+ not to consider '\en' to be space.
+ .TP
++\-\fBW \fRsandbox
++runs in a restricted mode where system(), input redirection (e.g. getline),
++output redirection (e.g. print and printf), and pipelines are disabled.
++.TP
+ \-\fBW \fRrandom=\fInum\fR
+ calls \fBsrand\fP with the given parameter
+ (and overrides the auto-seeding behavior).
+diff --git a/mawk.h b/mawk.h
+index 2d04be1adb34..a6ccc0071ecc 100644
+--- a/mawk.h
++++ b/mawk.h
+@@ -63,7 +63,7 @@ extern int dump_RE;
+ #define USE_BINMODE 0
+ #endif
+ 
+-extern short posix_space_flag, interactive_flag;
++extern short posix_space_flag, interactive_flag, sandbox_flag;
+ 
+ /*----------------
+  *  GLOBAL VARIABLES
+diff --git a/scan.c b/scan.c
+index 3a8fc9181ab8..c1833b8b7315 100644
+--- a/scan.c
++++ b/scan.c
+@@ -455,6 +455,8 @@ yylex(void)
+ 	    un_next();
+ 
+ 	if (getline_flag) {
++	    if (sandbox_flag)
++		rt_error("redirection not allowed in sandbox mode");
+ 	    getline_flag = 0;
+ 	    ct_ret(IO_IN);
+ 	} else
+@@ -462,6 +464,8 @@ yylex(void)
+ 
+     case SC_GT:		/* '>' */
+ 	if (print_flag && paren_cnt == 0) {
++	    if (sandbox_flag)
++		rt_error("redirection not allowed in sandbox mode");
+ 	    print_flag = 0;
+ 	    /* there are 3 types of IO_OUT
+ 	       -- build the error string in string_buff */
+@@ -488,6 +492,8 @@ yylex(void)
+ 	    un_next();
+ 
+ 	    if (print_flag && paren_cnt == 0) {
++		if (sandbox_flag)
++		    rt_error("pipe execution not allowed in sandbox mode");
+ 		print_flag = 0;
+ 		yylval.ival = PIPE_OUT;
+ 		string_buff[0] = '|';
+-- 
+2.13.5
+
diff --git a/sys-apps/mawk/mawk-1.3.4_p20161120.ebuild b/sys-apps/mawk/mawk-1.3.4_p20161120.ebuild
index 5db9517c4128..e70a4f0b2ee2 100644
--- a/sys-apps/mawk/mawk-1.3.4_p20161120.ebuild
+++ b/sys-apps/mawk/mawk-1.3.4_p20161120.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
@@ -12,7 +12,7 @@ SRC_URI="ftp://invisible-island.net/mawk/${MY_P}.tgz"
 
 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 ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 
 RDEPEND="app-eselect/eselect-awk"
 DEPEND="${RDEPEND}"
diff --git a/sys-apps/mawk/mawk-1.3.4_p20171017-r1.ebuild b/sys-apps/mawk/mawk-1.3.4_p20171017-r1.ebuild
new file mode 100644
index 000000000000..e50d8aa12776
--- /dev/null
+++ b/sys-apps/mawk/mawk-1.3.4_p20171017-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+MY_P=${P/_p/-}
+DESCRIPTION="an (often faster than gawk) awk-interpreter"
+HOMEPAGE="https://invisible-island.net/mawk/mawk.html"
+SRC_URI="ftp://ftp.invisible-island.net/mawk/${MY_P}.tgz"
+
+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 ~x86-macos"
+IUSE="forced-sandbox"
+
+RDEPEND="app-eselect/eselect-awk"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( ACKNOWLEDGMENT CHANGES README )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.4-sandbox.patch
+	"${FILESDIR}"/${PN}-1.3.4-sandbox-default.patch
+)
+
+src_configure() {
+	tc-export BUILD_CC
+	econf $(use_enable forced-sandbox)
+}
+
+src_install() {
+	default
+
+	exeinto /usr/share/doc/${PF}/examples
+	doexe examples/*
+	docompress -x /usr/share/doc/${PF}/examples
+}
+
+pkg_postinst() {
+	eselect awk update ifunset
+}
+
+pkg_postrm() {
+	eselect awk update ifunset
+}
diff --git a/sys-apps/mawk/metadata.xml b/sys-apps/mawk/metadata.xml
index 56c124413057..fb5ddc9df936 100644
--- a/sys-apps/mawk/metadata.xml
+++ b/sys-apps/mawk/metadata.xml
@@ -5,4 +5,7 @@
 	<email>base-system@gentoo.org</email>
 	<name>Gentoo Base System</name>
 </maintainer>
+<use>
+	<flag name="forced-sandbox">Always enable -W sandbox mode for simpler/secure runtime</flag>
+</use>
 </pkgmetadata>
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index bedb16f73eb6..7bc23f15b77a 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,4 +1,5 @@
 AUX README.RESCUE 137 BLAKE2B af986752f516bf1925852271f2cea558fe02990c1180ac696c9234c25d1266e4f6eba6ac72f907757c5f98394e1248b436286f8ba1c48456b752ee4ceb8405da SHA512 dba0f0d6d4cd140e636cc70dfb7bdb298e2f2fb040bc07b0874cac994bdbabd26bfd9361d85a0f8b9a92a185281e4901606b9e4f563afdc8867341bbe6af1cb0
+AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906402e83df4b72fd10e006621523fe5b6d59219318a978e368649047784bb85771cd189b2542a2e19f941 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c
 DIST portage-2.3.13.tar.bz2 945477 BLAKE2B 0ad44859f04db529713cc80a51e6dadc767ed6b6d0aef1d070650d82133c05e161eaa9fd1e208b3078c513ccf6f73136b8bf865542f0dc9396de9142bad1d32c SHA512 71d9ea6c9a889572f60e7e501e9f8739db588cffd98a431303906eb90c1f7bb85c55f6779cbfb921630149d1b3174539fe2357fbeffbbe9857998907e3215ad3
 DIST portage-2.3.14.tar.bz2 948535 BLAKE2B 765c9eabb64c3b095993bb244481df2d243f57ad97029d7bb3d9ac89fd0ee939fb3a2aaa624a0f40959820903d70e6c209518d97df6b82501325963c963db9df SHA512 36daf3b9425e08a8e136e87dbb7be43d4688b5505203f11938a07b916da441e1f802b1cbd2e97505c0dc1c249ba5fda2a059a4ad515c2887f8199d1e130a2732
 DIST portage-2.3.16.tar.bz2 949134 BLAKE2B f8e7b6f13dfbf9aecdec444705042c6584c324522c0d131bf3c10f8fbfd5f6eeb97134afa42ed23da37f36ad4e2a0fc27129aebeb100aed2e3fd650c360ed060 SHA512 5847904b3262adcef04c7d6781cf2d03130480a49c5343a3a2d5cc36ddc7245ac30b1ba152329f96e2e4ca8d62ef387554cb228798db60f6f8141830d147dfaf
@@ -9,8 +10,8 @@ EBUILD portage-2.3.13-r1.ebuild 8523 BLAKE2B d8676285889a5fbc2abc9397bb24f61d1e4
 EBUILD portage-2.3.13.ebuild 8220 BLAKE2B 1c71ce90b2d0d0ff9ecdbc842e9178cc5ba3e3016c3d00243f6dfa43772ce8fe6719965bc7f6f968a24ebd267442f3697b698dc5e8e947aca85f611cba33a12f SHA512 01c64f9252eddec365801614582182d509f969fd83889d003a3081df96f92dc2f3b707231ef74357fdd049eedef726e95304d3ceec0c334504ca186ee5cd0f01
 EBUILD portage-2.3.14.ebuild 8523 BLAKE2B eed0ce93cc3d1401817cbcc14c12bf76157dda41294958ab2d72ae72187f62d220e3cdde93b40d3f6c7b80e65f564bfb062b2a37230c8200d855b4e585165b80 SHA512 439a5e2521e74d4a5b73e91f9e3f0ae29b3eaa01c6bb3e2f3420f2ee838b6fbb60438e785c30e9806fb7cd65d7dbcf6062d1b3f61a4792c01326ab874dbacdfe
 EBUILD portage-2.3.16.ebuild 8371 BLAKE2B c1442999cc4e36d94412fd451b8a403cf8afea392a798312518f0ee1c13579efffdc2ce3d815f375942ffa34225cf40dd3a4387e7c7f31c3b43dbacf6378991f SHA512 dc064087870150d8c0629e6d7f95f704728b08ee85464c9d228f3e425a74bacded772d6a1ff1371937686b50960410e9e5cd9824ad58e8ca3ae2b10ba3b3b263
-EBUILD portage-2.3.19.ebuild 8364 BLAKE2B 5e3d2e58275986ef97177fd66411005c425c351e2af3d58d9f23bf78eb8a324c3e5eed8ee9940a69becd2598999a0e180e28bfb2f1a2a835f92297d822efbf9b SHA512 f1ae940de4e730190162b6ed7a9e7de1ff59c7b36fe32e85bfd3439c196472446a674056e11a1958bde1f7efb0c45f7cbef0a3bf369552c70810001adb630c65
+EBUILD portage-2.3.19-r1.ebuild 8420 BLAKE2B fbec704b4eba0d52ebdaf8f4cb02e6ac71e1b982faa1db1845b136b7c16b30360a5aff7031de29b07faaf6709b31b96064073216152edfdf21ef01967672cd17 SHA512 8f13dbb41408bd41901ddbc81df341e61e578bb91b8c44f21f02665f5aebdf8195f337cb0d24518a138880c2c36c50fc2f3b924f91ba5fea083b74c697ab597b
 EBUILD portage-2.3.6.ebuild 8661 BLAKE2B 79789262c8d2cfea53c24291ee9b1d638bee592c2eb6435b22f6996be43bd5e0bf76df39df74163b98297d6ecd11c24fe4b8ee0cbd84b7a62196c0b9de4ef8d6 SHA512 53301757289cc37690020ac7b5379d026ff1e87f9d558c913eae213d0f33b75261045616c9259fe28684aa1031c27d4f58a52438e67eb91a97d186a80ad298a4
 EBUILD portage-2.3.8.ebuild 8211 BLAKE2B d615c9a0ae6df8f649f6ccdaecd6a404f9196cc62008b3bc38801c8e355b82b0288c00e4c52e481961fa6f568c0cfd4425a4ec7e313d08f9be143623ea2cfbaf SHA512 d803ac927d8a6f7fb00f629bca8a1bf94200d4ecbc83740afb32041b865dcfd13ca4329eda9693ceab20d2bcec30b132e23fd0b62cef262f246297f0d6ff748a
-EBUILD portage-9999.ebuild 7898 BLAKE2B 3eb2b5417170a7309bb0a56085ab1caf807a7245d02cd3f1f2f1e8dc2a75dee0204538daac9b364d1604da89abef5e55093af6759ef62136f2829a928fec180e SHA512 07c97f2f8b2fdbc4e1494fa517c88eb9fbdfd3429b3e21e4087be9ae4e6cf3ce401cd7def881d32cb9f5e9f8e25515e776c866f050c0181f9ef7e2cbf4affeef
+EBUILD portage-9999.ebuild 7954 BLAKE2B 3722e91d6949748a77a8dc489250b346ea2fec4c02b18c8309f3d29ca83e85a21de83dda39c6e6a963b26e7fc045cc9000d846593f0b2a96428d1709d19441b3 SHA512 c1f07d6fbac108fa40a99324b4d3a3d98c3bc0fdb33c4e02d1e5364a961bc319609ed7eddae94dfdde5e410f008d57edad362ed270432946095a6f897ab9485a
 MISC metadata.xml 1147 BLAKE2B 7a665b1c7a67e5f14020c1604c846840698a973885b6ab3d48c1ccd0782504a4ded3b12c81ccf3b17e539a593ee03a7ea23ec1656d65b0aceeeb59cf67e76408 SHA512 733193cbfc96da31252b5e4109d0b76f797e339c41eda2c1230cc1d5b0e75912177570ed0140218a7a7b85d9b8bc53e8e6931e88810269c499be87af40e6b86c
diff --git a/sys-apps/portage/files/portage-ccache.conf b/sys-apps/portage/files/portage-ccache.conf
new file mode 100644
index 000000000000..37857fde319b
--- /dev/null
+++ b/sys-apps/portage/files/portage-ccache.conf
@@ -0,0 +1,2 @@
+# Prevent ccache files from being cleaned
+x /var/tmp/ccache
diff --git a/sys-apps/portage/portage-2.3.19.ebuild b/sys-apps/portage/portage-2.3.19-r1.ebuild
index b4f03d91d2de..1c78b4a699f7 100644
--- a/sys-apps/portage/portage-2.3.19.ebuild
+++ b/sys-apps/portage/portage-2.3.19-r1.ebuild
@@ -10,7 +10,7 @@ PYTHON_COMPAT=(
 )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
 
-inherit distutils-r1
+inherit distutils-r1 tmpfiles
 
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
@@ -203,6 +203,8 @@ python_install_all() {
 		esetup.py "${targets[@]}"
 	fi
 
+	dotmpfiles "${FILESDIR}"/portage-ccache.conf
+
 	# Due to distutils/python-exec limitations
 	# these must be installed to /usr/bin.
 	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index adb4f2b5bde8..e025371418af 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -10,7 +10,7 @@ PYTHON_COMPAT=(
 )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
 
-inherit distutils-r1 git-r3
+inherit distutils-r1 git-r3 tmpfiles
 
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
@@ -202,6 +202,8 @@ python_install_all() {
 		esetup.py "${targets[@]}"
 	fi
 
+	dotmpfiles "${FILESDIR}"/portage-ccache.conf
+
 	# Due to distutils/python-exec limitations
 	# they must be installed to /usr/bin.
 	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
diff --git a/sys-apps/sparc-utils/Manifest b/sys-apps/sparc-utils/Manifest
index 3ba0746a3765..2e828f825e0b 100644
--- a/sys-apps/sparc-utils/Manifest
+++ b/sys-apps/sparc-utils/Manifest
@@ -1,5 +1,8 @@
 AUX audioctl.init 455 BLAKE2B 5e449ba3910ded2550dbbd367a2a4f63e3964a65b48d228078a30205a731c0270bd96d7bf4105d833b67fcbd2f0ae98de414f5b77f495172dac741498d94183d SHA512 6ae87679c9e51876551babfaa35126a7ae94c15edc21c630154130652a1f9f754c489c5406c9c3166157a45495d05668bb06bce79ab34053a0b74c34b19c16a5
+AUX sparc-utils-1.9-no-implicit.patch 584 BLAKE2B 153440b685bfd044c24f3da85598895724873b536628ec205c24028baf908e84008c0e629381a6f703f42baa7d6bef3534e77bb03af6dd3b23d9a9017a43ebda SHA512 302c29f1a33ea6b92184bd272fc974b1886168e7aa3d0f0cdcc117024475cf6b27eed9336f8b7edd84b40862144f58c3337fcc47cf3c1a744e5f4a71f8ee4f7f
 DIST sparc-utils_1.9-3.diff.gz 10337 BLAKE2B 03ee7ca15c4e736955fa08c66bbd1db2ec39764b4334fbec3838f5bcea3945d22c7a3148c00ab43a67324827af473739d014d7a6a895dbbd58c43ba13cbb1efe SHA512 c6eba75261ffee55cc49e3da71ad3a2f12e04574158975c69db0bbd94d7c22ca4dec50f3140cf0bf9f35bb547865deca3cfd3e28e76c70b9173926bc0b8f34ee
+DIST sparc-utils_1.9-4.diff.gz 9083 BLAKE2B e4b16c26fe67be73d0fd3ad8e1e80b19356d5961abac344f28650e4d355cac9c557999591947391c41be88d819ebb703ae1ff177b4fbe0d9bea7a411a791821f SHA512 ef79dc480471117da3a778450b3a122eaf64fdee69d35ff30b301f2360ff5d76c6343ce37c25cc188891c1619809daa0595d01c6e85781ddd7ddf1713c8378b7
 DIST sparc-utils_1.9.orig.tar.gz 110080 BLAKE2B 52f47c130fb8e24b0340589c846292fb2e4e9b211a10cddf52a7a63edd70673e2b7d05c2415e558c5f2d1235f33f4ae65b777d3f8b2cf2c50a601d1f0a7a941a SHA512 bde05f1a98211aaf502be6dfd757ddfb21c136cedbb46ca84a4539706c71901815c9d8bedfebc3800c7340634b32276197c75f92f9cc829e4f50c37d203e9358
 EBUILD sparc-utils-1.9-r4.ebuild 2304 BLAKE2B 16c4932eff08538320f9e624f942a779fcf6c9011922b0deb52b9abf5595f1274a9cec075756cf29ba81c8b0b5b572d13ccf07e46b6ba8865bc50c8090eea7e9 SHA512 8d72473fb064d0a2c2fc5e4334d23f2af904fa9d7ff4c406193d9dd2f45c4728ed696bc842c6a558958623a5bf89109b37ce25ad7d071d16036ce17807390166
+EBUILD sparc-utils-1.9-r5.ebuild 1547 BLAKE2B 876ab391f3920f7743f1ccccc071012b227322137da087e3ec76afab891485449813bc7797fc8f3f4fe5f3d61cec1cec78516972ee38004afd6a3687e03c1078 SHA512 34e081d48ad5f862db79e2654d7b0ff2020358438770697629f1a19318b864ced425c7b9779314ba23703e8d43803540bd59e400297ce24ad382a4ff74eeca79
 MISC metadata.xml 416 BLAKE2B 3d0e052bc957750b869856cabb6e94d86dc1655e63da29ac3753c16d8437e7a9a97c89e225f03b6267bb32bdbe6215c25717f088684e493b5785a6d334854dd1 SHA512 c057eea9ea65b87cb366e802dd8962901024335a85b3ec53caa6c342c9e1a23e656dcadc2a70692e5e7ab55a0ac82637ef052699844f50061461a645613b688d
diff --git a/sys-apps/sparc-utils/files/sparc-utils-1.9-no-implicit.patch b/sys-apps/sparc-utils/files/sparc-utils-1.9-no-implicit.patch
new file mode 100644
index 000000000000..567edd3c6113
--- /dev/null
+++ b/sys-apps/sparc-utils/files/sparc-utils-1.9-no-implicit.patch
@@ -0,0 +1,21 @@
+diff --git a/prtconf-1.3/eeprom.c b/prtconf-1.3/eeprom.c
+index b801f95..b15e74c 100644
+--- a/prtconf-1.3/eeprom.c
++++ b/prtconf-1.3/eeprom.c
+@@ -33,4 +33,6 @@
+ #include <dirent.h>
+ #include <pwd.h>
++#include <ctype.h> /* isdigit() */
++#include <sys/ioctl.h> /* ioctl() */
+ 
+ #include <asm/openpromio.h>
+diff --git a/prtconf-1.3/prtconf.c b/prtconf-1.3/prtconf.c
+index b9d8c89..c9b54be 100644
+--- a/prtconf-1.3/prtconf.c
++++ b/prtconf-1.3/prtconf.c
+@@ -30,4 +30,5 @@
+ #include <sys/stat.h>
+ #include <sys/utsname.h>
++#include <sys/ioctl.h> /* ioctl() */
+ 
+ #include <asm/openpromio.h>
diff --git a/sys-apps/sparc-utils/sparc-utils-1.9-r5.ebuild b/sys-apps/sparc-utils/sparc-utils-1.9-r5.ebuild
new file mode 100644
index 000000000000..80f6a939f0df
--- /dev/null
+++ b/sys-apps/sparc-utils/sparc-utils-1.9-r5.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Various sparc utilities from Debian GNU/Linux"
+HOMEPAGE="https://packages.debian.org/sparc-utils"
+SRC_URI="mirror://debian/pool/main/s/${PN}/${PN}_${PV}.orig.tar.gz
+	mirror://debian/pool/main/s/${PN}/${PN}_${PV}-4.diff.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~sparc"
+IUSE=""
+
+DEPEND="virtual/os-headers"
+RDEPEND=">=sys-apps/util-linux-2.13-r1"
+
+S=${WORKDIR}/${P}.orig
+
+PATCHES=(
+	"${WORKDIR}/${PN}_${PV}-4.diff"
+	"${FILESDIR}"/${P}-no-implicit.patch
+)
+
+src_compile() {
+	emake -C elftoaout-2.3 \
+		CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+	emake -C src piggyback piggyback64 \
+		CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+	emake -C prtconf-1.3 all \
+		CC="$(tc-getCC)"
+}
+
+src_install() {
+	# since the debian/piggyback64.1 manpage is a pointer to the
+	# debian/piggyback.1 manpage, copy debian/piggyback.1 to
+	# debian/piggyback64.1
+
+	cp "${S}"/debian/piggyback.1 "${S}"/debian/piggyback64.1 || die
+
+	dobin elftoaout-2.3/elftoaout
+	dobin src/piggyback
+	dobin src/piggyback64
+	dosbin prtconf-1.3/prtconf
+	dosbin prtconf-1.3/eeprom
+
+	doman elftoaout-2.3/elftoaout.1
+	doman prtconf-1.3/prtconf.8
+	doman prtconf-1.3/eeprom.8
+	doman debian/piggyback.1
+	doman debian/piggyback64.1
+}
+
+pkg_postinst() {
+	ewarn "In order to have /usr/sbin/eeprom, make sure you build /dev/openprom"
+	ewarn "device support (CONFIG_SUN_OPENPROMIO) into the kernel, or as a"
+	ewarn "module (and that the module is loaded)."
+}
diff --git a/sys-apps/uam/Manifest b/sys-apps/uam/Manifest
index e453a5c02d16..23d39b727461 100644
--- a/sys-apps/uam/Manifest
+++ b/sys-apps/uam/Manifest
@@ -1,8 +1,4 @@
-DIST uam-0.3.1.tar.bz2 59632 BLAKE2B 7134ac7754635904023a6b6272786f078d87b4cde13e949046bc48492f7632ef1c8af24f6d16a2c09abcff59df4047f875645ac13836457f1ea35af495396ecd SHA512 bcd7a37701eb73bf3443d1fa98372fc0788cb3101619265c012d010f83e2cccc17fa8bc033704396707aa6de9caf0a80c9637dd7c7d1f86b01fd844967dac5a5
 DIST uam-0.3.2.tar.bz2 60508 BLAKE2B 35accde4ae392f33af0d1c0f30069975e30691927dff33ac754d00f1de7b30d1b789e9797637f9701913796b5993add4b2405294fa47b1fbd6f8d6e1946b1ad8 SHA512 4a4ee9286b3762227fc5a03a10998cb3b4a2f110cd648bb2ed45f400e31218a17d3929c83450e9190255bda1f22f4001a7f33842999b79c27aa12fc11f286273
-DIST uam-0.3.tar.bz2 58143 BLAKE2B 08a20293e66c649b9933138888411c0a8bbf86d24dfe5bff7714d6e9f6d96e6608de237ef0cd09a9d4b5b7f24566dfc0add581a64592c02c8f4b0325c132cf4d SHA512 6b5ce8b37ea7b430a492c4411ac005d6555e49bbc4849ae03c5bb16e7dd89e8cac32349dfa0507f01cc6b22bdb111eda69471141da4952f8425f9390035c6085
-EBUILD uam-0.3.1.ebuild 1492 BLAKE2B ed2f0c66d6406d411ff2b5d8bd6d9f5b30ee0f55d22acb148200e610ac286b041417a0a22f45385e2ec97041143475b38a200031d12d90c20dcf8576245ef468 SHA512 358e8fe2c5723ecdd109c3934e30e3b91ab2eeca13163ad3894fe7c1bc33f1e3dfc2be58e1ef61f138064db5ba9186760921fe30d31b274329c08e93f04aeec2
 EBUILD uam-0.3.2.ebuild 1490 BLAKE2B c18f67cc75abdeb64a5434e5dffdc01f7665a31eaa451de61b1783068b50c48dcd84aa2e6e6371a975756960d6207120fe422bab0811b8d5fd362d2ce9ca2d93 SHA512 6c5c47fedab034583c1f471a1768e800b37f7127482e28cf1449be1c4085fb2caf46c0acf57ed8dce9849b7987addc05972f1b6c08a4c8a0f246a1a8e5a38ecf
-EBUILD uam-0.3.ebuild 1625 BLAKE2B affc055535fcae119b205ba1056283163cf83d43f628a7ab9965025ece5b45443b43708c9f8a93a60c17168e7915504ee39dd91dacdefb3637402397cf246c82 SHA512 9b94e6faa63a32f8dcd88f13ad2b750f0c0e2caf17ea4539490ee34bccec89229dbff456fb8ce194e356bcf8fd48752366dc7134f7af7fab93190e9c15bf54bf
 EBUILD uam-9999.ebuild 1641 BLAKE2B 43823d6f16dbdfb9fe7a744bd5d2b2a4536f30f8527371d8ef5e2fa2086ba3ad64dbbcfb7772b3b8f67b5a4ecc33042c4e1411f3c439bce407829f405934427e SHA512 73b2b1a6d4139eb4bc6e846aa4cb0baa582215f5baf0b0fadf712213c79a53749ed0ac31a34463da4beaf0932c8425602830582beffb1c7e4beb207c7bc7c293
 MISC metadata.xml 720 BLAKE2B b7972ab02c083ded62cf5552a515c0f75d7ec7a5546e75df29dc2b749c6db713d5cea47eb3478fc92ded9128dd08d5b7f84c6050db2354b2aafedc22a3652ef8 SHA512 8603fba8cd8b329edef637f3030bc6b2d9ab4b40bcb511a501140e71eae5cc89be8c1a488c5e45e0f1daaf83334306e3ba86966ac74bceba6426b68cb1b2fbe3
diff --git a/sys-apps/uam/uam-0.3.1.ebuild b/sys-apps/uam/uam-0.3.1.ebuild
deleted file mode 100644
index facab0b105e5..000000000000
--- a/sys-apps/uam/uam-0.3.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils udev user
-
-DESCRIPTION="Simple udev-based automounter for removable USB media"
-HOMEPAGE="https://bitbucket.org/mgorny/uam/"
-SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="virtual/udev"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-pkg_postinst() {
-	# The plugdev group is created by pam, pmount and many other ebuilds
-	# in gx86. As we don't want to depend on any of them (even pmount is
-	# optional), we create it ourself too.
-	enewgroup plugdev
-
-	elog "To be able to access uam-mounted filesystems, you have to be"
-	elog "a member of the 'plugdev' group."
-	elog
-	elog "Note that uam doesn't provide any way to allow unprivileged user"
-	elog "to manually umount devices. The upstream suggested solution"
-	elog "is to use [sys-apps/pmount]. If you don't feel like installing"
-	elog "additional tools, remember to sync before removing your USB stick."
-	elog
-	elog "If you'd like uam to mount ejectable media like CDs/DVDs, you need"
-	elog "to enable in-kernel media polling, e.g.:"
-	elog "	echo 5000 > /sys/module/block/parameters/events_dfl_poll_msecs"
-	elog "where 5000 would mean a poll will occur every 5 seconds."
-	elog
-	elog "If you'd like to receive libnotify-based notifications, you need"
-	elog "to install the [x11-misc/sw-notify-send] tool."
-
-	udev_reload
-}
diff --git a/sys-apps/uam/uam-0.3.ebuild b/sys-apps/uam/uam-0.3.ebuild
deleted file mode 100644
index 097c74fe846f..000000000000
--- a/sys-apps/uam/uam-0.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools-utils user
-
-DESCRIPTION="Simple udev-based automounter for removable USB media"
-HOMEPAGE="https://bitbucket.org/mgorny/uam/"
-SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="virtual/udev"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( NEWS README )
-
-pkg_postinst() {
-	# The plugdev group is created by pam, pmount and many other ebuilds
-	# in gx86. As we don't want to depend on any of them (even pmount is
-	# optional), we create it ourself too.
-	enewgroup plugdev
-
-	elog "To be able to access uam-mounted filesystems, you have to be"
-	elog "a member of the 'plugdev' group."
-	elog
-	elog "Note that uam doesn't provide any way to allow unprivileged user"
-	elog "to manually umount devices. The upstream suggested solution"
-	elog "is to use [sys-apps/pmount]. If you don't feel like installing"
-	elog "additional tools, remember to sync before removing your USB stick."
-	elog
-	elog "If you'd like uam to mount ejectable media like CDs/DVDs, you need"
-	elog "to enable in-kernel media polling, e.g.:"
-	elog "	echo 5000 > /sys/module/block/parameters/events_dfl_poll_msecs"
-	elog "where 5000 would mean a poll will occur every 5 seconds."
-	elog
-	elog "If you'd like to receive libnotify-based notifications, you need"
-	elog "to install the [x11-misc/sw-notify-send] tool."
-
-	if [[ -e "${EROOT}"/dev/.udev ]]; then
-		ebegin "Calling udev to reload its rules"
-		udevadm control --reload-rules
-		eend $?
-	fi
-}
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index 78fb77c6ea73..4688eab908d9 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/silo/Manifest b/sys-boot/silo/Manifest
index fede478792e3..10eb4dba38fb 100644
--- a/sys-boot/silo/Manifest
+++ b/sys-boot/silo/Manifest
@@ -1,3 +1,4 @@
+AUX silo-1.4.14_p20120819-gnu90-inline.patch 544 BLAKE2B 6336a6713a706b8181cbb5d60f542f47fa4009347546bdb812369fb3fb054818e6230af239244ee9628a315df5c1bbdf0085be92448c9f2fca3f1ec7323f51dd SHA512 a3ac9e1226de694063bce8edcd0160ab7340a2821ec243ea45a79885da81eaf3a8af2bbe19350edaa45654a2d13ef070682ea7eca80e12f982e8a05ef49abcd7
 AUX silo-e2fsprogs-1.4.14.patch 1349 BLAKE2B ad11dbaac011fa4f006f1cfd5cfb5a9e5b45af99d663295a02bd5473833ed3c4337c32e86d12cc16db25ce65573ca4223fbd3380c5b9a889cab17e6541f7fe69 SHA512 f914e1ddfbdbac71fc1b67ebf188a66f1f55a1d5b19654e77d1f6e614f9adc4f1848c90754be60bdc4a9b4a4750d66cf5ef4db13db08719dc0877e4b1205ef6b
 DIST silo_1.4.14+git20100228-1.diff.gz 10143 BLAKE2B 4282de2900dfa670164ab9c7d64c7793cb5a132fda015750355bad9d94269c223f850d23fe048c215df9653689774dadd8f9cbbdd2919751e574f00b10053e08 SHA512 7209fd4fe65d7d72866ce41d25498e8369f59b51833550ecf9ae84badce33e82eccf97835558d560ca9937ebf37d0de99da7876ee4de1bafbe96e931c6d72cf0
 DIST silo_1.4.14+git20100228.orig.tar.gz 738325 BLAKE2B 5e5e221a9df91b94523c366a9f6ab2d195567e9f2938f141d93750a2fd15ec3cf657ca48155ea1113c7b6db011953fa15c1c6fd05759d7bc47cfc274c43424da SHA512 aa119893695fe0ce5eb30c7a461aa77b0f8935b1e2bcff9f83b232aad8b44cce72662c7c6716c61ea914dd5217edaf8d0e01b363010a2f7d9be9ac80a666bb77
@@ -7,5 +8,6 @@ DIST silo_1.4.14+git20120819-1.diff.gz 10711 BLAKE2B c44a0204e3aece4eec8355f88b3
 DIST silo_1.4.14+git20120819.orig.tar.gz 755510 BLAKE2B f1185086671c12c901704c2aa1f582a4e983d2d4a2d5ec18194aebcd43a7bdf9e7ad329efebaf4911d40f8a417ff8c8566b61be4eac5fea13235ac44d0edf852 SHA512 2d1dd8f805fb0a272877b5e8e19e5a645aa9fe02cf2b5ef43b5d2894c0c6a5a82483a0e41556af50f01dc795dc5e43350ae92139485c19d64cda75c2aca01a38
 EBUILD silo-1.4.14_p20100228.ebuild 1719 BLAKE2B 758a07bd95c74f0f0e1c2ef7a80b76baebef3550d0f455b25526eb370caa4df16cf63d3b3002b6d638f3f00b034d7009c885ea4ba20ab54679a1a50ea4960d53 SHA512 e968690916ca701d8c55e682c3c8f599bab8bbd51fdd8567a9edc3f9959cf4c1727716dbd522c94eb1ba53c28949c7ae2ab5b0694cd541fb5ff3f55f1cb23b4d
 EBUILD silo-1.4.14_p20120226.ebuild 1735 BLAKE2B d5852234c99b0df9253a85e61e33adb9f48f2ae76baee9fa4ce3ffee67461c7a3dd60bd65cc2a1bb90733756965502f5508ee2b76935a358e60c99bbf3038c7c SHA512 93f02430b14ccd2ab7d64d32cf3edd7cb5b4824c61327e06cb04ef5f5c050058f13a9de3aaae21d789095af71efad6d79c0470e338950b21d576640eae8307d4
+EBUILD silo-1.4.14_p20120819-r1.ebuild 1566 BLAKE2B 888b6973d1320461d6f304577c143302077d375551a92d4c13e1c7e07191eae12cc5b4ffbefcb2ed5e9350c4f9c89848052be21085327274bd224eb54f20da97 SHA512 cd9758ed3e273c0ecc796f90b26bab81cf88719d5575f3e51b250c510ce5a7f00f6ab796d2ce9f84c873b370933f44ea5b3c07bffd7050978a4958babe1cf958
 EBUILD silo-1.4.14_p20120819.ebuild 1569 BLAKE2B 7c51160a48da6db1fa827f9e1f73afb72b3067f24a0f7f1804c66a7a644fb37566aad013505d500322dd6effea5dd07b2bfd194fe871e423a83d671bc4937109 SHA512 39d1ce19e0ffbd5743abc2e4141f8ede3877b0f438728be8c9913d06b2931080dc3503cd89ec8e1813e611a15751b522afa16d9229bfc0790c4df288cde03c13
 MISC metadata.xml 383 BLAKE2B 30e20990d4d208db4d45f19aaab45fad2afdb238415163399d2665d1327f6932dbf420ecc455ad03ba69492a1ec9c18397362164873016427a624e8fb3e41844 SHA512 4d4c999f52f1dfb269edc79e10df3fe667273d895eceaa4db695e9bcfe5ba781a0f9f7367411fb4be71ecedc679ce792c2359801e28b2c164fd7f44b971ced5a
diff --git a/sys-boot/silo/files/silo-1.4.14_p20120819-gnu90-inline.patch b/sys-boot/silo/files/silo-1.4.14_p20120819-gnu90-inline.patch
new file mode 100644
index 000000000000..bf6add0ce104
--- /dev/null
+++ b/sys-boot/silo/files/silo-1.4.14_p20120819-gnu90-inline.patch
@@ -0,0 +1,20 @@
+--- a/Rules.make
++++ b/Rules.make
+@@ -26,2 +26,7 @@ CFLAGS += -fno-stack-protector
+ endif
++ifeq ($(call cc-option-yn, -std=gnu90),y)
++# In gcc-5+ c99 changed inline rules by forbidding
++# multiple extern definitions. Fall back to gnu90
++CFLAGS += -std=gnu90
++endif
+ 
+--- a/silo/Makefile
++++ b/silo/Makefile
+@@ -6,2 +6,7 @@ UFSDEPS=
+ CFLAGS=-O2 -Wall -I. -I../include
++ifeq ($(call cc-option-yn, -std=gnu90),y)
++# In gcc-5+ c99 changed inline rules by forbidding
++# multiple extern definitions. Fall back to gnu90
++CFLAGS += -std=gnu90
++endif
+ 
diff --git a/sys-boot/silo/silo-1.4.14_p20120819-r1.ebuild b/sys-boot/silo/silo-1.4.14_p20120819-r1.ebuild
new file mode 100644
index 000000000000..8cb43a1287e1
--- /dev/null
+++ b/sys-boot/silo/silo-1.4.14_p20120819-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mount-boot flag-o-matic toolchain-funcs eutils
+
+DEB_PL="1"
+MY_PV="${PV##*_p}"
+MY_GIT="git${MY_PV%%_*}"
+MY_PV="${PV%%_*}"
+MY_P="${PN}_${MY_PV}+${MY_GIT}"
+
+DESCRIPTION="SPARC/UltraSPARC Improved Loader, a boot loader for sparc"
+SRC_URI="mirror://debian/pool/main/s/${PN}/${MY_P}.orig.tar.gz
+	mirror://debian/pool/main/s/${PN}/${MY_P}-${DEB_PL}.diff.gz"
+HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/davem/silo.git;a=summary"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="-* ~sparc"
+IUSE=""
+
+DEPEND="sys-fs/e2fsprogs
+	sys-apps/sparc-utils"
+RDEPEND=""
+
+ABI_ALLOW="sparc32"
+
+S="${WORKDIR}/${PN}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gnu90-inline.patch
+)
+
+src_prepare() {
+	default
+
+	#Set the correct version
+	sed -i -e "s/1.4.14/1.4.14_git20120819_p1/g" Rules.make || die
+
+	# Fix build failure
+	sed -i -e "s/-fno-strict-aliasing/-fno-strict-aliasing -U_FORTIFY_SOURCE -mcpu=v9/g" Rules.make || die
+}
+
+src_compile() {
+	filter-flags "-fstack-protector"
+
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	default
+
+	dodoc first-isofs/README.SILO_ISOFS docs/README*
+
+	# Fix maketilo manpage
+	rm "${D}"/usr/share/man/man1/maketilo.1
+	dosym tilo.1 /usr/share/man/man1/maketilo.1
+}
+
+pkg_postinst() {
+	mount-boot_pkg_postinst
+	ewarn "NOTE: If this is an upgrade to an existing SILO install,"
+	ewarn "      you will need to re-run silo as the /boot/second.b"
+	ewarn "      file has changed, else the system will fail to load"
+	ewarn "      SILO at the next boot."
+	ewarn
+}
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 54a8523e1d3a..2c66a1d046a3 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/duperemove/Manifest b/sys-fs/duperemove/Manifest
index 62d943bdd6bb..e9fc2cff114c 100644
--- a/sys-fs/duperemove/Manifest
+++ b/sys-fs/duperemove/Manifest
@@ -1,16 +1,6 @@
 AUX duperemove-0.11_beta4-sysmacros.patch 259 BLAKE2B f2749d5b372244aae43d54698a33175546c434718eaf205bc55984652a28a6607d34457a840c4500e12a1bc3b088e658665627364cf2a141d6a39a96cbddc310 SHA512 59decd2c3d761faf683edf807454f3a00f4c71ce60302b2fb9e4ce7408f449659f714ec71488f4a69dd1d1a12bd1e5715f2d897e66fc947adf3cd1d70ac63790
-DIST duperemove-0.09.1.tar.gz 54978 BLAKE2B b1575dbd2720f4001f2a1f53637f171063b0195b2c7cc4c01597948e447991d3a13079d54f7a1133ac1a937a5ce82e14a3724909aa820da8ea06a4e78dcf8055 SHA512 49de99b64c8b0a71a47474480f33b07f2e6602c355621a9d0c6c92a3b7c2f2f5e6c03abc4e2459a1b96fa9543767c0abe48c5c63daf53962a3033a3b1984a037
-DIST duperemove-0.09.2.tar.gz 55715 BLAKE2B 32232e9da10dd41dcc9bbabe8ddc0d147525310feabe362592ad2b2ad16c25b66110ab73d0d7fcb779fb2d27d3222b3fda0f89a438989ff3c67354a59b8fd0d1 SHA512 acc1c16ed3faf08e54d4adfcc9f852d2c967981bc461ab45b0673f46f2e86109020d56e641da9764d46f2cc53cbcad5d2aa014357a819ae170375d784b2c08c5
-DIST duperemove-0.09.3.tar.gz 55722 BLAKE2B fde83eb04fd531ac01d48bee2945fec73004b716cbbdcdb34047286daab3fe0f07d9941d4792f5c67a92407ac3688df21d0dce8e18e43690d1faf70c4225b090 SHA512 fe2a19088ec9ac3dda35da8b9580ddcc1c3b49e60824f2c1bbf8c013756c060b4c9663d1977bb6622c4de19754fd4a1011cc09ef3c785c2b4b218e0c9fb15b87
-DIST duperemove-0.09.4.tar.gz 55725 BLAKE2B 92b91cd650be46da61b55c0b43e11f26f4861ef13f8703c3246b9610c66235effd05199740104f1903a237beaf5b726415fb72e4a49adbd696563b9db3d41d56 SHA512 dff728a34bdf8df71aa13b7f9c8ffae8ce643337f4dafacb3ceeb778d326b1885f63ae03215c6d714c4fcd7b2f26b03e47d7ad3a42eca3f2d5de5b596b653bf1
-DIST duperemove-0.09.5.tar.gz 56175 BLAKE2B 0805503720434193e7929d8fa74283db459949648e9df1ddfeb7aead6ecf28f86f0e550a415173daaea0b73d8bc7c1a19394941344ca52d9f5e1e0ba1f43047d SHA512 111127d9ab7d5567de8393197cf5bc977db1f64b7405fd848e1ca5aaa5ca7a3057fa06b61b161d0dfc45e0c5ebcc2406218d9a834db519c7ca348cdc7a0fe2f2
 DIST duperemove-0.10.tar.gz 95656 BLAKE2B d52916f21f48a929db98a4cb132b41030b4f8b884851242690aad8b0b4faef12bb176aee51bb16cab940495d033b2467e0572e0b54d9533c920b8da4d3a1f719 SHA512 11bb1a9937b9ca7969b9176bb4cfc8fff91c257a8645baa0ca0ec6b634ae3c464712414f856d5a75ed16c6d13f0ae85ac3584df1f474575a975cb20ae0d7a9f1
 DIST duperemove-0.11.beta4.tar.gz 114532 BLAKE2B 76301204c87c0978421ede7652dbb9cbc273f5ef4a99c709517b1421ec7bb94bafed9465a744c9a42c74c6ee936de1a1e5510a58ed36c7ec783436cefeacec69 SHA512 e3879f558026a11d34c996243eeeab267bebec508a0bafa76ad563fe81c3bf911650745f27bd449c4d788c302b08324bb780e4d86dc5996678e06a1df233a286
-EBUILD duperemove-0.09.1.ebuild 473 BLAKE2B 13976a991f35495f6c968a38ba84d45513ccdf3d09dd49ec3217cddced5b948919f0e6095105828af0bc22b5459b104862243c7284103489bea52bcf8af89c46 SHA512 4170bf829851b9b372519f21e9d9fb2d973477f8694b785a46de92fb94498650d12127a0b15900e795d521ad86f99fcb580f6fce685700573ee9d8c0c0ecb948
-EBUILD duperemove-0.09.2.ebuild 909 BLAKE2B 680ec2cea3c169c0a67361bd5e9760165f4e85211e6e1d505831fc4b8f83b2b2b9dff20ab1479f5cbcea38dcc1b39f9c781af5b26e5c0cc697f221b080b7b966 SHA512 1141d45db5cb3d3cc2d891552ca36c9c40a439cf8e27529857dc579e72fceadfe891ce336fa16ecd88367363e5d69dad2abb19ca95c2b2441f18c2b7befc5a7d
-EBUILD duperemove-0.09.3.ebuild 734 BLAKE2B d124776c64576eafedfd2f54c7236cce40305b76f5f7bd5cfb78446667427127079cb1261954bdc785eec1e09fce8a6136ddb26e0f9159556285cbb4c65dcd1e SHA512 f36634414470f80342f41b1aaa766f2fc8d4e1c027636512cd0f9f4d0e3cfdfb8908d434ae4d609d99c36c2d92d273aa2664d406f3d1bd491670a83614fd9894
-EBUILD duperemove-0.09.4.ebuild 734 BLAKE2B d124776c64576eafedfd2f54c7236cce40305b76f5f7bd5cfb78446667427127079cb1261954bdc785eec1e09fce8a6136ddb26e0f9159556285cbb4c65dcd1e SHA512 f36634414470f80342f41b1aaa766f2fc8d4e1c027636512cd0f9f4d0e3cfdfb8908d434ae4d609d99c36c2d92d273aa2664d406f3d1bd491670a83614fd9894
-EBUILD duperemove-0.09.5.ebuild 734 BLAKE2B d124776c64576eafedfd2f54c7236cce40305b76f5f7bd5cfb78446667427127079cb1261954bdc785eec1e09fce8a6136ddb26e0f9159556285cbb4c65dcd1e SHA512 f36634414470f80342f41b1aaa766f2fc8d4e1c027636512cd0f9f4d0e3cfdfb8908d434ae4d609d99c36c2d92d273aa2664d406f3d1bd491670a83614fd9894
 EBUILD duperemove-0.10.ebuild 831 BLAKE2B 2f7902dd16acba90da55cebce325e6717b3af806ec55466d7e4bd91dad3d814f01b9818433ef6e59dac5d532888e1152e6a3e4d4ae040d438a0709a5b0f754f8 SHA512 1869181a31a17d9ae5a85d4034bc8d87105b2e05cb49071476b195ada90787b01ab1e6c42dd04771d6189aed03a512b410db77409a349a8af968fc3b4cc8c7e5
 EBUILD duperemove-0.11_beta4.ebuild 766 BLAKE2B c31b61f19033d159d6e0c8c91841027dc5cbea3f85a2098b2f34487eb035c6141f8b241e62587f7eeda5ad5a88865a38a0c3224bef90ba40b3587a47b55b077c SHA512 1b480cc6b94e974bd32ffd8f912d00f2bd1b542046bd0885d725de4fe7ae7fe4645d2f8b533fb182bf8437f3e77f9a1ffb79fe8dec2ce4db450c740538a4674c
 MISC metadata.xml 475 BLAKE2B 53dbd2deecde55b464cd06ba45fdc917e4a1b17232cb312400192be505a0ff870be87503857c513bfeaccf4c256748ad91af42d3e7a1cd1268f3e1c01ad9d86f SHA512 dc74d3d2be21f9cc6ac03cd6812d6e90bccd26bdcaf0a4e22f16ec7bae30e8cd252ac4b191aee2d4d94d45401ac680b9ee9ce8c7adad7a92afac908c9ab24de1
diff --git a/sys-fs/duperemove/duperemove-0.09.1.ebuild b/sys-fs/duperemove/duperemove-0.09.1.ebuild
deleted file mode 100644
index aea32e31e001..000000000000
--- a/sys-fs/duperemove/duperemove-0.09.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-DESCRIPTION="Btrfs deduplication utility."
-
-HOMEPAGE="https://github.com/markfasheh/duperemove"
-
-SRC_URI="https://github.com/markfasheh/duperemove/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-
-SLOT="0"
-
-KEYWORDS="~amd64"
-
-DEPEND="dev-libs/glib:2="
-
-RDEPEND="${DEPEND}"
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" install
-}
diff --git a/sys-fs/duperemove/duperemove-0.09.2.ebuild b/sys-fs/duperemove/duperemove-0.09.2.ebuild
deleted file mode 100644
index 36b1db08909f..000000000000
--- a/sys-fs/duperemove/duperemove-0.09.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Btrfs deduplication utility"
-HOMEPAGE="https://github.com/markfasheh/duperemove"
-SRC_URI="https://github.com/markfasheh/duperemove/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="dev-libs/glib:2=
-	dev-libs/libgcrypt:0="
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# https://github.com/markfasheh/duperemove/issues/53#issuecomment-89796552
-	sed -i -e '/glib2_mutex_unlock/s:mutex_lock:mutex_unlock:' duperemove.c || die
-}
-
-src_compile() {
-	# CC & CFLAGS are set via = so need to override them
-	# LIBRARY_FLAGS are set via += so need to pass them via env
-	export LIBRARY_FLAGS="${LDFLAGS}"
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Wall"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" install
-}
diff --git a/sys-fs/duperemove/duperemove-0.09.3.ebuild b/sys-fs/duperemove/duperemove-0.09.3.ebuild
deleted file mode 100644
index 17b2c00c5202..000000000000
--- a/sys-fs/duperemove/duperemove-0.09.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=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Btrfs deduplication utility"
-HOMEPAGE="https://github.com/markfasheh/duperemove"
-SRC_URI="https://github.com/markfasheh/duperemove/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="dev-libs/glib:2=
-	dev-libs/libgcrypt:0="
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	# CC & CFLAGS are set via = so need to override them
-	# LIBRARY_FLAGS are set via += so need to pass them via env
-	export LIBRARY_FLAGS="${LDFLAGS}"
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Wall"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" install
-}
diff --git a/sys-fs/duperemove/duperemove-0.09.4.ebuild b/sys-fs/duperemove/duperemove-0.09.4.ebuild
deleted file mode 100644
index 17b2c00c5202..000000000000
--- a/sys-fs/duperemove/duperemove-0.09.4.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 toolchain-funcs
-
-DESCRIPTION="Btrfs deduplication utility"
-HOMEPAGE="https://github.com/markfasheh/duperemove"
-SRC_URI="https://github.com/markfasheh/duperemove/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="dev-libs/glib:2=
-	dev-libs/libgcrypt:0="
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	# CC & CFLAGS are set via = so need to override them
-	# LIBRARY_FLAGS are set via += so need to pass them via env
-	export LIBRARY_FLAGS="${LDFLAGS}"
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Wall"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" install
-}
diff --git a/sys-fs/duperemove/duperemove-0.09.5.ebuild b/sys-fs/duperemove/duperemove-0.09.5.ebuild
deleted file mode 100644
index 17b2c00c5202..000000000000
--- a/sys-fs/duperemove/duperemove-0.09.5.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 toolchain-funcs
-
-DESCRIPTION="Btrfs deduplication utility"
-HOMEPAGE="https://github.com/markfasheh/duperemove"
-SRC_URI="https://github.com/markfasheh/duperemove/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="dev-libs/glib:2=
-	dev-libs/libgcrypt:0="
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	# CC & CFLAGS are set via = so need to override them
-	# LIBRARY_FLAGS are set via += so need to pass them via env
-	export LIBRARY_FLAGS="${LDFLAGS}"
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Wall"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" install
-}
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index ae0a8447be8c..59fa1fc47360 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -10,7 +10,9 @@ DIST e2fsprogs-1.43.3-missing_uninit_bg.patch 1317 BLAKE2B ec53c0aca102e137fce43
 DIST e2fsprogs-1.43.3.tar.gz 7405892 BLAKE2B 158aeee327a1ca68ce1bda1f97c9fa25ba1bd78ea9ee418c8ad85d2bf422d49ea93ad6c1b33c9b7bdafceacb4c0975da776c6e5b2df8962baf0d368c894db5a8 SHA512 77e753f77222a0a7a334d7d93c900ea6cb339ed40af29952e414fc4e45d8c5c01d67771978a941195effe666df965746c2b31977c5f05ff307429b978dac8dea
 DIST e2fsprogs-1.43.6.tar.gz 7466907 BLAKE2B 6c19c686432b7990900b239c4a1b3b6675b085ca7adfdb4323d1253ee8c83f22f87f67b0b4a843e48cb71322b1a7454b3ceab669f875b71b967e96054a55f1ac SHA512 95e3e7def177de921d3204aeace4cb8243d79872468d3289cace0547798c84e92af253022deb803cd8c045411283b01431728a86b14b9e8b45cdd5dca739db66
 DIST e2fsprogs-1.43.7.tar.gz 7492811 BLAKE2B 122158f0824de632b93fab651be60ca45096b5dac20438a6407c69577017a5f117ce402166b529072a81a2b6ac96f9237ea1a0f55d7d23d05ba758d42d86451a SHA512 71694c57d076517f6e1f2a5bffcbc49c32fcf11283e26739304f50ff0aae28646ea7af80dc85b636b87db57a0042a5bce82411e631f7d5c055440ebeadb90282
+DIST e2fsprogs-1.43.8.tar.gz 7474876 BLAKE2B b5d550a646facd2aae9de9758976e987ab6ddfc7c92fc1ea2ca71140010f3e10627a5dee5e17caa77746c6de508a652e26a31df123732603c9cbcc8df5edaa54 SHA512 158e9fa928de61716d57eeac1a64c3c40043c00594ce397419de71fc1f260f1a8f932971b1cef62ed8a01e865f4d97f6bc86289c3a60d33b160874b20744cbe5
 EBUILD e2fsprogs-1.43.3-r1.ebuild 4040 BLAKE2B a6100687d4e3edeb42d0328c592c9dc896aca97b883ead0bc866afe138dfb3a30126fb448fc5c30516d73c1a94c2fcc75dcf3bb6786ff36920850ca88ea5f84b SHA512 5053ec14ad968d6f4f8bb0cf0a227c0f56af71eaf0201fe7d53448c962f6f097aeb92b561381194aea58f5d3d99421d455ad50f280413d83ada6b281e1361c9c
 EBUILD e2fsprogs-1.43.6.ebuild 3794 BLAKE2B 30536b1a22b10fab64223baf79a8717aa6cc736fa94ee74dcbef4ef2a068ff0d5969b1a77fadc324ed8d81fcf1282f8e566faa130975befed2be83e570aaa6ab SHA512 79c0ebff04f84941e0959e52d4a0d5d5804fdca9ccad42c23d9523ce8091a1230f5e50a06d24b0f3bb8e125c9a71c80629d2ed58fc2fc5b49703f97ba176fe77
 EBUILD e2fsprogs-1.43.7.ebuild 3803 BLAKE2B 16d9ba317e345a07bd0505e3d6ebd7a50c2aca6e323bd9ee09e1a6390aa4965e6b5903d66cc52c82b19cbe9928fe4bc31613de5294eef8c521901bb648724ae0 SHA512 5ede2280b2d42c18e14315654f6dc092b02b757927ba1a4973417f514b6dc66f506dec85e69f1a0c00e177a3950b74bb42fe0994d15a50c2c83455cb7baeb7d9
+EBUILD e2fsprogs-1.43.8.ebuild 3825 BLAKE2B 4362d2301f7a41d03bd49ff2220274f4c459b8ea24b8df081a93eb117f605781c26a4578f1d80b9778a986eac6cfe8bc7d0a00e3b72b17d49789e93feaf4f873 SHA512 7cca30321f643180c7b7457e2e577467a0e85f7cf9523a6285c7fd5699db6b4cf04623dfd22712ba6bc2a3957a3976aa3f4300e22225d92108f6a5b0301900f3
 MISC metadata.xml 520 BLAKE2B 3e908938de1132b5cde97c6b51b40f72c03e91301b54c14339379d2e2380414dd33096a87d64ff2fc7d886cd65fb16b9c16a376b7338c826f44917860f380be2 SHA512 a5ff91610ed175147f1a9c2c725a30380908c02fc04c6b7df2792cb4fd805f9137374d2a910e456128a7bf2fec9e83af3063bcb5f2ad51394bed8bed648e3905
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.43.8.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.43.8.ebuild
new file mode 100644
index 000000000000..ba0347721fd7
--- /dev/null
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.43.8.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 )
+	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/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index b17b2b54a276..cad52a7156e2 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -14,7 +14,7 @@ DIST xfsprogs-4.5.0.tar.gz 1524382 BLAKE2B 7ff26e6c61081db37c4fb4a15abdeb3ece2c6
 DIST xfsprogs-4.9.0.tar.xz 1087940 BLAKE2B f896a1248e978b4d7c879c91e73f16fd5894cb95c22143e2f805ab2f54b75cafef63cd574fbf3ccbaebb59914b3759a1f8b3a49790c8c05df145d01416723c62 SHA512 990946f0a34381f57afb39bcda0ff539e18af4de2ecc19c833ffd4fb7c22c25b501091c1f0953db103a62204d952c9eecba21f22f3c5910286456da65fb09fa7
 EBUILD xfsprogs-4.12.0.ebuild 2733 BLAKE2B 91254ce021009746a40486f0e2d4697b4b5ee8440b25cb9b0f4ee7166acc9a6a110211268b7485cbfa77bcf8e9f214eb2dad26bb5bd51294ff2ae324109068d2 SHA512 b163f664b954fd6ace1e3ce1ad352deab0a10050c8b0b96dba8446cd4d9cbddb31c6c043ce7bffe86975606682e6e268f0efedda544c107284c92e7b4014d63d
 EBUILD xfsprogs-4.13.1.ebuild 2670 BLAKE2B 12442b0cc0c254617ab5870ff5b4079fdca4b9510a2c43e1bace5128766f983e1a4a3183ffafffc348739f04d2156afe58888718ed8ac7c646c5796857cba129 SHA512 ab45b35a6805c8b55437ae5606f99dcae5edae90c2957c15653095d5efe16a13350d99b9117e13e55df9ea95b94119adb6d24b35e6f12635f2a17189f402f35c
-EBUILD xfsprogs-4.14.0.ebuild 2670 BLAKE2B 12442b0cc0c254617ab5870ff5b4079fdca4b9510a2c43e1bace5128766f983e1a4a3183ffafffc348739f04d2156afe58888718ed8ac7c646c5796857cba129 SHA512 ab45b35a6805c8b55437ae5606f99dcae5edae90c2957c15653095d5efe16a13350d99b9117e13e55df9ea95b94119adb6d24b35e6f12635f2a17189f402f35c
+EBUILD xfsprogs-4.14.0.ebuild 2666 BLAKE2B c12465cdf122aaa34eda17dd083807822d5bfca92f9f8ced8050b91321da735f49ccdb6c8f4e2201cded486eb5910ffcb6cffe10dde8b1b181b4bd2bc8faecca SHA512 1dc68589942943c0138c966e9d01c9abd4586c8f96d945c31ed6af6c1e93441bc56857d9229d85d3c9abb407c9461e70e2af2406dbe5a7cda9c3824f5237e07d
 EBUILD xfsprogs-4.5.0.ebuild 2876 BLAKE2B dc897627ade02ec497d20fd761c102737b1fce4cbd62b252ca1a4fd06ae393b87d67c78584c4af8d4c5f3f958e84ee69e808bf46fa7ac29fbe08db0cd03b6af5 SHA512 2b40573bc0cb60c3b2d6e77c1b1b064856cee0e394b371622da66e12c11792b1b48e6ab8615679b18afef3f17a7264680c9787d1fbb243c012ea837c3463a946
 EBUILD xfsprogs-4.9.0.ebuild 2715 BLAKE2B 11f3355289c0801b61a914527182d3488d5d5eb9aef53ce1433db3f3ea7c379b960d1fe7ffea06694dc18bc68ee1b87905b34a3efaf79d41432a7a590818bc2a SHA512 ca6f97b41217d7d1e238d366811c77b2fbf5a43e99c79805999ba25f955e6a76290dedd95a93242777e44410ed07d0ebc1810f40771a43fdffbe90f283e90bf2
 MISC metadata.xml 257 BLAKE2B f8a00f23163e58c310fa0e4ab94b2e6b5638ec569a5e93ea2efec8c7bdd97c1629e9bc0e9bf04917f5ca4fea4085855b281c30ced2f09548e96b12e6bb1d5a40 SHA512 9c7759d33e1bbc8be0da5b4f59fc720266e40f4116d7db0c17c5ad800a7bb638f33a1308e1554092af781f06df6f6cb55db41fc22207cd3edc2e159840e3a3b1
diff --git a/sys-fs/xfsprogs/xfsprogs-4.14.0.ebuild b/sys-fs/xfsprogs/xfsprogs-4.14.0.ebuild
index a77ca48cb15d..07b9803cbf8d 100644
--- a/sys-fs/xfsprogs/xfsprogs-4.14.0.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-4.14.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
@@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="libedit nls readline static static-libs"
 REQUIRED_USE="static? ( static-libs )"
 
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 0dd01b757769..a68d16bdfb64 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/linux-headers/Manifest b/sys-kernel/linux-headers/Manifest
index bc1d3046fade..ca435046d081 100644
--- a/sys-kernel/linux-headers/Manifest
+++ b/sys-kernel/linux-headers/Manifest
@@ -35,7 +35,7 @@ EBUILD linux-headers-3.18.ebuild 1444 BLAKE2B 420273f8046f2f94c43503d6674241636a
 EBUILD linux-headers-4.10.ebuild 1531 BLAKE2B 6e27f38efab41f7df5298de3c81978309d254d529bcad0aa666bd1344e3cbf60ce0080f2b65ec18e6eb99ef993fad43f74e446584a1c2faf675f8e8d134d740d SHA512 045e009b6dac4d4799a4e70ef5dd66eb1ac5df830ac6e7c94c6a3e41a39daa20805c25f9bcff2667e3db1be7b3c7936d755d274c926cdd0a64a24ac554f82ed6
 EBUILD linux-headers-4.11.ebuild 1531 BLAKE2B 6e27f38efab41f7df5298de3c81978309d254d529bcad0aa666bd1344e3cbf60ce0080f2b65ec18e6eb99ef993fad43f74e446584a1c2faf675f8e8d134d740d SHA512 045e009b6dac4d4799a4e70ef5dd66eb1ac5df830ac6e7c94c6a3e41a39daa20805c25f9bcff2667e3db1be7b3c7936d755d274c926cdd0a64a24ac554f82ed6
 EBUILD linux-headers-4.12.ebuild 1531 BLAKE2B 6e27f38efab41f7df5298de3c81978309d254d529bcad0aa666bd1344e3cbf60ce0080f2b65ec18e6eb99ef993fad43f74e446584a1c2faf675f8e8d134d740d SHA512 045e009b6dac4d4799a4e70ef5dd66eb1ac5df830ac6e7c94c6a3e41a39daa20805c25f9bcff2667e3db1be7b3c7936d755d274c926cdd0a64a24ac554f82ed6
-EBUILD linux-headers-4.13.ebuild 1527 BLAKE2B f69fe24037c43c43998222d535af911c90466fecaef6ebd00fb2779c034b8c44efe494352ff007de785c90ba342c02ef8fcfc6702cab159317e7f538f9d796ea SHA512 7e8256a05de31567f30c4d82a05024857bda385bf26904e239d3c7de440559f4b5ed0f57e09f5b1db2e9044a02a40cf7443db8b1d015049327a2a1bc01a88a8e
+EBUILD linux-headers-4.13.ebuild 1526 BLAKE2B cc455789d081dc7c4849daf4a1a857dc8371ca9bfbc893e5e17100e40ab34820e782c5f9e5320c3934c2266047925ff9dc0eb783c80fa9cf1aef486cf566bbfe SHA512 12a27d5c893b4f1d708af049966e5b8acb75b74fb7164d079827fc9c2bd2883dad0013ac5685e3274ca20d999bc9962df1b394c5f6fd7cb9014093829f50f094
 EBUILD linux-headers-4.14.ebuild 1539 BLAKE2B 8900db7ba2982d602920c18fdbc34340d624eb18d1477a59426170f8c5d82d88aaca5b1132a6211fe52dd635fe18d06c294d1e93e901bb6fde702ce83a229520 SHA512 412b3b9d932373fa4e3643d7cb14b96972d3fada2991f1150816365a0989fe6d802975882329afd6039809bfa49863a4e3043e596a4f1ff32e18fc7d5ba5bd6f
 EBUILD linux-headers-4.3.ebuild 1518 BLAKE2B 52d619f4780c15425f36e56137a9c92946f2819ad8053e737ab444bd21b5ef8012980ae83084038dfdf511edc039f9ae9b4538f137865d2a7efb5a018d231efa SHA512 a66be101c58288eacb28d46397a6f22c01b87b59057c527fc4716bc71f7b2ec657548293de60665bc4bbb7da14ada8270964a0f6e46ca5b349c73c4e446b2fcb
 EBUILD linux-headers-4.4.ebuild 1518 BLAKE2B 7aa19afb813093a903a3de6ac6176470baa3fcac408bfaae4adfb49d676b74f022bcf08ad719184dde1b947e6bd32246af220e9b30649556ded38b58c0833a62 SHA512 f4476f0cd952626fecdf8d13b28f33ad44bc9839d0918306af9dff1a97a65eee730421c906df5ea1f77be143be5deefbd23c985b135b330c15dc3188383015e0
diff --git a/sys-kernel/linux-headers/linux-headers-4.13.ebuild b/sys-kernel/linux-headers/linux-headers-4.13.ebuild
index 3f45c46cb485..47a5d6165643 100644
--- a/sys-kernel/linux-headers/linux-headers-4.13.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-4.13.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"
@@ -12,7 +12,7 @@ PATCH_VER="1"
 SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz
 	${PATCH_VER:+mirror://gentoo/gentoo-headers-${PV}-${PATCH_VER}.tar.xz}"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
 
 DEPEND="app-arch/xz-utils
 	dev-lang/perl"
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index c47be61e1b62..93736519de5d 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 7b3522bc4107..717354e1ad16 100644
--- a/sys-libs/e2fsprogs-libs/Manifest
+++ b/sys-libs/e2fsprogs-libs/Manifest
@@ -2,7 +2,9 @@ AUX e2fsprogs-libs-1.42.13-fix-build-cflags.patch 300 BLAKE2B a6cfc44d27991cb98b
 DIST e2fsprogs-libs-1.43.3.tar.gz 599387 BLAKE2B decdb20114ad7b00754ecfe5658de6446cac8f2861a131cde71b6440934f5e66cbef7e5ef9945a15c6bccb3da0ca49d8f7bc04be59ee3565a03a16f850cdfbd1 SHA512 a1a5c01be1d020d858b958694747ba4f35032cd55bff71078cfddc31a818790ce4ead25fcf5e2aceca42c0faaf1635b6d8e3a2c7b87caac7f6fbbe5a44ceb411
 DIST e2fsprogs-libs-1.43.6.tar.gz 595409 BLAKE2B a5edf65b637b7f3fab16174a695baa232b8aeab6e8d28140a3a68ed63eee309949ca85a28f33d15199068fffe9174ef76b28f403ec09118296a458611592a36e SHA512 80a643ba349aac79c88548e9692066f777c5f9e82e309b348606a8078de456171535e6e5df91f73ca3db9d03bb539b1a19883cf74615357bdf77f3bd20cc0b11
 DIST e2fsprogs-libs-1.43.7.tar.gz 595431 BLAKE2B 12677792ff602586fa41f15c16a19b9d4135be8a4d8e4f26d40a8ee5b09254bec34f3ec6186b386fe0ef5690f26b2be54a46931eb5c76bf0693ce5877927fdc4 SHA512 b57c069d2e95588823fd69169378dd9d8a04ca77daa1a5dda8398cd198ace6184a3cb08507ae2b195de399caa4d197306043749f4a3010bccd942ba00d44162b
+DIST e2fsprogs-libs-1.43.8.tar.gz 596246 BLAKE2B 6847f177ccfdb06b49f58951b258647ec11b1237e3d33e44c2f7c6b93569445010914921d9447c842eba141c31a9982c72558dc6eb62fb2b24d1574a3204b1a8 SHA512 3127351310542326102dbbe84dade4043ff7f3046fb84e3364036a0975103a0aa146ba02400400e73affa658b93a69d0cb14855c2ab8f6da5b88d9ea0f17c9e8
 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.7.ebuild 1864 BLAKE2B 0c8a29e52c2523ad58698611cb6aa16ec9e25f044aa7a7914d17af353f09f9359270976200eb2bfc667e783b2288b17da4336711200339e5fe5c7c24fc9cb6e3 SHA512 50f0993a527c7f75747615272875ef4f2d74799242c389fa8258e6dfcd0f86d29706bf12b8dd29be1de39bfcf49627ee991dc15d217c182fb66b54ffd97c0d97
+EBUILD e2fsprogs-libs-1.43.8.ebuild 1878 BLAKE2B 8abd48e95d66949bf5451ae3820f2da81eee7a0fb662c7da1a46a013a87da3858ba245c8ae84ca9e1d443ec79dcfdc97bb61b55c943b816c7f9f927174a868b7 SHA512 96e1d98877c800cafc48065584c92711b64af5531cfb70a97fedfabc3cd5c5126ac8923582456eda24ca655dd119206929e6171c453e146ed8cf1c332ba252fa
 MISC metadata.xml 329 BLAKE2B 03dc6edded63d4d10b064515402e963a4770ffc36e17de351d5617849ea138796e4bf20c7feb383cc8ca3a88fba1caaf68b5411241a2558db832f9b659193644 SHA512 39e1ddf508b648594e45cd4e72a41997ab4ae7b5cfdefa136a18a1e68ac5a2bfb1f6a12328f1faee5501fbeff0c61cd91417de717c4869f530a18a05ea5d4c71
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.43.8.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.43.8.ebuild
new file mode 100644
index 000000000000..68c23f47263a
--- /dev/null
+++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.43.8.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/gdbm/Manifest b/sys-libs/gdbm/Manifest
index 945bd5a2804a..d4df681e5dea 100644
--- a/sys-libs/gdbm/Manifest
+++ b/sys-libs/gdbm/Manifest
@@ -1,10 +1,9 @@
 AUX gdbm-1.13-fix-a-typo-in-gdbm.h.patch 657 BLAKE2B af19808507b00d941a51756bbc2a48686aad60c0a19626d4b3f549b948254629857eb7ce9a692d790fdf42877de2d6072455b1825347cf9d557e45239088c989 SHA512 bb31f6043184f02f9b0735d8827d09de77367bac489296805a963c01963a70c60dea8efb4a4a00c254019bf438f0c54159b3097c276185367f0064fe119544a1
 DIST gdbm-1.11.tar.gz 811662 BLAKE2B 5936aaac753da4aa5e9a103cfb8a50d33d8ff124846c9224f09aead496b9e76c269b17aaca0b96d3c51b0444910f29e4f9f246f858e5ab849917662711732f4b SHA512 272fb65ab9ca0a21e9f0dcfb2c638457e87cbb938c65ee850123474d11f2858496f84d3fa9edca27cd91c7220160cfdb59f90bd46ddc45395514addc9fd4151c
-DIST gdbm-1.12.tar.gz 841213 BLAKE2B e91d595df6bef489edf005a3e6ea66f3bb64dbb8afc079d82a16796cae53759bb0ab6123929d2375dcc2ff6b1dec15522b9d6a82c22bffa1f7a21a9c01673644 SHA512 25e03dceed6986f1977d304a5ad059ac6c603a88ad4aa18c831ec42df82d68006f2e04b8a3cc400d0a4970750c78ba24a3f84cdff70de9f278cfd854c059699e
 DIST gdbm-1.13.tar.gz 891987 BLAKE2B f73cb89aeed140a584c5a8bce9c2324cc39a7647ee288364af66fbe1c1cd8662e53f7cb82a208e795a6d27adc048018153671d964ecad518407eb888283e17c5 SHA512 fdb777f5b415b0578ea46b4a6fc70151a04a3568e2f2c8c0219ccad8c0d34abb773d80d5d7a06462ad1a3d6c1f3b5b7ab25f9de4f43ccf05c58db05f9a2906ad
+DIST gdbm-1.14.tar.gz 893270 BLAKE2B 413b0e866579c697baa8b6ee2412690d3a25aecae1a1bed7b213560a452bf6a41343cabcc5e1c4c3269f796148e7c94782b479790227780e0bd1e8e965eecb87 SHA512 8378920c446f4d343f43af9982acc93be28faf0d6ac709abead03fdd8d47e9ef0226e86179d1e9cdc239c096a11f8d9ccd524747f6114ed9985e1120b8b60c2b
 DIST gdbm-1.8.3.tar.gz 228695 BLAKE2B 21b5833facb97fe937020d80b038c7b09e55eea6bdb9ec323d185a0980f235ff6a225d180d86d984469ce04a3f0266d20881f317f4339915bc6f61ab150ac2ac SHA512 2a01751ee8f730db563b4f52185c72f1c7a4f66530d6736f05f7446153be685ea0bb6ea1d2bad16ce31547fea879dc48507ff65ad35b0973df9aa385713b10d7
 EBUILD gdbm-1.11.ebuild 1887 BLAKE2B 1f6680d070bc540e8e476e0f8abcd46c09b98f4334465b544b4c9ee1e92da3855e792cbc78ddb7f54d1cc2e1c7bf0d619289252647a895b9bb6f7c7d017aa30d SHA512 fb5768d73a8a25cad8e6defeba0dd4ba788a2f339e697054da879b0aa600cfafa18ec5793a255bc5cc3066019c189bdcb43842710588590c2bab1c28c172d5d5
-EBUILD gdbm-1.12.ebuild 1898 BLAKE2B f7f4d3587b0db3a0aa8606a4c743c2f225d7f08371a343572097b1ad908433707084dff2c831f52842663d9822e38fc212f281ced6c3d1a4f339322e92ce579c SHA512 70b901cc796d76e15f914528b68d80348415918c32d7fa6fab2600680bfc21a09fdad51c083eabf8913de6554fca2824e74025f797c1002e9d10264c80d99348
 EBUILD gdbm-1.13-r1.ebuild 1835 BLAKE2B 29c065fd646456fd5a34c6a97fcb0970037944293abfd0490eb7780788bceafa6d8ac83aef406dfec4f4901e946d240fad96485f79c6ce278bdf45c42d7ceef5 SHA512 a9f3a564ebbc6e5b2b539138bc2f4ab018e3a9f773005d3a98a177daca764e1f442c8c6901b2e72439d3d3e11d96087fd698a4e6095d4dcc5a74978e0c07fdde
-EBUILD gdbm-1.13.ebuild 1908 BLAKE2B 51eaf9aa599691b493428c85d9d798ea2e534a2255990ee6ba9def27820920770f04c7e0a2cec0f85cc1cab4c505bb6ca069ed0cfd71032c109c1e1e2efea918 SHA512 35b0414c2eec85e9b5ff6b7b8e152c1f59e135161e1d1bb39ccee5339b8871ef50b291a0eb5bf3c8d83694d1a84d0759ffd709411586e5209fd4ef23fbe6ae16
+EBUILD gdbm-1.14.ebuild 1791 BLAKE2B 21cb2319c43ba0e0fbfde666aaf3d364a706cc85d86d0d2c5e1a725a9ce190aa91616be649e66faf47c1a54af94dc61f6e488aa9692f11280d2383eb9555e360 SHA512 41f9aaf1a9a77d6e512f01f3dbbce94997586137a11546e9c6d0e846c8091c8af0bb1bee11f56c7cb8351ddd561b23681b2ab4a54babea313025b76eeb74ae18
 MISC metadata.xml 471 BLAKE2B d73a0a1493a17d9990451e721b5bccddbdc3cfb59af544b1cdd927e31c65795888b13c7e42274a454d7dd8762ba92c5ab94dae5af7389a67688e6b06840ebad5 SHA512 05f989aa1f1d2ca29d4084741af8465c3daa0713881130aeb8ba8ac65f89a8874d668a0ea32184ec404e19777aa1df9e8d2526fe2ce9a22cae8c08c608501d41
diff --git a/sys-libs/gdbm/gdbm-1.12.ebuild b/sys-libs/gdbm/gdbm-1.12.ebuild
deleted file mode 100644
index 4748ea363615..000000000000
--- a/sys-libs/gdbm/gdbm-1.12.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit flag-o-matic libtool multilib multilib-minimal
-
-EX_P="${PN}-1.8.3"
-DESCRIPTION="Standard GNU database libraries"
-HOMEPAGE="https://www.gnu.org/software/gdbm/"
-SRC_URI="mirror://gnu/gdbm/${P}.tar.gz
-	exporter? ( mirror://gnu/gdbm/${EX_P}.tar.gz )"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+berkdb exporter nls static-libs"
-
-RDEPEND="
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20131008-r4
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
-
-EX_S="${WORKDIR}"/${EX_P}
-
-src_prepare() {
-	elibtoolize
-}
-
-multilib_src_configure() {
-	# gdbm doesn't appear to use either of these libraries
-	export ac_cv_lib_dbm_main=no ac_cv_lib_ndbm_main=no
-
-	if multilib_is_native_abi && use exporter ; then
-		pushd "${EX_S}" >/dev/null
-		append-lfs-flags
-		econf --disable-shared
-		popd >/dev/null
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf \
-		--includedir="${EPREFIX}"/usr/include/gdbm \
-		--with-gdbm183-libdir="${EX_S}/.libs" \
-		--with-gdbm183-includedir="${EX_S}" \
-		$(use_enable berkdb libgdbm-compat) \
-		$(multilib_native_use_enable exporter gdbm-export) \
-		$(use_enable nls) \
-		$(use_enable static-libs static)
-}
-
-multilib_src_compile() {
-	use exporter && emake -C "${EX_S}" libgdbm.la
-	emake
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	use static-libs || find "${ED}" -name '*.la' -delete
-	mv "${ED}"/usr/include/gdbm/gdbm.h "${ED}"/usr/include/ || die
-}
-
-pkg_preinst() {
-	preserve_old_lib libgdbm{,_compat}.so.{2,3} #32510
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify libgdbm{,_compat}.so.{2,3} #32510
-}
diff --git a/sys-libs/gdbm/gdbm-1.13.ebuild b/sys-libs/gdbm/gdbm-1.14.ebuild
index 1aafca746d33..c617c54ab178 100644
--- a/sys-libs/gdbm/gdbm-1.13.ebuild
+++ b/sys-libs/gdbm/gdbm-1.14.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=5
+EAPI=6
 
-inherit flag-o-matic libtool multilib multilib-minimal
+inherit autotools flag-o-matic multilib multilib-minimal
 
 EX_P="${PN}-1.8.3"
 DESCRIPTION="Standard GNU database libraries"
@@ -24,7 +24,8 @@ RDEPEND="${DEPEND}"
 EX_S="${WORKDIR}/${EX_P}"
 
 src_prepare() {
-	elibtoolize
+	default
+	eautoreconf
 }
 
 multilib_src_configure() {
@@ -59,14 +60,8 @@ multilib_src_compile() {
 multilib_src_install_all() {
 	einstalldocs
 
-	use static-libs || find "${ED}" -name '*.la' -delete
+	if ! use static-libs ; then
+		find "${ED}" -name '*.la' -delete || die
+	fi
 	mv "${ED%/}"/usr/include/gdbm/gdbm.h "${ED%/}"/usr/include/ || die
 }
-
-pkg_preinst() {
-	preserve_old_lib libgdbm{,_compat}.so.{2,3} #32510
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify libgdbm{,_compat}.so.{2,3} #32510
-}
diff --git a/sys-libs/libcap/Manifest b/sys-libs/libcap/Manifest
index acf2f81efe95..33a5d7fbfc49 100644
--- a/sys-libs/libcap/Manifest
+++ b/sys-libs/libcap/Manifest
@@ -8,6 +8,6 @@ AUX libcap-2.25-gperf.patch 620 BLAKE2B c870cd0d093df2e8f7498adc4d9b23f101089d80
 AUX libcap-2.25-ignore-RAISE_SETFCAP-install-failures.patch 988 BLAKE2B 63417032b843ff7cb704c9880cfca4db5083d05d479c71dd12925d729f22a4900c2ae277a20399d58830eaca969842d587a2ae0a646809d6b659a75d13678312 SHA512 ba573ce68858c1370f3d25ad03678a534e6f3052076694d09e795d1febf2f3d76a6a170658b71d9e31105521fd5d22dd72095585a5402286dba424937064b389
 DIST libcap-2.24.tar.xz 63412 BLAKE2B 9edab6e606f64dcb06eb75160775340ff5ab92a7f5d98957c682d6510aa510a21f6c796af64dfef0090d9c035b94903d86b360635977e55549e51e25b8fa167e SHA512 c062bab936d651a50efa66dcfa51ab3ce4b0881195d23bb32142b5c8044d30e0e2152f3497844ce90c04f909aeffe2d41203efff41972e38758dcca7b653884b
 DIST libcap-2.25.tar.xz 63672 BLAKE2B 205790dea83f15b585e5151814ea520ab1545661d18fa57f36e8c8e597a7c0f0ff1d7b5ccffc36e313eb28606f1e71678233a06896e29cb28e5559b190dd47ed SHA512 c3ab491885292adc171cde542b96f1295e84132febb50112a46575c3bde3a3eb6fcf733f7a756b4b656e013c0abb5ed6571db24799f8c0b23d8f759f992864f9
-EBUILD libcap-2.24-r2.ebuild 1849 BLAKE2B 1aa06743d5883db4958ed3c24acd20b42fa1fe9b2fbf629121b7dc1fe58b5e69130dbbacfcfc39cb40ed4e5059dfeddadfbfc83d8e5e2540df4ab8731e7fe925 SHA512 bcc666cb5493e71c9060144a87289cdbb8cdf7a9ee98de6d44619a54881a0b4585e50c8edd24596a419a9e79c67e8ecd0eb215fcb68bd2b7305e704d346dd1e1
-EBUILD libcap-2.25.ebuild 1993 BLAKE2B 3a9f36dd3b74e95263add1659a4e597451840d16ea5cfc4bc07e8c190dfb77739bd34fc9c5681a4d395baec580acad8295b51f1fe684f73eb9840451faf81466 SHA512 f06c3222c4138950a7acbf1ff51dec492e383a8f6155a6e00477df63fb56f71138e49754bdb4fc4c7644d4acfc379d26504de926b8419cda8b8ac14c1efafb9d
+EBUILD libcap-2.24-r2.ebuild 1865 BLAKE2B aa257346d0da204ae26fd2f702681e9d207dbd36d72648f049c25c6611262c82ecc0f4580406a361bd20cfa391b49bb8f487f1481c0795018b6d30ed08aa6f6a SHA512 2d0fceabd4131ca6cafd7b2f2d8f27be7cd2a4bc4a0dd7614d0f7212cb3959e4e80705c6431d106542901384be51f4ad57f5c3a14ef06c1ded163b16835cbbc1
+EBUILD libcap-2.25.ebuild 2009 BLAKE2B 9b73d115bff54fe3b03ca1fe995a5aa4f5c9d43d2bddc0546fd61a0cc657a251562ba9d96cf7115d04f89d47d516bf7dea6fe32b049f1fba774c3fba3843eb54 SHA512 f59b50c716e78138bfeff288e82b062f442fdb54ba252846f4f9d6933de5ca138e69e230e6af1dc40ef25a0d31b079e1701fb88d7bd6f8cb11969b8177b4e117
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-libs/libcap/libcap-2.24-r2.ebuild b/sys-libs/libcap/libcap-2.24-r2.ebuild
index 5575faa355ce..56d79e96f0e5 100644
--- a/sys-libs/libcap/libcap-2.24-r2.ebuild
+++ b/sys-libs/libcap/libcap-2.24-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="4"
@@ -47,8 +47,9 @@ multilib_src_configure() {
 }
 
 multilib_src_compile() {
-	tc-export_build_env BUILD_CC
 	tc-export AR CC RANLIB
+	local BUILD_CC
+	tc-export_build_env BUILD_CC
 
 	default
 }
diff --git a/sys-libs/libcap/libcap-2.25.ebuild b/sys-libs/libcap/libcap-2.25.ebuild
index feb60b9a4b62..81fb56032a2e 100644
--- a/sys-libs/libcap/libcap-2.25.ebuild
+++ b/sys-libs/libcap/libcap-2.25.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
@@ -52,8 +52,9 @@ multilib_src_configure() {
 }
 
 multilib_src_compile() {
-	tc-export_build_env BUILD_CC
 	tc-export AR CC RANLIB
+	local BUILD_CC
+	tc-export_build_env BUILD_CC
 
 	default
 }
diff --git a/sys-libs/libstdc++-v3/Manifest b/sys-libs/libstdc++-v3/Manifest
index 2e234294182c..5e7b58b43bc0 100644
--- a/sys-libs/libstdc++-v3/Manifest
+++ b/sys-libs/libstdc++-v3/Manifest
@@ -1,4 +1,5 @@
+AUX libstdc++-v3-3.3.6-glibc226.patch 1349 BLAKE2B e16351bae2539fac5d71b1cec43e0869f079c34e1bc59a170b7ff699e6c9aff95dbde09b07c17f3ec4a66f02548a3c78e4679eab38244aa5a2ddde12856fb1fc SHA512 05e2195c385b8cfbeb7b4978a70c3dbcee02210ff7b1785ad736f6c2cbbb8bf3abefec93417c427c2719b2bf6ebe565f432f45e5e17a4c51672785ed5b650a22
 DIST gcc-3.3.6-patches-1.9.tar.bz2 51760 BLAKE2B 68704c1ddb73d2966746dd1a57b9699c3130d9165dd990b0b70f13b0dc4c7c4503afcbb268fd54242e17bdd571d5d0a20c172ee431c3c772e7c3412d3f0ac884 SHA512 306220c537c5cd90af7638431e6547ee9a80199c384629b5fbda06c28b2d6168fcf1dd448c0e178b104f41e03a8ebda4f389489d205b9e66ade6637e4747196c
 DIST gcc-3.3.6.tar.bz2 23972413 BLAKE2B e7b33edcdbbb13b0be41a41156bf6fb6dcfe4f5ad75c41de86cb37f854be6b7a6a8dda0e65d331461469848cd912e25920e8aa2dcb142cb661731ba571cb5de1 SHA512 576b88e2fa675314a79a85f180684fe5af370c596476a0bf02e33e8ae0e2be838417ea80675ce4194a8213792cf7ada50cae5131149e4b890ab61e0b8d50d0ed
-EBUILD libstdc++-v3-3.3.6-r1.ebuild 4824 BLAKE2B 699ae3ac4a865dc8a52ae904418140958faa9345d6b595d0005a7dc3930b5fc492cb867949c057c659cc63685ec138a9152fa304169aca998dd5b430329b3f1b SHA512 54c0a0965ecedd0ea53921e2449076c00d040ff6e4d50989bf87c310597983be5d558ba533433964bc074080e6235aa84a21bc15554685b8c5581939d00c1c09
+EBUILD libstdc++-v3-3.3.6-r1.ebuild 4921 BLAKE2B 80cf6f16d9a1128d47a5ea7a7959eed300a7e8d64adb23c81a17c033d7738ed8938fc65531929dd34e592481ef9cf6e1bd4e8211f9d521a88405299b5ba65af1 SHA512 61a11c5f4a0159d61f4aa927e0f802be01bc2b2ab401c1d99ca8b47ca7540ac3442d6817a4fa9d2a76e40857fb625448d50e3297130864f673beac7a83a0cda8
 MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
diff --git a/sys-libs/libstdc++-v3/files/libstdc++-v3-3.3.6-glibc226.patch b/sys-libs/libstdc++-v3/files/libstdc++-v3-3.3.6-glibc226.patch
new file mode 100644
index 000000000000..a444da2d2bfc
--- /dev/null
+++ b/sys-libs/libstdc++-v3/files/libstdc++-v3-3.3.6-glibc226.patch
@@ -0,0 +1,33 @@
+diff -ruN gcc-3.3.6.orig/gcc/config/i386/linux.h gcc-3.3.6/gcc/config/i386/linux.h
+--- gcc-3.3.6.orig/gcc/config/i386/linux.h	2018-01-01 20:14:36.311860098 +0100
++++ gcc-3.3.6/gcc/config/i386/linux.h	2018-01-01 20:16:05.912287579 +0100
+@@ -261,7 +261,7 @@
+ 	  siginfo_t *pinfo;						\
+ 	  void *puc;							\
+ 	  siginfo_t info;						\
+-	  struct ucontext uc;						\
++	  struct ucontext_t uc;						\
+ 	} *rt_ = (CONTEXT)->cfa;					\
+ 	sc_ = (struct sigcontext *) &rt_->uc.uc_mcontext;		\
+       }									\
+diff -ruN gcc-3.3.6.orig/gcc/config/i386/linux64.h gcc-3.3.6/gcc/config/i386/linux64.h
+--- gcc-3.3.6.orig/gcc/config/i386/linux64.h	2018-01-01 20:14:36.271859907 +0100
++++ gcc-3.3.6/gcc/config/i386/linux64.h	2018-01-01 20:16:05.912287579 +0100
+@@ -112,7 +112,7 @@
+     if (*(unsigned char *)(pc_+0) == 0x48				\
+ 	&& *(unsigned long *)(pc_+1) == 0x050f0000000fc0c7)		\
+       {									\
+-	struct ucontext *uc_ = (CONTEXT)->cfa;				\
++	struct ucontext_t *uc_ = (CONTEXT)->cfa;				\
+ 	sc_ = (struct sigcontext *) &uc_->uc_mcontext;			\
+       }									\
+     else								\
+@@ -182,7 +182,7 @@
+ 	  siginfo_t *pinfo;						\
+ 	  void *puc;							\
+ 	  siginfo_t info;						\
+-	  struct ucontext uc;						\
++	  struct ucontext_t uc;						\
+ 	} *rt_ = (CONTEXT)->cfa;					\
+ 	sc_ = (struct sigcontext *) &rt_->uc.uc_mcontext;		\
+       }									\
diff --git a/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6-r1.ebuild b/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6-r1.ebuild
index 53ec501f081d..c90cf870b492 100644
--- a/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6-r1.ebuild
+++ b/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6-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
 
 inherit eutils flag-o-matic libtool multilib
@@ -130,6 +130,10 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
+
+	# bug 637608
+	has_version '>=sys-libs/glibc-2.26' && epatch "${FILESDIR}/${P}-glibc226.patch"
+
 	elibtoolize --portage --shallow
 	./contrib/gcc_update --touch
 	mkdir -p "${WORKDIR}"/build
diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
index a973754312e8..66ad25471242 100644
--- a/sys-libs/ncurses/Manifest
+++ b/sys-libs/ncurses/Manifest
@@ -14,4 +14,5 @@ DIST ncurses-5.9.tar.gz 2826473 BLAKE2B 91101b049a5eb6a2674fb86b5eba56515207f490
 DIST ncurses-6.0.tar.gz 3131891 BLAKE2B 68670ebdaba28c7a750631da01a0e3681b476cc9e9ae6fd9eae5a254f41fab5f1a5df5fa9897a92d1da751f1cc0b72f2ffee4603865900e67fcbb949c102cf78 SHA512 9ec194f4783dae6de8c529cac31b5cfbfcfea212c5d47b1f87cd49df013e38f8580a9e7aa1384918df0921b4ba999d5e73eb6d6362cce2d7287e64308b673963
 EBUILD ncurses-5.9-r101.ebuild 5295 BLAKE2B dccde970635c874070f52a3fe1cd49f6f2c21a3360299596d49db2d57ec9be4c9319fe1d38af49949d8528ced9559ffa8d01d339a5f44b3181cf6405f68a0a5b SHA512 e7505e1b91925abed6feb120da09ec578276c467fef6b3e99fa8ebf74e4abecc130507406919ea1c49e7f9e4738e9c0b4dc20f9964b603de50dba2abe637f1ad
 EBUILD ncurses-6.0-r1.ebuild 8645 BLAKE2B c74fd055fbcdd72c4f3a8d719ef568d015f4edb57ce9167497307689d069148ad4a8789014ae81d7b277c324cbe1189dc0f2205c50b915899b542ef63be875ec SHA512 6eba919e6333c4833455784a377257a6d8dd7d134daf9a536113327487c8f2a191da942f9bea76fb963b0c04a64cd6ac7065b2c32e30fd1e61df302d6d424fdc
+EBUILD ncurses-6.0-r2.ebuild 8668 BLAKE2B a6a1229148f506938aacf52ab00b9e81f54e15114c6416b9a1e5ebf55a9eb5987940e4bf1ec1bfbeb054483628f2a159cbe1bc8d26ad27d887230278b7df4779 SHA512 e9f515ff4be96474f1a13da4c6b1eb5ce2afb14dab5b6244fa556f539e465a0813f8d9ec6cbc62d81b6892b851a5cbc3d40725cd647ec99949edd0579882870e
 MISC metadata.xml 619 BLAKE2B a5b29f22ce491bf7a308673944651ea9d916a6d487a45a2a7ee4a7e8d33f7b3bd398e3edeb830f0b443cb4524c0b73af4d6e1511e8128289a76666acd931d611 SHA512 3f28fd8aee675226f641d72d7437edf4c5840cdac3dca64b6a4c61902d4f4127d86f65acfefb270cba2fcfb0ba9d6ff9d3ca24930825b89c82f0eedc8160f9ef
diff --git a/sys-libs/ncurses/ncurses-6.0-r2.ebuild b/sys-libs/ncurses/ncurses-6.0-r2.ebuild
new file mode 100644
index 000000000000..9051223ca378
--- /dev/null
+++ b/sys-libs/ncurses/ncurses-6.0-r2.ebuild
@@ -0,0 +1,287 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils flag-o-matic toolchain-funcs multilib-minimal
+
+MY_PV=${PV:0:3}
+PV_SNAP=${PV:4}
+MY_P=${PN}-${MY_PV}
+DESCRIPTION="console display library"
+HOMEPAGE="https://www.gnu.org/software/ncurses/ http://dickey.his.com/ncurses/"
+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 ~sparc-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}] )"
+#	berkdb? ( sys-libs/db )"
+# Block the older ncurses that installed all files w/SLOT=5. #557472
+RDEPEND="${DEPEND}
+	!<=sys-libs/ncurses-5.9-r4:5
+	!<x11-terms/rxvt-unicode-9.06-r3
+	!<x11-terms/st-0.6-r1
+	!app-emulation/emul-linux-x86-baselibs"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}/${PN}-6.0-gfbsd.patch"
+	"${FILESDIR}/${PN}-5.7-nongnu.patch"
+	"${FILESDIR}/${PN}-6.0-rxvt-unicode-9.15.patch" #192083 #383871
+	"${FILESDIR}/${PN}-6.0-pkg-config.patch"
+	"${FILESDIR}/${PN}-5.9-gcc-5.patch" #545114
+	"${FILESDIR}/${PN}-6.0-ticlib.patch" #557360
+	"${FILESDIR}/${PN}-6.0-cppflags-cross.patch" #601426
+)
+
+src_prepare() {
+	[[ -n ${PV_SNAP} ]] && epatch "${WORKDIR}"/${MY_P}-${PV_SNAP}-patch.sh
+	epatch "${PATCHES[@]}"
+}
+
+src_configure() {
+	unset TERMINFO #115036
+	tc-export_build_env BUILD_{CC,CPP}
+	BUILD_CPPFLAGS+=" -D_GNU_SOURCE" #214642
+
+	# Build the various variants of ncurses -- narrow, wide, and threaded. #510440
+	# Order matters here -- we want unicode/thread versions to come last so that the
+	# binaries in /usr/bin support both wide and narrow.
+	# The naming is also important as we use these directly with filenames and when
+	# checking configure flags.
+	NCURSES_TARGETS=(
+		ncurses
+		$(usex unicode 'ncursesw' '')
+		$(usex threads 'ncursest' '')
+		$(use unicode && usex threads 'ncursestw' '')
+	)
+
+	# When installing ncurses, we have to use a compatible version of tic.
+	# This comes up when cross-compiling, doing multilib builds, upgrading,
+	# or installing for the first time.  Build a local copy of tic whenever
+	# the host version isn't available. #249363 #557598
+	if ! ROOT=/ has_version "~sys-libs/${P}:0" ; then
+		local lbuildflags="-static"
+
+		# some toolchains don't quite support static linking
+		local dbuildflags="-Wl,-rpath,${WORKDIR}/lib"
+		case ${CHOST} in
+			*-darwin*)  dbuildflags=     ;;
+			*-aix*)     dbuildflags=     ;;
+		esac
+		echo "int main() {}" | \
+			$(tc-getCC) -o x -x c - ${lbuildflags} -pipe >& /dev/null \
+			|| lbuildflags="${dbuildflags}"
+
+		# We can't re-use the multilib BUILD_DIR because we run outside of it.
+		BUILD_DIR="${WORKDIR}" \
+		CHOST=${CBUILD} \
+		CFLAGS=${BUILD_CFLAGS} \
+		CXXFLAGS=${BUILD_CXXFLAGS} \
+		CPPFLAGS=${BUILD_CPPFLAGS} \
+		LDFLAGS="${BUILD_LDFLAGS} ${lbuildflags}" \
+		do_configure cross --without-shared --with-normal
+	fi
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local t
+	for t in "${NCURSES_TARGETS[@]}" ; do
+		do_configure "${t}"
+	done
+}
+
+do_configure() {
+	local target=$1
+	shift
+
+	mkdir "${BUILD_DIR}/${target}"
+	cd "${BUILD_DIR}/${target}" || die
+
+	local conf=(
+		# We need the basic terminfo files in /etc, bug #37026.  We will
+		# add '--with-terminfo-dirs' and then populate /etc/terminfo in
+		# src_install() ...
+		--with-terminfo-dirs="${EPREFIX}/etc/terminfo:${EPREFIX}/usr/share/terminfo"
+
+		# Disabled until #245417 is sorted out.
+		#$(use_with berkdb hashed-db)
+
+		# ncurses is dumb and doesn't install .pc files unless pkg-config
+		# is also installed.  Force the tests to go our way.  Note that it
+		# doesn't actually use pkg-config ... it just looks for set vars.
+		--enable-pc-files
+		--with-pkg-config="$(tc-getPKG_CONFIG)"
+		# This path is used to control where the .pc files are installed.
+		--with-pkg-config-libdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig"
+
+		# Now the rest of the various standard flags.
+		--with-shared
+		--without-hashed-db
+		$(use_with ada)
+		$(use_with cxx)
+		$(use_with cxx cxx-binding)
+		--with-cxx-shared
+		$(use_with debug)
+		$(use_with profile)
+		# The configure script uses ldd to parse the linked output which
+		# is flaky for cross-compiling/multilib/ldd versions/etc...
+		$(use_with gpm gpm libgpm.so.1)
+		--disable-termcap
+		--enable-symlinks
+		--with-rcs-ids
+		--with-manpage-format=normal
+		--enable-const
+		--enable-colorfgbg
+		--enable-hard-tabs
+		--enable-echo
+		$(use_enable !ada warnings)
+		$(use_with debug assertions)
+		$(use_enable !debug leaks)
+		$(use_with debug expanded)
+		$(use_with !debug macros)
+		$(multilib_native_with progs)
+		$(use_with test tests)
+		$(use_with trace)
+		$(use_with tinfo termlib)
+	)
+
+	if [[ ${target} == ncurses*w ]] ; then
+		conf+=( --enable-widec )
+	else
+		conf+=( --disable-widec )
+	fi
+	if [[ ${target} == ncursest* ]] ; then
+		conf+=( --with-{pthread,reentrant} )
+	else
+		conf+=( --without-{pthread,reentrant} )
+	fi
+	# Make sure each variant goes in a unique location.
+	if [[ ${target} == "ncurses" ]] ; then
+		# "ncurses" variant goes into "${EPREFIX}"/usr/include
+		# It is needed on Prefix because the configure script appends
+		# "ncurses" to "${prefix}/include" if "${prefix}" is not /usr.
+		conf+=( --enable-overwrite )
+	else
+		conf+=( --includedir="${EPREFIX}"/usr/include/${target} )
+	fi
+	# See comments in src_configure.
+	if [[ ${target} != "cross" ]] ; then
+		local cross_path="${WORKDIR}/cross"
+		[[ -d ${cross_path} ]] && export TIC_PATH="${cross_path}/progs/tic"
+	fi
+
+	# Force bash until upstream rebuilds the configure script with a newer
+	# version of autotools. #545532
+	CONFIG_SHELL=${EPREFIX}/bin/bash \
+	ECONF_SOURCE=${S} \
+	econf "${conf[@]}" "$@"
+}
+
+src_compile() {
+	# See comments in src_configure.
+	if ! ROOT=/ has_version "~sys-libs/${P}:0" ; then
+		BUILD_DIR="${WORKDIR}" \
+		do_compile cross -C progs tic
+	fi
+
+	multilib-minimal_src_compile
+}
+
+multilib_src_compile() {
+	local t
+	for t in "${NCURSES_TARGETS[@]}" ; do
+		do_compile "${t}"
+	done
+}
+
+do_compile() {
+	local target=$1
+	shift
+
+	cd "${BUILD_DIR}/${target}" || die
+
+	# A little hack to fix parallel builds ... they break when
+	# generating sources so if we generate the sources first (in
+	# non-parallel), we can then build the rest of the package
+	# in parallel.  This is not really a perf hit since the source
+	# generation is quite small.
+	emake -j1 sources
+	# For some reason, sources depends on pc-files which depends on
+	# compiled libraries which depends on sources which ...
+	# Manually delete the pc-files file so the install step will
+	# create the .pc files we want.
+	rm -f misc/pc-files
+	emake "$@"
+}
+
+multilib_src_install() {
+	local target
+	for target in "${NCURSES_TARGETS[@]}" ; do
+		emake -C "${BUILD_DIR}/${target}" DESTDIR="${D}" install
+	done
+
+	# Move main libraries into /.
+	if multilib_is_native_abi ; then
+		gen_usr_ldscript -a \
+			"${NCURSES_TARGETS[@]}" \
+			$(use tinfo && usex unicode 'tinfow' '') \
+			$(usev tinfo)
+	fi
+	if ! tc-is-static-only ; then
+		# Provide a link for -lcurses.
+		ln -sf libncurses$(get_libname) "${ED}"/usr/$(get_libdir)/libcurses$(get_libname) || die
+	fi
+	use static-libs || find "${ED}"/usr/ -name '*.a' -delete
+
+	# Build fails to create this ...
+	dosym ../share/terminfo /usr/$(get_libdir)/terminfo
+}
+
+multilib_src_install_all() {
+#	if ! use berkdb ; then
+		# We need the basic terminfo files in /etc, bug #37026
+		einfo "Installing basic terminfo files in /etc..."
+		local x
+		for x in ansi console dumb linux rxvt rxvt-unicode screen{,-256color} vt{52,100,102,200,220} \
+				 xterm xterm-{,256}color
+		do
+			local termfile=$(find "${ED}"/usr/share/terminfo/ -name "${x}" 2>/dev/null)
+			local basedir=$(basename $(dirname "${termfile}"))
+
+			if [[ -n ${termfile} ]] ; then
+				dodir /etc/terminfo/${basedir}
+				mv ${termfile} "${ED}"/etc/terminfo/${basedir}/
+				dosym ../../../../etc/terminfo/${basedir}/${x} \
+					/usr/share/terminfo/${basedir}/${x}
+			fi
+		done
+#	fi
+
+	echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" > "${T}"/50ncurses
+	doenvd "${T}"/50ncurses
+
+	use minimal && rm -r "${ED}"/usr/share/terminfo*
+	# Because ncurses5-config --terminfo returns the directory we keep it
+	keepdir /usr/share/terminfo #245374
+
+	cd "${S}"
+	dodoc ANNOUNCE MANIFEST NEWS README* TO-DO doc/*.doc
+	use doc && dohtml -r doc/html/
+}
+
+pkg_preinst() {
+	preserve_old_lib /$(get_libdir)/libncurses.so.5
+	use unicode && preserve_old_lib /$(get_libdir)/libncursesw.so.5
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /$(get_libdir)/libncurses.so.5
+	use unicode && preserve_old_lib_notify /$(get_libdir)/libncursesw.so.5
+}
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 8ad1e4a980d1..52196e57762d 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 2cfbf03b6b63..ab4d2ede4185 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -19,7 +19,7 @@ DIST chromium-65.0.3294.5.tar.xz 484687920 BLAKE2B 2d4d30ea83bfa0d5753eecd4ea735
 DIST chromium-65.0.3298.3.tar.xz 485716108 BLAKE2B 185b3f683b2a732343fa5f98b24171f1d3cf2cf8eeb63c56efa7699f6b038d2a7eea4f9277b0b7ee2fdfa207a4f13edbaf2cc9a591a79ec4d058a131ce44366b SHA512 f1ed9a403036e87da7897f173eeb1aa71fe2650efc5ef5b98f814c7d4d9c879971597f9ded11324c86d6edc7f12f3bcf2786a6fb022e9697dbdb8eae086e18b7
 EBUILD chromium-63.0.3239.108.ebuild 19805 BLAKE2B c11e610a7f7f498e351d0250a2c68459fda3cdbd1c18abadfd61ef4fe88998125807de58b2e39b6f364dc8b165b1195d11e32b5eea8df14e1d28a08915e84a99 SHA512 d0c44d2057568e092f6f955946df78ef8579114b200b233b2b45d878cb97439bcba1dca78bf3ff40386b5bb4a9c7670de5bbcca34572094abc7dcfeb3f5324fb
 EBUILD chromium-64.0.3282.24.ebuild 20052 BLAKE2B 6c8983cbba2db73f4cf0d445f39f12dd9e9b880990f701ac695421e9bad1296431747af2b1d3d1f90cd2d21eaf96b910cd274b47bf571af03e0abdb71a1b30b3 SHA512 fbe825d7ceee78a90943c539cfcdcacd33808a7be82180b2397d2ef5c09732e1d40acf1d534ba76fabdad2175bed04e47d23a381b140fc4fa922530a91c93529
-EBUILD chromium-64.0.3282.39.ebuild 20103 BLAKE2B 30c7112270da507add602cb6251d22c29fb9ad280098b35a638ae749e90a2381598225a37e904e27126cea8aa843b831ba4b28a8c6c445c9b3d5ab43e14c63b2 SHA512 32a05d704a2e4dd44c53c03c792ea06a010884f5aa3f88ce4dc285ccc6c185d7fab32bc3ecee688657975ed46c176e8c665d7da59231b7d84c41bb533cd8aceb
+EBUILD chromium-64.0.3282.39.ebuild 20150 BLAKE2B 52ac5f763b1d62a3fa0b22401aadd7a9988945dc2ca1b1631f56f5f82df00a66a563aa0ac2b9e7a5f186dbb7bdbb1f945749e1c8bdc74d22dd51fe1e5c112c75 SHA512 fc1fc03574c94fb0b2e2b4e4e13907fa8724f01b1cb1f11869610e417663b6867ff994ecd95e508dff8f4e95c8127f36431368aa1b28b695e175ef1c92e2257f
 EBUILD chromium-65.0.3294.5.ebuild 20338 BLAKE2B a992c3d16e340f53ed575941b7ec48c8a254286be84f468f93e45eab707f95e13dde6c70c67296239e83defd5a7552cea527057e9733020ed575dd5aba8d7276 SHA512 f5b8fa9c52c98d601c4d0848c51789c6cfb3e18f6e0de541add26ef50a78c32fab1e6adcb483db9ad0af35734e77607f010ece461f4f88cce18e4633fae3620b
-EBUILD chromium-65.0.3298.3.ebuild 20238 BLAKE2B c807a79659a854e2255256fbe4c90a8ae8c27898aa224d29143fd55118f07f15d0790118ac9ec497232db22d694b0b786c67d8e814220059b8b6d60950134c9c SHA512 8a0b947a13ae4a917e8d4366dcd8ce7bdda9e37775dc9148fadd09e219448c6cc74746ca4a1f3494678caf495b60a7630ac9bf0b9a1da5435664214379dbcc65
+EBUILD chromium-65.0.3298.3.ebuild 20285 BLAKE2B 3473461e5dc5cc20aaa013961f1c0f3f7bb6ff688d5d297f5e2e4529a38669586fca9448069696176ace87c49f4ea1c7dcd7a462f22915caeba21c83bea6dcff SHA512 c7a507a8671ead8b27bf61d90ef7f45b84e6048f6c8cefb19ea99defd9e6760072085c9bbe399603f81c5b1253bcfff322345d13dfb584e9f2e960c43885ac56
 MISC metadata.xml 1336 BLAKE2B 77878a208aff8c9744fca1874e9f692dc6dd55484303274012288c01def548cb96e0d428125613c84f49966adae9702c430ff1ca61c7df5654d1fda4ac9aa22d SHA512 028de2d2f3068ec95dc586b1d5b40cc4f69feba6ca685038427c606005ffc1ede58d056b0502822be83e28217182adc5305e81a7de8fd49f3162250a476cc1a0
diff --git a/www-client/chromium/chromium-64.0.3282.39.ebuild b/www-client/chromium/chromium-64.0.3282.39.ebuild
index a80dbf6b6262..176c6981bdd0 100644
--- a/www-client/chromium/chromium-64.0.3282.39.ebuild
+++ b/www-client/chromium/chromium-64.0.3282.39.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"
@@ -21,8 +21,10 @@ IUSE="component-build cups gnome-keyring +hangouts kerberos neon pic +proprietar
 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:= )
diff --git a/www-client/chromium/chromium-65.0.3298.3.ebuild b/www-client/chromium/chromium-65.0.3298.3.ebuild
index f125feec488e..331308682ad9 100644
--- a/www-client/chromium/chromium-65.0.3298.3.ebuild
+++ b/www-client/chromium/chromium-65.0.3298.3.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"
@@ -21,8 +21,10 @@ IUSE="component-build cups gnome-keyring +hangouts kerberos neon pic +proprietar
 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:= )
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index e036b1121e0d..cf8ecb49dc4c 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1,3 +1,3 @@
 DIST google-chrome-beta_64.0.3282.39-1_amd64.deb 52673146 BLAKE2B c7495a93235bce2994940b3ae1288631504b82d60830bed11b35e79ac446a41edaa2bc0a0ebbb832c34cbbe73802f941c934be526bbd76d09f4fb90935a42d5c SHA512 222c1879854c002506e05b28b866b4d2d9ed99fd4d9c9a497bead03a6bf4758966b075c9aad409446dbf9754150c796be1c0c3c03bc552ff97163b5723a18182
-EBUILD google-chrome-beta-64.0.3282.39.ebuild 3559 BLAKE2B 5a1eb688323640ce81aaebd74215844ffe06ad88c85046aa633f1d412350d97f0c98004b82218c3314a087ddfe571938ccbb417f03d83e0824f0708a7961ab1e SHA512 51df0ed3d1dfab83ec82cf03238ca9d1edda85f647b77c8232b46716ebdb5156c28a0c7d2706efe5b9cca4ab825437ddd9be865ddd99726ef47094d54eda4adf
+EBUILD google-chrome-beta-64.0.3282.39.ebuild 3586 BLAKE2B ec0dad94cc55adb4b3d1519d79d3c9ce476be51f494b3674f255ee0d343f820d7f2287f92267d71cb7176f3212f48db110493f86b16583c75a8d535aba896b0a SHA512 8059f3f86bfdf3db7e5800f5c072770de1e59d4f3ca3b03c85a6219992e1b3f2f7c194cfb653596b9573aa1a568a83316af1aa8a04440d7443a1fa30064b0f2b
 MISC metadata.xml 517 BLAKE2B dfd840aa3f7845f67c8d6cca488d89845ca7c259eb4df00f8458ae48b1962df91ca8299ef34785f635dcab25b445246e999fbbfef3bdd7117a4ee1b14beca420 SHA512 837becd9e41aca24694cd10a7bddbc5ca501aca983832daccb4c091a7712267ef20051e7a19af02bc3b48eed89c9e18aa0d46ca2411e1d58d045ceb732a180af
diff --git a/www-client/google-chrome-beta/google-chrome-beta-64.0.3282.39.ebuild b/www-client/google-chrome-beta/google-chrome-beta-64.0.3282.39.ebuild
index ab556f06a5d3..fed294475cd9 100644
--- a/www-client/google-chrome-beta/google-chrome-beta-64.0.3282.39.ebuild
+++ b/www-client/google-chrome-beta/google-chrome-beta-64.0.3282.39.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"
@@ -30,13 +30,14 @@ RESTRICT="bindist mirror strip"
 
 DEPEND=""
 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
-	gnome-base/gconf:2
 	media-libs/alsa-lib
 	media-libs/fontconfig
 	media-libs/freetype:2
diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index 956f6a9d9564..32567af67b6f 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -1,80 +1,9 @@
-AUX 0001-CFLAGS-must-contain-fPIC-when-checking-the-linker.patch 1195 BLAKE2B db1bc3b21c8e0829a500233900010536e6c1cdea684087bfa6e03b740029ffeaa2cf0acbe85bdc9cf614110bc3a631f34fe57586bc61650935d78bc994316e34 SHA512 8e922d39caf41fb2336f16812e016bbe3c4b94c964a2194aded313f9007cec15370da072dae8239d0b3b10092fc7d7f2ff4297babe0546c432489579477e550b
 AUX all-gentoo-1.js 957 BLAKE2B efd898ece0eee2fbc7621bb326b89f26c7b5f15ff0376371e4843ff6afc4a0e9b6417d0b0597a84212a77867bc91dc5b61c442a10211a05a7d128349e3b22392 SHA512 8280531443787d26ef482b1f4ddf33278884a35554ceec09877868f96350dce521119d300bdafa80bc529e99ce0cc597d06c2bc6b43d978a8035dedb7734c821
-AUX firefox-Include-sys-sysmacros.h-for-major-minor-when-availab.patch 1827 BLAKE2B 0d9134474e135f6d611f2b601c73dd3efdcef31024c796f5d96b226fa68ce1e0939380e1ccb8da948e330f41860a7759a7d9dc5ab8d6b67bfb0bb6f3f1123b5e SHA512 14d7f8138cf81507ed186ae496cb310d6b94a1e59a8ad64d237418291dc2a9ff757a966cfb6047fbe2017c2c2635699b8528e274cbf16f01cb8e7afb23fe5353
 AUX seamonkey.desktop 288 BLAKE2B 894d3f2b6caa73ce1bdb59d931b7253d4ab1b28e222adf7e9576a6029a393b101a1da51bd47c5bc35181fc8d831b8e20d9d8db0768229a315cf671ae35f2ea25 SHA512 ff5087a8449de9c99ba80d16031901af839affbad55c55801c6d58ccf7d7822d3935508015fcd698f4ae3a8db26ff425108b9435bf6ce43211d6aacb417628c0
 DIST chatzilla-SEA2_48_RELBRANCH.tar.bz2 440624 BLAKE2B 28a606785a2e5bf7e35a4cd7d05a38a10361cb30250f996b636185f7ea7111eb358ae35b46b3a4c4267c3357d318232ba53c84087e7995616e87cda49c874b11 SHA512 51a1eb638882a7feac3c6c854def2f81ba8fdaec91267ca94a41949c223743816ad5f548ca8c09be0328e9dcf9ea0170b9add42f09420c5fd4461c41bfcf74c1
 DIST dom-inspector-DOMI_2_0_17.tar.bz2 154940 BLAKE2B c71c629a293157bd46518d28621636a35c1cb105080e7dbe9bf567eacd904088177c6ce9c1ca64f489c4451041d68b0dffc86e618d25d42809a7901933f89d40 SHA512 1428d636a6618e834a7d6f4364e3772ac9baa7562351dff936b7cb0a0c306e72a62d60e20ea8a31e5384c322b93f3f09931cffc80983112eefaf191b66420e8f
-DIST enigmail-1.9.6.1.tar.gz 1745021 BLAKE2B 0fdc1e2e3f16491759cb360593e2132524150b34bb30234d520802f30aef8869367ac9a6e9fe75722ac2aa9a60dbf4ffb71293a07f8d460ea3672e78a8cb6772 SHA512 e6ab69734a39a4953e0167e07b06f0d5c83fb42956515392319a1cd9d665ca274f6a12b4141e2dfa373ef074f0526f3d7330a48d29d600fc38f724d26518ff84
-DIST enigmail-1.9.8.1.tar.gz 1776673 BLAKE2B 9a8251ced15ee4feeceafc3ee261f877886783428224dcb1616e411864f70f6fd822503ba82ebe9fe61462cb25baabda6c5cf65ff8738a53719b7e212eca8e78 SHA512 af280040e96eb69529e723e52e65621e42743c974b0ed42598e73458004f0a59688da7257d2b556e95a56c4cad3ac48f527d4d9a7a54c9c92eaff132257e0cfd
-DIST firefox-49.0-patches-04.tar.xz 13356 BLAKE2B 704dfc67c4c6883605765ae14be05a6a1ea1f9eda70ad20b7e293539fbe96b21cb462d7bccbacb361ffb45d276366b8ab2a4fb52455bd4cd41ca97cd2e6c4edb SHA512 3346cbe0146d6b480336c250c34c5be0a37cf9c7222238366794b4a03fb9c636ea22294cb517fc59826a0793a4a5723ff2f4cf85384fc405f1c1f14080458282
-DIST firefox-51.0-patches-06.tar.xz 9604 BLAKE2B 48936797845249f972dec472c20b8e622c6cae8e72a7ba57974631ce9eac70ddf28ad2f91c5a93ef7a73e6e18845cc13b8bf8a8fbf4695a00827f8936e91ffac SHA512 5fdc3913e6e4fb1427a051ba12c459bb5330e0712d5775b38281115a78e45e22f200e969ca3e82ac1c1fcfe5d27795d82e16ce15b8c5893bc102892876b2636b
-DIST firefox-52.2-patches-03.tar.xz 13148 BLAKE2B b43fda5b8455f49f042bc2e0d5417d6c17c196db226c2d563cc7b0813e800eaaed1eeb5759166a861ac9dc48c59909717d7e848853aa51c96219c06a32597779 SHA512 420dbeded3ff2f81250554416115a674ece1847db4449af9d09fa3ea5861037da9bd8525ce5bceede2abab1b58e06485e95417644c0ba8332eb076fbfed7cecd
 DIST firefox-52.4-patches-02.tar.xz 14412 BLAKE2B 9c15aa293dfc36efe1236d9b5736012a3efd0480f0d8eb243687b50245ccdb6e0ed13e564271569211eb767bd01ba3c7688c350005ce862403335dcc2e87bca7 SHA512 6befeaefc118bc161ad05eed619142814e5cf31aaeede3fb5618b1f5ace887e9e1fa6914320b513404380a426cfb0f45107435f92b2d7e95d95cd7c44e03ad96
-DIST seamonkey-2.46-be.xpi 936650 BLAKE2B 90ba2054260ea9e273e7eb74ecf380923c38dd5bf824b294ccb39849c3ced61c02d5930323a24f06d16f343f110cc61f010960abedd9875aba03c4f9d87d6c90 SHA512 a48caf48c0f705e991c31f6f0191662c99bcf022e9bec59b6caeaf03cec384f5b45c6a03af1103d0889fed2d19e57ff5c61fc67faad9cc1786993d0e9368a954
-DIST seamonkey-2.46-ca.xpi 937577 BLAKE2B 419408f3b571d3d828f0b4236bd58c09325945c919a2caa059f52286bee720b2c87cc71ad3b8a2bd96eb2481ee6c2f90c89fa46c65597dea6427403a3585ff50 SHA512 cf0d7c4829cae2baa064f8a68bfd827c6d596b9036d50e51f50a7d85faa7b1bd067c7dd84f7062affab6c1282186591c54f1cce60457e76924ae328eabca6505
-DIST seamonkey-2.46-cs.xpi 936101 BLAKE2B 76909f71303acc43e8c66b4da9c55cd04f22f8656b31a80aba2858e3aaef683f4ebf1c09092d5e94f6f3d918687c58bf3bed38f44359c960b2fb40e6e095b151 SHA512 faa70bfbd6b8ecf3bf31ae7da164922ed4618558c62d8263b5655d285c932f0b3fd2e501397845276c4a2d0e519fcfd6d20bf7f0af5323cf5b1c1de94385766e
-DIST seamonkey-2.46-de.xpi 942796 BLAKE2B bfd808f52563dd2530e25eefd28e838fe54e9c057384c3e68006ef515f25bea82fc8748e02961c3dc04a18c74fc481f564d1ec305a1eb0df96a46e86acccf8a7 SHA512 c52da108c93f7b8b57d09315ab391b34033d51a8df0db5bd65b2c0c5be3ad5ce3b1cf1b1066472fe208bb7ad2e4f000ce9a4d17c209efa52bf3f22c672e29835
-DIST seamonkey-2.46-en-GB.xpi 900232 BLAKE2B fc01f4d0cba8e36bfc0aa0f0ac8bfc63c3b61f6d5be9eca9604d4a56273268458cb080fb00faca511b3b839f5cd1b1cda0c88427f050b3be9c62dd4789487d12 SHA512 879d1f0281d9e1232713377b5e1e2bd9ea91477f32c2cd50de823dfd6d7b5561b4597c4abba8e258ade561ec776a8f21839aff4b2be56ec54ad6cd510c7d1783
-DIST seamonkey-2.46-es-AR.xpi 952318 BLAKE2B b1a0833ce88572be536515689cca522ef10c568ce866993a10f3627c967695a6e24fef8ffff3aececff54bfc402ad37a6c6a515cfc13e7b1b9f8b8893637793e SHA512 7b943846d37d4f492fdf16feeeb4202f09efa38920b0fdc3db8235d1493a4eea8a066d38d08a3cf77ad02e21ceb680b0235762eafe8e5dc3ead666dd81b2406d
-DIST seamonkey-2.46-es-ES.xpi 881728 BLAKE2B b55da449aec8d76cf7d2ba35f6b428ccadb5235e6ae9eadf8cb388d1fb397cb75ddde354763ec110769052315bdb93e64ce8132526d3e14de22a3e52989f08ba SHA512 f8a63bfcf888c98af238d4cbd54a377981c13f0bb1c4d1c9e845aec76fbbf319435e99538c56c89c506c7657c0e1f24fa4f269d6f44e916b5d60eecfd8a9755f
-DIST seamonkey-2.46-fi.xpi 905048 BLAKE2B 09fc723dd89054b213ea37c982ba8bb72c29cb3d669c856eb19a74f58cb103ecf48ecff4163e8fa3d14cdfc3d61a2daaccaaa7a2a927cfd7915f7cc12ff2566a SHA512 e78b9c9acea5524ce90310915d28bcd31f5001267bf81362ffed1dbc19fcfdf65ff3d128ba0bb67b28dae29b0bdcc5e283dc8fbdba196cda4c339fcefa5b7ac7
-DIST seamonkey-2.46-fr.xpi 945990 BLAKE2B 4e0aebce01d77b259375918f86ac138364579a5b9de6d19ad77b7c0bc2b14f3481709e37030165b4c1e87009e53f471ba58a880fc04ad8d90cdc4abd396d4b56 SHA512 d68eedef674f61bb9bbf28c4b7b78ea5963537dfe5e13c4a9cd3277613df4a06c25d52e9ceafa319c25d2302b4c2a60c141e73478f9174449cfed55cd826c95b
-DIST seamonkey-2.46-gl.xpi 915640 BLAKE2B 827c96acb0890f138928edf75233eb5020bc21eb3b4dbc7c7236973ba92bbc693d1c0757e67a68b45660e5aa31db259b6567bd9f0f8738d5d8a02273ee421711 SHA512 a3113eafd27129c8b18db7e1dfa6dd1c5581cb701bb569d9781215090f8c7e8112b083750c47d8233c23e4f78c09eb9903912a171a0076b4a7b99dbe03569bf8
-DIST seamonkey-2.46-hu.xpi 950137 BLAKE2B 56d6416abc825b30593754056d3f9bf188211ac42295bc21346d39c4346d7ec3383258e7e29461e7ad99a45774b86da0bf1ff9f9737c7a468a68560981ab81b1 SHA512 35f77886c5be124d5fdbb35f03a6917f87c29d8c29e874c68d99b0dc9880481a95677001b7560ab887a7604303e698c5a15c68831c344069663d9dae09794f97
-DIST seamonkey-2.46-it.xpi 788290 BLAKE2B b80a5aead64790a2a0662608e9399bf5aeb9320392a4b80667e73bdc263a3f85483414d410bca19392dbe428eafc7e9aeda3d102cb4674209ac9c0b4d091666c SHA512 1c6fefe5cc0b371d367044135abcc5cc9b8c0c10cf2e745ec78dcc1d41413fff3ee8850b98df31cad34783a6219c615e8e90d2916009993a860f64eb5c2a363d
-DIST seamonkey-2.46-ja.xpi 1000175 BLAKE2B 1c12e93550482c32ed1386f1d0321fa0602e88ffca956d858738c8d8897d8fce5e5096a8a374cef6b7388d56caadf042ef7a5a1ee6e663e56467f6837a63e1d2 SHA512 29f3f6a862947baa132d4b45c58cce86e175906402a0440384d4e1d1e30ad4b30e2eac7f271d8b9dc2b5ebcd2646ecb252d4365703eaea5905a6e64db0ee9e81
-DIST seamonkey-2.46-lt.xpi 951611 BLAKE2B 7288cafbb5d533e799bc0bd4f72022a26c4eccdd023b1e0e8374bedc3fdfb04040a77d998713c5f3df4981f2a3b7616fbed75361c8e439dea735de9346a2fbf4 SHA512 dbb61a46407695d1644923ea822a4b32b05ea0e6657b9ad0c75bab97920fd33dd5ec8b3e5f8eeba3c5f2d34219e374bb66ea5bac82f6cf6226b6061f21b205b5
-DIST seamonkey-2.46-nb-NO.xpi 921937 BLAKE2B cd54bd433504ae7b958269b99fa67329dc362a24d7a68e1060a2520f8a7b30c2391dc3feae8d3d2588f2624b333d473c3907934da2b5c3e87739124ac62d5921 SHA512 d808ae3cc7d391611d78154f82c57fd92705481ec5ebafea9aa8bb9fce44302a3f5912ae5d9f0997f84eb7ef08faae666a0f4b14e57dca4b97bc458f8dd72ddb
-DIST seamonkey-2.46-nl.xpi 926891 BLAKE2B 1430d8ccf1b691b3822f2f3fbf1f7ad61e6c111940d023b2fbc67b87d19d7ea32008c6d62471521b78eb49c199238075831e938700707748f0031a0714d9dad2 SHA512 179280b6a549f6946eee21a58bca066a3181e6311328037fcec70d51bb0a191b3b1aaad118fb3c247c24f766c211e4470370535d2e4060a67dafbca1fe97f525
 DIST seamonkey-2.46-patches-01.tar.xz 768 BLAKE2B e886f8c43cd856bb7cc4ea2a03c2a364bde1faef5c77156456d161c87867c52e0fb9bd348cc92330a22cff8ae0ebbab997b3d3985bb40c6c0883da4a35789f9c SHA512 2bbf09c8285f9f1ef5e194da7c43a8d1bbd4f2366ba182c78a7be4f0c36f549eb8cfee5e42d2eea87ea5d6920b36196e901b31ddca94e792aa2d3fb28de097ad
-DIST seamonkey-2.46-patches-02.tar.xz 1352 BLAKE2B 6be008ce670e529a94e9a68dfd2e9d45fcdd1990e9f68b7ead8828133f88c9e6399a03e5dc7dea56435faf7b5f437e7502dcdebd62c74c42485f6c8d7d7cef5a SHA512 d92f3df10a92581da345f440d338befe96e1b3c26da419f846b5b6c2903ddd494e48b37beec7eb854d3a863dd08fbe3f157f670e33dbeecefda4b7bf2bf9708b
-DIST seamonkey-2.46-pl.xpi 918214 BLAKE2B bff9d2c1257996533374a871f76b1b71fd0ded2b9999a867155f46c88328667f8c8cc5b6d7e09a1149c8f4e825bbfd1349b778b98bac9f2f334b0ad02e1c16f7 SHA512 fbb65a47f2e790e5ef3d7aa0134d25cd8a21b7ef3d4216b63c84ff9cf0c6e31b5611f56d88cff752317a337d497e96712ef533badfe87b0f8d9bde388a95d47a
-DIST seamonkey-2.46-pt-PT.xpi 934340 BLAKE2B 1101c8c9fe55b3478ff02f5144fef81bdd3b6391558bd06ee7d5dc0049c7a59781c3a8703b7438605cb7bedb554006ff726cfcfc6e6959ff32dba837a305b872 SHA512 99eae434fa4648e619c748a0b8ac2dbde07cdd6908a3720d764bb072e8788e28ec2e26690742730a1743819e90685da67f995c7aab80ec4fad8214891195250e
-DIST seamonkey-2.46-ru.xpi 960162 BLAKE2B df8d21db6eb5fe6ed509496e5f0d1cf325b16bfc5c872b472613e4a1eabc968df56ae1100022b40bb6e330bf6994935cc066f245ca80aadd7bd06a81284b6c9c SHA512 d86e695835102c84716fec3ea2e4a411bb73d9ecd00bf0f6361f0095e2994a5392d89d79603345548cca33efec6c364931a9918a32692d09f126ebf6bf7db429
-DIST seamonkey-2.46-sk.xpi 962527 BLAKE2B 61fd208648de6f40a7786175f988909056a8750b6eedfc9dc0871a86b1953dab92c80127a0f5b812e92328b9ab456ee0cac9281ff1832781b07536b07034d690 SHA512 501788051942c161f1c51a314cb03b352656ced7a4c062b4b1ddb7256297ef62dac234e06ecc6287f67c1761e391c477ff1046058546c7ab732a2286ca7f08fa
-DIST seamonkey-2.46-sv-SE.xpi 935346 BLAKE2B 3aedc4b7c59571cadb14bc895299ad5aeb49fe255ed09a169e62d9e46600ef089792fbbd200f9118db8b3c469777a5c0a11e376700da2ef7c414472ac4cebccc SHA512 93d740e45bd9e461858ef9a6130e7c0c4591539931bcb8a356bc7fd82aa748de2114379fc311624346992a551eaa238fdf33d582a99d60ce5584b281518c923f
-DIST seamonkey-2.46-tr.xpi 912742 BLAKE2B cca68d6928d0a513af594c4339f9ad2c6e9a121965a96e0493afd12e2952c907cb4c07f19709006dbda50156033c6f94d3592647f63d8d755020122c67530cbe SHA512 a504255780691c4f091576b474ae58dc870b3e9e5f3021ba41c8cfe9c77d1657f9cf30a107ca5352af31427d15fccd93e433d156a16ea6eb7e5cb4cd66aa77c5
-DIST seamonkey-2.46-uk.xpi 995478 BLAKE2B ec6e19c351f55084f5fb580ef40bef7fd520c500540d5541028a8838b539efc8bdff902adfbb3a2d3d3c1dc4396683fe307c06531fd7fe76e8d85e01805e0c1c SHA512 3ee7c892aea95b652edead2d4c041a01b0d7627399fde1575df5796a36e379413837717c184ffa430b9283f360f84af2d5def76337cf5ab1d78d8be3bbad88c1
-DIST seamonkey-2.46-zh-CN.xpi 942579 BLAKE2B b7b0314a86f4d231ff15aed37cd51e5834b18c9fb68db65300027d4a3e0c71a74f58364debaeda333e9ec44b15fc91229becd8ceba43f4dbd04d5d31b27a4bcb SHA512 b79032668894aef28f3934cb6be623f81f1c73f88aaa09545c0f5bc06f415e37338ccb9bfd418cb31203be113038bab04cc82f7994e53cb6bd8ee79ce72b9415
-DIST seamonkey-2.46-zh-TW.xpi 970970 BLAKE2B bca879fa524dc26a72131bc7a8aed4e2cb28a3a09b0d7efb54fd6d6db80c9dbda5711d2f3b6db4118dcb42ff353047862e0959b84f6c7f92ace76c9660a016d9 SHA512 1c735d6f4e9fdc9c09c270b7f653de12b2a2f8c0d60b8a229a6f15a303e074d5681f56514f8fd054e5d1ad67e3e516aaf5341e58cac85b3705ccb3034822b436
-DIST seamonkey-2.46.source.tar.xz 204913776 BLAKE2B edf30a7e6a450966bc07bbace7833aef14337815228214d0d6e16bd75975a3160fd9d149e11b540560224c139e09b0c4fdccefd7186ad8657bc800329c95522d SHA512 b70a40ad6797c82458436ce8e15d461bec982916a3ad5949610f2830647872f3b54a63fb62b17780c33e74c067054b590d0a5ebd0e836854a10e60feee692491
-DIST seamonkey-2.48-cs.xpi 929570 BLAKE2B a251bc092054bad71d577aa3ef2e5aa1ffad7bf6e77f2d1edeb0292aa699b3dd21edbd82fed523c24051c23b3263b3eb965bb7ce16e145ce4d204dabea22b154 SHA512 edaf752c349eff6b0b49e4c63e93b64027b9183ad2c30aab43bd2159ef3e0ca61d6ba0cca7d222372bb051163d9b62377de017b31ecb29e34b95e9eabab7ea83
-DIST seamonkey-2.48-de.xpi 937351 BLAKE2B 8c8b662013c56240de5832dbbcb8f112b22459074a5991e1061de6a21ad0e466e523af09850b90632117a1e518ee4fbeceee2f33f01b350095a0904a05f46d09 SHA512 8a9ad75af63685b86e8c0a1191b83ea25d0c01870e700a2cf9b9a2c1f8793570320acae408f686699d19ec2467064582c8d5e4fa6220b40d02e928e7185a1797
-DIST seamonkey-2.48-en-GB.xpi 901731 BLAKE2B 9a437e8f180e2495b6601b2349cabd7c5dd70facb1f3fc169205ef96760578df3d14f1e32a98b1b76b7f94ca579d217d43a5c757c01049ed70efb3dd3485865d SHA512 25a8eb0b532ab7becbf60dbf9e6720b389d820fb51805c5447161e55e52426344590b2efe92d7fd151b097e48cc148a712b6b18229a286fc42e8e0147620a685
-DIST seamonkey-2.48-es-AR.xpi 941407 BLAKE2B 94250078b3a54c609dfa19b7a8bbcd8223f8db2ea3aee6cfe69a76965adb4edeb7e4c305a4015d414878a139e5a7879450fc6cf14aaff2ab33c1ddfa04d1d0bf SHA512 06802ad0e68255d6e0b2f216d71d806ac26c486f9b0c802e54604f842da5fb84cc073e35bb4fbed9f7d964a6a9c4f28041da2821ae70461a6837f0872697dc57
-DIST seamonkey-2.48-es-ES.xpi 890255 BLAKE2B 5e18f370d4545d89156889c5f19e752343324aef6b508246d358a1fa17b91597280fad6686dd58e7a4e0e3ee5db590fd44607d50cffb4e69eeb2044133d5be97 SHA512 72d0fad247be52ddae72ef1265c84441677eaeb8f6633c21c9bd4b9f2b84898cd4ddbb46932e0dd041b4afbd04357b85e77e76b6e3533f6f55857a528c98f2f7
-DIST seamonkey-2.48-fr.xpi 957402 BLAKE2B df3c0d22effd794abf91e2dd983e2645090f953d9ee50821f73818d3bc02a4d1917269e77eba36e501ff75e48cc402318756ce8089d9ad5d57353cb6fc2f8862 SHA512 ab5c57722026dd1abc1311cb3f72c452c3aaa6ade7a9737cdfeee6c97319b82a196d0ff79893e270e162a02c00aac67cbdcf7e9ba507d2a15844d47416db7a6a
-DIST seamonkey-2.48-hu.xpi 943677 BLAKE2B 60d97bfb5b78886d53a2de81a520ea0b3e0e7db256674123fa23606a74e7a9568c1efadb41aa06b97e3ce68b7479e26c93314b1821058b1a42174befc974af74 SHA512 5f6bd359df25fa979a480f8c82ca2b0795a8c380075e2ac68290c939b48bb9cc0c6940166efe9dd2b24ce75b4b84e18ef781430ccca7ddda9d6141703fdeaec9
-DIST seamonkey-2.48-it.xpi 783035 BLAKE2B b49b7b52ad22a86d923b5b46e152820a32398a8bd80f1ed96ce096c5af0d1b9d9b760d9c6706537051713d07e5b45b16e66557c30f8c4f09c755de032f9ce082 SHA512 c083aecefa5b77e3a7472fc40ac1627147037ba0a6f856d4d0c83ce848d2253acd2fadf80beaa68fd1f260e39cde675c0a26e00907ebb9b0f2f7443cab7edd35
-DIST seamonkey-2.48-ja.xpi 1027353 BLAKE2B d5c6343e29aea9fca71281c19f6976ebd64dd0c70643a494fc75fb2f2bd20c591dccca03a8df40b4ae775f55cce21d98a5b4567df340d47d78d02f2de6ceefb5 SHA512 67172ad5d7c14f5d1f8dc66825d1ba328c5396bf3e2b18b0c12568fb7792d8ddd845e8212ee92ccc14519c7646d6170802633ce71fbfbb95bd575f9fb4304bfd
-DIST seamonkey-2.48-lt.xpi 944779 BLAKE2B 51e51e839d38a9e4d5c9b1c70f10f7ead9d1ca151f6ddac5175d04db387270fa349ba384241fce931ac605e9bf306636eca88299fad28f1d36f2b52f9f7f58d9 SHA512 599a8d6295237237a2be5710faaa3ddf11789db0f9223415cc471dd864fd357ee56e173bc443b13a8e4414f2e571fea9556926fa423a4042edb74e9fcbc99547
-DIST seamonkey-2.48-nl.xpi 946317 BLAKE2B 3c53c59d78d696c809713d5432b799445b982e36b4b789385ead043cd37099ef971c6222beededfce71c802214cbeb12597772a29ab27b3d47df16458f4a44c0 SHA512 864526d3898171454e3a6acc199c8653348631e936d411bd9006da285706bd6500f83bda00d7ef8fcdb0223b626c78fc20fda47b1bed488637dc6fc74626119a
-DIST seamonkey-2.48-pl.xpi 905621 BLAKE2B 975fcc9474446bb089b87fcf72b03855d29c1e9e2ec0b7df3501711ab746c30b4fdfd50d7917ae2877b0c575a7084798818ec7870344d4ea403f05dfd6b2b1e5 SHA512 cfa4cfa12d52b39fc8abdd57ad0438fcf613997fa28e0625eb2b15b2ac0d0851dfdc629161eac91534a42bc5b51108dd93733d89f094fb783be651015c15c03d
-DIST seamonkey-2.48-pt-PT.xpi 928435 BLAKE2B aead434f1f2a604f2258ed2af4ddd0375d7f5b8beead6b6f1a680709f73a1ed49f0fb61c752ee74c827f0bbf92ed30cdf8fdd835514852c5dbce96103baf4a30 SHA512 86795aa2fcfa1b52973c132f230273c9ebe9c271f5be3f279ec43c76ff35fd45c8d3b72076748d71924711a4dc2c39b23fcdee88aa62a731f947ffdea9613051
-DIST seamonkey-2.48-ru.xpi 986167 BLAKE2B 3c075eb4e1c42d1782fe2a672987feb07c5f18c478e798f39860d6820b30ffdf6042d5e2a0a9c09d66ad95560c3643acb59543eaf949a60cf59214fea31d048b SHA512 a21b6647ebf91eae3ce8467d9b71d8a80a8478d7701dd777c0ab8d517e85fce6a06f0438e68a01c9439612ff3f51b6626be2c9c5cc637be5980d9870ee7ad813
-DIST seamonkey-2.48-sk.xpi 956279 BLAKE2B e2566751fe751991ee955752cb33c27f4b64efe46ec5b50e4699a43eaba59202cfe4538dd5e478b943834a043efc0413ed3a125ab5cd411e868eb97619b3f1c0 SHA512 08d4c51cb6b23e522fb41f2cb507fd459afd4b02a9f27d5249b76a5e9105d48cd44c210d28e5a4575b0f9565e3c73c16c7f7136a65b006440183646e640c3761
-DIST seamonkey-2.48-sv-SE.xpi 930510 BLAKE2B 1d974f8828f6da7838c1c0d700f158053c71f9ee6acbcc6a6f2f8b3bf99d616b06e1278e323e130a52c090fa8f65c1f1c1388036ffdc4fcf005e02f0e7044f7c SHA512 098ffc81d2115f055b2cf4f5ef195e1f6bb58068d143225dba42dff00a5efb8d660641c4bd295f1bcccd3c032f6bdc940e20f9e4ba6aa7d3624cf61e9ee8440f
-DIST seamonkey-2.48-zh-CN.xpi 934871 BLAKE2B f515e4aac8d1097205e311806fdaf7af35f1f749a715d2301e33fd29d450c94b691002625fd99131b02c1b89d9c06c48cd5dbc94c79ad10c0983936786f436c1 SHA512 18485d34b90f3f619dde55c1772c5f4873a4efd5b828755eec28b20aa74d98050ccd206b19fa409ab6bea7f0053a94f2d684b54e19f763004fb752ad8e002d2c
-DIST seamonkey-2.48-zh-TW.xpi 991735 BLAKE2B eb0fef6b2fb43956f670a0553761e3a6d4f507895534bd6bde4bab8cd6b58dabe64b68db79d749e95e274337878d1d86188b6a3610b25f1fc503c2f874ecacbb SHA512 d14be0b9da910e3c7014c4ac9e6fc8270eb43176623280c55eec9e63c5fd0ce9b83db781cdbcd1eae67281fd09ad6dc2218df479e66076878c6bda12c2f2eeb3
-DIST seamonkey-2.48.source.tar.xz 220412744 BLAKE2B 5c0b3004e42d251154fea639b153ff4f68a7f2fa6a58534ffce96bb309e1799da309763cc1e30a0fcd6cb08203c59c73f706bdf23ec160c281b94125807f8c93 SHA512 b1992a1dbaeb045aea10ff02aa214ec0c1725e3ad0844d2dffd1c0d0c26754fbd98b5fb5df25a2a490ebcb7a47037c61599b0a2e9240338b4e769e529faa33cf
-DIST seamonkey-2.49.4.0-cs.xpi 941974 BLAKE2B 4de71b190c63e4284b5915ab3f9f9672026fd2375996df26064598a6e1859f3e9b56c668c63a4741c37471c23dadb6eefc018a1715d7afa3e5ced8477a16eb50 SHA512 c3b061e0b735c6949a0ce7f8be22c7818e6bd039de5284015b0ff63b8456f18bd51db9f3a3d1f9a5df2a6d0610043ea9e33f16ccd3ba64e20ac53e901196afd3
-DIST seamonkey-2.49.4.0-de.xpi 949902 BLAKE2B a51a5ccf0a86708b26c9394cc88d3a05f6108760933b5ccca92d54390090f379ab34b4d90796e77764bcba1fbb20a8ffe56f7cf5ba7aeefc80e0e01d3f5cc86b SHA512 fb85fa867b5b9417190aa25cc678d68e3afed04bfe052896167aaf46042397da6e1bbeb70acc321f46bd0bed4f0856152d80a348b478a336d28825c4120af1c6
-DIST seamonkey-2.49.4.0-en-GB.xpi 911789 BLAKE2B 495cd6fcb8cde5dcbab636bad20e1da5f89dcfb3bbafea12fec1c2fc68bdf9145d533828163884dd25988f792839739a3374a233567820cdf97fb49c44d7228c SHA512 973fc7f693abe9b87bd971f79e050bd4bd9a16e4e6f6a50d9298f2c71d45aa328c4279055382b7f9bf8c807dff9c1ab8855d97dbbe3eb4d71c40ee5e3a02f3b6
-DIST seamonkey-2.49.4.0-es-AR.xpi 952759 BLAKE2B fb882c78290507b7bd349ab01545c7263b983b156c26938fa77565658b55d567d3f057b177b2e98be0d83e5bfb21c3b9bf39f31ecbc4b406739afa6f3af5e5ec SHA512 ec198ed919079e16bf638be032cc7de165d0e9d05d0742a12828b5ad510884d4dd0da57c0cbae85b3fe0089a1be26f42c9887957ab6ecac8b8ef6cf0fbbcb345
-DIST seamonkey-2.49.4.0-es-ES.xpi 897737 BLAKE2B 6ddefeeff9b9d1c96b4dc8d068a179d92a353470329571e8b84962f3c667bdb06cd4f9851a64868958e99412d7eb7f3a3910edf48c4a73c86474283a8268c504 SHA512 e9fb5834f3086ee1cf99404930149f06ee7f3f0d5796550c3368b915ed9f729dbd92032682c6273b687b6f3077a4ca3a78192e101f1276d90ebf2eb71f39f22e
-DIST seamonkey-2.49.4.0-fr.xpi 969290 BLAKE2B ec7bbac2dda87d64486e36a18b18ab89c5940df2134704c5fa5af892c0b9669ff2cea81fb34355d383b6207c0993504afe052c5c435a4a402862a5c814debfe7 SHA512 188f4a8c79b10f95c807a08837290fbc3245c983e6797b8f8a0beea4f4ffad915abeb942920f9986910a0530218f4e35ba16de60b4f21d33116ae16756eb4e8c
-DIST seamonkey-2.49.4.0-hu.xpi 955174 BLAKE2B 60784e962a43bf01630f76693b17954d4788daebb54d29f95ff5f3650ecd78b7067f1af20421d104feffaed10d08dfe1b25f8551969678bd4e1fe9b414a7edcf SHA512 e28beb23242a6535230df4fd1adb82e8957487179402cb82dedc2faa6464b411d22ddb2732e0490a916597301eebf2fda727bcadb34e029bd468bd066dbc3080
-DIST seamonkey-2.49.4.0-it.xpi 793590 BLAKE2B 4c7e837b93a090b3f0934a37bb1c63534dce632839677b0127055502cb7dc57f210c1390afa663ca9c2f4f01196756579750d94b8815de12fc6b2bd9c12a6a19 SHA512 c750a85b74bb37d966f1bbecdafcd6ad9d4532eaf0f49f9148081f821c61aec332646eb7c43f0eef4b736362a8c2ab0a1205a38537129f6fe920dc8ae0f16ca9
-DIST seamonkey-2.49.4.0-ja.xpi 1033801 BLAKE2B 0fb8ebcde8c64f60872d3ed4acd17249c852fb43863e5649cf778dfffde13cdee5ed63af4d66647d4c57a9d456a769b2b43f28cf9637b8b71ffb053dc0f46bee SHA512 454756af04d5d3301c3ffe321109e1c78aa69a3b9e4a29e1b1e7226b958062e451551d73c3df87785fd80e74a4e433fc2094e3702ceb1a547abb858551878056
-DIST seamonkey-2.49.4.0-lt.xpi 956024 BLAKE2B 75ffe875f683e8e47e703574e4a3b73cb2bb764e8163f833208e06b914709acf772734848a2164b94f138dae021c4915e8b20f417132c84197042215548b5b25 SHA512 14124e0b9b60f360f6f2b77b5bafe80569894754a3ffd27b6a3aab34136d7876d785b5e9178cb1d34ec46a7b858f26327658e1a3e43ac97abe272838dde78228
-DIST seamonkey-2.49.4.0-nl.xpi 957391 BLAKE2B 859a5cce26654b3f67d4a340d40b96d66199461250342a699f3186f97edad0347174e87a68a6be21bd6c2ff91497195be98bfb717679d76aa9be2590b809ee9c SHA512 0f3e68df37e211b73773e1b84d39d4540d1d8865cc534bad841babc30c074bb9301cc472aa0e4e61e09bc26948270e1106e1546d27705380819d830ca158215d
-DIST seamonkey-2.49.4.0-pl.xpi 913004 BLAKE2B 8fa4e937c41b6585075f920a778c13d08fcbb6a5759d5371a05d278b5646963d4b8a066aedd60e7521caf354d4ed57e14864d6cb802900284a8be05553ea0e38 SHA512 532b64032b6e4cb902cd9d99ef5505f3ac57964452196f3a9f49eff1bd965c5a8a8271960951482266f12214cce4cad876268f9f38a193f5d91c2644fef0aff8
-DIST seamonkey-2.49.4.0-pt-PT.xpi 939012 BLAKE2B 16bcdbd9c04f023dba7de4e5caaa16f2bbd0bda45625008b909fa360eb98409b21081b892d9e3dcc4fbc5a3ffb1bafc630f2266f69149c70ad96a81025aa7e01 SHA512 f8cac43e61de1d4dfbc0febddcadfa10cc457e7552016c79ff954cddef900470e60912c607076976b15811944a07cd785fbd2ffd85a5af3ce545ec98c12bdc05
-DIST seamonkey-2.49.4.0-ru.xpi 995907 BLAKE2B ce02fd35e093b3f5c2fed309a2fae066e48c7b3351075d55b72751d66b6e13fb13758b8ef4ffa351e85907152ac78a0fb4ced99e2af2993f5906440ba69b0051 SHA512 846f7f361a15ea1b04539ec789dffb459e1fbd85283c720883d6545da67a979e040c80b5cb6a0938f0ca9e059e837310cf3fb2d97671e37ff256ad2ac780291c
-DIST seamonkey-2.49.4.0-sk.xpi 967988 BLAKE2B fd7db86b778be8b1202c031ccb6b18805fc9027f50dd513e3ca0ef2afa1208f5df0b7636c0b6f822fda9618ebe48dc1b16710888284c2d5681e00e4be26c03cf SHA512 8fb02cb8f95c68ce40aabaf79c57bd7c655092dd5fb939d68a62a1bec707b903fbcf16299ff8dd094e161b5f4c732a813d63e33b3ff3ac09f9e1afcf740426d9
-DIST seamonkey-2.49.4.0-sv-SE.xpi 940793 BLAKE2B ec901577f833e69f78d0fba13fe1ee1297105332db66fa5e0c841f19aca4e3274822f43f49b925eba7e86bb8682963424369bb4ce8b089df32d8fc7fbd294e2d SHA512 0ac1b0a8e599ef0ffe49d8a7b94dd25818601fb5603273ed995b9a4bb52c5e13a360c76b9278bf8a14b8dce5609f33be319c43fa13ee7b16eda897f6c2d39ddf
-DIST seamonkey-2.49.4.0-zh-CN.xpi 946349 BLAKE2B ff8d5dfc671cf51e9af849e7781eb3ada2cda97cc542a8a28306a7c060043752be7614574c0c4882c54dec8a82972a46a7c8bc8085d94a9273264cd15dbfbc83 SHA512 5d3a6accc9deb69b6d52bccca0b52e12b8727d0e6a99067dba52921a147c333b7b777d7dc4935510fb981c9cfae2c4cfc30f310fad9b06e5537ef1dbb89b5e28
-DIST seamonkey-2.49.4.0-zh-TW.xpi 1002365 BLAKE2B e66f68187c0373f96ba8f58f420c8a4c917015e6c38a54a6c80d9cdf4b31620ff3c104ffccc1f4e0f140673b15eefe1742a2b0f3208e00abb4a593322cb1edf9 SHA512 a5797304f4de6edf807238a551676fe9755d9ae0dc0141ea959c6edae8bc742ad11976a2b1cf4f2a324ad6b94c1a97c77e29b8100a679af7002156d1d0150376
 DIST seamonkey-2.49.5.0-cs.xpi 941974 BLAKE2B 4de71b190c63e4284b5915ab3f9f9672026fd2375996df26064598a6e1859f3e9b56c668c63a4741c37471c23dadb6eefc018a1715d7afa3e5ced8477a16eb50 SHA512 c3b061e0b735c6949a0ce7f8be22c7818e6bd039de5284015b0ff63b8456f18bd51db9f3a3d1f9a5df2a6d0610043ea9e33f16ccd3ba64e20ac53e901196afd3
 DIST seamonkey-2.49.5.0-de.xpi 949902 BLAKE2B a51a5ccf0a86708b26c9394cc88d3a05f6108760933b5ccca92d54390090f379ab34b4d90796e77764bcba1fbb20a8ffe56f7cf5ba7aeefc80e0e01d3f5cc86b SHA512 fb85fa867b5b9417190aa25cc678d68e3afed04bfe052896167aaf46042397da6e1bbeb70acc321f46bd0bed4f0856152d80a348b478a336d28825c4120af1c6
 DIST seamonkey-2.49.5.0-en-GB.xpi 911789 BLAKE2B 495cd6fcb8cde5dcbab636bad20e1da5f89dcfb3bbafea12fec1c2fc68bdf9145d533828163884dd25988f792839739a3374a233567820cdf97fb49c44d7228c SHA512 973fc7f693abe9b87bd971f79e050bd4bd9a16e4e6f6a50d9298f2c71d45aa328c4279055382b7f9bf8c807dff9c1ab8855d97dbbe3eb4d71c40ee5e3a02f3b6
@@ -93,11 +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 thunderbird-52.4.0.source.tar.xz 228561704 BLAKE2B 33f52517cd81c550cfa95f2cae1d2f7d4dba1dc7e0e0cf2e6778d327679c200c3071c46f9a5057c3b289a789af24fa683460c87a980c3994848cdd681a573839 SHA512 6ac39cecca9e53b51754d7a8bd7cae228d197eb234b03a2386c16fd665f4f7a67f10bbdf981c20b3f7a21a5ef67e2771154a3dd9f249c6a884c48a9e59bcfc78
+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 thunderbird-52.5.0.source.tar.xz 230282080 BLAKE2B d55dc086c23813cc116277d532e3f3f99711d7f00be1e09c22d76f021b074d63b1abc8f3814906d73060481857328f0391140484eb1b4c413e8c91fb70003063 SHA512 b9b599e5853887bd518e5a57f6fd04751bb78f553f97b260cd9ba7268c4cff307be40b81b00f1320f5a5156e5c67115595b2d389f931c265d0c3448f56fb8319
-EBUILD seamonkey-2.46-r1.ebuild 11916 BLAKE2B 32b5814f815e976b0ccb537b1345ad3d725d0f376de14f14bfed811f8ec89aaa360d96bc89aef2c6860e6361559caa81d8788f939b16b06fe6957951e7bf98e0 SHA512 46280b09685bcd166f53e27272d60804b68c7e347d0572d6285b6305acde294c6455e729f83a3ec9add1fffb432cc0e72f0247db42e8e435bb5531ff6ed3ae93
-EBUILD seamonkey-2.48-r1.ebuild 13747 BLAKE2B d2b6dfe1a7689d906444fe8d8536b62a02d9303ef1f4b66d1dfe12d99a1e14f087bee936b203b1c990b27d637317854f43dea5659054d97bfd466b11e83c3aa6 SHA512 4bd9722147e02b53b49f263b4606039e04c3a1d92f28f2b65523c314c03982e10e2102a85875a8a76c326598d69c7045d8ed4146b2f2071640dac3010699aea7
-EBUILD seamonkey-2.48.ebuild 13160 BLAKE2B 4221d5c668a8e6692a1d6afb928a152461803f5e4fb50f9058a9dac90699cccc916bd40482ba863fa184197d792a331ccefc67fa7a9f3e180b6956ffa9666d3e SHA512 f6307112b3b19b6e3b39373f7662c4d2590f29bd04cc8f440b01f7e0f752cb279d1ee7a572e4d55afe6991548dd9ba0b34ec593d537f1672b7fe8531a91f8cdf
-EBUILD seamonkey-2.49.4.0_p0.ebuild 14276 BLAKE2B 01e4ee5166e2115fb8f6c99bd30df901d96755e9a2d33a6edf8ebc72d48d9f7ce6b82cfb2b067f25002e9412e8fe299355d593ec9266dcda0f80a6747421b61e SHA512 38f615abfe23c81f179eeea4bfd44afb15aac42c64ec705308380d8becd949568dc92b6eef1a74b2b35f987ee879cc6bd7f93c0751330cd83418568deafe3bf9
-EBUILD seamonkey-2.49.5.0_p0.ebuild 12779 BLAKE2B cf8a995949e3d328e56e3041df0fadbe0d48224536c20644cab1ba04c14819d71241730e9b8115d6498e5d6f0b7d7135c95b94737e83d4401c941834253573ab SHA512 705f9e92f42b3a469453a4c8d236fd170e6748f8ca2d37260f693a20b67670baf8ebf47777d8c40344599a2421349117dfadddf0de0b021337ae3319741ed35c
-MISC metadata.xml 2039 BLAKE2B 2aa1ebb3f846451a4eab23222095fc1ebd341b397183122d3f15f76671fa048dd00f1ab801f959d20f70c5a802c9a82e3e4a1c7eaf27cdb5a843188dbd59a700 SHA512 4ff3452da421be924a01cfbe8c1dc686d7e6c85d5596a0f35e0474bf991c4f666278152cdcff4a14a4d6621732a7beae3267612f76ba4eece68a78bdd15a4812
+DIST thunderbird-52.5.2.source.tar.xz 230369636 BLAKE2B b1fe2dab986298de590cf7beab9845459ac7582119179599842a4577de7e402d7cdc569dd6b36db017690245df576f96066bf3dfa77be24a35b700559ce56942 SHA512 d626d3d37959539b15b5d2ae4a580fcc160380974bfc1a69a1fc8ff2435932e90a69fa386d5ecb6721d9154603c6b7d063e3368f6f995fea057eb593c06ef4ff
+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
+MISC metadata.xml 1882 BLAKE2B e72fa92838230026eaab872a858ba54ccecf47055bff324215219f785e3143daa13984d1f8b2bc746d8a0cc1a07c74a0ee2067f029b92df098431a43588a27a3 SHA512 d533b6033b37fe1410722b2f005a147e1508a2e9a390176a199b15a6464ff5b354ba5ee2542ea243c33b4d4d1e1f91b6e331f9bf43f13b0ef1ceb973e8e9e117
diff --git a/www-client/seamonkey/files/0001-CFLAGS-must-contain-fPIC-when-checking-the-linker.patch b/www-client/seamonkey/files/0001-CFLAGS-must-contain-fPIC-when-checking-the-linker.patch
deleted file mode 100644
index fe3130e33692..000000000000
--- a/www-client/seamonkey/files/0001-CFLAGS-must-contain-fPIC-when-checking-the-linker.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 4604a80b052456f20187d89e5c3e115ef0bb7251 Mon Sep 17 00:00:00 2001
-From: "Jory A. Pratt" <anarchy@gentoo.org>
-Date: Mon, 24 Jul 2017 06:10:11 -0500
-Subject: [PATCH] CFLAGS must contain -fPIC when checking the linker
- https://bugs.gentoo.org/show_bug.cgi?id=607350
-
-Signed-off-by: Jory A. Pratt <anarchy@gentoo.org>
----
- mozilla/build/autoconf/compiler-opts.m4 | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/mozilla/build/autoconf/compiler-opts.m4 b/mozilla/build/autoconf/compiler-opts.m4
-index c12d400..639e99e 100644
---- a/mozilla/build/autoconf/compiler-opts.m4
-+++ b/mozilla/build/autoconf/compiler-opts.m4
-@@ -268,6 +268,8 @@ MOZ_ARG_ENABLE_BOOL(pie,
- 
- if test "$GNU_CC" -a -n "$MOZ_PIE"; then
-     AC_MSG_CHECKING([for PIE support])
-+    _SAVE_CFLAGS=$CFLAGS
-+    CFLAGS="$CFLAGS -fPIC"
-     _SAVE_LDFLAGS=$LDFLAGS
-     LDFLAGS="$LDFLAGS -pie"
-     AC_TRY_LINK(,,AC_MSG_RESULT([yes])
-@@ -275,6 +277,8 @@ if test "$GNU_CC" -a -n "$MOZ_PIE"; then
-                   AC_MSG_RESULT([no])
-                   AC_MSG_ERROR([--enable-pie requires PIE support from the linker.]))
-     LDFLAGS=$_SAVE_LDFLAGS
-+    CFLAGS=$_SAVE_CFLAGS
-+
- fi
- 
- AC_SUBST(MOZ_PROGRAM_LDFLAGS)
--- 
-2.13.3
diff --git a/www-client/seamonkey/files/firefox-Include-sys-sysmacros.h-for-major-minor-when-availab.patch b/www-client/seamonkey/files/firefox-Include-sys-sysmacros.h-for-major-minor-when-availab.patch
deleted file mode 100644
index 9a3dad17058a..000000000000
--- a/www-client/seamonkey/files/firefox-Include-sys-sysmacros.h-for-major-minor-when-availab.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 5679a9daa463bd038883afe69332ef3807c41442 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 1 Feb 2017 18:48:02 +0100
-Subject: [PATCH] Include sys/sysmacros.h for major(), minor() when available
-
-Include sys/sysmacros.h explicitly as that will be required by future
-glibc versions to expose major() and minor() macros.
-
-Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1329798
----
- build/moz.configure/headers.configure | 4 ++++
- config/system-headers                 | 1 +
- xpcom/io/nsLocalFileUnix.cpp          | 3 +++
- 3 files changed, 8 insertions(+)
-
-diff --git a/build/moz.configure/headers.configure b/build/moz.configure/headers.configure
-index 52ffa2f89..53ca44ca4 100644
---- a/build/moz.configure/headers.configure
-+++ b/build/moz.configure/headers.configure
-@@ -57,6 +57,10 @@ check_headers(
- check_header('sys/queue.h',
-              when=non_msvc_compiler)
- 
-+# sys/sysmacros.h may be necessary for major()/minor() macros
-+check_header('sys/sysmacros.h',
-+             when=non_msvc_compiler)
-+
- check_headers(
-     'sys/types.h',
-     'netinet/in.h',
-diff --git a/config/system-headers b/config/system-headers
-index 60788e788..984e86933 100644
---- a/config/system-headers
-+++ b/config/system-headers
-@@ -1055,6 +1055,7 @@ sys/statvfs.h
- sys/syscall.h
- sys/sysctl.h
- sys/sysinfo.h
-+sys/sysmacros.h
- sys/sysmp.h
- sys/syssgi.h
- sys/system_properties.h
-diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
-index 6f13e2a7d..be7bf4de2 100644
---- a/xpcom/io/nsLocalFileUnix.cpp
-+++ b/xpcom/io/nsLocalFileUnix.cpp
-@@ -30,6 +30,9 @@
- #define BLOCK_SIZE 1024 /* kernel block size */
- #endif
- #endif
-+#if defined(HAVE_SYS_SYSMACROS_H)
-+#include <sys/sysmacros.h>
-+#endif
- 
- #include "xpcom-private.h"
- #include "nsDirectoryServiceDefs.h"
--- 
-2.11.0
-
diff --git a/www-client/seamonkey/metadata.xml b/www-client/seamonkey/metadata.xml
index cd4713cbfef7..c817c037ff70 100644
--- a/www-client/seamonkey/metadata.xml
+++ b/www-client/seamonkey/metadata.xml
@@ -14,12 +14,10 @@
 		<flag name="chatzilla">Build Mozilla's IRC client (default on)</flag>
 		<flag name="custom-optimization">Build with user-specified compiler optimizations (-Os, -O0, -O1, -O2, -O3) from CFLAGS (unsupported)</flag>
 		<flag name="gmp-autoupdate">Allow Gecko Media Plugins (binary blobs) to be automatically downloaded and kept up-to-date in user profiles</flag>
-		<flag name="gtk3">Use the cairo-gtk3 rendering engine</flag>
 		<flag name="force-gtk3">Use the cairo-gtk3 rendering engine</flag>
 		<flag name="ipc">Use inter-process communication between tabs and plugins. Allows for greater stability in case of plugin crashes</flag>
 		<flag name="jemalloc">Enable or disable jemalloc</flag>
 		<flag name="roaming">Build roaming extension support (default on)</flag>
-		<flag name="skia">Enable the SKIA engine for 2D rendering as an alternative to cairo</flag>
 		<flag name="system-cairo">Use the system-wide <pkg>x11-libs/cairo</pkg> instead of bundled</flag>
 		<flag name="system-harfbuzz">Use the system-wide <pkg>media-libs/harfbuzz</pkg> instead of bundled</flag>
 		<flag name="system-icu">Use the sytem-wide <pkg>dev-libs/icu</pkg> instead of bundled</flag>
diff --git a/www-client/seamonkey/seamonkey-2.46-r1.ebuild b/www-client/seamonkey/seamonkey-2.46-r1.ebuild
deleted file mode 100644
index 13cdff31c035..000000000000
--- a/www-client/seamonkey/seamonkey-2.46-r1.ebuild
+++ /dev/null
@@ -1,391 +0,0 @@
-# Copyright 1999-2017 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=(be 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_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=45
-	SMPV="${PV%.[0-9].*}"
-	MOZ_P="${PN}-${SMPV}"
-	MOZ_HTTP_URI="https://archive.mozilla.org/pub/thunderbird/releases/${MOZ_PV/${SMPV}/${TB_MAJOR}}"
-	MOZ_GENERATE_LANGPACKS=1
-	S="${WORKDIR}/thunderbird-${MOZ_PV/${SMPV}/${TB_MAJOR}}"
-	SRC_URI="${SRC_URI}
-	${MOZ_HTTP_URI}/source/${MY_MOZ_P/${MOZ_P}/thunderbird-${TB_MAJOR}}.source.tar.xz
-	https://dev.gentoo.org/~axs/distfiles/${PN}-2.42.3.0-l10n-sources.tar.xz
-	https://dev.gentoo.org/~axs/distfiles/chatzilla-2.42.tar.xz
-	https://dev.gentoo.org/~axs/distfiles/dom-inspector-2.0.16.tar.xz
-	"
-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
-MOZCONFIG_OPTIONAL_JIT="enabled"
-inherit check-reqs flag-o-matic toolchain-funcs eutils mozconfig-v6.49 multilib pax-utils fdo-mime autotools mozextension nsplugins mozlinguas-v2
-
-PATCHFF="firefox-49.0-patches-04"
-PATCH="${PN}-2.46-patches-02"
-EMVER="1.9.6.1"
-
-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 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
-	crypt? ( https://www.enigmail.net/download/source/enigmail-${EMVER}.tar.gz )"
-
-ASM_DEPEND=">=dev-lang/yasm-1.1"
-
-RDEPEND=">=dev-libs/nss-3.25
-	>=dev-libs/nspr-4.12
-	crypt? ( || (
-		( >=app-crypt/gnupg-2.0
-			|| (
-				app-crypt/pinentry[gtk]
-				app-crypt/pinentry[qt5]
-				app-crypt/pinentry[qt4]
-			)
-		)
-		=app-crypt/gnupg-1.4* ) )"
-
-DEPEND="${RDEPEND}
-	!elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( dev-libs/libexecinfo ) ) )
-	crypt? ( dev-lang/perl )
-	amd64? ( ${ASM_DEPEND}
-		virtual/opengl )
-	x86? ( ${ASM_DEPEND}
-		virtual/opengl )"
-
-BUILD_OBJ_DIR="${S}/seamonk"
-
-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
-}
-
-src_prepare() {
-	# Apply our patches
-	eapply "${WORKDIR}"/seamonkey
-
-	# browser patches go here
-	pushd "${S}"/mozilla &>/dev/null || die
-	rm -f "${WORKDIR}"/firefox/2000-firefox_gentoo_install_dirs.patch
-	eapply "${WORKDIR}"/firefox
-	popd &>/dev/null || 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
-
-	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
-
-	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() {
-	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-	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
-
-	# 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
-
-	if use crypt ; then
-		pushd "${WORKDIR}"/enigmail &>/dev/null || die
-		econf
-		popd &>/dev/null || die
-	fi
-
-	# 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
-
-	# Only build enigmail extension if conditions are met.
-	if use crypt ; then
-		einfo "Building enigmail"
-		pushd "${WORKDIR}"/enigmail &>/dev/null || die
-		emake -j1
-		emake xpi
-		popd &>/dev/null || die
-	fi
-}
-
-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-gmpopenh264 ; 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}" \
-	emake DESTDIR="${D}" install
-	cp "${FILESDIR}"/${PN}.desktop "${T}" || die
-
-	if use crypt ; then
-		local em_dir="${WORKDIR}/enigmail/build"
-		pushd "${T}" &>/dev/null || die
-		unzip "${em_dir}"/enigmail*.xpi install.rdf || die
-		emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' install.rdf)
-		#'
-		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
-		cd "${D}"${MOZILLA_FIVE_HOME}/extensions/${emid} || die
-		unzip "${em_dir}"/enigmail*.xpi || die
-
-		popd &>/dev/null || die
-	fi
-
-	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
-
-	#doman "${BUILD_OBJ_DIR}/suite/app/${PN}.1"
-
-	# 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
-	fdo-mime_desktop_database_update
-
-	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.48-r1.ebuild b/www-client/seamonkey/seamonkey-2.48-r1.ebuild
deleted file mode 100644
index 01fae8065d91..000000000000
--- a/www-client/seamonkey/seamonkey-2.48-r1.ebuild
+++ /dev/null
@@ -1,433 +0,0 @@
-# Copyright 1999-2017 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=45
-	SMPV="${PV%.[0-9].*}"
-	MOZ_P="${PN}-${SMPV}"
-	MOZ_HTTP_URI="https://archive.mozilla.org/pub/thunderbird/releases/${MOZ_PV/${SMPV}/${TB_MAJOR}}"
-	MOZ_GENERATE_LANGPACKS=1
-	S="${WORKDIR}/thunderbird-${MOZ_PV/${SMPV}/${TB_MAJOR}}"
-	SRC_URI="${SRC_URI}
-	${MOZ_HTTP_URI}/source/${MY_MOZ_P/${MOZ_P}/thunderbird-${TB_MAJOR}}.source.tar.xz
-	https://dev.gentoo.org/~axs/distfiles/${PN}-2.42.3.0-l10n-sources.tar.xz
-	https://dev.gentoo.org/~axs/distfiles/chatzilla-2.42.tar.xz
-	https://dev.gentoo.org/~axs/distfiles/dom-inspector-2.0.16.tar.xz
-	"
-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.51 multilib pax-utils xdg-utils autotools mozextension nsplugins mozlinguas-v2
-
-PATCHFF="firefox-51.0-patches-06"
-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.1
-	>=dev-libs/nspr-4.13
-	crypt? ( || (
-		( >=app-crypt/gnupg-2.0
-			|| (
-				app-crypt/pinentry[gtk]
-				app-crypt/pinentry[qt5]
-				app-crypt/pinentry[qt4]
-			)
-		)
-		=app-crypt/gnupg-1.4* )
-		x11-plugins/enigmail
-	)
-	jack? ( virtual/jack )
-"
-
-DEPEND="
-	${RDEPEND}
-	!elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( dev-libs/libexecinfo ) ) )
-	crypt? ( dev-lang/perl )
-	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
-}
-
-src_prepare() {
-	# Apply our patches
-	eapply "${WORKDIR}"/seamonkey
-	eapply "${FILESDIR}/0001-CFLAGS-must-contain-fPIC-when-checking-the-linker.patch" #625992
-
-	# browser patches go here
-	pushd "${S}"/mozilla &>/dev/null || die
-	rm -f "${WORKDIR}"/firefox/1000_gentoo_install_dir.patch
-	rm -f "${WORKDIR}"/firefox/2000-firefox_gentoo_install_dirs.patch
-	eapply "${WORKDIR}"/firefox
-	eapply "${FILESDIR}/firefox-Include-sys-sysmacros.h-for-major-minor-when-availab.patch"
-	popd &>/dev/null || die
-
-	# ugly hackaround for system-harfbuzz
-	if ! grep -Fq "harfbuzz/hb-glib.h" mozilla/config/system-headers ; then
-		sed '/MOZ_SYSTEM_HARFBUZZ/aharfbuzz/hb-glib.h' \
-			-i mozilla/config/system-headers || die
-	else
-		einfo "harfbuzz hackery no longer needed."
-	fi
-
-	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
-
-	# 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
-
-	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() {
-	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-	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 crypt ; then
-		emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' "${EROOT%/}"/usr/share/enigmail/install.rdf)
-		if [[ -n ${emid} ]]; then
-			dosym "${EPREFIX%/}"/usr/share/enigmail ${MOZILLA_FIVE_HOME}/extensions/${emid}
-		else
-			eerror "${EPREFIX%/}/usr/share/enigmail/install.rdf: No such file or directory"
-			die "<EM:ID> tag for x11-plugins/enigmail could not be found!"
-		fi
-	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
-
-	# Because PM's dont seem to properly merge a symlink replacing a directory
-	if use crypt ; then
-		local emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' "${EROOT%/}"/usr/share/enigmail/install.rdf)
-		local emidpath="${EROOT%/}"${MOZILLA_FIVE_HOME}/extensions/${emid}
-		if [[ -z ${emid} ]]; then
-			eerror "${EROOT%/}/usr/share/enigmail/install.rdf: No such file or directory"
-			die "Could not find enigmail on disk during pkg_preinst()"
-		fi
-		if [[ ! -h "${emidpath}" ]] && [[ -d "${emidpath}" ]]; then
-			if ! rm -R --interactive=never "${emidpath}" ; then
-				eerror "Could not remove enigmail directory from previous installation,"
-				eerror "You must remove this by hand and rename the symbolic link yourself:"
-				eerror
-				eerror "\t cd ${EPREFIX%/}${MOZILLA_FIVE_HOME}/extensions"
-				eerror "\t rm -Rf ${emid}"
-				eerror "\t mv ${emid}.backup* ${emid}"
-			fi
-		fi
-	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.48.ebuild b/www-client/seamonkey/seamonkey-2.48.ebuild
deleted file mode 100644
index 452ce3d6bc8b..000000000000
--- a/www-client/seamonkey/seamonkey-2.48.ebuild
+++ /dev/null
@@ -1,430 +0,0 @@
-# Copyright 1999-2017 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=45
-	SMPV="${PV%.[0-9].*}"
-	MOZ_P="${PN}-${SMPV}"
-	MOZ_HTTP_URI="https://archive.mozilla.org/pub/thunderbird/releases/${MOZ_PV/${SMPV}/${TB_MAJOR}}"
-	MOZ_GENERATE_LANGPACKS=1
-	S="${WORKDIR}/thunderbird-${MOZ_PV/${SMPV}/${TB_MAJOR}}"
-	SRC_URI="${SRC_URI}
-	${MOZ_HTTP_URI}/source/${MY_MOZ_P/${MOZ_P}/thunderbird-${TB_MAJOR}}.source.tar.xz
-	https://dev.gentoo.org/~axs/distfiles/${PN}-2.42.3.0-l10n-sources.tar.xz
-	https://dev.gentoo.org/~axs/distfiles/chatzilla-2.42.tar.xz
-	https://dev.gentoo.org/~axs/distfiles/dom-inspector-2.0.16.tar.xz
-	"
-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.51 multilib pax-utils xdg-utils autotools mozextension nsplugins mozlinguas-v2
-
-PATCHFF="firefox-51.0-patches-06"
-PATCH="${PN}-2.46-patches-01"
-EMVER="1.9.8.1"
-
-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
-	crypt? ( https://www.enigmail.net/download/source/enigmail-${EMVER}.tar.gz )
-"
-
-ASM_DEPEND=">=dev-lang/yasm-1.1"
-
-RDEPEND="
-	>=dev-libs/nss-3.28.1
-	>=dev-libs/nspr-4.13
-	crypt? ( || (
-		( >=app-crypt/gnupg-2.0
-			|| (
-				app-crypt/pinentry[gtk]
-				app-crypt/pinentry[qt5]
-				app-crypt/pinentry[qt4]
-			)
-		)
-		=app-crypt/gnupg-1.4* ) )
-	jack? ( virtual/jack )
-"
-
-DEPEND="
-	${RDEPEND}
-	!elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( dev-libs/libexecinfo ) ) )
-	crypt? ( dev-lang/perl )
-	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
-}
-
-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
-	rm -f "${WORKDIR}"/firefox/2000-firefox_gentoo_install_dirs.patch
-	eapply "${WORKDIR}"/firefox
-	eapply "${FILESDIR}/firefox-Include-sys-sysmacros.h-for-major-minor-when-availab.patch"
-	popd &>/dev/null || die
-
-	# ugly hackaround for system-harfbuzz
-	if ! grep -Fq "harfbuzz/hb-glib.h" mozilla/config/system-headers ; then
-		sed '/MOZ_SYSTEM_HARFBUZZ/aharfbuzz/hb-glib.h' \
-			-i mozilla/config/system-headers || die
-	else
-		einfo "harfbuzz hackery no longer needed."
-	fi
-
-	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
-
-	# 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
-
-	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() {
-	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-	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
-
-	if use crypt ; then
-		pushd "${WORKDIR}"/enigmail &>/dev/null || die
-		econf
-		popd &>/dev/null || die
-	fi
-
-	# 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
-
-	# Only build enigmail extension if conditions are met.
-	if use crypt ; then
-		einfo "Building enigmail"
-		pushd "${WORKDIR}"/enigmail &>/dev/null || die
-		emake -j1
-		emake xpi
-		popd &>/dev/null || die
-	fi
-}
-
-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
-
-	if use crypt ; then
-		local em_dir="${WORKDIR}/enigmail/build"
-		pushd "${T}" &>/dev/null || die
-		unzip "${em_dir}"/enigmail*.xpi install.rdf || die
-		emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' install.rdf)
-		#'
-		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
-		cd "${D}"${MOZILLA_FIVE_HOME}/extensions/${emid} || die
-		unzip "${em_dir}"/enigmail*.xpi || die
-
-		popd &>/dev/null || die
-	fi
-
-	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.0_p0.ebuild b/www-client/seamonkey/seamonkey-2.49.5.0_p0.ebuild
index 619c394ae2f3..b416d59f01f4 100644
--- a/www-client/seamonkey/seamonkey-2.49.5.0_p0.ebuild
+++ b/www-client/seamonkey/seamonkey-2.49.5.0_p0.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
@@ -70,7 +70,7 @@ PATCH="${PN}-2.46-patches-01"
 
 DESCRIPTION="Seamonkey Web Browser"
 HOMEPAGE="http://www.seamonkey-project.org"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 x86"
 
 SLOT="0"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
diff --git a/www-client/seamonkey/seamonkey-2.49.4.0_p0.ebuild b/www-client/seamonkey/seamonkey-2.49.5.2_p0.ebuild
index bb914f46431e..fdac7c1d5486 100644
--- a/www-client/seamonkey/seamonkey-2.49.4.0_p0.ebuild
+++ b/www-client/seamonkey/seamonkey-2.49.5.2_p0.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
@@ -39,12 +39,9 @@ elif [[ ${PV} == *_p[0-9] ]]; then
 	SMPV="${PV%.[0-9].*}"
 	MOZ_P="${PN}-${MOZ_PV}"
 	MOZ_HTTP_URI="https://archive.mozilla.org/pub/thunderbird/releases/${MOZ_PV/${SMPV}/${TB_MAJOR}}"
-# the following is for self-rolling localizations
 	#MOZ_GENERATE_LANGPACKS=1
-	#SRC_URI="${SRC_URI}
-	#https://dev.gentoo.org/~axs/distfiles/${PN}-${SMPV}-l10n-sources-20170727.tar.xz"
-# for this one use the localizations pre-rolled upstream for 2.49.1-candidate build 2
-	MOZ_LANGPACK_PREFIX="../../../seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/"
+	#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"
@@ -68,7 +65,7 @@ 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.2-patches-03"
+PATCHFF="firefox-52.4-patches-02"
 PATCH="${PN}-2.46-patches-01"
 
 DESCRIPTION="Seamonkey Web Browser"
@@ -90,10 +87,10 @@ SRC_URI+="
 ASM_DEPEND=">=dev-lang/yasm-1.1"
 
 RDEPEND="
-	>=dev-libs/nss-3.28.1
-	>=dev-libs/nspr-4.13
-	crypt? ( x11-plugins/enigmail )
+	>=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="
@@ -218,7 +215,6 @@ src_prepare() {
 }
 
 src_configure() {
-	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
 	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
@@ -351,16 +347,6 @@ src_install() {
 		rm -rf "${ED}"/usr/include "${ED}${MOZILLA_FIVE_HOME}"/{idl,include,lib,sdk}
 	fi
 
-	if use crypt ; then
-		emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' "${EROOT%/}"/usr/share/enigmail/install.rdf)
-		if [[ -n ${emid} ]]; then
-			dosym "${EPREFIX%/}"/usr/share/enigmail ${MOZILLA_FIVE_HOME}/extensions/${emid}
-		else
-			eerror "${EPREFIX%/}/usr/share/enigmail/install.rdf: No such file or directory"
-			die "<EM:ID> tag for x11-plugins/enigmail could not be found!"
-		fi
-	fi
-
 	if use chatzilla ; then
 		local emid='{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}'
 
@@ -394,26 +380,6 @@ pkg_preinst() {
 	if [ -d ${MOZILLA_FIVE_HOME}/plugins ] ; then
 		rm ${MOZILLA_FIVE_HOME}/plugins -rf
 	fi
-
-	# Because PM's dont seem to properly merge a symlink replacing a directory
-	if use crypt ; then
-		local emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' "${EROOT%/}"/usr/share/enigmail/install.rdf)
-		local emidpath="${EROOT%/}"${MOZILLA_FIVE_HOME}/extensions/${emid}
-		if [[ -z ${emid} ]]; then
-			eerror "${EROOT%/}/usr/share/enigmail/install.rdf: No such file or directory"
-			die "Could not find enigmail on disk during pkg_preinst()"
-		fi
-		if [[ ! -h "${emidpath}" ]] && [[ -d "${emidpath}" ]]; then
-			if ! rm -R --interactive=never "${emidpath}" ; then
-				eerror "Could not remove enigmail directory from previous installation,"
-				eerror "You must remove this by hand and rename the symbolic link yourself:"
-				eerror
-				eerror "\t cd ${EPREFIX%/}${MOZILLA_FIVE_HOME}/extensions"
-				eerror "\t rm -Rf ${emid}"
-				eerror "\t mv ${emid}.backup* ${emid}"
-			fi
-		fi
-	fi
 }
 
 pkg_postinst() {
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 81cabdbebb3b..2e16d17baa37 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/boa/Manifest b/www-servers/boa/Manifest
index 74306986be70..7f3609f944cc 100644
--- a/www-servers/boa/Manifest
+++ b/www-servers/boa/Manifest
@@ -7,6 +7,5 @@ AUX boa.rc6 816 BLAKE2B 2ec091bedbe7b32c554191a78dd5d46bc50bba21c1ee85b867611247
 AUX boa.service 131 BLAKE2B a77133453d32a7798704019470156e54842878f125f3bdab28f71ed804aa4b910621328b7b486a4b24dceaf1e82012a09de59977a460263c57e0e8aaa13f5329 SHA512 62628a38bd679e10b0f5d3712d206fe292d4adf0ed4af9387b7e923ce0c2efad060f139a8cf5d0aad89485ee4ba94565387e6cf0858e779538d24705aa01ee99
 AUX mime.types 5488 BLAKE2B c87384f25be47bc2640029ff51b7e10b830a3544c89072f8033bb23018920ef9d98b2db7f8c6d71e4bb5157f3858c49d682d0eb8708273a4ede0afffa7f86239 SHA512 5498bc2cf93640f04240b96ff6ac297d9900d44180a9fc6d4a763f5c97c140f46e0a16efb736be6e295b9448915c80830854eb2c705f37b04633fed6352262bd
 DIST boa-0.94.14rc21.tar.gz 199950 BLAKE2B 763c3f9d3b4a0442d16372121b9d1a584dbfc43848c3cd89a8f33e4728dc2924fc32161dd8b756d74fcaa6ddbc5839b59a3cc4b88353892d79eb455a09687700 SHA512 ca8e5c2c29f0b6cd4fd2f7268682dc345c1d37f4de099319e22d63d822a72195659d707e148f2e2725edec88d90208fc40702f15ab2cacadc9957f1a0437d798
-EBUILD boa-0.94.14_rc21-r1.ebuild 1200 BLAKE2B a88bb29e08db5b77345b857bf5f7e399a64339c3eef9815cfd1efd22b1b6a4276d0e88b8c76bb22254b099e7d81a9f9b03bee06d9f17a23c55ac747dbc284909 SHA512 1167ac6fb017b9b21b3d90b36afb3cc34fb4b270169e5e0747847f171b3161bb49ed6c5c36934ad5a180fd792f70b3bae2902ee117b98dcd7413311b69929337
 EBUILD boa-0.94.14_rc21-r2.ebuild 1202 BLAKE2B 7b22623c7d6aab6b5a5accbf2f845dc6b66e5494dfabc8a7542220b47fbf58017c1f183df62ca6f9d4cb7072ac289725c8787efd1a2b7129ff461d62c28abca7 SHA512 8251a496b079e459a3e00f333f6b75d3a35b1c94e980a33e777411320e7d0bd001f46dde3abf2ab377f6f5cfa041db0f226a75b438d38107224a8494a34293fc
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/www-servers/boa/boa-0.94.14_rc21-r1.ebuild b/www-servers/boa/boa-0.94.14_rc21-r1.ebuild
deleted file mode 100644
index 1b0652fa298e..000000000000
--- a/www-servers/boa/boa-0.94.14_rc21-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils systemd
-
-MY_P=${P/_/}
-DESCRIPTION="A very small and very fast http daemon"
-SRC_URI="http://www.boa.org/${MY_P}.tar.gz"
-HOMEPAGE="http://www.boa.org/"
-
-KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc"
-
-RDEPEND=""
-DEPEND="sys-devel/bison
-	sys-devel/flex
-	doc? ( virtual/latex-base )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-texi.patch
-	epatch "${FILESDIR}"/${P}-ENOSYS.patch
-}
-
-src_compile() {
-	default
-
-	use doc || sed -i -e '/^all:/s/boa.dvi //' docs/Makefile
-	emake docs
-}
-
-src_install() {
-	dosbin src/boa
-	doman docs/boa.8
-	doinfo docs/boa.info
-	if use doc; then
-		dodoc docs/boa.html
-		dodoc docs/boa_banner.png
-		dodoc docs/boa.dvi
-	fi
-
-	keepdir /var/log/boa
-	keepdir /var/www/localhost/htdocs
-	keepdir /var/www/localhost/cgi-bin
-	keepdir /var/www/localhost/icons
-
-	newinitd "${FILESDIR}"/boa.rc6 boa
-	newconfd "${FILESDIR}"/boa.conf.d boa
-
-	systemd_dounit "${FILESDIR}"/boa.service
-
-	exeinto /usr/lib/boa
-	doexe src/boa_indexer
-
-	insinto /etc/boa
-	doins "${FILESDIR}"/boa.conf
-	doins "${FILESDIR}"/mime.types
-}
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 2d2fad63dc65..7e27b986ccb5 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -47,7 +47,7 @@ DIST ngx_mogilefs_module-1.0.4.tar.gz 11208 BLAKE2B e0729b66554c8890727190a624d4
 DIST ngx_rtmp-1.2.0.tar.gz 519895 BLAKE2B a5a888473dd2ba2320ff74017e8445d96fa3e361acc559edb270ad075c937ab5630e537a67ad8ed134a7ec5809ae63e38791ac25ceab3e26160469be8cc2e82c SHA512 8965d9bee91a46375516ccd012d1c43cd23f15c0630d11ed01472b9a84504574b476f22c5584f43c972a8f923e9ae025b9b60c64aace0ed159c7279bcbd376c8
 DIST ngx_rtmp-1.2.1.tar.gz 519919 BLAKE2B 744ccb8031eb9653f158f9eceba64fc9c8af7b9a42e64ef996ab3bbbe1402e5ffd3efcc8e4aaca437eb5e208e4b6f2d8643fcca953b32f32543eaa1ae4d9505c SHA512 4a0af5e9afa4deb0b53de8de7ddb2cfa6430d372e1ef9e421f01b509548bd134d427345442ac1ce667338cc2a1484dc2ab732e316e878ac7d3537dc527d5f922
 EBUILD nginx-1.12.1.ebuild 37447 BLAKE2B 1b51a2bd6e51b6120b099c9fdac42ed4655c09efe440388c53f0a1445e14be56b242f6ad6f73c213ec836761274cc3ff18fd19abeea7863bd12eab23697c6d25 SHA512 dad602d21ce679a674455f478efad66d1532862d277e65797279c476d24242c4f4b04bd03168a14eee171148d3d2d6488b80a86b001036b087a02630d9ad6642
-EBUILD nginx-1.12.2-r1.ebuild 37151 BLAKE2B b45ef0236cebc897ee5e448a2d3b4aa18069a2acdf2d2a26b0d0c99fea8b993353a1d04660da946a0df4c663ce5e5e8dd7c8b799bd1fe7f289559fa062f4fcfc SHA512 cb9bbe27bc6990905a782426d993a19985cb6ab0b61f120c9e138f081fb11748cbdb958ffa781f863c8aa4c1115544b9203cad3781481067215d8d71f7e5db5e
+EBUILD nginx-1.12.2-r1.ebuild 37150 BLAKE2B 65fed3395350ccd46c82c77e42ca5b0407127832fae1b3a3b660fd5d6f13adc6aef65cd340d41c5a0212241881f23843f1cf849dfc46c972f3741e0facc2d5a8 SHA512 59897652e9dfd97468de4b447cbd080917f65d12507ffd2ec0037227c69b029242c8710aa20c041a6f3abe93d8ffd1e8678c131059b612697e1af1d6b702b31c
 EBUILD nginx-1.13.7.ebuild 37167 BLAKE2B 48231e7da06b4d249a7ed44108e5d8aa8922a612d6b5327b253635e569755c9f1b622e470c86feac2a27b8fe58048409afee222e2163fb2aad55a216139d16ff SHA512 077d4d564d804555d6dff74e525276435669db3e011b9f54da8401321c3cc275106d375b95ab649bf203c38132cd55e70fa203bc7da20a0af84cd87ead877171
 EBUILD nginx-1.13.8.ebuild 37167 BLAKE2B 2dbdb6a067079729fe7f138035ae48a1bf701e27e466081e89469be458087671773beebf79e935bfd1bea6628843b5b228d633628609beb6fa1473094d2d58dd SHA512 f6f3cfa0edafa058b1ca894ff2722928f66039715c1da70f0d6c1287bd1764b7b2674a1d1576cc389749f570801994ec41cf0b28615d566ecd5b7cddf36b18b3
 MISC metadata.xml 1309 BLAKE2B 9da8c2589e775e0ed57a344ba2d6c5e9d29908c253fd77306b2ea2f7392d9bda64ec18ee9120640e5d22e3624b79131377b3020e7e35a9603916ee8c6e8d663e SHA512 ea27337d56750dfa1c7a478eb0bdb4318cb03e181e16cee304e6beeb3261abde75cddb68a4249ceb97089d3e6740bcae10ff3441ac9f5e8a074409080313ca73
diff --git a/www-servers/nginx/nginx-1.12.2-r1.ebuild b/www-servers/nginx/nginx-1.12.2-r1.ebuild
index cacb3fe4c7f5..40d650b17fe8 100644
--- a/www-servers/nginx/nginx-1.12.2-r1.ebuild
+++ b/www-servers/nginx/nginx-1.12.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="6"
@@ -172,7 +172,7 @@ LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+
 	nginx_modules_http_push_stream? ( GPL-3 )"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 # Package doesn't provide a real test suite
 RESTRICT="test"
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index c0a396306195..e14bd59ce7ea 100644
--- a/x11-drivers/Manifest.gz
+++ b/x11-drivers/Manifest.gz
diff --git a/x11-drivers/afb-ucode/Manifest b/x11-drivers/afb-ucode/Manifest
deleted file mode 100644
index 5a7052e056dd..000000000000
--- a/x11-drivers/afb-ucode/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST afb-ucode.tar.bz2 36421 BLAKE2B d59c7331da0ad3769259948dd958a3884aab8bf5f5e7c424382d16189ca4098f96b8d0851fc9407cce112669277e911f98c863aebe595392fa2b6a8d4207e22a SHA512 f90a9b04e7b01f432bffb3ebe78b6e283c1878512b2310df7a96f982f43aa1aabda952670efc4c4cd3a60ba008fdd4c57684672c7735fe902da88262a68417f3
-EBUILD afb-ucode-1.3.11.ebuild 501 BLAKE2B e71535c6c5a184df64e62431ec5b693ac7aeda31bbf02fb8abf73f5015db8f7a1ad09450b124d2074705726b21bcc5f7bc781103cd127f09bd7bfb5ead87e583 SHA512 2c8b39acdc0c5432be2f6f38837e2ce7bf8bb54237d465727d12bcee9c779aa00cd4a2aa54342a833bcc47ce9a09b90c6f02eabf2b3e20bb51d993408dca1c44
-MISC metadata.xml 259 BLAKE2B 396ca927fdc93057fc68b14bbbcc6f8178135988d862c08bf6f213b7137bca2e3588640e8e2b625755236409e36821ae7b7cf0747477a9c2c37cce3fbd406dbd SHA512 9155e5b4b4f6fd684acd0d3783aea6c086855b00e2318b8700ca8ecddaa90aabd0f5a476f6972113f3708ee6741a4e02f04056c411fd8e96e0a9029a3ffb1651
diff --git a/x11-drivers/afb-ucode/afb-ucode-1.3.11.ebuild b/x11-drivers/afb-ucode/afb-ucode-1.3.11.ebuild
deleted file mode 100644
index 230d76f8d362..000000000000
--- a/x11-drivers/afb-ucode/afb-ucode-1.3.11.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Binary blob microcode for Elite3D framebuffers, required by xf86-video-sunffb"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="
-	http://dlc.sun.com/osol/sparc-gfx/downloads/${PN}.tar.bz2
-	mirror://gentoo/${PN}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="-* sparc"
-IUSE=""
-
-RDEPEND="x11-misc/afbinit"
-
-S="${WORKDIR}/${PN}"
-
-src_install() {
-	dolib.a afb.ucode
-}
diff --git a/x11-drivers/afb-ucode/metadata.xml b/x11-drivers/afb-ucode/metadata.xml
deleted file mode 100644
index b21e0850135f..000000000000
--- a/x11-drivers/afb-ucode/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>sparc@gentoo.org</email>
-	<name>Gentoo Linux SPARC Development</name>
-</maintainer>
-</pkgmetadata>
diff --git a/x11-drivers/xf86-video-apm/Manifest b/x11-drivers/xf86-video-apm/Manifest
deleted file mode 100644
index cd3b9e00966c..000000000000
--- a/x11-drivers/xf86-video-apm/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX xf86-video-apm-1.2.5-remove-mibstore_h.patch 581 BLAKE2B daa1d073f99b4aa01a50e6d8e9fb67148b0cb07af10185b7c9d2edbe00b9a9e6ea6918d13c785ef29147e4d1d9f7f26771a485ea10068db906639633ebf9ad6a SHA512 f27a8f9f3206de54ce9f05596d78829832e7576b5d515d22b0052e39c70fef63e85f016c2c1dfad45aa6d09cb59582d101854552fc44970275f1b38688924d52
-DIST xf86-video-apm-1.2.4.tar.bz2 325979 BLAKE2B bc1976c5ce975b14ca2a9e0e54c3a5a2b6114d73c9c89c7bdd8a0dc4627c1f1dadd705860a97f3a1b49357fe25dbf173ed26623217f1f5e0d6b6cd225194fa46 SHA512 4b98614d8f2889d5330b50cb211f8b1f03ac9be30d531b7c14b117fa144b8a279b2f892370e19380a898711d95a6bfc11a116955c1caed65981798e3199211f1
-DIST xf86-video-apm-1.2.5.tar.bz2 325277 BLAKE2B 05719cb41069f6b7f09be4d4f81787213673560ff7d0570cf65d200b6ec66ae35910c6d4aa810ccb226f9337e7693cb3e719bbc4bfbd552d16b951f4d8eaf8ef SHA512 652307d5e21fcd0df890b941821f409cc0c9846133cf7e522799710d28ebf0d8ff2d8ead3235d8207169f416a6561bc14b4fedb1baaddb1bddf03007372af622
-EBUILD xf86-video-apm-1.2.4.ebuild 296 BLAKE2B 2dd69c27114352564117823ae09514daff5b25f415d28112784609dc487ce2d9827581fae183a17c0428fb32c560f42aa78e71e9c21cf17161184c81c3f3dd17 SHA512 04bc455159061e8a82350e3222c7b5f1cfe1cddb5d865a5123070c5562cda9b896708ca9f7a087d7c25b1347365f89d4aad36f2bbd68611412f3f197fcf083c3
-EBUILD xf86-video-apm-1.2.5-r1.ebuild 353 BLAKE2B da3b079c41a92f8fc9e8011aaccfe4b139499942b40f203b6771dc9d53e1c3c828648587b7427da259dc3d62f5962204255626bfdd28bf65ae0a895f8923c22a SHA512 a79ba7ad44496c5e1a87ff83fd345db5e83b4b2fcf2c7a7958096d0771bc752d090d7aac0aa8ffd4713e4e82d5739a707f4f42be6b832215f329a72b57791128
-EBUILD xf86-video-apm-1.2.5.ebuild 296 BLAKE2B 2dd69c27114352564117823ae09514daff5b25f415d28112784609dc487ce2d9827581fae183a17c0428fb32c560f42aa78e71e9c21cf17161184c81c3f3dd17 SHA512 04bc455159061e8a82350e3222c7b5f1cfe1cddb5d865a5123070c5562cda9b896708ca9f7a087d7c25b1347365f89d4aad36f2bbd68611412f3f197fcf083c3
-MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-apm/files/xf86-video-apm-1.2.5-remove-mibstore_h.patch b/x11-drivers/xf86-video-apm/files/xf86-video-apm-1.2.5-remove-mibstore_h.patch
deleted file mode 100644
index e48d2c42d832..000000000000
--- a/x11-drivers/xf86-video-apm/files/xf86-video-apm-1.2.5-remove-mibstore_h.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 9f67408e4f078e907fbf4feb45cfdcfd0cdebcca Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Thu, 10 Jan 2013 03:03:29 +0000
-Subject: Remove #include "mibstore.h"
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
-diff --git a/src/apm.h b/src/apm.h
-index a3c06f8..365e5e2 100644
---- a/src/apm.h
-+++ b/src/apm.h
-@@ -33,9 +33,6 @@
- /* All drivers initialising the SW cursor need this */
- #include "mipointer.h"
- 
--/* All drivers implementing backing store need this */
--#include "mibstore.h"
--
- /* I2C support */
- #include "xf86i2c.h"
- 
---
-cgit v0.9.0.2-2-gbebe
diff --git a/x11-drivers/xf86-video-apm/metadata.xml b/x11-drivers/xf86-video-apm/metadata.xml
deleted file mode 100644
index e943b72b8a48..000000000000
--- a/x11-drivers/xf86-video-apm/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>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
-</pkgmetadata>
diff --git a/x11-drivers/xf86-video-apm/xf86-video-apm-1.2.4.ebuild b/x11-drivers/xf86-video-apm/xf86-video-apm-1.2.4.ebuild
deleted file mode 100644
index 8e8549b0093c..000000000000
--- a/x11-drivers/xf86-video-apm/xf86-video-apm-1.2.4.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit xorg-2
-
-DESCRIPTION="Alliance ProMotion video driver"
-
-KEYWORDS="amd64 ia64 x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}"
diff --git a/x11-drivers/xf86-video-apm/xf86-video-apm-1.2.5-r1.ebuild b/x11-drivers/xf86-video-apm/xf86-video-apm-1.2.5-r1.ebuild
deleted file mode 100644
index bc8f9a126227..000000000000
--- a/x11-drivers/xf86-video-apm/xf86-video-apm-1.2.5-r1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="Alliance ProMotion video driver"
-
-KEYWORDS="amd64 ia64 x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-remove-mibstore_h.patch
-)
diff --git a/x11-drivers/xf86-video-apm/xf86-video-apm-1.2.5.ebuild b/x11-drivers/xf86-video-apm/xf86-video-apm-1.2.5.ebuild
deleted file mode 100644
index 8e8549b0093c..000000000000
--- a/x11-drivers/xf86-video-apm/xf86-video-apm-1.2.5.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit xorg-2
-
-DESCRIPTION="Alliance ProMotion video driver"
-
-KEYWORDS="amd64 ia64 x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}"
diff --git a/x11-drivers/xf86-video-ark/Manifest b/x11-drivers/xf86-video-ark/Manifest
deleted file mode 100644
index f580f954ee01..000000000000
--- a/x11-drivers/xf86-video-ark/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX xf86-video-ark-0.7.5-remove-mibstore_h.patch 953 BLAKE2B 91c8978506d6e9e9723e75fbe4a5b439a5dfc902fa9037475b093f4efcaf30f15043ffa9e9fd3fa519f65213edaa65e080c76794f51a2ece1413f1135f470c4e SHA512 864834c7dcb15df57dcc7ad54b80367569ad258df3a6312a3010ab3bfe11cbfff68a50410627adb510f6eddc233a93e48d7bcc4e754d9a1045e6a7eaf1327535
-DIST xf86-video-ark-0.7.5.tar.bz2 290423 BLAKE2B 0c787bd335942d807b5575d00ffa402f71b99f7b969f7ac91cc485f95b217788c4c7d359f11b22bd9896900ac9c9130eede0f43180d9cecea43081eed69ec2c1 SHA512 67c2b4e2109bf9d84a007c9679d35e7c0a4e4ddcdb7be9fa5070ce7e2f666e018d8421ddd4890cf3abb4eb37e060a10666c62a9efbb5369eb7cd8647ee18a644
-EBUILD xf86-video-ark-0.7.5.ebuild 381 BLAKE2B 8ae4480fdb27703e7b0e2cc52fc96683b2d5c2c28e64993e91926ca0bddc0e9cdeed26aae4e5f942bb239ffb693a96f511ed316b236acc8b48c269655b59e390 SHA512 d3b199e9580214bfadde26a7d9566909f96bd6a8ce726653133a901611cf765841af17abec7996c5bbfdb40043c4113053d3df2ee693c8e05414686bd698c95e
-MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-ark/files/xf86-video-ark-0.7.5-remove-mibstore_h.patch b/x11-drivers/xf86-video-ark/files/xf86-video-ark-0.7.5-remove-mibstore_h.patch
deleted file mode 100644
index 1acea99c45b1..000000000000
--- a/x11-drivers/xf86-video-ark/files/xf86-video-ark-0.7.5-remove-mibstore_h.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 3a3eb72baec46f48e6cf15a834271c3d3386deac Mon Sep 17 00:00:00 2001
-From: Gaetan Nadon <memsize@videotron.ca>
-Date: Tue, 17 Sep 2013 19:55:37 +0000
-Subject: Remove usage of mibstore.h (removed from server)
-
-The module had a compile error for this missing header file.
-
-Changes similar to vmware commit
-23d87c92b7211cc5249eefe4ab3a2c7f370e279e
-
-Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
-Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
----
-diff --git a/src/ark_driver.c b/src/ark_driver.c
-index b7c287c..65cfe84 100644
---- a/src/ark_driver.c
-+++ b/src/ark_driver.c
-@@ -39,7 +39,6 @@
- #include "compiler.h"
- #include "mipointer.h"
- #include "micmap.h"
--#include "mibstore.h"
- #include "fb.h"
- #include "ark.h"
- 
-@@ -538,7 +537,6 @@ static Bool ARKScreenInit(SCREEN_INIT_ARGS_DECL)
- 
- 	fbPictureInit (pScreen, 0, 0);
- 
--	miInitializeBackingStore(pScreen);
- 	xf86SetBackingStore(pScreen);
- 
- 	if (!pARK->NoAccel) {
---
-cgit v0.9.0.2-2-gbebe
diff --git a/x11-drivers/xf86-video-ark/metadata.xml b/x11-drivers/xf86-video-ark/metadata.xml
deleted file mode 100644
index e943b72b8a48..000000000000
--- a/x11-drivers/xf86-video-ark/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>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
-</pkgmetadata>
diff --git a/x11-drivers/xf86-video-ark/xf86-video-ark-0.7.5.ebuild b/x11-drivers/xf86-video-ark/xf86-video-ark-0.7.5.ebuild
deleted file mode 100644
index 0aa31dc98613..000000000000
--- a/x11-drivers/xf86-video-ark/xf86-video-ark-0.7.5.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="X.Org driver for ark cards"
-KEYWORDS="amd64 ia64 x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	>=x11-libs/libpciaccess-0.12.901"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-remove-mibstore_h.patch
-)
diff --git a/x11-drivers/xf86-video-chips/Manifest b/x11-drivers/xf86-video-chips/Manifest
deleted file mode 100644
index 32dbd00079fb..000000000000
--- a/x11-drivers/xf86-video-chips/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST xf86-video-chips-1.2.7.tar.bz2 426013 BLAKE2B 6b4c840614f6e8eb8fab93f6da172588e028337715d02ab33c997000bfa083e2ba92d2886a38f825d11faad928cc2e65614a43eb3bc830b9dbdb75eec708c5eb SHA512 12a98b79b9eba42fd408b9ac9568600dd3b1e7552841dff9b86afad78f3730e354e9ce0df1f6229a06933b7f4d7598a36227f203749447076eb63c4a9c9811f9
-EBUILD xf86-video-chips-1.2.7.ebuild 243 BLAKE2B 8b439829855895d6830013d7c0014244728e7cc7e6817673ed729e521b379a87bf1eeb7f97acaa9e5b2beaf0929da7c5a4bd91ffc46066b4e0a368aaef43c2ad SHA512 8d14c76e2a7e9c773f902890f3dabb9f2ee47d89412e5933c7c086cc8a1b9ac9ea03d6aef22a964c9795c5cbb62dd12bfc10bc2937f549776d3cf5066d8b7257
-MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-chips/metadata.xml b/x11-drivers/xf86-video-chips/metadata.xml
deleted file mode 100644
index e943b72b8a48..000000000000
--- a/x11-drivers/xf86-video-chips/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>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
-</pkgmetadata>
diff --git a/x11-drivers/xf86-video-chips/xf86-video-chips-1.2.7.ebuild b/x11-drivers/xf86-video-chips/xf86-video-chips-1.2.7.ebuild
deleted file mode 100644
index 3f39b90225fd..000000000000
--- a/x11-drivers/xf86-video-chips/xf86-video-chips-1.2.7.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="Chips and Technologies video driver"
-
-KEYWORDS="amd64 ia64 ppc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
diff --git a/x11-drivers/xf86-video-cirrus/Manifest b/x11-drivers/xf86-video-cirrus/Manifest
deleted file mode 100644
index eb3b24086741..000000000000
--- a/x11-drivers/xf86-video-cirrus/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST xf86-video-cirrus-1.5.1.tar.bz2 329436 BLAKE2B cfe1ac727e110ce854f2531246b2a50bad5e9d486c1216ee34a632a22c0e70ca0898275675da54ed489140288d043ae828e744c24c81714a925117eecf85e249 SHA512 1f134986e6d91ecb9f88c331240f3d4b687029c45db1321dd1d95fefd88991bc38c2ec634259a58a8178d567dc0902d98800edf87886f691db10e5fd5385c526
-DIST xf86-video-cirrus-1.5.2.tar.bz2 327547 BLAKE2B 3b21643b0423f36b654e31efdda5a96e942c01fc30080bf37729b7d6f965e6b26971dadeccc8998e085a7cdbaf9ace183a8a0294d9b9e9053add015c32cae4e9 SHA512 2af1b089527fb715b07b6d50da863972a1d063863e976c5e75576e70b502b74af43bc38adba917dc916f79d9d122ada41f49dcaf41b4b4289de012a4ef4be838
-DIST xf86-video-cirrus-1.5.3.tar.bz2 338930 BLAKE2B d5ab9cf1f2d19b4d29af2e5d52ed7f69c6e1952304d4f88ea4ce2c7498f8297aac431e16105dd921c51adf1e89e6104d484c945f8bd192434b81f4134a43eb2c SHA512 6aec70f943d9bf7455782d300bd5e1caab5c90408cdca25b9a3ef314e565082f3249a179fb508be36a61c8a34006c0ace14b9aa41f724f479511a906fa8f4798
-EBUILD xf86-video-cirrus-1.5.1.ebuild 298 BLAKE2B e21098187cc5b6243e1d33c01134bd3f9f7a0b2a72a75607ff989517cbd95ab78c8d19bec7bb10d125db535459b16cac37391951684ecbcbcf5f0c5290cd04ce SHA512 8e03426b4a519cfb070e6254498675234fa28fae8b5febdfedbaeedcdcd08ddb95e212c27b1dfeff91476684ff755724ea5d31864e61b4468d376c611556d726
-EBUILD xf86-video-cirrus-1.5.2.ebuild 298 BLAKE2B e21098187cc5b6243e1d33c01134bd3f9f7a0b2a72a75607ff989517cbd95ab78c8d19bec7bb10d125db535459b16cac37391951684ecbcbcf5f0c5290cd04ce SHA512 8e03426b4a519cfb070e6254498675234fa28fae8b5febdfedbaeedcdcd08ddb95e212c27b1dfeff91476684ff755724ea5d31864e61b4468d376c611556d726
-EBUILD xf86-video-cirrus-1.5.3.ebuild 298 BLAKE2B f198d13925b71dfcccb391fcd7a9b57f1a00dec227eb0bd58e4fe7d49350e058964a3663b2fa0ae317337735185faeedb2cabf4695f9bfff260eef471bafeed9 SHA512 b91681d5bbfb8823b87ac88d2398b5cd755ce98bfcb58080cc8cd3a102ef981d516a9186dfa53e87b2783a6abca1177450f5c3842310b000326f7b9a59faea9c
-MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-cirrus/metadata.xml b/x11-drivers/xf86-video-cirrus/metadata.xml
deleted file mode 100644
index e943b72b8a48..000000000000
--- a/x11-drivers/xf86-video-cirrus/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>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
-</pkgmetadata>
diff --git a/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.5.1.ebuild b/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.5.1.ebuild
deleted file mode 100644
index 72aa149e9b52..000000000000
--- a/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.5.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit xorg-2
-
-DESCRIPTION="Cirrus Logic video driver"
-KEYWORDS="alpha amd64 ia64 ppc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}"
diff --git a/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.5.2.ebuild b/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.5.2.ebuild
deleted file mode 100644
index 72aa149e9b52..000000000000
--- a/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.5.2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit xorg-2
-
-DESCRIPTION="Cirrus Logic video driver"
-KEYWORDS="alpha amd64 ia64 ppc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}"
diff --git a/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.5.3.ebuild b/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.5.3.ebuild
deleted file mode 100644
index eea225f94433..000000000000
--- a/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.5.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit xorg-2
-
-DESCRIPTION="Cirrus Logic video driver"
-KEYWORDS="alpha amd64 ia64 ppc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}"
diff --git a/x11-drivers/xf86-video-freedreno/Manifest b/x11-drivers/xf86-video-freedreno/Manifest
deleted file mode 100644
index 849c7d0c2851..000000000000
--- a/x11-drivers/xf86-video-freedreno/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST xf86-video-freedreno-1.0.0.tar.bz2 310884 BLAKE2B 34ca1cfa05c6eac757f1790157e32ebe1531d9876b117de96899e02abfbfa2b77408bd4b30a0b428c479a6fe4b4c7c204e718e0b7efe919e95ebf9223873afb1 SHA512 80d1d8a5d69dd36df2c23f72460c40604d1873389bc3ab446b876587500dac4c88b10512552a884809bdc886207649ba3815d5a0e576d23ea723823055ac4877
-DIST xf86-video-freedreno-1.1.0.tar.bz2 324575 BLAKE2B 99840026c439cdff8b2ded64598c6e65c2ee5cdea696b74bbd0a30b4b887fa118ea56289bc268d2bbd808f4e900bca5cad012497f8b28267083220821a41fb46 SHA512 f4dfa1e246340b59ebf49826b71edc8d69ae9fea3ff41780d0a11fe5fab8e714b094cc8bd7e8d20537eac52d489518a8ae3848fd13d584ed764d14066d0cf117
-DIST xf86-video-freedreno-1.3.0.tar.bz2 327153 BLAKE2B de6bace88b44a296631c36fa1fa80e67832d21e53477a4fc25e1524ae42eeb76f30f84eb903caab21450977907c233f87967f7db0c3014b8c8265ab1befea167 SHA512 f897cf0f7dda36212ef44379cd23d838f1a01832911b3ca52771ccbca6c3722da2c9218bac78679b610d8c3a7f56d05ba3823bea7cbbaef3366b4b14e9e311fd
-DIST xf86-video-freedreno-1.4.0.tar.bz2 312898 BLAKE2B d2144bee03918599a16b19ccd71057f0958bc15322be8183c6f65e4099ea4de00390825e433476d3c7e38e82812d6d0fbf6cf9e9fd028b84aa525b88c3278b49 SHA512 5bc7c35bd79e8ff90d8da5360413b03c497ba3dec9399c78fc85e8f1d2bf8955c27c6b225dfbbcdb73a16a4b539cfa131e309866e42289cb577d0e9bfc15b6ca
-EBUILD xf86-video-freedreno-1.0.0.ebuild 453 BLAKE2B 5259bb68b0ae7303ee079dbde2dca00bfef1d84845685f67056937136c2a1971c6044f1b56ee5a9d2f403be7e4a0e907003df57573b6eaf65f0d8dde7b351c08 SHA512 4095113db5554c960fdc4e8f4be786e46e10f02d9b02daed66c381b66610268c0f65f3e3272e699f7f24043768aecacc89e32a263488956e56744922961b288a
-EBUILD xf86-video-freedreno-1.1.0.ebuild 340 BLAKE2B c6a13caa3027305d649a5014861466af6c0bf48656e2066030c08cfbfb8d4af93e1e66c3394e4c813acd5a1556b54032c5a91410b854b7d9e28cb36c17d4eef8 SHA512 990fd5a0fa69f87b765f18f47ffddd65f3230645444854c99c7f35eda59995cfa4a325792f47775fdb3b028ac402f160b61fb751f8af803f16fad78c0a80ed98
-EBUILD xf86-video-freedreno-1.3.0.ebuild 339 BLAKE2B 72dac3f4443bab0ebcfd7d1c25abf151b9ced24944886fc1fbe77d46aea9ee9a68c51b9e03d3b440b7a891206be83d2119d53cc595713eb80bde67e6cc4db22c SHA512 77368d97189995e87e07b188466a3681713c4ed6043c354c65b4a82587cd10b0326d319892a4b55a914f4a072618b299ed2606b24317d7f75e71a005ce9e1442
-EBUILD xf86-video-freedreno-1.4.0.ebuild 339 BLAKE2B 72dac3f4443bab0ebcfd7d1c25abf151b9ced24944886fc1fbe77d46aea9ee9a68c51b9e03d3b440b7a891206be83d2119d53cc595713eb80bde67e6cc4db22c SHA512 77368d97189995e87e07b188466a3681713c4ed6043c354c65b4a82587cd10b0326d319892a4b55a914f4a072618b299ed2606b24317d7f75e71a005ce9e1442
-MISC metadata.xml 234 BLAKE2B b45f6795dbd73dfcee2a68f93ec5460509b15a69401467bc8f4af9505eeb04a2aa35a2b144eb88781df4abd4e15d2b88fc728daf033c6d646762170ffb00b1a7 SHA512 fabcd59aeede4ac93d66552746edacc44fd565551aafaca67185aff7f8e6a4c0fa21f3d54e4fccd7def948ec57b90489631bd779fb992cd9322132b0a3aa503b
diff --git a/x11-drivers/xf86-video-freedreno/metadata.xml b/x11-drivers/xf86-video-freedreno/metadata.xml
deleted file mode 100644
index 7a7bbf810544..000000000000
--- a/x11-drivers/xf86-video-freedreno/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>x11@gentoo.org</email>
-		<name>X11</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/x11-drivers/xf86-video-freedreno/xf86-video-freedreno-1.0.0.ebuild b/x11-drivers/xf86-video-freedreno/xf86-video-freedreno-1.0.0.ebuild
deleted file mode 100644
index e5d2469dc3e0..000000000000
--- a/x11-drivers/xf86-video-freedreno/xf86-video-freedreno-1.0.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_DRI=always
-inherit xorg-2
-
-DESCRIPTION="Driver for Adreno mobile GPUs"
-KEYWORDS="arm"
-IUSE=""
-
-RDEPEND="x11-libs/libdrm[video_cards_freedreno]"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# Gentoo installs drm_mode.h to /usr/include/libdrm/
-	sed -i 's:drm/drm_mode.h:libdrm/drm_mode.h:' src/drmmode_display.c || die
-	xorg-2_src_prepare
-}
diff --git a/x11-drivers/xf86-video-freedreno/xf86-video-freedreno-1.1.0.ebuild b/x11-drivers/xf86-video-freedreno/xf86-video-freedreno-1.1.0.ebuild
deleted file mode 100644
index c9b77fa9733c..000000000000
--- a/x11-drivers/xf86-video-freedreno/xf86-video-freedreno-1.1.0.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_DRI=always
-inherit xorg-2
-
-DESCRIPTION="Driver for Adreno mobile GPUs"
-KEYWORDS="~arm"
-IUSE=""
-
-RDEPEND=">=media-libs/mesa-10.2[xa]
-	virtual/libudev
-	>=x11-libs/libdrm-2.4.54[video_cards_freedreno]"
-DEPEND="${RDEPEND}"
diff --git a/x11-drivers/xf86-video-freedreno/xf86-video-freedreno-1.3.0.ebuild b/x11-drivers/xf86-video-freedreno/xf86-video-freedreno-1.3.0.ebuild
deleted file mode 100644
index 72a0d37a848b..000000000000
--- a/x11-drivers/xf86-video-freedreno/xf86-video-freedreno-1.3.0.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_DRI=always
-inherit xorg-2
-
-DESCRIPTION="Driver for Adreno mobile GPUs"
-KEYWORDS="arm"
-IUSE=""
-
-RDEPEND=">=media-libs/mesa-10.2[xa]
-	virtual/libudev
-	>=x11-libs/libdrm-2.4.54[video_cards_freedreno]"
-DEPEND="${RDEPEND}"
diff --git a/x11-drivers/xf86-video-freedreno/xf86-video-freedreno-1.4.0.ebuild b/x11-drivers/xf86-video-freedreno/xf86-video-freedreno-1.4.0.ebuild
deleted file mode 100644
index 72a0d37a848b..000000000000
--- a/x11-drivers/xf86-video-freedreno/xf86-video-freedreno-1.4.0.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_DRI=always
-inherit xorg-2
-
-DESCRIPTION="Driver for Adreno mobile GPUs"
-KEYWORDS="arm"
-IUSE=""
-
-RDEPEND=">=media-libs/mesa-10.2[xa]
-	virtual/libudev
-	>=x11-libs/libdrm-2.4.54[video_cards_freedreno]"
-DEPEND="${RDEPEND}"
diff --git a/x11-drivers/xf86-video-i128/Manifest b/x11-drivers/xf86-video-i128/Manifest
deleted file mode 100644
index f8ba942539e3..000000000000
--- a/x11-drivers/xf86-video-i128/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX xf86-video-i128-1.3.6-remove-mibstore_h.patch 809 BLAKE2B 7c6bc62784e7244dae299dbc2d6abe6cc5d72d71670060d9afbc204c3ba87a54dc0b4663e340eee7e6aef67923bf93a75f01889ee7148ef11c6bb16e05d634fb SHA512 3cfe390f1f812250ed3abde0dc8bd699419bf71d6642328d69163012b813906b995acf942c31febe6fc6909109181436e1c7dfcb74d08feae6c9b7434ea63df9
-DIST xf86-video-i128-1.3.5.tar.bz2 306803 BLAKE2B 42150256b06a8c375af71d7e39416391cbf7e41ccbebe152fd05560472711b7f184edd92ca633a1f5e8d776822a79df082e6e01310f7847ebc16c79d8a9e64ac SHA512 a299c2a96b1432fca14f8a6223544f100148f4c260c8cb41819f9169fb606ff18dac2dd0adafa515521f28f044faf5dc492dd43f8b0f14554cc1f1942530cb74
-DIST xf86-video-i128-1.3.6.tar.bz2 324894 BLAKE2B 14e41786a3b2d74a2a03d341a183284e4d7db6be8d6e5d7f75eff7288550b4be31ddb7dd2930ac7fec037a83aba4cdc96e9e98ac5482bc7dc988667744da64db SHA512 688956107fe473941da9d22914dc1aa1889b8a1bb75678692d40630396eca5426a4506bb0a536c48b6ed7a2b580a80af5b8b5d3199e2b04d8f24c404f60d3c34
-EBUILD xf86-video-i128-1.3.5.ebuild 291 BLAKE2B 89af8d376a456b99da22b2484ac4e3855be6395dbb3c8d6eb18668b0f65b5df70f585404b75f7c5d28f2287b75eb220568330e7697ab59ac80f34c47b5d803f7 SHA512 d44621a8e84fca641e2485da47df1f937f4617f2f2cb970e95e852d28ea0c3443c6c117410373d865ba5bed1fe37b8eb33fc9c2307c5f9fb8a755707755574f9
-EBUILD xf86-video-i128-1.3.6-r1.ebuild 348 BLAKE2B c5fde8130a52e5d55344a87671114b4ac0c419008539c9f3231e60b56c8907a836de8ca47983e0959d973b0452ee4b4c895a8928c88154280c5d0bdcdd5aa538 SHA512 f05ab36dc3d0a61c39e5d7df79c3922bbcd317fdbe253fc9afb4247e6fc1e8dff8b6f7470e36201e7e47f259712f0d9e9ac18f081d4e7c0a644ae5f9f046e4b4
-EBUILD xf86-video-i128-1.3.6.ebuild 291 BLAKE2B 89af8d376a456b99da22b2484ac4e3855be6395dbb3c8d6eb18668b0f65b5df70f585404b75f7c5d28f2287b75eb220568330e7697ab59ac80f34c47b5d803f7 SHA512 d44621a8e84fca641e2485da47df1f937f4617f2f2cb970e95e852d28ea0c3443c6c117410373d865ba5bed1fe37b8eb33fc9c2307c5f9fb8a755707755574f9
-MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-i128/files/xf86-video-i128-1.3.6-remove-mibstore_h.patch b/x11-drivers/xf86-video-i128/files/xf86-video-i128-1.3.6-remove-mibstore_h.patch
deleted file mode 100644
index b42a6c8f1f51..000000000000
--- a/x11-drivers/xf86-video-i128/files/xf86-video-i128-1.3.6-remove-mibstore_h.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From c87753733a6e1f85d1d037dced0b47ce0cf41658 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Tue, 25 Sep 2012 12:54:40 +0000
-Subject: Remove mibstore.h
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
-diff --git a/src/i128_driver.c b/src/i128_driver.c
-index a0f08c0..51a4135 100644
---- a/src/i128_driver.c
-+++ b/src/i128_driver.c
-@@ -50,8 +50,6 @@
- /* All drivers initialising the SW cursor need this */
- #include "mipointer.h"
- 
--/* All drivers implementing backing store need this */
--#include "mibstore.h"
- #include "micmap.h"
- 
- #include "xf86DDC.h"
-@@ -1556,7 +1554,6 @@ I128ScreenInit(SCREEN_INIT_ARGS_DECL)
-         return FALSE;
-     }
-     
--    miInitializeBackingStore(pScreen);
-     xf86SetBackingStore(pScreen);
-     xf86SetSilkenMouse(pScreen);
- 
---
-cgit v0.9.0.2-2-gbebe
diff --git a/x11-drivers/xf86-video-i128/metadata.xml b/x11-drivers/xf86-video-i128/metadata.xml
deleted file mode 100644
index e943b72b8a48..000000000000
--- a/x11-drivers/xf86-video-i128/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>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
-</pkgmetadata>
diff --git a/x11-drivers/xf86-video-i128/xf86-video-i128-1.3.5.ebuild b/x11-drivers/xf86-video-i128/xf86-video-i128-1.3.5.ebuild
deleted file mode 100644
index cfab15c8bdb5..000000000000
--- a/x11-drivers/xf86-video-i128/xf86-video-i128-1.3.5.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit xorg-2
-
-DESCRIPTION="Number 9 I128 video driver"
-
-KEYWORDS="amd64 ia64 x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}"
diff --git a/x11-drivers/xf86-video-i128/xf86-video-i128-1.3.6-r1.ebuild b/x11-drivers/xf86-video-i128/xf86-video-i128-1.3.6-r1.ebuild
deleted file mode 100644
index 469c0bf698f2..000000000000
--- a/x11-drivers/xf86-video-i128/xf86-video-i128-1.3.6-r1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="Number 9 I128 video driver"
-
-KEYWORDS="amd64 ia64 x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-remove-mibstore_h.patch
-)
diff --git a/x11-drivers/xf86-video-i128/xf86-video-i128-1.3.6.ebuild b/x11-drivers/xf86-video-i128/xf86-video-i128-1.3.6.ebuild
deleted file mode 100644
index cfab15c8bdb5..000000000000
--- a/x11-drivers/xf86-video-i128/xf86-video-i128-1.3.6.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit xorg-2
-
-DESCRIPTION="Number 9 I128 video driver"
-
-KEYWORDS="amd64 ia64 x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}"
diff --git a/x11-drivers/xf86-video-i740/Manifest b/x11-drivers/xf86-video-i740/Manifest
deleted file mode 100644
index 098944d5b8a6..000000000000
--- a/x11-drivers/xf86-video-i740/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST xf86-video-i740-1.3.6.tar.bz2 347463 BLAKE2B 97f4b5769d247ded5c03624cbe96a3382141413ad3d3c6b9fecaa9cd87f0c65f66c131d40c6eadde0eaf1d1ca9ff2dd719e7d083eab76245f76731dd0374865f SHA512 82a3932e8c7f89550afdf69adadba4cc7a1b28f7a15ab018bff948d99767c57b61510967be7997131e2e1e87acf7b0ea28018deb1c907c284e68fc866d2b4139
-EBUILD xf86-video-i740-1.3.6.ebuild 287 BLAKE2B 6d50cd4ec861afc0fec779c55cb5bd41c54a0479cd87bd50760959d9b74f7520814c959a438e48794f2afdb6a25520553513c13430b80e4bef68b4d561e11842 SHA512 2b4a6399b16e4a9b16e1ff8c8e490e5a95a2af4cdb3dec3ace2d8f66b143b61b7e41852edebda49de105eebc11e90bacfa9660221426920fa8cf573766ec93d5
-MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-i740/metadata.xml b/x11-drivers/xf86-video-i740/metadata.xml
deleted file mode 100644
index e943b72b8a48..000000000000
--- a/x11-drivers/xf86-video-i740/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>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
-</pkgmetadata>
diff --git a/x11-drivers/xf86-video-i740/xf86-video-i740-1.3.6.ebuild b/x11-drivers/xf86-video-i740/xf86-video-i740-1.3.6.ebuild
deleted file mode 100644
index 7da6fd84a92a..000000000000
--- a/x11-drivers/xf86-video-i740/xf86-video-i740-1.3.6.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="Intel i740 video driver"
-
-KEYWORDS="amd64 ia64 x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}"
diff --git a/x11-drivers/xf86-video-mach64/Manifest b/x11-drivers/xf86-video-mach64/Manifest
deleted file mode 100644
index ab3018d8a422..000000000000
--- a/x11-drivers/xf86-video-mach64/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST xf86-video-mach64-6.9.5.tar.bz2 520883 BLAKE2B f2b64ad7a5c177e6144cd4c86e43f8c01f9440bb18f742e6f892b2f2b0f8680c7ff30df77b38a459d0550a1bf7d58c8ce4c60ede9a66a127b8825cb1aa27255c SHA512 855b1a505c4309dd6accd0a2b371763fe98f510e0b6c680e2b2a1ce780e4ee6ea8eeeafb85fd22b879a25679b4c3f03a8216b2ea5797fbbc00fccd597fb7622d
-EBUILD xf86-video-mach64-6.9.5.ebuild 442 BLAKE2B 5d3557151eafd3cbd7d054be9fd191d1af8a91b60024ef168b353d323c7de348753808aa7b387e94765f1b33a9b8003bc2743f6c340142692733a11e53b905a7 SHA512 d974d3d52f45b08ee156b10d529b6208ceadf112bf36b7f0bf3d6f04507fb830ff994c2f2143b92fa7a72bbadc14d5bcc1643ce90d02bf6a5e99cb7f9a8caa48
-MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-mach64/metadata.xml b/x11-drivers/xf86-video-mach64/metadata.xml
deleted file mode 100644
index e943b72b8a48..000000000000
--- a/x11-drivers/xf86-video-mach64/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>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
-</pkgmetadata>
diff --git a/x11-drivers/xf86-video-mach64/xf86-video-mach64-6.9.5.ebuild b/x11-drivers/xf86-video-mach64/xf86-video-mach64-6.9.5.ebuild
deleted file mode 100644
index 358c8d3af605..000000000000
--- a/x11-drivers/xf86-video-mach64/xf86-video-mach64-6.9.5.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_DRI="dri"
-inherit xorg-2
-
-DESCRIPTION="ATI Mach64 video driver"
-
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=x11-base/xorg-server-1.10
-	>=x11-libs/libpciaccess-0.12.901"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable dri)
-	)
-
-	xorg-2_pkg_setup
-}
diff --git a/x11-drivers/xf86-video-neomagic/Manifest b/x11-drivers/xf86-video-neomagic/Manifest
deleted file mode 100644
index f0e4c72ad62b..000000000000
--- a/x11-drivers/xf86-video-neomagic/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST xf86-video-neomagic-1.2.9.tar.bz2 340789 BLAKE2B 6943834328d13c52c95e2f2c915ff29e5dbd074304c37403585a24867a20c9aed313dd11784eabfedff3ca1f0f6ee1ae0ce3868e0bc79b54508e6c28f33bb625 SHA512 fc1fbb220110ae5aa8909f586a3a22ed0d4570b1e9f7577da7014c5e129d8cf04a8ea754e0f7fae5fc5d8e5671593f235656ce991f74fa828fd2b8f9c5e171e6
-EBUILD xf86-video-neomagic-1.2.9.ebuild 223 BLAKE2B 5a8da580b235ef69c70bbf104f238492a88042cca083cdf8c3136aebd5f4d701a9db55d018d7332e5d05501602f2340ceb3f0edbfac40ed8e24ad4e3291cd72a SHA512 e3fe94d222811b283350092e4d501be59f62d2716c70d32b467375211cd1d3942f4ee5cd8f971ead1c40e4e8858ca3e88094f46ec177298a238bfb7ee5b1e1e8
-MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-neomagic/metadata.xml b/x11-drivers/xf86-video-neomagic/metadata.xml
deleted file mode 100644
index e943b72b8a48..000000000000
--- a/x11-drivers/xf86-video-neomagic/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>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
-</pkgmetadata>
diff --git a/x11-drivers/xf86-video-neomagic/xf86-video-neomagic-1.2.9.ebuild b/x11-drivers/xf86-video-neomagic/xf86-video-neomagic-1.2.9.ebuild
deleted file mode 100644
index 777c6421657d..000000000000
--- a/x11-drivers/xf86-video-neomagic/xf86-video-neomagic-1.2.9.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="Neomagic video driver"
-KEYWORDS="amd64 ia64 x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
diff --git a/x11-drivers/xf86-video-opentegra/Manifest b/x11-drivers/xf86-video-opentegra/Manifest
deleted file mode 100644
index 5daf46cc90da..000000000000
--- a/x11-drivers/xf86-video-opentegra/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST xf86-video-opentegra-0.7.0.tar.xz 254784 BLAKE2B 5c72fb533b66a8d4522a4c69c859c5112246177e9b018b942316deeb8afdab4c0224bafab05a5a5fbb150520186b407b8ddc86d76dc2cb427864b2f676e60f8b SHA512 04676455721518cad81b1db06c9c643e9084bf8b241cc190285595b48927ce3c9e4cf28fab37ceb2d8873e5dfd00e5df1a708ae34aeb85e0e43165b190fc63f4
-EBUILD xf86-video-opentegra-0.7.0.ebuild 368 BLAKE2B 502f71453c8ababa0490a69f0b55d15d198ae36929e34f88e77222117eaa69586e3a5adf78a7f54b67a8c9045cf5fda73249e706b954768e2d77145b88c112ec SHA512 903b9f448ff9d3a2158c21dc70f8fbbb9c31c5c11559c61b38c437112151440951f5d8bfa7c72df5231c6a89741abf3e0de41da66423601ef3624a611b2bb388
-MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-opentegra/metadata.xml b/x11-drivers/xf86-video-opentegra/metadata.xml
deleted file mode 100644
index e943b72b8a48..000000000000
--- a/x11-drivers/xf86-video-opentegra/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>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
-</pkgmetadata>
diff --git a/x11-drivers/xf86-video-opentegra/xf86-video-opentegra-0.7.0.ebuild b/x11-drivers/xf86-video-opentegra/xf86-video-opentegra-0.7.0.ebuild
deleted file mode 100644
index 5e4999928ac2..000000000000
--- a/x11-drivers/xf86-video-opentegra/xf86-video-opentegra-0.7.0.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="X.Org video driver for NVIDIA Tegra"
-
-SRC_URI="https://www.x.org/releases/individual/driver/${P}.tar.xz"
-KEYWORDS="arm"
-IUSE=""
-
-RDEPEND="x11-libs/libdrm[video_cards_tegra]
-	>=x11-base/xorg-server-1.13"
-DEPEND="${RDEPEND}"
diff --git a/x11-drivers/xf86-video-rendition/Manifest b/x11-drivers/xf86-video-rendition/Manifest
deleted file mode 100644
index fa100f1010c2..000000000000
--- a/x11-drivers/xf86-video-rendition/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST xf86-video-rendition-4.2.6.tar.bz2 362408 BLAKE2B 83ea3910b19156abaab2f6882d7c600260d280e9e3a36eafc42a258c2ca23d74b71e85525f9f5099693c157a06fa942b4bac9d33b4b9114260d6f87ec5bf3c3b SHA512 ef4910b11ede69af89a7ee60039113a35c03f2bab5f9433eefbb4ed685b0260f630e9047fa8ab60a7f0e8a0958a24f8821b719e061c26bc51ff7736b500ddbc7
-EBUILD xf86-video-rendition-4.2.6.ebuild 291 BLAKE2B f6f20043c1b2d1b9cb102e8dae4e5e7bcb44f31c2a4686c0bedf7c0b30e82d5710885ba90e55d3f50c9716e3958b09f334e529582c2ebc36f6770f81b5550b24 SHA512 e3cbbcf4aa6ae104b2ac1ec2ad3e3394dd22a7cd8134cc720b66c31c1bc38e0473ee40a7595ef0237a61ec76e071eeae87a410778b4e978454145dea1564041a
-MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-rendition/metadata.xml b/x11-drivers/xf86-video-rendition/metadata.xml
deleted file mode 100644
index e943b72b8a48..000000000000
--- a/x11-drivers/xf86-video-rendition/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>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
-</pkgmetadata>
diff --git a/x11-drivers/xf86-video-rendition/xf86-video-rendition-4.2.6.ebuild b/x11-drivers/xf86-video-rendition/xf86-video-rendition-4.2.6.ebuild
deleted file mode 100644
index 5cd2aa010cea..000000000000
--- a/x11-drivers/xf86-video-rendition/xf86-video-rendition-4.2.6.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="Rendition video driver"
-KEYWORDS="alpha amd64 ia64 x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}"
diff --git a/x11-drivers/xf86-video-s3/Manifest b/x11-drivers/xf86-video-s3/Manifest
deleted file mode 100644
index 9d4912282d75..000000000000
--- a/x11-drivers/xf86-video-s3/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX xf86-video-s3-0.6.5-mibstore_h.patch 914 BLAKE2B 793e7fc85e9c68ca40eeaed08e445535bff4438b33ab0ad8b648e400cb1d2fb0eb6c734f21c7b3373865c8bf25940208f6570109428193786d1f77b53fc7ce91 SHA512 1ce8aee76a746f115ad3296bf7d76360d2693602f41631deac3a56ab87478f2a843afa15a0cb28f6b8975589fcc387ab26c82f9f59a125a19bf0aa19c3fde4ec
-DIST xf86-video-s3-0.6.5.tar.bz2 325582 BLAKE2B f8a4894f0f1fab87e17cc8cda141034b46888b79744bffe829f7cea7652b007950d79d37bd1da37b3879fd2f1eb7280d10aa1245cb3d9f64c6d964556e830a84 SHA512 bd7d93008dae33b0b7943b2c81de5f39b1d8224ccebd0cdb9e8d22e7ea7fb0981adf6afd44e24162fa8a076d3e250f93316fd3a25cada2d65166a6bc4d13c267
-EBUILD xf86-video-s3-0.6.5-r1.ebuild 349 BLAKE2B fb061bd0b770161b1888c08714e0a8a3b0663ed6facc51972118894a41c29a69cc6b2f1c8fb81478a41e00bcd74b57d482f1b742764102a1c0e7f7f92727a3e1 SHA512 99128ec65278aaa95e5861a7abda4d7bc434a8a324651bd347c939d317f6fa3f916b1324275fe154d601b6f5b30fa56c7d90ad2fa1a55a5c20731c7a521651c1
-EBUILD xf86-video-s3-0.6.5.ebuild 299 BLAKE2B 9d9f30e56dda710ceb0dd3af0c509c6a82b8aadadc76f65c9c48cbe0f1ade03a9340a6f01b099d80b0264962e3faad6609e2af738d1778d27049dc254a03a3df SHA512 2914ba2f27916619c80a7da65e3339ec3fce8b46c87cd4b0f16cff6e692864bd3f03c4b0ceead293f2a464d9b90a83938ea80fc4ec897104dc1233998b798366
-MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-s3/files/xf86-video-s3-0.6.5-mibstore_h.patch b/x11-drivers/xf86-video-s3/files/xf86-video-s3-0.6.5-mibstore_h.patch
deleted file mode 100644
index 95f20ca4b83f..000000000000
--- a/x11-drivers/xf86-video-s3/files/xf86-video-s3-0.6.5-mibstore_h.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From ed0fbfd27609e897c42d7ab316481a9504746233 Mon Sep 17 00:00:00 2001
-From: Gaetan Nadon <memsize@videotron.ca>
-Date: Tue, 07 Jan 2014 21:28:58 +0000
-Subject: Remove mibstore.h
-
-As it was done in numerous other drivers. Fixes compile error.
-
-Tested-by: Trevor Woerner <trevor.woerner@linaro.org>
-Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
----
-diff --git a/src/s3_driver.c b/src/s3_driver.c
-index 61242ad..85763ba 100644
---- a/src/s3_driver.c
-+++ b/src/s3_driver.c
-@@ -52,7 +52,6 @@
- #include "compiler.h"
- #include "mipointer.h"
- #include "micmap.h"
--#include "mibstore.h"
- #include "fb.h"
- #include "inputstr.h"
- #include "shadowfb.h"
-@@ -822,7 +821,6 @@ static Bool S3ScreenInit(SCREEN_INIT_ARGS_DECL)
- 	fbPictureInit (pScreen, 0, 0);
- 	S3DGAInit(pScreen);
- 
--        miInitializeBackingStore(pScreen);
-         xf86SetBackingStore(pScreen);
- 
- 	/* framebuffer manager setup */
---
-cgit v0.9.0.2-2-gbebe
diff --git a/x11-drivers/xf86-video-s3/metadata.xml b/x11-drivers/xf86-video-s3/metadata.xml
deleted file mode 100644
index e943b72b8a48..000000000000
--- a/x11-drivers/xf86-video-s3/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>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
-</pkgmetadata>
diff --git a/x11-drivers/xf86-video-s3/xf86-video-s3-0.6.5-r1.ebuild b/x11-drivers/xf86-video-s3/xf86-video-s3-0.6.5-r1.ebuild
deleted file mode 100644
index e66396c13ac4..000000000000
--- a/x11-drivers/xf86-video-s3/xf86-video-s3-0.6.5-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="X.Org driver for s3 cards"
-
-KEYWORDS="alpha amd64 ia64 ppc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-mibstore_h.patch
-)
diff --git a/x11-drivers/xf86-video-s3/xf86-video-s3-0.6.5.ebuild b/x11-drivers/xf86-video-s3/xf86-video-s3-0.6.5.ebuild
deleted file mode 100644
index d941a0cdb4ea..000000000000
--- a/x11-drivers/xf86-video-s3/xf86-video-s3-0.6.5.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit xorg-2
-
-DESCRIPTION="X.Org driver for s3 cards"
-
-KEYWORDS="alpha amd64 ia64 ppc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}"
diff --git a/x11-drivers/xf86-video-s3virge/Manifest b/x11-drivers/xf86-video-s3virge/Manifest
deleted file mode 100644
index 933a517ed698..000000000000
--- a/x11-drivers/xf86-video-s3virge/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST xf86-video-s3virge-1.10.7.tar.bz2 374129 BLAKE2B a0d4f11a58cf7c40226ec3719bf1b5f558ad190441d3ea2a878a2654636fed50bb548de422685f009a87dbab26d4e3b839e9e0fe6e003755b7266ee805c16a2b SHA512 bbeb3af1558eeb25768ec86e14687d442d54046913af6f4f4eb49c0b9641377b0d6f0e85629b16e46db07adb2358053cbfbe7b366d0cb9a817a011a1c7703e57
-EBUILD xf86-video-s3virge-1.10.7.ebuild 295 BLAKE2B 48d10a79754dcf7acbb7fd4a8bca1c672c4d5877c1cce48394c1403edc7db2a39a858f6ccfbb083d989105c4b8f175329d659e623e10acba7a5401467fad44ac SHA512 720ec37b309d1f9ca69553345296ec0340a879d96ef134eb29cd7fb6f3be02ba85c118f5b8e2cffdb3683e44a8e23e123b3dfd2ee5445325c9d674938f25efc5
-MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-s3virge/metadata.xml b/x11-drivers/xf86-video-s3virge/metadata.xml
deleted file mode 100644
index e943b72b8a48..000000000000
--- a/x11-drivers/xf86-video-s3virge/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>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
-</pkgmetadata>
diff --git a/x11-drivers/xf86-video-s3virge/xf86-video-s3virge-1.10.7.ebuild b/x11-drivers/xf86-video-s3virge/xf86-video-s3virge-1.10.7.ebuild
deleted file mode 100644
index 0f219fa52cc5..000000000000
--- a/x11-drivers/xf86-video-s3virge/xf86-video-s3virge-1.10.7.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="S3 ViRGE video driver"
-
-KEYWORDS="alpha amd64 ia64 ppc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}"
diff --git a/x11-drivers/xf86-video-savage/Manifest b/x11-drivers/xf86-video-savage/Manifest
deleted file mode 100644
index 17ea4ff39203..000000000000
--- a/x11-drivers/xf86-video-savage/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST xf86-video-savage-2.3.9.tar.bz2 433686 BLAKE2B 3acb205b96663eca94a7ba4eb6f5fe6832c9f119748ee9db07247045242452c1f6bcdecc2b8645e0889962db4ad01d149f8ba2d046a5e4cdc0f085fd8f55f0f6 SHA512 35fe52651fe5799bbbc6e7b3608a655102547e8f8f2189288d3f5b477f819bfc56a9a8eef39813ca455e56076e4f7c36304480c3ccddbac6c794672828cf705a
-EBUILD xf86-video-savage-2.3.9.ebuild 735 BLAKE2B 67417810c5d371eaedfcb9a776f2ab2e0682b3eb9a6723be72a54722f15d457b27c0decf75ea1a75b9c1e48b2ab39a773c474e64199a3b180fca60275a67a044 SHA512 813506a654bc1b7e0df8492f3095110ffae677ac4b35740be7c6ee27f86ac5b0a21bd05156782309936a05d303f3e2e6d0456fb2e655acf37653e05716515085
-MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-savage/metadata.xml b/x11-drivers/xf86-video-savage/metadata.xml
deleted file mode 100644
index e943b72b8a48..000000000000
--- a/x11-drivers/xf86-video-savage/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>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
-</pkgmetadata>
diff --git a/x11-drivers/xf86-video-savage/xf86-video-savage-2.3.9.ebuild b/x11-drivers/xf86-video-savage/xf86-video-savage-2.3.9.ebuild
deleted file mode 100644
index 9dc567fc11b9..000000000000
--- a/x11-drivers/xf86-video-savage/xf86-video-savage-2.3.9.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
-XORG_DRI=dri
-inherit xorg-2
-
-DESCRIPTION="S3 Savage video driver"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86 ~amd64-fbsd ~x86-fbsd"
-
-IUSE="dri"
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	>=x11-proto/xextproto-7.0.99.1"
-
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable dri)
-	)
-	xorg-2_pkg_setup
-}
-
-pkg_postinst() {
-	if has_version ">=x11-base/xorg-server-1.12.99"; then
-		elog "Your X server no longer supports XAA, so xf86-video-savage will fall back"
-		elog "to shadowFB. Enable EXA in your X.org configuration to still have some 2D"
-		elog "acceleration. See \"man 4 savage\" for details."
-	fi
-}
diff --git a/x11-drivers/xf86-video-sis/Manifest b/x11-drivers/xf86-video-sis/Manifest
deleted file mode 100644
index cbae4cf5be26..000000000000
--- a/x11-drivers/xf86-video-sis/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST xf86-video-sis-0.10.9.tar.bz2 736272 BLAKE2B 32b53678510acb39a98bd218c3450c0332e8b7027e11b5b4799fe81599bdd9e75acccda73bb8d794b2e89c5db340a4f1345ed2e6dd9fdae4b9cbcec9ca0a7f51 SHA512 7cb11d2f1f8be8d92159af7e322a9e4fe4e3436c38932d6d665b8854c2009495e99ff075c7a14d9db9c781114afc8397f0e8c1225d9a2f4bbf1b6a4b6cd6745d
-EBUILD xf86-video-sis-0.10.9.ebuild 249 BLAKE2B b183b21fc96a418e4ce8ef285b23767dee16259a6560ed2493d2b476267900b2eedb69605c11d5ef682b914956e1de4ace805d73e21f39ecf7b56b175b51b591 SHA512 812d385ab1e62380c184cc4131f3ef18440aaccba82add986d5bd602e5f5edb5a32ebd4ead61fe392fdd58731cf048df61b3d0c04dcdffcaf030e2eb56800afb
-MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-sis/metadata.xml b/x11-drivers/xf86-video-sis/metadata.xml
deleted file mode 100644
index e943b72b8a48..000000000000
--- a/x11-drivers/xf86-video-sis/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>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
-</pkgmetadata>
diff --git a/x11-drivers/xf86-video-sis/xf86-video-sis-0.10.9.ebuild b/x11-drivers/xf86-video-sis/xf86-video-sis-0.10.9.ebuild
deleted file mode 100644
index c15d7b7386e1..000000000000
--- a/x11-drivers/xf86-video-sis/xf86-video-sis-0.10.9.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="SiS and XGI video driver"
-KEYWORDS="amd64 ia64 ppc x86 ~x86-fbsd"
-
-DEPEND=">=x11-proto/xf86dgaproto-2.1"
diff --git a/x11-drivers/xf86-video-sisusb/Manifest b/x11-drivers/xf86-video-sisusb/Manifest
deleted file mode 100644
index b48263512c46..000000000000
--- a/x11-drivers/xf86-video-sisusb/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST xf86-video-sisusb-0.9.7.tar.bz2 411894 BLAKE2B 3ed58fda26131d3312ab3edd7bbb37f75fc8a6826b171fa35f0b0bb121ccce9a11c128f2832405447eba808057e9cdbe635ff38f76a21708df3b1180c905a8f3 SHA512 6edaf54bad80a261fa22606cad6619992e04560e132b3e68be30c80ebf2e599bc157118e725f67c5d96adc09ed036cc0c78ae0e0ce926708726f953a2fc34f02
-EBUILD xf86-video-sisusb-0.9.7.ebuild 296 BLAKE2B 3a7720900e945112e4d946a9cf49c345fbd1a4551c6a484fc3f4e10ebb9a166deb22c49b7cafba02612d63bf88ee80677d6b1403fde017d2ac9136552194f6f4 SHA512 536c3c851230e4f6820c8f991fc5002923fe718db3df33c272d65a1b3fab10c927fb48a8a5dea4fe53964e8b3ce2f3438881c5b956a967e689ce51f34437e39b
-MISC metadata.xml 234 BLAKE2B b45f6795dbd73dfcee2a68f93ec5460509b15a69401467bc8f4af9505eeb04a2aa35a2b144eb88781df4abd4e15d2b88fc728daf033c6d646762170ffb00b1a7 SHA512 fabcd59aeede4ac93d66552746edacc44fd565551aafaca67185aff7f8e6a4c0fa21f3d54e4fccd7def948ec57b90489631bd779fb992cd9322132b0a3aa503b
diff --git a/x11-drivers/xf86-video-sisusb/metadata.xml b/x11-drivers/xf86-video-sisusb/metadata.xml
deleted file mode 100644
index 7a7bbf810544..000000000000
--- a/x11-drivers/xf86-video-sisusb/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>x11@gentoo.org</email>
-		<name>X11</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/x11-drivers/xf86-video-sisusb/xf86-video-sisusb-0.9.7.ebuild b/x11-drivers/xf86-video-sisusb/xf86-video-sisusb-0.9.7.ebuild
deleted file mode 100644
index e53aa7809de2..000000000000
--- a/x11-drivers/xf86-video-sisusb/xf86-video-sisusb-0.9.7.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="SiS USB video driver"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sh sparc x86"
-IUSE=""
-
-RDEPEND=">=x11-base/xorg-server-1.6"
-DEPEND="${RDEPEND}"
diff --git a/x11-drivers/xf86-video-suncg14/Manifest b/x11-drivers/xf86-video-suncg14/Manifest
deleted file mode 100644
index 48cca965376a..000000000000
--- a/x11-drivers/xf86-video-suncg14/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST xf86-video-suncg14-1.1.1.tar.bz2 226518 BLAKE2B 24e9faff5280e17921cd959b16b21331adec175873faab16e44b8ed59a9835f2980d91f53f9a06d8699f78660319a4336f26ab28258575dbcedb753a7b7cc7d6 SHA512 6f9e6221b03baa218d0f39e1395cd18a68610df1af281fae09132cd7c6f012bc5907b904025bbc572bddd96864b818b76664b8c6abe474bf50acbe5d8daf9ec8
-DIST xf86-video-suncg14-1.1.2.tar.bz2 281915 BLAKE2B ee327fa01ba27977309100f2dae623deacad0967912da1e1c2b17c8bc986f4f32e573e99e19218388605bcf6f2e2554b5ef5af5dcfb640699b9c69007ebd66b7 SHA512 685a2675114e471ff0bc82b4ce73a18e5486f03621db148f3a7ce828e9aa62682d7b0ed608da40773e264957bb420f3d8920ab352d10fb0452540986b6b7d72f
-EBUILD xf86-video-suncg14-1.1.1.ebuild 396 BLAKE2B 10a4228055bf7473c0b4581f91b9bbae141ba145edac357535d479cf324cd5b58a06b7c0cf9c48d2c90e145bdb17dd8e378f3f9ba27938c6acdca079e62d7e13 SHA512 752e6d69fb3cc9f4ba41cd61731843441b9f37fd72302541c114c5a54ad47ddd62d7cae4e9b85c7c6fb3631574dbf05263cf7601eed2f58f6a0c7c5bdb0dd2fa
-EBUILD xf86-video-suncg14-1.1.2.ebuild 396 BLAKE2B b0a6def91226ba3516844ecd0b113dd6e2dbecb14f0a91d1794f98cbfb5031d2e2544432af614b63db1f6f479873260618218325c32207dfd6374dcd26598477 SHA512 d36a85059c76b7ff69f01321075bbea02675da35482906d13c2dc141b8a867ecf5c81baf7308db4b75a15fa5bf4a9be34ec40841f7f5f7caa4648ba1d1b67a4e
-MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-suncg14/metadata.xml b/x11-drivers/xf86-video-suncg14/metadata.xml
deleted file mode 100644
index e943b72b8a48..000000000000
--- a/x11-drivers/xf86-video-suncg14/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>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
-</pkgmetadata>
diff --git a/x11-drivers/xf86-video-suncg14/xf86-video-suncg14-1.1.1.ebuild b/x11-drivers/xf86-video-suncg14/xf86-video-suncg14-1.1.1.ebuild
deleted file mode 100644
index 73571ac50593..000000000000
--- a/x11-drivers/xf86-video-suncg14/xf86-video-suncg14-1.1.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="CG14 video driver"
-KEYWORDS="-* sparc"
-IUSE=""
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-video-suncg14/xf86-video-suncg14-1.1.2.ebuild b/x11-drivers/xf86-video-suncg14/xf86-video-suncg14-1.1.2.ebuild
deleted file mode 100644
index 2361a20dc662..000000000000
--- a/x11-drivers/xf86-video-suncg14/xf86-video-suncg14-1.1.2.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="CG14 video driver"
-KEYWORDS="-* sparc"
-IUSE=""
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-video-suncg3/Manifest b/x11-drivers/xf86-video-suncg3/Manifest
deleted file mode 100644
index d704b58edbd6..000000000000
--- a/x11-drivers/xf86-video-suncg3/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST xf86-video-suncg3-1.1.1.tar.bz2 225622 BLAKE2B a41fa53de83c2256b63bad46d92c91396eee2cef58107625005e694a93282d54d3ccd4fa892059cdf3c235fb9c5338a8ab148f70f102846863980398d218eaaf SHA512 f5eea1f9216824c2db0d97e5e009f987165e53a27f27185ec8df14f85d45e614d47b0b620fac181585037576c68f7736d175f401903a9dc5d9f1891171b92067
-DIST xf86-video-suncg3-1.1.2.tar.bz2 281012 BLAKE2B 32fb11a6c25741bca594588e3606e666165162a716e914f8d98c3164185e9c346de6c3279abc2540db6a9843360d259834f05ce20c550738f550ad48255888a5 SHA512 d4b658700a94716ab2253d672cbb64a13b4dc8571664c77db6770b96419031d73c5927d35692a2903e09fe3fc6802015328c3ec055e40a344be60d601fc03bad
-EBUILD xf86-video-suncg3-1.1.1.ebuild 395 BLAKE2B 76ca182d87a3a21fdf5caaf56682d1327d2786c1915598ca5098b3dd5155904c97fae92bcb53514f705d8da084005619985940b97ca415453d336f5e845b96a4 SHA512 e06423188a30bf4e69401c5ddfcbd180b98a4b6114b220ea528f95d96b89313dba464f364cf85bd8ee25c52c21d804acf4c6f85791eb3bd01e0a06c44220dfc9
-EBUILD xf86-video-suncg3-1.1.2.ebuild 395 BLAKE2B 48d9f4087a0a98a090d4c9e1ebc0134b5bd4c8cff44db8b90ed980199d62cffa811f5396bc3ece22ccbc55bbd20896f068b94914c601919120f2fef6400a06ed SHA512 04e14b8959171017a6160fff70c079bf6592386bb734330edfa0a43c246f91c3f9e51dcc397f814e898e241b215e9ddbc0d7a88924495cf54388f0c7dacc9dba
-MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-suncg3/metadata.xml b/x11-drivers/xf86-video-suncg3/metadata.xml
deleted file mode 100644
index e943b72b8a48..000000000000
--- a/x11-drivers/xf86-video-suncg3/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>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
-</pkgmetadata>
diff --git a/x11-drivers/xf86-video-suncg3/xf86-video-suncg3-1.1.1.ebuild b/x11-drivers/xf86-video-suncg3/xf86-video-suncg3-1.1.1.ebuild
deleted file mode 100644
index 65b03793cb4a..000000000000
--- a/x11-drivers/xf86-video-suncg3/xf86-video-suncg3-1.1.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="CG3 video driver"
-KEYWORDS="-* sparc"
-IUSE=""
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-video-suncg3/xf86-video-suncg3-1.1.2.ebuild b/x11-drivers/xf86-video-suncg3/xf86-video-suncg3-1.1.2.ebuild
deleted file mode 100644
index 707229319ccc..000000000000
--- a/x11-drivers/xf86-video-suncg3/xf86-video-suncg3-1.1.2.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="CG3 video driver"
-KEYWORDS="-* sparc"
-IUSE=""
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-video-suncg6/Manifest b/x11-drivers/xf86-video-suncg6/Manifest
deleted file mode 100644
index 8a32a9885e9b..000000000000
--- a/x11-drivers/xf86-video-suncg6/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST xf86-video-suncg6-1.1.1.tar.bz2 229111 BLAKE2B 939a39d37b271b209ba4efbfea67621903837b29e2321c916ff7dcd562d5287c9af93ff5d286bf9f3f57892052331aed061831022f2e2859130455d007b56abe SHA512 61e8277e77943474ef542a45c34a5a267d06d765fcefe1a55a1e7b47742258ed22e56267ce53a8d4a1a9d04c52b1499a190154d56a47c85023bf7826d24846fe
-DIST xf86-video-suncg6-1.1.2.tar.bz2 286663 BLAKE2B 165bd1531015ddd6dea3e8a83300f77150c70495c68d18255c23bc30287d2c473c7a96a1ff09ba6886189e1fcd402c0e6f2b37c659ec3c86259e99bea39e995b SHA512 d094d951dfa452b0089210a7a4e30a4e32c7af6198a2c956a4c0820fc8d491d3d556539e060ccba59c91289adc4e57d8f06c193790280e064bef4dd98cd5ce05
-EBUILD xf86-video-suncg6-1.1.1.ebuild 403 BLAKE2B 4f7e5bd5945afa84819401b62c46d311a0604192e6ef492dfe8f18f589c48d13f615fc7d68f4f3c2de92dfa554663b2073340f159492b2e3125c1790663c412c SHA512 0ae21e0f4a98faf5175381eb89d60d41f1e7f076c2198ddf479d1ae296e316d798e2ca8e699fa65192493c1f506df9f0c4a8920796d7449ebe986c6c77c346f2
-EBUILD xf86-video-suncg6-1.1.2.ebuild 403 BLAKE2B acbf20d657db9564d31217076bf08b31662fa1b70272cc51dab2f97eb5c4ba9578fae6e43104c96c4b4f2266442e691c3f7aaa4487b63196be5280e4b3fa9528 SHA512 f53d67736928f965d7a862de1edebca41a5561b82b6dc9a5591614bea556afe366b482e4fd5921bbcedca5e64500afbe6ecc30fe02a0ff3ef9302c384d0bd7e7
-MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-suncg6/metadata.xml b/x11-drivers/xf86-video-suncg6/metadata.xml
deleted file mode 100644
index e943b72b8a48..000000000000
--- a/x11-drivers/xf86-video-suncg6/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>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
-</pkgmetadata>
diff --git a/x11-drivers/xf86-video-suncg6/xf86-video-suncg6-1.1.1.ebuild b/x11-drivers/xf86-video-suncg6/xf86-video-suncg6-1.1.1.ebuild
deleted file mode 100644
index b7e5da8c3d48..000000000000
--- a/x11-drivers/xf86-video-suncg6/xf86-video-suncg6-1.1.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="GX/Turbo GX video driver"
-KEYWORDS="-* sparc"
-IUSE=""
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-video-suncg6/xf86-video-suncg6-1.1.2.ebuild b/x11-drivers/xf86-video-suncg6/xf86-video-suncg6-1.1.2.ebuild
deleted file mode 100644
index 4bbc868200d8..000000000000
--- a/x11-drivers/xf86-video-suncg6/xf86-video-suncg6-1.1.2.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="GX/Turbo GX video driver"
-KEYWORDS="-* sparc"
-IUSE=""
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-video-sunffb/Manifest b/x11-drivers/xf86-video-sunffb/Manifest
deleted file mode 100644
index f1c543dac73a..000000000000
--- a/x11-drivers/xf86-video-sunffb/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX xf86-video-sunffb-1.2.2-unbreak-when-xaa-is-not-present.patch 1008 BLAKE2B 18b2aa1b10481d5c8dfc5352bc33d2cad89fcb2b947c2090e5d39d20ba22b29af2e5557613daf4ab42d6e3ff2f686e53905f690517e93e23086335c6f650b0a7 SHA512 318c0ad41bd928a87622253b178e9bca294c5b735f1dc2c75ca288da1f1bdd9733739709e7f9a8d50e77d370a6200c9a9446d304400504e8fe3146d04bd43d2d
-DIST xf86-video-sunffb-1.2.1.tar.bz2 283427 BLAKE2B b5c2d032c2963ece45972bee0b4b8b8e43d3e7f254ff90fa8aefe387c1c688ef27cd6bce1063566936dba55380bd1978517d35e7941154561455079f0ad13bf4 SHA512 4c5c62f752af1d76a9f1b716f3a77190419d76733c4a622f17a9367ba984ee6a644b480780e2be78968e3779444eef995ae1fa0e4f2ba42d5ea886d35e96b38c
-DIST xf86-video-sunffb-1.2.2.tar.bz2 334827 BLAKE2B 0285482e3c50cfcc98189eba351865fd4d06a153c74eee7bfd00a8bd8e59626289db09c90e53e23c5f7eb2845164c7526c6e4d0c104942014ab60a1403447d78 SHA512 a812cfdb43527e97993d1ce8b62324a5ee442c0bbf695d45582f10d7d428606ac9a546c80cd401e41e2f198c94fa84762ec4e545b53b8d1cb074bfb13ab45ff0
-EBUILD xf86-video-sunffb-1.2.1.ebuild 357 BLAKE2B 1802a1c69f0ca17341c22b0c7e146cd2be8a503559964c00f075f1213a99268e381db5445f8cc82f621fdcbc781d20a004e1cbf363cdd82918e729c8fc083cb5 SHA512 0ce33089fb2e77db8bbb867a3d0bd86ada7f74ced6ced9f01a204716193368dc308606f0aec24465a63af61a7dcc681434e4bfb280cff8b19b38f815bc7f7f6c
-EBUILD xf86-video-sunffb-1.2.2-r1.ebuild 327 BLAKE2B 108e882d992e1eb50a795f8d76ddd2981a26d57277538c4553db8d0157df8215bb1e06f810bad2be72c81d5c275604c32a09980255f3f386e429e09320c25bc9 SHA512 25e7dade3ad09c704b90df22212c5a786d31ae3ad9df90f7574b9a9fd5581424748c14fea633c5901c734d0b9a8ed43c12e110261c39580c64e61b10492fe6f4
-MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-sunffb/files/xf86-video-sunffb-1.2.2-unbreak-when-xaa-is-not-present.patch b/x11-drivers/xf86-video-sunffb/files/xf86-video-sunffb-1.2.2-unbreak-when-xaa-is-not-present.patch
deleted file mode 100644
index 83a7ca2b3e63..000000000000
--- a/x11-drivers/xf86-video-sunffb/files/xf86-video-sunffb-1.2.2-unbreak-when-xaa-is-not-present.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 181b60190c1f81fc9b9b5deb07d536b78f2536ab Mon Sep 17 00:00:00 2001
-From: Matthieu Herrb <matthieu.herrb@laas.fr>
-Date: Mon, 10 Jun 2013 19:51:08 +0000
-Subject: Unbreak when XAA is not present.
-
-Turn accel off if loading XAA fails.
-
-Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
-Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
----
-diff --git a/src/ffb_driver.c b/src/ffb_driver.c
-index af13484..7f17d64 100644
---- a/src/ffb_driver.c
-+++ b/src/ffb_driver.c
-@@ -413,9 +413,12 @@ FFBPreInit(ScrnInfoPtr pScrn, int flags)
- 	return FALSE;
-     }
- 
--    if (xf86LoadSubModule(pScrn, "xaa") == NULL) {
--	FFBFreeRec(pScrn);
--	return FALSE;
-+    if (!pFfb->NoAccel) {
-+        if (xf86LoadSubModule(pScrn, "xaa") == NULL) {
-+            xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-+                       "Loading XAA failed, acceleration disabled\n");
-+            pFfb->NoAccel = TRUE;
-+        }
-     }
- 
-     if (pFfb->HWCursor && xf86LoadSubModule(pScrn, "ramdac") == NULL) {
---
-cgit v0.9.0.2-2-gbebe
diff --git a/x11-drivers/xf86-video-sunffb/metadata.xml b/x11-drivers/xf86-video-sunffb/metadata.xml
deleted file mode 100644
index e943b72b8a48..000000000000
--- a/x11-drivers/xf86-video-sunffb/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>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
-</pkgmetadata>
diff --git a/x11-drivers/xf86-video-sunffb/xf86-video-sunffb-1.2.1.ebuild b/x11-drivers/xf86-video-sunffb/xf86-video-sunffb-1.2.1.ebuild
deleted file mode 100644
index 458090b9bc89..000000000000
--- a/x11-drivers/xf86-video-sunffb/xf86-video-sunffb-1.2.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit x-modular
-
-DESCRIPTION="SUNFFB video driver"
-
-KEYWORDS="-* sparc"
-IUSE=""
-
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/xextproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-video-sunffb/xf86-video-sunffb-1.2.2-r1.ebuild b/x11-drivers/xf86-video-sunffb/xf86-video-sunffb-1.2.2-r1.ebuild
deleted file mode 100644
index b930ee8342c2..000000000000
--- a/x11-drivers/xf86-video-sunffb/xf86-video-sunffb-1.2.2-r1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="SUNFFB video driver"
-
-KEYWORDS="-* sparc"
-IUSE=""
-
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-unbreak-when-xaa-is-not-present.patch
-)
diff --git a/x11-drivers/xf86-video-sunleo/Manifest b/x11-drivers/xf86-video-sunleo/Manifest
deleted file mode 100644
index d58ec55dcff9..000000000000
--- a/x11-drivers/xf86-video-sunleo/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST xf86-video-sunleo-1.2.0.tar.bz2 243593 BLAKE2B 441bf33c130f25fc7788b800bd61143dba8e9d8f7f575423d4ff9b77e49d5e5eadb067596473b572a8cc46eef2a6ee92de8d7c66317b15292e5b4fc42af767ca SHA512 fab7e6fe5ce8653a82077704df39a4d89fc37e728dd7b404269bdb37060c41e669a6f3daea15d5e2ea828642c9ed00984945f677a12b8af8bff7c810ad23f2a8
-DIST xf86-video-sunleo-1.2.1.tar.bz2 289383 BLAKE2B 960613e01e6b758a5e42dfd46fc58417bb0087dcf82c0cd588184f34efec392e59ea3ad455e34bd4be8c5ad4a45f1506ab885accf10038da9d0bf3cdca99082a SHA512 52f1578dba4f77e2d999ea2017325df6ac324d60ec2e62677ef9a900aabb183650bcd0923b5a0a1cd7c13c9e80c8a47223b96be651e5a5ecb635654f3eb67af1
-DIST xf86-video-sunleo-1.2.2.tar.bz2 314043 BLAKE2B 3f1ba7f94e4f335b0d3f3165830f74becbba865314b6a89e27418681dd459f4b4b8b6bac6629a9e73f17989db224aba4ed0e49c376f53ff1e04cc78d04ae9a16 SHA512 467559e608b59dcf2a50cbaddc218ad0778e88515906fed9d6346db09187f3f7645482113882bcf81428d4af3d3f2cccec7f24663c12c23a411f8a87551ef23f
-EBUILD xf86-video-sunleo-1.2.0.ebuild 387 BLAKE2B c73cbeb0c3960f43d2ca3959eaa2fb92b44aa04ed0e5a61c76a727cc4bc7df2c94916ba2f21acddefac0f55de02bd13bf31b8e2a12118c08bb8ebabccbe6b9a4 SHA512 770966a450bdb8232b71e00eea709badd7e68c0a80e5e4f4d6881db9dff45611217fedbc2c3fd392623571ddef4e946b9f6fb5dea8743961ac400657e7511df4
-EBUILD xf86-video-sunleo-1.2.1.ebuild 387 BLAKE2B cb806128e5a994e311831d181f7c082fa9574cf0143375ae4cb5854037d50272d12cfe2bf09d39edfd4cf0f4014a982c7211bcbf1a57808070806f3aab8ad608 SHA512 e76729b53d1d08cb7e66d3fb632ba978ee7260387fbd0901adc2f724bdfd63c49e8f5700d55832919921612fb18b48c9cf0df30295a1dd51b0188cdb39fe752e
-EBUILD xf86-video-sunleo-1.2.2.ebuild 387 BLAKE2B cb806128e5a994e311831d181f7c082fa9574cf0143375ae4cb5854037d50272d12cfe2bf09d39edfd4cf0f4014a982c7211bcbf1a57808070806f3aab8ad608 SHA512 e76729b53d1d08cb7e66d3fb632ba978ee7260387fbd0901adc2f724bdfd63c49e8f5700d55832919921612fb18b48c9cf0df30295a1dd51b0188cdb39fe752e
-MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-sunleo/metadata.xml b/x11-drivers/xf86-video-sunleo/metadata.xml
deleted file mode 100644
index e943b72b8a48..000000000000
--- a/x11-drivers/xf86-video-sunleo/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>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
-</pkgmetadata>
diff --git a/x11-drivers/xf86-video-sunleo/xf86-video-sunleo-1.2.0.ebuild b/x11-drivers/xf86-video-sunleo/xf86-video-sunleo-1.2.0.ebuild
deleted file mode 100644
index fb5e338210c2..000000000000
--- a/x11-drivers/xf86-video-sunleo/xf86-video-sunleo-1.2.0.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="Leo video driver"
-KEYWORDS="-* sparc"
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-video-sunleo/xf86-video-sunleo-1.2.1.ebuild b/x11-drivers/xf86-video-sunleo/xf86-video-sunleo-1.2.1.ebuild
deleted file mode 100644
index 69f5129a30cd..000000000000
--- a/x11-drivers/xf86-video-sunleo/xf86-video-sunleo-1.2.1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="Leo video driver"
-KEYWORDS="-* sparc"
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-video-sunleo/xf86-video-sunleo-1.2.2.ebuild b/x11-drivers/xf86-video-sunleo/xf86-video-sunleo-1.2.2.ebuild
deleted file mode 100644
index 69f5129a30cd..000000000000
--- a/x11-drivers/xf86-video-sunleo/xf86-video-sunleo-1.2.2.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="Leo video driver"
-KEYWORDS="-* sparc"
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-video-suntcx/Manifest b/x11-drivers/xf86-video-suntcx/Manifest
deleted file mode 100644
index 8575b83179e5..000000000000
--- a/x11-drivers/xf86-video-suntcx/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST xf86-video-suntcx-1.1.1.tar.bz2 228572 BLAKE2B c9b08d6cf7baf720f0b49f93f7430ca700befc20e0f341fed7acf36916cfe0aa1c180978bbcf09dc672f85a32af41d0bc4e3cb685769a17797fabb2ac6a50d03 SHA512 26bc892325daa1d6f4b2e98e81faa03463f827a7bf7b7c7ed1438aceb214096b8a3359d8f57d1c41dd7eaaddc6af5bb19823acce939b5037f9cb56fe1ec57e78
-DIST xf86-video-suntcx-1.1.2.tar.bz2 285544 BLAKE2B 272317219fe2b8a882385c038aab34fa8e0dbedef051dc474612322698473d0dcb96bd375199fb9fd483b8cb0abdf2c8678ddeb67c49b772231487af52a2ba27 SHA512 c7fa5959694e21fe4613d09eff3666eaca3f25a507b9e6c3efc537bd02aa35fb8633a381d01e5ea243dc38782e616558502c181e9116a0240cf6f196e26a20bd
-EBUILD xf86-video-suntcx-1.1.1.ebuild 395 BLAKE2B 3eec43c71dc813a6dc81bbd36963788730971044781330c7939dabe332f4413de595e13c12307bd15b63bc6d13531a4667cffb3f3be6011619f6d785edfb0ccc SHA512 0366cb9af7a713cb2b8fac1c77f63ab58441aaefae334db00b0b878900d6e9d651e3db752ece6f0d5f84f461c70182394cc5510fe7021283130e1bc374a6d54d
-EBUILD xf86-video-suntcx-1.1.2.ebuild 395 BLAKE2B aa6ba26801f7124371d7d245fe9026e4bc85f4913c3a4ede5e6dd93c6922327cd3b3f3087a72846bbb213554c029608f3c030b5bfbb73e9f9f98747616c7862d SHA512 c181e48c9acc6a23a69a7e90343d46eb522709ef2e75e64a3b20504f14cb18f27d5268b94ebaef68b08ac6c5fbd9066d7145d1db71568d05bfd4d7e9bab86ed0
-MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-suntcx/metadata.xml b/x11-drivers/xf86-video-suntcx/metadata.xml
deleted file mode 100644
index e943b72b8a48..000000000000
--- a/x11-drivers/xf86-video-suntcx/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>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
-</pkgmetadata>
diff --git a/x11-drivers/xf86-video-suntcx/xf86-video-suntcx-1.1.1.ebuild b/x11-drivers/xf86-video-suntcx/xf86-video-suntcx-1.1.1.ebuild
deleted file mode 100644
index cf23a2877aa7..000000000000
--- a/x11-drivers/xf86-video-suntcx/xf86-video-suntcx-1.1.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="TCX video driver"
-KEYWORDS="-* sparc"
-IUSE=""
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-video-suntcx/xf86-video-suntcx-1.1.2.ebuild b/x11-drivers/xf86-video-suntcx/xf86-video-suntcx-1.1.2.ebuild
deleted file mode 100644
index 8ec3acb973f1..000000000000
--- a/x11-drivers/xf86-video-suntcx/xf86-video-suntcx-1.1.2.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="TCX video driver"
-KEYWORDS="-* sparc"
-IUSE=""
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-video-tga/Manifest b/x11-drivers/xf86-video-tga/Manifest
deleted file mode 100644
index 2aec787bb4f5..000000000000
--- a/x11-drivers/xf86-video-tga/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX xf86-video-tga-1.2.2-remove-mibstore_h.patch 1019 BLAKE2B 337c84ea4dbd42e77545d94a2222f37f985bba587ead4d7e6438c362845e2dc8c85c057d521b488dc33ed6686cc2d09aa98428b7dffb854ce00e89639656a7d3 SHA512 049d7f65c9c7105c0d015229b105a3c7778c9cd441efe06e7c412b7c1d648cbba9a35cd55f9552d7fa77c5eb6e25e6ddb2b17eff0235dd087cf01c9c07fb884f
-DIST xf86-video-tga-1.2.2.tar.bz2 318943 BLAKE2B f5e16ab6cf5c6cd3e8b628848cf63272c574509e736332697c9055ac3de24e2c269d2db55d786c71488a7bb7b47c12f7c2813e71ad1098b10aa43775ab78812e SHA512 38d0f61e0384400187b8a02d8ddc8b08edf2485448d9fcc941b5cc20bfc15f46d7f665b98365227b42b029dc92d76da9efcf8e934bcf382765657a0b54d1d231
-EBUILD xf86-video-tga-1.2.2-r1.ebuild 376 BLAKE2B 3e74b3305536e7f19007ad437361865116616deecd85beb684348e0540656b5cc91c8d158527bb3cd89f7832e61b0eddce326c3ea8615dfbb2b2f2b64eed4f85 SHA512 bc29aacd89025bbc95a82e3f0dd95ea82beb80172dcaa9517643cb5b8f3beb989025aa977b4761d08910a10f1a6cddd0291f62080dcc87660d02e24bd62dbe69
-EBUILD xf86-video-tga-1.2.2.ebuild 319 BLAKE2B bfeb6591056abded001fae7a13b56540e018fe8a816bd4a01b9f2f7025a253caffa29c079f5a07dd5b8581d5cc7f9b08026ca709b5328c9a79fc9c1881ee9f3e SHA512 edf453e73950ee2b75c1182d16b87dcc401075a0bf725a2238bff81f9c1c51bf35802730086b00b81ff28c36dfeee1171714dafa0e6f976227099c30b48a01bc
-MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-tga/files/xf86-video-tga-1.2.2-remove-mibstore_h.patch b/x11-drivers/xf86-video-tga/files/xf86-video-tga-1.2.2-remove-mibstore_h.patch
deleted file mode 100644
index 811444147578..000000000000
--- a/x11-drivers/xf86-video-tga/files/xf86-video-tga-1.2.2-remove-mibstore_h.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From b7022db0559cd1b6cd3eb6b5abf6896a607b478d Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Tue, 25 Sep 2012 12:55:00 +0000
-Subject: Remove mibstore.h
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
-diff --git a/src/tga_accel.c b/src/tga_accel.c
-index 35af1a4..b414df5 100644
---- a/src/tga_accel.c
-+++ b/src/tga_accel.c
-@@ -37,7 +37,6 @@
- #include "xf86cmap.h"
- #include "mipointer.h"
- 
--#include "mibstore.h"
- #include "miline.h"
- 
- #include "tga_regs.h"
-diff --git a/src/tga_driver.c b/src/tga_driver.c
-index dd4f3e6..90d2660 100644
---- a/src/tga_driver.c
-+++ b/src/tga_driver.c
-@@ -46,8 +46,6 @@
- 
- /* software cursor */
- #include "mipointer.h"
--/* backing store */
--#include "mibstore.h"
- 
- /*  #include "mibank.h" */
- /* colormap manipulation */
-@@ -1451,7 +1449,6 @@ TGAScreenInit(SCREEN_INIT_ARGS_DECL)
-     
-     fbPictureInit (pScreen, 0, 0);
-     
--    miInitializeBackingStore(pScreen);
-     xf86SetBackingStore(pScreen);
-     xf86SetSilkenMouse(pScreen);
- 
---
-cgit v0.9.0.2-2-gbebe
diff --git a/x11-drivers/xf86-video-tga/metadata.xml b/x11-drivers/xf86-video-tga/metadata.xml
deleted file mode 100644
index e943b72b8a48..000000000000
--- a/x11-drivers/xf86-video-tga/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>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
-</pkgmetadata>
diff --git a/x11-drivers/xf86-video-tga/xf86-video-tga-1.2.2-r1.ebuild b/x11-drivers/xf86-video-tga/xf86-video-tga-1.2.2-r1.ebuild
deleted file mode 100644
index 01f28e90cbd1..000000000000
--- a/x11-drivers/xf86-video-tga/xf86-video-tga-1.2.2-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="X.Org driver for tga cards"
-KEYWORDS="alpha amd64 ia64 x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/xf86dgaproto"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-remove-mibstore_h.patch
-)
diff --git a/x11-drivers/xf86-video-tga/xf86-video-tga-1.2.2.ebuild b/x11-drivers/xf86-video-tga/xf86-video-tga-1.2.2.ebuild
deleted file mode 100644
index 2a1136a59d9d..000000000000
--- a/x11-drivers/xf86-video-tga/xf86-video-tga-1.2.2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit xorg-2
-
-DESCRIPTION="X.Org driver for tga cards"
-KEYWORDS="alpha amd64 ia64 x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/xf86dgaproto"
diff --git a/x11-drivers/xf86-video-trident/Manifest b/x11-drivers/xf86-video-trident/Manifest
deleted file mode 100644
index 15e4f1db8d69..000000000000
--- a/x11-drivers/xf86-video-trident/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST xf86-video-trident-1.3.8.tar.bz2 387742 BLAKE2B 602631c1ba232645f170f080a5895170b6780ea722e551972866e514cf026d7dd83f301f07c3b5bfe2ad4b087d90b434d69c84df8aef0a508e180af992e8eaa3 SHA512 f971e9441c9ff7374d53d30f6746232903221665ae52560d5716762c2233cc6d0065b631a4fed98bf194d9827572cc42da577a2e6e06ba014e6ce42343b63f66
-EBUILD xf86-video-trident-1.3.8.ebuild 287 BLAKE2B b025b3e5ec14e7fdcf31e66b3ce3b4987469e6eecaca39b66fddb3a4a8a12ff8ad563e2d447f6301ac6b1a2f8275c77f40b50fe411eefdce0552e31e1fadec65 SHA512 1e29a8837301b01c9e76244b1f1c3dffaf72e9a7cdf9044315437958f533843bd80f6e73b11928e882e806819ff7aa8025320fcdb7b4dd5ac0c736f1c6deb4eb
-MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-trident/metadata.xml b/x11-drivers/xf86-video-trident/metadata.xml
deleted file mode 100644
index e943b72b8a48..000000000000
--- a/x11-drivers/xf86-video-trident/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>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
-</pkgmetadata>
diff --git a/x11-drivers/xf86-video-trident/xf86-video-trident-1.3.8.ebuild b/x11-drivers/xf86-video-trident/xf86-video-trident-1.3.8.ebuild
deleted file mode 100644
index 52b17dd40cf9..000000000000
--- a/x11-drivers/xf86-video-trident/xf86-video-trident-1.3.8.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="Trident video driver"
-KEYWORDS="amd64 ia64 ppc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}"
diff --git a/x11-drivers/xf86-video-tseng/Manifest b/x11-drivers/xf86-video-tseng/Manifest
deleted file mode 100644
index e0734acd945e..000000000000
--- a/x11-drivers/xf86-video-tseng/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX xf86-video-tseng-1.2.5-remove-mibstore_h.patch 873 BLAKE2B 2dd6c0051fad77f7db2f6a4b0d4e9fa59c12edfba82af9726914aa2fbb209b2beda587d0951c48b3d66217aad8926fd53fd90eecb3e7f7b5798efa1830772402 SHA512 3c2586b137ab3185681cec945e759334d4c4b48d333a9b770d3b061bfe8a51aa536b1c0b3680c04d2f12365255c2fa99aceafcbd595e04d5c8ea29d43356bf90
-DIST xf86-video-tseng-1.2.5.tar.bz2 330575 BLAKE2B 7b7b9e5ae8ddb3b07314b235746ee52dea2b256ab96e1b0dab391ea74e8f8d2485810d939122cfcc365e841cf194c72942c0d891f801419995b86eec17be55af SHA512 6e0010b24d5b97ade00ef80fda5ea91bce3a9ce07881551e84ac552ba49336905b62f062c656c72ea3097a0bec1517ec5038aa5766f8424e5f81d67dc777480c
-EBUILD xf86-video-tseng-1.2.5-r1.ebuild 343 BLAKE2B 8d8a0002d63e8abeb9687feb842f9a5d5b593de30f6134e7f4a3d2e5feb34bfddd3339bd38ba6b77860dde368ba26d1401f985c5fa818d4f5dcf75e6afcf5425 SHA512 01f5ce5abf6b3ccba2afd7201976a6092c08ba286f87cadea5d09257d61b5cb1b3552254944bca42fd0833d228fb99db54ac94bf96994246f29655f1a64764e8
-MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-tseng/files/xf86-video-tseng-1.2.5-remove-mibstore_h.patch b/x11-drivers/xf86-video-tseng/files/xf86-video-tseng-1.2.5-remove-mibstore_h.patch
deleted file mode 100644
index 88f9cc570128..000000000000
--- a/x11-drivers/xf86-video-tseng/files/xf86-video-tseng-1.2.5-remove-mibstore_h.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From d2d5c8437e401181f56804cc68594c4831a0983d Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Tue, 25 Sep 2012 12:55:02 +0000
-Subject: Remove mibstore.h
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
-diff --git a/src/tseng_driver.c b/src/tseng_driver.c
-index ffafb19..0db62e5 100644
---- a/src/tseng_driver.c
-+++ b/src/tseng_driver.c
-@@ -39,9 +39,6 @@
- /* All drivers initialising the SW cursor need this */
- #include "mipointer.h"
- 
--/* All drivers implementing backing store need this */
--#include "mibstore.h"
--
- #include "fb.h"
- 
- #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
-@@ -1453,7 +1450,6 @@ TsengScreenInit(SCREEN_INIT_ARGS_DECL)
- 	}
-     }
- 
--    miInitializeBackingStore(pScreen);
-     xf86SetSilkenMouse(pScreen);
-     /* Initialise cursor functions */
-     miDCInitialize(pScreen, xf86GetPointerScreenFuncs());
---
-cgit v0.9.0.2-2-gbebe
diff --git a/x11-drivers/xf86-video-tseng/metadata.xml b/x11-drivers/xf86-video-tseng/metadata.xml
deleted file mode 100644
index e943b72b8a48..000000000000
--- a/x11-drivers/xf86-video-tseng/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>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
-</pkgmetadata>
diff --git a/x11-drivers/xf86-video-tseng/xf86-video-tseng-1.2.5-r1.ebuild b/x11-drivers/xf86-video-tseng/xf86-video-tseng-1.2.5-r1.ebuild
deleted file mode 100644
index 6fce9a642284..000000000000
--- a/x11-drivers/xf86-video-tseng/xf86-video-tseng-1.2.5-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="Tseng Labs video driver"
-KEYWORDS="amd64 ia64 x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-remove-mibstore_h.patch
-)
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 0a318448ba4a..dbc834504e9e 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/afbinit/Manifest b/x11-misc/afbinit/Manifest
deleted file mode 100644
index 4b8c3d3964f3..000000000000
--- a/x11-misc/afbinit/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX afbinit-mmap-1.0.1.patch 503 BLAKE2B 1bf65dad4d154e5d952e82fbac1a23b40bdfd0a05a45e34c2774a3afac223f3112710c1b21287effe28a37520258b60ab61c048d77bdb84b11022b9357bd4c22 SHA512 a0450aff4756e4406be00d84496b3632d5c60df5c8800403e2be0fcdfb6399242d30e3f90b634bcedff5aa2ee10fdf15af5b2797ae974a73875abddb4bedd271
-AUX afbinit.init 243 BLAKE2B eaad35459fefa3e52fdba52a88a6116b774c9ee6d188dfdd14d7ad9945ff12d01916620b24e4fb05189d0e3d8a1843405fd78427c34b1f40502efa771beecbb8 SHA512 8e6bd724b7552d987d6626d9472ea6848ec1e71caa5e7bef46fe7e0e16d0c9a92c51a2fa58fc9545d7a0db9d2e5bf4f498dbc772c3ca480a6fb3d188cd565a79
-AUX rc.afb-1.0.1-r7.patch 1531 BLAKE2B 00b8e1760d1c98b72e82d0c3d2126960541cd84fddb33307ca9091d4fa129d8501f7a6a4d28888066acab8fbab1d795c3863a0c62854210eb88607b04fe1f438 SHA512 24155451249e38065ee55756df67baed8dc93b16560d3b6f4fc6f42bb81d3e501007dcfeca30c25864dad7350caf8a9a8a3e26680f125657fcbe3aacd5475b0e
-DIST afbinit-1.0.1.tar.bz2 3288 BLAKE2B 790d2a2bbb3bf5778a2720bd40cbdfc930531b762fff3e779eaae661ee1b72792ae51d358ff28f4068b37bf6b20c2941e1f82af8fc72ea10fde9b5bd6f6d8180 SHA512 5cb654ea8572cca3906bf9ecb583165eb4742f67c433e01f81e5f9a238988d3c9f8a8206c9520054ebd74b673c5c1ffef573e5946119d9f2bb1a3154bfe7afaf
-EBUILD afbinit-1.0.1-r7.ebuild 1112 BLAKE2B 465c89502b175abcb86edc00bffe9de4bf308d4d15ca2226090e27d11b9f96fab450719d0146b6f6ab4cca7f901842331ed453ae01abb90a2433bf7e0a13afba SHA512 44300f66082791f1bd936bee8c9179a8c94d7d154664f56e0050dae604e1d2e66fc66d17f01a9c93c62d07c8e7571fce2a05aa9a9a45ba7257160435df9ab97d
-MISC metadata.xml 264 BLAKE2B a5a04e29f8dfa35c63bb46d4f7d7ef92942ce0fd176ce9facd4e70b3a6ed4f4f8428088579b8be06b3b74a53938ad8a4a89192c4116bb485b7c1afd84559d8c4 SHA512 dda5dcf3384eb6758810e868b61d485e2155cd87efcd284dd3ffeb08e5d7718a1447b706e6afc98d715711b8c42f97df7b9f621eca282104788d2d5eb3cf842d
diff --git a/x11-misc/afbinit/afbinit-1.0.1-r7.ebuild b/x11-misc/afbinit/afbinit-1.0.1-r7.ebuild
deleted file mode 100644
index 53c60c7ec8c7..000000000000
--- a/x11-misc/afbinit/afbinit-1.0.1-r7.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils
-
-DESCRIPTION="loads the microcode for Elite3D framebuffers to use X"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-IUSE=""
-
-LICENSE="GPL-1"
-SLOT="0"
-KEYWORDS="-* sparc"
-
-RDEPEND="${DEPEND}
-	sys-apps/util-linux"
-
-src_unpack() {
-	unpack ${A}
-	##
-	# Patch rc.afb to handle both kernels 2.4.x and 2.6.x
-	einfo "Patching to handle both kernel 2.4.x and 2.6.x style afb identification"
-	cd "${S}"
-	epatch "${FILESDIR}"/rc.afb-${PVR}.patch || die "Cannot patch rc.afb init script"
-	einfo 'Patching afbinit.c to use MMAP_PUBLIC (needed for kernels > 2.6.14)'
-	epatch "${FILESDIR}"/afbinit-mmap-${PV}.patch || die "Cannot patch for mmap"
-}
-
-src_compile() {
-	emake || die "make failed"
-}
-
-src_install() {
-	dosbin afbinit
-	dosbin rc.afb
-	newinitd "${FILESDIR}"/afbinit.init afbinit
-}
-
-pkg_postinst() {
-	einfo "To use afbinit, you'll need the AFB microcode."
-	einfo "This is available via a Solaris install at /usr/lib/afb.ucode"
-	einfo "or via sun.com"
-}
diff --git a/x11-misc/afbinit/files/afbinit-mmap-1.0.1.patch b/x11-misc/afbinit/files/afbinit-mmap-1.0.1.patch
deleted file mode 100644
index 43a16c0cbf49..000000000000
--- a/x11-misc/afbinit/files/afbinit-mmap-1.0.1.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- afbinit.c-	2006-01-31 15:21:31.000000000 +0000
-+++ afbinit.c	2006-01-31 15:22:23.000000000 +0000
-@@ -236,7 +236,7 @@
- 	/* MMAP the registers. */
- 	uregs = mmap(0, 0x2000,
- 		     PROT_READ | PROT_WRITE,
--		     MAP_PRIVATE,
-+		     MAP_SHARED,
- 		     afb_fd,
- 		     0x04000000);
- 	if (uregs == (void *)-1L) {
-@@ -246,7 +246,7 @@
- 
- 	kregs = mmap(0, 0x2000,
- 		     PROT_READ | PROT_WRITE,
--		     MAP_PRIVATE,
-+		     MAP_SHARED,
- 		     afb_fd,
- 		     0x0bc04000);
- 	if (kregs == (void *)-1L) {
diff --git a/x11-misc/afbinit/files/afbinit.init b/x11-misc/afbinit/files/afbinit.init
deleted file mode 100644
index eb77118e7e01..000000000000
--- a/x11-misc/afbinit/files/afbinit.init
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	before xdm
-}
-
-start() {
-	ebegin "Loading afbinit"
-	/usr/sbin/rc.afb
-	eend $? "Failed to load afbinit"
-}
diff --git a/x11-misc/afbinit/files/rc.afb-1.0.1-r7.patch b/x11-misc/afbinit/files/rc.afb-1.0.1-r7.patch
deleted file mode 100644
index 37f5f40d1a6a..000000000000
--- a/x11-misc/afbinit/files/rc.afb-1.0.1-r7.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- rc.afb-	1999-09-08 06:42:36.000000000 +0000
-+++ rc.afb	2008-03-18 17:55:11.000000000 +0000
-@@ -10,11 +10,6 @@
- 	exit 0
- fi
- 
--if [ `/bin/dmesg | /bin/grep -c "Elite 3D"` -eq 0 ]
--then
--	exit 0
--fi
--
- # The microcode loader binary and the microcode
- # itself must exist.
- if [ ! -x /usr/sbin/afbinit -o ! -f /usr/lib/afb.ucode ]
-@@ -22,13 +17,38 @@
- 	exit 0
- fi
- 
--# Make FB device list.
--afb_devs=`/bin/dmesg | /bin/egrep -i "Elite 3D" | /bin/sed 's/\:.*//'`
-+# Make FB device list, depending on which kind of kernel we have.
-+# First, try kernel 2.4.x
-+
-+if [ `/bin/dmesg | /bin/grep -c "Elite 3D"` -gt 0 ]
-+then
-+
-+	afb_devs=`/bin/dmesg | /bin/egrep -i "Elite 3D" | /bin/sed 's/\:.*//'`
-+
-+	# Load microcode onto each card.
-+	for AFB in ${afb_devs}
-+	do
-+		echo -n "${AFB}: Loading Elite3D microcode... "
-+		/usr/sbin/afbinit /dev/${AFB} /usr/lib/afb.ucode
-+		echo "done."
-+	done
-+	exit 0
-+else
-+##
-+#	OK, we're not kernel 2.4.x
-+#	try kernel 2.6.x
-+
-+## if [ `/bin/dmesg | /bin/grep -c "AFB"` -gt 0 ]
-+## then
- 
--# Load microcode onto each card.
--for AFB in ${afb_devs}
--do
--	echo -n "${AFB}: Loading Elite3D microcode... "
--	/usr/sbin/afbinit /dev/${AFB} /usr/lib/afb.ucode
--	echo "done."
--done
-+	[[ -e /proc/fb ]] || exit 0
-+	afb_devs=`/bin/more -s /proc/fb  | /bin/egrep -i "Elite 3D" | /bin/sed 's/\ .*//'`
-+	# Load microcode onto each card.
-+	for AFB in ${afb_devs}
-+	do
-+		echo -n "/dev/fb${AFB}: Loading Elite3D microcode... "
-+		/usr/sbin/afbinit /dev/fb${AFB} /usr/lib/afb.ucode
-+		echo "done."
-+	done
-+	exit 0
-+fi
diff --git a/x11-misc/afbinit/metadata.xml b/x11-misc/afbinit/metadata.xml
deleted file mode 100644
index 6fa5bc8b3252..000000000000
--- a/x11-misc/afbinit/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-
-	<maintainer type="project">
-		<email>sparc@gentoo.org</email>
-		<name>Gentoo Linux SPARC Development</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/x11-misc/qtnotifydaemon/Manifest b/x11-misc/qtnotifydaemon/Manifest
deleted file mode 100644
index 073cb99421db..000000000000
--- a/x11-misc/qtnotifydaemon/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX qtnotifydaemon-1.0.14-build.patch 702 BLAKE2B 04af90c917c0a3689323935c9d11c2e764283a2575f4174f21997cf660ccf4621a98b5408d5a3647ce9aacfbfc1cf1f2cb2bac87f9bad499b85240eb78be1bb4 SHA512 4d71408894f071433d70d0f305606402ecb780f1cb7857b2cb9715e3b0ac524fea3561c247da009bdf745e2e0284f2f7bd8ac15a38283f8c8cef4d7a811ec0f4
-DIST qtnotifydaemon_1.0.14.orig.tar.gz 1136779 BLAKE2B fa3c3455bcbfc01397ec7db371337df2e8ca0a7b00077cbd1279fbedfa544e4fd8bdec3284ee11735e9c55618ff834f0b65f193df6db734bb9c0debaefdf7351 SHA512 409f911be7d0e55f8a9f23db67ad6eefac1d215c598f54bab35bd704feee3a68ae21a3c416bd8848aacbdd82ca751ea1170c566d5615d4ac8a30adb87d487b8f
-EBUILD qtnotifydaemon-1.0.14.ebuild 720 BLAKE2B f9558a2c37c1b6f832d23a2d917d617fbf121f6c66a0f72e67d08b315417c410408eefbaa0018a329e3f570cdfded7ecf7f82285a8857528738cf894ce70269b SHA512 b61b1bd3c9fd7bc7bac3bc0a41e012abe8d131220401883a53c13d308662ab4247a60dd41f36164dfae77f54fe6b34872de47089616bc2b011ed9cd6a0874d21
-MISC metadata.xml 227 BLAKE2B 9d5b1e7b6fac85414998ab68e7ec0fc3e34b60dfc60474e834c2eeadf25423ad3e5fff886e5eb1a06ebb31d5668772c1ae4b381194bd36f7651085a406674d2d SHA512 70347ff7fbf043df97c4799497cdeeb3af878158a95f9de8898017b9ebe58a853b3071e830865fd45cbf633a047082d3f030fe6bc0f81cfb5a40f765d11db82d
diff --git a/x11-misc/qtnotifydaemon/files/qtnotifydaemon-1.0.14-build.patch b/x11-misc/qtnotifydaemon/files/qtnotifydaemon-1.0.14-build.patch
deleted file mode 100644
index 0aebc851c727..000000000000
--- a/x11-misc/qtnotifydaemon/files/qtnotifydaemon-1.0.14-build.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Fixes build with GCC 4.7, as well as the gold linker.
-
---- main.cpp
-+++ main.cpp
-@@ -22,6 +22,7 @@
- #include <signal.h>
- #include <sys/stat.h>
- #include <pwd.h>
-+#include <unistd.h>
- #include "dbus.h"
- #include "notifywidget.h"
- #include "notifyarea.h"
---- notifyarea.cpp
-+++ notifyarea.cpp
-@@ -22,6 +22,7 @@
- #include <QSystemTrayIcon> //alex
- #include <QDesktopWidget>
- #include <fstream>
-+#include <unistd.h>
- #include "notifyarea.h"
- #include "notifywidget.h"
- #include "dbus.h"
---- qtnotifydaemon.pro
-+++ qtnotifydaemon.pro
-@@ -13,6 +13,7 @@
- INCLUDEPATH += .
- QT += dbus
- RESOURCES += images.qrc
-+LIBS += -lX11
- 
- # Input
- SOURCES += main.cpp notifywidget.cpp dbus.cpp notifyarea.cpp message.cpp
diff --git a/x11-misc/qtnotifydaemon/qtnotifydaemon-1.0.14.ebuild b/x11-misc/qtnotifydaemon/qtnotifydaemon-1.0.14.ebuild
deleted file mode 100644
index a210a436ee83..000000000000
--- a/x11-misc/qtnotifydaemon/qtnotifydaemon-1.0.14.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit qt4-r2
-
-DESCRIPTION="A flexible and configurable notification daemon"
-HOMEPAGE="https://sourceforge.net/projects/qtnotifydaemon/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	dev-qt/qtdbus:4
-	dev-qt/qtgui:4
-	dev-qt/qt3support:4
-	!x11-misc/notification-daemon
-	!x11-misc/notify-osd"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}
-
-PATCHES=( "${FILESDIR}/${P}-build.patch" )
-
-src_install() {
-	dobin ${PN}
-
-	insinto /usr/share/dbus-1/services
-	doins org.freedesktop.Notifications.service
-
-	doman debian/${PN}.1
-}
diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index 3bfd76510e84..efed959fb2ba 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/enigmail/Manifest b/x11-plugins/enigmail/Manifest
index adf38ea4cad1..3e29d49fefa0 100644
--- a/x11-plugins/enigmail/Manifest
+++ b/x11-plugins/enigmail/Manifest
@@ -1,13 +1,4 @@
-DIST enigmail-1.9.6.1.tar.gz 1745021 BLAKE2B 0fdc1e2e3f16491759cb360593e2132524150b34bb30234d520802f30aef8869367ac9a6e9fe75722ac2aa9a60dbf4ffb71293a07f8d460ea3672e78a8cb6772 SHA512 e6ab69734a39a4953e0167e07b06f0d5c83fb42956515392319a1cd9d665ca274f6a12b4141e2dfa373ef074f0526f3d7330a48d29d600fc38f724d26518ff84
-DIST enigmail-1.9.8.1.tar.gz 1776673 BLAKE2B 9a8251ced15ee4feeceafc3ee261f877886783428224dcb1616e411864f70f6fd822503ba82ebe9fe61462cb25baabda6c5cf65ff8738a53719b7e212eca8e78 SHA512 af280040e96eb69529e723e52e65621e42743c974b0ed42598e73458004f0a59688da7257d2b556e95a56c4cad3ac48f527d4d9a7a54c9c92eaff132257e0cfd
-DIST enigmail-1.9.8.2.tar.gz 1776792 BLAKE2B 901bc4d735c461e1fad39bc7f2a613eac6c087af5053f7d15ee80fdef790c4a022cffd8972dbd2570d39e9f51ac29db287ed6c04745f36f07b93312401262cc5 SHA512 4db069752a8251f4989ab9736600b83f005a066f99b2830add088514d0afec69871c998c148535e5dc212d3635c35990a90161a47c18398805e1c51497263431
-DIST enigmail-1.9.8.3.tar.gz 1776756 BLAKE2B 3de3c81b5bd1c79583ea32f79c3654337417f42f1cd11ee7df5e6b1064144eac584ba8d7368834910b9e460deb9c2d150940efdcef61c5f67803067201049e6e SHA512 d8c08b1824352353c7596750b801604f7216bc5a138563b1fbd5fb890901e9c7c03cb2df099c9158d6bf3125fa17c900f65fb21bc40a8ced67a6812cdc0e02d9
 DIST enigmail-1.9.9.tar.gz 1787556 BLAKE2B 729cf7e404b4cc5d964df476e627b476916cd6c834ce5f220a26738bc32eabbd9fd2c4c3cbaccef6e1d8c4b5b7313b54278a4170808f8b722443b338fda87b55 SHA512 39b37305362c88527d897ed95aa9d8457137d5f026359d19b838ab9df531c14099e157afdc8fefae78a6fa2ddded8dbfbeaf84eb91ac6cfbb05ae808731da2cb
-EBUILD enigmail-1.9.6.1-r1.ebuild 1302 BLAKE2B 2d553c9ca2a117f39c2aea293a57f61371c13100147ad85b24217ebd7c75d779bfa3c1d5a6c5d69683e02416c308ca56ae985bd61f2d5d633d5805fdd1bfcf6f SHA512 a62356a3ea2dc1d7befb86548f41e47d89a0f838088c0467879a4b2304695bbee52ce5dc4478323b266cfe747c4ac86eeb971a8125a091232948d2d2d5a6bea7
-EBUILD enigmail-1.9.8.1.ebuild 1302 BLAKE2B 2d553c9ca2a117f39c2aea293a57f61371c13100147ad85b24217ebd7c75d779bfa3c1d5a6c5d69683e02416c308ca56ae985bd61f2d5d633d5805fdd1bfcf6f SHA512 a62356a3ea2dc1d7befb86548f41e47d89a0f838088c0467879a4b2304695bbee52ce5dc4478323b266cfe747c4ac86eeb971a8125a091232948d2d2d5a6bea7
-EBUILD enigmail-1.9.8.2.ebuild 1306 BLAKE2B 9f835cf1b1f4c9fea8ffb1e146ef1ffab92310e4ff4a3ff2c15abee6795abea636256596eccd8e355eea1215c68083ab34deb951285bfc3875014142af79c8f4 SHA512 97c14d79f519aba74d595ab4df7a65fcff86ad27cc2027def749fec4f04c5a46a6f513cb005dc23c71fb7dca729662b0eaaa1366efba2c202beb728f725e7402
-EBUILD enigmail-1.9.8.3-r1.ebuild 1924 BLAKE2B 9bbca182873498d5623a40d8355560c246358be1a404fc1cf97502e15a683ba99e9abba6be590b47176fdc880a082d718a0055a136e9a5bb70a038dc80dd1720 SHA512 daaccfd03847c51ab76dfb3327dadddae920cdd4cc1a493ab65e68997a7210a01e300ba1269b5f469ff533e9bef1cdd72309bbcc4f7730ee603d785be97be4f2
-EBUILD enigmail-1.9.8.3.ebuild 1306 BLAKE2B 9f835cf1b1f4c9fea8ffb1e146ef1ffab92310e4ff4a3ff2c15abee6795abea636256596eccd8e355eea1215c68083ab34deb951285bfc3875014142af79c8f4 SHA512 97c14d79f519aba74d595ab4df7a65fcff86ad27cc2027def749fec4f04c5a46a6f513cb005dc23c71fb7dca729662b0eaaa1366efba2c202beb728f725e7402
 EBUILD enigmail-1.9.9.ebuild 1922 BLAKE2B 91c9d28229704a6fc1b529a3b9948c3b4b32e097a2f9ec4d44e9e036ad2b7615314c1cf14120e536304cfb43c3ce0d71a6e327f92992c4f79b51ad484ffad6dd SHA512 b2e8dd3b86c1aaf37954c067bdaae67217f7446317817af837f9a2affd4c886d0e3d3b81b10f402105cd54a4534449a86ebe69673024367a34467fea400b6cba
 EBUILD enigmail-9999.ebuild 1915 BLAKE2B ccff9cc03869ccc02a313a3f96cdf25081424b295e03dca6f6a69449da99013708efc20fd5141e61cff2b68640d466a6141a60df51b29803c4ac11a47eebdcd6 SHA512 4b8c948bf8aef1eb2d2a422ee66d8ad0df4a0ef312ca7c16dbe12654b0bcc504e3882bbd258e5630a0e51977f14028b059940b47fb464bb7534daf47d6270374
 MISC metadata.xml 250 BLAKE2B 9e6643b2a0b90fc083246090047db38d3b9a3b71db8542051307b7e87394135d3337e1ea54b83a0c7474661a0fd07d950385b44cbed6ee95f6e6ad718bd0b062 SHA512 ba5e7c1f6ee117471a3804bc54211e7f89c75e965a865f45f85015a0a28ec7d511ef9bbc196eef8245dc9259f54b04eb3563d83811a293bb946cf0977563892b
diff --git a/x11-plugins/enigmail/enigmail-1.9.6.1-r1.ebuild b/x11-plugins/enigmail/enigmail-1.9.6.1-r1.ebuild
deleted file mode 100644
index f10b469ea882..000000000000
--- a/x11-plugins/enigmail/enigmail-1.9.6.1-r1.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
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-any-r1
-
-DESCRIPTION="Mozilla extension to provide GPG support in mail clients"
-HOMEPAGE="http://www.enigmail.net/"
-
-KEYWORDS="~alpha amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-SLOT="0"
-LICENSE="MPL-2.0 GPL-3"
-IUSE=""
-SRC_URI="http://www.enigmail.net/download/source/${P}.tar.gz"
-
-RDEPEND="|| (
-		( >=app-crypt/gnupg-2.0
-			|| (
-				app-crypt/pinentry[gtk(-)]
-				app-crypt/pinentry[qt4(-)]
-				app-crypt/pinentry[qt5(-)]
-			)
-		)
-		=app-crypt/gnupg-1.4*
-	)"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	app-arch/zip
-	dev-lang/perl
-	"
-
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	emake ipc public ui package lang
-	emake xpi
-
-}
-
-src_install() {
-	insinto /usr/share/${PN}
-	doins -r build/dist/{chrome,components,defaults,modules,wrappers,chrome.manifest,install.rdf}
-}
-
-pkg_postinst() {
-	local peimpl=$(eselect --brief --colour=no pinentry show)
-	case "${peimpl}" in
-	*gtk*|*qt*) ;;
-	*)	ewarn "The pinentry front-end currently selected is not one supported by thunderbird."
-		ewarn "You may be prompted for your password in an inaccessible shell!!"
-		ewarn "Please use 'eselect pinentry' to select either the gtk or qt front-end"
-		;;
-	esac
-}
diff --git a/x11-plugins/enigmail/enigmail-1.9.8.1.ebuild b/x11-plugins/enigmail/enigmail-1.9.8.1.ebuild
deleted file mode 100644
index f10b469ea882..000000000000
--- a/x11-plugins/enigmail/enigmail-1.9.8.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
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-any-r1
-
-DESCRIPTION="Mozilla extension to provide GPG support in mail clients"
-HOMEPAGE="http://www.enigmail.net/"
-
-KEYWORDS="~alpha amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-SLOT="0"
-LICENSE="MPL-2.0 GPL-3"
-IUSE=""
-SRC_URI="http://www.enigmail.net/download/source/${P}.tar.gz"
-
-RDEPEND="|| (
-		( >=app-crypt/gnupg-2.0
-			|| (
-				app-crypt/pinentry[gtk(-)]
-				app-crypt/pinentry[qt4(-)]
-				app-crypt/pinentry[qt5(-)]
-			)
-		)
-		=app-crypt/gnupg-1.4*
-	)"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	app-arch/zip
-	dev-lang/perl
-	"
-
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	emake ipc public ui package lang
-	emake xpi
-
-}
-
-src_install() {
-	insinto /usr/share/${PN}
-	doins -r build/dist/{chrome,components,defaults,modules,wrappers,chrome.manifest,install.rdf}
-}
-
-pkg_postinst() {
-	local peimpl=$(eselect --brief --colour=no pinentry show)
-	case "${peimpl}" in
-	*gtk*|*qt*) ;;
-	*)	ewarn "The pinentry front-end currently selected is not one supported by thunderbird."
-		ewarn "You may be prompted for your password in an inaccessible shell!!"
-		ewarn "Please use 'eselect pinentry' to select either the gtk or qt front-end"
-		;;
-	esac
-}
diff --git a/x11-plugins/enigmail/enigmail-1.9.8.2.ebuild b/x11-plugins/enigmail/enigmail-1.9.8.2.ebuild
deleted file mode 100644
index ff5e7f5079a3..000000000000
--- a/x11-plugins/enigmail/enigmail-1.9.8.2.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
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-any-r1
-
-DESCRIPTION="Mozilla extension to provide GPG support in mail clients"
-HOMEPAGE="http://www.enigmail.net/"
-
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-SLOT="0"
-LICENSE="MPL-2.0 GPL-3"
-IUSE=""
-SRC_URI="http://www.enigmail.net/download/source/${P}.tar.gz"
-
-RDEPEND="|| (
-		( >=app-crypt/gnupg-2.0
-			|| (
-				app-crypt/pinentry[gtk(-)]
-				app-crypt/pinentry[qt4(-)]
-				app-crypt/pinentry[qt5(-)]
-			)
-		)
-		=app-crypt/gnupg-1.4*
-	)"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	app-arch/zip
-	dev-lang/perl
-	"
-
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	emake ipc public ui package lang
-	emake xpi
-
-}
-
-src_install() {
-	insinto /usr/share/${PN}
-	doins -r build/dist/{chrome,components,defaults,modules,wrappers,chrome.manifest,install.rdf}
-}
-
-pkg_postinst() {
-	local peimpl=$(eselect --brief --colour=no pinentry show)
-	case "${peimpl}" in
-	*gtk*|*qt*) ;;
-	*)	ewarn "The pinentry front-end currently selected is not one supported by thunderbird."
-		ewarn "You may be prompted for your password in an inaccessible shell!!"
-		ewarn "Please use 'eselect pinentry' to select either the gtk or qt front-end"
-		;;
-	esac
-}
diff --git a/x11-plugins/enigmail/enigmail-1.9.8.3-r1.ebuild b/x11-plugins/enigmail/enigmail-1.9.8.3-r1.ebuild
deleted file mode 100644
index 03f1324ee127..000000000000
--- a/x11-plugins/enigmail/enigmail-1.9.8.3-r1.ebuild
+++ /dev/null
@@ -1,74 +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-any-r1
-
-DESCRIPTION="Mozilla extension to provide GPG support in mail clients"
-HOMEPAGE="http://www.enigmail.net/"
-
-KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-SLOT="0"
-LICENSE="MPL-2.0 GPL-3"
-IUSE=""
-SRC_URI="http://www.enigmail.net/download/source/${P}.tar.gz"
-
-RDEPEND="|| (
-		( >=app-crypt/gnupg-2.0
-			|| (
-				app-crypt/pinentry[gtk(-)]
-				app-crypt/pinentry[qt4(-)]
-				app-crypt/pinentry[qt5(-)]
-			)
-		)
-		=app-crypt/gnupg-1.4*
-	)
-	!<mail-client/thunderbird-52.5.0
-	!<www-client/seamonkey-2.49.5.0_p0
-	"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	app-arch/zip
-	dev-lang/perl
-	"
-
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	emake ipc public ui package lang
-	emake xpi
-
-}
-
-src_install() {
-	local emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' build/dist/install.rdf)
-	[[ -n ${emid} ]] || die "Could not scrape EM:ID from install.rdf"
-
-	mv build/enigmail*.xpi build/"${emid}.xpi" || die 'Could not rename XPI to match EM:ID'
-
-	# thunderbird
-	insinto "/usr/share/mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}"
-	doins build/"${emid}.xpi"
-
-	# seamonkey
-	insinto "/usr/share/mozilla/extensions/{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}"
-	doins build/"${emid}.xpi"
-}
-
-pkg_postinst() {
-	local peimpl=$(eselect --brief --colour=no pinentry show)
-	case "${peimpl}" in
-	*gtk*|*qt*) ;;
-	*)	ewarn "The pinentry front-end currently selected is not one supported by thunderbird."
-		ewarn "You may be prompted for your password in an inaccessible shell!!"
-		ewarn "Please use 'eselect pinentry' to select either the gtk or qt front-end"
-		;;
-	esac
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		elog ""
-		elog "Please restart thunderbird and/or seamonkey in order for them to use"
-		elog "the newly installed version of enigmail."
-	fi
-}
diff --git a/x11-plugins/enigmail/enigmail-1.9.8.3.ebuild b/x11-plugins/enigmail/enigmail-1.9.8.3.ebuild
deleted file mode 100644
index ff5e7f5079a3..000000000000
--- a/x11-plugins/enigmail/enigmail-1.9.8.3.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
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-any-r1
-
-DESCRIPTION="Mozilla extension to provide GPG support in mail clients"
-HOMEPAGE="http://www.enigmail.net/"
-
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-SLOT="0"
-LICENSE="MPL-2.0 GPL-3"
-IUSE=""
-SRC_URI="http://www.enigmail.net/download/source/${P}.tar.gz"
-
-RDEPEND="|| (
-		( >=app-crypt/gnupg-2.0
-			|| (
-				app-crypt/pinentry[gtk(-)]
-				app-crypt/pinentry[qt4(-)]
-				app-crypt/pinentry[qt5(-)]
-			)
-		)
-		=app-crypt/gnupg-1.4*
-	)"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	app-arch/zip
-	dev-lang/perl
-	"
-
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	emake ipc public ui package lang
-	emake xpi
-
-}
-
-src_install() {
-	insinto /usr/share/${PN}
-	doins -r build/dist/{chrome,components,defaults,modules,wrappers,chrome.manifest,install.rdf}
-}
-
-pkg_postinst() {
-	local peimpl=$(eselect --brief --colour=no pinentry show)
-	case "${peimpl}" in
-	*gtk*|*qt*) ;;
-	*)	ewarn "The pinentry front-end currently selected is not one supported by thunderbird."
-		ewarn "You may be prompted for your password in an inaccessible shell!!"
-		ewarn "Please use 'eselect pinentry' to select either the gtk or qt front-end"
-		;;
-	esac
-}
diff --git a/x11-plugins/qled/Manifest b/x11-plugins/qled/Manifest
deleted file mode 100644
index e085bb6a5ad9..000000000000
--- a/x11-plugins/qled/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST 72482-QLed-0.6.2.zip 720788 BLAKE2B ae03e4d1c7bb77a8b06f1762c6d022cdea868bf81d4ea30fd6ac9a1bc62b29a2ba5fb9a2f3e73f091b8e39a09db89b8c28b270e1d2d1191963a76b562f5ec6f1 SHA512 407df6b873b3b846d53847f96d145cbfb62a9878bdd3bc0c7157cd8f8a7e0ecdd903061059ab37dc62ad7c909483d94c540505f295761debe9727579fcb35cd1
-EBUILD qled-0.6.2.ebuild 546 BLAKE2B b462a4ae36de7ec30476ed219c01092c06cc2e2fc64c522b533a88f3042d2736cc35ff622bde6faa671af69738505876dcd9c0674aa8a64c663db73823226c28 SHA512 37c4fd42f8a2dd4ee3d7efc553df5a4a768ff41cf478100d90062e1333525ccdabb6792e3783b269827d8d7649577d5f76f84f9cf19c0d1a630416e49f441f98
-MISC metadata.xml 244 BLAKE2B c4578615fd9f129ba63401a677b05631e811fc780e4c1f3e95ad1da14adb53c59705683a04a0ad1e54ec8ae3730b412d77ecd844b664272ff22c27dd00aafe53 SHA512 c0661c87a34d45258dc8236baf4e1fd4fcb3f418f4a6bb13670ae91141c7474ea8d423cb7df3c8f45cc4441e22783e6ceb807a84ccb8a75c574ea079f8a02117
diff --git a/x11-plugins/qled/metadata.xml b/x11-plugins/qled/metadata.xml
deleted file mode 100644
index 2028cee3c389..000000000000
--- a/x11-plugins/qled/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="person">
-<email>hwoarang@gentoo.org</email>
-<name>Markos Chandras</name>
-</maintainer>
-</pkgmetadata>
diff --git a/x11-plugins/qled/qled-0.6.2.ebuild b/x11-plugins/qled/qled-0.6.2.ebuild
deleted file mode 100644
index 60a382ce2f2e..000000000000
--- a/x11-plugins/qled/qled-0.6.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=3
-
-inherit qt4-r2
-
-MY_PN="QLed"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="Custom Led widget plugin for Qt-Designer"
-HOMEPAGE="http://qt-apps.org/content/show.php?content=72482"
-SRC_URI="http://qt-apps.org/CONTENT/content-files/72482-${MY_P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	|| ( ( >=dev-qt/qtgui-4.8.5:4 dev-qt/designer:4 ) <dev-qt/qtgui-4.8.5:4 )
-	dev-qt/qtsvg:4"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
diff --git a/x11-plugins/wmcpuwatch/Manifest b/x11-plugins/wmcpuwatch/Manifest
index 20c96e991f05..148051b967d9 100644
--- a/x11-plugins/wmcpuwatch/Manifest
+++ b/x11-plugins/wmcpuwatch/Manifest
@@ -1,3 +1,4 @@
+AUX wmcpuwatch-0.2-cmake.patch 1376 BLAKE2B 5bee8323ebed3418220688964e709f7f657b91ffea780dd073464dddf3a30cfbb06d741cf0a50ac8a727dacbe428cc7ea6f8e5e8d8a5102f197034b16d5b284d SHA512 9e2f55aac2fc2d12556b70c05cd30cacd2fc8acdc3b6f955473a02b18fc2e705adcd6954e23051dbfdc8a51734a69446a20f459df0295e3a0e74459ff8729a5c
 DIST wmcpuwatch-0.2.tar.bz2 55621 BLAKE2B 5be49c22b7f063fe2cf4fb91358665903018500d51f56731b0f3584fec011031ec03fdb650722634aaf3b8b9a29e9f7d048b73fcc88b20e469607472cf827e69 SHA512 25aa3fb2d416035a7f3afbec58b2166338009e57310166e91719f6b5cfc4a1e05600ef0ec381c1ff56964848dac1e8ed272cbc4e352dbcc2751addd2cddd2e6e
-EBUILD wmcpuwatch-0.2.ebuild 450 BLAKE2B ea698bbf2a78f1011692074b211799da6a73762ef45d5b7e780784744de0dd4edfeec7d077e88c1db5aa7b3b067d825651279c67aabee6e65ea2087ef01a3d68 SHA512 ee48e13abf455514add333e39f19ade82e1b348a627d2a4baa8a5730fa74eb6d0c1b2c3405190576c5145c94f66be5239201b536a9295d03e5403ad55f3e56a5
+EBUILD wmcpuwatch-0.2-r1.ebuild 762 BLAKE2B 9af1e94b7599686d532c6e097129a622eb97bf5c62634fd18c294433e1baff805251c4ae09ef60728371cd29642add881c1ac3dc31121540ba08b8b21e34ed15 SHA512 3f6118e0c18b462d6e10f1ba6c67d239adfddde1a8800f13cf24eae77e85f23f28c00d790e0a165374c5131595618dace4901adb1b6ac13d6136e2b156a92127
 MISC metadata.xml 779 BLAKE2B 55a1b5288840f3bcb34fc4e1fdf1790b9f3dfd8454816caaea58c19f1ef9156fd3deea1be0540d4c3fc10701aec04da0a51d4beb35b81e7c892a5a25e6d3ea08 SHA512 7cced753e2d94d9f1d4265269797c690ed732dcf3943ea8263d7408c9e295a0e2d26aecf9dd9e0b0805dfcb0ecc355f87764ec65292c78a822dcd00d85d3c011
diff --git a/x11-plugins/wmcpuwatch/files/wmcpuwatch-0.2-cmake.patch b/x11-plugins/wmcpuwatch/files/wmcpuwatch-0.2-cmake.patch
new file mode 100644
index 000000000000..bd3ddac62403
--- /dev/null
+++ b/x11-plugins/wmcpuwatch/files/wmcpuwatch-0.2-cmake.patch
@@ -0,0 +1,33 @@
+diff -Naur wmcpuwatch-0.2.orig/CMakeLists.txt wmcpuwatch-0.2/CMakeLists.txt
+--- wmcpuwatch-0.2.orig/CMakeLists.txt	2017-09-03 13:58:43.000000000 +0200
++++ wmcpuwatch-0.2/CMakeLists.txt	2018-01-01 22:28:19.108393247 +0100
+@@ -26,6 +26,7 @@
+ #
+ # Define include directories
+ include_directories(
++	"${PROJECT_BINARY_DIR}"
+     ${DOCKAPP_INCLUDE_DIR}
+     ${X11_X11_INCLUDE_PATH})
+ 
+@@ -56,8 +57,6 @@
+ install(TARGETS wmcpuwatch RUNTIME DESTINATION bin)
+ install(FILES wmcpuwatch.1 DESTINATION share/man/man1)
+ install(FILES wmcpuwatch.desktop DESTINATION share/applications)
+-install(FILES README.md DESTINATION share/doc/${CMAKE_PROJECT_NAME})
+-install(FILES ChangeLog DESTINATION share/doc/${CMAKE_PROJECT_NAME} RENAME changelog)
+ 
+ #
+ # Create a source tarball using CPack
+diff -Naur wmcpuwatch-0.2.orig/doc/CMakeLists.txt wmcpuwatch-0.2/doc/CMakeLists.txt
+--- wmcpuwatch-0.2.orig/doc/CMakeLists.txt	2017-09-03 12:00:37.000000000 +0200
++++ wmcpuwatch-0.2/doc/CMakeLists.txt	2018-01-01 22:33:00.690614708 +0100
+@@ -20,9 +20,6 @@
+         WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+         COMMENT "Generating code documentation"
+         VERBATIM)
+-
+-    # Install the documentation
+-    install(DIRECTORY html DESTINATION share/doc/${CMAKE_PROJECT_NAME})
+ else (DOXYGEN_FOUND)
+     message("doxygen not installed: Not creating code documentation")
+ endif (DOXYGEN_FOUND)
diff --git a/x11-plugins/wmcpuwatch/wmcpuwatch-0.2.ebuild b/x11-plugins/wmcpuwatch/wmcpuwatch-0.2-r1.ebuild
index d475e3e240e7..e758ba522eee 100644
--- a/x11-plugins/wmcpuwatch/wmcpuwatch-0.2.ebuild
+++ b/x11-plugins/wmcpuwatch/wmcpuwatch-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=6
@@ -11,7 +11,21 @@ SRC_URI="https://bitbucket.org/StarFire/${PN}/downloads/${P}.tar.bz2"
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="doc"
 
 RDEPEND=">=x11-libs/libdockapp-0.7:="
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen[dot] )"
+
+DOCS=( ChangeLog README.md )
+PATCHES=( "${FILESDIR}"/${P}-cmake.patch )
+
+src_prepare() {
+	cmake-utils_src_prepare
+	use doc || sed -e "s/add_subdirectory(doc)//" -i CMakeLists.txt || die
+}
+
+src_install() {
+	cmake-utils_src_install
+	use doc && dodoc -r "${BUILD_DIR}"/doc/html
+}
diff --git a/x11-plugins/wmcube/Manifest b/x11-plugins/wmcube/Manifest
index c29b2fb802a8..375098fc6be6 100644
--- a/x11-plugins/wmcube/Manifest
+++ b/x11-plugins/wmcube/Manifest
@@ -1,4 +1,3 @@
-AUX wmcube-0.98-list.patch 2918 BLAKE2B 393e76edcefa54d814229cc2d8d21556d7437580c1a226d454470175de6ad1e9a688555aabdc60aaa328d578b4d04b300e64ae431efe9d7680400118d52116d5 SHA512 2a6da4a9b676ea51bbcc400b3255f3c10240db13fd6da46921f6c91d5529ecf50120e195b815e58a1b0a8bad81a944e8da3cba261a69579f36165f35ad23f144
 DIST wmcube-1.0.2.tar.gz 56908 BLAKE2B 4ce373b3822e9d515d611e577214a2c51a8e4fb62cc47cf9f64ad49441bd3c53ba09d301c898a37f6ffafecf984ae04cefce9890c593797719b29fb54425f6c7 SHA512 171700848a9d674ced3ee33468b967b2be706e72863f8356f0d8d72785c06a1c34b5be3597e5604bf74e97ee911ca05b68a28bfe67c1171a61c7084450d622de
 EBUILD wmcube-1.0.2.ebuild 905 BLAKE2B 7cdf13f3021adac5cd2b71b813fe8c4522c6fe819c4e16bdb6f520e5cc4ad008cf3c8695cf9279c931d15302efa7a4ae0aae05dfda6c2b83db5402b30f19f020 SHA512 4a73a28b1d57ba605f83fe5c7b2a5362a0d98369b409ea689f0f501065ff9b7584d86b08553d2a7dee8230fa09421c47e274da05aeed762c734a7590623c8210
 MISC metadata.xml 417 BLAKE2B 7d594431bb0c67d7275c73e53e6958ff415beaf1ec79b82bbf887b3ac16d17e13e8319f467c17bd376b04130959767be65e6112bd7032b853502b8d9dd07817e SHA512 370036b0e1a6a62c3251f22f687277a6ad684b02e423db1b2879fc08267db8c4b6de7e0e35de500b836dd1156d717bf3100e3de4027477473e30aeb1adf339ba
diff --git a/x11-plugins/wmcube/files/wmcube-0.98-list.patch b/x11-plugins/wmcube/files/wmcube-0.98-list.patch
deleted file mode 100644
index 1b1ac317669e..000000000000
--- a/x11-plugins/wmcube/files/wmcube-0.98-list.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-diff -Naur wmgeneral.orig/list.c wmgeneral/list.c
---- wmgeneral.orig/list.c	2016-01-04 13:28:36.583339716 +0100
-+++ wmgeneral/list.c	2016-01-04 13:28:48.694343645 +0100
-@@ -38,7 +38,7 @@
- 
- /* Return a cons cell produced from (head . tail)
- 
--INLINE LinkedList* 
-+LinkedList* 
- list_cons(void* head, LinkedList* tail)
- {
-   LinkedList* cell;
-@@ -51,7 +51,7 @@
- 
- /* Return the length of a list, list_length(NULL) returns zero
- 
--INLINE int
-+int
- list_length(LinkedList* list)
- {
-   int i = 0;
-@@ -66,7 +66,7 @@
- /* Return the Nth element of LIST, where N count from zero.  If N 
-    larger than the list length, NULL is returned 
- 
--INLINE void*
-+void*
- list_nth(int index, LinkedList* list)
- {
-   while(index-- != 0)
-@@ -81,7 +81,7 @@
- 
- /* Remove the element at the head by replacing it by its successor
- 
--INLINE void
-+void
- list_remove_head(LinkedList** list)
- {
-   if (!*list) return;  
-@@ -101,7 +101,7 @@
- 
- /* Remove the element with `car' set to ELEMENT
- /*
--INLINE void
-+void
- list_remove_elem(LinkedList** list, void* elem)
- {
-   while (*list)
-@@ -112,7 +112,7 @@
-     }
- 
- 
--INLINE LinkedList *
-+LinkedList *
- list_remove_elem(LinkedList* list, void* elem)
- {
-     LinkedList *tmp;
-@@ -132,7 +132,7 @@
- 
- /* Return element that has ELEM as car
- 
--INLINE LinkedList*
-+LinkedList*
- list_find(LinkedList* list, void* elem)
- {
-   while(list)
-@@ -146,7 +146,7 @@
- 
- /* Free list (backwards recursive)
- 
--INLINE void
-+void
- list_free(LinkedList* list)
- {
-   if(list)
-@@ -158,7 +158,7 @@
- 
- /* Map FUNCTION over all elements in LIST
- 
--INLINE void
-+void
- list_mapcar(LinkedList* list, void(*function)(void*))
- {
-   while(list)
-diff -Naur wmgeneral.orig/list.h wmgeneral/list.h
---- wmgeneral.orig/list.h	2016-01-04 13:28:36.583339716 +0100
-+++ wmgeneral/list.h	2016-01-04 13:28:39.471340654 +0100
-@@ -29,31 +29,25 @@
- #ifndef __LIST_H_
- #define __LIST_H_
- 
--#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
--# define INLINE inline
--#else
--# define INLINE
--#endif
--
- typedef struct LinkedList {
-   void *head;
-   struct LinkedList *tail;
- } LinkedList;
- 
--INLINE LinkedList* list_cons(void* head, LinkedList* tail);
-+LinkedList* list_cons(void* head, LinkedList* tail);
- 
--INLINE int list_length(LinkedList* list);
-+int list_length(LinkedList* list);
- 
--INLINE void* list_nth(int index, LinkedList* list);
-+void* list_nth(int index, LinkedList* list);
- 
--INLINE void list_remove_head(LinkedList** list);
-+void list_remove_head(LinkedList** list);
- 
--INLINE LinkedList *list_remove_elem(LinkedList* list, void* elem);
-+LinkedList *list_remove_elem(LinkedList* list, void* elem);
- 
--INLINE void list_mapcar(LinkedList* list, void(*function)(void*));
-+void list_mapcar(LinkedList* list, void(*function)(void*));
- 
--INLINE LinkedList*list_find(LinkedList* list, void* elem);
-+LinkedList*list_find(LinkedList* list, void* elem);
- 
--INLINE void list_free(LinkedList* list);
-+void list_free(LinkedList* list);
- 
- #endif
diff --git a/x11-plugins/wmload/Manifest b/x11-plugins/wmload/Manifest
index 4fedab6ceac3..cf3f047d52f3 100644
--- a/x11-plugins/wmload/Manifest
+++ b/x11-plugins/wmload/Manifest
@@ -1,8 +1,5 @@
-AUX wmload-0.9.2-prefix.patch 222 BLAKE2B 20e44e91cecc160ce3ce70e429a333004b57ee26158d9675edd9f9c8dc352514e918f8fab3bd45182504293792d2ca16bbb1f294ec74f8124644324ce79cce8b SHA512 c92f3782728ccca5440cac7b750f5312c4e9c3942230974a6ea88e72388764f08add2a03bf382a8855a56e683f98531281e37423d39eafab2eef82aac49995aa
 AUX wmload-0.9.6-solaris.patch 3036 BLAKE2B 46982b6bad9e2b5a731ff5d90ee5ccac730a7645876d390b0dce664548740549624fdbec064e760401dfa18c5bbeedb5271d58b007428710815b92704996b751 SHA512 8884d0f742cfa6536f436bc4656d1e6d44eb6f4de076a9f68c0d8bb6ab66bc93a8e972094593e367347a580f53d56697e2dbe98810257532e08f99111597f07c
-AUX wmload-ComplexProgramTargetNoMan.patch 224 BLAKE2B e592218a8c052ac63143e11889b55cd1321abd1c90151b166d4216bdb51a4a671a7b5b7235025135de069de781632e4d2dc08cba5aeb1c008148f930fa84bd6f SHA512 41753993f6cce969284c0093506d125d7b6b7508968a98a248e8c06cc0941fcd9daf2e1d31782aa58e21ce18a3ed8a03131fddee9f048c93c3b4d97560625cd5
 AUX wmload.desktop 155 BLAKE2B 50461febd5980fce4d55231c958b1959066b791cd99c807ed9c82a96c6d833d930f3c9ee90148c3a99efbed789399669363129f26fb5d676e092eb610ac48489 SHA512 260b0370bbd730ce89f7452e1c8d8ccdacee047aa025ea4e832405534e9a0418983e1724fa01ab143e7d978906708697ea338d1f831a8de5c3a790f0f238395b
-AUX wmload.solaris.patch 3494 BLAKE2B 99e48775cac95c5d06c07cb82dab8d752f0251d53447df5f924f0a8314385d9b0a37361a06e8b136771b4949bc8f3c7049525bb0818b5a2685259812ac1beaf3 SHA512 9b65b4578168f3bc3b0e3bccff94097fb301e6763fecae712b58b3d21a994ceb8fbc8f39d640959374e19e2cfa71e3eab38d4eaf18c421bdf28c7113db1212f0
 DIST wmload-0.9.7.tar.gz 17648 BLAKE2B 418b18390035eec14fdd2d715519aff0807c7c5171448818e113ebe27ba908c5416baaa2e605daf3701c7acac6cde6d76c2b26a85f8cae18efd95b000d0e510a SHA512 5d08f34013c23c85de88adbfeca31e8399f0f9ce5573845aa50c1f4a06488d729de637b1d0f8b5739194b30ba8e085d40022926a3a8328d3cdab462f9e649801
 EBUILD wmload-0.9.7.ebuild 789 BLAKE2B 75f80c22ad031132fb148e0e6969e6cbc3b1198580d7ac5ecdd1ffae0c362d2414620d1492dc163ebdc4e3ecb2b6f5eb10bc71fd60d34c9ab1d0e55a20b24655 SHA512 7c6056e4ed1bc456392acfe89e18b1d3851e0c81b18601271469e4086eb1fd7dbb21e867f1cdf6d21237fedbfa36864060871fafcd81e16381f9b23fe07f55dc
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmload/files/wmload-0.9.2-prefix.patch b/x11-plugins/wmload/files/wmload-0.9.2-prefix.patch
deleted file mode 100644
index 3ec43c570df0..000000000000
--- a/x11-plugins/wmload/files/wmload-0.9.2-prefix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Imakefile
-+++ Imakefile
-@@ -2,7 +2,7 @@
- DESTDIR = /usr/local
- BINDIR = /bin
- 
--XPMLIB = -L/usr/lib/X11 -lXpm -lm  
-+XPMLIB = `pkg-config xpm --libs` -lm
- DEPLIBS = $(DEPXLIB) 
- 
- LOCAL_LIBRARIES = $(XPMLIB) $(XLIB)  
diff --git a/x11-plugins/wmload/files/wmload-ComplexProgramTargetNoMan.patch b/x11-plugins/wmload/files/wmload-ComplexProgramTargetNoMan.patch
deleted file mode 100644
index 8d3d25d6fa3c..000000000000
--- a/x11-plugins/wmload/files/wmload-ComplexProgramTargetNoMan.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- wmload-0.9.2/Imakefile~	Sat Dec  1 21:53:52 2001
-+++ wmload-0.9.2/Imakefile	Sat Dec  1 21:53:52 2001
-@@ -14,4 +14,4 @@
- SRCS = wmload.c
- OBJS = wmload.o
- 
--ComplexProgramTarget(wmload)
-+ComplexProgramTargetNoMan(wmload)
diff --git a/x11-plugins/wmload/files/wmload.solaris.patch b/x11-plugins/wmload/files/wmload.solaris.patch
deleted file mode 100644
index 788d4190aba0..000000000000
--- a/x11-plugins/wmload/files/wmload.solaris.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-* original: http://www.rampant.org/~dp/software/wmload.solaris.patch
-
---- wmload.c
-+++ wmload.c
-@@ -6,6 +6,11 @@
- #include <math.h>
- #include <fcntl.h>
- #include <X11/Xatom.h>
-+#ifdef sun
-+#include <sys/types.h>
-+#include <sys/sysinfo.h>
-+#include <kstat.h>
-+#endif
- 
- #include "back.xpm"
- #include "mask2.xbm"
-@@ -214,7 +219,7 @@
-   NormalGC = XCreateGC(dpy, Root, gcm, &gcv);  
- 
-   if (ONLYSHAPE) { /* try to make shaped window here */
--    pixmask = XCreateBitmapFromData(dpy, win, mask2_bits, mask2_width, 
-+    pixmask = XCreateBitmapFromData(dpy, win, (char *)mask2_bits, mask2_width, 
- 				    mask2_height);
-     XShapeCombineMask(dpy, win, ShapeBounding, 0, 0, pixmask, ShapeSet);
-     XShapeCombineMask(dpy, iconwin, ShapeBounding, 0, 0, pixmask, ShapeSet);
-@@ -410,6 +415,107 @@
-     return (char *)p;
- }
- 
-+#ifdef sun
-+
-+static kstat_ctl_t *kc;
-+static kstat_t **cpu_ksp_list;
-+static int ncpus;
-+
-+void
-+cpu_stats_init()
-+{
-+	int i = 0;
-+	kstat_t *ksp;
-+	static int kstats_ready = 0;
-+
-+	if (!kstats_ready) {
-+		if ((kc = kstat_open()) == NULL) {
-+		      fprintf(stderr,"wmload: can't open /dev/kstat\n");
-+		      exit (1);
-+		}
-+		kstats_ready = 1;
-+	}
-+
-+	for (ksp = kc->kc_chain; ksp; ksp = ksp->ks_next) {
-+                if (strcmp(ksp->ks_module, "cpu_stat") == 0)
-+			i++;
-+	}
-+
-+	if (cpu_ksp_list) {
-+		free(cpu_ksp_list);
-+	}
-+	cpu_ksp_list = (kstat_t **) calloc(i * sizeof (kstat_t *), 1); 
-+	ncpus = i;
-+
-+	/*
-+	 * stash the ksp for each CPU.
-+	 */
-+	i = 0;
-+	for (ksp = kc->kc_chain; ksp; ksp = ksp->ks_next) {
-+                if (strcmp(ksp->ks_module, "cpu_stat") == 0) {
-+			cpu_ksp_list[i] = ksp;
-+			i++;
-+		}
-+	}
-+}
-+
-+int
-+get_cpu_stats()
-+{
-+	int i;
-+	cpu_stat_t stat;
-+	static int firsttime = 1;
-+
-+	if (firsttime) {
-+		firsttime = 0;
-+		return (1);	/* force code to go initialize kstat stuff */
-+	}
-+
-+	/*
-+	 * Read each cpu's data.  If the chain has changed (a state change
-+	 * has happened, maybe a new cpu was added to the system), then
-+	 * return 1.  This will cause the code to reinitialize the cpu_ksp_list
-+	 * array.  word.
-+	 */
-+	cp_time[0] = cp_time[1] = cp_time[2] = cp_time[3] = 0;
-+	for (i = 0; i < ncpus; i++) {
-+		if (kstat_read(kc, cpu_ksp_list[i], (void *) &stat) == -1)
-+			return (1);
-+		cp_time[0] += stat.cpu_sysinfo.cpu[CPU_USER]; /* user */
-+		cp_time[1] += stat.cpu_sysinfo.cpu[CPU_WAIT]; /* "nice" */
-+		cp_time[2] += stat.cpu_sysinfo.cpu[CPU_KERNEL]; /* sys */
-+		cp_time[3] += stat.cpu_sysinfo.cpu[CPU_IDLE]; /* idle ("free")*/
-+	}
-+	return (0);
-+}
-+
-+void GetLoad(int Maximum, int *usr, int *nice, int *sys, int *free)
-+{
-+  int total;
-+
-+  while (get_cpu_stats() != 0) {
-+	  cpu_stats_init();
-+  }
-+
-+  *usr  = cp_time[0] - last[0];
-+  *nice = cp_time[1] - last[1];
-+  *sys  = cp_time[2] - last[2];
-+  *free = cp_time[3] - last[3];
-+
-+  /* printf("[%d %d %d %d]\n", *usr, *nice, *sys, *free); */
-+
-+  total = *usr + *nice + *sys + *free;
-+  last[0] = cp_time[0];
-+  last[1] = cp_time[1];
-+  last[2] = cp_time[2];
-+  last[3] = cp_time[3];
-+
-+  *usr = rint(Maximum * (float)(*usr)   /total);
-+  *nice =rint(Maximum * (float)(*nice)  /total);
-+  *sys = rint(Maximum * (float)(*sys)   /total);
-+  *free = rint(Maximum * (float)(*free) /total);
-+}
-+#else /* sun */
- void GetLoad(int Maximum, int *usr, int *nice, int *sys, int *free)
- { 
-   char buffer[100];/*[4096+1];*/
-@@ -445,6 +551,7 @@
-   *sys = rint(Maximum * (float)(*sys)   /total);
-   *free = rint(Maximum * (float)(*free) /total);
- }
-+#endif
- 
- void InsertLoad()
- {
diff --git a/x11-plugins/wmtz/Manifest b/x11-plugins/wmtz/Manifest
index c7452fdfebaa..8d0c467fa0fd 100644
--- a/x11-plugins/wmtz/Manifest
+++ b/x11-plugins/wmtz/Manifest
@@ -1,5 +1,3 @@
-AUX wmtz-0.7-list.patch 2918 BLAKE2B 393e76edcefa54d814229cc2d8d21556d7437580c1a226d454470175de6ad1e9a688555aabdc60aaa328d578b4d04b300e64ae431efe9d7680400118d52116d5 SHA512 2a6da4a9b676ea51bbcc400b3255f3c10240db13fd6da46921f6c91d5529ecf50120e195b815e58a1b0a8bad81a944e8da3cba261a69579f36165f35ad23f144
-AUX wmtz-0.7.patch 1305 BLAKE2B 13b09b49fda781a04e73a29d56dc87e1aec8a71a4ea643d49797fb15c2b6eecd390d02885c9fbdb17e5614285ddc7831f4d1c75b9fb58976aefe4aeb78c05bff SHA512 4e04a1a95d39ebe9982d4f26acf827fbbeb953f4dcc695c5b39dcb46423bd9d58336838a3d8a28af142b9a5391625a6965ece158b735514adce4438afa662194
 DIST wmtz-0.7_p20150816.tar.gz 19310 BLAKE2B 7f3bc0b077a9a667211cc588f1fb7c3d1d246256724a6cf5a17f028d2d334d02f898a798aca6fae11910868d312844bbe8ac5bfd190229f3ae829e97e50e2247 SHA512 60c9b66423332b155ce262d30026a5091c0379eb3257f547af1203d331968e9f334a533ed03832476512893d06cea857db9c044b30115978904510f9725e8455
 EBUILD wmtz-0.7_p20150816.ebuild 909 BLAKE2B 1779da6b58b351f016470ae11fe49c583be86456f19c26c0a2d46a4d8d43c0afc0984db1a002004522686cacff9d0819339b1d7bea81ac16a97b76bf256c1dc0 SHA512 ac4cab3641b4e772f945afb41694c88d9d8a7a28bf44b91e42af6997d2ed9ff49c4ef1c9aa8fcafb8607d474e70a54471ec4c6023e131a846c3fc2601b05feec
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmtz/files/wmtz-0.7-list.patch b/x11-plugins/wmtz/files/wmtz-0.7-list.patch
deleted file mode 100644
index 1b1ac317669e..000000000000
--- a/x11-plugins/wmtz/files/wmtz-0.7-list.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-diff -Naur wmgeneral.orig/list.c wmgeneral/list.c
---- wmgeneral.orig/list.c	2016-01-04 13:28:36.583339716 +0100
-+++ wmgeneral/list.c	2016-01-04 13:28:48.694343645 +0100
-@@ -38,7 +38,7 @@
- 
- /* Return a cons cell produced from (head . tail)
- 
--INLINE LinkedList* 
-+LinkedList* 
- list_cons(void* head, LinkedList* tail)
- {
-   LinkedList* cell;
-@@ -51,7 +51,7 @@
- 
- /* Return the length of a list, list_length(NULL) returns zero
- 
--INLINE int
-+int
- list_length(LinkedList* list)
- {
-   int i = 0;
-@@ -66,7 +66,7 @@
- /* Return the Nth element of LIST, where N count from zero.  If N 
-    larger than the list length, NULL is returned 
- 
--INLINE void*
-+void*
- list_nth(int index, LinkedList* list)
- {
-   while(index-- != 0)
-@@ -81,7 +81,7 @@
- 
- /* Remove the element at the head by replacing it by its successor
- 
--INLINE void
-+void
- list_remove_head(LinkedList** list)
- {
-   if (!*list) return;  
-@@ -101,7 +101,7 @@
- 
- /* Remove the element with `car' set to ELEMENT
- /*
--INLINE void
-+void
- list_remove_elem(LinkedList** list, void* elem)
- {
-   while (*list)
-@@ -112,7 +112,7 @@
-     }
- 
- 
--INLINE LinkedList *
-+LinkedList *
- list_remove_elem(LinkedList* list, void* elem)
- {
-     LinkedList *tmp;
-@@ -132,7 +132,7 @@
- 
- /* Return element that has ELEM as car
- 
--INLINE LinkedList*
-+LinkedList*
- list_find(LinkedList* list, void* elem)
- {
-   while(list)
-@@ -146,7 +146,7 @@
- 
- /* Free list (backwards recursive)
- 
--INLINE void
-+void
- list_free(LinkedList* list)
- {
-   if(list)
-@@ -158,7 +158,7 @@
- 
- /* Map FUNCTION over all elements in LIST
- 
--INLINE void
-+void
- list_mapcar(LinkedList* list, void(*function)(void*))
- {
-   while(list)
-diff -Naur wmgeneral.orig/list.h wmgeneral/list.h
---- wmgeneral.orig/list.h	2016-01-04 13:28:36.583339716 +0100
-+++ wmgeneral/list.h	2016-01-04 13:28:39.471340654 +0100
-@@ -29,31 +29,25 @@
- #ifndef __LIST_H_
- #define __LIST_H_
- 
--#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
--# define INLINE inline
--#else
--# define INLINE
--#endif
--
- typedef struct LinkedList {
-   void *head;
-   struct LinkedList *tail;
- } LinkedList;
- 
--INLINE LinkedList* list_cons(void* head, LinkedList* tail);
-+LinkedList* list_cons(void* head, LinkedList* tail);
- 
--INLINE int list_length(LinkedList* list);
-+int list_length(LinkedList* list);
- 
--INLINE void* list_nth(int index, LinkedList* list);
-+void* list_nth(int index, LinkedList* list);
- 
--INLINE void list_remove_head(LinkedList** list);
-+void list_remove_head(LinkedList** list);
- 
--INLINE LinkedList *list_remove_elem(LinkedList* list, void* elem);
-+LinkedList *list_remove_elem(LinkedList* list, void* elem);
- 
--INLINE void list_mapcar(LinkedList* list, void(*function)(void*));
-+void list_mapcar(LinkedList* list, void(*function)(void*));
- 
--INLINE LinkedList*list_find(LinkedList* list, void* elem);
-+LinkedList*list_find(LinkedList* list, void* elem);
- 
--INLINE void list_free(LinkedList* list);
-+void list_free(LinkedList* list);
- 
- #endif
diff --git a/x11-plugins/wmtz/files/wmtz-0.7.patch b/x11-plugins/wmtz/files/wmtz-0.7.patch
deleted file mode 100644
index adb5c68f1b6c..000000000000
--- a/x11-plugins/wmtz/files/wmtz-0.7.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -ur wmtz-0.7.orig/wmtz/Makefile wmtz-0.7/wmtz/Makefile
---- wmtz-0.7.orig/wmtz/Makefile	2001-03-11 15:57:59.000000000 +0200
-+++ wmtz-0.7/wmtz/Makefile	2008-01-12 15:24:29.000000000 +0200
-@@ -1,5 +1,5 @@
- CC = gcc
--LIBDIR = -L/usr/X11R6/lib
-+LIBDIR = -L/usr/lib
- LIBS   = -lXpm -lXext -lX11 -lm
- FLAGS = -O2
- DESTDIR = /usr/local
-@@ -10,7 +10,7 @@
- 
- 
- .c.o:
--	$(CC) -I/usr/X11R6/include $(FLAGS) -c -Wall $< -o $*.o
-+	$(CC) -I/usr/include $(FLAGS) -c -Wall $< -o $*.o
- 
- wmtz: $(OBJS)
- 	$(CC) $(FLAGS) -o wmtz $^ -lXext $(LIBDIR) $(LIBS)
-diff -ur wmtz-0.7.orig/wmtz/wmtz.c wmtz-0.7/wmtz/wmtz.c
---- wmtz-0.7.orig/wmtz/wmtz.c	2001-04-16 22:26:34.000000000 +0300
-+++ wmtz-0.7/wmtz/wmtz.c	2008-01-12 15:17:37.000000000 +0200
-@@ -51,8 +51,7 @@
- #define STRSIZE 10
- #define LMST 1
- #define GMST 0
--#define ABOUT "xmessage -center -buttons \"Close\" \"WMTZ - Window Maker Time Zone dockapp v0.7
--http://www.geocities.com/jl1n/wmtz/wmtz.html\""
-+#define ABOUT "xmessage -center -buttons \"Close\" \"WMTZ - Window Maker Time Zone dockapp v0.7\nhttp://www.geocities.com/jl1n/wmtz/wmtz.html\""
- 
- 
- /*
-@@ -479,6 +478,7 @@
- 		   but_stat = -1;
-                    break;
- 	    default:
-+	    break;
- 	  }
-         }  
- 
-@@ -529,6 +529,7 @@
- 	    exit(0);
- 	    break;
- 	default:
-+	break;
-       }
-     return;
- }
author	V3n3RiX <venerix@redcorelinux.org>	2018-01-02 14:45:16 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-01-02 14:45:16 +0000
commit	a70f42c65202d88c203c40910fef8f96f333d1ee (patch)
tree	de550ee3deb79c550ae1aba7fcce118d5d4dbc31
parent	721254b86a09bdedd5eefd0de7899c90ea2ead1a (diff)