diff --git a/Manifest b/Manifest
index 578dae18b56e..5e9a973e89ff 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 28846 BLAKE2B 94a7f2fd66d7c7d899b14612d63f67c97e7055975a5ec7639f3df9f563314e64e4ff3287d210e0f4fc93491423791f408fbbc3b0bc3f173b1fea1522eac686b1 SHA512 023806fbb56378530ff48f83cde59073e96baaa571c6dee66d129154a3750e24e5329140fd447288da386cef7ab1ecd66e04641481d851e701c48e13bf0b68b5
-TIMESTAMP 2018-01-01T11:04:32Z
+MANIFEST Manifest.files.gz 28812 BLAKE2B 1cd24311610a3586b6134ccc87ab2f56bc118eda02ad15961c3b038a1c95bf34092085889ba4dae8045ef10bb0fdf17a486389b884546bf90003df0c110562c7 SHA512 3d3d613b1abedccdfb380008d22708d627466913435aa1d2eaa41acb5df8fbde6fcd51a7685172b96aa575f508aeed176dd5cc5565bd1809de85a292a505e00c
+TIMESTAMP 2018-01-02T10:09:44Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlpKFcBfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlpLWmhfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klD6EA/+IQBBrBmVVVkLvFsqt7cUUVT7ksj6WEszNk30R/LFW06qzUKUmbRYA6CZ
-EPP3CQnT3+SNLBnouVODLaF54L9GYlt/XB+QqMde/NWTYg5g3Wt3xTM4Jnkq9Sbk
-DvCjzUsKqAjqapGVVp+G+MV4XkbIo7p2xj2vcWo+WwMe9Odct8OmVlCYzitjUT4A
-JmD+LmPI39lMHuARzXmJtb2585PnqvwrDDgd1VSzzjS3UEjlKgJk6S0CnVE2WTQ5
-RIFMH68pP1THHyuWXquVEetOPAT0XyZaKG9R4ZvMSLgWaMR1qZXmvlIbJBCUyBTV
-HtY90RXD3g3DdXbnbKv9AYw8uRYJKAXbIZdfSNeFKwg2AUj+JJpBMg4OXyBvI0yY
-HioTQB0Q3XazB/sKk4HLgu+tKNZH/UkLzT1L+eYR89vZV4oEt7RXjLCMKtZm27Mh
-lGJSIEyfoFMHpkD3bz80OZ3xK3+XclDOYgyDnzyOfmhtlBelAv4DV5Bj5gbYoicw
-uFCr5CEYb1Igz5vNUzxgrMSRRxFzC5IHEkm+io2+SQh2CHFhLkx+oYwWQgha5X/k
-/23Y1FQgaai5DAXJLU4G/jkMvhJmCZjo7bg90e9mhs1U+mJFhWGpKDUOivkD5Z2Y
-8cYfyfP79utshgYHrw9Xail6qZi5gs+mCcTq9kSaMeFeuYjhufE=
-=C5j9
+klAlOxAAnpQz8NkfMvoA9lCLNMfldQCDgfs8GKSTCBWA1ry4PFqiwFU+Vp6Pw25G
+5mEtukqp4Gdv5GwzXteeUx1uZ2mxaLugydLxcSWTq+JnVTW66xrmE4M6V/75ARxE
+A92o0gg4NeGY+jWMGgChWCgDLWGTFbIX7dOYSxhkC3wU7TnIZ4tyfQ2IxNpK3Xj5
+9GkGyjw3L2stTPTH4owhQxGj4p0FM6s/AT8DIavM8iOUmKVJwmOeOi7sxLes8RG9
+7RQ1A1mTn5inAA3o1qSH4l9MNCvOzjFZxUUowfzxvcsWqYq/uv/KyH1l2Lr/4h4e
+l3BcSQ86Vwql1rskEAgFYtbyAucZUv1Vna8L/fApV1lc/Fa7EdfapgqVT80sW1O9
+p8g/GN8kMnDc4f1cJNPFjIAXsK80kD1ZdaJc3ALMKLwIhDzESBFsxErZO/cEuN3a
+3PziAKX6VqYt6jt+UJtZklVF0y5Ag6PjPQ5oVUtCjI+Pa3/9+MTXxTY+qEMEIW80
+4MrQTEbZiL7pF1/wyuCR2HhqIS46YG8JczwYGT3DkItCsbVwxsjve95gXCHL30wn
+s+A9uwoZfzXHvo6zlOjikT72fkIcExY0JJAXRSUY3swmLUkoFIu//iW/oYvVrNyy
+sVw9+ofJKh8P6QbdVgdi/kkdSK+njVzIcu5MJXy8FyoGGxId2b4=
+=LwuF
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 8de9053bfef5..494c76c08a7b 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 891ae388cf8f..31300e50b6e2 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
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
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
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-eselect/Manifest.gz b/app-eselect/Manifest.gz
index 61f6b2f48e71..5ae69d92c3b3 100644
Binary files a/app-eselect/Manifest.gz and b/app-eselect/Manifest.gz differ
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-portage/Manifest.gz b/app-portage/Manifest.gz
index dcdc64a6d6d4..15d8318eb573 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
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-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-20170712.ebuild
deleted file mode 100644
index a9f100ab082e..000000000000
--- a/app-portage/eclass-manpages/eclass-manpages-20170712.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-20170321.ebuild b/app-portage/eclass-manpages/eclass-manpages-20180101.ebuild
similarity index 85%
rename from app-portage/eclass-manpages/eclass-manpages-20170321.ebuild
rename to app-portage/eclass-manpages/eclass-manpages-20180101.ebuild
index a9f100ab082e..42a54f0e3d5a 100644
--- a/app-portage/eclass-manpages/eclass-manpages-20170321.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
Binary files a/app-shells/Manifest.gz and b/app-shells/Manifest.gz differ
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
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
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
Binary files a/dev-cpp/Manifest.gz and b/dev-cpp/Manifest.gz differ
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
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
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
Binary files a/dev-dotnet/Manifest.gz and b/dev-dotnet/Manifest.gz differ
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
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
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 78c358e3ac80..814a9f8d189d 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
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/libcdio/Manifest b/dev-libs/libcdio/Manifest
index c386dec0745b..a97dabe66095 100644
--- a/dev-libs/libcdio/Manifest
+++ b/dev-libs/libcdio/Manifest
@@ -4,8 +4,10 @@ DIST libcdio-0.93.tar.gz 2723371 BLAKE2B 3dc361f48c0ccc22c76ad691f856512a87906dd
 DIST libcdio-0.94.tar.gz 2355452 BLAKE2B c6a720fb714e6aa0d4425ccf92e4c08172d26d77a94e8a6897ffee197a740de78da8d480ec9af2dcfd59c3f96fb2a823a4e39259389dd82ece4108c6a05a4646 SHA512 e1d3c96c4acc7be923c97109c3f76223adc00b293278daef7d5008b1e5d67f33402f9f224f05120e9e1e8b3a8d1fa1b0bd5069dc6dd309741e3590e2c19e0e66
 DIST libcdio-1.0.0.tar.gz 2343992 BLAKE2B d187a0aba99efa1172cab302fcd020dc2a581633368230a6ba00db6250c8e7d5e66111fba1804ecb0ba5416c876f88f1d07549118bb003d4631c14d0f3e85ba6 SHA512 2beb5c9cf455c5b56f0a8ba641b8fe322c487256b017108fadbdf288e92787fa0b956d2291aa877df5a9b4494f8425de58c0f71d587ef5f9346987733f66e5dc
 DIST libcdio-1.1.0.tar.gz 2348106 BLAKE2B c63959d6cd92288b2d098f19b28a61fc5a7005390186045c6f72392becf9eb5808da7a8b952de166c5b263b9c10e594031a3fb908331eda040c210b984b3e11e SHA512 fe5a0d726974c8678b59de74ce043a5ed464f6ab595bf938e90bc5a348e9e882755e75aa3eecce50ce910b28e2498b5a892402fc0ea8728d382d1af36db71985
+DIST libcdio-2.0.0.tar.gz 2354813 BLAKE2B d3ebf9a20004cc8c75d1e6f97a2cea68f490517e34a4cf84f343d717e49cbb9cd612a3c6911894501f16373e3222e7fc6d175fd6d93d1c967cd21502716b22f8 SHA512 8f48cc71d28b427b16f48e50bcaf0aea171055c72a9aeee383ac4374eee1d3d288323814c3a3f308a9ba097aa815319429c1931072897985a3b02b814766fd4f
 EBUILD libcdio-0.93.ebuild 1870 BLAKE2B 30953f0973dc5656e26312606ad557ced8aa9a7a0672bee7e9fead2c002360c5ac233dbabc64c2232043c201ea41d9626ac86feaf8af743ed7267d4fa75a8edc SHA512 eaa3d8d99c5fe412afecb7890ce68c9b0ebdcc063fa457afc4074e4ecb2a12af3293913d4d13691e9e218f51f251f51d5537cc4c2fe6fe48d4b7e2c6e3367945
 EBUILD libcdio-0.94-r1.ebuild 1888 BLAKE2B 20ef4b8bdc055c406864b2bd91022a5938f469b20be26c48e888d8d1b58886296989fcb784a07898c1f663d3cbc7fb89bb097c2885983a59f8327a28fe03d529 SHA512 2bcb9d699852d5781ada3d4b5b0d3b80af32571f27041a8ba316da408c0b1188d2b5fca64c238e850ff40a91cba97dc65a157e6633cb1beb76f7edef3122056a
 EBUILD libcdio-1.0.0-r1.ebuild 1866 BLAKE2B 602b38ccbbd247f100bbc28eb0bece2132d280b9c6723f9f296e2e9906d441435c0c2f82ab0603fd8b80d47ce8f8bc28539377fa88c2a4aa950678aa65ccae41 SHA512 25b0989c158e152eddb589941dd16b9aee4b3e2783f2ddefd0939d9245a904829ec348c5337c84ddeafb7dfd4eef9b7298976fec3bc665fb8abbd87774dd6514
 EBUILD libcdio-1.1.0.ebuild 1788 BLAKE2B f3d6344d71d636aa3adb6e602fe43b8780125ea034c2509eb9482b71c76957f9671c977aba92f54130f770a3b9c2d8d452bc2fa473378348436fcfb10f01dc00 SHA512 532216f99f928150d76cda3be770a2565c2bb08533dfa809c7979052701098e70ea36db1d4db494ed567a433e5466b692b00f9d95436a93e24abd68e3aadfb94
+EBUILD libcdio-2.0.0.ebuild 1788 BLAKE2B 0f786de8168c8e703fec35636f4cbfd62a06c5e6fc78676d2070c650519fc744e46a53ea18208c40ffb9a449a894e9a962f4759b6a242c9bae9a389a78767e22 SHA512 aff73b81eb022c1971c58412eb5724e28440be857d42f11109e45bef25518697a770c0cd80ca704d5ff82496f8842a4d429c6797062e149607b8cbc21c6223ba
 MISC metadata.xml 528 BLAKE2B c36309be516242be4eec641d3f81ed67c0f840154bb8a47983a6fb8340a72bcacb1b2eb4f46610a2e341c5c64494fa620c730a44c306b9334b102edf9884e9ca SHA512 17b0f73a4496400d46b3485909fc6c6b3da85e99b5fc03335e9b6ce50233ac075edbe2fc97eee8bc817e632f53238d1c33c3166d33d0d10d745a31dac3797de9
diff --git a/dev-libs/libcdio/libcdio-2.0.0.ebuild b/dev-libs/libcdio/libcdio-2.0.0.ebuild
new file mode 100644
index 000000000000..8e37d8d2b7a8
--- /dev/null
+++ b/dev-libs/libcdio/libcdio-2.0.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools libtool ltprune multilib-minimal
+
+DESCRIPTION="A library to encapsulate CD-ROM reading and control"
+HOMEPAGE="https://www.gnu.org/software/libcdio/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/18" # subslot is based on SONAME
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="cddb +cxx minimal static-libs test"
+
+RDEPEND="
+	!minimal? (
+		>=sys-libs/ncurses-5.7-r7:0=
+		cddb? ( >=media-libs/libcddb-1.3.2 )
+	)
+	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	sys-apps/sed
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( dev-lang/perl )
+"
+
+DOCS="AUTHORS ChangeLog NEWS README* THANKS TODO"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/cdio/cdio_config.h
+	/usr/include/cdio/version.h
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	sed \
+		-e "s:-lncurses:$($(tc-getPKG_CONFIG) --libs ncurses):g" \
+		-i configure || die
+
+	elibtoolize # to prevent -L/usr/lib ending up in the linker line wrt 499510
+}
+
+multilib_src_configure() {
+	local util_switch
+	if ! multilib_is_native_abi || use minimal ; then
+		util_switch="--without"
+	else
+		util_switch="--with"
+	fi
+
+	# Tests fail if ECONF_SOURCE is not relative
+	ECONF_SOURCE="../${P}" econf \
+		--disable-maintainer-mode \
+		$(use_enable cxx) \
+		--disable-cpp-progs \
+		--disable-example-progs \
+		$(use_enable static-libs static) \
+		$(use_enable cddb) \
+		--disable-vcd-info \
+		${util_switch}-{cd-drive,cd-info,cdda-player,cd-read,iso-info,iso-read}
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files
+}
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/mpc/Manifest b/dev-libs/mpc/Manifest
index 4a61e240f1cd..c2105666632c 100644
--- a/dev-libs/mpc/Manifest
+++ b/dev-libs/mpc/Manifest
@@ -1,4 +1,4 @@
-AUX mpc-1.0.3-mpfr-4.0.0.patch 4125 BLAKE2B e0fba3c28da8e0f1ac4766836cb1e8b09a3413510aa82d01694a7e907871b122fa338c352abf4dd7a9c0b67b7973a91775a9455c3a4dc9fe718430456b3d4214 SHA512 69a29a1c70fe2515852a5802ad6a425dc58796d839f9caa596e33f0745af4ef8df4ab61993cb0204b00fa4395561422274cd2e8ce5728d94ef8219711e2e7c8f
+AUX mpc-1.0.3-mpfr-4.0.0.patch 3748 BLAKE2B 906ee3ff90ab1d9aad58caae7b1185d99d6e09f30f9fe80e9673c0ef499b4fff349b61c6de77502e2e3eecc68ecab6d00453cf1525cb8b404a6f7be9b90ec3b5 SHA512 7ecdc20adce8d71c268e7b090a484441f2b807c19caef637de0bd97cdc12534d7b24f6d7cae80e3c1ecbf7c6445f81cb63b219869797e69de3dbae0e268d9caa
 AUX mpc-1.0.3-no-ulp.patch 904 BLAKE2B 33f96aa9ce60823ac9b84a604ac84c87fd0d4d8eec9b08880f70920aad24775a00cfadf0e76f08274d829f3a7ef03f22d8f440f0207ccaa7f98f1c4911d0beb1 SHA512 22bf9f04ba745d66469a23366d405b7b32bd7454e2240d01995b0dd04e156f23fa1bd842b520799af899ff96650bd050f4675d7a9cba6ebd68ba8fb5d658a0a6
 DIST mpc-1.0.1.tar.gz 624125 BLAKE2B ba5c63f5e0cdcff2cfd5b93d152f70422232bca472b5153209b525794e338f11bdd0e371a055535aa31bb3b8991a5f6ef645b1bf2393027803bf84c0d4346991 SHA512 fa381e75999bba626ba08d73225285b03c6d2f6cca87881b28829925d1624eaed1c9b544f75e7281cf5d8dcdd7831025a4eafc05f88f13375f9e08239a8a9303
 DIST mpc-1.0.2.tar.gz 633173 BLAKE2B 9d58d8a41bf4a2d7a82842dc1e76f7fc1376dac950919ae72d1cb04fe70132747a22dcbec91391e1f5aa857c96de553aa21548f20f139742ae4b2463df473d63 SHA512 0e94ba9a20c7374839d2a53a9ed8cce647cc74142b464634fdb9cbaf96e91e43ea13f0b4dab5c06c247e6719de0c0ae03fdcba0c7c4518ee504c545c96da70d0
diff --git a/dev-libs/mpc/files/mpc-1.0.3-mpfr-4.0.0.patch b/dev-libs/mpc/files/mpc-1.0.3-mpfr-4.0.0.patch
index 72d6f2217caf..3a62d9bd20a3 100644
--- a/dev-libs/mpc/files/mpc-1.0.3-mpfr-4.0.0.patch
+++ b/dev-libs/mpc/files/mpc-1.0.3-mpfr-4.0.0.patch
@@ -41,9 +41,9 @@ diff --git a/src/mul.c b/src/mul.c
 index 3c9c0a7..8c4afe4 100644
 --- a/src/mul.c
 +++ b/src/mul.c
-@@ -175,8 +175,9 @@ mul_imag (mpc_ptr z, mpc_srcptr x, mpc_srcptr y, mpc_rnd_t rnd)
- #define MPFR_EXP(x)       ((x)->_mpfr_exp)
- #define MPFR_LIMB_SIZE(x) ((MPFR_PREC (x) - 1) / GMP_NUMB_BITS + 1)
+@@ -171,8 +171,9 @@
+ }
+ 
  
 +#if HAVE_MPFR_FMMA == 0
  static int
@@ -52,15 +52,15 @@ index 3c9c0a7..8c4afe4 100644
             mpfr_srcptr d, int sign, mpfr_rnd_t rnd)
  {
     /* Computes z = ab+cd if sign >= 0, or z = ab-cd if sign < 0.
-@@ -359,6 +360,7 @@ mpfr_fmma (mpfr_ptr z, mpfr_srcptr a, mpfr_srcptr b, mpfr_srcptr c,
+@@ -319,6 +320,7 @@
+ 
     return inex;
  }
 +#endif
  
  
  int
- mpc_mul_naive (mpc_ptr z, mpc_srcptr x, mpc_srcptr y, mpc_rnd_t rnd)
-@@ -375,10 +377,17 @@ mpc_mul_naive (mpc_ptr z, mpc_srcptr x, mpc_srcptr y, mpc_rnd_t rnd)
+@@ -337,10 +339,17 @@
     else
        rop [0] = z [0];
  
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 3207cec59733..9cb64d06fde1 100644
Binary files a/dev-php/Manifest.gz and b/dev-php/Manifest.gz differ
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 170d52b2b949..90ecda809d6c 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/PySDL2/Manifest b/dev-python/PySDL2/Manifest
new file mode 100644
index 000000000000..7cfa88bde494
--- /dev/null
+++ b/dev-python/PySDL2/Manifest
@@ -0,0 +1,5 @@
+AUX PySDL2-0.9.6-0001-test-Always-allow-greater-patch-version-of-SDL2.patch 1812 BLAKE2B 7551d27fe1044d9a7bbe741fd70417f3f180d722915e53ff4374efc5575c70c8171cf4032d26e3b7703eb39e7da4998c6d867447a5338c76897ae84e598192ac SHA512 1a26d4db26b5fbc3c259c110825dbefa272e5c565928d041951438d1ed2012a67b3a06b2158b1c2a7c57685ab6e22363c3841e8bb3bf2e54ea21553b386c89cf
+AUX PySDL2-0.9.6-0002-test-Handle-missing-haptic-support-gracefully.patch 950 BLAKE2B e4baf35535ff37a845ba65127d6e580d2c5086e60df0d03a6939b5fee7dac860475503b01644097d9af2a21209e25258524f0feacd45729574034095615ecaf3 SHA512 50b1785d02290ce9544743cea245e216f8cbbadaf9dfc0c865fadd21e1beea88a64d89a304bcfb72e8b2cc19a961fba3c23de028b7caf7e16739f9665dd9aa1a
+DIST PySDL2-0.9.6.tar.gz 1048158 BLAKE2B 70a450990dd73169489af2d5b218eea0794c9f75948d774680df4b4423855318ddc6d16a0453f62361d4f0b81e872edc067235c4f946476ea8988e16cd0de44c SHA512 676b1b3381b614122442c70fe4cbd7c210ef3d8695c2babd37938e67b5cfeb2f8acbdcb914c5f68aceb549d89f7a77bdc80c7406b340b0e38c22543df8d46739
+EBUILD PySDL2-0.9.6.ebuild 1864 BLAKE2B 9c9a7bf62ac3b6f3d64fa7f376f947c7c7c065f4013d21c846691edc8cba851ff0deccfc24f3a1d9863a17ab7836d2d470cf502207ef75783cb6ab7033c6eedb SHA512 2f464af658a5eaf1ee49abe83444720de194f8420cce06bdb760193c03874de9ef198a4dd073405fac248af663a0e0a765bb8c1426a6815f17688583e1b2fcf8
+MISC metadata.xml 451 BLAKE2B 2bc91faee3235d8d971aaba13051362ffe22563c5bc5a33a4dcaa0fa59abb7f238310d271a5311c98d4f69b112f731e11d1c8c49fa1a1d2bed1a5acf36c905f5 SHA512 50ba020088e640ca59a7ab64e30ff760b4708866ebc54b91fa2a12e4408463ebb0b04cfe990113bb7f556cbe8a4fc369fe86e3da4ec5b79a76752868cd08a62c
diff --git a/dev-python/PySDL2/PySDL2-0.9.6.ebuild b/dev-python/PySDL2/PySDL2-0.9.6.ebuild
new file mode 100644
index 000000000000..d761ef0b205c
--- /dev/null
+++ b/dev-python/PySDL2/PySDL2-0.9.6.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+inherit distutils-r1
+
+DESCRIPTION="Python (ctypes) bindings for SDL2 libraries"
+HOMEPAGE="https://github.com/marcusva/py-sdl2 https://pypi.python.org/pypi/PySDL2"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( public-domain CC0-1.0 ZLIB )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+# Optional deps:
+# - dev-python/numpy,
+# - dev-python/pillow,
+# - media-libs/sdl2-* (loaded dynamically via ctypes).
+#
+# If a reverse dependency needs the specific module, it should
+# explicitly depend on the optional module in question. You also
+# probably need to explicitly require some media-libs/libsdl2 flags.
+RDEPEND="media-libs/libsdl2"
+
+# Require all of SDL2 libraries and at least the most common subsystems
+# for better test coverage.
+DEPEND="
+	test? (
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		media-libs/libsdl2[joystick,sound,video]
+		media-libs/sdl2-gfx
+		media-libs/sdl2-image
+		media-libs/sdl2-mixer
+		media-libs/sdl2-ttf
+	)"
+
+PATCHES=(
+	# fix tests to allow newer versions of libsdl2
+	"${FILESDIR}"/PySDL2-0.9.6-0001-test-Always-allow-greater-patch-version-of-SDL2.patch
+	# fix tests to handle missing haptic support gracefully
+	"${FILESDIR}"/PySDL2-0.9.6-0002-test-Handle-missing-haptic-support-gracefully.patch
+)
+
+src_prepare() {
+	# tarball uses DOS line endings
+	find '(' -name '*.py' -o -name '*.rst' -o -name '*.txt' ')' \
+		-type f -exec sed -i -e 's/\r$//' {} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# from .travis.yml
+	local -x SDL_VIDEODRIVER=dummy
+	local -x SDL_AUDIODRIVER=dummy
+	local -x SDL_RENDER_DRIVER=software
+
+	"${PYTHON}" -m unittest discover -v \
+		-s sdl2/test -p '*_test.py' || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/PySDL2/files/PySDL2-0.9.6-0001-test-Always-allow-greater-patch-version-of-SDL2.patch b/dev-python/PySDL2/files/PySDL2-0.9.6-0001-test-Always-allow-greater-patch-version-of-SDL2.patch
new file mode 100644
index 000000000000..0b72f9036637
--- /dev/null
+++ b/dev-python/PySDL2/files/PySDL2-0.9.6-0001-test-Always-allow-greater-patch-version-of-SDL2.patch
@@ -0,0 +1,47 @@
+From d34a898bb8d8bfd9cb4a85ff880826e4c7f2b0f7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Mon, 1 Jan 2018 12:31:52 +0100
+Subject: [PATCH 1/2] test: Always allow greater patch-version of SDL2
+
+Similarly to sdlimage_test, allow newer patch-version of other SDL2
+libraries. There is no technical reason to prevent people from upgrading
+libsdl2 while having old PySDL2 installed, and there is no reason to
+make tests fail every time libsdl2 happens to be upgraded.
+
+(backported for 0.9.6)
+
+Closes: https://github.com/marcusva/py-sdl2/issues/115
+---
+ sdl2/test/sdlmixer_test.py | 2 +-
+ sdl2/test/version_test.py  | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/sdl2/test/sdlmixer_test.py b/sdl2/test/sdlmixer_test.py
+index 00c2ca6..1cebe55 100644
+--- a/sdl2/test/sdlmixer_test.py
++++ b/sdl2/test/sdlmixer_test.py
+@@ -27,7 +27,7 @@ class SDLMixerTest(unittest.TestCase):
+         self.assertIsInstance(v.contents, version.SDL_version)
+         self.assertEqual(v.contents.major, 2)
+         self.assertEqual(v.contents.minor, 0)
+-        self.assertEqual(v.contents.patch, 1)
++        self.assertGreaterEqual(v.contents.patch, 1)
+ 
+ if __name__ == '__main__':
+     sys.exit(unittest.main())
+diff --git a/sdl2/test/version_test.py b/sdl2/test/version_test.py
+index 51b5065..60e5bcf 100644
+--- a/sdl2/test/version_test.py
++++ b/sdl2/test/version_test.py
+@@ -25,7 +25,7 @@ class SDLVersionTest(unittest.TestCase):
+         self.assertEqual(type(v), version.SDL_version)
+         self.assertEqual(v.major, 2)
+         self.assertEqual(v.minor, 0)
+-        self.assertEqual(v.patch, 6)
++        self.assertGreaterEqual(v.patch, 6)
+ 
+     def test_SDL_VERSIONNUM(self):
+         self.assertEqual(version.SDL_VERSIONNUM(1, 2, 3), 1203)
+-- 
+2.16.0.rc0
+
diff --git a/dev-python/PySDL2/files/PySDL2-0.9.6-0002-test-Handle-missing-haptic-support-gracefully.patch b/dev-python/PySDL2/files/PySDL2-0.9.6-0002-test-Handle-missing-haptic-support-gracefully.patch
new file mode 100644
index 000000000000..2b03fed4d09d
--- /dev/null
+++ b/dev-python/PySDL2/files/PySDL2-0.9.6-0002-test-Handle-missing-haptic-support-gracefully.patch
@@ -0,0 +1,26 @@
+From 4a38a0ef4c13ec3c518b78c0e56550fb8af43119 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Mon, 1 Jan 2018 13:29:16 +0100
+Subject: [PATCH 2/2] test: Handle missing haptic support gracefully
+
+---
+ sdl2/test/sdl_test.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/sdl2/test/sdl_test.py b/sdl2/test/sdl_test.py
+index 70c2e98..402e549 100644
+--- a/sdl2/test/sdl_test.py
++++ b/sdl2/test/sdl_test.py
+@@ -47,7 +47,8 @@ class SDLTest(unittest.TestCase):
+                      "FreeBSD des not support haptic input yet")
+     def test_SDL_INIT_HAPTIC(self):
+         ret = SDL_Init(SDL_INIT_HAPTIC)
+-        self.assertEqual(ret, 0, SDL_GetError())
++        if ret != 0:
++            self.skipTest('Haptic subsystem not supported')
+         ret = SDL_WasInit(SDL_INIT_HAPTIC)
+         self.assertEqual(ret, SDL_INIT_HAPTIC)
+         SDL_QuitSubSystem(SDL_INIT_HAPTIC)
+-- 
+2.16.0.rc0
+
diff --git a/dev-python/PySDL2/metadata.xml b/dev-python/PySDL2/metadata.xml
new file mode 100644
index 000000000000..dbc51f1b9563
--- /dev/null
+++ b/dev-python/PySDL2/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">marcusva/py-sdl2</remote-id>
+		<remote-id type="pypi">PySDL2</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/bcrypt/Manifest b/dev-python/bcrypt/Manifest
index 40ebe90d245b..f0e66af3680c 100644
--- a/dev-python/bcrypt/Manifest
+++ b/dev-python/bcrypt/Manifest
@@ -4,6 +4,6 @@ DIST bcrypt-3.1.3.tar.gz 40806 BLAKE2B 60b42bd4326ae1285911a79eff43f871366d6db8f
 DIST bcrypt-3.1.4.tar.gz 42575 BLAKE2B c4521ecfa55e5b857e35c9d9e402b8e911b2546bdb349a4e87f31e6af0a2686ebc9df4fc6268534c65d3bca8facfa2e8ccd549174f8f91a25002e94ba7fb9be4 SHA512 885dadec10aa9c5944a68e73ebc3ba409d41517850fad1bcb61321a8ce4072b95422472b9f7ca76508e9b0d24a86e19f3e415a0713f0a1921b9d3f796089ae71
 EBUILD bcrypt-3.1.1.ebuild 903 BLAKE2B 79ade1ec5e091e545b4e79ee7cea009b64faf22e86e6d08561369560d6a268e32aab671fe17bf36bfab0d62ec1b9b801d121a70145db997e3c3ac0d0d3007436 SHA512 413898097ff85b779de4c24ddcdb10f000a8c254c425b5524b8d2ac4b576b55827d6d27b88cdaa4bd77317af8e444127bfd301e9fd29814dcbe4d3c71fe13e8c
 EBUILD bcrypt-3.1.2.ebuild 915 BLAKE2B 3255a42f95ca45bf6f16e50251d742582ed04450038485712a18d2283d9501ca5314f436479a5c27b628c0278ae3789995ba4b0f3ba39b95b8d4e54f4c2b37f3 SHA512 b91f2ea8bdbd9f8ba8ac8e616e5ce828cc7e562350015b1643fc29cd14536eb7b4fb188df2f2a3d30b97aed3af0db80b04aebdec4d4f66eabf00826451d2dc7b
-EBUILD bcrypt-3.1.3.ebuild 866 BLAKE2B 409979285a4e98e951a53851b8098d48dba1b19ac2c16e414baced1a2c112edf0975efdab43ee26c7ca685a7a3467aac3108e3db6c7f1f13fe42e9dc7484ad7d SHA512 e50d62e9d86d26ca1fe1f618a747614875d0e83b2a92458f7e5bd05dd9087708f5d36e397b3ff833f4a8134cda5b6e5911dc39cf0fc220323fbe8c826d093b13
+EBUILD bcrypt-3.1.3.ebuild 873 BLAKE2B b370a6d7275e65ca8b14ce5163676508fafb65b0f77a5b3fa3e246481fa1c66880e12f67fa6bc1f181b0e6a852df8accf5047c27b4b3b5290cee6d51703348bf SHA512 2413283af8e9f093fa50a770f3c541120f9e6598371e219f7c59a0114d9d3fa8c9bfec22292f1919d6230e2a667375bda7c20dffbe6ec504fc3c7f473e330064
 EBUILD bcrypt-3.1.4.ebuild 879 BLAKE2B e70f2438319b9e95fea6d48450d437664f41e85087f1bac51de82000a4ee8b46c2615193a3773af500e1602578a030782d520bfcca152c4c632facabdc226522 SHA512 879def966adf93a79eb12bcd32e5d79e1322b97d94a62722a16097c020e72ff483552f902e776cfb7ac634b9fcf45559a0d057d787a0ac2a74311574a351c599
 MISC metadata.xml 485 BLAKE2B 789fde3cb8c29c27778293f22f9e3a4453b743d52f5fab1dd2db6d940e4e1bff843d6ccdb4f7374b456b2cd4f80877f453205bb9a5eeee9f6e32382297ab967b SHA512 3b4fb489f9d1ecdee3dedc58dda61aa86c6bc30f29aba50de6dc4faa499276d83fe15518088e4d0e76c98ca30188b2f1b921807821fc73b5dfc592490e6fdb46
diff --git a/dev-python/bcrypt/bcrypt-3.1.3.ebuild b/dev-python/bcrypt/bcrypt-3.1.3.ebuild
index 5f7222090ec1..2d8885a3cc80 100644
--- a/dev-python/bcrypt/bcrypt-3.1.3.ebuild
+++ b/dev-python/bcrypt/bcrypt-3.1.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
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="amd64 ~arm ~arm64 ia64 ppc ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ia64 ppc ppc64 ~sparc x86"
 IUSE="test"
 
 COMMON_DEPEND="
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/paramiko/Manifest b/dev-python/paramiko/Manifest
index b0079399e3ff..13300861afff 100644
--- a/dev-python/paramiko/Manifest
+++ b/dev-python/paramiko/Manifest
@@ -6,7 +6,7 @@ DIST paramiko-2.3.0.tar.gz 279279 BLAKE2B 64db3412ac5b64ca345a978442062b9ff14e70
 DIST paramiko-2.3.1.tar.gz 282553 BLAKE2B 298bf73d2ecbb47506a7e3b7a03ddd650c8f126ef21b0e443602327a7011ee55c146aa3b6e4d160b47680b50dab3fcf04843597a290ccb166f88fc129bd85a67 SHA512 b63a177f1f03937d5650d6f2a3ca4c00e0c3ffb0080e5e5a8141aab435c3ad415f5af8c61cb2894d176544b854ff26ee510eaa41081b452dfa6213cdc0566665
 EBUILD paramiko-1.16.0.ebuild 1194 BLAKE2B 8e55b80178aecfa56ea22674713a5462b5ea07e777236cb7be4b05d7b2ea4cad15a7f3ac748643dcf9717ce61dd5d33dc294176031d9c0fb855782e4f9ba2d88 SHA512 98dc8c3ee704b82e0f5d9ee05f4f46ef3acf1078ca9ade31e7d19e0f3a14390b299ffd503f4ce10c19e0cfe2f7cc35e22a89533494333ae7cc46d7b8b6efb511
 EBUILD paramiko-2.1.2.ebuild 1141 BLAKE2B 52ec975ac82f1921d19aa7264583a90bb081da736bafb0e0bb75e14e4b84df19d9759d10716375f659cfcf73c1a0e7a20e90d2cae240988713e215966a482cbc SHA512 db85d4e8c14a284c8f82c58a805362fb85c0bc15da075dd86e456ed4e439b35cee278574de5c8ef0496685c1d769dd103e4772f82bcecd2a8d7c691d5416101d
-EBUILD paramiko-2.2.1.ebuild 1085 BLAKE2B 4ad67815b1704fa850b10af616a42668b5edef068a173b0e9c6e8c7548c28a354d1ebaa6cd2594d016ab0f2a693fdac1a2d93e02efd696e3534e61136f9e89e7 SHA512 ea1607550c8c99a7932d29f2a19e1d3247143090377121a19100a7c5c1eb737b03418a867113ab766aed65a48711beb28d86ef0faa04478f223305fc62e0dcb1
+EBUILD paramiko-2.2.1.ebuild 1092 BLAKE2B 8e157c06cd2964dfcebf1b01203d2f2db544a4043e5dacb94397d6259b5fc7e287142e764c7f062337d94568b91ef3276425f3348fa7db2eed597d9eb0a940f3 SHA512 697f81342eaee5a53ce0dc9dd49900c0ee8c9fa5d1a01a8b2d33165ea2b1dcaf7e429f049a586738f30b5e121e6d36471b011612e33244e77b7729dbb0a848ca
 EBUILD paramiko-2.3.0.ebuild 1333 BLAKE2B 2d9c2ae810042c06ee2eb0bc1bb1014c50e2889be8095d8a3b4f9938c66c49021f1a8acd5dbcc35e10f42ac2e760e8e994338f11feccfe0d8dd69f67919246c6 SHA512 6b1e269c54e59c653fdcb42a62e3d4f3631186d6efdfab6c807acbc5d3d8c969971a5a53b88aa154d96d6488d9edc85ae33bb65fb4cc192258d92091464625be
 EBUILD paramiko-2.3.1.ebuild 1333 BLAKE2B 2d9c2ae810042c06ee2eb0bc1bb1014c50e2889be8095d8a3b4f9938c66c49021f1a8acd5dbcc35e10f42ac2e760e8e994338f11feccfe0d8dd69f67919246c6 SHA512 6b1e269c54e59c653fdcb42a62e3d4f3631186d6efdfab6c807acbc5d3d8c969971a5a53b88aa154d96d6488d9edc85ae33bb65fb4cc192258d92091464625be
 EBUILD paramiko-9999.ebuild 973 BLAKE2B 8699c5195a985d92b6c00a6c5197e08926fe19dc6328b1a819ea40c0729bbaac0fd6910429ee4e214e253fe2a007af0eb66f2e86cb872ab73dfa084c17e14e79 SHA512 7cfa47309ea9696805adf419c835fcdcd45e1b4c1f8b4d2c7570eb35245060c411c84ec7db7f86486b84b2ad430f4549eb6dc171553af308d8c445784df54daa
diff --git a/dev-python/paramiko/paramiko-2.2.1.ebuild b/dev-python/paramiko/paramiko-2.2.1.ebuild
index 02f106dde192..bec1852fce30 100644
--- a/dev-python/paramiko/paramiko-2.2.1.ebuild
+++ b/dev-python/paramiko/paramiko-2.2.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
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ia64 ppc ppc64 x86"
+KEYWORDS="amd64 ~arm64 ia64 ppc ppc64 ~sparc x86"
 IUSE="doc examples"
 
 RDEPEND="
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/pynacl/Manifest b/dev-python/pynacl/Manifest
index 15067d12aef4..ee43bca53df3 100644
--- a/dev-python/pynacl/Manifest
+++ b/dev-python/pynacl/Manifest
@@ -2,6 +2,6 @@ DIST pynacl-1.1.1.tar.gz 3099431 BLAKE2B 26b7f9e3c23da7bb06d0d14268424cd786d8a16
 DIST pynacl-1.1.2.tar.gz 3149804 BLAKE2B 2ddf6728bfc5a8d5984ecf3fe054a7f36acf15b64d9ba42df93bb21940b9646997d59500825cdf04deeba9afbf4d227a016ad631211d18cba2ab1a38bdd89541 SHA512 ce9c720699fc3b808bb569ad9916f5f5ea97fbc49643117b014374ffaf77ce7972a530e9c4cfaca14dcffc8d676b5bce2facf6da99bf2fda4e319b772075e52e
 DIST pynacl-1.2.0.tar.gz 3301645 BLAKE2B 7309409d7913bf1dee690a6fba5dd490de7a5cd41119e68115452a8c51317005d10eebfa7017f0a182f07bd20ef36f7b395c9461e3e7929cb1102b24afcb937b SHA512 ffc3b91766aad9d0d21c88c198ebb7520d204e58ffbcac815a382af7eaf9b489f85ae6c2fc4cfe4dd5e04576062bfe248bdcc08fb42bf184a73e41f4352c7bd1
 EBUILD pynacl-1.1.1.ebuild 887 BLAKE2B 5b53da2c38f6ec9432dd129c802ff66df9694b71ec12ab466cc7f23d904236a3c6d81e5823827cdaa3a49b57a21925368345228347523d9acba4b3036afb792d SHA512 733c60faa80eae56229983d66992771f33990dd5853ff16e7db2a6d3d4829a08a7c615a8b7364b1ea986ef8da0eb5f194d21bd5eb8a7ed31b7fac24d0bdbdcb7
-EBUILD pynacl-1.1.2.ebuild 857 BLAKE2B 5863c48e1bcbd9e8e29b1b58d3d902cb7a7929d516dc6fa7b8f105dca5adbc622d4c5580709c17ac257b6d779299de337c4951e26949823340f1310521917257 SHA512 12cbff9c859c183cb1d0362e3cd1693e73f8b8de65ac098764071939b213712708c1395f8f3e1dcd1fb5362b2966ae6118eff285c5f444129467e106801304de
+EBUILD pynacl-1.1.2.ebuild 864 BLAKE2B f396cd993f65d060caf79a87b44c37102d49856c3df88442383709ca1bee4fc18671cf62e1a7119d1c3a8cdc60dad81b44c00eec8eef1350c74516f149ada3e6 SHA512 729a3fa3e03a952b8211b7e32cc2ecd6795f16dceafa148aca128974f0f2eb123a3c5654df09b5b53057dcafdafc9197dfb6c821d1c97a2bd868ea8c848473f4
 EBUILD pynacl-1.2.0.ebuild 859 BLAKE2B 1383c479db400fea43eb3026f14605827674a48691c667627b648e51e8e736874c791bb9441b821e5e9865fc4ae2a3b8c03c57230d00220a35dced9ecf31b594 SHA512 07b6d39acc8564d43472aa21e0d974b926b023e937792740b1b32218d12a97166e4b3ecb6f3e3ed0c35c061d11a26cb8fa86e9a1432337f26fcee8c65ffc4b0d
 MISC metadata.xml 927 BLAKE2B a9f7c9b74daed0905451be50c45ce9761fd7e9794f4a1f3c33a34d36ed56ec7c67f6486075220a0125a87cc573efd7ea593dbadf6f4572fb4e164fea4f3b007e SHA512 d277f860e8aa745cdd1211546cc726d814adb37594c2fdc16d56212b4bf886e7eb7333cbff4ecba0ba66db35ec468665f904345f6a6136669790f70f9bf9f536
diff --git a/dev-python/pynacl/pynacl-1.1.2.ebuild b/dev-python/pynacl/pynacl-1.1.2.ebuild
index b8bc0180bfc6..158f3e3559bb 100644
--- a/dev-python/pynacl/pynacl-1.1.2.ebuild
+++ b/dev-python/pynacl/pynacl-1.1.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
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/pyca/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ia64 ppc ppc64 x86"
+KEYWORDS="amd64 arm ~arm64 ia64 ppc ppc64 ~sparc x86"
 IUSE="test"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]
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-python/pytest-qt/Manifest b/dev-python/pytest-qt/Manifest
new file mode 100644
index 000000000000..4e4427c7d220
--- /dev/null
+++ b/dev-python/pytest-qt/Manifest
@@ -0,0 +1,3 @@
+DIST pytest-qt-2.3.0.tar.gz 106707 BLAKE2B cf02aed42481cbcadfaaa15c883f3055337f6f32e33b7dfbce986ecd9936218ee5bfe9f21e1a910aa970e7adf88dd24415d63f40655e8417863e96a4285fd466 SHA512 2bda4b5f60ba68b151ce62972661cd704e40f4cadaef2583882099e96100b5c5b9398de796e851579e026e9736e07539c4db8c10eef16929ce729c4dd7a22940
+EBUILD pytest-qt-2.3.0.ebuild 900 BLAKE2B 06898d5289b9c14ed6376613618086bd718c59cd035c67e5e812587a29600c66e75158a8e0686e7348648a847ad5605a736c3eb243e23cdba15ac69a2d84c062 SHA512 9f720d5067e08d9fdb16a61524e6bdfc0891b3cbc485fb24f21b0945322e7ed52a2ce1162b0ce380e0d23e95745f48f56f257777c71d001c96199c3f2f3b85e4
+MISC metadata.xml 396 BLAKE2B f4d5cdd1823e62b7b0443623b9f34ffbd2f5f7944ddca44dacbeba2b4a3daa438203483b96f113ab821d4e5dccdc6e9cde8faa3a6a4a53d190b567af07cb9b61 SHA512 c5c3149a783a4d72eb7f0582d416b0f6c408d86878892a0ccde2aa5ec672a55c0c2658af31cffdd8f66500420fa3ee43dbda98397a1efb3cc06697e9e1af84ac
diff --git a/dev-python/pytest-qt/metadata.xml b/dev-python/pytest-qt/metadata.xml
new file mode 100644
index 000000000000..2b11b948e3b9
--- /dev/null
+++ b/dev-python/pytest-qt/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>blueness@gentoo.org</email>
+    <name>Anthony G. Basile</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">pytest-qt</remote-id>
+    <remote-id type="github">pytest-dev/pytest-qt</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pytest-qt/pytest-qt-2.3.0.ebuild b/dev-python/pytest-qt/pytest-qt-2.3.0.ebuild
new file mode 100644
index 000000000000..f99801f96289
--- /dev/null
+++ b/dev-python/pytest-qt/pytest-qt-2.3.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_5 )
+inherit distutils-r1
+
+DESCRIPTION="pytest plugin for PyQt4 or PyQt5 applications"
+HOMEPAGE="https://pypi.python.org/pypi/pytest-qt"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="
+	>=dev-python/pytest-2.7.0[${PYTHON_USEDEP}]
+	|| (
+		dev-python/PyQt4
+		dev-python/PyQt5
+	)
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx-py3doc-enhanced-theme[${PYTHON_USEDEP}]
+	)
+"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+# Test make assumptions about Qt environment
+RESTRICT="test"
+
+python_compile_all() {
+	use doc && sphinx-build -b html docs _build/html
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( _build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index cb74fc50ef3e..5d9b499e369a 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
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
similarity index 76%
rename from dev-ruby/request_store/request_store-1.3.1.ebuild
rename to 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-tex/Manifest.gz b/dev-tex/Manifest.gz
index 75a2e5e53520..41560dd8cac8 100644
Binary files a/dev-tex/Manifest.gz and b/dev-tex/Manifest.gz differ
diff --git a/dev-tex/csindex/Manifest b/dev-tex/csindex/Manifest
index 74b85a8e0763..73e9b814b944 100644
--- a/dev-tex/csindex/Manifest
+++ b/dev-tex/csindex/Manifest
@@ -1,5 +1,5 @@
 AUX csindex-2.11c-decl.patch 711 BLAKE2B 77fd9a81fe88ce1d219cf9759f5371ddba5a7c5347c8877a37e21b828b98ed170c513216498555c0738128a24b7e9311994055e8c2504c301aa07e6a8460f83a SHA512 f17aae7a3b22c230671bec969349b2e610eee69d521167f705eabf78bd242b50afe128d1da355d6f22ae8ad096980c6b1cbb942ce56afc9556f9c645701cd1a7
 AUX csindex-2.11c-flags.patch 432 BLAKE2B 53cadff28ba66eacea704898788f9310ec062d0a398e0ef33182483cfbe860abd4bc42ea70505de0820c11efc46e88da0d200e8a74057fdbefde388976c31619 SHA512 af1be473ead18034b221d8eb3aa05067e1f8f8cb12d10ee4c3434b2a2fbe1f85bbb9268b938b3541ae66e44e12ea7c1aabd8518a91ee0100097013957e906067
 DIST csindex-19980713.tar.gz 31778 BLAKE2B 0ad638dc79a4a5bdba43803572fdc049bbf4bc519d682cd73f0d007fd5063f1c2e476f6afd7a75d0fa7cec3c0a66c4c8759001101ea14470bb79e3023d6ea621 SHA512 ab4d35c84272aa64f9613023412cf8fb8d0b565ffd1fe61b397f82911b6ff7c230c4f54ff44aa0ea5a512229e7ee9410a9257c3fc7ee1d0ba267151ab1704130
-EBUILD csindex-2.11c-r1.ebuild 671 BLAKE2B 8180ac6242288907fd2af717a99c1ab263df5f06c6cebe2b14242f489c62178dd25947f9531e4ab0a048044ebe11284b1fd86329607a2c26790507d880a184e8 SHA512 380e067ec106dcc60c09e122ad08a33abf877e860e7ab91121fd53ce311c71f5bc064ec51f4da0189f7d9dd8cd5c1035feabaeb5dd274dc075a97b2d7490c6d5
+EBUILD csindex-2.11c-r2.ebuild 620 BLAKE2B 3e8f2a210bf1c37b50d2c7c40327851677cc3b8b2353db634426610c3f6178b2e109391b59912b72a7fe426b052f2c59f817057308918fe178a601be2cd20204 SHA512 0ce146dd978ed4da6e0efbc6c5a8b61aab802e35d4b9c17fbf8fbfc5c6ddfd8c86163277019942f4ba2d7b3dcbca86aedb10d92447337abd67c5a418fcebbc00
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/dev-tex/csindex/csindex-2.11c-r1.ebuild b/dev-tex/csindex/csindex-2.11c-r2.ebuild
similarity index 64%
rename from dev-tex/csindex/csindex-2.11c-r1.ebuild
rename to dev-tex/csindex/csindex-2.11c-r2.ebuild
index 7f4f09bbeba0..5c8b4110b8ac 100644
--- a/dev-tex/csindex/csindex-2.11c-r1.ebuild
+++ b/dev-tex/csindex/csindex-2.11c-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=3
+EAPI=6
 
-inherit toolchain-funcs eutils
+inherit toolchain-funcs
 
 MY_P="${PN}-19980713"
 
@@ -21,16 +21,16 @@ RDEPEND=""
 
 S=${WORKDIR}/${MY_P}
 
-src_prepare() {
-	epatch "${FILESDIR}/${P}-flags.patch" \
-		"${FILESDIR}/${P}-decl.patch"
-}
+PATCHES=(
+	"${FILESDIR}/${P}-flags.patch"
+	"${FILESDIR}/${P}-decl.patch"
+)
 
 src_compile() {
-	emake CC="$(tc-getCC)" || die "make failed"
+	emake CC="$(tc-getCC)"
 }
 
 src_install() {
-	dobin csindex || die
+	dobin csindex
 	dodoc README
 }
diff --git a/dev-tex/feynmf/Manifest b/dev-tex/feynmf/Manifest
index d6adfc4b80ce..91ab97b4a321 100644
--- a/dev-tex/feynmf/Manifest
+++ b/dev-tex/feynmf/Manifest
@@ -2,5 +2,5 @@ AUX feynmf-1.08-tempfile.patch 1138 BLAKE2B e74751683497aad6d485d0df43c570006961
 AUX feynmf-1.08.patch 305 BLAKE2B e4de6f6ec120f57232eed6b8034436e15198893645c03235d3e13d0d4fe995cf50d5a8e9038841e87b186e1d0d8e41103bef1776b1440f6a817d95e458645fd7 SHA512 3a85fb8a132be9d7c465953345d4d4374192f2341a90dd9f89ab65a3999c7de76fe92019af533edacc4353b85805a0af2749687d304c06080a1a5ff7ce5613a3
 DIST feynmf-1.08.tar.gz 286208 BLAKE2B a6de553a9624d3e4a1c5aa3f0759bdfbbf449d45477929fee4cbca6ad43dae0d3e835368dac9d9aab80145fedaa78fa9cedabcb5258c956af8daa31f05fe78c3 SHA512 968853ef09ab140fa0844068e564995b44bd79bbe5376a7b866d6db80278b2099aab47920213c7f744d5558e10e69a6de8e056f4d35c8d0fe51055a17981cad2
 DIST feynmf-cnl.tar.gz 49920 BLAKE2B 61624bbfb51edbd28fce3fdadaa56023d540804e3cd314f7aad857803399013921e0c766f7976e79c9989200cc30449197254d180b4e34e5d6ad37822c53c616 SHA512 ba84d284a6157bd1fce6fd1752a006472631bd8628d9c7b0cd9f429e7d3f5c79a7489c43d9db76232987cbe8de01a794d060095dbcbffbd003189ff002493201
-EBUILD feynmf-1.08-r5.ebuild 1772 BLAKE2B 9a9f31b33bb30c956c76d0492a49292938ea05f67017893c50a4320abd551e1f62c2369e57557b1f497f26a64bf91e8272ca7128e89cbee38e5af58bf797eab3 SHA512 65256b8bcb54d0bb7e9ffb4cb77452bcde790c319cd74b0ad07e2b177a3907ee84b4047da843d63ac47846b3fb7f1d114bdee0b45f2f3afe576f225e895e563d
+EBUILD feynmf-1.08-r6.ebuild 1772 BLAKE2B cfa96bd3c39911069ee12e671b1a7a46f73841b2c00a0a83541ed494db33e01262d275685938479057477d2199e4886da1d6548753cf57415c9770adfe0b505b SHA512 e0e0b9e47db9746909188be3e7bdf7abd0d4eef558080a281bb79fdcaf1e71a4deda267d88d9ea4caa693c5a2720c5a28d859dfe6b7c515f9928f847a2452e02
 MISC metadata.xml 663 BLAKE2B 57db427b339c6c905c8b0df11126f49a3f791c299d37bc8c45526d7f79aa072cdfdaa97cee40f95fa636d37817081854f400c4d797fcbee3feee3eab64804ed1 SHA512 f9e4fd6f162e659326146eb4768a97940b0fd444de2883efa9f00d28f14ba88023f7e3bca7b42c98b6442fa6622a6a8fec6112215253e3f6ab982041603c9cba
diff --git a/dev-tex/feynmf/feynmf-1.08-r5.ebuild b/dev-tex/feynmf/feynmf-1.08-r6.ebuild
similarity index 91%
rename from dev-tex/feynmf/feynmf-1.08-r5.ebuild
rename to dev-tex/feynmf/feynmf-1.08-r6.ebuild
index 5656bfc5a5c9..a88c7c445f47 100644
--- a/dev-tex/feynmf/feynmf-1.08-r5.ebuild
+++ b/dev-tex/feynmf/feynmf-1.08-r6.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 eutils latex-package
+inherit latex-package
 
 DESCRIPTION="Combined LaTeX/Metafont package for drawing of Feynman diagrams"
 HOMEPAGE="http://www.ctan.org/tex-archive/macros/latex/contrib/feynmf/"
@@ -22,11 +22,14 @@ DEPEND="${RDEPEND}
 	doc? ( dev-texlive/texlive-bibtexextra )"
 
 S="${WORKDIR}/${PN}"
+PATCHES=(
+	"${FILESDIR}"/${P}.patch
+	"${FILESDIR}"/${P}-tempfile.patch
+)
 
 src_prepare() {
 	rm -f phaip.bst				# use style from bibtexextra
-	epatch "${FILESDIR}/${P}.patch"
-	epatch "${FILESDIR}/${P}-tempfile.patch"
+	default
 }
 
 src_compile() {
diff --git a/dev-tex/floatflt/Manifest b/dev-tex/floatflt/Manifest
index 7deaeba1d912..97cb63888b82 100644
--- a/dev-tex/floatflt/Manifest
+++ b/dev-tex/floatflt/Manifest
@@ -1,3 +1,3 @@
 DIST floatflt-1.31a.zip 304735 BLAKE2B 60fe58f4e333adb175686eb58510408f50b0ce81b53618efc5c7b395cb0e61f4250c938f592b1cebaf48f9d4905c25bace344983ded1bb7841b4b401f2ff3b08 SHA512 f4e7b960daba37a06dbec47ab0432afa6738416ddea652f8f301609af950bd4f842671bd769de3f246f1cbb88df16299199e24e5965d7f76e160736787f7e9ce
-EBUILD floatflt-1.31a.ebuild 543 BLAKE2B 0ba2e9c81893aa95ce9f6187d6627ae79f71ac7af2483493dd243b5d0ee085f88e1e7bed626ac3379a7f93ab24b4c07b14aeac8b699f7bdf2ed0bc0ac9c64e60 SHA512 17ce50ca889ee161ed2b578b64fcae22febbc629582cbf080f54aad018f182d24c06de3305858dfee677c044ab69f8195f577f5bfecc55f1df507617d13e29a6
+EBUILD floatflt-1.31a-r1.ebuild 543 BLAKE2B 262f8a54fbb59645c5c09814592e11b14b6d5e764643fa7694421eb40852cd197ecd08e77ad3d3a530464e4b1f142ac932a64adadc31662f79fbc7a131fbfe81 SHA512 5c1bd4a27b265fafa7399430c11bcd242c8115e6e22a8bc4e75984b80b2368105d7de9a093532eec391d048b5985672a7d86833408f57fde9f1090afbe082ed2
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/dev-tex/floatflt/floatflt-1.31a.ebuild b/dev-tex/floatflt/floatflt-1.31a-r1.ebuild
similarity index 91%
rename from dev-tex/floatflt/floatflt-1.31a.ebuild
rename to dev-tex/floatflt/floatflt-1.31a-r1.ebuild
index 337ba60b6396..e918c233a000 100644
--- a/dev-tex/floatflt/floatflt-1.31a.ebuild
+++ b/dev-tex/floatflt/floatflt-1.31a-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=3
+EAPI=6
 
 inherit latex-package
 
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index ed3dc933303d..8f1d933afe28 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
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
similarity index 91%
rename from dev-util/bcc/bcc-0.4.0.ebuild
rename to 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/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/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 434e2d5d2841..69f325fbe882 100644
Binary files a/dev-vcs/Manifest.gz and b/dev-vcs/Manifest.gz differ
diff --git a/dev-vcs/colorcvs/Manifest b/dev-vcs/colorcvs/Manifest
index e7d19f9c9096..b0646323a687 100644
--- a/dev-vcs/colorcvs/Manifest
+++ b/dev-vcs/colorcvs/Manifest
@@ -1,5 +1,5 @@
-AUX colorcvs-1.4-prefix.patch 530 BLAKE2B bf75ae00e2854f6390f66c51476c7f89401ed640c1dac365043269bce12393ae52a1b569dc5a7889bbc112172e9ed0aa08b7cc813dbb74d9a8780536cd2edf6d SHA512 69df4ce5007d58f13a1dfab7a09cc2d05731e9bc72d0ce0f680f0c46de13d6ecccbec4726b21cc0925b448dd9abe6126d8e6deb83f7883a79e8e97f94e1aad77
+AUX colorcvs-1.4-prefix.patch 529 BLAKE2B 7a16954f603df824db1527f9079086d1722867888c4748b0a57f4e00561b5248e3f67de8067aefd3b3c77caf23d2af913b6a841e33962c10aed36ac4c21b26fb SHA512 a86d265c5d37647c89a8e53dd92d4a01bdf378ebe78d69757401c1a51e75ada912c00981781ddf0af3017936673b8f6c2b218a7f9da8100ee1e5a6f094d95512
 AUX colorcvs-profile.sh 47 BLAKE2B b8ed44839f0b4db3624134ade0ec1c053c003d6af3bbca78c6e8b5719f530704fafdb808de2562e7e2c4eda04b50a54165373fa9764720a018a964312bfc8114 SHA512 46e2692476317558cc3d4642e44aeab5b79d9bcacb0ca6b8f3470170cd351adfe156898b3c4f47ce80266eb70ad62bcfac0354b66cd315993d906ab3739acaca
 DIST colorcvs-1.4.tar.bz2 8376 BLAKE2B 329c255f3813ff8452091d15cdff898aa047a2ae84369faf659acd2939de80f0740abf7b52155b9676085bc8198eaa7b2a3039c684a12f1c6a5d3584590f9ba1 SHA512 b8c9f3241318599da40614392045a0bba3952314001f6b411207307e79e20b7dea1a9741d5a84dc91b652319ee434c2c14f03435ce4adbd22160d66181da6e44
-EBUILD colorcvs-1.4-r1.ebuild 1002 BLAKE2B 58d045da57d053d8e3af07f10e5721e13d9f563deb17cf2e02dab42cec8bb73acaaf54ace73430bbf71ab4840804f9fa60eb6dcb5e19b66fb578a09e66eb712d SHA512 ad0cd74e7ffeb97188fdb85a4bcd8fdeec1d230f2d474dc24ac8aaf2fc895b9b24c41b301c2fbacfcebc434b40e5e84edcc9fef3688c48652bdb4daef7d2b89d
+EBUILD colorcvs-1.4-r2.ebuild 939 BLAKE2B 07aa62dce13a5c13ec31ce7580a09ac6d7662fcf3938829a39141c2b94b0275e015cbbe544973cf60a77b0d71b909ac58f9c78c4d482042427ea420322990e13 SHA512 8ef10ba5ac01a8bb567e1182bf685d84fe87e0b712fe6ca02dc0cef84a723c45cc2505270b0523fc8de8fe000426df68f3dbbd086d20f97a4d9c7e6de4d846f3
 MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b
diff --git a/dev-vcs/colorcvs/colorcvs-1.4-r1.ebuild b/dev-vcs/colorcvs/colorcvs-1.4-r2.ebuild
similarity index 73%
rename from dev-vcs/colorcvs/colorcvs-1.4-r1.ebuild
rename to dev-vcs/colorcvs/colorcvs-1.4-r2.ebuild
index d3c5b132c2e0..2f2076b0e8dc 100644
--- a/dev-vcs/colorcvs/colorcvs-1.4-r1.ebuild
+++ b/dev-vcs/colorcvs/colorcvs-1.4-r2.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=3
+EAPI=6
 
-inherit eutils prefix
+inherit prefix
 
 DESCRIPTION="A tool based on colorgcc to beautify cvs output"
 HOMEPAGE="https://packages.gentoo.org/package/dev-vcs/colorcvs"
@@ -17,21 +17,23 @@ IUSE=""
 DEPEND=""
 RDEPEND="
 	dev-lang/perl
-	dev-vcs/cvs"
+	dev-vcs/cvs
+"
 
 src_prepare() {
 	# fix typo
 	sed -i -e 's:compiler_pid:cvs_pid:' ${PN} || die "sed failed"
-	epatch "${FILESDIR}"/${P}-prefix.patch
+	eapply "${FILESDIR}"/${P}-prefix.patch
 	eprefixify colorcvs
+	default
 }
 
 src_install() {
 	insinto /etc/profile.d
-	doins "${FILESDIR}/${PN}-profile.sh" || die "doins failed"
+	doins "${FILESDIR}/${PN}-profile.sh"
 
-	dobin colorcvs || die "dobin failed"
-	dodoc colorcvsrc-sample || die "dodoc failed"
+	dobin colorcvs
+	dodoc colorcvsrc-sample
 }
 
 pkg_postinst() {
diff --git a/dev-vcs/colorcvs/files/colorcvs-1.4-prefix.patch b/dev-vcs/colorcvs/files/colorcvs-1.4-prefix.patch
index 0a93b49eba0b..acc96c42bf65 100644
--- a/dev-vcs/colorcvs/files/colorcvs-1.4-prefix.patch
+++ b/dev-vcs/colorcvs/files/colorcvs-1.4-prefix.patch
@@ -1,5 +1,5 @@
---- colorcvs.orig	2008-01-26 20:04:54 +0100
-+++ colorcvs	2008-01-26 20:05:56 +0100
+--- a/colorcvs	2008-01-26 20:04:54 +0100
++++ b/colorcvs	2008-01-26 20:05:56 +0100
 @@ -54,7 +54,7 @@
  
  sub initDefaults
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 841d0edfa7f4..cd264f665aa1 100644
Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ
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-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 89f3f9fe077b..d6e1efcd8a13 100644
Binary files a/games-emulation/Manifest.gz and b/games-emulation/Manifest.gz differ
diff --git a/games-emulation/m64py/Manifest b/games-emulation/m64py/Manifest
index d5f546ab2c3e..42b0dd98258e 100644
--- a/games-emulation/m64py/Manifest
+++ b/games-emulation/m64py/Manifest
@@ -1,3 +1,5 @@
 DIST m64py-0.2.3.tar.gz 304241 BLAKE2B efd7e4fc9a75d2b9525ad40e67f92ff56e0e932d96ee4ba51fc128d0fa8fb88a0811efada86af580501803f4f9d9e94aee23d6a50704c2e05078cc511825f347 SHA512 5471d2ce96007c5cb5492f7ba3bc2a8843455dfea811b114c68862fa5c06a636e6dd6a4304e60bf2273377330b0eb01f2dcdc0340d02ec498ae44cdd2ccc01ff
+DIST m64py-0.2.4.tar.gz 209621 BLAKE2B 05fe7044ec096767ae1eb57aad9f326b157d67ea709ca0bb74cdd68ae16a23eb662a2842bef5e038d1b29cbf0a5252669ff54268d1227390f47e8c9029b63e6a SHA512 ab78565466c6dcfe604cdc00b7e63dee2f0f33514dbf4f9115af646b1f6562042516513d054bd5cb489ad89c9d30431e9ce531f8b27925ecb9c6f7b509836348
 EBUILD m64py-0.2.3-r2.ebuild 1966 BLAKE2B 7401531f4c6ac5ae18ad0ebfded531474b3a294bf43499c4a117788f52bf39938be964ac19bb74ce9928ba96c97a097eed79a1f0cca31f1b58eb68a8e05e767f SHA512 ab22af067537fae68a9ba4767e4676c64926ec91131d00469b8bca1dabeb76700a3b9a7afecff30f36d60e99c8b2b330965094379a6f234b17c18e0668507fc0
-MISC metadata.xml 322 BLAKE2B f033bc882b57f392fef8d0f97c0952642705a6a54603534fe6dfe92b97a859bc75a3b654c59de08112f7424254e6fba8345e57ad07ac90a81f5711a9615291b3 SHA512 e05b00f770c010b4d7776a79923b8b683679cdf36a2ab5d995cf907fc1dbeb86f3538753d25a743277937f625d15d9f9d5d2679096e9fa382c1d47b4c240d61c
+EBUILD m64py-0.2.4.ebuild 1067 BLAKE2B a21eeabf0ac3bb7c88486ca1ac12efac04c58ade8c666b9efd73c011a1f499879d522c0cb721177b8014a23f4b322fe5229e2eafeceb42ed8b433448609d5e96 SHA512 8a66a89849ace632528543c73725a3ba1c2e60e84a4b81a4c9af4e0cb36bea9c622a4ad130d9ecdef0e74d9a089856ddeed0ae7af858a857e2672af073d8acb6
+MISC metadata.xml 455 BLAKE2B 094f3f1db818c82e55c07512db2e94ed800bfd14595d70aa8ddca7d63e862807c5552210f9a71c01ea0fbcc61f3d46a139a762d1026d75b1f932e15ec7e0e589 SHA512 41d3ca220e71119ec7bf4ea8b1ea92289d901ba3a0058e75423dd50580d03a0cbc9aae2c368fc3c47793e0405c0e167fc546c65f039661b5b11fbb274846301b
diff --git a/games-emulation/m64py/m64py-0.2.4.ebuild b/games-emulation/m64py/m64py-0.2.4.ebuild
new file mode 100644
index 000000000000..7d0c4054d8dc
--- /dev/null
+++ b/games-emulation/m64py/m64py-0.2.4.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="A frontend for Mupen64Plus"
+HOMEPAGE="http://m64py.sourceforge.net/"
+SRC_URI="mirror://sourceforge/m64py/${P}.tar.gz"
+
+LICENSE="GPL-3 LGPL-3 public-domain GPL-2 BSD CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="7z rar"
+
+RDEPEND="
+	dev-python/PyQt5[gui,opengl,widgets,${PYTHON_USEDEP}]
+	dev-python/PySDL2[${PYTHON_USEDEP}]
+	media-libs/libsdl2[joystick,video]
+	>=games-emulation/mupen64plus-core-2.5:0/2-sdl2
+	7z? (
+		|| (
+			dev-python/pylzma[${PYTHON_USEDEP}]
+			app-arch/p7zip
+		)
+	)
+	rar? (
+		|| (
+			dev-python/rarfile[${PYTHON_USEDEP}]
+			app-arch/unrar
+			app-arch/rar
+		)
+	)"
+
+python_prepare_all() {
+	# set the correct search path
+	cat >> src/m64py/platform.py <<-_EOF_
+		SEARCH_DIRS = ["/usr/$(get_libdir)/mupen64plus"]
+_EOF_
+
+	distutils-r1_python_prepare_all
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/games-emulation/m64py/metadata.xml b/games-emulation/m64py/metadata.xml
index c8f77563ef65..00cb74caa25a 100644
--- a/games-emulation/m64py/metadata.xml
+++ b/games-emulation/m64py/metadata.xml
@@ -5,6 +5,10 @@
 		<email>mgorny@gentoo.org</email>
 		<name>Michał Górny</name>
 	</maintainer>
+	<use>
+		<flag name='7z'>Ensure support for .7z archives.</flag>
+		<flag name='rar'>Ensure support for .rar archives.</flag>
+	</use>
 	<upstream>
 		<remote-id type="sourceforge">m64py</remote-id>
 	</upstream>
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/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
Binary files a/games-fps/Manifest.gz and b/games-fps/Manifest.gz differ
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-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index 67f8f9487377..703e576e678e 100644
Binary files a/games-puzzle/Manifest.gz and b/games-puzzle/Manifest.gz differ
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 0c360fd7ed6f..a47bf7becc30 100644
Binary files a/mail-client/Manifest.gz and b/mail-client/Manifest.gz differ
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
similarity index 55%
rename from mail-client/mailx/mailx-8.1.2.20050715-r7.ebuild
rename to 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/mail-client/novell-groupwise-client/Manifest b/mail-client/novell-groupwise-client/Manifest
index aa16e15975e9..903e34c2727b 100644
--- a/mail-client/novell-groupwise-client/Manifest
+++ b/mail-client/novell-groupwise-client/Manifest
@@ -1,3 +1,3 @@
-DIST gw802_hp3_client_linux_multi.tar.gz 209918505 SHA256 f9be044980dd00703aaf2a1b2b93468e526a308cfe91769a61c7079ec3e08f98 SHA512 3a03ac02954f86c2e797404128441bff980f82cdc9936668fb528aef0190240891f92e4094fe53d58a0684ef8e94ebac7c73fbfa262e72bc450fab8ea9872efd WHIRLPOOL a07c30b18f6902521fe07d60b1ead302dc669a19c3d31e1af5acf91185b581924bd2ccfc07216a00ac06e7451aa981ac88958719d59a51b5a9053a445f455ad5
-EBUILD novell-groupwise-client-8.0.2.96933.ebuild 2205 BLAKE2B 0ee84d3440bfef4f6b036844bdcbb5429aef05ef5b7175e85404268ebf9e1b98a87d377b48ba08b7df0a6223db893cd8f8c88eb80faacc3e68999e10378dd99b SHA512 121b147bf3e7836c1ed4491316f6f2cf13b776f7d5805b94d48fa0ee868f73fdc01e1a97e7456cda2720496df8aca33957baa23727cd81fb6a59b152d0fb2f97
+DIST gw802_hp3_client_linux_multi.tar.gz 209918505 BLAKE2B 9e0788334f5fbe7a69a19d4b81dc439ce9e8b01fc0fb50c9ff9cf34a020dcbbeddb726e10005e4c9d48b7f385327eb74ebbb86ec034dfd405c19c38daf491946 SHA512 3a03ac02954f86c2e797404128441bff980f82cdc9936668fb528aef0190240891f92e4094fe53d58a0684ef8e94ebac7c73fbfa262e72bc450fab8ea9872efd
+EBUILD novell-groupwise-client-8.0.2.96933.ebuild 2267 BLAKE2B 7da93bfa3ff738b109bf4ed4aeafc13066bd85a367e438c483e705aa110cd1214cdf0ff89d27658484cdfe8660690dc558898aabb8fcc71c44236c3a2373e51c SHA512 a6295b65626071a8e5a136c8a78b142b70f81effeb656d831ec1c584969f0cd686c3d8e3207da37c2363f93e74dd6dbddb4503f428c1bec93b9791ae633a0cd9
 MISC metadata.xml 224 BLAKE2B f5f8be74b864fb579516bbffb5e8adcd95c4274cd6223fe89094a32374858a6b6742846c114fd94a7e6158baa0c83d9dda195c350a609e937010458a4cf6c1a3 SHA512 8793a074cebd46dcb7e9813eb09462292ca552d1e457c8ed5b714217f397cd8f95696f1f92d98ac179876bf39574d20ae4fbd9a5a67548f375a89c7dcd2a6309
diff --git a/mail-client/novell-groupwise-client/novell-groupwise-client-8.0.2.96933.ebuild b/mail-client/novell-groupwise-client/novell-groupwise-client-8.0.2.96933.ebuild
index 0b039c8f996c..af840dc33034 100644
--- a/mail-client/novell-groupwise-client/novell-groupwise-client-8.0.2.96933.ebuild
+++ b/mail-client/novell-groupwise-client/novell-groupwise-client-8.0.2.96933.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -36,7 +36,10 @@ RDEPEND="
 	>=media-libs/freetype-2.5.5[abi_x86_32(-)]
 "
 
-RESTRICT="binchecks fetch mirror strip"
+RESTRICT="fetch mirror strip"
+
+# we might as well list all files in all QA variables...
+QA_PREBUILT="*"
 
 src_unpack() {
 	unpack ${A}
@@ -62,7 +65,7 @@ src_install() {
 	mv "${WORKDIR}"/${PN}-${MY_PV}/opt "${D}"/ || die "mv opt failed"
 
 	dodir /opt/bin
-	dosym /opt/novell/groupwise/client/bin/groupwise /opt/bin/groupwise
+	dosym ../novell/groupwise/client/bin/groupwise /opt/bin/groupwise
 }
 
 pkg_nofetch() {
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 644b4498f476..d8ed10b17df3 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest
index 3e6e02e88a5b..7eb1af9c8d8c 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
+EBUILD geeqie-1.4.ebuild 2071 BLAKE2B c29441b59ca85d956f52e315eaaaa0b13ad692b70f921b48ce2d38f783ba881dcb85fcdeb89e646c30d15e13d161bf05af810ed3b4cf258d39331f1abc70578a SHA512 468cc475d878f0d5212681ef7faecf55c0bcf5bc1bb583f6e82818a544bbf08a05a5cbe517e72c37b795f15efe62f18d40db59e434c60fa582f0985a375f36f1
 MISC metadata.xml 806 BLAKE2B bdab12aff9617fbcdc5e5e9be5b22d1d48b4a41691375c9a3af8bee2e3c10a511cb9aaf0144a1df2d0988ed9185d36699b45a04e397b532e9ca98ec1a7863ee7 SHA512 f5d2929460a639de62f06abf298d4817ffbf9550892b4ad0eccbb9bb8fbffeb5e399c9184bb1d1367090135af329d36807bf1f7497ec5af77201da631a5f91d4
diff --git a/media-gfx/geeqie/geeqie-1.4.ebuild b/media-gfx/geeqie/geeqie-1.4.ebuild
new file mode 100644
index 000000000000..7da47a528433
--- /dev/null
+++ b/media-gfx/geeqie/geeqie-1.4.ebuild
@@ -0,0 +1,86 @@
+# 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 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 )
+	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 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/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/maim/Manifest b/media-gfx/maim/Manifest
index e16f459bde2a..741a56adb7d6 100644
--- a/media-gfx/maim/Manifest
+++ b/media-gfx/maim/Manifest
@@ -1,3 +1,4 @@
 DIST maim-5.4.63.tar.gz 39666 BLAKE2B 0c472480f231b84c7f772347d6eeca8620947e5494f176dd4513ee41a5de29e9b90eafbec1bb7064e745e24c9b1043a7ccd9627cbab5561f30f6e8a859273e21 SHA512 d84cfe051109c9c4b79f2a006f2d73a0fa9cd40151c9d6996740326766886f8b070bc49029d0d3810fd8743cc63d76c051fc249e53b4e9ff37faf8708c149dfd
 EBUILD maim-5.4.63.ebuild 599 BLAKE2B 23481feda7a67dea9ddfe017db071e07cc39b06bdd1e3c6e6a63bb2f198b0532f7c0a57d7c9f12b7de2fb1fb855cb9051a1695c5dbc64092eaeaae44a15b04d3 SHA512 a889034dd4c81f939c7e0edcb01f1de36b54e68bd8f793b08c935ba3affec3449c7492d418b7e614cf340e0092cd27410f72fa56b914d3d6ed6b9de849d607e6
+EBUILD maim-9999.ebuild 846 BLAKE2B fba5e14c794a9727c1809c4879d18e11d1152c73fe0ec4d5c58bcb3755c4cacfc13b0f88e85c212596d6da005273e26674a96cfa34b62a8f3faaa54b50fcae8b SHA512 d5d0024d6878a513281d3faa4395a0a126643f820bf0917d663f1987ecec37e08513d8e8e9571047078fd7edc1f4609477bf4a791925967f6daee282bd5f385a
 MISC metadata.xml 370 BLAKE2B cf97a29c8998e02c1cf3c1a2262af3b4ead910bc3b9a84a43ceb97eb6f8522b134007ba6380e5a0e014ac62b4faad27f856a847026bba576e1e1a6e4c2bfd160 SHA512 d3c3fb700a3d2c5c67a3919ae60fba9e843734875378ba682d93f728c408845f580caf940b3e39436582ddd1c3e2fe4e21f01cc74960d00f8cbddf20047abb62
diff --git a/media-gfx/maim/maim-9999.ebuild b/media-gfx/maim/maim-9999.ebuild
new file mode 100644
index 000000000000..254e10aa2376
--- /dev/null
+++ b/media-gfx/maim/maim-9999.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Commandline tool to take screenshots of the desktop"
+HOMEPAGE="https://github.com/naelstrof/maim"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/naelstrof/maim.git"
+else
+	SRC_URI="https://github.com/naelstrof/maim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="unicode"
+
+RDEPEND="
+	media-libs/libpng:0=
+	virtual/jpeg:0
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-misc/slop:=
+	unicode? ( dev-libs/icu:= )"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DMAIM_UNICODE=$(usex unicode)
+	)
+	cmake-utils_src_configure
+}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 6d49bc901f56..fbadfb3565f0 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/bio2jack/Manifest b/media-libs/bio2jack/Manifest
index 501570d901ae..bd710a5f4cec 100644
--- a/media-libs/bio2jack/Manifest
+++ b/media-libs/bio2jack/Manifest
@@ -1,3 +1,4 @@
 DIST bio2jack-0.9.tar.gz 527385 BLAKE2B 9f977e8f03a9de272c0b440c256569382876a62875dfc3d1f896c80388bd219d195d5544ba1dd5fb6b2141e63368f4293c3cb5081e1d2d8d3cdceef29a54285d SHA512 8faf73b9aa81d48eddb624146c0144094e466f16cad89fad3670f927963a5944d78f0342aba0f29cece422e3f012faf3e1a0c459fd5cef279406f5bebe66e66a
 EBUILD bio2jack-0.9-r1.ebuild 1124 BLAKE2B 629a4baf8176e3c724e507442eb39836e4fdcf28e2c0d734615e1d66bd9973b9336499355f716f6a1d5f2595a5cd9365342db913d8476c4d8af0f3a0d4c4760a SHA512 247054c9c07e628a71396f69286d240a6d468d566ccc223c2156d8c61658578ba1ae1660ca06b736147c2001cbd563e142794ad19617357ec0da48087b707038
+EBUILD bio2jack-0.9-r2.ebuild 1120 BLAKE2B bda00fb4113303e035b0f42d9403f45eae4645822f4a7259b6c9562ccba250838b4764156f36dcf985d62bafd0ac3e18fb5f58604d2f46535cede0246f91cbf5 SHA512 869f9d8a13be1128bcbb79e7457a947f7a938bce55c58922d1272b32cd59278425c04f40f3e8974ae5c2aa27fd5accd78fea79be822aa33dda24c0929f435e48
 MISC metadata.xml 331 BLAKE2B 10b8c96e08bc97853a40647f2875aafc8c7de9994ba5af8cf5e2ed429efc2cd494b65d1d6dd424da234785568ebaeec822f15c0b088a0bc8df1a12322f2472bf SHA512 57c44fcd806d4de0339c0a6041635dac52545c8aa71516aefcde41613a8ec92f293c5e28f7b04ed3ab746fdccee306b80a44ef4faef24b2ade1abd2be831ca27
diff --git a/media-libs/bio2jack/bio2jack-0.9-r2.ebuild b/media-libs/bio2jack/bio2jack-0.9-r2.ebuild
new file mode 100644
index 000000000000..fd38ec0396da
--- /dev/null
+++ b/media-libs/bio2jack/bio2jack-0.9-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools
+
+DESCRIPTION="A library for porting blocked I/O OSS/ALSA audio applications to JACK"
+HOMEPAGE="http://bio2jack.sourceforge.net/"
+SRC_URI="mirror://sourceforge/bio2jack/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="static-libs"
+
+RDEPEND="media-libs/libsamplerate
+	virtual/jack"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	eapply_user
+
+	# upstream does not provide a real release, it releases a tarball
+	# with a _prebuilt_ copy of bio2jack. Drop all of the built stuff
+	# and recreate autotools from scratch, then build.
+	rm -rf *.a *.o *.la *.lo .libs .deps Makefile config.{log,status} stamp-h1 stamp || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-shared \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dobin bio2jack-config
+	dodoc AUTHORS ChangeLog NEWS README
+	rm -f "${ED}"usr/lib*/lib*.la
+}
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/stk/Manifest b/media-libs/stk/Manifest
index dbba5dfd0d5c..cc7676e6fb67 100644
--- a/media-libs/stk/Manifest
+++ b/media-libs/stk/Manifest
@@ -15,5 +15,6 @@ DIST stk-4.5.0.tar.gz 2466803 BLAKE2B 30e73179000a581c66a4e80fa00aaea481675b6779
 DIST stk-4.5.1.tar.gz 2413113 BLAKE2B 5eedf936f26acd3e2f377a198b252ee36bcdbb642f0649c0db6c453beb670a1fc725c94af78ff3e075f50068ae6927b628de0174dba598191ed9f9d2f074c17c SHA512 c4c05edfb49b269d5d2518c06abad8e636c4f67a8598f5a03d406bbef04b8b3315d2592d35c8742ce9163b52215ac87b6349c0012e271a43707d109175b6d336
 EBUILD stk-4.4.4-r1.ebuild 1564 BLAKE2B d8ae6dfb0dd63b5594a570c791c8569cafd18b77e8dfa12cde5f50b9cab634575ad1302f2ee4d9ba6e2a5704b795ac4743c16e3758029923481090341ced77cf SHA512 cb3d4dd97904d88d99278bec5cf950df4e11638731e409b1d75d991841b9695aaa702002df9755a6f761d3e45f69f45c87f1c4e31850e9b2928948e4b3181156
 EBUILD stk-4.5.0.ebuild 1352 BLAKE2B dd2042f88f400b9a0a69f9acfde308870971d9c3efcd76603239dff77d42ffa8c151dc4e4414523394855ee0af2ab25300cc327398e93865e55361caca7ce53a SHA512 37d800c4abae1a39c754ae28b11dcbd1b1a4a30b59b4eac3bc468404d2bdacc930e66ef1333493aa3f3c933b5b2c9e8603ff05ad36b78f2ae4c15ea94ec9cbdb
+EBUILD stk-4.5.1-r1.ebuild 1312 BLAKE2B 34551e5b40610675a28d851067b1b272c823fb47e3cf8d72a89d2dd36194d69c9e1bd4dc00e14a5dd45e47efa786803aed2329f2a9cf2346f31f6c58eaed96df SHA512 a195a28e90a2c1d7a21bce4b1eec45de6e986dff7a29a679aa0b94776c8353e6e700180955c2a46efbf5a6f60db794c6beb8405dfdd2e8b5c52e0113d75678c7
 EBUILD stk-4.5.1.ebuild 1323 BLAKE2B 06b0eff796356e5bd4a20bd02c99c154be49f007ac8f0371bceaaeeb0725939499cff9bc73c0228cd249646c45ca55b5b7caf8f75e823842ea48489719c5a276 SHA512 e64143c9947a35b939aaa964cd7c9510a0ed044eba803bc48a15870a5e94d5db1c8c6ebd534f61dbaef80fd00eb650de8e12fa50c5c916139787230ba1e84d6f
 MISC metadata.xml 365 BLAKE2B a10b2261fdb56826dfdeb96a89f678dbebd332f99fafe31a5be95ca0db2593b3a14f69b856cda7ca5b3b6edd93f45661118a0c1fa6d6fe2ad7e4c449c579bd9b SHA512 48da9b52d54138bf4d271d39390a78b38641a4accf4f9cff2a0ce4a3954b45805d3a834f5aab0cdd13710e12ec36b5421be6c8a54db8698ae7bcf665c6866012
diff --git a/media-libs/stk/stk-4.5.1-r1.ebuild b/media-libs/stk/stk-4.5.1-r1.ebuild
new file mode 100644
index 000000000000..71f85aada4bb
--- /dev/null
+++ b/media-libs/stk/stk-4.5.1-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils autotools
+
+DESCRIPTION="Synthesis ToolKit in C++"
+HOMEPAGE="http://ccrma.stanford.edu/software/stk/"
+SRC_URI="http://ccrma.stanford.edu/software/stk/release/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa debug doc jack oss static-libs"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	dev-lang/perl"
+
+src_prepare() {
+	EPATCH_SUFFIX="patch" epatch "${FILESDIR}/${P}"
+	eapply_user
+
+	eautoreconf
+}
+
+src_configure() {
+	#breaks with --disable-foo...uses as --enable-foo
+	local myconf
+	if use debug; then
+		myconf="${myconf} --enable-debug"
+	fi
+	if use oss; then
+		myconf="${myconf} --with-oss"
+	fi
+	if use alsa; then
+		myconf="${myconf} --with-alsa"
+	fi
+	if use jack; then
+		myconf="${myconf} --with-jack"
+	fi
+
+	econf ${myconf} \
+		--enable-shared \
+		$(use_enable static-libs static) \
+		RAWWAVE_PATH=/usr/share/stk/rawwaves/
+}
+
+src_install() {
+	dodoc README.md
+
+	# install the lib
+	dolib src/libstk*
+
+	# install headers
+	insinto /usr/include/stk
+	doins include/*.h
+
+	# install rawwaves
+	insinto /usr/share/stk/rawwaves
+	doins rawwaves/*.raw
+
+	# install docs
+	if use doc; then
+		dohtml -r doc/html/*
+	fi
+}
diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index f1f01e6e6d76..3321774928d7 100644
Binary files a/media-radio/Manifest.gz and b/media-radio/Manifest.gz differ
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 7d8f8d11ccd6..54642d4fcd05 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/alsaplayer/Manifest b/media-sound/alsaplayer/Manifest
index d1e6df3de4ae..4c80ca41d247 100644
--- a/media-sound/alsaplayer/Manifest
+++ b/media-sound/alsaplayer/Manifest
@@ -1,3 +1,4 @@
 DIST alsaplayer-0.99.81.tar.bz2 806906 BLAKE2B 6b37aaa65f6426a43483c3fa7e077ca89ce553655587e0f44ac61ade5d4f5467a304e18ef0142336b0cc94311498ccaa16d9ed2d6eb8109474626c6d1a4ca97d SHA512 6723b36837d01f14645bb1d43ec7c54c85e8afed9b020f56dc81b4de64b74e4da2504507fe83954c7b26817e90510c585d09e759fc11e731d4d27e86f3932650
+EBUILD alsaplayer-0.99.81-r1.ebuild 1923 BLAKE2B 64767934a9aa1e2665db11e0b69ce5beef39ea219be0e005bf69d0e74874e17bc46ad11e085c7815bd11cb1ad313551d0c34c2abb0234653b97425837e555b03 SHA512 216d303c6048621be9e3b10b866086c2d8e48a8a25aaa75acb00ea58d6804fbf0d35ebfa4a0851e9e42dbfaf33a2ce8b77970ff68a64a9e9111fc9a5f5737c97
 EBUILD alsaplayer-0.99.81.ebuild 1953 BLAKE2B 9b474fb6a2b00fa7510d105f3c7d42d807e34ce5f547795607dedd2b0a35d345c11ef9431a280bf5713d475b0b3950cd50327d4283a78ceb6e4a7580707772c0 SHA512 2916eb5516a8caa4bc173a0c579b76824f3b3625303f56ef3ce507f46a4e19ed5a1abf74b1851b57b1d8c1cc729ce0c4f00488aee03410fa12e9367cbbf98994
 MISC metadata.xml 337 BLAKE2B 1f60abc42f95db4e9876c4894ddc16175f17d35b53c7d9fcd425e0124d3fdf08978b349cf2364cfc32555408d1e5ec011fc6367ac9d3e4b7260cf0d2d665522e SHA512 eb9f49ef0aaa5f6ec8c8a29f0459cde3fbbcce419217ae9c22ed6f50dea1893e02037b556daa4276de62aa18fd3193d8c213c6b819d701689fea845d64f97f61
diff --git a/media-sound/alsaplayer/alsaplayer-0.99.81-r1.ebuild b/media-sound/alsaplayer/alsaplayer-0.99.81-r1.ebuild
new file mode 100644
index 000000000000..f1d448e8b1da
--- /dev/null
+++ b/media-sound/alsaplayer/alsaplayer-0.99.81-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools desktop
+
+DESCRIPTION="A heavily multi-threaded pluggable audio player"
+HOMEPAGE="http://www.alsaplayer.org/"
+SRC_URI="http://www.alsaplayer.org/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86"
+IUSE="+alsa audiofile doc flac gtk id3tag jack mad mikmod nas nls ogg opengl oss vorbis xosd"
+
+RDEPEND="
+	media-libs/libsndfile:=
+	sys-libs/zlib:=
+	alsa? ( media-libs/alsa-lib )
+	audiofile? ( media-libs/audiofile )
+	flac? ( media-libs/flac )
+	gtk? ( >=x11-libs/gtk+-2.10:2 )
+	id3tag? ( media-libs/libid3tag )
+	jack? ( virtual/jack )
+	mad? ( media-libs/libmad )
+	mikmod? ( media-libs/libmikmod:0 )
+	nas? ( media-libs/nas )
+	ogg? ( media-libs/libogg )
+	opengl? ( virtual/opengl )
+	vorbis? ( media-libs/libvorbis )
+	xosd? ( x11-libs/xosd )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	nls? ( sys-devel/gettext )
+	oss? ( virtual/os-headers )"
+REQUIRED_USE="|| ( alsa jack nas oss )"
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e 's:AM_CFLAGS = $(AM_CXXFLAGS)::' \
+		output/jack/Makefile.am || die
+
+	sed -i \
+		-e 's:-O2 -funroll-loops -finline-functions -ffast-math::' \
+		configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	export ac_cv_prog_HAVE_DOXYGEN=$(usex doc true false)
+	export ac_cv_lib_xosd_xosd_create=$(usex xosd)
+
+	econf \
+		--disable-esd \
+		$(use_enable nls) \
+		$(use_enable opengl) \
+		$(use_enable mikmod) \
+		$(use_enable vorbis oggvorbis) \
+		$(use_enable audiofile) \
+		$(use_enable flac) \
+		$(use_enable mad) \
+		$(use_enable id3tag) \
+		$(use_enable gtk systray) \
+		$(use_enable jack) \
+		$(use_enable alsa) \
+		$(use_enable oss) \
+		$(use_enable gtk gtk2) \
+		$(use_enable nas)
+}
+
+src_install() {
+	default
+	dodoc docs/*.txt
+
+	newicon interface/gtk2/pixmaps/logo.xpm ${PN}.xpm
+
+	find "${D}" -name '*.la' -delete || die
+}
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-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index a69aadb8db70..d2a097bd1367 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1,6 +1,8 @@
 AUX hydrogen-0.9.5-gcc47.patch 761 BLAKE2B 4dcf893c24a6cd8f3669af7f1b5517488adfd6aaf5018959732225f46ce0013faea98554a2e370c0d724100f64cd92308e00bf619271e9de4125dc7b7971f1fe SHA512 ff3a06fbafdce19bf04f9fb71c04ff754e22caa36148a0f5e4a56efc53ce9b9478e9f1aeacdcc037234104762d9fce208aef351c70941b044e2d83bac4131304
 AUX hydrogen-0.9.5-gcc6.patch 609 BLAKE2B f34496e0c3c251f135262ff30efaff243ae4fc0a279ad529f0bceb1e6b854b6b8b513a2f2b1c6e15ce1f68d51032817147ae7a357205345bf64876b5f2c7096b SHA512 0078c02e9cb2de557825cd6119ccfb6247f171ccc4a53ea93241891850c82f0924e9e0a4740764d13f1deefcb5e9469137e5d4a69c2bfceedeae8fb110deea8f
 AUX hydrogen-0.9.5-use_lrdf_pkgconfig.patch 858 BLAKE2B c43e9a0de36e1eee2c184b6405b3a01284dea8f058ba77aa415e85ee5e4e2bc27b975ee5a1d959471c64154f9be6cc0fe51e66db31abd7149e0350f91e8a9735 SHA512 251a74287370f66df9eeecd3b6c7963c2614cf6b17a56fc71dc9f99077c3267a2e79469e2993ae22d017ea7f6cc7c581455c97c125e3be73860321112a67fd31
+AUX hydrogen-gnuinstalldirs.patch 4979 BLAKE2B 02b3894ec8d6893c061a1a7767e44b6d5d0df3fa29fceb731e56dd83be74784195d0da13447c82326638ce7091c26c846d42c70ca6d66ef1a64310de8eab73a3 SHA512 23838dbab56d29f53ff78055f371ce11a57f7cf738c76ce22b684b1de72cefe71767a1237246c24b90034e72a72a16d4999365959563a71906e34b7da6abb3c1
 DIST hydrogen-0.9.5.tar.gz 5239702 BLAKE2B 5fb1e7561b65587a6a4b8e642a4e0262cf8521a6847f04e57d4f99af2ef38fecb05f779cd5b0c25d487360db6455b0912729e7deac0d9959e8c32938a44b1adb SHA512 0053f0cb301c541326b66eb416dc548561a973ade993c055e7bc2acbdf28732e627a605061c8b487644026510f5b8395946bba209ddfd19230c960e9bb619f97
 EBUILD hydrogen-0.9.5-r1.ebuild 1816 BLAKE2B b66901bef46726ad957b37074ec247d7c9d502f324c8a0a2da2bca3af036a204b6f63fb0047672ef6fa38194c263c210efae02ae33d8eb56a4169bbf4a8529cf SHA512 0bd6ded8debf0915399c1dcc56537730d3c8a8b219262223d567f2240f3019de5675196102da55840c039ab30814ef27ec1f7b1c4313e537e07970e353956b86
-MISC metadata.xml 429 BLAKE2B 6d7efaf4823ada77016a5a8b28e27ddbe9c0a3732a3874a85dd6ba82180e2504fd24ce325e3c9b50d6824039c391188e28b9b1f8033537977bdef1f84cdf7041 SHA512 a57c6e234c6e735bc5eb4fbe19218773a0ffe3d741eafdbbc87394552173bb512c0164e23e7c919f4927a82b549b5f60bcbb55cb2396dc77f795c028e9fd6777
+EBUILD hydrogen-9999.ebuild 1831 BLAKE2B b05a1bb7a184ccf69846132a79a82c4677b77ac8e6b51bb8114734bc1ac47e19c7d4a9deb3b3ca14237f17d360a702253b8318ffe4bda7d1811ac572b79b9c63 SHA512 26532173d65743e0b102e2169a32bc1e39464e51bcdc4185080be069e49b66a5eb224a31510e79e4f118e09e617754e26d2da85123d1a79967888bae113bc9ca
+MISC metadata.xml 477 BLAKE2B 16ddf823d0ac8b091a760f0dfba28581991184f7b507ca64123d85cee9c0a4a05958a28adfc53ddff671f4ac4576fcf3041236779d0ce5a54e42f9f1915940ca SHA512 de194a51ad2ef2cca91c59e2dcdfec0d0f26a206d46309f49df36c5499ca39a4458fc0f66bdbcba70be392aef96365bc2680b67595f46be40c0304f7a1fca70f
diff --git a/media-sound/hydrogen/files/hydrogen-gnuinstalldirs.patch b/media-sound/hydrogen/files/hydrogen-gnuinstalldirs.patch
new file mode 100644
index 000000000000..d42b3971d45b
--- /dev/null
+++ b/media-sound/hydrogen/files/hydrogen-gnuinstalldirs.patch
@@ -0,0 +1,112 @@
+From 11c72da8b2bf96f650ca6e1e38af0819c4f49c45 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Mon, 1 Jan 2018 11:52:18 +0100
+Subject: [PATCH] Use GNUInstallDirs
+
+Fixes multiarch and deprecated man dir location.
+---
+ CMakeLists.txt            | 14 ++++++++------
+ src/cli/CMakeLists.txt    |  2 +-
+ src/core/CMakeLists.txt   |  6 +++---
+ src/gui/CMakeLists.txt    |  2 +-
+ src/player/CMakeLists.txt |  2 +-
+ 5 files changed, 14 insertions(+), 12 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 96dbf47a..2caab298 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -30,6 +30,8 @@ ELSE()
+ 	SET(DISPLAY_VERSION "${VERSION}-${GIT_REVISION}")
+ ENDIF(VERSION_SUFFIX)
+ 
++include(GNUInstallDirs)
++
+ SET(LIBSNDFILE_VERSION_PREV "1.0.17")
+ 
+ #
+@@ -146,13 +148,13 @@ ELSE(MINGW)
+ 		#Without setting this, installation would go into /usr/local, which does not exist per default
+ 		SET(CMAKE_INSTALL_PREFIX "/usr" )
+     ELSE(APPLE)
+-        SET(OSS_LIB_PATHS "/usr/lib${LIB_SUFFIX}/oss/lib" "/usr/local/lib${LIB_SUFFIX}/oss/lib" )
++        SET(OSS_LIB_PATHS "${CMAKE_INSTALL_LIBDIR}/oss/lib" "/usr/local/lib${LIB_SUFFIX}/oss/lib" )
+     ENDIF(APPLE)
+ ENDIF(MINGW)
+ 
+ #Installation paths
+ # TODO remove data from path
+-SET(SYS_DATA_PATH "${CMAKE_INSTALL_PREFIX}/share/hydrogen/data")
++SET(SYS_DATA_PATH "${CMAKE_INSTALL_DATAROOTDIR}/hydrogen/data")
+ # TODO remove data from path, could be .config/hydrogen
+ SET(USR_DATA_PATH ".hydrogen/data")
+ 
+@@ -358,10 +360,10 @@ ELSE()
+ 	INSTALL(DIRECTORY data DESTINATION ${SYS_DATA_PATH}/.. PATTERN ".git" EXCLUDE)
+ ENDIF()
+ IF(NOT MINGW AND NOT APPLE)
+-	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.appdata.xml DESTINATION "${CMAKE_INSTALL_PREFIX}/share/appdata")
+-	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/applications")
+-	INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/img/gray/h2-icon.svg DESTINATION "/usr/share/pixmaps")
+-	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_PREFIX}/man/man1")
++	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.appdata.xml DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/appdata")
++	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.desktop DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications")
++	INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/img/gray/h2-icon.svg DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/pixmaps")
++	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_MANDIR}/man1")
+ ENDIF()
+ 
+ #
+diff --git a/src/cli/CMakeLists.txt b/src/cli/CMakeLists.txt
+index f6cd04eb..7725dc83 100644
+--- a/src/cli/CMakeLists.txt
++++ b/src/cli/CMakeLists.txt
+@@ -20,4 +20,4 @@ TARGET_LINK_LIBRARIES(h2cli
+ 
+ ADD_DEPENDENCIES(h2cli hydrogen-core-${VERSION})
+ 
+-INSTALL(TARGETS h2cli RUNTIME DESTINATION bin BUNDLE DESTINATION bin )
++INSTALL(TARGETS h2cli RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR})
+diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
+index db1333da..0ab61d96 100644
+--- a/src/core/CMakeLists.txt
++++ b/src/core/CMakeLists.txt
+@@ -57,13 +57,13 @@ TARGET_LINK_LIBRARIES(hydrogen-core-${VERSION}
+ #SET_TARGET_PROPERTIES(hydrogen-core-${VERSION} PROPERTIES PUBLIC_HEADER   "${hydrogen_INCLUDES}" )
+ 
+ INSTALL(TARGETS hydrogen-core-${VERSION}
+-    LIBRARY DESTINATION "lib${LIB_SUFFIX}"
+-    ARCHIVE DESTINATION "lib${LIB_SUFFIX}"
++    LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++    ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+     # do not copy directory hierarchy
+     #PUBLIC_HEADER DESTINATION include/hydrogen
+ )
+ 
+ IF(NOT APPLE AND NOT WIN32)
+     INSTALL(DIRECTORY include DESTINATION "${CMAKE_INSTALL_PREFIX}" FILES_MATCHING PATTERN "*.h" PATTERN ".svn" EXCLUDE)
+-    INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/include/hydrogen/config.h" DESTINATION "${CMAKE_INSTALL_PREFIX}/include/hydrogen" )
++    INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/include/hydrogen/config.h" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/hydrogen" )
+ ENDIF()
+diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
+index fb375e48..9cd18e6a 100644
+--- a/src/gui/CMakeLists.txt
++++ b/src/gui/CMakeLists.txt
+@@ -57,4 +57,4 @@ TARGET_LINK_LIBRARIES(hydrogen
+ qt5_use_modules(hydrogen Widgets)
+ ADD_DEPENDENCIES(hydrogen hydrogen-core-${VERSION})
+ 
+-INSTALL(TARGETS hydrogen RUNTIME DESTINATION bin BUNDLE DESTINATION bin )
++INSTALL(TARGETS hydrogen RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR})
+diff --git a/src/player/CMakeLists.txt b/src/player/CMakeLists.txt
+index 72c270f3..836fc5b4 100644
+--- a/src/player/CMakeLists.txt
++++ b/src/player/CMakeLists.txt
+@@ -16,4 +16,4 @@ TARGET_LINK_LIBRARIES(h2player
+ 
+ ADD_DEPENDENCIES(h2player hydrogen-core-${VERSION})
+ 
+-INSTALL(TARGETS h2player RUNTIME DESTINATION bin BUNDLE DESTINATION bin )
++INSTALL(TARGETS h2player RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR})
+-- 
+2.15.1
+
diff --git a/media-sound/hydrogen/hydrogen-9999.ebuild b/media-sound/hydrogen/hydrogen-9999.ebuild
new file mode 100644
index 000000000000..3d14fb4a6533
--- /dev/null
+++ b/media-sound/hydrogen/hydrogen-9999.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils git-r3 xdg-utils
+
+DESCRIPTION="Advanced drum machine"
+HOMEPAGE="http://www.hydrogen-music.org/"
+EGIT_REPO_URI="https://github.com/${PN}-music/${PN}"
+
+LICENSE="GPL-2 ZLIB"
+SLOT="0"
+KEYWORDS=""
+IUSE="alsa +archive jack ladspa lash osc oss portaudio portmidi pulseaudio"
+
+REQUIRED_USE="lash? ( alsa )"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	dev-qt/qtxmlpatterns:5
+	>=media-libs/libsndfile-1.0.18
+	alsa? ( media-libs/alsa-lib )
+	archive? ( app-arch/libarchive )
+	!archive? ( >=dev-libs/libtar-1.2.11-r3 )
+	jack? ( virtual/jack )
+	ladspa? ( media-libs/liblrdf )
+	lash? ( media-sound/lash )
+	osc? ( media-libs/liblo )
+	portaudio? ( media-libs/portaudio )
+	portmidi? ( media-libs/portmidi )
+	pulseaudio? ( media-sound/pulseaudio )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS ChangeLog DEVELOPERS README.txt )
+
+PATCHES=( "${FILESDIR}/${PN}-gnuinstalldirs.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DWANT_ALSA=$(usex alsa)
+		-DWANT_CPPUNIT=OFF
+		-DWANT_DEBUG=OFF
+		-DWANT_JACK=$(usex jack)
+		-DWANT_JACKSESSION=$(usex jack)
+		-DWANT_LADSPA=$(usex ladspa)
+		-DWANT_LASH=$(usex lash)
+		-DWANT_LIBARCHIVE=$(usex archive)
+		-DWANT_LRDF=$(usex ladspa)
+		-DWANT_OSC=$(usex osc)
+		-DWANT_OSS=$(usex oss)
+		-DWANT_PORTAUDIO=$(usex portaudio)
+		-DWANT_PORTMIDI=$(usex portmidi)
+		-DWANT_PULSEAUDIO=$(usex pulseaudio)
+		-DWANT_RUBBERBAND=OFF
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	dosym ../../${PN}/data/doc /usr/share/doc/${PF}/html
+}
+
+pkg_postinst() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/media-sound/hydrogen/metadata.xml b/media-sound/hydrogen/metadata.xml
index 3881dc28c758..972362fefd42 100644
--- a/media-sound/hydrogen/metadata.xml
+++ b/media-sound/hydrogen/metadata.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>proaudio@gentoo.org</email>
-    <name>Gentoo ProAudio Project</name>
-  </maintainer>
-  <use>
-    <flag name="archive">Use libarchive instead of libtar</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">hydrogen</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>proaudio@gentoo.org</email>
+		<name>Gentoo ProAudio Project</name>
+	</maintainer>
+	<use>
+		<flag name="archive">Use libarchive instead of libtar</flag>
+		<flag name="portmidi">Add portmidi support</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">hydrogen-music/hydrogen</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-sound/timidity++/Manifest b/media-sound/timidity++/Manifest
index ae89e7b033ed..da8824d683ff 100644
--- a/media-sound/timidity++/Manifest
+++ b/media-sound/timidity++/Manifest
@@ -12,5 +12,5 @@ AUX timidity.desktop.2 257 BLAKE2B 6c7f88a3ccd9fc4ea90cd228e6d04d799430a78361d6d
 AUX timidity.service 190 BLAKE2B 909311fae666b9970a8b4d56e1848f907ffeff1fc9e0cacc7a89027ec1ce6a555ea01570328d75425b006752d6332cf278642ec9a7c27b9c9adb2cb7621e241e SHA512 1022c1e37e2a97fba414673860ec89bc146da208981dd50d9486c525b47c74ae146acef2d75ceec26335c3ab98b2c928ce480a161637990ecd737507a6c21b49
 AUX timidity.xpm 1522 BLAKE2B 9aee528dbf843d992d548adc923f817373013760128ae96df7becb6bc844a95ddc056b072dbaea1528d9db5c2d4836b09f8316b740c75033fc23a0bb76186fab SHA512 1630fc235e450e5420c598357ad98eed6f04b1d1035fd6284dfeb2e633ce5d80135f89ea593d58b4eac2b9405383787e4d891b9c22ff8b5ac3ece64e9abe7d4e
 DIST TiMidity++-2.14.0.tar.xz 1356476 BLAKE2B 8d4a360d1c16b250f3bef7c010e1e263fdda13446437ff2454dc2c2a717246c4d27836a3b40586b12b33e175bc54ee211a3a1798005733461cf5833eda11811a SHA512 d8fc06fa36e4dd42de80c61943da4cd9aec5f8aaf31057a9ededa633d2d48e64c4e53391378d82a7a46ffe4f96c756b010ea9727270f80b134ae1f8bad535bd3
-EBUILD timidity++-2.14.0-r2.ebuild 5145 BLAKE2B 05022218b647af0e16d0491a12b4979f0b4124b767debba71f0f7eb7dbe2ff1b2ac38f52dbdf1b7aeb77e8d719e8aeeabc9ec19784b6a008b60bff0b4d08623d SHA512 2e1d66fb2550d4b86faedf802abd8eda33e32a60da473d5448acc36d8e08e50d507d68aceee8690fa8aed090fff60da50ae3ed6a92c5f608be7228877596ba0f
+EBUILD timidity++-2.14.0-r2.ebuild 5120 BLAKE2B ea61c55377c185c5b8f5ef21f65805903ab81a816932fe356d438bc91e06768ba93a2e0742079322aaef32870350999f1a8dac5898626e07b3c09cc00c4fdfd3 SHA512 331162f1be948e0ad0f8c3d05ace64d654991225cbb654957519b932ed4687a79234381bcdcf6ecd0cad9add9c3575b3d019d10f8725e76ffee8c2992a7ecf16
 MISC metadata.xml 331 BLAKE2B 0e52df0230422381a5982f075e39f00e982f9948a3d3309d183bbac93569d908fe3603082f11943fc35e3b8bd1c76bc131e7525c91e3aac5b7d9461093686f71 SHA512 b4559e92a59ba70b25863304bbdc59225c6ccbf3ee9ab8516db6987a19e8b5b7b6ea95f40c9ff55ed33c194ab174360d5f8fd6bfafa43290bb97a3a2093289e3
diff --git a/media-sound/timidity++/timidity++-2.14.0-r2.ebuild b/media-sound/timidity++/timidity++-2.14.0-r2.ebuild
index fe45d20fa484..355ec9f0d006 100644
--- a/media-sound/timidity++/timidity++-2.14.0-r2.ebuild
+++ b/media-sound/timidity++/timidity++-2.14.0-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=5
@@ -24,7 +24,7 @@ DEPEND="ncurses? ( >=sys-libs/ncurses-5 )
 	nas? ( >=media-libs/nas-1.4 )
 	alsa? ( media-libs/alsa-lib )
 	slang? ( sys-libs/slang )
-	jack? ( media-sound/jack-audio-connection-kit )
+	jack? ( virtual/jack )
 	vorbis? ( media-libs/libvorbis )
 	flac? ( media-libs/flac )
 	speex? ( media-libs/speex )
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index ad6a294b59fe..dc6f7b311ad2 100644
Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ
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 b1cbd84b40e1..c1aa9f2181f9 100644
Binary files a/metadata/Manifest.gz and b/metadata/Manifest.gz differ
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index bd71a0f44646..69b01d213f0e 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 01 Jan 2018 11:04:27 +0000
+Tue, 02 Jan 2018 10:09:39 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index fe080c66da4d..3046cbd2e4c4 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-01T11:04:31Z
+TIMESTAMP 2018-01-02T10:09:43Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlpKFb9fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlpLWmdfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDhcQ//fzRkGp2Yr5UL7ieN6nFat848BESHiUZyhIK/JGDCRwlX1pgZ3V+MqNW9
-v608ocNXJ8CjSyes65y3ybU0jvG3PAZe+Qy/+NEoeyqW8Ga8Pxe9K7OOKT04i9QX
-ZAbGVeEzkspuKR2W9Syye5taT5Fv88FxKyzEp4i8JGs7zHQa0EPzfg8PY6INeZGk
-HsjkDCndEpytKhXYC5aHu1NO9tiV0z6sSVqUPIqN+nAr2UdFD8sTfh97SEl6ITL5
-VSrbWDMgMgzb8KLYxtOZ1MTfbFQfS70vl+53nQdzrEtY5IRHM3KghrZCF2s4PDHv
-rrzZoPrWrPrrW9SScC7yiT3pwHaH6w7i90p81ZdXMTrj3KOYnKvktKr+Mh8ht17t
-eFfo5/3qyfxq855HIREUjEAwIG75RD0D9D+GerV+NcjNtKjw6TC4anzek8LqvX6F
-k06nBPT1FddvEsDnuDOXJKfaneLSj8ZWFhm7luMgs8wKJyGATqM5ODhMCnACkeKO
-hflbwVM++IhrKPqsU3cjZcC+9Ocjo7/0AtGqNolcK/0QHba7LhFAhMigM0V44ftn
-wXDEfUBXYf493deAMC06sugOwZXEgSIYYjYKVubpqcNaaqg7BOEDBCYk3mxtxDs9
-Zb5yqir6fTq/7+VpmoEhrJTp0V8kj0iqheTl1sRZL27ufR+R7xk=
-=Dgh6
+klD2Cg/+MLA/AHXLPcB2IQ8gPG9Xz7LhMLenUJksGsTsECjqzdeYgi43JIekm0L3
+LAuu8bMiiq2+w7lul7oTCdWNMqUDyElkPtjw9gqPiQe3mBBsTruI/ydSMWg6vFGe
+3GgXfPOfMSURP6zjQclV4XMpXZ47u8MgZIqsOJU/s5sbYhiRNXRbf9qA3N1kpi9m
+qdndedAz51MMklGkTgVw6TM07ap500+tIOZFqjgk2BbtXlcGn8i3VLg6MUJKG2Wf
+k4Z4u5x7fuNp5AGogIbj0pTEUhH3pARTZQatFej4f4uzn5iU/DnYmIp9FRmxDoDc
+RVkQkhwlY75JbhK+dY+ac6v/bgMH9pFTviGqv/DzaAo37oN/94hObSqGv+5p9cY5
+FNIhDAkyR+fEe8tIBd/Ij1Rneb34eFTKsHtCFl79HPpZi6xFSMKJ/otSCxaIaPCi
+pErnmNlzVVaz/WEQX8NSCxqRlKO2pAfkCa96wpFJRbhnZhgGSPlieRdLz3uoM3Iz
+E9vJUR6Q0eCHwl/mgbARCN/CO+TEQpJgADvxAsIVol/3tPOJrpioViXhr1cS3fx1
+9L9J/usm4HfnEsavDjkF5BQPhnyU7kx2CqFSUnVV839wfpmBeV5mYVfue9aGkUZT
+m9k9rKIoZH0OFNoDGB8F7h9Ng5VsEu3SsB/wRtXl8N4lPq+ZJh8=
+=Yd5Y
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 469000321fcb..69b01d213f0e 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Mon, 01 Jan 2018 11:04:28 +0000
+Tue, 02 Jan 2018 10:09:39 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index f335cb821bba..b8c53de6aab2 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 0d5d249bb208..74b373c3ceb5 100644
Binary files a/metadata/md5-cache/app-admin/Manifest.gz and b/metadata/md5-cache/app-admin/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/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..064cfeddca9d 100644
Binary files a/metadata/md5-cache/app-arch/Manifest.gz and b/metadata/md5-cache/app-arch/Manifest.gz differ
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
Binary files a/metadata/md5-cache/app-backup/Manifest.gz and b/metadata/md5-cache/app-backup/Manifest.gz differ
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
Binary files a/metadata/md5-cache/app-crypt/Manifest.gz and b/metadata/md5-cache/app-crypt/Manifest.gz differ
diff --git a/metadata/md5-cache/app-crypt/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-eselect/Manifest.gz b/metadata/md5-cache/app-eselect/Manifest.gz
index 14b520e95186..389d1d0571f1 100644
Binary files a/metadata/md5-cache/app-eselect/Manifest.gz and b/metadata/md5-cache/app-eselect/Manifest.gz differ
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-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index 3f3b88bea1d4..1712852ed758 100644
Binary files a/metadata/md5-cache/app-portage/Manifest.gz and b/metadata/md5-cache/app-portage/Manifest.gz differ
diff --git a/metadata/md5-cache/app-portage/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-20170321 b/metadata/md5-cache/app-portage/eclass-manpages-20170321
deleted file mode 100644
index fbd29cca8d0e..000000000000
--- a/metadata/md5-cache/app-portage/eclass-manpages-20170321
+++ /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-20170321.tar.xz
-_md5_=554c7e7bfef39700ef93f04c6e54e062
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-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-20170521 b/metadata/md5-cache/app-portage/eclass-manpages-20180101
similarity index 60%
rename from metadata/md5-cache/app-portage/eclass-manpages-20170521
rename to metadata/md5-cache/app-portage/eclass-manpages-20180101
index ca373526ee4f..2defd16dab99 100644
--- a/metadata/md5-cache/app-portage/eclass-manpages-20170521
+++ 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-20170521.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
Binary files a/metadata/md5-cache/app-shells/Manifest.gz and b/metadata/md5-cache/app-shells/Manifest.gz differ
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
Binary files a/metadata/md5-cache/app-text/Manifest.gz and b/metadata/md5-cache/app-text/Manifest.gz differ
diff --git a/metadata/md5-cache/app-text/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
Binary files a/metadata/md5-cache/dev-cpp/Manifest.gz and b/metadata/md5-cache/dev-cpp/Manifest.gz differ
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
Binary files a/metadata/md5-cache/dev-db/Manifest.gz and b/metadata/md5-cache/dev-db/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-db/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
Binary files a/metadata/md5-cache/dev-dotnet/Manifest.gz and b/metadata/md5-cache/dev-dotnet/Manifest.gz differ
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
Binary files a/metadata/md5-cache/dev-java/Manifest.gz and b/metadata/md5-cache/dev-java/Manifest.gz differ
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 890b046d1385..f5bcb8330585 100644
Binary files a/metadata/md5-cache/dev-libs/Manifest.gz and b/metadata/md5-cache/dev-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-libs/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/libcdio-2.0.0 b/metadata/md5-cache/dev-libs/libcdio-2.0.0
new file mode 100644
index 000000000000..159fbb070ab6
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libcdio-2.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!minimal? ( >=sys-libs/ncurses-5.7-r7:0= cddb? ( >=media-libs/libcddb-1.3.2 ) ) >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/sed sys-devel/gettext virtual/pkgconfig test? ( dev-lang/perl ) >=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 library to encapsulate CD-ROM reading and control
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/libcdio/
+IUSE=cddb +cxx minimal 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 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-3
+RDEPEND=!minimal? ( >=sys-libs/ncurses-5.7-r7:0= cddb? ( >=media-libs/libcddb-1.3.2 ) ) >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+SLOT=0/18
+SRC_URI=mirror://gnu/libcdio/libcdio-2.0.0.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=99e6ba479e2acd2f9a226853c40775da
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-php/Manifest.gz b/metadata/md5-cache/dev-php/Manifest.gz
index d9d29d185344..dc494f32efb7 100644
Binary files a/metadata/md5-cache/dev-php/Manifest.gz and b/metadata/md5-cache/dev-php/Manifest.gz differ
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 12784b150a51..68f8e74e2e50 100644
Binary files a/metadata/md5-cache/dev-python/Manifest.gz and b/metadata/md5-cache/dev-python/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-python/PySDL2-0.9.6 b/metadata/md5-cache/dev-python/PySDL2-0.9.6
new file mode 100644
index 000000000000..b45d4b5313de
--- /dev/null
+++ b/metadata/md5-cache/dev-python/PySDL2-0.9.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/pillow[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-libs/libsdl2[joystick,sound,video] media-libs/sdl2-gfx media-libs/sdl2-image media-libs/sdl2-mixer media-libs/sdl2-ttf ) 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 (ctypes) bindings for SDL2 libraries
+EAPI=6
+HOMEPAGE=https://github.com/marcusva/py-sdl2 https://pypi.python.org/pypi/PySDL2
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( public-domain CC0-1.0 ZLIB )
+RDEPEND=media-libs/libsdl2 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/PySDL2/PySDL2-0.9.6.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_=145944698a4bbe8a20de476a680a1cbe
diff --git a/metadata/md5-cache/dev-python/bcrypt-3.1.3 b/metadata/md5-cache/dev-python/bcrypt-3.1.3
index e9d3cf2e191b..4eda2cea3ce7 100644
--- a/metadata/md5-cache/dev-python/bcrypt-3.1.3
+++ b/metadata/md5-cache/dev-python/bcrypt-3.1.3
@@ -4,11 +4,11 @@ DESCRIPTION=Modern password hashing for software and servers
 EAPI=6
 HOMEPAGE=https://github.com/pyca/bcrypt/ https://pypi.python.org/pypi/bcrypt/
 IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm ~arm64 ia64 ppc ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ia64 ppc ppc64 ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python2_7? ( >=dev-python/cffi-1.1:=[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_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_4? ( >=dev-python/cffi-1.1:=[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_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_5? ( >=dev-python/cffi-1.1:=[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_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( >=dev-python/cffi-1.1:=[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_6(-)?,-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-2.6.0 ) >=dev-python/six-1.4.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !dev-python/py-bcrypt 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/b/bcrypt/bcrypt-3.1.3.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_=3abbcfc3818f0766c323488d9c28b3ca
+_md5_=e6bc546350b1c4996ec368597a1569a1
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/paramiko-2.2.1 b/metadata/md5-cache/dev-python/paramiko-2.2.1
index 0f29aafac753..8354d20a06fb 100644
--- a/metadata/md5-cache/dev-python/paramiko-2.2.1
+++ b/metadata/md5-cache/dev-python/paramiko-2.2.1
@@ -4,11 +4,11 @@ DESCRIPTION=SSH2 protocol library
 EAPI=6
 HOMEPAGE=http://www.paramiko.org/ https://github.com/paramiko/paramiko/ https://pypi.python.org/pypi/paramiko/
 IUSE=doc examples python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm64 ia64 ppc ppc64 x86
+KEYWORDS=amd64 ~arm64 ia64 ppc ppc64 ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-python/bcrypt-3.1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cryptography-1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pynacl-1.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyasn1-0.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 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/paramiko/paramiko-2.2.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_=a720f4059bdaa925109a1b25d17eb216
+_md5_=23f2bda3ca5c5f2691213c5354b963d7
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/pynacl-1.1.2 b/metadata/md5-cache/dev-python/pynacl-1.1.2
index 0f0630cb877f..ac38dca244bb 100644
--- a/metadata/md5-cache/dev-python/pynacl-1.1.2
+++ b/metadata/md5-cache/dev-python/pynacl-1.1.2
@@ -4,11 +4,11 @@ DESCRIPTION=Python binding to the Networking and Cryptography (NaCl) library
 EAPI=6
 HOMEPAGE=https://github.com/pyca/pynacl/ https://pypi.python.org/pypi/PyNaCl/
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 arm ~arm64 ia64 ppc ppc64 x86
+KEYWORDS=amd64 arm ~arm64 ia64 ppc ppc64 ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=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/cffi-1.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/libsodium:0/18 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/pyca/pynacl/archive/1.1.2.tar.gz -> pynacl-1.1.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_=8fe962025ba93baddde3195353bd1aa2
+_md5_=536c5564086039d8d9864a57f98324e6
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-python/pytest-qt-2.3.0 b/metadata/md5-cache/dev-python/pytest-qt-2.3.0
new file mode 100644
index 000000000000..0e11cefc04d7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytest-qt-2.3.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
+DESCRIPTION=pytest plugin for PyQt4 or PyQt5 applications
+EAPI=6
+HOMEPAGE=https://pypi.python.org/pypi/pytest-qt
+IUSE=doc python_targets_python2_7 python_targets_python3_5
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/pytest-2.7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] || ( dev-python/PyQt4 dev-python/PyQt5 ) doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/sphinx-py3doc-enhanced-theme[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/p/pytest-qt/pytest-qt-2.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_=8e015884927028c51b9d101c0d487977
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 18c6cd537f55..db9835704700 100644
Binary files a/metadata/md5-cache/dev-ruby/Manifest.gz and b/metadata/md5-cache/dev-ruby/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ruby/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-tex/Manifest.gz b/metadata/md5-cache/dev-tex/Manifest.gz
index fe387fbc1c0f..efb9659baf70 100644
Binary files a/metadata/md5-cache/dev-tex/Manifest.gz and b/metadata/md5-cache/dev-tex/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-tex/csindex-2.11c-r1 b/metadata/md5-cache/dev-tex/csindex-2.11c-r1
deleted file mode 100644
index b5e547b08480..000000000000
--- a/metadata/md5-cache/dev-tex/csindex-2.11c-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Utility for creating Czech/Slovak-sorted LaTeX index-files
-EAPI=3
-HOMEPAGE=http://math.feld.cvut.cz/olsak/cstex/
-KEYWORDS=amd64 x86
-LICENSE=MakeIndex
-SLOT=0
-SRC_URI=ftp://math.feld.cvut.cz/pub/cstex/base/csindex-19980713.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=bc6f9d6ce180a65dc45b95df35f68b6c
diff --git a/metadata/md5-cache/dev-tex/csindex-2.11c-r2 b/metadata/md5-cache/dev-tex/csindex-2.11c-r2
new file mode 100644
index 000000000000..b12781802643
--- /dev/null
+++ b/metadata/md5-cache/dev-tex/csindex-2.11c-r2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=Utility for creating Czech/Slovak-sorted LaTeX index-files
+EAPI=6
+HOMEPAGE=http://math.feld.cvut.cz/olsak/cstex/
+KEYWORDS=amd64 x86
+LICENSE=MakeIndex
+SLOT=0
+SRC_URI=ftp://math.feld.cvut.cz/pub/cstex/base/csindex-19980713.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=0fcd656b6919f944995114834b919330
diff --git a/metadata/md5-cache/dev-tex/feynmf-1.08-r5 b/metadata/md5-cache/dev-tex/feynmf-1.08-r6
similarity index 57%
rename from metadata/md5-cache/dev-tex/feynmf-1.08-r5
rename to metadata/md5-cache/dev-tex/feynmf-1.08-r6
index a1fefe4b7fc1..b707df23ca04 100644
--- a/metadata/md5-cache/dev-tex/feynmf-1.08-r5
+++ b/metadata/md5-cache/dev-tex/feynmf-1.08-r6
@@ -1,7 +1,7 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEFINED_PHASES=compile install postinst postrm prepare
 DEPEND=dev-texlive/texlive-metapost dev-lang/perl doc? ( dev-texlive/texlive-bibtexextra ) virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=Combined LaTeX/Metafont package for drawing of Feynman diagrams
-EAPI=5
+EAPI=6
 HOMEPAGE=http://www.ctan.org/tex-archive/macros/latex/contrib/feynmf/
 IUSE=doc
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-texlive/texlive-metapost virtual/latex-base
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/feynmf-1.08.tar.gz doc? ( https://dev.gentoo.org/~ulm/distfiles/feynmf-cnl.tar.gz )
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	latex-package	79acad19b9efeec616d0ad70cd117b03	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=fd1bb2d1613f2cbe01bd0b1cb5931ae1
+_eclasses_=latex-package	79acad19b9efeec616d0ad70cd117b03
+_md5_=5cb5422fd1761899cc803893ec0dadf5
diff --git a/metadata/md5-cache/dev-tex/floatflt-1.31a b/metadata/md5-cache/dev-tex/floatflt-1.31a
deleted file mode 100644
index f5ffd062dac2..000000000000
--- a/metadata/md5-cache/dev-tex/floatflt-1.31a
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=app-arch/unzip virtual/latex-base >=sys-apps/texinfo-4.2-r5
-DESCRIPTION=LaTeX package used to warp text around figures
-EAPI=3
-HOMEPAGE=http://www.ctan.org/tex-archive/macros/latex/contrib/floatflt/
-KEYWORDS=~amd64 hppa ~x86
-LICENSE=LPPL-1.2
-RDEPEND=virtual/latex-base
-SLOT=0
-SRC_URI=mirror://gentoo/floatflt-1.31a.zip
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	latex-package	79acad19b9efeec616d0ad70cd117b03	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=c4c31c85784a79fa1d1396ec476455b3
diff --git a/metadata/md5-cache/dev-tex/floatflt-1.31a-r1 b/metadata/md5-cache/dev-tex/floatflt-1.31a-r1
new file mode 100644
index 000000000000..affd290c6407
--- /dev/null
+++ b/metadata/md5-cache/dev-tex/floatflt-1.31a-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm
+DEPEND=app-arch/unzip virtual/latex-base >=sys-apps/texinfo-4.2-r5
+DESCRIPTION=LaTeX package used to warp text around figures
+EAPI=6
+HOMEPAGE=http://www.ctan.org/tex-archive/macros/latex/contrib/floatflt/
+KEYWORDS=~amd64 hppa ~x86
+LICENSE=LPPL-1.2
+RDEPEND=virtual/latex-base
+SLOT=0
+SRC_URI=mirror://gentoo/floatflt-1.31a.zip
+_eclasses_=latex-package	79acad19b9efeec616d0ad70cd117b03
+_md5_=960205806dfb6a41c56d60ffd6c265ae
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 156048a6a27c..0ab27c29f773 100644
Binary files a/metadata/md5-cache/dev-util/Manifest.gz and b/metadata/md5-cache/dev-util/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-util/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.3.0_p20170913 b/metadata/md5-cache/dev-util/bcc-0.3.0_p20170913
deleted file mode 100644
index d7904c7a39f8..000000000000
--- a/metadata/md5-cache/dev-util/bcc-0.3.0_p20170913
+++ /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/488c119ee7aa7598c11be876acd6761342874e68.tar.gz -> bcc-0.3.0_p20170913.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
diff --git a/metadata/md5-cache/dev-util/bcc-0.4.0 b/metadata/md5-cache/dev-util/bcc-0.5.0_p20171230
similarity index 94%
rename from metadata/md5-cache/dev-util/bcc-0.4.0
rename to metadata/md5-cache/dev-util/bcc-0.5.0_p20171230
index e020362be6bc..2785d2775fa1 100644
--- a/metadata/md5-cache/dev-util/bcc-0.4.0
+++ 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/v0.4.0.tar.gz -> bcc-0.4.0.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_=b10e269cf72de9e8abe1987f1527f649
+_md5_=6470111f1a62480aaef2636b6995a81b
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/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index 2ec752754e94..fc53c74a6249 100644
Binary files a/metadata/md5-cache/dev-vcs/Manifest.gz and b/metadata/md5-cache/dev-vcs/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-vcs/colorcvs-1.4-r1 b/metadata/md5-cache/dev-vcs/colorcvs-1.4-r1
deleted file mode 100644
index 1fba27381d95..000000000000
--- a/metadata/md5-cache/dev-vcs/colorcvs-1.4-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst prepare
-DESCRIPTION=A tool based on colorgcc to beautify cvs output
-EAPI=3
-HOMEPAGE=https://packages.gentoo.org/package/dev-vcs/colorcvs
-KEYWORDS=amd64 ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl dev-vcs/cvs
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~jlec/distfiles/colorcvs-1.4.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=c8103cf863278ec73505323b94b71fc6
diff --git a/metadata/md5-cache/dev-vcs/colorcvs-1.4-r2 b/metadata/md5-cache/dev-vcs/colorcvs-1.4-r2
new file mode 100644
index 000000000000..4ab2ed8948ad
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/colorcvs-1.4-r2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst prepare
+DESCRIPTION=A tool based on colorgcc to beautify cvs output
+EAPI=6
+HOMEPAGE=https://packages.gentoo.org/package/dev-vcs/colorcvs
+KEYWORDS=amd64 ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=GPL-2
+RDEPEND=dev-lang/perl dev-vcs/cvs
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~jlec/distfiles/colorcvs-1.4.tar.bz2
+_eclasses_=prefix	e51c7882b7b721e54e684f7eb143cbfe
+_md5_=4b6e886bb0c901873c200669918a877b
diff --git a/metadata/md5-cache/games-emulation/Manifest.gz b/metadata/md5-cache/games-emulation/Manifest.gz
index fff1c4f6068a..3dc7bd5d7519 100644
Binary files a/metadata/md5-cache/games-emulation/Manifest.gz and b/metadata/md5-cache/games-emulation/Manifest.gz differ
diff --git a/metadata/md5-cache/games-emulation/m64py-0.2.4 b/metadata/md5-cache/games-emulation/m64py-0.2.4
new file mode 100644
index 000000000000..80d9509603ad
--- /dev/null
+++ b/metadata/md5-cache/games-emulation/m64py-0.2.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=A frontend for Mupen64Plus
+EAPI=6
+HOMEPAGE=http://m64py.sourceforge.net/
+IUSE=7z rar python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3 LGPL-3 public-domain GPL-2 BSD CC-BY-SA-3.0
+RDEPEND=dev-python/PyQt5[gui,opengl,widgets,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/PySDL2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-libs/libsdl2[joystick,video] >=games-emulation/mupen64plus-core-2.5:0/2-sdl2 7z? ( || ( dev-python/pylzma[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(-)] app-arch/p7zip ) ) rar? ( || ( dev-python/rarfile[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(-)] app-arch/unrar app-arch/rar ) ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://sourceforge/m64py/m64py-0.2.4.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_=b1a697928c0e47dda3c429abbbc7e401
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index 4c3bc17d8884..4879cadf4297 100644
Binary files a/metadata/md5-cache/mail-client/Manifest.gz and b/metadata/md5-cache/mail-client/Manifest.gz differ
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/mail-client/novell-groupwise-client-8.0.2.96933 b/metadata/md5-cache/mail-client/novell-groupwise-client-8.0.2.96933
index 05cee32cc9cc..fe70143993a0 100644
--- a/metadata/md5-cache/mail-client/novell-groupwise-client-8.0.2.96933
+++ b/metadata/md5-cache/mail-client/novell-groupwise-client-8.0.2.96933
@@ -6,8 +6,8 @@ HOMEPAGE=http://www.novell.com/products/groupwise/
 KEYWORDS=~amd64 ~x86
 LICENSE=all-rights-reserved
 RDEPEND=sys-libs/libstdc++-v3 >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXau-1.0.8[abi_x86_32(-)] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32(-)] >=x11-libs/libXext-1.3.3[abi_x86_32(-)] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)] >=x11-libs/libXi-1.7.4[abi_x86_32(-)] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)] >=x11-libs/libXtst-1.2.2[abi_x86_32(-)] >=x11-libs/libxcb-1.11-r1[abi_x86_32(-)] x11-libs/motif:2.2[abi_x86_32(-)] >=media-libs/alsa-lib-1.0.28[abi_x86_32(-)] >=media-libs/freetype-2.5.5[abi_x86_32(-)]
-RESTRICT=binchecks fetch mirror strip
+RESTRICT=fetch mirror strip
 SLOT=0
 SRC_URI=gw802_hp3_client_linux_multi.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=c0fa7a46c4113a1740f1eb68fe48d4a0
+_md5_=9e84fa2a27938a578394bdeb19fb0676
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 378b99e8207b..c60bac9d5a61 100644
Binary files a/metadata/md5-cache/media-gfx/Manifest.gz and b/metadata/md5-cache/media-gfx/Manifest.gz differ
diff --git a/metadata/md5-cache/media-gfx/geeqie-1.4 b/metadata/md5-cache/media-gfx/geeqie-1.4
new file mode 100644
index 000000000000..a5d36dc9ab62
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/geeqie-1.4
@@ -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 ) 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 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 ) 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_=903369af8d26f6d1c292e12ca8c263db
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/maim-9999 b/metadata/md5-cache/media-gfx/maim-9999
new file mode 100644
index 000000000000..c80606045d29
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/maim-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=media-libs/libpng:0= virtual/jpeg:0 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXrender x11-misc/slop:= unicode? ( dev-libs/icu:= ) sys-devel/make >=dev-util/cmake-3.7.2 >=dev-vcs/git-1.8.2.1
+DESCRIPTION=Commandline tool to take screenshots of the desktop
+EAPI=6
+HOMEPAGE=https://github.com/naelstrof/maim
+IUSE=unicode
+LICENSE=GPL-3
+RDEPEND=media-libs/libpng:0= virtual/jpeg:0 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXrender x11-misc/slop:= unicode? ( dev-libs/icu:= )
+SLOT=0
+_eclasses_=cmake-utils	77a5a8d3308359caadcdd91688f20093	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=981ab3ffb54aacf4bc58b522315c0cdd
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index a926dd8f80e4..24047550e511 100644
Binary files a/metadata/md5-cache/media-libs/Manifest.gz and b/metadata/md5-cache/media-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/media-libs/bio2jack-0.9-r2 b/metadata/md5-cache/media-libs/bio2jack-0.9-r2
new file mode 100644
index 000000000000..71ec08570edf
--- /dev/null
+++ b/metadata/md5-cache/media-libs/bio2jack-0.9-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=media-libs/libsamplerate virtual/jack virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A library for porting blocked I/O OSS/ALSA audio applications to JACK
+EAPI=6
+HOMEPAGE=http://bio2jack.sourceforge.net/
+IUSE=static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=GPL-2
+RDEPEND=media-libs/libsamplerate virtual/jack
+SLOT=0
+SRC_URI=mirror://sourceforge/bio2jack/bio2jack-0.9.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=411c35946207fca6b1c4ff8956206ea0
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/stk-4.5.1-r1 b/metadata/md5-cache/media-libs/stk-4.5.1-r1
new file mode 100644
index 000000000000..10bce9a882dd
--- /dev/null
+++ b/metadata/md5-cache/media-libs/stk-4.5.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack ) virtual/pkgconfig dev-lang/perl >=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=Synthesis ToolKit in C++
+EAPI=6
+HOMEPAGE=http://ccrma.stanford.edu/software/stk/
+IUSE=alsa debug doc jack oss static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack )
+SLOT=0
+SRC_URI=http://ccrma.stanford.edu/software/stk/release/stk-4.5.1.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=42d3dd83061ac0a058e1874da999073f
diff --git a/metadata/md5-cache/media-radio/Manifest.gz b/metadata/md5-cache/media-radio/Manifest.gz
index 0c9d42e00ef5..7e719f542751 100644
Binary files a/metadata/md5-cache/media-radio/Manifest.gz and b/metadata/md5-cache/media-radio/Manifest.gz differ
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 ecd96168d225..d3b86cb7b261 100644
Binary files a/metadata/md5-cache/media-sound/Manifest.gz and b/metadata/md5-cache/media-sound/Manifest.gz differ
diff --git a/metadata/md5-cache/media-sound/alsaplayer-0.99.81-r1 b/metadata/md5-cache/media-sound/alsaplayer-0.99.81-r1
new file mode 100644
index 000000000000..9f853fbcd22c
--- /dev/null
+++ b/metadata/md5-cache/media-sound/alsaplayer-0.99.81-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=media-libs/libsndfile:= sys-libs/zlib:= alsa? ( media-libs/alsa-lib ) audiofile? ( media-libs/audiofile ) flac? ( media-libs/flac ) gtk? ( >=x11-libs/gtk+-2.10:2 ) id3tag? ( media-libs/libid3tag ) jack? ( virtual/jack ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod:0 ) nas? ( media-libs/nas ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl ) vorbis? ( media-libs/libvorbis ) xosd? ( x11-libs/xosd ) virtual/pkgconfig doc? ( app-doc/doxygen ) nls? ( sys-devel/gettext ) oss? ( virtual/os-headers ) >=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 heavily multi-threaded pluggable audio player
+EAPI=6
+HOMEPAGE=http://www.alsaplayer.org/
+IUSE=+alsa audiofile doc flac gtk id3tag jack mad mikmod nas nls ogg opengl oss vorbis xosd
+KEYWORDS=~amd64 ~mips ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsndfile:= sys-libs/zlib:= alsa? ( media-libs/alsa-lib ) audiofile? ( media-libs/audiofile ) flac? ( media-libs/flac ) gtk? ( >=x11-libs/gtk+-2.10:2 ) id3tag? ( media-libs/libid3tag ) jack? ( virtual/jack ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod:0 ) nas? ( media-libs/nas ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl ) vorbis? ( media-libs/libvorbis ) xosd? ( x11-libs/xosd )
+REQUIRED_USE=|| ( alsa jack nas oss )
+SLOT=0
+SRC_URI=http://www.alsaplayer.org/alsaplayer-0.99.81.tar.bz2
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=e04e1e6de036285d9c8070228fa28223
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-sound/hydrogen-9999 b/metadata/md5-cache/media-sound/hydrogen-9999
new file mode 100644
index 000000000000..86279c2fa3e6
--- /dev/null
+++ b/metadata/md5-cache/media-sound/hydrogen-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 >=media-libs/libsndfile-1.0.18 alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive ) !archive? ( >=dev-libs/libtar-1.2.11-r3 ) jack? ( virtual/jack ) ladspa? ( media-libs/liblrdf ) lash? ( media-sound/lash ) osc? ( media-libs/liblo ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 >=dev-vcs/git-1.8.2.1
+DESCRIPTION=Advanced drum machine
+EAPI=6
+HOMEPAGE=http://www.hydrogen-music.org/
+IUSE=alsa +archive jack ladspa lash osc oss portaudio portmidi pulseaudio
+LICENSE=GPL-2 ZLIB
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 >=media-libs/libsndfile-1.0.18 alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive ) !archive? ( >=dev-libs/libtar-1.2.11-r3 ) jack? ( virtual/jack ) ladspa? ( media-libs/liblrdf ) lash? ( media-sound/lash ) osc? ( media-libs/liblo ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio )
+REQUIRED_USE=lash? ( alsa )
+SLOT=0
+_eclasses_=cmake-utils	77a5a8d3308359caadcdd91688f20093	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=636619dc09b39a4f9969da653056501c
diff --git a/metadata/md5-cache/media-sound/timidity++-2.14.0-r2 b/metadata/md5-cache/media-sound/timidity++-2.14.0-r2
index 2712de96ef6c..e87c056e57fb 100644
--- a/metadata/md5-cache/media-sound/timidity++-2.14.0-r2
+++ b/metadata/md5-cache/media-sound/timidity++-2.14.0-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm prepare setup
-DEPEND=ncurses? ( >=sys-libs/ncurses-5 ) emacs? ( virtual/emacs ) gtk? ( x11-libs/gtk+:2 ) tk? ( >=dev-lang/tk-8.5.13 ) nas? ( >=media-libs/nas-1.4 ) alsa? ( media-libs/alsa-lib ) slang? ( sys-libs/slang ) jack? ( media-sound/jack-audio-connection-kit ) vorbis? ( media-libs/libvorbis ) flac? ( media-libs/flac ) speex? ( media-libs/speex ) ao? ( >=media-libs/libao-0.8.5 ) motif? ( >=x11-libs/motif-2.3:0 ) X? ( x11-libs/libXaw x11-libs/libXext >=media-libs/libpng-1.4.2 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEPEND=ncurses? ( >=sys-libs/ncurses-5 ) emacs? ( virtual/emacs ) gtk? ( x11-libs/gtk+:2 ) tk? ( >=dev-lang/tk-8.5.13 ) nas? ( >=media-libs/nas-1.4 ) alsa? ( media-libs/alsa-lib ) slang? ( sys-libs/slang ) jack? ( virtual/jack ) vorbis? ( media-libs/libvorbis ) flac? ( media-libs/flac ) speex? ( media-libs/speex ) ao? ( >=media-libs/libao-0.8.5 ) motif? ( >=x11-libs/motif-2.3:0 ) X? ( x11-libs/libXaw x11-libs/libXext >=media-libs/libpng-1.4.2 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DESCRIPTION=A handy MIDI to WAV converter with OSS and ALSA output support
 EAPI=5
 HOMEPAGE=http://timidity.sourceforge.net/
@@ -7,8 +7,8 @@ IUSE=motif oss nas X gtk vorbis tk slang alsa jack emacs ao selinux speex flac n
 KEYWORDS=amd64 arm ~arm64 hppa ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 PDEPEND=|| ( media-sound/timidity-eawpatches media-sound/timidity-freepats )
-RDEPEND=ncurses? ( >=sys-libs/ncurses-5 ) emacs? ( virtual/emacs ) gtk? ( x11-libs/gtk+:2 ) tk? ( >=dev-lang/tk-8.5.13 ) nas? ( >=media-libs/nas-1.4 ) alsa? ( media-libs/alsa-lib ) slang? ( sys-libs/slang ) jack? ( media-sound/jack-audio-connection-kit ) vorbis? ( media-libs/libvorbis ) flac? ( media-libs/flac ) speex? ( media-libs/speex ) ao? ( >=media-libs/libao-0.8.5 ) motif? ( >=x11-libs/motif-2.3:0 ) X? ( x11-libs/libXaw x11-libs/libXext >=media-libs/libpng-1.4.2 ) alsa? ( media-sound/alsa-utils ) app-eselect/eselect-timidity selinux? ( sec-policy/selinux-timidity )
+RDEPEND=ncurses? ( >=sys-libs/ncurses-5 ) emacs? ( virtual/emacs ) gtk? ( x11-libs/gtk+:2 ) tk? ( >=dev-lang/tk-8.5.13 ) nas? ( >=media-libs/nas-1.4 ) alsa? ( media-libs/alsa-lib ) slang? ( sys-libs/slang ) jack? ( virtual/jack ) vorbis? ( media-libs/libvorbis ) flac? ( media-libs/flac ) speex? ( media-libs/speex ) ao? ( >=media-libs/libao-0.8.5 ) motif? ( >=x11-libs/motif-2.3:0 ) X? ( x11-libs/libXaw x11-libs/libXext >=media-libs/libpng-1.4.2 ) alsa? ( media-sound/alsa-utils ) app-eselect/eselect-timidity selinux? ( sec-policy/selinux-timidity )
 SLOT=0
 SRC_URI=mirror://sourceforge/timidity/TiMidity++-2.14.0.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=113b4185784eaeee06b3fa706869184b
+_md5_=563276590a12b769f01bbcd9201857e1
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index d4e94e979d00..e50450ef455e 100644
Binary files a/metadata/md5-cache/media-video/Manifest.gz and b/metadata/md5-cache/media-video/Manifest.gz differ
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-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index a7a9ec167246..f36b61ecf17a 100644
Binary files a/metadata/md5-cache/net-dns/Manifest.gz and b/metadata/md5-cache/net-dns/Manifest.gz differ
diff --git a/metadata/md5-cache/net-dns/ldns-utils-1.6.12 b/metadata/md5-cache/net-dns/ldns-utils-1.6.12
deleted file mode 100644
index 49996250ea58..000000000000
--- a/metadata/md5-cache/net-dns/ldns-utils-1.6.12
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=net-libs/ldns-1.6.12[gost?,ssl?] examples? ( net-libs/libpcap ) >=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=Set of utilities to simplify various dns(sec) tasks
-EAPI=3
-HOMEPAGE=http://www.nlnetlabs.nl/projects/ldns/
-IUSE=examples gost ssl
-KEYWORDS=amd64 ppc x86
-LICENSE=BSD
-RDEPEND=>=net-libs/ldns-1.6.12[gost?,ssl?] examples? ( net-libs/libpcap )
-SLOT=0
-SRC_URI=http://www.nlnetlabs.nl/downloads/ldns/ldns-1.6.12.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=f8f152d93403737a2fa189adad1fb83c
diff --git a/metadata/md5-cache/net-firewall/Manifest.gz b/metadata/md5-cache/net-firewall/Manifest.gz
index b46ae3b0fbe6..4cf0360df950 100644
Binary files a/metadata/md5-cache/net-firewall/Manifest.gz and b/metadata/md5-cache/net-firewall/Manifest.gz differ
diff --git a/metadata/md5-cache/net-firewall/shorewall-5.1.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
Binary files a/metadata/md5-cache/net-ftp/Manifest.gz and b/metadata/md5-cache/net-ftp/Manifest.gz differ
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
Binary files a/metadata/md5-cache/net-im/Manifest.gz and b/metadata/md5-cache/net-im/Manifest.gz differ
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
Binary files a/metadata/md5-cache/net-libs/Manifest.gz and b/metadata/md5-cache/net-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/net-libs/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 44c2acc8f407..73cd81ff960e 100644
Binary files a/metadata/md5-cache/net-misc/Manifest.gz and b/metadata/md5-cache/net-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/net-misc/aget-0.4.1-r1 b/metadata/md5-cache/net-misc/aget-0.4.1-r1
deleted file mode 100644
index a3f4b52505d3..000000000000
--- a/metadata/md5-cache/net-misc/aget-0.4.1-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=multithreaded HTTP download accelerator
-EAPI=3
-HOMEPAGE=http://www.enderunix.org/aget/
-KEYWORDS=amd64 ~arm ~mips ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-SLOT=0
-SRC_URI=http://www.enderunix.org/aget/aget-0.4.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=8dbd59fe2eeaa89c75cb3069a3ebc57e
diff --git a/metadata/md5-cache/net-misc/aget-0.4.1-r2 b/metadata/md5-cache/net-misc/aget-0.4.1-r2
new file mode 100644
index 000000000000..f169daaa9c0e
--- /dev/null
+++ b/metadata/md5-cache/net-misc/aget-0.4.1-r2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=multithreaded HTTP download accelerator
+EAPI=6
+HOMEPAGE=http://www.enderunix.org/aget/
+KEYWORDS=amd64 ~arm ~mips ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+SLOT=0
+SRC_URI=http://www.enderunix.org/aget/aget-0.4.1.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=cbb78b89261fc4dbf3680612e21c981f
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/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/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
similarity index 58%
rename from metadata/md5-cache/net-misc/icaclient-13.6.0.10243651
rename to 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/ipsvd-1.0.0-r1 b/metadata/md5-cache/net-misc/ipsvd-1.0.0-r2
similarity index 85%
rename from metadata/md5-cache/net-misc/ipsvd-1.0.0-r1
rename to metadata/md5-cache/net-misc/ipsvd-1.0.0-r2
index c6ba1cf96004..21bfdc3e4377 100644
--- a/metadata/md5-cache/net-misc/ipsvd-1.0.0-r1
+++ b/metadata/md5-cache/net-misc/ipsvd-1.0.0-r2
@@ -1,6 +1,6 @@
-DEFINED_PHASES=compile configure install prepare
+DEFINED_PHASES=compile configure install
 DESCRIPTION=ipsvd is a set of internet protocol service daemons for Unix
-EAPI=3
+EAPI=6
 HOMEPAGE=http://smarden.org/ipsvd/
 IUSE=static
 KEYWORDS=~amd64 ~x86
@@ -8,4 +8,4 @@ LICENSE=BSD
 SLOT=0
 SRC_URI=http://smarden.org/ipsvd/ipsvd-1.0.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=9f486f5cb51274692f0cddf716a36441
+_md5_=437de6e49b241f0975c8d98d25cd1398
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/ocsync-0.90.4 b/metadata/md5-cache/net-misc/ocsync-0.90.4
deleted file mode 100644
index 80b497f956e6..000000000000
--- a/metadata/md5-cache/net-misc/ocsync-0.90.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-text/asciidoc doc? ( app-doc/doxygen ) test? ( dev-libs/check dev-util/cmocka ) sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=A file synchronizer especially designed for you, the normal user
-EAPI=5
-HOMEPAGE=http://csync.org/
-IUSE=doc iconv samba +sftp test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-db/sqlite:3 >=dev-libs/iniparser-3.1:0 net-libs/neon[ssl] iconv? ( virtual/libiconv ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh ) !net-misc/csync !>=net-misc/owncloud-client-1.5.1
-RESTRICT=test
-SLOT=0
-SRC_URI=http://download.owncloud.com/download/ocsync-0.90.4.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_=819524495bd990f77604033adb16892f
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-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index e0f81107a134..3af3d9899788 100644
Binary files a/metadata/md5-cache/net-vpn/Manifest.gz and b/metadata/md5-cache/net-vpn/Manifest.gz differ
diff --git a/metadata/md5-cache/net-vpn/tor-0.3.1.9-r1 b/metadata/md5-cache/net-vpn/tor-0.3.1.9-r1
index 4b658a2781c6..7663ebdc70f2 100644
--- a/metadata/md5-cache/net-vpn/tor-0.3.1.9-r1
+++ b/metadata/md5-cache/net-vpn/tor-0.3.1.9-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Anonymizing overlay network for TCP
 EAPI=6
 HOMEPAGE=http://www.torproject.org/
 IUSE=libressl lzma scrypt seccomp selinux systemd tor-hardening test web zstd
-KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~ppc-macos
+KEYWORDS=amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~ppc-macos
 LICENSE=BSD GPL-2
 RDEPEND=app-text/asciidoc dev-libs/libevent[ssl] sys-libs/zlib !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( sys-libs/libseccomp ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd ) selinux? ( sec-policy/selinux-tor )
 SLOT=0
 SRC_URI=https://www.torproject.org/dist/tor-0.3.1.9.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.3.1.9.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=490f3ee7acba41adb0e03638a85f8c75
+_md5_=fb893ea34d30aadab44b8ee4ab4d56a3
diff --git a/metadata/md5-cache/sci-biology/Manifest.gz b/metadata/md5-cache/sci-biology/Manifest.gz
index 9c3ee7eba49b..251fb9000024 100644
Binary files a/metadata/md5-cache/sci-biology/Manifest.gz and b/metadata/md5-cache/sci-biology/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-biology/arb-5.1-r1 b/metadata/md5-cache/sci-biology/arb-5.1-r1
deleted file mode 100644
index 625b6db40deb..000000000000
--- a/metadata/md5-cache/sci-biology/arb-5.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare unpack
-DEPEND=app-text/sablotron media-libs/libpng media-libs/tiff www-client/lynx x11-libs/libXaw x11-libs/libXpm x11-libs/motif:0 opengl? ( media-libs/glew media-libs/freeglut || ( media-libs/mesa[motif] ( media-libs/mesa x11-libs/libGLw ) ) )
-DESCRIPTION=Tools for DNA/RNA sequence database handling and phylogenetic analysis
-EAPI=2
-HOMEPAGE=http://www.arb-home.de/
-IUSE=+opengl
-KEYWORDS=~amd64 ~x86
-LICENSE=arb
-RDEPEND=app-text/sablotron media-libs/libpng media-libs/tiff www-client/lynx x11-libs/libXaw x11-libs/libXpm x11-libs/motif:0 opengl? ( media-libs/glew media-libs/freeglut || ( media-libs/mesa[motif] ( media-libs/mesa x11-libs/libGLw ) ) ) sci-visualization/gnuplot
-SLOT=0
-SRC_URI=http://download.arb-home.de/release/arb_5.1/arbsrc.tgz -> arb-5.1.tgz mirror://gentoo/arb-5.1-glibc2.10.patch.bz2 https://dev.gentoo.org/~jlec/arb-5.1-linker.patch.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=55cafcf3d37a81cfa2273ca02c35bb00
diff --git a/metadata/md5-cache/sci-biology/arb-5.2 b/metadata/md5-cache/sci-biology/arb-5.2
deleted file mode 100644
index 813841fafc1b..000000000000
--- a/metadata/md5-cache/sci-biology/arb-5.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare unpack
-DEPEND=app-text/sablotron media-libs/libpng media-libs/tiff www-client/lynx x11-libs/libXaw x11-libs/libXpm x11-libs/motif:0 opengl? ( media-libs/glew media-libs/freeglut || ( media-libs/mesa[motif] ( media-libs/mesa x11-libs/libGLw ) ) ) sys-process/time
-DESCRIPTION=Tools for DNA/RNA sequence database handling and phylogenetic analysis
-EAPI=4
-HOMEPAGE=http://www.arb-home.de/
-IUSE=+opengl
-KEYWORDS=~amd64 ~x86
-LICENSE=arb
-RDEPEND=app-text/sablotron media-libs/libpng media-libs/tiff www-client/lynx x11-libs/libXaw x11-libs/libXpm x11-libs/motif:0 opengl? ( media-libs/glew media-libs/freeglut || ( media-libs/mesa[motif] ( media-libs/mesa x11-libs/libGLw ) ) ) sci-visualization/gnuplot
-SLOT=0
-SRC_URI=http://download.arb-home.de/release/arb_5.2/arbsrc.tgz -> arb-5.2.tgz https://dev.gentoo.org/~jlec/distfiles/arb-5.2-linker.patch.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=f0ab0e2c5ca080655274968b7915db12
diff --git a/metadata/md5-cache/sci-biology/arb-5.3 b/metadata/md5-cache/sci-biology/arb-5.3
deleted file mode 100644
index fe5d50cf7ffd..000000000000
--- a/metadata/md5-cache/sci-biology/arb-5.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare unpack
-DEPEND=app-text/sablotron media-libs/libpng media-libs/tiff www-client/lynx x11-libs/libXaw x11-libs/libXpm x11-libs/motif:0 opengl? ( media-libs/glew media-libs/freeglut || ( media-libs/mesa[motif] ( media-libs/mesa x11-libs/libGLw ) ) ) sys-process/time
-DESCRIPTION=Tools for DNA/RNA sequence database handling and phylogenetic analysis
-EAPI=4
-HOMEPAGE=http://www.arb-home.de/
-IUSE=+opengl
-KEYWORDS=~amd64 ~x86
-LICENSE=arb
-RDEPEND=app-text/sablotron media-libs/libpng media-libs/tiff www-client/lynx x11-libs/libXaw x11-libs/libXpm x11-libs/motif:0 opengl? ( media-libs/glew media-libs/freeglut || ( media-libs/mesa[motif] ( media-libs/mesa x11-libs/libGLw ) ) ) sci-visualization/gnuplot
-SLOT=0
-SRC_URI=http://download.arb-home.de/release/arb_5.3/arbsrc.tgz -> arb-5.3.tgz https://dev.gentoo.org/~jlec/distfiles/arb-5.3-linker.patch.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=bf2908058bcd4bfbaa7c0eb481d7c999
diff --git a/metadata/md5-cache/sci-biology/fasta-35.4.10 b/metadata/md5-cache/sci-biology/fasta-35.4.10
deleted file mode 100644
index 31459ccae2a6..000000000000
--- a/metadata/md5-cache/sci-biology/fasta-35.4.10
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=test? ( app-shells/tcsh )
-DESCRIPTION=FASTA is a DNA and Protein sequence alignment software package
-EAPI=2
-HOMEPAGE=http://fasta.bioch.virginia.edu/fasta_www2/fasta_down.shtml
-IUSE=debug cpu_flags_x86_sse2 test
-KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=fasta
-SLOT=0
-SRC_URI=http://faculty.virginia.edu/wrpearson/fasta/fasta3/fasta-35.4.10.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=bc70246741c824a5b11b9e292d26c372
diff --git a/metadata/md5-cache/sci-biology/iedera-1.04 b/metadata/md5-cache/sci-biology/iedera-1.04
deleted file mode 100644
index f2c23bc0e7af..000000000000
--- a/metadata/md5-cache/sci-biology/iedera-1.04
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=A subset seed design tool for DNA sequence alignment
-EAPI=2
-HOMEPAGE=http://bioinfo.lifl.fr/yass/iedera.php
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://bioinfo.lifl.fr/yass/files/iedera-1.04.tar.gz
-_md5_=85c923889cd2b60188eea7dfbc90f7d1
diff --git a/metadata/md5-cache/sci-electronics/Manifest.gz b/metadata/md5-cache/sci-electronics/Manifest.gz
index 2953e0ef1ac7..f7118e8f96fe 100644
Binary files a/metadata/md5-cache/sci-electronics/Manifest.gz and b/metadata/md5-cache/sci-electronics/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-electronics/ngspice-26 b/metadata/md5-cache/sci-electronics/ngspice-26
deleted file mode 100644
index c553d29a2242..000000000000
--- a/metadata/md5-cache/sci-electronics/ngspice-26
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=sys-libs/ncurses readline? ( >=sys-libs/readline-5.0 ) X? ( x11-libs/libXaw x11-libs/libXt x11-libs/libX11 sci-visualization/xgraph ) >=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=The Next Generation Spice (Electronic Circuit Simulator)
-EAPI=3
-HOMEPAGE=http://ngspice.sourceforge.net
-IUSE=X debug readline
-KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~x64-macos
-LICENSE=BSD GPL-2
-RDEPEND=sys-libs/ncurses readline? ( >=sys-libs/readline-5.0 ) X? ( x11-libs/libXaw x11-libs/libXt x11-libs/libX11 sci-visualization/xgraph )
-SLOT=0
-SRC_URI=mirror://sourceforge/ngspice/ngspice-26.tar.gz mirror://sourceforge/ngspice/ngspice-26-manual.pdf
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=61f9e4f18583daa5a784184f9c259620
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 6484b61436ac..f1bea6919a65 100644
Binary files a/metadata/md5-cache/sci-libs/Manifest.gz and b/metadata/md5-cache/sci-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-libs/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
Binary files a/metadata/md5-cache/sci-misc/Manifest.gz and b/metadata/md5-cache/sci-misc/Manifest.gz differ
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 c7a3f4483e1b..276cb8cba5e4 100644
Binary files a/metadata/md5-cache/sys-apps/Manifest.gz and b/metadata/md5-cache/sys-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-apps/darwin-miscutils-12 b/metadata/md5-cache/sys-apps/darwin-miscutils-12
new file mode 100644
index 000000000000..fb1a29234fbf
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/darwin-miscutils-12
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=sys-libs/ncurses:=
+DESCRIPTION=Miscellaneous commands used on macOS, High Sierra 10.13
+EAPI=6
+HOMEPAGE=https://www.opensource.apple.com/
+KEYWORDS=~ppc-macos ~x64-macos ~x86-macos
+LICENSE=BSD
+RDEPEND=sys-libs/ncurses:=
+SLOT=0
+SRC_URI=https://opensource.apple.com/tarballs/misc_cmds/misc_cmds-34.tar.gz https://opensource.apple.com/tarballs/shell_cmds/shell_cmds-203.tar.gz https://opensource.apple.com/tarballs/developer_cmds/developer_cmds-63.tar.gz https://opensource.apple.com/source/adv_cmds/adv_cmds-147/md/md.c -> adv_cmds-md-147.c https://opensource.apple.com/source/adv_cmds/adv_cmds-147/md/md.1 -> adv_cmds-md-147.1 https://642666.bugs.gentoo.org/attachment.cgi?id=511988 -> adv_cmds-md-147-compile.patch
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=73f75de7127ed0a03258ceb0d52dcab0
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 b/metadata/md5-cache/sys-apps/mawk-1.3.4_p20171017
new file mode 100644
index 000000000000..ef7cb85c0bc7
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/mawk-1.3.4_p20171017
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm prepare
+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
+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_=a438e202516bab199844ce43011e38e0
diff --git a/metadata/md5-cache/sys-apps/microcode-ctl-1.28-r2 b/metadata/md5-cache/sys-apps/microcode-ctl-1.28-r2
new file mode 100644
index 000000000000..fefc133aba27
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/microcode-ctl-1.28-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install preinst
+DESCRIPTION=Intel processor microcode update utility
+EAPI=6
+HOMEPAGE=https://pagure.io/microcode_ctl
+IUSE=selinux
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-firmware/intel-microcode-20090330[monolithic(+)] selinux? ( sec-policy/selinux-cpucontrol )
+SLOT=0
+SRC_URI=https://releases.pagure.org/microcode_ctl/microcode_ctl-1.28.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=9d9140813cf8d0b4f6205a71054c4524
diff --git a/metadata/md5-cache/sys-apps/portage-2.3.19 b/metadata/md5-cache/sys-apps/portage-2.3.19-r1
similarity index 95%
rename from metadata/md5-cache/sys-apps/portage-2.3.19
rename to 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-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index 52e1858375fb..16335328c01b 100644
Binary files a/metadata/md5-cache/sys-auth/Manifest.gz and b/metadata/md5-cache/sys-auth/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-auth/libnss-nis-1.4 b/metadata/md5-cache/sys-auth/libnss-nis-1.4
index 770151b5c405..03e281a9a874 100644
--- a/metadata/md5-cache/sys-auth/libnss-nis-1.4
+++ b/metadata/md5-cache/sys-auth/libnss-nis-1.4
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=net-libs/libnsl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libtirpc:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !<sys-libs/glibc-2.26 virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=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
+DEPEND=>net-libs/libnsl-0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libtirpc:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !<sys-libs/glibc-2.26 virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=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=NSS module to provide NIS support
 EAPI=6
 HOMEPAGE=https://github.com/thkukuk/libnss_nis
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=~amd64
 LICENSE=LGPL-2.1+ BSD ISC
-RDEPEND=net-libs/libnsl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libtirpc:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !<sys-libs/glibc-2.26
+RDEPEND=>net-libs/libnsl-0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libtirpc:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !<sys-libs/glibc-2.26
 SLOT=0
 SRC_URI=https://github.com/thkukuk/libnss_nis/archive/v1.4.tar.gz -> libnss-nis-1.4.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=6e94b72871b33f9cb961d1607b83c5f6
+_md5_=7af8f8b322b93b07d189ba333dab95f3
diff --git a/metadata/md5-cache/sys-auth/pam-csync-0.42.0-r1 b/metadata/md5-cache/sys-auth/pam-csync-0.42.0-r1
deleted file mode 100644
index cdd2c7a1ea42..000000000000
--- a/metadata/md5-cache/sys-auth/pam-csync-0.42.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-text/asciidoc sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=PAM module to provide roaming home directories for a user session
-EAPI=6
-HOMEPAGE=https://www.csync.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/iniparser-3.1:0 >=net-misc/ocsync-0.60.0 virtual/pam
-SLOT=0
-SRC_URI=https://www.csync.org/files/pam_csync-0.42.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_=3615d979825645002df9fe5438f59e4e
diff --git a/metadata/md5-cache/sys-boot/Manifest.gz b/metadata/md5-cache/sys-boot/Manifest.gz
index 19b7eb1c1f8c..c5c06355bcbd 100644
Binary files a/metadata/md5-cache/sys-boot/Manifest.gz and b/metadata/md5-cache/sys-boot/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-boot/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 cef44b7bf4cf..d4353932428d 100644
Binary files a/metadata/md5-cache/sys-fs/Manifest.gz and b/metadata/md5-cache/sys-fs/Manifest.gz differ
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/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-fs/xfsprogs-4.9.0 b/metadata/md5-cache/sys-fs/xfsprogs-4.9.0
index 77dcad71417c..f69cb264a4d9 100644
--- a/metadata/md5-cache/sys-fs/xfsprogs-4.9.0
+++ b/metadata/md5-cache/sys-fs/xfsprogs-4.9.0
@@ -4,11 +4,11 @@ DESCRIPTION=xfs filesystem utilities
 EAPI=5
 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=ftp://ftp.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-4.9.0.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=dc8264f84bfa0a6a60077acf811671fd
+_md5_=bd45fed576fd9a441d34727e1a545b35
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 74fdd092a475..506349f68f7c 100644
Binary files a/metadata/md5-cache/sys-kernel/Manifest.gz and b/metadata/md5-cache/sys-kernel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-kernel/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 61c622b14514..96d4ecec85d1 100644
Binary files a/metadata/md5-cache/sys-libs/Manifest.gz and b/metadata/md5-cache/sys-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-libs/glibc-2.26-r5 b/metadata/md5-cache/sys-libs/glibc-2.26-r5
index dc56a73a724a..245c00cfa69d 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.26-r5
+++ b/metadata/md5-cache/sys-libs/glibc-2.26-r5
@@ -4,6 +4,7 @@ DESCRIPTION=GNU libc C library
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/libc/
 IUSE=audit caps debug doc gd hardened multilib nscd selinux systemtap profile suid vanilla crosscompile_opts_headers-only
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
 PDEPEND=!vanilla? ( sys-libs/timezone-data )
 RDEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) !sys-kernel/ps3-sources sys-apps/gentoo-functions !sys-libs/nss-db vanilla? ( !sys-libs/timezone-data )
@@ -11,4 +12,4 @@ RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.26.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.26-patches-5.tar.bz2 multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	prefix	e51c7882b7b721e54e684f7eb143cbfe	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	toolchain-glibc	6f221877ee4e2a1566fe5f46ee62ba8f	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=4d40d97b221a6dda2f1eae75b84a1a23
+_md5_=3f9115d3c7edb47266e4e06ad098859f
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/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index eefa18d6b63e..7cd1da4d768e 100644
Binary files a/metadata/md5-cache/www-apps/Manifest.gz and b/metadata/md5-cache/www-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/www-apps/eyeos-2.5 b/metadata/md5-cache/www-apps/eyeos-2.5
deleted file mode 100644
index 6c8aa6472954..000000000000
--- a/metadata/md5-cache/www-apps/eyeos-2.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=>=app-admin/webapp-config-1.50.15
-DESCRIPTION=AJAX web-based desktop environment
-EAPI=5
-HOMEPAGE=http://www.eyeos.org
-IUSE=vhosts
-KEYWORDS=~amd64 ~x86
-LICENSE=AGPL-3
-RDEPEND=dev-lang/php[curl,crypt,gd,json,mysql,mysqli,pdo,sharedmem,sqlite] virtual/httpd-php >=app-admin/webapp-config-1.50.15
-SLOT=2.5
-SRC_URI=mirror://sourceforge/eyeos/eyeos2/eyeos-2.5.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	webapp	a76ebd3cb5649737496e8238992dd7ca
-_md5_=c905b9e37cde0643cc52cfcab2a79b93
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 803f716e26c4..602b0c575cf8 100644
Binary files a/metadata/md5-cache/www-client/Manifest.gz and b/metadata/md5-cache/www-client/Manifest.gz differ
diff --git a/metadata/md5-cache/www-client/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-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index d901e8985d94..26a3537d87dc 100644
Binary files a/metadata/md5-cache/www-servers/Manifest.gz and b/metadata/md5-cache/www-servers/Manifest.gz differ
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
Binary files a/metadata/md5-cache/x11-drivers/Manifest.gz and b/metadata/md5-cache/x11-drivers/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-drivers/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 d007b6d5a97c..a6b908a78971 100644
Binary files a/metadata/md5-cache/x11-misc/Manifest.gz and b/metadata/md5-cache/x11-misc/Manifest.gz differ
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/slop-9999 b/metadata/md5-cache/x11-misc/slop-9999
new file mode 100644
index 000000000000..f5bdaaa5c1f5
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/slop-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-libs/icu:= x11-libs/libX11 x11-libs/libXext opengl? ( media-libs/glew:0= virtual/opengl x11-libs/libXrender:= ) media-libs/glm sys-devel/make >=dev-util/cmake-3.7.2 >=dev-vcs/git-1.8.2.1
+DESCRIPTION=An application that queries the user for a selection for printing
+EAPI=6
+HOMEPAGE=https://github.com/naelstrof/slop
+IUSE=opengl
+LICENSE=GPL-3
+RDEPEND=dev-libs/icu:= x11-libs/libX11 x11-libs/libXext opengl? ( media-libs/glew:0= virtual/opengl x11-libs/libXrender:= )
+SLOT=0
+_eclasses_=cmake-utils	77a5a8d3308359caadcdd91688f20093	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=57eaeee7e855f1e1415148ff44f0308a
diff --git a/metadata/md5-cache/x11-plugins/Manifest.gz b/metadata/md5-cache/x11-plugins/Manifest.gz
index 28ce6abd20c6..4bf56100138b 100644
Binary files a/metadata/md5-cache/x11-plugins/Manifest.gz and b/metadata/md5-cache/x11-plugins/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-plugins/wmcpuwatch-0.2 b/metadata/md5-cache/x11-plugins/wmcpuwatch-0.2-r1
similarity index 85%
rename from metadata/md5-cache/x11-plugins/wmcpuwatch-0.2
rename to 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
Binary files a/metadata/md5-cache/x11-wm/Manifest.gz and b/metadata/md5-cache/x11-wm/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-wm/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 0f11c17c7319..ed8c7134a722 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-01T11:04:31Z
+TIMESTAMP 2018-01-02T10:09:43Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlpKFb9fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlpLWmdfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDutw/8DoE5yeHnIkMumX/eq8onK7DNGiCPWMxlDuDlQVAuXqBPbAWwosXkD42z
-4yDpa2VLFpBvm0lw7XC9mg+3UuvRi0yI0JPYQ1TDhBbuJW0sdbh0DftnWF8U5kjW
-deH6Xzd7/GG70zVukxP43lJyyHYjz/i/nLUQfKOljp3aGQkrhsEVnBASWRVYyQRH
-tiSII6wItXgJbmeq9B7Jx6AZzmZsJ8/QsAHm1kfZodj1Fo+uX++KWOaARB4/pe8U
-JfKUaNIi0mKNWrv2uteasKS1WM9oaLTyjUWsIFSwp2i9ZUvNnVcgZrWshZM/jynA
-KJJFQh2pcXpTcEnRuHShSXLxTqy+996p4D+ZXW4xeKgKom+LT3UlkzjmsQcie+Zm
-87yhlA6RENQpGJPQITDMV731o+ovJfvZQsnfSgF2XZA3hHqY+bSouKFq6prT6T7M
-JF6w4xDWuAjdu4WnAKicEazMWNhRiM5U35x+Ra0hykflUmTfqnEx1WFlz4FIh/Kt
-k2OykzLCHHabx+AyxPPjsl0Uol5eR12FAgDqHNSnfU6o4vrIrY80v//Z8jyvSYKi
-Qz4fOCq7M8nDSisiGkTtfXYJIETwHrPUi0JAP581FBoT4M4ptqQCHGD0FfGQxyYb
-YS9cICikbFp4Mw2sfoK6wsRZC6pdAxnSue++9TTjd2DDPAe5TBU=
-=FC9J
+klADNg//d8CkA7ab09T4DgSXp1pNkDKlF0L11PHER0mN38t/J36Z3P64dw3h2/B4
+Gux8ElxbWd0bLQ/rqvjzj3JYxoZk3vKNCBMuyNgDel2zENRC5wpldn/T4ZI/+67a
+sCN1PeNLZ2q2YdQvn5XsVIz63R+Sft8bx2bcndLfrCvs5saQrUO4LQV28Rxb1b5L
++oyVU1URYTLEVgMSUOD3ZE5D+ptPNqsBJlu/YGz5v63DD/e5ef60z46VdEUHQ7jI
+AMoUKhc2FGVwz4Ynr+F6muTwDDEpl94+39yD6VBwHX+zrmsCBrhC/Y+h+LirwGEg
+/k64NC5A7i8Vqyrlu7XdfihSXSwtJOdSg7CQHQhT4NhH6qDeodPz60KrjSyqbxFw
+PmCCW9d09zsC8ko8sjVzHg6Pe5pEXwaZXuNuS9+bvKAlzxHO7Li5JtZyPGVHipSH
+XWzthxFczyvaIqp4YX7+PJH1hhPGCzSvP95RiGpQ6HmT2ke1rTOFwpyeqZUDuFEO
+lRwvo1pOiIScC3MUVk03mK5KVi7fGCQwoNuUcBAwDexNcjK2oDmSeii/wt4l+y6/
+esi1L7BVZ6qa4LZtQF1Tycg0dcuFAeSK04UN/WTX+XI440MIsryfNS160suUTkfY
+2ahBxOJCo0cyIqnJ37vTXkEMlhSnOPsD6DlqH3T7pAMeoPHCzus=
+=78yU
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 469000321fcb..69b01d213f0e 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Mon, 01 Jan 2018 11:04:28 +0000
+Tue, 02 Jan 2018 10:09:39 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index e6322eb2d7a8..7046202a40ce 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Mon Jan  1 11:04:27 UTC 2018
+Tue Jan  2 10:09:39 UTC 2018
diff --git a/metadata/timestamp.calculate b/metadata/timestamp.calculate
index c9e9b3fcfd78..35389c7a60f7 100644
--- a/metadata/timestamp.calculate
+++ b/metadata/timestamp.calculate
@@ -389,7 +389,10 @@
 1702282250 ./dev-java/jid3/jid3-0.46-r2.ebuild
 1702282250 ./dev-java/glassfish-ejb-api/glassfish-ejb-api-3.2.ebuild
 1702282250 ./dev-java/touchgraph-graphlayout/touchgraph-graphlayout-1.22-r1.ebuild
+1801020310 ./dev-java/servletapi/servletapi-2.3-r4.ebuild
 1702282250 ./dev-java/servletapi/servletapi-2.3-r3.ebuild
+1801020310 ./dev-java/servletapi/servletapi-2.4-r6.ebuild
+1801020310 ./dev-java/servletapi/servletapi-2.2-r4.ebuild
 1702282250 ./dev-java/servletapi/servletapi-2.2-r3.ebuild
 1702282250 ./dev-java/servletapi/servletapi-2.4-r5.ebuild
 1702282250 ./dev-java/zeus-jscl/zeus-jscl-1.64-r1.ebuild
@@ -1016,8 +1019,8 @@
 1702262206 ./sys-libs/tapi/tapi-1.30.ebuild
 1710301552 ./sys-libs/libapparmor/libapparmor-2.11.1.ebuild
 1801010610 ./sys-libs/libapparmor/libapparmor-2.12.0.ebuild
-1702282250 ./sys-libs/libcap/libcap-2.24-r2.ebuild
-1702282250 ./sys-libs/libcap/libcap-2.25.ebuild
+1801020510 ./sys-libs/libcap/libcap-2.24-r2.ebuild
+1801020510 ./sys-libs/libcap/libcap-2.25.ebuild
 1702282250 ./sys-libs/libvpd/libvpd-2.1.3.ebuild
 1702282250 ./sys-libs/libvpd/libvpd-2.2.4.ebuild
 1702282250 ./sys-libs/libvpd/libvpd-2.2.5.ebuild
@@ -1221,7 +1224,7 @@
 1702282250 ./sys-libs/rvm/rvm-1.17-r1.ebuild
 1702282250 ./sys-libs/rvm/rvm-1.12.ebuild
 1703242239 ./sys-libs/glibc/glibc-2.22-r4.ebuild
-1801010040 ./sys-libs/glibc/glibc-2.26-r5.ebuild
+1801011840 ./sys-libs/glibc/glibc-2.26-r5.ebuild
 1706161733 ./sys-libs/glibc/glibc-2.20-r2.ebuild
 1709022129 ./sys-libs/glibc/glibc-2.23-r4.ebuild
 1712201309 ./sys-libs/glibc/glibc-2.26-r3.ebuild
@@ -1236,7 +1239,7 @@
 1712020139 ./sys-libs/libavc1394/libavc1394-0.5.4.ebuild
 1712020139 ./sys-libs/libavc1394/libavc1394-0.5.4-r1.ebuild
 1711070020 ./sys-libs/libosinfo/libosinfo-1.0.0-r1.ebuild
-1709021056 ./sys-libs/libstdc++-v3/libstdc++-v3-3.3.6-r1.ebuild
+1801020010 ./sys-libs/libstdc++-v3/libstdc++-v3-3.3.6-r1.ebuild
 1702282250 ./sci-visualization/spectromatic/spectromatic-1.0-r3.ebuild
 1702282250 ./sci-visualization/gcalc/gcalc-3.1_rc1-r1.ebuild
 1709211657 ./sci-visualization/visit/visit-2.12.3.ebuild
@@ -1383,7 +1386,6 @@
 1702282250 ./sci-biology/amos/amos-3.1.0-r3.ebuild
 1702282250 ./sci-biology/snpfile/snpfile-2.0.1-r2.ebuild
 1702282250 ./sci-biology/iedera/iedera-1.05-r1.ebuild
-1702282250 ./sci-biology/iedera/iedera-1.04.ebuild
 1702282250 ./sci-biology/prodigal/prodigal-2.6.3.ebuild
 1703082147 ./sci-biology/elph/elph-1.0.1-r1.ebuild
 1702282250 ./sci-biology/aaindex/aaindex-9.1-r1.ebuild
@@ -1391,7 +1393,6 @@
 1702282250 ./sci-biology/goby-cpp/goby-cpp-1.9.8.1.ebuild
 1702282250 ./sci-biology/goby-cpp/goby-cpp-1.9.7.3.ebuild
 1702282250 ./sci-biology/fasta/fasta-36.3.5e.ebuild
-1702282250 ./sci-biology/fasta/fasta-35.4.10.ebuild
 1709212200 ./sci-biology/foldingathome/foldingathome-7.4.4-r2.ebuild
 1702282250 ./sci-biology/profphd/profphd-1.0.39.ebuild
 1702282250 ./sci-biology/profphd/profphd-1.0.40.ebuild
@@ -1447,10 +1448,7 @@
 1702282250 ./sci-biology/ariadne/ariadne-1.3-r3.ebuild
 1702282250 ./sci-biology/phred/phred-071220-r1.ebuild
 1702282250 ./sci-biology/embassy-domsearch/embassy-domsearch-0.1.660.ebuild
-1702282250 ./sci-biology/arb/arb-5.1-r1.ebuild
 1711182109 ./sci-biology/arb/arb-6.0.6.ebuild
-1702282250 ./sci-biology/arb/arb-5.3.ebuild
-1702282250 ./sci-biology/arb/arb-5.2.ebuild
 1702282250 ./sci-biology/stride/stride-20011129-r1.ebuild
 1702282250 ./sci-biology/abyss/abyss-2.0.2-r1.ebuild
 1702282250 ./sci-biology/maqview/maqview-0.2.5-r3.ebuild
@@ -1676,7 +1674,7 @@
 1710160602 ./sci-libs/libgeodecomp/libgeodecomp-0.3.1.ebuild
 1702282250 ./sci-libs/coinor-bcps/coinor-bcps-0.93.10.ebuild
 1702282250 ./sci-libs/coinhsl/coinhsl-2014.01.10.ebuild
-1702282250 ./sci-libs/fftw/fftw-9999.ebuild
+1801020010 ./sci-libs/fftw/fftw-9999.ebuild
 1712241209 ./sci-libs/fftw/fftw-2.1.5-r9.ebuild
 1710190759 ./sci-libs/fftw/fftw-3.3.6_p2.ebuild
 1702282250 ./sci-libs/liborigin/liborigin-20110829.ebuild
@@ -1973,8 +1971,8 @@
 1703160414 ./dev-ruby/ruby-rsvg/ruby-rsvg-3.1.1.ebuild
 1702282250 ./dev-ruby/ruby-rsvg/ruby-rsvg-3.0.8.ebuild
 1702282250 ./dev-ruby/request_store/request_store-1.3.2.ebuild
+1801021010 ./dev-ruby/request_store/request_store-1.4.0.ebuild
 1708060921 ./dev-ruby/request_store/request_store-1.0.5.ebuild
-1702282250 ./dev-ruby/request_store/request_store-1.3.1.ebuild
 1707020841 ./dev-ruby/activejob/activejob-5.0.4.ebuild
 1709131642 ./dev-ruby/activejob/activejob-5.1.4.ebuild
 1709291719 ./dev-ruby/activejob/activejob-4.2.10.ebuild
@@ -3278,8 +3276,7 @@
 1709270809 ./dev-ruby/ruby-progressbar/ruby-progressbar-1.8.3-r1.ebuild
 1705252253 ./dev-ruby/ruby-progressbar/ruby-progressbar-1.8.1.ebuild
 1705252253 ./dev-ruby/ruby-progressbar/ruby-progressbar-1.7.5.ebuild
-1709140751 ./dev-ruby/curses/curses-1.2.4.ebuild
-1707070819 ./dev-ruby/curses/curses-1.2.3.ebuild
+1801021010 ./dev-ruby/curses/curses-1.2.4.ebuild
 1707291732 ./dev-ruby/minitest-pretty_diff/minitest-pretty_diff-0.1.ebuild
 1702282250 ./dev-ruby/crack/crack-0.4.2-r1.ebuild
 1707120735 ./dev-ruby/crack/crack-0.4.3-r1.ebuild
@@ -3398,7 +3395,6 @@
 1708110520 ./media-video/v4l2loopback/v4l2loopback-0.10.0.ebuild
 1702282250 ./media-video/submux-dvd/submux-dvd-0.5.2.ebuild
 1702282250 ./media-video/abby/abby-0.4.8.ebuild
-1702282250 ./media-video/bashnapi/bashnapi-1.1.5.ebuild
 1702282250 ./media-video/bashnapi/bashnapi-1.3.5.ebuild
 1702282250 ./media-video/xvid4conf/xvid4conf-1.12.ebuild
 1706281107 ./media-video/jubler/jubler-5.1.ebuild
@@ -3695,7 +3691,7 @@
 1709112140 ./www-client/opera/opera-12.16_p1860-r1.ebuild
 1712151539 ./www-client/opera/opera-49.0.2725.56.ebuild
 1712251409 ./www-client/midori/midori-0.5.11-r2.ebuild
-1712210339 ./www-client/google-chrome-beta/google-chrome-beta-64.0.3282.39.ebuild
+1801020440 ./www-client/google-chrome-beta/google-chrome-beta-64.0.3282.39.ebuild
 1702282250 ./www-client/phantomjs/phantomjs-2.0.0-r1.ebuild
 1702282250 ./www-client/phantomjs/phantomjs-1.9.8.ebuild
 1709191820 ./www-client/phantomjs/phantomjs-2.1.1.ebuild
@@ -3747,9 +3743,9 @@
 1712210339 ./www-client/google-chrome-unstable/google-chrome-unstable-65.0.3298.3.ebuild
 1702282250 ./www-client/ck4up/ck4up-1.2.ebuild
 1712232109 ./www-client/chromium/chromium-65.0.3294.5.ebuild
-1712262009 ./www-client/chromium/chromium-65.0.3298.3.ebuild
+1801020440 ./www-client/chromium/chromium-65.0.3298.3.ebuild
 1712182009 ./www-client/chromium/chromium-64.0.3282.24.ebuild
-1712232109 ./www-client/chromium/chromium-64.0.3282.39.ebuild
+1801020440 ./www-client/chromium/chromium-64.0.3282.39.ebuild
 1712232109 ./www-client/chromium/chromium-63.0.3239.108.ebuild
 1702282250 ./www-client/dillo/dillo-3.0.5.ebuild
 1702282250 ./www-client/dillo/dillo-3.0.5-r1.ebuild
@@ -4539,10 +4535,10 @@
 1712200109 ./app-crypt/libu2f-host/libu2f-host-1.1.1.ebuild
 1702282250 ./app-crypt/libykneomgr/libykneomgr-0.1.8.ebuild
 1708230031 ./app-crypt/aescrypt/aescrypt-3.0.6b.ebuild
-1712090209 ./app-crypt/acme/acme-0.20.0.ebuild
-1711020728 ./app-crypt/acme/acme-0.19.0.ebuild
+1801020010 ./app-crypt/acme/acme-0.20.0.ebuild
+1801020010 ./app-crypt/acme/acme-0.19.0.ebuild
 1712230209 ./app-crypt/acme/acme-9999.ebuild
-1709211918 ./app-crypt/acme/acme-0.18.2.ebuild
+1801020010 ./app-crypt/acme/acme-0.18.2.ebuild
 1711111801 ./app-crypt/libsecret/libsecret-0.18.5.ebuild
 1704082033 ./app-crypt/tc-play/tc-play-2.0-r1.ebuild
 1710040211 ./app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.9.1.ebuild
@@ -4615,6 +4611,7 @@
 1702282250 ./app-crypt/keylookup/keylookup-2.2-r9999.ebuild
 1702282250 ./app-crypt/keylookup/keylookup-2.2.ebuild
 1712040339 ./app-crypt/moolticute/moolticute-0.10.0_beta.ebuild
+1801020310 ./app-crypt/moolticute/moolticute-0.11.4_beta.ebuild
 1712040339 ./app-crypt/moolticute/moolticute-9999.ebuild
 1709250707 ./app-crypt/yubikey-manager/yubikey-manager-0.4.5.ebuild
 1712210409 ./app-crypt/yubikey-manager/yubikey-manager-0.5.0.ebuild
@@ -5157,7 +5154,6 @@
 1711270010 ./sys-auth/consolekit/consolekit-1.1.2.ebuild
 1702282250 ./sys-auth/consolekit/consolekit-1.1.0-r1.ebuild
 1702282250 ./sys-auth/pam-pgsql/pam-pgsql-0.7.3.2.ebuild
-1712281839 ./sys-auth/pam-csync/pam-csync-0.42.0-r1.ebuild
 1702282250 ./sys-auth/libnss-pgsql/libnss-pgsql-1.5.0_beta.ebuild
 1702282250 ./sys-auth/libnss-pgsql/libnss-pgsql-1.4.0.ebuild
 1712010209 ./sys-auth/polkit-qt/polkit-qt-0.112.0_p20160416-r1.ebuild
@@ -5179,7 +5175,7 @@
 1702282250 ./sys-auth/libyubikey/libyubikey-1.12.ebuild
 1702282250 ./sys-auth/libyubikey/libyubikey-1.13.ebuild
 1702282250 ./sys-auth/polkit-pkla-compat/polkit-pkla-compat-0.1.ebuild
-1711251710 ./sys-auth/libnss-nis/libnss-nis-1.4.ebuild
+1801012040 ./sys-auth/libnss-nis/libnss-nis-1.4.ebuild
 1702282250 ./sys-auth/ykclient/ykclient-2.15.ebuild
 1702282250 ./sys-auth/ykclient/ykclient-2.14.ebuild
 1707121742 ./sys-auth/keystone/keystone-2017.1.9999.ebuild
@@ -5275,7 +5271,6 @@
 1712220039 ./net-libs/meanwhile/meanwhile-1.0.2-r1.ebuild
 1708150908 ./net-libs/libssh2/libssh2-1.8.0-r1.ebuild
 1707201734 ./net-libs/libssh2/libssh2-9999.ebuild
-1707201734 ./net-libs/libssh2/libssh2-1.8.0.ebuild
 1702282250 ./net-libs/libssh2/libssh2-1.7.0.ebuild
 1702282250 ./net-libs/libnetfilter_log/libnetfilter_log-1.0.1.ebuild
 1709062359 ./net-libs/telepathy-accounts-signon/telepathy-accounts-signon-1.0.ebuild
@@ -5345,7 +5340,7 @@
 1702282250 ./net-libs/libnatpmp/libnatpmp-20150609.ebuild
 1702282250 ./net-libs/libnatpmp/libnatpmp-20130911.ebuild
 1705161100 ./net-libs/libgfbgraph/libgfbgraph-0.2.3-r1.ebuild
-1708151746 ./net-libs/libssh/libssh-9999.ebuild
+1801021140 ./net-libs/libssh/libssh-9999.ebuild
 1708151639 ./net-libs/libssh/libssh-0.7.5-r1.ebuild
 1706101809 ./net-libs/libssh/libssh-0.7.4.ebuild
 1712250539 ./net-libs/signond/signond-8.59.ebuild
@@ -5656,7 +5651,6 @@
 1702282250 ./net-libs/nativebiginteger/nativebiginteger-0.8.7.ebuild
 1712131239 ./net-libs/miniupnpc/miniupnpc-2.0.20170509.ebuild
 1712131109 ./net-libs/miniupnpc/miniupnpc-2.0.20171212.ebuild
-1711051519 ./net-libs/miniupnpc/miniupnpc-2.0.20171102.ebuild
 1702282250 ./net-libs/roadrunner/roadrunner-0.9.1.ebuild
 1706300749 ./net-libs/uhttpmock/uhttpmock-0.5.0.ebuild
 1801010110 ./net-libs/uhttpmock/uhttpmock-0.5.1.ebuild
@@ -6473,7 +6467,6 @@
 1702282250 ./x11-misc/xss-lock/xss-lock-0.3.0_p20140302-r1.ebuild
 1705251720 ./x11-misc/devilspie/devilspie-0.23-r1.ebuild
 1705121754 ./x11-misc/devilspie/devilspie-0.23.ebuild
-1702282250 ./x11-misc/afbinit/afbinit-1.0.1-r7.ebuild
 1702282250 ./x11-misc/vdpauinfo/vdpauinfo-1.0.ebuild
 1703161115 ./x11-misc/xbitmaps/xbitmaps-1.1.1-r1.ebuild
 1711182027 ./x11-misc/wmctrl/wmctrl-1.07-r2.ebuild
@@ -6573,6 +6566,7 @@
 1707052331 ./x11-misc/kronometer/kronometer-2.1.5.ebuild
 1702282250 ./x11-misc/sunflower/sunflower-0.2_alpha59.ebuild
 1712310040 ./x11-misc/slop/slop-6.3.46.ebuild
+1801011610 ./x11-misc/slop/slop-9999.ebuild
 1711202235 ./x11-misc/xystray/xystray-1.0.ebuild
 1702282250 ./x11-misc/gpaste/gpaste-3.20.3.ebuild
 1703221029 ./x11-misc/xautomation/xautomation-1.09-r1.ebuild
@@ -7446,6 +7440,7 @@
 1702282250 ./dev-libs/libcdio/libcdio-0.93.ebuild
 1702282250 ./dev-libs/libcdio/libcdio-0.94-r1.ebuild
 1712121809 ./dev-libs/libcdio/libcdio-1.1.0.ebuild
+1801012040 ./dev-libs/libcdio/libcdio-2.0.0.ebuild
 1711201831 ./dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-17.40.492261.ebuild
 1712161309 ./dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-17.50.511655.ebuild
 1702282250 ./dev-libs/cereal/cereal-1.2.2.ebuild
@@ -7459,7 +7454,6 @@
 1712021309 ./dev-libs/libgit2-glib/libgit2-glib-0.26.2.ebuild
 1702282250 ./dev-libs/libgit2-glib/libgit2-glib-0.24.4.ebuild
 1705051751 ./dev-libs/libgit2-glib/libgit2-glib-0.25.0.ebuild
-1708250147 ./dev-libs/libgit2-glib/libgit2-glib-0.26.0-r1.ebuild
 1708282153 ./dev-libs/xapian/xapian-1.2.24.ebuild
 1710051436 ./dev-libs/xapian/xapian-1.2.25.ebuild
 1711262240 ./dev-libs/xapian/xapian-1.4.4.ebuild
@@ -7787,7 +7781,6 @@
 1708221558 ./dev-libs/libgit2/libgit2-0.26.0.ebuild
 1712270109 ./dev-libs/liblist/liblist-2.4.ebuild
 1702282250 ./dev-libs/libb64/libb64-1.2.1.ebuild
-1702282250 ./dev-libs/libb64/libb64-1.2.ebuild
 1705261300 ./dev-libs/libmcal/libmcal-0.7-r6.ebuild
 1702282250 ./dev-libs/libmcal/libmcal-0.7-r5.ebuild
 1707210322 ./dev-libs/ntl/ntl-10.5.0.ebuild
@@ -8016,7 +8009,6 @@
 1702282250 ./dev-libs/cyberjack/cyberjack-3.99.5_p03-r1.ebuild
 1702282250 ./dev-libs/libtomfloat/libtomfloat-0.02.ebuild
 1706261008 ./dev-libs/jsoncpp/jsoncpp-1.8.1.ebuild
-1708311805 ./dev-libs/jsoncpp/jsoncpp-1.8.3.ebuild
 1702282250 ./dev-libs/jsoncpp/jsoncpp-0.10.6.ebuild
 1703290129 ./dev-libs/jsoncpp/jsoncpp-0.10.2-r1.ebuild
 1712221739 ./dev-libs/jsoncpp/jsoncpp-1.8.4.ebuild
@@ -8404,7 +8396,7 @@
 1712221339 ./app-laptop/laptop-mode-tools/laptop-mode-tools-1.71-r1.ebuild
 1703171656 ./net-vpn/logmein-hamachi/logmein-hamachi-2.1.0.174.ebuild
 1703171656 ./net-vpn/logmein-hamachi/logmein-hamachi-2.1.0.139.ebuild
-1712171539 ./net-vpn/tor/tor-0.3.1.9-r1.ebuild
+1801011710 ./net-vpn/tor/tor-0.3.1.9-r1.ebuild
 1712171539 ./net-vpn/tor/tor-0.3.2.7_rc-r1.ebuild
 1710290153 ./net-vpn/tor/tor-0.3.1.7.ebuild
 1712220639 ./net-vpn/tor/tor-0.3.2.8_rc.ebuild
@@ -8708,6 +8700,7 @@
 1711191537 ./games-emulation/dolphin/dolphin-5.0.ebuild
 1702282250 ./games-emulation/dolphin/dolphin-9999.ebuild
 1702282250 ./games-emulation/m64py/m64py-0.2.3-r2.ebuild
+1801011710 ./games-emulation/m64py/m64py-0.2.4.ebuild
 1702282250 ./games-emulation/mupen64plus-rsp-hle/mupen64plus-rsp-hle-2.5.ebuild
 1711182327 ./games-emulation/yabause/yabause-0.9.14.ebuild
 1711182327 ./games-emulation/daphne/daphne-1.0.ebuild
@@ -9159,7 +9152,7 @@
 1712101740 ./app-arch/dpkg/dpkg-1.17.26.ebuild
 1710241634 ./app-arch/dpkg/dpkg-1.19.0.4.ebuild
 1702282250 ./app-arch/unzip/unzip-6.0_p20.ebuild
-1711260510 ./app-arch/unzip/unzip-6.0_p21-r2.ebuild
+1801020140 ./app-arch/unzip/unzip-6.0_p21-r2.ebuild
 1711211652 ./app-arch/unzip/unzip-6.0_p21.ebuild
 1701181302 ./app-arch/dump/dump-0.4.46.ebuild
 1702170244 ./app-arch/pixz/pixz-1.0.6.ebuild
@@ -9171,11 +9164,8 @@
 1709170513 ./app-arch/sharutils/sharutils-4.15.2.ebuild
 1702282250 ./app-arch/sharutils/sharutils-4.14-r1.ebuild
 1702282250 ./app-arch/sharutils/sharutils-4.15.1.ebuild
-1702282250 ./app-arch/zip/zip-3.0.ebuild
 1702282250 ./app-arch/zip/zip-3.0-r2.ebuild
-1702282250 ./app-arch/zip/zip-2.32-r1.ebuild
 1702282250 ./app-arch/zip/zip-3.0-r3.ebuild
-1702282250 ./app-arch/zip/zip-3.0-r1.ebuild
 1707141045 ./app-arch/fastjar/fastjar-0.98-r3.ebuild
 1707141045 ./app-arch/fastjar/fastjar-0.98-r2.ebuild
 1706301419 ./app-arch/pdlzip/pdlzip-1.8.ebuild
@@ -9189,9 +9179,8 @@
 1706301419 ./app-arch/zpaq/zpaq-7.15.ebuild
 1707280743 ./app-arch/mscompress/mscompress-0.3-r1.ebuild
 1702282250 ./app-arch/ncompress/ncompress-4.2.4.4.ebuild
-1710290108 ./app-arch/snappy/snappy-1.1.7.ebuild
+1801021140 ./app-arch/snappy/snappy-1.1.7.ebuild
 1711192344 ./app-arch/snappy/snappy-1.1.3-r1.ebuild
-1710160304 ./app-arch/snappy/snappy-1.1.6.ebuild
 1704011931 ./app-arch/file-roller/file-roller-3.22.3.ebuild
 1708100158 ./app-arch/file-roller/file-roller-3.24.1.ebuild
 1712101740 ./app-arch/rpm/rpm-4.12.0.1.ebuild
@@ -9220,12 +9209,9 @@
 1712281839 ./app-arch/pure-sfv/pure-sfv-0.3-r1.ebuild
 1702282250 ./app-arch/alien/alien-8.95.ebuild
 1709042021 ./app-arch/lz4/lz4-9999.ebuild
-1702282250 ./app-arch/lz4/lz4-0_p120.ebuild
-1702282250 ./app-arch/lz4/lz4-0_p131-r1.ebuild
 1707071200 ./app-arch/lz4/lz4-1.7.5-r1.ebuild
 1702282250 ./app-arch/lz4/lz4-0_p131.ebuild
-1709252204 ./app-arch/lz4/lz4-1.8.0.ebuild
-1702282250 ./app-arch/lz4/lz4-0_p106-r1.ebuild
+1801021140 ./app-arch/lz4/lz4-1.8.0.ebuild
 1710021211 ./app-arch/bzip2/bzip2-1.0.6-r8.ebuild
 1708311857 ./app-arch/par2cmdline/par2cmdline-0.7.3.ebuild
 1712201139 ./app-arch/par2cmdline/par2cmdline-0.8.0.ebuild
@@ -9518,7 +9504,7 @@
 1702282250 ./dev-db/lib_mysqludf_sys/lib_mysqludf_sys-0.0.3.ebuild
 1702282250 ./dev-db/lmdb/lmdb-0.9.18.ebuild
 1712170009 ./dev-db/lmdb/lmdb-0.9.19.ebuild
-1712191909 ./dev-db/pg_top/pg_top-3.7.0.ebuild
+1801020340 ./dev-db/pg_top/pg_top-3.7.0.ebuild
 1702282250 ./dev-db/pg_top/pg_top-3.6.2-r1.ebuild
 1705191842 ./dev-db/psqlodbc/psqlodbc-09.06.0310.ebuild
 1712151839 ./dev-db/psqlodbc/psqlodbc-10.00.0000.ebuild
@@ -9749,7 +9735,7 @@
 1702282250 ./sys-kernel/linux-headers/linux-headers-2.4.36.ebuild
 1702282250 ./sys-kernel/linux-headers/linux-headers-3.18.ebuild
 1702282250 ./sys-kernel/linux-headers/linux-headers-4.5.ebuild
-1801010110 ./sys-kernel/linux-headers/linux-headers-4.13.ebuild
+1801020310 ./sys-kernel/linux-headers/linux-headers-4.13.ebuild
 1611112353 ./sys-kernel/linux-headers/linux-headers-4.8.ebuild
 1612190942 ./sys-kernel/linux-headers/linux-headers-4.9.ebuild
 1712111039 ./sys-kernel/git-sources/git-sources-4.15_rc3.ebuild
@@ -10154,8 +10140,10 @@
 1712290339 ./media-gfx/imagemagick/imagemagick-6.9.9.26.ebuild
 1708211701 ./media-gfx/imagemagick/imagemagick-7.0.6.9.ebuild
 1711191811 ./media-gfx/imagemagick/imagemagick-6.9.9.20.ebuild
+1801012310 ./media-gfx/imagemagick/imagemagick-7.0.7.19.ebuild
 1708211701 ./media-gfx/imagemagick/imagemagick-6.9.9.9.ebuild
 1709092004 ./media-gfx/imagemagick/imagemagick-6.9.9.0.ebuild
+1801012310 ./media-gfx/imagemagick/imagemagick-6.9.9.31.ebuild
 1710060931 ./media-gfx/imagemagick/imagemagick-7.0.7.6.ebuild
 1712122209 ./media-gfx/imagemagick/imagemagick-7.0.7.11.ebuild
 1710060931 ./media-gfx/imagemagick/imagemagick-6.9.9.18.ebuild
@@ -10193,6 +10181,7 @@
 1711181607 ./media-gfx/librecad/librecad-2.1.3-r1.ebuild
 1702282250 ./media-gfx/bootsplash-themes/bootsplash-themes-20060913.ebuild
 1702282250 ./media-gfx/openclipart/openclipart-0.20.ebuild
+1801011610 ./media-gfx/maim/maim-9999.ebuild
 1708300923 ./media-gfx/maim/maim-5.4.63.ebuild
 1702282250 ./media-gfx/xzgv/xzgv-0.9.1.ebuild
 1712182209 ./media-gfx/digikam/digikam-5.7.0-r1.ebuild
@@ -10264,6 +10253,7 @@
 1702282250 ./media-gfx/aoi/aoi-2.5.ebuild
 1702282250 ./media-gfx/symboleditor/symboleditor-2.0.0.ebuild
 1711271510 ./media-gfx/geeqie/geeqie-1.3-r1.ebuild
+1801020240 ./media-gfx/geeqie/geeqie-1.4.ebuild
 1702282250 ./media-gfx/gqview/gqview-2.1.5-r1.ebuild
 1702282250 ./media-gfx/tintii/tintii-2.10.0.ebuild
 1708220314 ./media-gfx/jpegoptim/jpegoptim-1.4.3.ebuild
@@ -10859,7 +10849,7 @@
 1702282250 ./dev-vcs/svn2git/svn2git-1.0.10.ebuild
 1708272355 ./dev-vcs/svn2git/svn2git-9999.ebuild
 1708272355 ./dev-vcs/svn2git/svn2git-1.0.11.ebuild
-1702282250 ./dev-vcs/colorcvs/colorcvs-1.4-r1.ebuild
+1801012010 ./dev-vcs/colorcvs/colorcvs-1.4-r2.ebuild
 1704202348 ./dev-vcs/hg-fast-export/hg-fast-export-160914.ebuild
 1712021609 ./dev-vcs/bzr-xmloutput/bzr-xmloutput-0.8.8-r2.ebuild
 1708190330 ./dev-vcs/colorsvn/colorsvn-0.3.3.ebuild
@@ -12031,6 +12021,7 @@
 1702282250 ./net-firewall/ipkungfu/ipkungfu-0.5.2-r2.ebuild
 1712302310 ./net-firewall/shorewall/shorewall-5.1.9-r1.ebuild
 1712310340 ./net-firewall/shorewall/shorewall-5.1.10.1-r2.ebuild
+1801020040 ./net-firewall/shorewall/shorewall-5.1.10.2.ebuild
 1712292110 ./net-firewall/shorewall/shorewall-5.1.10.1.ebuild
 1702282250 ./net-firewall/nufw/nufw-2.2.22-r1.ebuild
 1704011900 ./net-firewall/nufw/nufw-2.2.22-r2.ebuild
@@ -12499,7 +12490,7 @@
 1704090052 ./dev-lang/parrot/parrot-7.5.0.ebuild
 1711032344 ./dev-lang/parrot/parrot-8.1.0.ebuild
 1702282250 ./dev-lang/maude/maude-2.7.ebuild
-1801010310 ./skel.ebuild
+1801021240 ./skel.ebuild
 1703101359 ./dev-python/python-lzo/python-lzo-1.08-r1.ebuild
 1707312111 ./dev-python/python-lzo/python-lzo-1.11.ebuild
 1708050006 ./dev-python/cliff-tablib/cliff-tablib-1.1.ebuild
@@ -12554,6 +12545,7 @@
 1702282250 ./dev-python/ttystatus/ttystatus-0.22.ebuild
 1702282250 ./dev-python/ttystatus/ttystatus-0.23.ebuild
 1702282250 ./dev-python/irman-python/irman-python-0.1-r1.ebuild
+1801011710 ./dev-python/PySDL2/PySDL2-0.9.6.ebuild
 1702282250 ./dev-python/storm/storm-0.20-r1.ebuild
 1709300330 ./dev-python/google-auth-httplib2/google-auth-httplib2-0.0.2.ebuild
 1712281709 ./dev-python/markdown/markdown-2.6.8.ebuild
@@ -13236,7 +13228,7 @@
 1703110551 ./dev-python/ipython_genutils/ipython_genutils-0.1.0.ebuild
 1703162211 ./dev-python/ipython_genutils/ipython_genutils-0.2.0.ebuild
 1710191119 ./dev-python/bcrypt/bcrypt-3.1.4.ebuild
-1709300226 ./dev-python/bcrypt/bcrypt-3.1.3.ebuild
+1801011440 ./dev-python/bcrypt/bcrypt-3.1.3.ebuild
 1703112001 ./dev-python/bcrypt/bcrypt-3.1.1.ebuild
 1703080553 ./dev-python/bcrypt/bcrypt-3.1.2.ebuild
 1702282250 ./dev-python/yolk/yolk-0.4.3-r1.ebuild
@@ -13413,7 +13405,6 @@
 1709241359 ./dev-python/configclass/configclass-0.1.0.ebuild
 1711222029 ./dev-python/pyblake2/pyblake2-0.9.3-r1.ebuild
 1712271839 ./dev-python/pyblake2/pyblake2-1.1.0.ebuild
-1711221948 ./dev-python/pyblake2/pyblake2-1.0.1.ebuild
 1703102340 ./dev-python/decoratortools/decoratortools-1.8-r1.ebuild
 1712170109 ./dev-python/namespace-sphinxcontrib/namespace-sphinxcontrib-1.0.ebuild
 1703161135 ./dev-python/functools32/functools32-3.2.3.ebuild
@@ -13772,7 +13763,7 @@
 1704241231 ./dev-python/logilab-common/logilab-common-1.2.2.ebuild
 1712170339 ./dev-python/logilab-common/logilab-common-1.4.1.ebuild
 1702282250 ./dev-python/pyrsistent/pyrsistent-0.12.0.ebuild
-1712282339 ./dev-python/pyrsistent/pyrsistent-0.13.0.ebuild
+1801020340 ./dev-python/pyrsistent/pyrsistent-0.13.0.ebuild
 1705151247 ./dev-python/pyrsistent/pyrsistent-0.12.1.ebuild
 1708061641 ./dev-python/zfec/zfec-1.4.24.ebuild
 1702282250 ./dev-python/astroid/astroid-1.3.8.ebuild
@@ -13912,7 +13903,6 @@
 1703110615 ./dev-python/traitlets/traitlets-4.3.1.ebuild
 1702282250 ./dev-python/URLObject/URLObject-2.4.0.ebuild
 1704201218 ./dev-python/URLObject/URLObject-2.4.2-r1.ebuild
-1711212047 ./dev-python/pygit2/pygit2-0.26.1.ebuild
 1705150133 ./dev-python/pygit2/pygit2-0.25.1.ebuild
 1712271539 ./dev-python/pygit2/pygit2-0.26.3.ebuild
 1703202101 ./dev-python/pytest-html/pytest-html-1.14.2.ebuild
@@ -14016,7 +14006,7 @@
 1702282250 ./dev-python/oslo-sphinx/oslo-sphinx-4.7.0.ebuild
 1712211039 ./dev-python/oslo-sphinx/oslo-sphinx-4.15.2.ebuild
 1707121742 ./dev-python/djangocms-file/djangocms-file-2.0.1.ebuild
-1712241209 ./dev-python/paramiko/paramiko-2.2.1.ebuild
+1801011440 ./dev-python/paramiko/paramiko-2.2.1.ebuild
 1702282250 ./dev-python/paramiko/paramiko-1.16.0.ebuild
 1705170206 ./dev-python/paramiko/paramiko-9999.ebuild
 1709260443 ./dev-python/paramiko/paramiko-2.3.1.ebuild
@@ -14183,6 +14173,7 @@
 1712100339 ./dev-python/typing/typing-3.5.3.0.ebuild
 1702282250 ./dev-python/django-annoying/django-annoying-0.8.7.ebuild
 1702282250 ./dev-python/django-annoying/django-annoying-0.7.7.ebuild
+1801012140 ./dev-python/pytest-qt/pytest-qt-2.3.0.ebuild
 1702282250 ./dev-python/django-registration/django-registration-1.0.ebuild
 1706271422 ./dev-python/nbsphinx/nbsphinx-0.2.13.ebuild
 1706280700 ./dev-python/nbsphinx/nbsphinx-0.2.14.ebuild
@@ -14586,7 +14577,7 @@
 1704202001 ./dev-python/asciitable/asciitable-0.8.0-r1.ebuild
 1703260625 ./dev-python/weakrefmethod/weakrefmethod-1.0.3.ebuild
 1711051204 ./dev-python/pynacl/pynacl-1.2.0.ebuild
-1712241209 ./dev-python/pynacl/pynacl-1.1.2.ebuild
+1801011440 ./dev-python/pynacl/pynacl-1.1.2.ebuild
 1703290443 ./dev-python/pynacl/pynacl-1.1.1.ebuild
 1710052259 ./dev-python/sphinxcontrib-ditaa/sphinxcontrib-ditaa-0.2.ebuild
 1705111529 ./dev-python/dockerpty/dockerpty-0.4.1.ebuild
@@ -15466,7 +15457,6 @@
 1712170039 ./dev-python/sqlalchemy/sqlalchemy-1.1.15.ebuild
 1706032359 ./dev-python/python3-openid/python3-openid-3.1.0.ebuild
 1702282250 ./dev-python/python3-openid/python3-openid-3.0.4_p1.ebuild
-1702282250 ./dev-python/pymountboot/pymountboot-0.2.1.ebuild
 1707121741 ./dev-python/pymountboot/pymountboot-9999.ebuild
 1707121741 ./dev-python/pymountboot/pymountboot-0.2.2.ebuild
 1709021722 ./dev-python/configshell-fb/configshell-fb-1.1.23.ebuild
@@ -15743,7 +15733,6 @@
 1702282250 ./dev-python/pymetar/pymetar-0.21.ebuild
 1712131239 ./dev-python/miniupnpc/miniupnpc-2.0.20170509.ebuild
 1712131109 ./dev-python/miniupnpc/miniupnpc-2.0.20171212.ebuild
-1711051519 ./dev-python/miniupnpc/miniupnpc-2.0.20171102.ebuild
 1702282250 ./dev-python/pymssql/pymssql-1.0.2-r1.ebuild
 1702282250 ./dev-python/aiohttp/aiohttp-1.0.4.ebuild
 1702282250 ./dev-python/aiohttp/aiohttp-1.0.5.ebuild
@@ -16580,10 +16569,8 @@
 1710230041 ./app-shells/dash/dash-0.5.9.1-r3.ebuild
 1702282250 ./app-shells/dash/dash-0.5.8.2.ebuild
 1711121226 ./app-shells/posh/posh-0.12.6.ebuild
-1704242128 ./app-shells/bash-completion/bash-completion-2.5.ebuild
 1710240031 ./app-shells/bash-completion/bash-completion-2.7-r1.ebuild
 1710240031 ./app-shells/bash-completion/bash-completion-9999.ebuild
-1707022122 ./app-shells/bash-completion/bash-completion-2.7.ebuild
 1706201615 ./app-shells/bash-completion/bash-completion-2.4-r1.ebuild
 1711230226 ./app-shells/mpibash/mpibash-9999.ebuild
 1711230226 ./app-shells/mpibash/mpibash-1.3.ebuild
@@ -16839,8 +16826,6 @@
 1709072226 ./dev-cpp/libxmlpp/libxmlpp-2.40.1.ebuild
 1711021145 ./dev-cpp/catch/catch-1.11.0.ebuild
 1711051519 ./dev-cpp/catch/catch-9999.ebuild
-1711021145 ./dev-cpp/catch/catch-2.0.0_pre6.ebuild
-1708271119 ./dev-cpp/catch/catch-1.10.0.ebuild
 1711051519 ./dev-cpp/catch/catch-1.9999.ebuild
 1711051519 ./dev-cpp/catch/catch-2.0.1.ebuild
 1702282250 ./dev-cpp/pngpp/pngpp-0.2.9.ebuild
@@ -16964,8 +16949,7 @@
 1702282250 ./sci-misc/vitables/vitables-2.1-r1.ebuild
 1702282250 ./sci-misc/lttoolbox/lttoolbox-3.3.3.ebuild
 1702282250 ./sci-misc/gato/gato-1.2.2.ebuild
-1709130222 ./sci-misc/nco/nco-3.9.9.ebuild
-1709130222 ./sci-misc/nco/nco-4.5.1-r2.ebuild
+1801020210 ./sci-misc/nco/nco-4.5.1-r2.ebuild
 1712271509 ./sci-misc/boinc/boinc-7.8.4.ebuild
 1702282250 ./sci-misc/fitscut/fitscut-1.4.4.ebuild
 1702282250 ./sci-misc/ncview/ncview-2.1.7.ebuild
@@ -18347,7 +18331,7 @@
 1707111456 ./media-radio/flrig/flrig-1.3.32.ebuild
 1705242032 ./media-radio/flrig/flrig-1.3.31.ebuild
 1702282250 ./media-radio/flrig/flrig-1.3.27.ebuild
-1712122209 ./media-radio/flrig/flrig-1.3.36.ebuild
+1801020410 ./media-radio/flrig/flrig-1.3.36.ebuild
 1704021015 ./media-radio/flrig/flrig-1.3.30.ebuild
 1712282009 ./media-radio/flrig/flrig-1.3.37.ebuild
 1702282250 ./media-radio/xdx/xdx-2.5.0.ebuild
@@ -18367,7 +18351,7 @@
 1706091309 ./media-radio/qrq/qrq-0.3.1-r1.ebuild
 1712221639 ./media-radio/flmsg/flmsg-4.0.3.ebuild
 1712221639 ./media-radio/tqsl/tqsl-2.3.1.ebuild
-1712191909 ./media-radio/xlog/xlog-2.0.15.ebuild
+1801020410 ./media-radio/xlog/xlog-2.0.15.ebuild
 1706091308 ./media-radio/xlog/xlog-2.0.14-r1.ebuild
 1702282250 ./media-radio/xlog/xlog-2.0.14.ebuild
 1708121745 ./media-radio/wsjtx/wsjtx-1.7.0.ebuild
@@ -18398,7 +18382,7 @@
 1706281640 ./media-radio/fldigi/fldigi-4.0.4-r1.ebuild
 1710262154 ./media-radio/fldigi/fldigi-4.0.8.ebuild
 1706221349 ./media-radio/fldigi/fldigi-4.0.4.ebuild
-1712122209 ./media-radio/fldigi/fldigi-4.0.12.ebuild
+1801020340 ./media-radio/fldigi/fldigi-4.0.12.ebuild
 1710162048 ./media-radio/fldigi/fldigi-4.0.11.ebuild
 1712191709 ./media-radio/tucnak/tucnak-4.11.ebuild
 1702282250 ./media-radio/ax25-apps/ax25-apps-0.0.8_rc4.ebuild
@@ -18902,7 +18886,7 @@
 1707101710 ./dev-php/ZendFramework/ZendFramework-1.12.9.ebuild
 1702282250 ./dev-php/pecl-xrange/pecl-xrange-1.3.2-r2.ebuild
 1702282250 ./dev-php/SabreAMF/SabreAMF-1.3.234_p0.ebuild
-1711060252 ./dev-php/PEAR-Exception/PEAR-Exception-1.0.0.ebuild
+1801012340 ./dev-php/PEAR-Exception/PEAR-Exception-1.0.0.ebuild
 1703290441 ./dev-php/ming-php/ming-php-0.4.7.ebuild
 1801010710 ./dev-php/ming-php/ming-php-0.4.8.ebuild
 1702282250 ./dev-php/PEAR-Crypt_HMAC2/PEAR-Crypt_HMAC2-1.0.0.ebuild
@@ -19105,7 +19089,7 @@
 1702282250 ./dev-php/pecl-sphinx/pecl-sphinx-1.3.3-r1.ebuild
 1707061736 ./dev-php/PEAR-HTML_Template_Flexy/PEAR-HTML_Template_Flexy-1.3.13.ebuild
 1702282250 ./dev-php/PEAR-PEAR/PEAR-PEAR-1.10.1-r1.ebuild
-1711060253 ./dev-php/PEAR-PEAR/PEAR-PEAR-1.10.5.ebuild
+1801012340 ./dev-php/PEAR-PEAR/PEAR-PEAR-1.10.5.ebuild
 1704132038 ./dev-php/PEAR-Net_Socket/PEAR-Net_Socket-1.2.2.ebuild
 1702282250 ./dev-php/PEAR-Net_Socket/PEAR-Net_Socket-1.0.14-r3.ebuild
 1703091944 ./dev-php/PEAR-Net_Socket/PEAR-Net_Socket-1.1.0.ebuild
@@ -19681,8 +19665,7 @@
 1712171639 ./app-text/sablotron/sablotron-1.0.3-r1.ebuild
 1702282250 ./app-text/unac/unac-1.8.0.ebuild
 1712142009 ./app-text/fbreader/fbreader-0.99.4-r4.ebuild
-1712090009 ./app-text/fbreader/fbreader-0.99.4-r3.ebuild
-1708241853 ./app-text/fbreader/fbreader-0.99.4-r2.ebuild
+1801020340 ./app-text/fbreader/fbreader-0.99.4-r3.ebuild
 1702282250 ./app-text/teckit/teckit-2.5.3.ebuild
 1702282250 ./app-text/teckit/teckit-2.5.1.ebuild
 1707071203 ./app-text/teckit/teckit-2.5.6.ebuild
@@ -20117,7 +20100,6 @@
 1702282250 ./www-apps/dspam-web/dspam-web-3.10.1.ebuild
 1711300110 ./www-apps/chromedriver-bin/chromedriver-bin-2.30.ebuild
 1711300110 ./www-apps/chromedriver-bin/chromedriver-bin-2.24.ebuild
-1702282250 ./www-apps/eyeos/eyeos-2.5.ebuild
 1702282250 ./www-apps/dotproject/dotproject-2.1.7-r1.ebuild
 1702282250 ./www-apps/mypictures/mypictures-20040202-r1.ebuild
 1702282250 ./www-apps/mypictures/mypictures-20040202.ebuild
@@ -20902,8 +20884,6 @@
 1702282250 ./dev-util/xdelta/xdelta-1.1.4-r1.ebuild
 1703211841 ./dev-util/scons/scons-2.5.1.ebuild
 1710300051 ./dev-util/scons/scons-3.0.0.ebuild
-1702282250 ./dev-util/scons/scons-2.3.5.ebuild
-1702282250 ./dev-util/scons/scons-2.5.0.ebuild
 1703010334 ./dev-util/scons/scons-2.4.1.ebuild
 1712021609 ./dev-util/jconfig/jconfig-2.8-r3.ebuild
 1712021609 ./dev-util/jconfig/jconfig-2.9.ebuild
@@ -21001,10 +20981,9 @@
 1702282250 ./dev-util/lttng-ust/lttng-ust-2.7.4.ebuild
 1707111139 ./dev-util/lttng-ust/lttng-ust-2.8.1.ebuild
 1702282250 ./dev-util/lttng-ust/lttng-ust-2.7.1.ebuild
-1711180211 ./dev-util/strace/strace-4.19.ebuild
 1711180211 ./dev-util/strace/strace-4.16.ebuild
-1711221837 ./dev-util/strace/strace-4.20.ebuild
-1711221837 ./dev-util/strace/strace-9999.ebuild
+1801020110 ./dev-util/strace/strace-4.20.ebuild
+1801020110 ./dev-util/strace/strace-9999.ebuild
 1704202347 ./dev-util/trace-cmd/trace-cmd-2.6.ebuild
 1704202347 ./dev-util/trace-cmd/trace-cmd-2.5.1.ebuild
 1702282250 ./dev-util/obs-service-verify_file/obs-service-verify_file-20130403.ebuild
@@ -21029,7 +21008,6 @@
 1711030019 ./dev-util/visualvm/visualvm-1.3.9.ebuild
 1706202355 ./dev-util/deskzilla/deskzilla-1.7.1-r1.ebuild
 1708301012 ./dev-util/abi-compliance-checker/abi-compliance-checker-2.2.ebuild
-1706171015 ./dev-util/abi-compliance-checker/abi-compliance-checker-2.1.ebuild
 1707301237 ./dev-util/abi-compliance-checker/abi-compliance-checker-9999.ebuild
 1709242154 ./dev-util/promu/promu-0.1.0.ebuild
 1702282250 ./dev-util/build/build-0.3.10.ebuild
@@ -21270,9 +21248,8 @@
 1703060258 ./dev-util/rustfmt/rustfmt-0.5.0.ebuild
 1703060258 ./dev-util/rustfmt/rustfmt-0.6.3.ebuild
 1710292033 ./dev-util/cookiecutter/cookiecutter-1.6.0.ebuild
-1710272058 ./dev-util/bcc/bcc-0.4.0.ebuild
 1712142239 ./dev-util/bcc/bcc-0.5.0.ebuild
-1709151038 ./dev-util/bcc/bcc-0.3.0_p20170913.ebuild
+1801020510 ./dev-util/bcc/bcc-0.5.0_p20171230.ebuild
 1706050305 ./dev-util/sysprof/sysprof-3.22.2.ebuild
 1706050305 ./dev-util/sysprof/sysprof-3.24.1.ebuild
 1702282250 ./dev-util/dejagnu/dejagnu-1.5.ebuild
@@ -21366,7 +21343,6 @@
 1712052239 ./dev-util/pkgconf/pkgconf-1.3.10.ebuild
 1702282250 ./dev-util/obs-service-tar_scm/obs-service-tar_scm-0.3.1.ebuild
 1708261636 ./dev-util/shadowman/shadowman-9999.ebuild
-1708281822 ./dev-util/shadowman/shadowman-1.ebuild
 1710020850 ./dev-util/shadowman/shadowman-2.ebuild
 1709230100 ./dev-util/pkgcheck/pkgcheck-9999.ebuild
 1709230100 ./dev-util/pkgcheck/pkgcheck-0.5.4.ebuild
@@ -21391,8 +21367,6 @@
 1702282250 ./dev-util/obs-service-github_tarballs/obs-service-github_tarballs-0.2.1.ebuild
 1702282250 ./dev-util/diffuse/diffuse-0.4.8.ebuild
 1709052013 ./dev-util/abi-dumper/abi-dumper-1.1.ebuild
-1702282250 ./dev-util/abi-dumper/abi-dumper-0.99.15.ebuild
-1702282250 ./dev-util/abi-dumper/abi-dumper-0.99.19.ebuild
 1702282250 ./dev-util/regexxer/regexxer-0.10.ebuild
 1712281439 ./dev-util/eric/eric-17.09.ebuild
 1712281439 ./dev-util/eric/eric-17.11.ebuild
@@ -24099,11 +24073,8 @@
 1702282250 ./app-portage/g-octave/g-octave-0.4.1-r5.ebuild
 1704221256 ./app-portage/install-mask/install-mask-0.1.1.ebuild
 1704221256 ./app-portage/install-mask/install-mask-9999.ebuild
-1703241804 ./app-portage/eclass-manpages/eclass-manpages-99999999.ebuild
-1707120116 ./app-portage/eclass-manpages/eclass-manpages-20170712.ebuild
-1705211619 ./app-portage/eclass-manpages/eclass-manpages-20170521.ebuild
-1703241804 ./app-portage/eclass-manpages/eclass-manpages-20170321.ebuild
-1704281642 ./app-portage/eclass-manpages/eclass-manpages-20170428.ebuild
+1801020940 ./app-portage/eclass-manpages/eclass-manpages-99999999.ebuild
+1801020940 ./app-portage/eclass-manpages/eclass-manpages-20180101.ebuild
 1709052015 ./app-portage/eclass-manpages/eclass-manpages-20170905.ebuild
 1708250103 ./app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild
 1708250103 ./app-portage/smart-live-rebuild/smart-live-rebuild-1.3.5.ebuild
@@ -24183,7 +24154,6 @@
 1710051426 ./app-portage/mirrorselect/mirrorselect-2.2.3.ebuild
 1705221949 ./app-portage/gpyutils/gpyutils-0.2.1.ebuild
 1705141312 ./app-portage/gpyutils/gpyutils-9999.ebuild
-1705141312 ./app-portage/gpyutils/gpyutils-0.1.4.ebuild
 1709021750 ./app-portage/elogviewer/elogviewer-2.6-r1.ebuild
 1709021750 ./app-portage/elogviewer/elogviewer-0.6.2-r3.ebuild
 1709021750 ./app-portage/elogviewer/elogviewer-2.6.ebuild
@@ -24193,10 +24163,8 @@
 1709021750 ./app-portage/elogviewer/elogviewer-2.1-r2.ebuild
 1702282250 ./app-portage/gpytage/gpytage-0.3.0_rc1-r1.ebuild
 1702282250 ./app-portage/distpatch/distpatch-0.1.2.ebuild
-1712252239 ./app-portage/gemato/gemato-9.2.ebuild
+1801020940 ./app-portage/gemato/gemato-9.2.ebuild
 1712101340 ./app-portage/gemato/gemato-9999.ebuild
-1712050139 ./app-portage/gemato/gemato-8.ebuild
-1712031409 ./app-portage/gemato/gemato-9.1.ebuild
 1712300309 ./app-portage/unsymlink-lib/unsymlink-lib-8.ebuild
 1712192039 ./app-portage/unsymlink-lib/unsymlink-lib-9999.ebuild
 1712210039 ./app-portage/unsymlink-lib/unsymlink-lib-6.ebuild
@@ -24222,14 +24190,12 @@
 1702282250 ./app-portage/layman/layman-2.2.0-r7.ebuild
 1707201040 ./app-portage/deltup/deltup-0.4.6-r1.ebuild
 1712150139 ./app-portage/unsandbox/unsandbox-2.ebuild
-1709062352 ./app-portage/unsandbox/unsandbox-1.ebuild
 1710091733 ./app-portage/porthole/porthole-0.6.1-r4.ebuild
 1712251809 ./app-portage/grs/grs-0.5.ebuild
 1712271109 ./app-portage/grs/grs-9999.ebuild
 1712272039 ./app-portage/grs/grs-0.6.ebuild
 1703042153 ./app-portage/cpuid2cpuflags/cpuid2cpuflags-9999.ebuild
 1712021309 ./app-portage/cpuid2cpuflags/cpuid2cpuflags-5.ebuild
-1704181225 ./app-portage/cpuid2cpuflags/cpuid2cpuflags-4.ebuild
 1702282250 ./app-portage/cpuid2cpuflags/cpuid2cpuflags-1.ebuild
 1702282250 ./app-portage/overlint/overlint-0.5.2.ebuild
 1705221848 ./app-portage/overlint/overlint-0.5.3.ebuild
@@ -24331,6 +24297,7 @@
 1702282250 ./media-sound/gigedit/gigedit-0.2.0-r1.ebuild
 1708312353 ./media-sound/musique/musique-1.5.ebuild
 1712022009 ./media-sound/alsaplayer/alsaplayer-0.99.81.ebuild
+1801012210 ./media-sound/alsaplayer/alsaplayer-0.99.81-r1.ebuild
 1709232245 ./media-sound/abcde/abcde-2.8.1.ebuild
 1702282250 ./media-sound/abcde/abcde-2.5.4-r1.ebuild
 1708311620 ./media-sound/opus-tools/opus-tools-0.1.10.ebuild
@@ -24728,7 +24695,7 @@
 1708130215 ./media-sound/sound-juicer/sound-juicer-3.24.0.ebuild
 1704011931 ./media-sound/sound-juicer/sound-juicer-3.22.1.ebuild
 1712141139 ./media-sound/amarok/amarok-2.8.90-r5.ebuild
-1706211347 ./media-sound/timidity++/timidity++-2.14.0-r2.ebuild
+1801012210 ./media-sound/timidity++/timidity++-2.14.0-r2.ebuild
 1702282250 ./media-sound/taginfo/taginfo-1.2-r1.ebuild
 1702282250 ./media-sound/flacon/flacon-2.1.1.ebuild
 1712162039 ./media-sound/flacon/flacon-3.1.1.ebuild
@@ -24815,8 +24782,8 @@
 1705061026 ./media-sound/mpc/mpc-0.28.ebuild
 1702282250 ./media-sound/mpc/mpc-0.27.ebuild
 1702282250 ./media-sound/rawrec/rawrec-0.9.991.ebuild
-1712191239 ./media-sound/clementine/clementine-1.3.1_p20171113.ebuild
-1712040109 ./media-sound/clementine/clementine-9999.ebuild
+1801021140 ./media-sound/clementine/clementine-1.3.1_p20171113.ebuild
+1801021140 ./media-sound/clementine/clementine-9999.ebuild
 1702282250 ./media-sound/moosic/moosic-1.5.6-r1.ebuild
 1709111509 ./media-sound/audacity/audacity-2.1.3-r1.ebuild
 1712071439 ./media-sound/audacity/audacity-2.2.1.ebuild
@@ -24825,6 +24792,7 @@
 1702282250 ./media-sound/mt-daapd/mt-daapd-0.2.4.2.ebuild
 1702282250 ./media-sound/id3v2/id3v2-0.1.12.ebuild
 1709262110 ./media-sound/hydrogen/hydrogen-0.9.5-r1.ebuild
+1801011440 ./media-sound/hydrogen/hydrogen-9999.ebuild
 1707291340 ./media-sound/vorbis-tools/vorbis-tools-1.4.0-r4.ebuild
 1712110040 ./media-sound/vorbis-tools/vorbis-tools-1.4.0-r3.ebuild
 1712241839 ./media-sound/soundconverter/soundconverter-3.0.0_beta1.ebuild
@@ -25069,13 +25037,8 @@
 1702282250 ./sys-fs/bcache-tools/bcache-tools-9999.ebuild
 1702282250 ./sys-fs/bcache-tools/bcache-tools-1.0.5.ebuild
 1702282250 ./sys-fs/scan-ffs/scan-ffs-1.2.ebuild
-1702282250 ./sys-fs/duperemove/duperemove-0.09.2.ebuild
 1702282250 ./sys-fs/duperemove/duperemove-0.10.ebuild
-1702282250 ./sys-fs/duperemove/duperemove-0.09.1.ebuild
-1702282250 ./sys-fs/duperemove/duperemove-0.09.3.ebuild
 1709081032 ./sys-fs/duperemove/duperemove-0.11_beta4.ebuild
-1702282250 ./sys-fs/duperemove/duperemove-0.09.5.ebuild
-1702282250 ./sys-fs/duperemove/duperemove-0.09.4.ebuild
 1701181256 ./sys-fs/xfsdump/xfsdump-3.1.6.ebuild
 1710041845 ./sys-fs/xfsdump/xfsdump-3.1.8.ebuild
 1702282250 ./sys-fs/vzquota/vzquota-3.1.ebuild
@@ -25294,9 +25257,9 @@
 1710112215 ./sys-fs/cryfs/cryfs-9999.ebuild
 1710112215 ./sys-fs/cryfs/cryfs-0.9.7.ebuild
 1709280203 ./sys-fs/xfsprogs/xfsprogs-4.13.1.ebuild
-1711160142 ./sys-fs/xfsprogs/xfsprogs-4.9.0.ebuild
+1801012240 ./sys-fs/xfsprogs/xfsprogs-4.9.0.ebuild
 1702282250 ./sys-fs/xfsprogs/xfsprogs-4.5.0.ebuild
-1711280310 ./sys-fs/xfsprogs/xfsprogs-4.14.0.ebuild
+1801020140 ./sys-fs/xfsprogs/xfsprogs-4.14.0.ebuild
 1707252210 ./sys-fs/xfsprogs/xfsprogs-4.12.0.ebuild
 1701111316 ./sys-fs/udftools/udftools-1.1.ebuild
 1701241022 ./sys-fs/udftools/udftools-1.3.ebuild
@@ -25364,6 +25327,7 @@
 1706172024 ./sys-boot/grub/grub-2.02.ebuild
 1801010110 ./sys-boot/grub/grub-0.97-r16.ebuild
 1801010110 ./sys-boot/grub/grub-0.97-r18.ebuild
+1801020210 ./sys-boot/silo/silo-1.4.14_p20120819-r1.ebuild
 1702282250 ./sys-boot/silo/silo-1.4.14_p20120226.ebuild
 1702282250 ./sys-boot/silo/silo-1.4.14_p20100228.ebuild
 1702282250 ./sys-boot/silo/silo-1.4.14_p20120819.ebuild
@@ -25417,8 +25381,6 @@
 1711221248 ./x11-drivers/nvidia-drivers/nvidia-drivers-378.13-r1.ebuild
 1712211809 ./x11-drivers/nvidia-drivers/nvidia-drivers-387.22.ebuild
 1703112157 ./x11-drivers/xf86-video-nv/xf86-video-nv-2.1.21.ebuild
-1702282250 ./x11-drivers/xf86-video-suntcx/xf86-video-suntcx-1.1.2.ebuild
-1702282250 ./x11-drivers/xf86-video-suntcx/xf86-video-suntcx-1.1.1.ebuild
 1702282250 ./x11-drivers/xf86-video-vmware/xf86-video-vmware-13.1.0.ebuild
 1702282250 ./x11-drivers/xf86-video-vmware/xf86-video-vmware-13.0.1-r1.ebuild
 1703171326 ./x11-drivers/xf86-video-vmware/xf86-video-vmware-13.2.1.ebuild
@@ -25427,7 +25389,6 @@
 1712292110 ./x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.30.ebuild
 1706191626 ./x11-drivers/xf86-input-acecad/xf86-input-acecad-1.5.0.ebuild
 1703101359 ./x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.9.0.ebuild
-1702282250 ./x11-drivers/xf86-video-ark/xf86-video-ark-0.7.5.ebuild
 1703112157 ./x11-drivers/xf86-video-mga/xf86-video-mga-1.6.5.ebuild
 1708161015 ./x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.15.ebuild
 1708161015 ./x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.13.ebuild
@@ -25439,70 +25400,35 @@
 1706191558 ./x11-drivers/xf86-input-void/xf86-input-void-1.4.1.ebuild
 1702282250 ./x11-drivers/xf86-input-void/xf86-input-void-1.4.0.ebuild
 1706191626 ./x11-drivers/xf86-input-mutouch/xf86-input-mutouch-1.3.0.ebuild
-1702282250 ./x11-drivers/xf86-video-rendition/xf86-video-rendition-4.2.6.ebuild
 1706011213 ./x11-drivers/xf86-input-mtrack/xf86-input-mtrack-0.4.1.ebuild
 1702282250 ./x11-drivers/xf86-input-mtrack/xf86-input-mtrack-0.3.1.ebuild
 1702282250 ./x11-drivers/xf86-input-mtrack/xf86-input-mtrack-0.3.0.ebuild
-1702282250 ./x11-drivers/xf86-video-suncg14/xf86-video-suncg14-1.1.2.ebuild
-1702282250 ./x11-drivers/xf86-video-suncg14/xf86-video-suncg14-1.1.1.ebuild
 1703081044 ./x11-drivers/xf86-video-omap/xf86-video-omap-0.4.5.ebuild
 1702282250 ./x11-drivers/xf86-input-tslib/xf86-input-tslib-0.0.6-r2.ebuild
 1706191626 ./x11-drivers/xf86-input-tslib/xf86-input-tslib-0.0.6-r3.ebuild
-1703112157 ./x11-drivers/xf86-video-chips/xf86-video-chips-1.2.7.ebuild
 1702282250 ./x11-drivers/xf86-video-fbdev/xf86-video-fbdev-0.4.4.ebuild
-1703112157 ./x11-drivers/xf86-video-i740/xf86-video-i740-1.3.6.ebuild
-1702282250 ./x11-drivers/xf86-video-suncg6/xf86-video-suncg6-1.1.1.ebuild
-1702282250 ./x11-drivers/xf86-video-suncg6/xf86-video-suncg6-1.1.2.ebuild
-1702282250 ./x11-drivers/xf86-video-sunleo/xf86-video-sunleo-1.2.1.ebuild
-1702282250 ./x11-drivers/xf86-video-sunleo/xf86-video-sunleo-1.2.2.ebuild
-1702282250 ./x11-drivers/xf86-video-sunleo/xf86-video-sunleo-1.2.0.ebuild
 1702282250 ./x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.8.ebuild
 1702282250 ./x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.6.ebuild
 1702282250 ./x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.7.ebuild
 1704210951 ./x11-drivers/xf86-video-qxl/xf86-video-qxl-0.1.5.ebuild
 1702282250 ./x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-9999.ebuild
 1703101359 ./x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-13.1.0-r1.ebuild
-1702282250 ./x11-drivers/xf86-video-apm/xf86-video-apm-1.2.4.ebuild
-1702282250 ./x11-drivers/xf86-video-apm/xf86-video-apm-1.2.5-r1.ebuild
-1702282250 ./x11-drivers/xf86-video-apm/xf86-video-apm-1.2.5.ebuild
 1712190639 ./x11-drivers/xf86-video-vboxvideo/xf86-video-vboxvideo-1.0.0.ebuild
-1702282250 ./x11-drivers/xf86-video-sunffb/xf86-video-sunffb-1.2.1.ebuild
-1702282250 ./x11-drivers/xf86-video-sunffb/xf86-video-sunffb-1.2.2-r1.ebuild
 1706191626 ./x11-drivers/xf86-input-joystick/xf86-input-joystick-1.6.3.ebuild
-1712020139 ./x11-drivers/afb-ucode/afb-ucode-1.3.11.ebuild
 1706191558 ./x11-drivers/xf86-input-hyperpen/xf86-input-hyperpen-1.4.1.ebuild
 1711252340 ./x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-1.3.0.ebuild
 1711252340 ./x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-9999.ebuild
 1711252340 ./x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-1.4.0.ebuild
 1703161114 ./x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.5.ebuild
-1702282250 ./x11-drivers/xf86-video-freedreno/xf86-video-freedreno-1.1.0.ebuild
-1702282250 ./x11-drivers/xf86-video-freedreno/xf86-video-freedreno-1.3.0.ebuild
-1702282250 ./x11-drivers/xf86-video-freedreno/xf86-video-freedreno-1.4.0.ebuild
-1702282250 ./x11-drivers/xf86-video-freedreno/xf86-video-freedreno-1.0.0.ebuild
-1702282250 ./x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.5.1.ebuild
-1702282250 ./x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.5.3.ebuild
-1702282250 ./x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.5.2.ebuild
-1702282250 ./x11-drivers/xf86-video-tga/xf86-video-tga-1.2.2-r1.ebuild
-1702282250 ./x11-drivers/xf86-video-tga/xf86-video-tga-1.2.2.ebuild
 1711240806 ./x11-drivers/xf86-video-ati/xf86-video-ati-7.9.0.ebuild
 1711240806 ./x11-drivers/xf86-video-ati/xf86-video-ati-7.10.0.ebuild
-1702282250 ./x11-drivers/xf86-video-mach64/xf86-video-mach64-6.9.5.ebuild
 1702282250 ./x11-drivers/xf86-video-ast/xf86-video-ast-1.0.1.ebuild
 1702282250 ./x11-drivers/xf86-video-ast/xf86-video-ast-1.1.5.ebuild
 1702282250 ./x11-drivers/xf86-video-ast/xf86-video-ast-0.97.0-r1.ebuild
-1702282250 ./x11-drivers/xf86-video-s3virge/xf86-video-s3virge-1.10.7.ebuild
-1702282250 ./x11-drivers/xf86-video-tseng/xf86-video-tseng-1.2.5-r1.ebuild
 1702282250 ./x11-drivers/xf86-video-newport/xf86-video-newport-0.2.4.ebuild
 1702282250 ./x11-drivers/xf86-video-newport/xf86-video-newport-0.2.3.ebuild
-1702282250 ./x11-drivers/xf86-video-suncg3/xf86-video-suncg3-1.1.1.ebuild
-1702282250 ./x11-drivers/xf86-video-suncg3/xf86-video-suncg3-1.1.2.ebuild
 1706191558 ./x11-drivers/xf86-input-aiptek/xf86-input-aiptek-1.4.1-r1.ebuild
 1702282250 ./x11-drivers/xf86-input-aiptek/xf86-input-aiptek-1.4.1.ebuild
-1703112158 ./x11-drivers/xf86-video-trident/xf86-video-trident-1.3.8.ebuild
-1702282250 ./x11-drivers/xf86-video-s3/xf86-video-s3-0.6.5.ebuild
-1702282250 ./x11-drivers/xf86-video-s3/xf86-video-s3-0.6.5-r1.ebuild
-1706191558 ./x11-drivers/xf86-video-sisusb/xf86-video-sisusb-0.9.7.ebuild
-1703112157 ./x11-drivers/xf86-video-sis/xf86-video-sis-0.10.9.ebuild
 1702282250 ./x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.3.ebuild
 1702282250 ./x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.4.ebuild
 1702282250 ./x11-drivers/xf86-video-geode/xf86-video-geode-2.11.18.ebuild
@@ -25511,11 +25437,7 @@
 1710272236 ./x11-drivers/xf86-input-libinput/xf86-input-libinput-0.26.0.ebuild
 1703161114 ./x11-drivers/xf86-input-libinput/xf86-input-libinput-0.24.0.ebuild
 1706241140 ./x11-drivers/xf86-input-libinput/xf86-input-libinput-0.25.1.ebuild
-1702282250 ./x11-drivers/xf86-video-neomagic/xf86-video-neomagic-1.2.9.ebuild
 1706191626 ./x11-drivers/xf86-input-penmount/xf86-input-penmount-1.5.0.ebuild
-1702282250 ./x11-drivers/xf86-video-i128/xf86-video-i128-1.3.6-r1.ebuild
-1702282250 ./x11-drivers/xf86-video-i128/xf86-video-i128-1.3.5.ebuild
-1702282250 ./x11-drivers/xf86-video-i128/xf86-video-i128-1.3.6.ebuild
 1703112157 ./x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.4.7.ebuild
 1703101359 ./x11-drivers/xf86-video-siliconmotion/xf86-video-siliconmotion-1.7.9.ebuild
 1706191558 ./x11-drivers/xf86-input-elographics/xf86-input-elographics-1.4.1.ebuild
@@ -25528,10 +25450,8 @@
 1703112157 ./x11-drivers/xf86-input-wacom/xf86-input-wacom-0.34.0.ebuild
 1707211136 ./x11-drivers/xf86-input-wacom/xf86-input-wacom-0.35.0.ebuild
 1706191558 ./x11-drivers/xf86-input-fpit/xf86-input-fpit-1.4.0.ebuild
-1703112157 ./x11-drivers/xf86-video-savage/xf86-video-savage-2.3.9.ebuild
 1703112157 ./x11-drivers/xf86-video-glint/xf86-video-glint-1.2.9.ebuild
 1703112157 ./x11-drivers/xf86-video-r128/xf86-video-r128-6.10.2.ebuild
-1702282250 ./x11-drivers/xf86-video-opentegra/xf86-video-opentegra-0.7.0.ebuild
 1712101510 ./kde-frameworks/kemoticons/kemoticons-5.41.0.ebuild
 1712101510 ./kde-frameworks/kemoticons/kemoticons-5.40.0.ebuild
 1712101510 ./kde-frameworks/kjobwidgets/kjobwidgets-5.40.0.ebuild
@@ -29091,7 +29011,6 @@
 1712281609 ./sci-electronics/gerbv/gerbv-2.6.1.ebuild
 1702282250 ./sci-electronics/gerbv/gerbv-2.6.0.ebuild
 1702282250 ./sci-electronics/gnetman/gnetman-0.0.1_pre20110124.ebuild
-1712032039 ./sci-electronics/ngspice/ngspice-26.ebuild
 1712291839 ./sci-electronics/ngspice/ngspice-27-r1.ebuild
 1712280039 ./sci-electronics/ngspice/ngspice-27.ebuild
 1707082207 ./sci-electronics/systemc/systemc-2.3.0-r1.ebuild
@@ -29956,7 +29875,6 @@
 1702282250 ./net-dns/dnstop/dnstop-20140915.ebuild
 1711302210 ./net-dns/pdns/pdns-4.1.0.ebuild
 1712011439 ./net-dns/pdns/pdns-4.0.5.ebuild
-1702282250 ./net-dns/ldns-utils/ldns-utils-1.6.12.ebuild
 1712122209 ./net-dns/ldns-utils/ldns-utils-1.7.0.ebuild
 1703161518 ./net-dns/ldns-utils/ldns-utils-1.6.17.ebuild
 1801010110 ./net-dns/ldns-utils/ldns-utils-1.7.0-r1.ebuild
@@ -31817,7 +31735,6 @@
 1702282250 ./dev-dotnet/dbus-sharp/dbus-sharp-0.7.0-r2.ebuild
 1702282250 ./dev-dotnet/dbus-sharp/dbus-sharp-0.8.1.ebuild
 1702282250 ./dev-dotnet/pe-format/pe-format-9999.ebuild
-1702282250 ./dev-dotnet/pe-format/pe-format-2.1.2.ebuild
 1702282250 ./dev-dotnet/pe-format/pe-format-2.1.2-r1.ebuild
 1702282250 ./dev-dotnet/notify-sharp/notify-sharp-0.4.0_pre20090305-r1.ebuild
 1702282250 ./dev-dotnet/flickrnet-bin/flickrnet-bin-2.2-r1.ebuild
@@ -32081,6 +31998,7 @@
 1702282250 ./net-misc/pyhoca-gui/pyhoca-gui-0.5.0.6.ebuild
 1709251714 ./net-misc/pyhoca-gui/pyhoca-gui-0.5.0.7.ebuild
 1702282250 ./net-misc/l7-protocols/l7-protocols-2009.05.28.ebuild
+1801021110 ./net-misc/babeld/babeld-1.8.0.ebuild
 1702282250 ./net-misc/netpipes/netpipes-4.2-r2.ebuild
 1702282250 ./net-misc/asterisk-extra-sounds/asterisk-extra-sounds-1.4.11.ebuild
 1712030509 ./net-misc/telnet-bsd/telnet-bsd-1.2-r1.ebuild
@@ -32134,7 +32052,7 @@
 1711100154 ./net-misc/pps-tools/pps-tools-0.0.20120407.ebuild
 1711100154 ./net-misc/pps-tools/pps-tools-1.0.1.ebuild
 1702282250 ./net-misc/linux-eoip/linux-eoip-0.5.ebuild
-1702282250 ./net-misc/aget/aget-0.4.1-r1.ebuild
+1801012010 ./net-misc/aget/aget-0.4.1-r2.ebuild
 1707071623 ./net-misc/ipv6calc/ipv6calc-0.99.2.ebuild
 1706261714 ./net-misc/ipv6calc/ipv6calc-1.0.0.ebuild
 1702282250 ./net-misc/ipv6calc/ipv6calc-0.97.4.ebuild
@@ -32277,11 +32195,9 @@
 1710191313 ./net-misc/owncloud-client/owncloud-client-2.3.2-r2.ebuild
 1710191313 ./net-misc/owncloud-client/owncloud-client-2.3.3-r1.ebuild
 1702282250 ./net-misc/autoupnp/autoupnp-0.4.7.ebuild
-1702282250 ./net-misc/autoupnp/autoupnp-0.4.6.ebuild
 1702282250 ./net-misc/autoupnp/autoupnp-9999.ebuild
 1702282250 ./net-misc/getdate/getdate-1.2-r1.ebuild
 1702282250 ./net-misc/minissdpd/minissdpd-1.5.20161216.ebuild
-1702282250 ./net-misc/minissdpd/minissdpd-1.5.20160301.ebuild
 1702282250 ./net-misc/plowshare/plowshare-9999.ebuild
 1704031312 ./net-misc/plowshare/plowshare-2.1.6.ebuild
 1708301356 ./net-misc/plowshare/plowshare-2.1.7.ebuild
@@ -32448,7 +32364,6 @@
 1709030446 ./net-misc/modemmanager/modemmanager-1.6.4.ebuild
 1702282250 ./net-misc/ifenslave/ifenslave-1.1.0-r6.ebuild
 1706211304 ./net-misc/npapi-sdk/npapi-sdk-9999.ebuild
-1702282250 ./net-misc/npapi-sdk/npapi-sdk-0.27.ebuild
 1706211304 ./net-misc/npapi-sdk/npapi-sdk-0.27.2.ebuild
 1709230945 ./net-misc/openssh-blacklist/openssh-blacklist-0.4.1.ebuild
 1709020046 ./net-misc/sock/sock-1.1-r1.ebuild
@@ -32480,9 +32395,9 @@
 1702282250 ./net-misc/stone/stone-2.3e-r1.ebuild
 1702282250 ./net-misc/iaxmodem/iaxmodem-1.3.0-r1.ebuild
 1712192239 ./net-misc/vinagre/vinagre-3.22.0-r2.ebuild
-1710041145 ./net-misc/icaclient/icaclient-13.7.0.10276925.ebuild
-1710041145 ./net-misc/icaclient/icaclient-13.7.0.10276927.ebuild
-1710041145 ./net-misc/icaclient/icaclient-13.6.0.10243651.ebuild
+1801021140 ./net-misc/icaclient/icaclient-13.7.0.10276925.ebuild
+1801021140 ./net-misc/icaclient/icaclient-13.7.0.10276927.ebuild
+1801021140 ./net-misc/icaclient/icaclient-13.8.0.10299729.ebuild
 1702282250 ./net-misc/streamtuner/streamtuner-0.99.99-r5.ebuild
 1702282250 ./net-misc/rwbs/rwbs-0.27-r2.ebuild
 1705301021 ./net-misc/yandex-disk/yandex-disk-0.1.5.940_p1.ebuild
@@ -32503,7 +32418,7 @@
 1702282250 ./net-misc/rdate/rdate-1.4-r4.ebuild
 1702282250 ./net-misc/rdate/rdate-1.4-r3.ebuild
 1706191626 ./net-misc/netkit-rsh/netkit-rsh-0.17-r10.ebuild
-1702282250 ./net-misc/ipsvd/ipsvd-1.0.0-r1.ebuild
+1801012010 ./net-misc/ipsvd/ipsvd-1.0.0-r2.ebuild
 1702282250 ./net-misc/netkit-rwall/netkit-rwall-0.17-r1.ebuild
 1712251939 ./net-misc/networkmanager/networkmanager-1.10.2.ebuild
 1709030414 ./net-misc/networkmanager/networkmanager-1.8.2.ebuild
@@ -32534,7 +32449,6 @@
 1703161530 ./net-misc/lksctp-tools/lksctp-tools-1.0.16.ebuild
 1702282250 ./net-misc/ices/ices-2.0.2.ebuild
 1702282250 ./net-misc/ices/ices-2.0.1-r1.ebuild
-1702282250 ./net-misc/miniupnpd/miniupnpd-2.0.20161216.ebuild
 1712131109 ./net-misc/miniupnpd/miniupnpd-2.0.20171212.ebuild
 1702282250 ./net-misc/ris-linux/ris-linux-0.4-r1.ebuild
 1702282250 ./net-misc/switzerland/switzerland-0.1.0.ebuild
@@ -32545,7 +32459,6 @@
 1708061641 ./net-misc/udpxy/udpxy-1.0.23.7-r2.ebuild
 1704211521 ./net-misc/hath/hath-0.4.1.ebuild
 1702282250 ./net-misc/hath/hath-0.3.0.ebuild
-1702282250 ./net-misc/ocsync/ocsync-0.90.4.ebuild
 1704011931 ./net-misc/gnome-online-miners/gnome-online-miners-3.22.0.ebuild
 1708151256 ./net-misc/gnome-online-miners/gnome-online-miners-3.24.0.ebuild
 1702282250 ./net-misc/blinkperl/blinkperl-20030301-r2.ebuild
@@ -32578,7 +32491,7 @@
 1702282250 ./net-misc/ntpclient/ntpclient-2010.365.ebuild
 1708190952 ./net-misc/iputils/iputils-20161105.ebuild
 1710302140 ./net-misc/iputils/iputils-99999999.ebuild
-1710300129 ./net-misc/iputils/iputils-20171016_pre.ebuild
+1801021110 ./net-misc/iputils/iputils-20171016_pre.ebuild
 1708190952 ./net-misc/iputils/iputils-20151218.ebuild
 1708190952 ./net-misc/iputils/iputils-20121221-r2.ebuild
 1708190952 ./net-misc/iputils/iputils-20121221-r1.ebuild
@@ -32708,11 +32621,8 @@
 1707071449 ./net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20170310.ebuild
 1702282250 ./net-misc/ndppd/ndppd-0.2.5.ebuild
 1702282250 ./net-misc/mrouted/mrouted-3.9.5-r1.ebuild
-1710041112 ./net-misc/aria2/aria2-1.32.0.ebuild
 1702282250 ./net-misc/aria2/aria2-1.30.0.ebuild
 1711091954 ./net-misc/aria2/aria2-1.33.1.ebuild
-1702282250 ./net-misc/aria2/aria2-1.31.0.ebuild
-1710171812 ./net-misc/aria2/aria2-1.33.0.ebuild
 1702282250 ./net-misc/hashcash/hashcash-1.22-r1.ebuild
 1710231547 ./net-misc/wicd/wicd-1.7.4-r3.ebuild
 1702282250 ./net-misc/clusterssh/clusterssh-9999.ebuild
@@ -32953,7 +32863,7 @@
 1712192239 ./mail-client/balsa/balsa-2.5.3-r1.ebuild
 1702282250 ./mail-client/balsa/balsa-2.5.2-r1.ebuild
 1712172209 ./mail-client/nail/nail-12.4-r3.ebuild
-1702282250 ./mail-client/novell-groupwise-client/novell-groupwise-client-8.0.2.96933.ebuild
+1801011510 ./mail-client/novell-groupwise-client/novell-groupwise-client-8.0.2.96933.ebuild
 1702282250 ./mail-client/biabam/biabam-0.9.7.ebuild
 1710181053 ./mail-client/roundcube/roundcube-1.2.6.ebuild
 1707071751 ./mail-client/roundcube/roundcube-1.3.0.ebuild
@@ -32966,8 +32876,8 @@
 1707061825 ./mail-client/cone/cone-0.96.ebuild
 1704180224 ./mail-client/cone/cone-0.92.ebuild
 1706241232 ./mail-client/cone/cone-0.95.ebuild
+1801012340 ./mail-client/mailx/mailx-8.1.2.20160123.ebuild
 1702282250 ./mail-client/mailx/mailx-8.1.2.20050715-r6.ebuild
-1702282250 ./mail-client/mailx/mailx-8.1.2.20050715-r7.ebuild
 1711292110 ./mail-client/thunderbird-bin/thunderbird-bin-52.5.0.ebuild
 1702282250 ./mail-client/geary/geary-0.11.3.ebuild
 1712091839 ./mail-client/geary/geary-0.12.0.ebuild
@@ -33102,8 +33012,9 @@
 1702282250 ./sys-apps/install-xattr/install-xattr-0.5-r1.ebuild
 1702282250 ./sys-apps/install-xattr/install-xattr-9999.ebuild
 1709080654 ./sys-apps/mawk/mawk-1.3.4_p20160615.ebuild
-1709080654 ./sys-apps/mawk/mawk-1.3.4_p20161120.ebuild
+1801020140 ./sys-apps/mawk/mawk-1.3.4_p20161120.ebuild
 1709080654 ./sys-apps/mawk/mawk-1.3.4_p20150503.ebuild
+1801012210 ./sys-apps/mawk/mawk-1.3.4_p20171017.ebuild
 1712032139 ./sys-apps/guix/guix-0.13.0-r1.ebuild
 1705082317 ./sys-apps/guix/guix-0.12.0-r3.ebuild
 1702282250 ./sys-apps/msr-tools/msr-tools-1.3.ebuild
@@ -33358,6 +33269,7 @@
 1611200822 ./sys-apps/s390-tools/s390-tools-1.36.1.ebuild
 1702282250 ./sys-apps/s390-tools/s390-tools-1.23.1.ebuild
 1702282250 ./sys-apps/nca/nca-0.9.0-r1.ebuild
+1801012210 ./sys-apps/darwin-miscutils/darwin-miscutils-12.ebuild
 1702261911 ./sys-apps/darwin-miscutils/darwin-miscutils-8.ebuild
 1702261911 ./sys-apps/darwin-miscutils/darwin-miscutils-10.ebuild
 1702261911 ./sys-apps/darwin-miscutils/darwin-miscutils-9.ebuild
@@ -33392,7 +33304,7 @@
 1702282250 ./sys-apps/roccat-tools/roccat-tools-5.1.1.ebuild
 1702282250 ./sys-apps/less/less-487.ebuild
 1709260121 ./sys-apps/less/less-520.ebuild
-1711152040 ./sys-apps/less/less-529.ebuild
+1801020310 ./sys-apps/less/less-529.ebuild
 1702282250 ./sys-apps/gcp/gcp-0.1.3.ebuild
 1702282250 ./sys-apps/checkservice/checkservice-1.2.0.ebuild
 1704241403 ./sys-apps/findutils/findutils-4.6.0-r1.ebuild
@@ -33405,6 +33317,7 @@
 1708311839 ./sys-apps/the_silver_searcher/the_silver_searcher-2.0.0.ebuild
 1708311839 ./sys-apps/the_silver_searcher/the_silver_searcher-2.1.0.ebuild
 1707011812 ./sys-apps/microcode-ctl/microcode-ctl-1.27.ebuild
+1801012240 ./sys-apps/microcode-ctl/microcode-ctl-1.28-r2.ebuild
 1707011812 ./sys-apps/microcode-ctl/microcode-ctl-1.28-r1.ebuild
 1707011812 ./sys-apps/microcode-ctl/microcode-ctl-1.23.ebuild
 1707011812 ./sys-apps/microcode-ctl/microcode-ctl-1.28.ebuild
@@ -33516,6 +33429,7 @@
 1712271539 ./sys-apps/iproute2/iproute2-4.14.1-r2.ebuild
 1711292210 ./sys-apps/iproute2/iproute2-4.11.0.ebuild
 1711292210 ./sys-apps/iproute2/iproute2-9999.ebuild
+1801020040 ./sys-apps/sparc-utils/sparc-utils-1.9-r5.ebuild
 1702282250 ./sys-apps/sparc-utils/sparc-utils-1.9-r4.ebuild
 1712021939 ./sys-apps/vbetool/vbetool-1.1.ebuild
 1702282250 ./sys-apps/grepcidr/grepcidr-2.0.ebuild
@@ -33547,8 +33461,6 @@
 1705251804 ./sys-apps/flashrom/flashrom-9999.ebuild
 1702282250 ./sys-apps/uam/uam-0.3.2.ebuild
 1702282250 ./sys-apps/uam/uam-9999.ebuild
-1702282250 ./sys-apps/uam/uam-0.3.ebuild
-1702282250 ./sys-apps/uam/uam-0.3.1.ebuild
 1709280216 ./sys-apps/dbus/dbus-1.10.24.ebuild
 1706101757 ./sys-apps/dbus/dbus-1.10.18.ebuild
 1711300240 ./sys-apps/dbus/dbus-1.12.2.ebuild
@@ -33618,9 +33530,9 @@
 1711280140 ./sys-apps/portage/portage-2.3.14.ebuild
 1709112327 ./sys-apps/portage/portage-2.3.6.ebuild
 1711040621 ./sys-apps/portage/portage-2.3.13.ebuild
-1712160409 ./sys-apps/portage/portage-2.3.19.ebuild
+1801020610 ./sys-apps/portage/portage-2.3.19-r1.ebuild
 1712220839 ./sys-apps/portage/portage-2.3.16.ebuild
-1711200447 ./sys-apps/portage/portage-9999.ebuild
+1801020610 ./sys-apps/portage/portage-9999.ebuild
 1711040621 ./sys-apps/portage/portage-2.3.8.ebuild
 1702282250 ./sys-apps/fakechroot/fakechroot-2.17.2.ebuild
 1702282250 ./sys-apps/nawk/nawk-20121220-r2.ebuild
@@ -33723,11 +33635,10 @@
 1712041809 ./www-servers/tomcat/tomcat-8.5.24.ebuild
 1708221206 ./www-servers/sniproxy/sniproxy-0.5.0.ebuild
 1704211032 ./www-servers/cherokee/cherokee-1.2.104.ebuild
-1702282250 ./www-servers/boa/boa-0.94.14_rc21-r1.ebuild
 1702282250 ./www-servers/boa/boa-0.94.14_rc21-r2.ebuild
 1707121118 ./www-servers/nginx/nginx-1.12.1.ebuild
 1711211904 ./www-servers/nginx/nginx-1.13.7.ebuild
-1712262009 ./www-servers/nginx/nginx-1.12.2-r1.ebuild
+1801020310 ./www-servers/nginx/nginx-1.12.2-r1.ebuild
 1712261939 ./www-servers/nginx/nginx-1.13.8.ebuild
 1702282250 ./www-servers/fnord/fnord-1.10-r2.ebuild
 1712061539 ./www-servers/fnord/fnord-1.11-r1.ebuild
@@ -33865,6 +33776,7 @@
 1702282250 ./media-libs/imlib2/imlib2-9999.ebuild
 1706161326 ./media-libs/imlib2/imlib2-1.4.10.ebuild
 1702282250 ./media-libs/imlib2/imlib2-1.4.9.ebuild
+1801012240 ./media-libs/stk/stk-4.5.1-r1.ebuild
 1702282250 ./media-libs/stk/stk-4.4.4-r1.ebuild
 1702282250 ./media-libs/stk/stk-4.5.1.ebuild
 1702282250 ./media-libs/stk/stk-4.5.0.ebuild
@@ -34056,7 +33968,7 @@
 1702282250 ./media-libs/sdl-gfx/sdl-gfx-2.0.26.ebuild
 1702282250 ./media-libs/sdl-gfx/sdl-gfx-2.0.25.ebuild
 1712201709 ./media-libs/libmypaint/libmypaint-1.3.0_beta1.ebuild
-1712201709 ./media-libs/libmypaint/libmypaint-1.3.0.ebuild
+1801012340 ./media-libs/libmypaint/libmypaint-1.3.0.ebuild
 1702282250 ./media-libs/sdl2-ttf/sdl2-ttf-2.0.14.ebuild
 1702282250 ./media-libs/sdl2-ttf/sdl2-ttf-2.0.13.ebuild
 1707301238 ./media-libs/libepoxy/libepoxy-1.4.1.ebuild
@@ -34526,6 +34438,7 @@
 1709010954 ./media-libs/jasper/jasper-2.0.12.ebuild
 1709010954 ./media-libs/jasper/jasper-9999.ebuild
 1702282250 ./media-libs/bio2jack/bio2jack-0.9-r1.ebuild
+1801012240 ./media-libs/bio2jack/bio2jack-0.9-r2.ebuild
 1702282250 ./media-libs/libpqstego/libpqstego-0.0.1.ebuild
 1702282250 ./media-libs/libbsb/libbsb-0.0.7.ebuild
 1707182236 ./media-libs/clutter-gst/clutter-gst-3.0.24.ebuild
@@ -34754,7 +34667,7 @@
 1706171741 ./dev-tex/currvita/currvita-0.9i-r1.ebuild
 1702282250 ./dev-tex/crosstex/crosstex-0.6-r2.ebuild
 1702282250 ./dev-tex/latex-calendar/latex-calendar-3.1.ebuild
-1702282250 ./dev-tex/csindex/csindex-2.11c-r1.ebuild
+1801011940 ./dev-tex/csindex/csindex-2.11c-r2.ebuild
 1702282250 ./dev-tex/dvipost/dvipost-1.1-r2.ebuild
 1702282250 ./dev-tex/polytable/polytable-0.8.2.ebuild
 1710181306 ./dev-tex/hevea/hevea-2.31.ebuild
@@ -34827,7 +34740,7 @@
 1706171741 ./dev-tex/europecv/europecv-20060424-r2.ebuild
 1702282250 ./dev-tex/catdvi/catdvi-0.14-r1.ebuild
 1702282250 ./dev-tex/texpower/texpower-0.2.ebuild
-1702282250 ./dev-tex/floatflt/floatflt-1.31a.ebuild
+1801011940 ./dev-tex/floatflt/floatflt-1.31a-r1.ebuild
 1702282250 ./dev-tex/cdcover/cdcover-1.3b.ebuild
 1702282250 ./dev-tex/quotchap/quotchap-0.9f.ebuild
 1705071400 ./dev-tex/biber/biber-2.5.ebuild
@@ -34872,7 +34785,7 @@
 1708200214 ./dev-tex/dot2tex/dot2tex-2.9.0.ebuild
 1709062352 ./dev-tex/vc/vc-0.5.ebuild
 1702282250 ./dev-tex/ellipsis/ellipsis-1.6.ebuild
-1706171410 ./dev-tex/feynmf/feynmf-1.08-r5.ebuild
+1801012140 ./dev-tex/feynmf/feynmf-1.08-r6.ebuild
 1710182226 ./dev-tex/lgrind/lgrind-3.67-r3.ebuild
 1702282250 ./sci-geosciences/opencpn-plugin-squiddio/opencpn-plugin-squiddio-0.7.ebuild
 1702282250 ./sci-geosciences/opencpn-plugin-squiddio/opencpn-plugin-squiddio-9999.ebuild
@@ -37154,7 +37067,7 @@
 1705122054 ./x11-plugins/gkwebmon/gkwebmon-0.2-r2.ebuild
 1711112347 ./x11-plugins/allin1/allin1-0.5.0-r2.ebuild
 1702282250 ./x11-plugins/pidgin-funyahoo-plusplus/pidgin-funyahoo-plusplus-9999.ebuild
-1712151409 ./x11-plugins/wmcpuwatch/wmcpuwatch-0.2.ebuild
+1801020110 ./x11-plugins/wmcpuwatch/wmcpuwatch-0.2-r1.ebuild
 1711300140 ./x11-plugins/wmlaptop/wmlaptop-1.4.ebuild
 1711250240 ./x11-plugins/cputnik/cputnik-0.2.0.ebuild
 1711270240 ./x11-plugins/wmtop/wmtop-0.85.ebuild
@@ -37712,9 +37625,8 @@
 1702282250 ./app-eselect/eselect-chuck/eselect-chuck-1.0.1.ebuild
 1712162039 ./app-eselect/eselect-miniaudicle/eselect-miniaudicle-1.0.1-r2.ebuild
 1702282250 ./app-eselect/eselect-qtgraphicssystem/eselect-qtgraphicssystem-1.1.1.ebuild
-1712251509 ./app-eselect/eselect-repository/eselect-repository-1-r1.ebuild
 1711071922 ./app-eselect/eselect-repository/eselect-repository-9999.ebuild
-1711282240 ./app-eselect/eselect-repository/eselect-repository-2.ebuild
+1801020940 ./app-eselect/eselect-repository/eselect-repository-2.ebuild
 1702282250 ./app-eselect/eselect-mpost/eselect-mpost-0.3.ebuild
 1710310216 ./app-eselect/eselect-electron/eselect-electron-2.1.ebuild
 1707201104 ./app-eselect/eselect-vi/eselect-vi-1.1.9.ebuild
@@ -37725,7 +37637,6 @@
 1707231044 ./app-eselect/eselect-ruby/eselect-ruby-20170723.ebuild
 1712251110 ./app-eselect/eselect-ruby/eselect-ruby-20171225.ebuild
 1711302340 ./app-eselect/eselect-ruby/eselect-ruby-20161226.ebuild
-1702282250 ./app-eselect/eselect-lib-bin-symlink/eselect-lib-bin-symlink-0.1.ebuild
 1703171402 ./app-eselect/eselect-lib-bin-symlink/eselect-lib-bin-symlink-0.1.1.ebuild
 1702282250 ./app-eselect/eselect-lib-bin-symlink/eselect-lib-bin-symlink-9999.ebuild
 1707051527 ./app-emulation/bochs/bochs-2.6.9.ebuild
@@ -38050,8 +37961,8 @@
 1702282250 ./net-ftp/vsftpd/vsftpd-3.0.2-r2.ebuild
 1702282250 ./net-ftp/atftp/atftp-0.7-r3.ebuild
 1702282250 ./net-ftp/atftp/atftp-0.7-r5.ebuild
-1709170102 ./net-ftp/filezilla/filezilla-3.25.2.ebuild
-1709171324 ./net-ftp/filezilla/filezilla-3.25.2-r1.ebuild
+1801021240 ./net-ftp/filezilla/filezilla-3.25.2.ebuild
+1801021240 ./net-ftp/filezilla/filezilla-3.25.2-r1.ebuild
 1702282250 ./net-ftp/weex/weex-2.6.1.5-r1.ebuild
 1702282250 ./net-ftp/scythia/scythia-0.9.3_p2.ebuild
 1702282250 ./net-ftp/axyftp/axyftp-0.5.1-r2.ebuild
@@ -38167,6 +38078,7 @@
 1801011404 metadata/md5-cache/dev-java/prefuse-20071021_beta
 1801011404 metadata/md5-cache/dev-java/ant-javamail-1.9.2-r2
 1801011404 metadata/md5-cache/dev-java/txw2-runtime-20110809
+1801020310 metadata/md5-cache/dev-java/servletapi-2.4-r6
 1801011404 metadata/md5-cache/dev-java/ical4j-1.0.5
 1801011404 metadata/md5-cache/dev-java/myfaces-builder-annotations-1.0.9
 1801011404 metadata/md5-cache/dev-java/jdom-2.0.6-r4
@@ -38541,6 +38453,7 @@
 1801011404 metadata/md5-cache/dev-java/jmock-1.2.0-r1
 1801011404 metadata/md5-cache/dev-java/btf-1.2
 1801011404 metadata/md5-cache/dev-java/trident-1.3
+1801020310 metadata/md5-cache/dev-java/servletapi-2.3-r4
 1801011404 metadata/md5-cache/dev-java/netbeans-cnd-8.2
 1801011404 metadata/md5-cache/dev-java/slf4j-simple-1.7.7
 1801011404 metadata/md5-cache/dev-java/avalon-framework-4.2.0-r1
@@ -38602,7 +38515,7 @@
 1801011404 metadata/md5-cache/dev-java/sun-jms-1.1-r2
 1801011404 metadata/md5-cache/dev-java/cldc-api-1.1-r1
 1801011404 metadata/md5-cache/dev-java/commons-primitives-1.0-r3
-1801011404 metadata/md5-cache/dev-java/Manifest.gz
+1801020310 metadata/md5-cache/dev-java/Manifest.gz
 1801011404 metadata/md5-cache/dev-java/jdbc-mysql-5.1.26
 1801011404 metadata/md5-cache/dev-java/objenesis-1.3
 1801011404 metadata/md5-cache/dev-java/httpcomponents-client-4.5
@@ -38677,6 +38590,7 @@
 1801011404 metadata/md5-cache/dev-java/log4j-1.2.17-r3
 1801011404 metadata/md5-cache/dev-java/antlr-2.7.7-r8
 1801011404 metadata/md5-cache/dev-java/easymock-classextension-3.2-r1
+1801020310 metadata/md5-cache/dev-java/servletapi-2.2-r4
 1801011404 metadata/md5-cache/dev-java/libg-2.1.0-r1
 1801011404 metadata/md5-cache/dev-java/disruptor-3.2.0
 1801011404 metadata/md5-cache/dev-java/jchart2d-3.2.2
@@ -39186,7 +39100,7 @@
 1801011405 metadata/md5-cache/sys-libs/libcxxabi-4.0.1
 1801011405 metadata/md5-cache/sys-libs/libstatgrab-0.17
 1801011405 metadata/md5-cache/sys-libs/db-6.2.32
-1801011405 metadata/md5-cache/sys-libs/glibc-2.26-r5
+1801011840 metadata/md5-cache/sys-libs/glibc-2.26-r5
 1801011405 metadata/md5-cache/sys-libs/e2fsprogs-libs-1.43.3
 1801011405 metadata/md5-cache/sys-libs/timezone-data-2017b
 1801011405 metadata/md5-cache/sys-libs/libtermcap-compat-2.0.8-r2
@@ -39232,7 +39146,7 @@
 1702282334 metadata/md5-cache/sys-libs/gwenhywfar-4.15.3
 1801011405 metadata/md5-cache/sys-libs/uclibc-0.9.33.2-r15
 1801011405 metadata/md5-cache/sys-libs/libspe2-2.3.0_p135
-1801011405 metadata/md5-cache/sys-libs/libcap-2.25
+1801020510 metadata/md5-cache/sys-libs/libcap-2.25
 1801011405 metadata/md5-cache/sys-libs/librtas-1.3.8
 1801011405 metadata/md5-cache/sys-libs/glibc-2.23-r4
 1801011405 metadata/md5-cache/sys-libs/libapparmor-2.11.1
@@ -39272,13 +39186,13 @@
 1801011405 metadata/md5-cache/sys-libs/gdbm-1.13-r1
 1801011405 metadata/md5-cache/sys-libs/librtas-1.3.6
 1801011405 metadata/md5-cache/sys-libs/libosinfo-1.0.0-r1
-1801011405 metadata/md5-cache/sys-libs/libstdc++-v3-3.3.6-r1
+1801020010 metadata/md5-cache/sys-libs/libstdc++-v3-3.3.6-r1
 1801011405 metadata/md5-cache/sys-libs/binutils-libs-2.28.1
-1801011405 metadata/md5-cache/sys-libs/libcap-2.24-r2
+1801020510 metadata/md5-cache/sys-libs/libcap-2.24-r2
 1801011405 metadata/md5-cache/sys-libs/compiler-rt-9999
 1801011405 metadata/md5-cache/sys-libs/glibc-2.19-r1
 1801011405 metadata/md5-cache/sys-libs/libservicelog-1.1.11
-1801011405 metadata/md5-cache/sys-libs/Manifest.gz
+1801020510 metadata/md5-cache/sys-libs/Manifest.gz
 1801011405 metadata/md5-cache/sys-libs/slang-2.3.0
 1801011405 metadata/md5-cache/sys-libs/readline-5.2_p14
 1704132239 metadata/md5-cache/sys-libs/csu-79
@@ -39503,7 +39417,6 @@
 1801011404 metadata/md5-cache/sci-biology/express-0.9.5-r1
 1801011404 metadata/md5-cache/sci-biology/rnaview-20040713-r4
 1801011404 metadata/md5-cache/sci-biology/pysam-0.12.0.1
-1801011404 metadata/md5-cache/sci-biology/arb-5.1-r1
 1801011404 metadata/md5-cache/sci-biology/yass-1.14-r2
 1801011404 metadata/md5-cache/sci-biology/plink-1.90_pre140514
 1801011404 metadata/md5-cache/sci-biology/consed-29
@@ -39562,20 +39475,17 @@
 1801011404 metadata/md5-cache/sci-biology/poa-2-r1
 1801011404 metadata/md5-cache/sci-biology/kalign-2.03-r2
 1801011404 metadata/md5-cache/sci-biology/treeviewx-0.5.1-r3
-1702282330 metadata/md5-cache/sci-biology/iedera-1.04
 1801011404 metadata/md5-cache/sci-biology/mcl-08.312
 1702282330 metadata/md5-cache/sci-biology/hmmer-2.3.2-r4
 1801011404 metadata/md5-cache/sci-biology/clustalx-2.1-r1
-1801011404 metadata/md5-cache/sci-biology/arb-5.3
 1801011404 metadata/md5-cache/sci-biology/HTSeq-9999
 1801011404 metadata/md5-cache/sci-biology/phylip-3.696-r1
 1801011404 metadata/md5-cache/sci-biology/bioperl-run-9999-r1
 1801011404 metadata/md5-cache/sci-biology/seaview-4.5.4
 1801011404 metadata/md5-cache/sci-biology/sibsim4-0.20
-1801011404 metadata/md5-cache/sci-biology/arb-5.2
 1703082208 metadata/md5-cache/sci-biology/biosql-1.0.1-r1
 1801011404 metadata/md5-cache/sci-biology/fasta-36.3.5e
-1801011404 metadata/md5-cache/sci-biology/Manifest.gz
+1801011610 metadata/md5-cache/sci-biology/Manifest.gz
 1801011404 metadata/md5-cache/sci-biology/prodigal-2.6.3
 1801011404 metadata/md5-cache/sci-biology/probcons-1.12-r1
 1801011404 metadata/md5-cache/sci-biology/phylip-3.69-r1
@@ -39584,7 +39494,6 @@
 1801011404 metadata/md5-cache/sci-biology/embassy-domalign-0.1.660
 1801011404 metadata/md5-cache/sci-biology/gatk-2.4
 1801011404 metadata/md5-cache/sci-biology/kallisto-9999
-1801011404 metadata/md5-cache/sci-biology/fasta-35.4.10
 1801011404 metadata/md5-cache/sci-biology/phrap-1.080812-r2
 1801011404 metadata/md5-cache/sci-biology/embassy-emnu-1.05.660
 1801011404 metadata/md5-cache/sci-biology/bamtools-2.5.1
@@ -39884,7 +39793,7 @@
 1801011404 metadata/md5-cache/sci-libs/libcerf-1.3
 1801011404 metadata/md5-cache/sci-libs/libticalcs2-1.1.8
 1801011404 metadata/md5-cache/sci-libs/mkl-10.0.5.025
-1801011404 metadata/md5-cache/sci-libs/Manifest.gz
+1801020010 metadata/md5-cache/sci-libs/Manifest.gz
 1801011404 metadata/md5-cache/sci-libs/lrslib-051
 1801011404 metadata/md5-cache/sci-libs/p4est-1.0
 1801011404 metadata/md5-cache/sci-libs/libsvm-3.21
@@ -39953,7 +39862,7 @@
 1801011404 metadata/md5-cache/sci-libs/cminpack-1.3.4
 1702282331 metadata/md5-cache/sci-libs/idlmarkwardt-20130418
 1801011404 metadata/md5-cache/sci-libs/scikits_image-0.11.3
-1801011404 metadata/md5-cache/sci-libs/fftw-9999
+1801020010 metadata/md5-cache/sci-libs/fftw-9999
 1801011404 metadata/md5-cache/sci-libs/lrslib-042c-r2
 1801011404 metadata/md5-cache/sci-libs/minfx-1.0.10
 1801011404 metadata/md5-cache/sci-libs/profphd-utils-1.0.10-r1
@@ -40179,6 +40088,7 @@
 1801011404 metadata/md5-cache/dev-ruby/rack-2.0.3
 1801011404 metadata/md5-cache/dev-ruby/faraday-0.12.2
 1801011404 metadata/md5-cache/dev-ruby/coercible-1.0.0
+1801021010 metadata/md5-cache/dev-ruby/request_store-1.4.0
 1801011404 metadata/md5-cache/dev-ruby/itextomml-1.5.4
 1801011404 metadata/md5-cache/dev-ruby/uuidtools-2.1.5-r1
 1801011404 metadata/md5-cache/dev-ruby/rspec-support-3.6.0
@@ -40344,7 +40254,6 @@
 1801011404 metadata/md5-cache/dev-ruby/rgen-0.8.3
 1801011404 metadata/md5-cache/dev-ruby/rails-5.0.5
 1801011404 metadata/md5-cache/dev-ruby/charlock_holmes-0.7.5
-1801011404 metadata/md5-cache/dev-ruby/curses-1.2.3
 1801011404 metadata/md5-cache/dev-ruby/ruby-opengl-0.10.0
 1801011404 metadata/md5-cache/dev-ruby/ruby-atk-3.0.8
 1801011404 metadata/md5-cache/dev-ruby/rack-1.5.5
@@ -40637,7 +40546,6 @@
 1801011404 metadata/md5-cache/dev-ruby/debug_inspector-0.0.3
 1801011404 metadata/md5-cache/dev-ruby/rake-remote_task-2.4.2
 1801011404 metadata/md5-cache/dev-ruby/syntax-1.2.1
-1801011404 metadata/md5-cache/dev-ruby/request_store-1.3.1
 1801011404 metadata/md5-cache/dev-ruby/ruby-mp3info-0.8.9
 1801011404 metadata/md5-cache/dev-ruby/bluecloth-2.2.0-r3
 1801011404 metadata/md5-cache/dev-ruby/autoprefixer-rails-7.1.2.6
@@ -40813,7 +40721,7 @@
 1801011404 metadata/md5-cache/dev-ruby/rex-powershell-0.1.64
 1801011404 metadata/md5-cache/dev-ruby/selenium-webdriver-3.8.0
 1801011404 metadata/md5-cache/dev-ruby/pygments_rb-1.1.2
-1801011404 metadata/md5-cache/dev-ruby/curses-1.2.4
+1801021010 metadata/md5-cache/dev-ruby/curses-1.2.4
 1801011404 metadata/md5-cache/dev-ruby/sass-rails-4.0.5
 1801011404 metadata/md5-cache/dev-ruby/httparty-0.14.0-r1
 1801011404 metadata/md5-cache/dev-ruby/twitter-6.1.0
@@ -40876,7 +40784,7 @@
 1801011404 metadata/md5-cache/dev-ruby/capistrano-3.9.1
 1801011404 metadata/md5-cache/dev-ruby/vcr-1.11.3
 1801011404 metadata/md5-cache/dev-ruby/prawn-2.1.0
-1801011404 metadata/md5-cache/dev-ruby/Manifest.gz
+1801021010 metadata/md5-cache/dev-ruby/Manifest.gz
 1801011404 metadata/md5-cache/dev-ruby/cmdparse-3.0.3
 1801011404 metadata/md5-cache/dev-ruby/fast_xs-0.8.0-r2
 1801011404 metadata/md5-cache/dev-ruby/railties-5.0.5
@@ -41564,7 +41472,6 @@
 1801011404 metadata/md5-cache/media-video/mpglen-0.1
 1801011404 metadata/md5-cache/media-video/minitube-2.5.2-r1
 1801011404 metadata/md5-cache/media-video/replex-0.1.4
-1702282327 metadata/md5-cache/media-video/bashnapi-1.1.5
 1801011404 metadata/md5-cache/media-video/simplescreenrecorder-0.3.9-r1
 1801011404 metadata/md5-cache/media-video/raspberrypi-omxplayer-0_p20160528
 1801011404 metadata/md5-cache/media-video/gxine-0.5.908-r1
@@ -41707,7 +41614,7 @@
 1801011404 metadata/md5-cache/media-video/mkvtoolnix-15.0.0-r1
 1801011404 metadata/md5-cache/media-video/atomicparsley-0.9.0
 1801011404 metadata/md5-cache/media-video/dvdstyler-3.0.2
-1801011404 metadata/md5-cache/media-video/Manifest.gz
+1801020940 metadata/md5-cache/media-video/Manifest.gz
 1801011404 metadata/md5-cache/media-video/kino-1.3.4
 1801011404 metadata/md5-cache/media-video/mjpg-streamer-0_pre20120421
 1801011404 metadata/md5-cache/media-video/ccextractor-0.68
@@ -41866,7 +41773,7 @@
 1801011405 metadata/md5-cache/www-client/chromium-63.0.3239.108
 1801011405 metadata/md5-cache/www-client/ripe-atlas-cousteau-1.0.6
 1801011405 metadata/md5-cache/www-client/epiphany-3.24.5
-1801011405 metadata/md5-cache/www-client/google-chrome-beta-64.0.3282.39
+1801020440 metadata/md5-cache/www-client/google-chrome-beta-64.0.3282.39
 1801011405 metadata/md5-cache/www-client/chromium-64.0.3282.24
 1801011405 metadata/md5-cache/www-client/links-2.14
 1801011405 metadata/md5-cache/www-client/qupzilla-2.1.2
@@ -41885,12 +41792,12 @@
 1801011405 metadata/md5-cache/www-client/otter-9999
 1801011405 metadata/md5-cache/www-client/conkeror-1.0.4
 1801011405 metadata/md5-cache/www-client/w3mmee-0.3.2_p24-r9
-1801011405 metadata/md5-cache/www-client/chromium-64.0.3282.39
+1801020440 metadata/md5-cache/www-client/chromium-64.0.3282.39
 1801011405 metadata/md5-cache/www-client/surfraw-2.2.9-r1
 1801011405 metadata/md5-cache/www-client/weboob-0g
 1801011405 metadata/md5-cache/www-client/elinks-0.12_pre6-r2
 1801011405 metadata/md5-cache/www-client/google-chrome-63.0.3239.108
-1801011405 metadata/md5-cache/www-client/Manifest.gz
+1801020440 metadata/md5-cache/www-client/Manifest.gz
 1801011405 metadata/md5-cache/www-client/google-chrome-unstable-65.0.3298.3
 1704121439 metadata/md5-cache/www-client/lynx-2.8.9_pre11
 1801011405 metadata/md5-cache/www-client/opera-12.16_p1860-r1
@@ -41926,7 +41833,7 @@
 1801011405 metadata/md5-cache/www-client/qutebrowser-1.0.2
 1801011405 metadata/md5-cache/www-client/firefox-52.2.0
 1801011405 metadata/md5-cache/www-client/seamonkey-2.48-r1
-1801011405 metadata/md5-cache/www-client/chromium-65.0.3298.3
+1801020440 metadata/md5-cache/www-client/chromium-65.0.3298.3
 1801011405 metadata/md5-cache/www-client/vivaldi-1.13.1008.40_p1
 1702282334 metadata/md5-cache/www-client/uget-1.10.3
 1801011405 metadata/md5-cache/www-client/epiphany-3.22.7
@@ -42607,7 +42514,7 @@
 1801011404 metadata/md5-cache/net-fs/nfs-utils-2.2.2_rc1_p20171107-r1
 1801011404 metadata/md5-cache/net-fs/s3ql-2.24
 1801011404 metadata/md5-cache/net-fs/openafs-kernel-1.6.22
-1801011404 metadata/md5-cache/app-crypt/acme-0.20.0
+1801020010 metadata/md5-cache/app-crypt/acme-0.20.0
 1801011404 metadata/md5-cache/app-crypt/af_alg-0.0.1
 1801011404 metadata/md5-cache/app-crypt/certbot-0.19.0
 1801011404 metadata/md5-cache/app-crypt/seahorse-sharing-3.8.0_p20151117
@@ -42640,7 +42547,7 @@
 1801011404 metadata/md5-cache/app-crypt/codecrypt-1.8
 1801011404 metadata/md5-cache/app-crypt/libsecret-0.18.5
 1801011404 metadata/md5-cache/app-crypt/simp_le-9999
-1801011404 metadata/md5-cache/app-crypt/acme-0.19.0
+1801020010 metadata/md5-cache/app-crypt/acme-0.19.0
 1801011404 metadata/md5-cache/app-crypt/yubikey-manager-0.4.5
 1801011404 metadata/md5-cache/app-crypt/ckpass-0.2-r1
 1801011404 metadata/md5-cache/app-crypt/eid-mw-4.2.8
@@ -42670,6 +42577,7 @@
 1711260441 metadata/md5-cache/app-crypt/gnupg-pkcs11-scd-0.9.1
 1801011404 metadata/md5-cache/app-crypt/gnupg-2.1.20-r1
 1801011404 metadata/md5-cache/app-crypt/gnupg-2.2.3
+1801020310 metadata/md5-cache/app-crypt/moolticute-0.11.4_beta
 1801011404 metadata/md5-cache/app-crypt/stoken-0.91
 1801011404 metadata/md5-cache/app-crypt/p11-kit-0.23.2
 1801011404 metadata/md5-cache/app-crypt/keybase-1.0.21
@@ -42745,7 +42653,7 @@
 1801011404 metadata/md5-cache/app-crypt/johntheripper-1.7.9-r6
 1801011404 metadata/md5-cache/app-crypt/onak-0.5.0
 1801011404 metadata/md5-cache/app-crypt/stoken-0.90
-1801011404 metadata/md5-cache/app-crypt/Manifest.gz
+1801020310 metadata/md5-cache/app-crypt/Manifest.gz
 1708210038 metadata/md5-cache/app-crypt/debian-archive-keyring-2014.3
 1801011404 metadata/md5-cache/app-crypt/certbot-nginx-0.19.0
 1801011404 metadata/md5-cache/app-crypt/jetring-0.25
@@ -42760,7 +42668,7 @@
 1801011404 metadata/md5-cache/app-crypt/rotix-0.83
 1801011404 metadata/md5-cache/app-crypt/rhash-1.3.5
 1801011404 metadata/md5-cache/app-crypt/jacksum-1.7.0
-1801011404 metadata/md5-cache/app-crypt/acme-0.18.2
+1801020010 metadata/md5-cache/app-crypt/acme-0.18.2
 1801011404 metadata/md5-cache/app-crypt/moolticute-0.10.0_beta
 1801011404 metadata/md5-cache/app-crypt/certbot-apache-0.20.0
 1801011404 metadata/md5-cache/app-crypt/scute-1.5.0
@@ -43345,8 +43253,8 @@
 1801011404 metadata/md5-cache/sys-auth/pam_krb5-4.6
 1801011404 metadata/md5-cache/sys-auth/yubikey-personalization-gui-3.1.23
 1801011404 metadata/md5-cache/sys-auth/openpam-20140912-r1
-1801011404 metadata/md5-cache/sys-auth/libnss-nis-1.4
-1801011404 metadata/md5-cache/sys-auth/Manifest.gz
+1801012040 metadata/md5-cache/sys-auth/libnss-nis-1.4
+1801012110 metadata/md5-cache/sys-auth/Manifest.gz
 1801011404 metadata/md5-cache/sys-auth/pambase-20120417-r3
 1801011404 metadata/md5-cache/sys-auth/thinkfinger-0.3-r3
 1801011404 metadata/md5-cache/sys-auth/pambase-20150213
@@ -43373,7 +43281,6 @@
 1801011404 metadata/md5-cache/sys-auth/libnss-mysql-1.5_p20060915-r2
 1801011404 metadata/md5-cache/sys-auth/fprintd-0.6.0
 1801011404 metadata/md5-cache/sys-auth/ykpers-1.18.0
-1801011404 metadata/md5-cache/sys-auth/pam-csync-0.42.0-r1
 1801011404 metadata/md5-cache/sys-auth/pam_ssh-1.97-r2
 1801011404 metadata/md5-cache/sys-auth/pam_ldap-183
 1702282333 metadata/md5-cache/sys-auth/polkit-pkla-compat-0.1
@@ -43593,7 +43500,7 @@
 1801011404 metadata/md5-cache/net-libs/czmq-2.2.0-r2
 1801011404 metadata/md5-cache/net-libs/libasr-1.0.1.201505061057
 1702282328 metadata/md5-cache/net-libs/iax-0.2.2
-1801011404 metadata/md5-cache/net-libs/libssh-9999
+1801021140 metadata/md5-cache/net-libs/libssh-9999
 1801011404 metadata/md5-cache/net-libs/ripe-atlas-sagan-1.1.10
 1801011404 metadata/md5-cache/net-libs/courier-authlib-0.68.0
 1801011404 metadata/md5-cache/net-libs/libgfbgraph-0.2.3-r1
@@ -43633,7 +43540,6 @@
 1801011404 metadata/md5-cache/net-libs/courier-authlib-0.66.3
 1801011404 metadata/md5-cache/net-libs/enet-1.2.2
 1708101509 metadata/md5-cache/net-libs/libisds-0.10.7
-1801011404 metadata/md5-cache/net-libs/libssh2-1.8.0
 1801011404 metadata/md5-cache/net-libs/netwib-5.39.0
 1801011404 metadata/md5-cache/net-libs/libasyncns-0.8-r4
 1801011404 metadata/md5-cache/net-libs/liquid-dsp-1.3.0
@@ -43644,7 +43550,7 @@
 1801011404 metadata/md5-cache/net-libs/gupnp-av-0.12.10
 1801011404 metadata/md5-cache/net-libs/libsrtp-1.5.2
 1801011404 metadata/md5-cache/net-libs/libmbim-1.6.0
-1801011404 metadata/md5-cache/net-libs/Manifest.gz
+1801021140 metadata/md5-cache/net-libs/Manifest.gz
 1801011404 metadata/md5-cache/net-libs/librsync-2.0.0
 1801011404 metadata/md5-cache/net-libs/courier-unicode-1.4
 1801011404 metadata/md5-cache/net-libs/liquid-dsp-9999
@@ -43753,7 +43659,6 @@
 1801011404 metadata/md5-cache/net-libs/libsrtp-2.0.0-r1
 1801011404 metadata/md5-cache/net-libs/libgrss-0.7.0
 1711060409 metadata/md5-cache/net-libs/libnsl-0
-1801011404 metadata/md5-cache/net-libs/miniupnpc-2.0.20171102
 1702282328 metadata/md5-cache/net-libs/libblkmaker-0.3.2
 1801011404 metadata/md5-cache/net-libs/libssh-0.7.4
 1801011404 metadata/md5-cache/net-libs/libgadu-1.12.2
@@ -44629,6 +44534,7 @@
 1801011405 metadata/md5-cache/x11-misc/xkbset-0.5_p5_p1
 1703221038 metadata/md5-cache/x11-misc/3dfm-1.0-r1
 1801011405 metadata/md5-cache/x11-misc/xsri-2.1.0-r3
+1801011610 metadata/md5-cache/x11-misc/slop-9999
 1801011405 metadata/md5-cache/x11-misc/sent-1
 1801011405 metadata/md5-cache/x11-misc/qcomicbook-0.9.1
 1801011405 metadata/md5-cache/x11-misc/menumaker-0.99.10
@@ -44805,14 +44711,13 @@
 1801011405 metadata/md5-cache/x11-misc/spacefm-1.0.4-r1
 1801011405 metadata/md5-cache/x11-misc/peksystray-0.4.0
 1801011405 metadata/md5-cache/x11-misc/shutter-0.93.1-r3
-1801011405 metadata/md5-cache/x11-misc/Manifest.gz
+1801020210 metadata/md5-cache/x11-misc/Manifest.gz
 1801011405 metadata/md5-cache/x11-misc/libinput-gestures-2.30
 1801011405 metadata/md5-cache/x11-misc/gccmakedep-1.0.3
 1801011405 metadata/md5-cache/x11-misc/xautolock-2.2_p5_p1
 1801011405 metadata/md5-cache/x11-misc/kapow-1.5.5
 1801011405 metadata/md5-cache/x11-misc/chgres-0.1-r2
 1801011405 metadata/md5-cache/x11-misc/revelation-0.4.14-r1
-1801011405 metadata/md5-cache/x11-misc/afbinit-1.0.1-r7
 1801011405 metadata/md5-cache/x11-misc/xembedsniproxy-5.10.3
 1801011405 metadata/md5-cache/x11-misc/xwit-3.4_p15
 1801011405 metadata/md5-cache/x11-misc/sw-notify-send-9999
@@ -46005,7 +45910,7 @@
 1801011404 metadata/md5-cache/dev-libs/beignet-9999
 1801011404 metadata/md5-cache/dev-libs/pcc-libs-1.0.1_pre20121112
 1801011404 metadata/md5-cache/dev-libs/mpc-1.0.1
-1801011404 metadata/md5-cache/dev-libs/Manifest.gz
+1801020940 metadata/md5-cache/dev-libs/Manifest.gz
 1801011404 metadata/md5-cache/dev-libs/libusb-compat-0.1.5-r3
 1801011404 metadata/md5-cache/dev-libs/libcli-1.9.7
 1801011404 metadata/md5-cache/dev-libs/libusb-compat-0.1.5-r2
@@ -46086,7 +45991,6 @@
 1801011404 metadata/md5-cache/dev-libs/tinyxml-2.6.2-r2
 1801011404 metadata/md5-cache/dev-libs/confuse-3.2.1
 1801011404 metadata/md5-cache/dev-libs/libgaminggear-0.15.1
-1702282313 metadata/md5-cache/dev-libs/libb64-1.2
 1801011404 metadata/md5-cache/dev-libs/librelp-1.2.13
 1801011404 metadata/md5-cache/dev-libs/leveldb-1.15.0
 1801011404 metadata/md5-cache/dev-libs/rapidjson-9999
@@ -46118,7 +46022,6 @@
 1801011404 metadata/md5-cache/dev-libs/hiredis-0.13.3
 1801011404 metadata/md5-cache/dev-libs/xapian-1.4.5
 1801011404 metadata/md5-cache/dev-libs/liblognorm-1.1.2-r1
-1801011404 metadata/md5-cache/dev-libs/jsoncpp-1.8.3
 1801011404 metadata/md5-cache/dev-libs/caliper-1.5.0
 1801011404 metadata/md5-cache/dev-libs/libcoyotl-3.1.0-r2
 1801011404 metadata/md5-cache/dev-libs/libbulletml-0.0.6
@@ -46146,7 +46049,6 @@
 1801011404 metadata/md5-cache/dev-libs/marisa-0.2.4
 1801011404 metadata/md5-cache/dev-libs/mongo-cxx-driver-1.0.0
 1801011404 metadata/md5-cache/dev-libs/libcdio-0.93
-1801011404 metadata/md5-cache/dev-libs/libgit2-glib-0.26.0-r1
 1801011404 metadata/md5-cache/dev-libs/libx86emu-1.1
 1801011404 metadata/md5-cache/dev-libs/qqwing-1.3.3
 1801011404 metadata/md5-cache/dev-libs/libunistring-0.9.7
@@ -46236,6 +46138,7 @@
 1801011404 metadata/md5-cache/dev-libs/libarcus-2.6.0
 1801011404 metadata/md5-cache/dev-libs/libappindicator-12.10.0-r301
 1801011404 metadata/md5-cache/dev-libs/weston-3.0.0
+1801012040 metadata/md5-cache/dev-libs/libcdio-2.0.0
 1801011404 metadata/md5-cache/dev-libs/handystats-1.11.1
 1801011404 metadata/md5-cache/dev-libs/libressl-2.6.2
 1801011404 metadata/md5-cache/dev-libs/leveldb-1.9.0-r6
@@ -46593,7 +46496,7 @@
 1801011404 metadata/md5-cache/net-vpn/logmein-hamachi-2.1.0.174
 1801011404 metadata/md5-cache/net-vpn/strongswan-5.5.3
 1801011404 metadata/md5-cache/net-vpn/tinc-1.0.32
-1801011404 metadata/md5-cache/net-vpn/tor-0.3.1.9-r1
+1801011710 metadata/md5-cache/net-vpn/tor-0.3.1.9-r1
 1801011404 metadata/md5-cache/net-vpn/openconnect-7.07-r1
 1801011404 metadata/md5-cache/net-vpn/peervpn-0.044-r4
 1801011404 metadata/md5-cache/net-vpn/openfortivpn-1.5.0
@@ -46626,7 +46529,7 @@
 1801011404 metadata/md5-cache/net-vpn/badvpn-1.999.130
 1801011404 metadata/md5-cache/net-vpn/tor-0.3.2.8_rc
 1801011404 metadata/md5-cache/net-vpn/openvpn-2.4.4
-1801011404 metadata/md5-cache/net-vpn/Manifest.gz
+1801011710 metadata/md5-cache/net-vpn/Manifest.gz
 1801011404 metadata/md5-cache/net-vpn/badvpn-1.999.127
 1801011404 metadata/md5-cache/net-vpn/wireguard-0.0.20171221
 1801011404 metadata/md5-cache/net-vpn/vtun-3.0.3
@@ -46884,6 +46787,7 @@
 1801011405 metadata/md5-cache/x11-terms/mate-terminal-1.12.1
 1801011405 metadata/md5-cache/x11-terms/tilda-0.9.6-r1
 1801011404 metadata/md5-cache/games-emulation/xe-2.16.2
+1801011710 metadata/md5-cache/games-emulation/m64py-0.2.4
 1801011404 metadata/md5-cache/games-emulation/vgba-4.8
 1801011404 metadata/md5-cache/games-emulation/zsnes-1.51-r4
 1801011404 metadata/md5-cache/games-emulation/dolphin-5.0
@@ -46911,7 +46815,7 @@
 1801011404 metadata/md5-cache/games-emulation/sdlmame-0.174
 1801011404 metadata/md5-cache/games-emulation/dosbox-9999
 1801011404 metadata/md5-cache/games-emulation/gambatte-0.5.0_p20131102
-1801011404 metadata/md5-cache/games-emulation/Manifest.gz
+1801011710 metadata/md5-cache/games-emulation/Manifest.gz
 1801011404 metadata/md5-cache/games-emulation/mupen64plus-audio-sdl-2.5
 1711182338 metadata/md5-cache/games-emulation/desmume-0.9.11-r1
 1801011404 metadata/md5-cache/games-emulation/dolphin-9999
@@ -47343,11 +47247,9 @@
 1801011404 metadata/md5-cache/app-vim/vim-spell-en-20060123
 1711060039 metadata/md5-cache/app-vim/bufexplorer-7.4.19
 1711060039 metadata/md5-cache/app-vim/sudoedit-0.21
-1801011404 metadata/md5-cache/app-arch/lz4-0_p120
 1801011404 metadata/md5-cache/app-arch/zstd-1.1.0
 1801011404 metadata/md5-cache/app-arch/cabextract-1.6
 1801011404 metadata/md5-cache/app-arch/lrzip-0.621
-1801011404 metadata/md5-cache/app-arch/zip-2.32-r1
 1801011404 metadata/md5-cache/app-arch/lz5-2.0
 1801011404 metadata/md5-cache/app-arch/pax-20161104
 1801011404 metadata/md5-cache/app-arch/unace-2.5-r4
@@ -47403,10 +47305,10 @@
 1801011404 metadata/md5-cache/app-arch/snappy-1.1.3-r1
 1801011404 metadata/md5-cache/app-arch/innoextract-1.6
 1801011404 metadata/md5-cache/app-arch/torrentzip-0.9
-1801011404 metadata/md5-cache/app-arch/unzip-6.0_p21-r2
+1801020140 metadata/md5-cache/app-arch/unzip-6.0_p21-r2
 1801011404 metadata/md5-cache/app-arch/engrampa-1.16.0-r2
 1801011404 metadata/md5-cache/app-arch/upx-ucl-3.91
-1801011404 metadata/md5-cache/app-arch/snappy-1.1.7
+1801021140 metadata/md5-cache/app-arch/snappy-1.1.7
 1712291639 metadata/md5-cache/app-arch/stuffit-5.2.0.611
 1801011404 metadata/md5-cache/app-arch/pigz-2.3.4
 1801011404 metadata/md5-cache/app-arch/zstd-1.3.2
@@ -47438,12 +47340,12 @@
 1801011404 metadata/md5-cache/app-arch/funzix-1.0
 1801011404 metadata/md5-cache/app-arch/xarchiver-0.5.4.12
 1708282339 metadata/md5-cache/app-arch/lzop-1.04
-1801011404 metadata/md5-cache/app-arch/lz4-1.8.0
+1801021140 metadata/md5-cache/app-arch/lz4-1.8.0
 1801011404 metadata/md5-cache/app-arch/tardy-1.28
 1801011404 metadata/md5-cache/app-arch/afio-2.5.1-r1
 1801011404 metadata/md5-cache/app-arch/cfv-1.18.3-r1
 1801011404 metadata/md5-cache/app-arch/engrampa-1.14.1-r1
-1801011404 metadata/md5-cache/app-arch/Manifest.gz
+1801021140 metadata/md5-cache/app-arch/Manifest.gz
 1801011404 metadata/md5-cache/app-arch/zstd-1.1.3
 1801011404 metadata/md5-cache/app-arch/pbzip2-1.1.12
 1801011404 metadata/md5-cache/app-arch/zip-3.0-r2
@@ -47456,7 +47358,6 @@
 1801011404 metadata/md5-cache/app-arch/bzip2-1.0.6-r8
 1801011404 metadata/md5-cache/app-arch/unrpa-9999
 1801011404 metadata/md5-cache/app-arch/gzip-1.6
-1801011404 metadata/md5-cache/app-arch/lz4-0_p131-r1
 1801011404 metadata/md5-cache/app-arch/par2cmdline-0.7.4
 1702282308 metadata/md5-cache/app-arch/duff-0.5.2
 1801011404 metadata/md5-cache/app-arch/par-1.1
@@ -47476,7 +47377,6 @@
 1801011404 metadata/md5-cache/app-arch/sharutils-4.15.1
 1801011404 metadata/md5-cache/app-arch/xdms-1.3.2-r1
 1801011404 metadata/md5-cache/app-arch/pigz-2.4
-1801011404 metadata/md5-cache/app-arch/snappy-1.1.6
 1801011404 metadata/md5-cache/app-arch/unarj-2.65
 1801011404 metadata/md5-cache/app-arch/tardelta-1.0.1
 1801011404 metadata/md5-cache/app-arch/unrar-gpl-0.0.1_p20080417-r2
@@ -47503,12 +47403,10 @@
 1801011404 metadata/md5-cache/app-arch/lzlib-1.9
 1801011404 metadata/md5-cache/app-arch/pax-20160306
 1801011404 metadata/md5-cache/app-arch/bloscpack-0.6.0
-1801011404 metadata/md5-cache/app-arch/lz4-0_p106-r1
 1801011404 metadata/md5-cache/app-arch/xar-1.6.1-r1
 1801011404 metadata/md5-cache/app-arch/libarchive-3.3.1
 1705220108 metadata/md5-cache/app-arch/lzop-1.03
 1801011404 metadata/md5-cache/app-arch/dpkg-1.18.24
-1801011404 metadata/md5-cache/app-arch/zip-3.0
 1801011404 metadata/md5-cache/app-arch/deltarpm-3.6
 1801011404 metadata/md5-cache/app-arch/unp-2.0_pre7_p1-r1
 1801011404 metadata/md5-cache/app-arch/tapeutils-0.4
@@ -47522,7 +47420,6 @@
 1801011404 metadata/md5-cache/app-arch/p7zip-16.02-r1
 1801011404 metadata/md5-cache/app-arch/unp-2.0_pre7_p1
 1801011404 metadata/md5-cache/app-arch/zopfli-1.0.0_p20140705
-1801011404 metadata/md5-cache/app-arch/zip-3.0-r1
 1801011404 metadata/md5-cache/app-arch/pax-3.4.12.16-r1
 1801011404 metadata/md5-cache/app-arch/sharutils-4.15.2
 1801011404 metadata/md5-cache/app-arch/unar-1.10.1
@@ -47767,7 +47664,7 @@
 1801011404 metadata/md5-cache/dev-db/tora-3.2
 1801011404 metadata/md5-cache/dev-db/postgis-9999
 1801011404 metadata/md5-cache/dev-db/mariadb-10.1.29
-1801011404 metadata/md5-cache/dev-db/pg_top-3.7.0
+1801020340 metadata/md5-cache/dev-db/pg_top-3.7.0
 1801011404 metadata/md5-cache/dev-db/firebird-2.5.7.27050.0
 1801011404 metadata/md5-cache/dev-db/go-etcd-0_p20141013-r1
 1801011404 metadata/md5-cache/dev-db/postgresql-9.5.9
@@ -47782,7 +47679,7 @@
 1801011404 metadata/md5-cache/dev-db/pgpool2-3.5.2
 1801011404 metadata/md5-cache/dev-db/sqldeveloper-4.2.0.17.089.1709
 1801011404 metadata/md5-cache/dev-db/percona-toolkit-2.2.11
-1801011404 metadata/md5-cache/dev-db/Manifest.gz
+1801020340 metadata/md5-cache/dev-db/Manifest.gz
 1801011404 metadata/md5-cache/dev-db/sqldeveloper-4.1.5.21.78
 1801011404 metadata/md5-cache/dev-db/freetds-9999
 1707051608 metadata/md5-cache/dev-db/m17n-db-1.6.3
@@ -48013,7 +47910,7 @@
 1801011405 metadata/md5-cache/sys-kernel/zen-sources-3.12.9999
 1801011405 metadata/md5-cache/sys-kernel/rt-sources-4.11.12_p16
 1801011405 metadata/md5-cache/sys-kernel/genkernel-3.5.1.1
-1801011405 metadata/md5-cache/sys-kernel/linux-headers-4.13
+1801020310 metadata/md5-cache/sys-kernel/linux-headers-4.13
 1801011405 metadata/md5-cache/sys-kernel/gentoo-sources-4.9.68
 1801011405 metadata/md5-cache/sys-kernel/ck-sources-4.9.66
 1801011405 metadata/md5-cache/sys-kernel/gentoo-sources-4.14.10-r1
@@ -48036,7 +47933,7 @@
 1801011405 metadata/md5-cache/sys-kernel/linux-headers-4.10
 1801011405 metadata/md5-cache/sys-kernel/gentoo-sources-4.4.104
 1801011405 metadata/md5-cache/sys-kernel/linux-headers-3.18
-1801011405 metadata/md5-cache/sys-kernel/Manifest.gz
+1801020310 metadata/md5-cache/sys-kernel/Manifest.gz
 1801011405 metadata/md5-cache/sys-kernel/linux-headers-4.9
 1711281241 metadata/md5-cache/sys-kernel/linux-firmware-99999999
 1801011405 metadata/md5-cache/sys-kernel/rt-sources-4.1.46_p51
@@ -48278,6 +48175,7 @@
 1702282325 metadata/md5-cache/media-gfx/exif-0.6.21
 1801011404 metadata/md5-cache/media-gfx/gtkimageview-1.6.4
 1801011404 metadata/md5-cache/media-gfx/gqview-2.1.5-r1
+1801012310 metadata/md5-cache/media-gfx/imagemagick-6.9.9.31
 1801011404 metadata/md5-cache/media-gfx/xfig-3.2.5c-r1
 1801011404 metadata/md5-cache/media-gfx/xv-3.10a-r17
 1801011404 metadata/md5-cache/media-gfx/displaycal-3.3.3.0
@@ -48453,6 +48351,7 @@
 1801011404 metadata/md5-cache/media-gfx/imageworsener-1.3.1
 1801011404 metadata/md5-cache/media-gfx/cropgui-0.2-r1
 1801011404 metadata/md5-cache/media-gfx/gnome-raw-thumbnailer-3.0.0-r1
+1801011610 metadata/md5-cache/media-gfx/maim-9999
 1801011404 metadata/md5-cache/media-gfx/pngquant-2.7.2
 1801011404 metadata/md5-cache/media-gfx/llgal-0.13.17-r2
 1801011404 metadata/md5-cache/media-gfx/sigal-1.3.0
@@ -48460,7 +48359,7 @@
 1801011404 metadata/md5-cache/media-gfx/nvidia-texture-tools-2.0.8-r3
 1801011404 metadata/md5-cache/media-gfx/photivo-0_pre20121212
 1801011404 metadata/md5-cache/media-gfx/openexr_viewers-2.2.0
-1801011404 metadata/md5-cache/media-gfx/Manifest.gz
+1801020240 metadata/md5-cache/media-gfx/Manifest.gz
 1801011404 metadata/md5-cache/media-gfx/xdot-0.7
 1702282326 metadata/md5-cache/media-gfx/rotoscope-0.2
 1801011404 metadata/md5-cache/media-gfx/blender-2.79
@@ -48480,6 +48379,7 @@
 1801011404 metadata/md5-cache/media-gfx/xfig-3.2.5c
 1801011404 metadata/md5-cache/media-gfx/nip2-7.38.1
 1801011404 metadata/md5-cache/media-gfx/imageworsener-1.3.2
+1801012310 metadata/md5-cache/media-gfx/imagemagick-7.0.7.19
 1708231209 metadata/md5-cache/media-gfx/figurine-1.0.5-r1
 1801011404 metadata/md5-cache/media-gfx/kphotoalbum-5.2
 1801011404 metadata/md5-cache/media-gfx/povray-3.7.0.0-r1
@@ -48599,6 +48499,7 @@
 1801011404 metadata/md5-cache/media-gfx/gnofract4d-3.14.1
 1702282325 metadata/md5-cache/media-gfx/ebdftopcf-2
 1801011404 metadata/md5-cache/media-gfx/xloadimage-4.1-r11
+1801020240 metadata/md5-cache/media-gfx/geeqie-1.4
 1702282326 metadata/md5-cache/media-gfx/splash-themes-livecd-2006.1
 1801011404 metadata/md5-cache/media-gfx/recoverjpeg-2.2.3-r1
 1708230709 metadata/md5-cache/media-gfx/gifsicle-1.86
@@ -49092,7 +48993,6 @@
 1801011404 metadata/md5-cache/dev-vcs/mercurial-server-1.2-r1
 1702282322 metadata/md5-cache/dev-vcs/cvs2cl-2.71
 1801011404 metadata/md5-cache/dev-vcs/git-2.13.6
-1801011404 metadata/md5-cache/dev-vcs/colorcvs-1.4-r1
 1707301308 metadata/md5-cache/dev-vcs/gti-9999
 1801011404 metadata/md5-cache/dev-vcs/cvsync-9999
 1801011404 metadata/md5-cache/dev-vcs/subversion-1.8.18
@@ -49111,7 +49011,7 @@
 1801011404 metadata/md5-cache/dev-vcs/darcs-2.12.0
 1801011404 metadata/md5-cache/dev-vcs/svn2git-9999
 1801011404 metadata/md5-cache/dev-vcs/gitolite-gentoo-3.5.3.1
-1801011404 metadata/md5-cache/dev-vcs/Manifest.gz
+1801012010 metadata/md5-cache/dev-vcs/Manifest.gz
 1801011404 metadata/md5-cache/dev-vcs/git-mailz-0.12
 1801011404 metadata/md5-cache/dev-vcs/cvs-fast-export-1.38
 1710011139 metadata/md5-cache/dev-vcs/git-lfs-2.3.1
@@ -49192,6 +49092,7 @@
 1710071439 metadata/md5-cache/dev-vcs/guilt-0.36
 1801011404 metadata/md5-cache/dev-vcs/hgsvn-0.2.3-r1
 1801011404 metadata/md5-cache/dev-vcs/monotone-1.0-r4
+1801012010 metadata/md5-cache/dev-vcs/colorcvs-1.4-r2
 1801011404 metadata/md5-cache/java-virtuals/transaction-api-1.1
 1801011404 metadata/md5-cache/java-virtuals/servlet-api-2.3
 1801011404 metadata/md5-cache/java-virtuals/script-api-1.0-r1
@@ -50251,8 +50152,9 @@
 1801011404 metadata/md5-cache/net-firewall/conntrack-tools-1.4.4
 1801011404 metadata/md5-cache/net-firewall/arptables-0.0.3.4-r2
 1801011404 metadata/md5-cache/net-firewall/nftables-0.6-r4
-1801011404 metadata/md5-cache/net-firewall/Manifest.gz
+1801020040 metadata/md5-cache/net-firewall/Manifest.gz
 1801011404 metadata/md5-cache/net-firewall/nfacct-1.0.1
+1801020040 metadata/md5-cache/net-firewall/shorewall-5.1.10.2
 1801011404 metadata/md5-cache/net-firewall/psad-2.4.5
 1801011404 metadata/md5-cache/net-firewall/sanewall-1.1.6-r2
 1801011404 metadata/md5-cache/net-firewall/ebtables-2.0.10.4-r1
@@ -51363,7 +51265,6 @@
 1801011404 metadata/md5-cache/dev-python/testtools-2.3.0
 1801011404 metadata/md5-cache/dev-python/python-augeas-0.5.0
 1801011404 metadata/md5-cache/dev-python/reno-2.2.1
-1801011404 metadata/md5-cache/dev-python/pyblake2-1.0.1
 1801011404 metadata/md5-cache/dev-python/carrot-0.10.7-r1
 1801011404 metadata/md5-cache/dev-python/tempora-1.7
 1801011404 metadata/md5-cache/dev-python/sqlalchemy-0.9.8
@@ -51460,7 +51361,6 @@
 1801011404 metadata/md5-cache/dev-python/irc-15.0.6
 1801011404 metadata/md5-cache/dev-python/tooz-1.58.0
 1801011404 metadata/md5-cache/dev-python/webhelpers-1.3-r1
-1801011404 metadata/md5-cache/dev-python/pygit2-0.26.1
 1801011404 metadata/md5-cache/dev-python/robotframework-selenium2library-1.8.0
 1801011404 metadata/md5-cache/dev-python/pyroute2-0.4.21
 1801011404 metadata/md5-cache/dev-python/twisted-web-15.2.1
@@ -52408,7 +52308,7 @@
 1801011404 metadata/md5-cache/dev-python/idna-2.5
 1801011404 metadata/md5-cache/dev-python/setuptools-git-1.2
 1801011404 metadata/md5-cache/dev-python/ipykernel-4.3.1
-1801011404 metadata/md5-cache/dev-python/pyrsistent-0.13.0
+1801020340 metadata/md5-cache/dev-python/pyrsistent-0.13.0
 1801011404 metadata/md5-cache/dev-python/warlock-1.2.0
 1801011404 metadata/md5-cache/dev-python/utidylib-0.3
 1801011404 metadata/md5-cache/dev-python/transmissionrpc-0.11
@@ -52567,7 +52467,7 @@
 1801011404 metadata/md5-cache/dev-python/theano-0.9.0
 1801011404 metadata/md5-cache/dev-python/wrapt-1.10.8
 1801011404 metadata/md5-cache/dev-python/hypothesis-3.33.0
-1801011404 metadata/md5-cache/dev-python/Manifest.gz
+1801020940 metadata/md5-cache/dev-python/Manifest.gz
 1801011404 metadata/md5-cache/dev-python/mamba-0.8.6
 1801011404 metadata/md5-cache/dev-python/zope-testrunner-4.6.0
 1801011404 metadata/md5-cache/dev-python/spyder-3.2.4
@@ -52828,7 +52728,7 @@
 1801011404 metadata/md5-cache/dev-python/Flask-KVSession-0.6.1
 1801011404 metadata/md5-cache/dev-python/ipaddress-1.0.14
 1801011404 metadata/md5-cache/dev-python/wehjit-0.2.2-r1
-1801011404 metadata/md5-cache/dev-python/paramiko-2.2.1
+1801011440 metadata/md5-cache/dev-python/paramiko-2.2.1
 1801011404 metadata/md5-cache/dev-python/django-1.7.11
 1801011404 metadata/md5-cache/dev-python/rosdistro-0.6.3
 1801011404 metadata/md5-cache/dev-python/dpkt-1.8-r1
@@ -52932,7 +52832,7 @@
 1801011404 metadata/md5-cache/dev-python/jdcal-1.0
 1801011404 metadata/md5-cache/dev-python/protobuf-python-3.4.1
 1801011404 metadata/md5-cache/dev-python/addons-0.7
-1801011404 metadata/md5-cache/dev-python/pynacl-1.1.2
+1801011440 metadata/md5-cache/dev-python/pynacl-1.1.2
 1801011404 metadata/md5-cache/dev-python/pynacl-1.2.0
 1801011404 metadata/md5-cache/dev-python/awscli-1.10.59
 1702282317 metadata/md5-cache/dev-python/python-docs-3.5.2
@@ -53175,6 +53075,7 @@
 1801011404 metadata/md5-cache/dev-python/pytools-2016.2.6-r1
 1801011404 metadata/md5-cache/dev-python/httpretty-0.8.0-r1
 1801011404 metadata/md5-cache/dev-python/dingus-0.3.4-r1
+1801011710 metadata/md5-cache/dev-python/PySDL2-0.9.6
 1801011404 metadata/md5-cache/dev-python/gdmodule-0.56-r2
 1801011404 metadata/md5-cache/dev-python/symengine-0.3.0
 1801011404 metadata/md5-cache/dev-python/pickleshare-0.7.4-r1
@@ -53347,7 +53248,6 @@
 1801011404 metadata/md5-cache/dev-python/tabulate-0.8.1
 1801011404 metadata/md5-cache/dev-python/oauth2client-2.2.0
 1801011404 metadata/md5-cache/dev-python/plumbum-1.6.0
-1801011404 metadata/md5-cache/dev-python/miniupnpc-2.0.20171102
 1801011404 metadata/md5-cache/dev-python/oslo-cache-1.25.1
 1801011404 metadata/md5-cache/dev-python/pymdstat-0.4.2
 1801011404 metadata/md5-cache/dev-python/fusil-1.5-r1
@@ -53651,7 +53551,6 @@
 1801011404 metadata/md5-cache/dev-python/pysmi-0.1.3
 1801011404 metadata/md5-cache/dev-python/pyplusplus-9999
 1801011404 metadata/md5-cache/dev-python/pygresql-4.1.1-r2
-1801011404 metadata/md5-cache/dev-python/pymountboot-0.2.1
 1801011404 metadata/md5-cache/dev-python/parse-type-0.3.4-r1
 1801011404 metadata/md5-cache/dev-python/astrodendro-0.2.0
 1801011404 metadata/md5-cache/dev-python/python-efl-1.18.0
@@ -53759,7 +53658,7 @@
 1801011404 metadata/md5-cache/dev-python/paver-1.2.4
 1801011404 metadata/md5-cache/dev-python/happydoc-3.1-r2
 1801011404 metadata/md5-cache/dev-python/astroml-0.3
-1801011404 metadata/md5-cache/dev-python/bcrypt-3.1.3
+1801011440 metadata/md5-cache/dev-python/bcrypt-3.1.3
 1801011404 metadata/md5-cache/dev-python/service_identity-14.0.0
 1801011404 metadata/md5-cache/dev-python/carbon-0.9.13-r1
 1801011404 metadata/md5-cache/dev-python/pycrypto-2.6.1-r2
@@ -53990,6 +53889,7 @@
 1801011404 metadata/md5-cache/dev-python/gconf-python-2.28.1-r1
 1801011404 metadata/md5-cache/dev-python/sphinx-gallery-0.1.12
 1801011404 metadata/md5-cache/dev-python/treq-17.3.1
+1801012140 metadata/md5-cache/dev-python/pytest-qt-2.3.0
 1801011404 metadata/md5-cache/dev-python/pyosd-0.2.14-r1
 1801011404 metadata/md5-cache/dev-python/click-threading-0.1.2
 1801011404 metadata/md5-cache/dev-python/pyplusplus-1.0.0_p20131206
@@ -54784,7 +54684,6 @@
 1801011404 metadata/md5-cache/app-shells/tmux-bash-completion-9999
 1711281241 metadata/md5-cache/app-shells/zsh-completions-9999
 1801011404 metadata/md5-cache/app-shells/bash-4.2_p53
-1801011404 metadata/md5-cache/app-shells/bash-completion-2.5
 1612071138 metadata/md5-cache/app-shells/bashdb-4.4.0.92
 1801011404 metadata/md5-cache/app-shells/thefuck-3.24
 1801011404 metadata/md5-cache/app-shells/scsh-0.6.7-r2
@@ -54798,7 +54697,6 @@
 1801011404 metadata/md5-cache/app-shells/hstr-1.23
 1801011404 metadata/md5-cache/app-shells/mksh-53a
 1801011404 metadata/md5-cache/app-shells/zsh-5.4.2-r1
-1801011404 metadata/md5-cache/app-shells/bash-completion-2.7
 1711082339 metadata/md5-cache/app-shells/push-2.0-r1
 1709142208 metadata/md5-cache/app-shells/psh-1.8.1-r3
 1801011404 metadata/md5-cache/app-shells/mpibash-1.2
@@ -54830,7 +54728,7 @@
 1801011404 metadata/md5-cache/app-shells/mksh-56b
 1801011404 metadata/md5-cache/app-shells/bash-2.05b_p13
 1801011404 metadata/md5-cache/app-shells/scsh-install-lib-1.3.0
-1801011404 metadata/md5-cache/app-shells/Manifest.gz
+1801020940 metadata/md5-cache/app-shells/Manifest.gz
 1711071609 metadata/md5-cache/app-shells/fish-2.6.0
 1702282309 metadata/md5-cache/app-shells/bashdb-4.3.0.91-r2
 1801011404 metadata/md5-cache/app-shells/mksh-52
@@ -54895,7 +54793,7 @@
 1801011404 metadata/md5-cache/net-im/dianara-1.3.7
 1801011404 metadata/md5-cache/net-im/pork-0.99.8.1-r1
 1801011404 metadata/md5-cache/net-im/kadu-2.1-r1
-1801011404 metadata/md5-cache/net-im/coturn-4.5.0.6
+1801020610 metadata/md5-cache/net-im/coturn-4.5.0.6
 1801011404 metadata/md5-cache/net-im/ejabberd-17.04-r1
 1801011404 metadata/md5-cache/net-im/discord-bin-0.0.3
 1801011404 metadata/md5-cache/net-im/bitlbee-steam-1.2.0
@@ -54913,7 +54811,7 @@
 1801011404 metadata/md5-cache/net-im/qtox-1.11.0
 1801011404 metadata/md5-cache/net-im/reaim-0.8-r2
 1801011404 metadata/md5-cache/net-im/psi-1.2
-1801011404 metadata/md5-cache/net-im/coturn-9999
+1801020610 metadata/md5-cache/net-im/coturn-9999
 1801011404 metadata/md5-cache/net-im/openmittsu-0.9.2.109
 1801011404 metadata/md5-cache/net-im/librvp-0.9.6
 1801011404 metadata/md5-cache/net-im/slack-bin-2.1.2
@@ -54931,7 +54829,7 @@
 1801011404 metadata/md5-cache/net-im/mattermost-desktop-bin-3.6.0
 1801011404 metadata/md5-cache/net-im/slack-bin-2.8.2
 1801011404 metadata/md5-cache/net-im/hangups-9999
-1801011404 metadata/md5-cache/net-im/Manifest.gz
+1801020610 metadata/md5-cache/net-im/Manifest.gz
 1801011404 metadata/md5-cache/net-im/prosody-0.9.11
 1801011404 metadata/md5-cache/net-im/cpop-0.0.4-r1
 1801011404 metadata/md5-cache/net-im/openfire-4.1.0
@@ -54967,7 +54865,7 @@
 1801011404 metadata/md5-cache/net-im/ejabberd-17.01-r2
 1801011404 metadata/md5-cache/net-im/choqok-1.6.0
 1801011404 metadata/md5-cache/net-im/ekg2-0.3.1-r2
-1801011404 metadata/md5-cache/net-im/coturn-4.5.0.4-r1
+1801020610 metadata/md5-cache/net-im/coturn-4.5.0.4-r1
 1801011404 metadata/md5-cache/net-im/mcabber-1.1.0
 1801011404 metadata/md5-cache/net-im/prosody-0.9.12
 1801011404 metadata/md5-cache/net-im/bitlbee-steam-9999
@@ -55029,12 +54927,11 @@
 1801011404 metadata/md5-cache/dev-cpp/waylandpp-0.1.4
 1801011404 metadata/md5-cache/dev-cpp/sparsehash-2.0.3-r1
 1801011404 metadata/md5-cache/dev-cpp/glibmm-2.50.1
-1801011404 metadata/md5-cache/dev-cpp/Manifest.gz
+1801020940 metadata/md5-cache/dev-cpp/Manifest.gz
 1801011404 metadata/md5-cache/dev-cpp/gtksourceviewmm-2.10.3-r1
 1801011404 metadata/md5-cache/dev-cpp/catch-1.9999
 1801011404 metadata/md5-cache/dev-cpp/cpp-hocon-0.1.4
 1801011404 metadata/md5-cache/dev-cpp/libxmlpp-2.40.1
-1801011404 metadata/md5-cache/dev-cpp/catch-2.0.0_pre6
 1801011404 metadata/md5-cache/dev-cpp/catch-9999
 1801011404 metadata/md5-cache/dev-cpp/ctemplate-2.3-r1
 1801011404 metadata/md5-cache/dev-cpp/eigen-3.2.8-r2
@@ -55066,7 +54963,6 @@
 1801011404 metadata/md5-cache/dev-cpp/glog-0.3.4-r1
 1801011404 metadata/md5-cache/dev-cpp/ETL-0.04.15
 1801011404 metadata/md5-cache/dev-cpp/libjson-rpc-cpp-0.7.0
-1801011404 metadata/md5-cache/dev-cpp/catch-1.10.0
 1703011338 metadata/md5-cache/dev-cpp/libbinio-1.4-r1
 1801011404 metadata/md5-cache/dev-cpp/lucene++-3.0.7
 1801011404 metadata/md5-cache/dev-cpp/pangomm-2.40.1
@@ -55193,9 +55089,9 @@
 1801011404 metadata/md5-cache/sci-misc/fitsverify-4.17
 1801011404 metadata/md5-cache/sci-misc/repsnapper-2.4a_p3
 1801011404 metadata/md5-cache/sci-misc/gato-1.2.2
-1801011404 metadata/md5-cache/sci-misc/Manifest.gz
+1801020210 metadata/md5-cache/sci-misc/Manifest.gz
 1702282331 metadata/md5-cache/sci-misc/flashdot-1.1.4-r1
-1801011404 metadata/md5-cache/sci-misc/nco-4.5.1-r2
+1801020210 metadata/md5-cache/sci-misc/nco-4.5.1-r2
 1801011404 metadata/md5-cache/sci-misc/boinc-7.8.4
 1801011404 metadata/md5-cache/sci-misc/cdfplayer-11.2.0
 1801011404 metadata/md5-cache/sci-misc/apertium-3.2.0
@@ -55204,7 +55100,6 @@
 1801011404 metadata/md5-cache/sci-misc/oww-0.86.4
 1801011404 metadata/md5-cache/sci-misc/netlogo-bin-5.0.3-r1
 1801011404 metadata/md5-cache/sci-misc/repsnapper-9999
-1801011404 metadata/md5-cache/sci-misc/nco-3.9.9
 1801011404 metadata/md5-cache/sci-misc/repsnapper-2.3.2a_p3
 1801011404 metadata/md5-cache/sci-misc/vitables-2.1-r1
 1801011404 metadata/md5-cache/sci-misc/ncview-2.1.7
@@ -56584,7 +56479,7 @@
 1801011404 metadata/md5-cache/media-radio/xwxapt-2.7
 1801011404 metadata/md5-cache/media-radio/flamp-2.2.03
 1801011404 metadata/md5-cache/media-radio/flrig-1.3.35
-1801011404 metadata/md5-cache/media-radio/flrig-1.3.36
+1801020410 metadata/md5-cache/media-radio/flrig-1.3.36
 1801011404 metadata/md5-cache/media-radio/gpredict-2.0
 1801011404 metadata/md5-cache/media-radio/xwxapt-3.1
 1801011404 metadata/md5-cache/media-radio/flmsg-4.0.3
@@ -56598,7 +56493,7 @@
 1801011404 metadata/md5-cache/media-radio/flrig-1.3.33
 1801011404 metadata/md5-cache/media-radio/xwxapt-2.4
 1801011404 metadata/md5-cache/media-radio/wspr-3.01-r1
-1801011404 metadata/md5-cache/media-radio/fldigi-4.0.12
+1801020340 metadata/md5-cache/media-radio/fldigi-4.0.12
 1801011404 metadata/md5-cache/media-radio/flrig-1.3.30
 1801011404 metadata/md5-cache/media-radio/flrig-1.3.32
 1801011404 metadata/md5-cache/media-radio/wspr-3.01
@@ -56611,7 +56506,7 @@
 1801011404 metadata/md5-cache/media-radio/xwxapt-3.2
 1801011404 metadata/md5-cache/media-radio/fldigi-4.0.11
 1801011404 metadata/md5-cache/media-radio/xwxapt-2.9
-1801011404 metadata/md5-cache/media-radio/Manifest.gz
+1801020410 metadata/md5-cache/media-radio/Manifest.gz
 1706221408 metadata/md5-cache/media-radio/fldigi-4.0.4
 1801011404 metadata/md5-cache/media-radio/qrq-0.3.1
 1801011404 metadata/md5-cache/media-radio/fldigi-4.0.7
@@ -56619,7 +56514,7 @@
 1801011404 metadata/md5-cache/media-radio/fldigi-4.0.13
 1801011404 metadata/md5-cache/media-radio/xlog-2.0.14
 1801011404 metadata/md5-cache/media-radio/flrig-1.3.27
-1801011404 metadata/md5-cache/media-radio/xlog-2.0.15
+1801020410 metadata/md5-cache/media-radio/xlog-2.0.15
 1801011404 metadata/md5-cache/media-radio/flrig-1.3.31
 1801011404 metadata/md5-cache/media-radio/fldigi-4.0.5
 1801011404 metadata/md5-cache/media-radio/xdx-2.5.0
@@ -57200,7 +57095,7 @@
 1801011404 metadata/md5-cache/dev-php/xhprof-0.9.4_p20150226-r1
 1801011404 metadata/md5-cache/dev-php/pecl-crack-0.4-r6
 1801011404 metadata/md5-cache/dev-php/PEAR-MIME_Type-1.3.3
-1711060309 metadata/md5-cache/dev-php/PEAR-Exception-1.0.0
+1801012340 metadata/md5-cache/dev-php/PEAR-Exception-1.0.0
 1801011404 metadata/md5-cache/dev-php/PEAR-Crypt_GPG-1.4.2
 1801011404 metadata/md5-cache/dev-php/libvirt-php-0.5.3
 1712150639 metadata/md5-cache/dev-php/symfony-finder-3.2.8
@@ -57215,7 +57110,7 @@
 1702282315 metadata/md5-cache/dev-php/PEAR-Console_Getopt-1.4.1-r1
 1801011404 metadata/md5-cache/dev-php/PEAR-HTTP_Request2-2.2.1
 1711172138 metadata/md5-cache/dev-php/PEAR-HTML_Table_Matrix-1.0.10-r1
-1711060309 metadata/md5-cache/dev-php/PEAR-PEAR-1.10.5
+1801012340 metadata/md5-cache/dev-php/PEAR-PEAR-1.10.5
 1801011404 metadata/md5-cache/dev-php/PEAR-Text_Wiki_Mediawiki-0.2.0-r1
 1711172138 metadata/md5-cache/dev-php/PEAR-Text_Highlighter-0.8.0
 1801011404 metadata/md5-cache/dev-php/PEAR-I18Nv2-0.11.4-r3
@@ -57264,7 +57159,7 @@
 1702282315 metadata/md5-cache/dev-php/phing-2.16.0
 1703121808 metadata/md5-cache/dev-php/PEAR-Net_SMTP-1.7.3
 1702282315 metadata/md5-cache/dev-php/phar-utils-1.0.0
-1801011404 metadata/md5-cache/dev-php/Manifest.gz
+1801012340 metadata/md5-cache/dev-php/Manifest.gz
 1711172138 metadata/md5-cache/dev-php/PEAR-MDB2-2.5.0_beta5-r1
 1801011404 metadata/md5-cache/dev-php/pecl-http-2.6.0-r1
 1801011404 metadata/md5-cache/dev-php/pecl-translit-0.6.2-r1
@@ -57607,7 +57502,6 @@
 1801011404 metadata/md5-cache/app-text/groonga-normalizer-mysql-1.1.0
 1801011404 metadata/md5-cache/app-text/texlive-core-2012-r1
 1801011404 metadata/md5-cache/app-text/zathura-ps-0.2.4
-1801011404 metadata/md5-cache/app-text/fbreader-0.99.4-r2
 1801011404 metadata/md5-cache/app-text/discount-2.1.8a-r1
 1708162108 metadata/md5-cache/app-text/tabler-2-r1
 1801011404 metadata/md5-cache/app-text/xournal-9999
@@ -57721,7 +57615,7 @@
 1712292110 metadata/md5-cache/app-text/libmwaw-0.3.13
 1801011404 metadata/md5-cache/app-text/ding-1.8.1
 1801011404 metadata/md5-cache/app-text/zathura-pdf-poppler-0.2.7
-1801011404 metadata/md5-cache/app-text/Manifest.gz
+1801020940 metadata/md5-cache/app-text/Manifest.gz
 1707071808 metadata/md5-cache/app-text/texlive-2016
 1702282310 metadata/md5-cache/app-text/writerperfect-0.9.5
 1801011404 metadata/md5-cache/app-text/qpdfview-0.4.17_beta1
@@ -57856,7 +57750,7 @@
 1702282309 metadata/md5-cache/app-text/freepwing-1.4.3
 1801011404 metadata/md5-cache/app-text/cb2bib-1.9.7
 1801011404 metadata/md5-cache/app-text/pelican-3.7.1
-1801011404 metadata/md5-cache/app-text/fbreader-0.99.4-r3
+1801020340 metadata/md5-cache/app-text/fbreader-0.99.4-r3
 1801011404 metadata/md5-cache/app-text/keepnote-0.7.9-r2
 1801011404 metadata/md5-cache/app-text/cutemarked-0.11.3
 1801011404 metadata/md5-cache/app-text/clara-20031214
@@ -58371,7 +58265,6 @@
 1801011405 metadata/md5-cache/www-apps/webmcp-1.2.6
 1710080139 metadata/md5-cache/www-apps/piwigo-2.9.2
 1801011405 metadata/md5-cache/www-apps/trac-1.2
-1801011405 metadata/md5-cache/www-apps/eyeos-2.5
 1801011405 metadata/md5-cache/www-apps/tt-rss-20160527
 1801011405 metadata/md5-cache/www-apps/owncloud-10.0.3
 1801011405 metadata/md5-cache/www-apps/jekyll-watch-1.5.0
@@ -58463,7 +58356,7 @@
 1706301438 metadata/md5-cache/www-apps/ampache-3.8.3
 1711300140 metadata/md5-cache/www-apps/wordpress-4.9.1
 1801011405 metadata/md5-cache/www-apps/moodle-3.3.3
-1801011405 metadata/md5-cache/www-apps/Manifest.gz
+1801012110 metadata/md5-cache/www-apps/Manifest.gz
 1801011405 metadata/md5-cache/www-apps/scgi-1.14-r1
 1801011405 metadata/md5-cache/www-apps/davical-1.1.3.1-r2
 1702282334 metadata/md5-cache/www-apps/cvsweb-3.0.5
@@ -58823,7 +58716,7 @@
 1801011404 metadata/md5-cache/sys-freebsd/freebsd-usbin-11.1
 1801011404 metadata/md5-cache/sys-freebsd/boot0-8.2
 1801011404 metadata/md5-cache/sys-freebsd/freebsd-sources-9.1-r9
-1801011404 metadata/md5-cache/Manifest.gz
+1801021240 metadata/md5-cache/Manifest.gz
 1801011405 metadata/md5-cache/www-apache/mod_macro-1.1.10
 1801011405 metadata/md5-cache/www-apache/mod_wsgi-4.5.17
 1801011405 metadata/md5-cache/www-apache/mod_perl-2.0.10
@@ -58914,7 +58807,6 @@
 1801011404 metadata/md5-cache/dev-util/trace-cmd-2.5.1
 1801011404 metadata/md5-cache/dev-util/catalyst-2.0.18-r1
 1801011404 metadata/md5-cache/dev-util/pkgconfig-openbsd-20130507-r1
-1702282321 metadata/md5-cache/dev-util/abi-dumper-0.99.19
 1801011404 metadata/md5-cache/dev-util/buildbot-console-view-0.9.11
 1801011404 metadata/md5-cache/dev-util/vint-0.3.16
 1801011404 metadata/md5-cache/dev-util/schroot-1.6.10-r4
@@ -59051,7 +58943,6 @@
 1801011404 metadata/md5-cache/dev-util/xxdiff-4.0.1-r1
 1801011404 metadata/md5-cache/dev-util/rosdep-0.11.6
 1801011404 metadata/md5-cache/dev-util/tailor-0.9.35-r1
-1801011404 metadata/md5-cache/dev-util/bcc-0.4.0
 1801011404 metadata/md5-cache/dev-util/shellcheck-0.4.4
 1702282322 metadata/md5-cache/dev-util/peg-0.1.15
 1702282322 metadata/md5-cache/dev-util/shtool-2.0.8-r1
@@ -59284,7 +59175,6 @@
 1801011404 metadata/md5-cache/dev-util/kdevelop-php-5.2.1
 1801011404 metadata/md5-cache/dev-util/squashmerge-0.1
 1801011404 metadata/md5-cache/dev-util/buildbot-worker-0.9.11
-1801011404 metadata/md5-cache/dev-util/bcc-0.3.0_p20170913
 1801011404 metadata/md5-cache/dev-util/reswrap-3.2.0
 1801011404 metadata/md5-cache/dev-util/intel-ocl-sdk-4.4.0.117-r1
 1801011404 metadata/md5-cache/dev-util/gyp-20170904022846
@@ -59336,7 +59226,7 @@
 1801011404 metadata/md5-cache/dev-util/ragel-6.9
 1801011404 metadata/md5-cache/dev-util/cargo-0.16.0
 1801011404 metadata/md5-cache/dev-util/nvidia-cuda-sdk-8.0.44-r1
-1801011404 metadata/md5-cache/dev-util/Manifest.gz
+1801020940 metadata/md5-cache/dev-util/Manifest.gz
 1801011404 metadata/md5-cache/dev-util/xdelta-3.1.0
 1801011404 metadata/md5-cache/dev-util/dmake-4.12.2
 1801011404 metadata/md5-cache/dev-util/dissembler-0.9-r1
@@ -59389,7 +59279,7 @@
 1801011404 metadata/md5-cache/dev-util/re2c-1.0.3
 1801011404 metadata/md5-cache/dev-util/rosdep-9999
 1801011404 metadata/md5-cache/dev-util/squashdelta-0.1
-1801011404 metadata/md5-cache/dev-util/strace-9999
+1801020110 metadata/md5-cache/dev-util/strace-9999
 1801011404 metadata/md5-cache/dev-util/dialog-1.3.20170509
 1711281241 metadata/md5-cache/dev-util/cwdiff-9999
 1801011404 metadata/md5-cache/dev-util/rosinstall-9999
@@ -59467,7 +59357,6 @@
 1801011404 metadata/md5-cache/dev-util/bitcoin-tx-0.13.2
 1801011404 metadata/md5-cache/dev-util/lttng-ust-2.8.1
 1707121109 metadata/md5-cache/dev-util/colm-0.13.0.4
-1801011404 metadata/md5-cache/dev-util/scons-2.5.0
 1801011404 metadata/md5-cache/dev-util/lttng-tools-2.6.1
 1801011404 metadata/md5-cache/dev-util/sasm-2.2
 1801011404 metadata/md5-cache/dev-util/mpatch-0.8-r1
@@ -59483,7 +59372,6 @@
 1801011404 metadata/md5-cache/dev-util/trinity-1.7
 1801011404 metadata/md5-cache/dev-util/qbs-1.9.1
 1801011404 metadata/md5-cache/dev-util/pycharm-community-2017.3.1
-1801011404 metadata/md5-cache/dev-util/strace-4.19
 1801011404 metadata/md5-cache/dev-util/meld-3.18.0
 1801011404 metadata/md5-cache/dev-util/lttng-tools-2.8.0
 1801011404 metadata/md5-cache/dev-util/mingw-runtime-3.20.2
@@ -59564,9 +59452,8 @@
 1711281241 metadata/md5-cache/dev-util/clinfo-9999
 1801011404 metadata/md5-cache/dev-util/meson-0.43.0
 1801011404 metadata/md5-cache/dev-util/xdelta-1.1.4-r1
-1708281839 metadata/md5-cache/dev-util/shadowman-1
 1801011404 metadata/md5-cache/dev-util/clion-1.2.4.143.1186
-1801011404 metadata/md5-cache/dev-util/strace-4.20
+1801020110 metadata/md5-cache/dev-util/strace-4.20
 1801011404 metadata/md5-cache/dev-util/makeheaders-0_p4
 1801011404 metadata/md5-cache/dev-util/cucumber-3.0.2
 1801011404 metadata/md5-cache/dev-util/global-6.5.7
@@ -59578,8 +59465,6 @@
 1801011404 metadata/md5-cache/dev-util/uncrustify-9999
 1801011404 metadata/md5-cache/dev-util/systemtap-3.1
 1801011404 metadata/md5-cache/dev-util/cucumber-tag_expressions-1.1.1
-1706171039 metadata/md5-cache/dev-util/abi-compliance-checker-2.1
-1702282321 metadata/md5-cache/dev-util/abi-dumper-0.99.15
 1801011404 metadata/md5-cache/dev-util/pkgconfig-9999
 1801011404 metadata/md5-cache/dev-util/vmtouch-1.2.0
 1801011404 metadata/md5-cache/dev-util/umockdev-0.9.4
@@ -59595,7 +59480,6 @@
 1707082309 metadata/md5-cache/dev-util/makepp-2.0.98.5-r1
 1801011404 metadata/md5-cache/dev-util/unifdef-2.10
 1801011404 metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-0.9.13
-1801011404 metadata/md5-cache/dev-util/scons-2.3.5
 1801011404 metadata/md5-cache/dev-util/nvidia-cuda-sdk-7.5.18
 1801011404 metadata/md5-cache/dev-util/dejagnu-1.4.4-r3
 1801011404 metadata/md5-cache/dev-util/buildbot-grid-view-0.9.12_p1
@@ -59638,6 +59522,7 @@
 1711260441 metadata/md5-cache/dev-util/clair-2.0.1
 1801011404 metadata/md5-cache/dev-util/aruba-0.8.1
 1801011404 metadata/md5-cache/dev-util/osc-0.152.0
+1801020510 metadata/md5-cache/dev-util/bcc-0.5.0_p20171230
 1801011404 metadata/md5-cache/dev-util/bin_replace_string-0.2
 1801011404 metadata/md5-cache/dev-util/strace-4.16
 1801011404 metadata/md5-cache/dev-util/lttng-tools-2.7.3
@@ -61313,7 +61198,7 @@
 1801011404 metadata/md5-cache/app-admin/github-backup-utils-2.11.1
 1801011404 metadata/md5-cache/app-admin/dio-1.5.2
 1801011404 metadata/md5-cache/app-admin/ulogd-2.0.5_p20161017
-1801011404 metadata/md5-cache/app-admin/puppetserver-5.1.4
+1801020610 metadata/md5-cache/app-admin/puppetserver-5.1.4
 1712292010 metadata/md5-cache/app-admin/superadduser-1.0.9
 1801011404 metadata/md5-cache/app-admin/sysstat-11.6.0
 1801011404 metadata/md5-cache/app-admin/keepass-2.37
@@ -61419,7 +61304,7 @@
 1711260441 metadata/md5-cache/app-admin/logcheck-1.3.17
 1711260441 metadata/md5-cache/app-admin/graylog2-2.2.3
 1801011404 metadata/md5-cache/app-admin/jinit-0.1.12-r1
-1801011404 metadata/md5-cache/app-admin/Manifest.gz
+1801020610 metadata/md5-cache/app-admin/Manifest.gz
 1703071908 metadata/md5-cache/app-admin/systemrescuecd-x86-4.9.3
 1801011404 metadata/md5-cache/app-admin/diamond-9999
 1801011404 metadata/md5-cache/app-admin/calamares-3.1.7
@@ -62357,6 +62242,7 @@
 1801011404 metadata/md5-cache/app-portage/hackport-0.5.2
 1801011404 metadata/md5-cache/app-portage/gs-elpa-0.1.3
 1801011404 metadata/md5-cache/app-portage/layman-2.0.0-r1
+1801020940 metadata/md5-cache/app-portage/eclass-manpages-20180101
 1801011404 metadata/md5-cache/app-portage/portpeek-2.1.24
 1709142208 metadata/md5-cache/app-portage/g-cpan-0.16.7
 1709142208 metadata/md5-cache/app-portage/g-cpan-0.16.9
@@ -62376,7 +62262,6 @@
 1801011404 metadata/md5-cache/app-portage/tatt-0.5
 1801011404 metadata/md5-cache/app-portage/java-ebuilder-0.2
 1801011404 metadata/md5-cache/app-portage/g-sorcery-0.2.1
-1801011404 metadata/md5-cache/app-portage/unsandbox-1
 1801011404 metadata/md5-cache/app-portage/fetchcommandwrapper-0.7.3
 1801011404 metadata/md5-cache/app-portage/g-octave-0.4.1-r5
 1702282309 metadata/md5-cache/app-portage/perl-info-0.16
@@ -62385,7 +62270,6 @@
 1801011404 metadata/md5-cache/app-portage/gpyutils-0.2.1
 1801011404 metadata/md5-cache/app-portage/unsandbox-2
 1801011404 metadata/md5-cache/app-portage/esearch-1.3-r1
-1707120139 metadata/md5-cache/app-portage/eclass-manpages-20170712
 1801011404 metadata/md5-cache/app-portage/cfg-update-1.8.9
 1801011404 metadata/md5-cache/app-portage/etc-proposals-1.4.3-r3
 1702282309 metadata/md5-cache/app-portage/epkg-0.3
@@ -62395,14 +62279,13 @@
 1801011404 metadata/md5-cache/app-portage/elogv-0.7.6.1-r1
 1801011404 metadata/md5-cache/app-portage/diffmask-0.3.3-r2
 1801011404 metadata/md5-cache/app-portage/genlop-9999
-1801011404 metadata/md5-cache/app-portage/eix-0.33.0-r1
+1801020610 metadata/md5-cache/app-portage/eix-0.33.0-r1
 1801011404 metadata/md5-cache/app-portage/elogviewer-2.6-r1
 1801011404 metadata/md5-cache/app-portage/tatt-9999
 1801011404 metadata/md5-cache/app-portage/repoman-2.3.4
 1801011404 metadata/md5-cache/app-portage/mirrorselect-2.2.2-r2
 1801011404 metadata/md5-cache/app-portage/elogviewer-2.7
 1801011404 metadata/md5-cache/app-portage/cpuid2cpuflags-1
-1801011404 metadata/md5-cache/app-portage/gpyutils-0.1.4
 1801011404 metadata/md5-cache/app-portage/repoman-9999
 1801011404 metadata/md5-cache/app-portage/hackport-9999
 1801011404 metadata/md5-cache/app-portage/metagen-0.6.5-r1
@@ -62420,7 +62303,6 @@
 1801011404 metadata/md5-cache/app-portage/repo-commit-9999
 1801011404 metadata/md5-cache/app-portage/fetchcommandwrapper-0.8
 1712061709 metadata/md5-cache/app-portage/prefix-chain-setup-0.6
-1704281709 metadata/md5-cache/app-portage/eclass-manpages-20170428
 1801011404 metadata/md5-cache/app-portage/java-ebuilder-9999
 1801011404 metadata/md5-cache/app-portage/tatt-0.4
 1708261708 metadata/md5-cache/app-portage/elt-patches-20170826.1
@@ -62436,24 +62318,20 @@
 1702282309 metadata/md5-cache/app-portage/emerge-delta-webrsync-3.7.2-r1
 1801011404 metadata/md5-cache/app-portage/flaggie-9999
 1801011404 metadata/md5-cache/app-portage/esearch-9999
-1705211638 metadata/md5-cache/app-portage/eclass-manpages-20170521
 1801011404 metadata/md5-cache/app-portage/elogviewer-0.6.2-r3
 1801011404 metadata/md5-cache/app-portage/layman-2.0.0-r3
 1801011404 metadata/md5-cache/app-portage/elogv-0.7.6.2
 1801011404 metadata/md5-cache/app-portage/layman-2.4.2
 1801011404 metadata/md5-cache/app-portage/conf-update-1.0.3-r1
 1801011404 metadata/md5-cache/app-portage/pfl-2.4-r4
-1703241808 metadata/md5-cache/app-portage/eclass-manpages-20170321
 1801011404 metadata/md5-cache/app-portage/metagen-0.6.6
 1801011404 metadata/md5-cache/app-portage/gpytage-0.3.0_rc1-r1
-1801011404 metadata/md5-cache/app-portage/gemato-8
 1801011404 metadata/md5-cache/app-portage/fquery-0.2.2
 1801011404 metadata/md5-cache/app-portage/gs-elpa-0.1.3-r1
 1801011404 metadata/md5-cache/app-portage/repoman-2.3.6
 1801011404 metadata/md5-cache/app-portage/grs-0.5
 1801011404 metadata/md5-cache/app-portage/gentoopm-0.2.9
-1801011404 metadata/md5-cache/app-portage/Manifest.gz
-1801011404 metadata/md5-cache/app-portage/gemato-9.1
+1801020940 metadata/md5-cache/app-portage/Manifest.gz
 1801011404 metadata/md5-cache/app-portage/g-cpan-0.16.5
 1801011404 metadata/md5-cache/app-portage/elogv-0.7.6.5
 1801011404 metadata/md5-cache/app-portage/metagen-0.6.4.2
@@ -62463,10 +62341,9 @@
 1708261038 metadata/md5-cache/app-portage/elt-patches-20170422
 1801011404 metadata/md5-cache/app-portage/metagen-0.6.5
 1801011404 metadata/md5-cache/app-portage/gs-pypi-0.1
-1801011404 metadata/md5-cache/app-portage/gemato-9.2
+1801020940 metadata/md5-cache/app-portage/gemato-9.2
 1801011404 metadata/md5-cache/app-portage/repoman-2.3.0-r1
 1801011404 metadata/md5-cache/app-portage/gentoolkit-dev-0.2.8.3-r1
-1704181238 metadata/md5-cache/app-portage/cpuid2cpuflags-4
 1801011404 metadata/md5-cache/app-portage/java-ebuilder-0.1
 1801011404 metadata/md5-cache/app-portage/repo-commit-0.4.1
 1711281241 metadata/md5-cache/app-portage/g-cpan-9999
@@ -62510,7 +62387,7 @@
 1801011404 metadata/md5-cache/app-portage/grs-0.6
 1801011404 metadata/md5-cache/app-portage/grs-9999
 1801011404 metadata/md5-cache/app-portage/portage-utils-0.64
-1703241808 metadata/md5-cache/app-portage/eclass-manpages-99999999
+1801020940 metadata/md5-cache/app-portage/eclass-manpages-99999999
 1801011404 metadata/md5-cache/app-portage/elogv-0.7.6.4
 1801011404 metadata/md5-cache/app-portage/portage-utils-0.64-r1
 1801011404 metadata/md5-cache/app-portage/ufed-0.92
@@ -62702,7 +62579,7 @@
 1801011404 metadata/md5-cache/media-sound/dagrab-0.513-r1
 1707280808 metadata/md5-cache/media-sound/mikmod-3.2.8
 1801011404 metadata/md5-cache/media-sound/darksnow-0.7.1
-1801011404 metadata/md5-cache/media-sound/clementine-1.3.1_p20171113
+1801021140 metadata/md5-cache/media-sound/clementine-1.3.1_p20171113
 1801011404 metadata/md5-cache/media-sound/mpg321-0.3.2
 1801011404 metadata/md5-cache/media-sound/pamix-1.4.1
 1801011404 metadata/md5-cache/media-sound/mac-4.11.4.5.7
@@ -62717,6 +62594,7 @@
 1801011404 metadata/md5-cache/media-sound/lyvi-2.0.0
 1801011404 metadata/md5-cache/media-sound/vimpc-0.09.1
 1702282327 metadata/md5-cache/media-sound/mp3unicode-1.2.1
+1801012210 metadata/md5-cache/media-sound/alsaplayer-0.99.81-r1
 1801011404 metadata/md5-cache/media-sound/tap-reverbed-0-r1
 1801011404 metadata/md5-cache/media-sound/audacious-3.9
 1702282327 metadata/md5-cache/media-sound/icecream-1.3
@@ -62792,7 +62670,7 @@
 1801011404 metadata/md5-cache/media-sound/jack-audio-connection-kit-0.124.1-r1
 1801011404 metadata/md5-cache/media-sound/qtractor-0.8.5
 1801011404 metadata/md5-cache/media-sound/specimen-0.5.2_rc3-r2
-1801011404 metadata/md5-cache/media-sound/timidity++-2.14.0-r2
+1801012210 metadata/md5-cache/media-sound/timidity++-2.14.0-r2
 1801011404 metadata/md5-cache/media-sound/mpdas-0.4.0-r1
 1801011404 metadata/md5-cache/media-sound/cdcd-0.6.6-r2
 1801011404 metadata/md5-cache/media-sound/jamin-0.95.0-r2
@@ -62806,6 +62684,7 @@
 1801011404 metadata/md5-cache/media-sound/wavbreaker-0.11
 1801011404 metadata/md5-cache/media-sound/justeport-0.2
 1801011404 metadata/md5-cache/media-sound/specimen-0.5.2_rc3-r1
+1801011440 metadata/md5-cache/media-sound/hydrogen-9999
 1801011404 metadata/md5-cache/media-sound/ncmpc-0.24
 1702282327 metadata/md5-cache/media-sound/scmpc-0.4.1
 1801011404 metadata/md5-cache/media-sound/easytag-2.1.8
@@ -62882,7 +62761,7 @@
 1801011404 metadata/md5-cache/media-sound/mpfc-1.3.7-r1
 1801011404 metadata/md5-cache/media-sound/gom-0.29.103-r1
 1702282327 metadata/md5-cache/media-sound/gst123-0.3.4
-1801011404 metadata/md5-cache/media-sound/Manifest.gz
+1801021140 metadata/md5-cache/media-sound/Manifest.gz
 1801011404 metadata/md5-cache/media-sound/neutrino-0.8.4
 1801011404 metadata/md5-cache/media-sound/id3ed-1.10.4
 1801011404 metadata/md5-cache/media-sound/jaaa-0.4.2
@@ -62953,7 +62832,7 @@
 1801011404 metadata/md5-cache/media-sound/xmms2-scrobbler-0.4.0
 1702282327 metadata/md5-cache/media-sound/cdstatus-0.97.03
 1801011404 metadata/md5-cache/media-sound/xmms2-0.8-r4
-1801011404 metadata/md5-cache/media-sound/clementine-9999
+1801021140 metadata/md5-cache/media-sound/clementine-9999
 1801011404 metadata/md5-cache/media-sound/sound-juicer-3.24.0
 1801011404 metadata/md5-cache/media-sound/zynaddsubfx-3.0.2
 1801011404 metadata/md5-cache/media-sound/sonic-visualiser-2.5
@@ -63282,14 +63161,13 @@
 1711301810 metadata/md5-cache/sys-fs/xwmfs-0.82
 1801011405 metadata/md5-cache/sys-fs/mtd-utils-1.5.2
 1801011405 metadata/md5-cache/sys-fs/hfsutils-3.2.6-r5
-1801011405 metadata/md5-cache/sys-fs/xfsprogs-4.14.0
+1801020140 metadata/md5-cache/sys-fs/xfsprogs-4.14.0
 1801011405 metadata/md5-cache/sys-fs/e2fsprogs-1.43.7
 1801011405 metadata/md5-cache/sys-fs/aufs4-0_pre20170612
 1801011405 metadata/md5-cache/sys-fs/multipath-tools-0.7.2
 1801011405 metadata/md5-cache/sys-fs/aufs-headers-4.0_p20150420
 1801011405 metadata/md5-cache/sys-fs/aufs4-0_pre20171002
 1801011405 metadata/md5-cache/sys-fs/cryfs-9999
-1801011405 metadata/md5-cache/sys-fs/duperemove-0.09.4
 1702282333 metadata/md5-cache/sys-fs/archivemount-0.8.4
 1801011405 metadata/md5-cache/sys-fs/cryptsetup-1.7.5
 1801011405 metadata/md5-cache/sys-fs/btrfs-progs-4.5.3
@@ -63310,7 +63188,6 @@
 1801011405 metadata/md5-cache/sys-fs/iprutils-2.4.14.1
 1801011405 metadata/md5-cache/sys-fs/xfsprogs-4.12.0
 1801011405 metadata/md5-cache/sys-fs/reiser4progs-1.1.0
-1801011405 metadata/md5-cache/sys-fs/duperemove-0.09.3
 1801011405 metadata/md5-cache/sys-fs/dosfstools-4.1
 1801011405 metadata/md5-cache/sys-fs/quota-4.03
 1801011405 metadata/md5-cache/sys-fs/mac-fdisk-0.1-r7
@@ -63377,7 +63254,6 @@
 1801011405 metadata/md5-cache/sys-fs/lufs-0.9.7-r3
 1801011405 metadata/md5-cache/sys-fs/dislocker-0.7.1-r1
 1801011405 metadata/md5-cache/sys-fs/duperemove-0.11_beta4
-1801011405 metadata/md5-cache/sys-fs/duperemove-0.09.5
 1801011405 metadata/md5-cache/sys-fs/eudev-3.1.5
 1801011405 metadata/md5-cache/sys-fs/udev-init-scripts-9999
 1801011405 metadata/md5-cache/sys-fs/bcache-tools-9999
@@ -63390,7 +63266,7 @@
 1801011405 metadata/md5-cache/sys-fs/udev-234-r1
 1801011405 metadata/md5-cache/sys-fs/lvm2-2.02.139-r1
 1801011405 metadata/md5-cache/sys-fs/zfs-0.6.5.11
-1801011405 metadata/md5-cache/sys-fs/xfsprogs-4.9.0
+1801012240 metadata/md5-cache/sys-fs/xfsprogs-4.9.0
 1801011405 metadata/md5-cache/sys-fs/loop-aes-3.7m
 1801011405 metadata/md5-cache/sys-fs/vhba-20170610
 1801011405 metadata/md5-cache/sys-fs/reiserfsprogs-3.6.27
@@ -63446,7 +63322,7 @@
 1801011405 metadata/md5-cache/sys-fs/dd-rescue-1.46
 1801011405 metadata/md5-cache/sys-fs/ntfs3g-2017.3.23
 1801011405 metadata/md5-cache/sys-fs/snapraid-11.0-r1
-1801011404 metadata/md5-cache/sys-fs/Manifest.gz
+1801020940 metadata/md5-cache/sys-fs/Manifest.gz
 1801011405 metadata/md5-cache/sys-fs/zerofree-1.0.1
 1801011405 metadata/md5-cache/sys-fs/dd-rescue-1.99.6-r1
 1801011405 metadata/md5-cache/sys-fs/aufs3-3_p20160627
@@ -63465,7 +63341,6 @@
 1801011405 metadata/md5-cache/sys-fs/btrfs-progs-4.1.2
 1801011405 metadata/md5-cache/sys-fs/dd-rescue-1.99.6
 1801011405 metadata/md5-cache/sys-fs/aufs4-0_pre20160815
-1801011405 metadata/md5-cache/sys-fs/duperemove-0.09.2
 1707232209 metadata/md5-cache/sys-fs/exfat-utils-1.2.7
 1801011405 metadata/md5-cache/sys-fs/bcache-tools-1.0.5
 1801011405 metadata/md5-cache/sys-fs/cryfs-0.9.7
@@ -63479,7 +63354,6 @@
 1801011405 metadata/md5-cache/sys-fs/udftools-1.1
 1801011405 metadata/md5-cache/sys-fs/squashfs-tools-9999
 1702282333 metadata/md5-cache/sys-fs/mp3fs-0.32
-1801011405 metadata/md5-cache/sys-fs/duperemove-0.09.1
 1801011405 metadata/md5-cache/sys-fs/btrfs-progs-4.10.2
 1801011405 metadata/md5-cache/sys-fs/encfs-1.9.2
 1801011405 metadata/md5-cache/sys-fs/aufs-headers-3.19_p20150420
@@ -63634,7 +63508,7 @@
 1801011404 metadata/md5-cache/sys-boot/yaboot-static-1.3.17-r1
 1801011404 metadata/md5-cache/sys-boot/raspberrypi-mkimage-0_p20120201
 1801011404 metadata/md5-cache/sys-boot/raincoat-0.11
-1801011404 metadata/md5-cache/sys-boot/Manifest.gz
+1801020210 metadata/md5-cache/sys-boot/Manifest.gz
 1801011404 metadata/md5-cache/sys-boot/gnu-efi-3.0.3
 1801011404 metadata/md5-cache/sys-boot/plymouth-0.9.3
 1801011404 metadata/md5-cache/sys-boot/unetbootin-647
@@ -63655,6 +63529,7 @@
 1705261339 metadata/md5-cache/sys-boot/bootcreator-1.2
 1801011404 metadata/md5-cache/sys-boot/grub-static-0.97-r9
 1801011404 metadata/md5-cache/sys-boot/sgibootcd-0.12
+1801020210 metadata/md5-cache/sys-boot/silo-1.4.14_p20120819-r1
 1801011404 metadata/md5-cache/sys-boot/lilo-22.8-r2
 1801011404 metadata/md5-cache/sys-boot/arcload-0.50-r3
 1801011404 metadata/md5-cache/sys-boot/aboot-1.0_pre20040408-r3
@@ -63678,61 +63553,37 @@
 1801011404 metadata/md5-cache/sys-boot/raspberrypi-firmware-9999
 1702282333 metadata/md5-cache/sys-boot/mbr-1.1.11
 1801011405 metadata/md5-cache/x11-drivers/xf86-video-r128-6.10.2
-1801011405 metadata/md5-cache/x11-drivers/xf86-video-apm-1.2.5
 1801011405 metadata/md5-cache/x11-drivers/xf86-input-evdev-2.10.5
 1801011405 metadata/md5-cache/x11-drivers/nvidia-drivers-384.98
-1801011405 metadata/md5-cache/x11-drivers/xf86-video-savage-2.3.9
-1801011405 metadata/md5-cache/x11-drivers/xf86-video-freedreno-1.1.0
 1801011405 metadata/md5-cache/x11-drivers/xf86-video-dummy-0.3.8
 1801011405 metadata/md5-cache/x11-drivers/xf86-input-wacom-0.34.0
 1801011405 metadata/md5-cache/x11-drivers/nvidia-drivers-340.104
-1801011405 metadata/md5-cache/x11-drivers/xf86-video-suntcx-1.1.1
-1801011405 metadata/md5-cache/x11-drivers/xf86-video-sisusb-0.9.7
 1801011405 metadata/md5-cache/x11-drivers/xf86-video-geode-2.11.19
 1801011405 metadata/md5-cache/x11-drivers/xf86-input-mouse-1.9.2
-1801011405 metadata/md5-cache/x11-drivers/xf86-video-ark-0.7.5
 1801011405 metadata/md5-cache/x11-drivers/xf86-input-mtrack-0.3.0
 1801011405 metadata/md5-cache/x11-drivers/xf86-input-vmmouse-9999
 1801011405 metadata/md5-cache/x11-drivers/xf86-video-dummy-0.3.7
-1801011405 metadata/md5-cache/x11-drivers/xf86-video-suncg6-1.1.1
 1801011405 metadata/md5-cache/x11-drivers/xf86-video-vmware-13.0.2
-1801011405 metadata/md5-cache/x11-drivers/xf86-video-tga-1.2.2
-1801011405 metadata/md5-cache/x11-drivers/xf86-video-suncg3-1.1.2
 1801011405 metadata/md5-cache/x11-drivers/xf86-video-voodoo-1.2.5
 1801011405 metadata/md5-cache/x11-drivers/xf86-input-libinput-0.25.1
 1801011405 metadata/md5-cache/x11-drivers/xf86-video-mga-1.6.5
 1801011405 metadata/md5-cache/x11-drivers/xf86-video-vmware-13.1.0
-1801011405 metadata/md5-cache/x11-drivers/xf86-video-sunleo-1.2.2
 1801011405 metadata/md5-cache/x11-drivers/xf86-video-vesa-2.3.3
-1801011405 metadata/md5-cache/x11-drivers/xf86-video-i128-1.3.6-r1
-1801011405 metadata/md5-cache/x11-drivers/xf86-video-i128-1.3.5
-1801011405 metadata/md5-cache/x11-drivers/xf86-video-apm-1.2.5-r1
 1801011405 metadata/md5-cache/x11-drivers/xf86-video-vboxvideo-1.0.0
 1801011405 metadata/md5-cache/x11-drivers/xf86-video-intel-2.99.917_p20170216
 1801011405 metadata/md5-cache/x11-drivers/nvidia-drivers-375.82
 1801011405 metadata/md5-cache/x11-drivers/xf86-input-tslib-0.0.6-r3
-1801011405 metadata/md5-cache/x11-drivers/xf86-video-cirrus-1.5.3
-1801011405 metadata/md5-cache/x11-drivers/xf86-video-sis-0.10.9
-1801011405 metadata/md5-cache/x11-drivers/xf86-video-apm-1.2.4
 1801011405 metadata/md5-cache/x11-drivers/xf86-video-dummy-0.3.6
 1801011405 metadata/md5-cache/x11-drivers/xf86-input-libinput-0.24.0
 1801011405 metadata/md5-cache/x11-drivers/xf86-video-ast-1.0.1
-1801011405 metadata/md5-cache/x11-drivers/xf86-video-suncg14-1.1.2
-1801011405 metadata/md5-cache/x11-drivers/xf86-video-neomagic-1.2.9
 1801011405 metadata/md5-cache/x11-drivers/xf86-video-vmware-13.2.1
-1801011405 metadata/md5-cache/x11-drivers/xf86-video-suncg3-1.1.1
-1801011405 metadata/md5-cache/x11-drivers/xf86-video-suncg6-1.1.2
 1801011405 metadata/md5-cache/x11-drivers/nvidia-drivers-387.22
 1801011405 metadata/md5-cache/x11-drivers/xf86-input-void-1.4.0
 1801011405 metadata/md5-cache/x11-drivers/xf86-video-virtualbox-5.1.26
-1801011405 metadata/md5-cache/x11-drivers/xf86-video-freedreno-1.3.0
 1801011405 metadata/md5-cache/x11-drivers/xf86-video-glint-1.2.9
 1801011405 metadata/md5-cache/x11-drivers/xf86-video-virtualbox-5.1.30
-1801011405 metadata/md5-cache/x11-drivers/xf86-video-chips-1.2.7
 1801011405 metadata/md5-cache/x11-drivers/xf86-video-geode-2.11.18
-1801011405 metadata/md5-cache/x11-drivers/xf86-video-cirrus-1.5.1
 1801011405 metadata/md5-cache/x11-drivers/xf86-input-aiptek-1.4.1
-1801011405 metadata/md5-cache/x11-drivers/xf86-video-sunleo-1.2.0
 1801011405 metadata/md5-cache/x11-drivers/xf86-video-intel-2.99.917_p20170313
 1801011405 metadata/md5-cache/x11-drivers/xf86-input-mutouch-1.3.0
 1801011405 metadata/md5-cache/x11-drivers/xf86-video-tdfx-1.4.7
@@ -63740,68 +63591,48 @@
 1801011405 metadata/md5-cache/x11-drivers/xf86-video-vmware-13.0.1-r1
 1801011405 metadata/md5-cache/x11-drivers/xf86-input-tslib-0.0.6-r2
 1801011405 metadata/md5-cache/x11-drivers/xf86-video-modesetting-0.9.0
-1801011405 metadata/md5-cache/x11-drivers/xf86-video-tseng-1.2.5-r1
 1801011405 metadata/md5-cache/x11-drivers/xf86-video-geode-2.11.17
 1801011405 metadata/md5-cache/x11-drivers/nvidia-drivers-387.34
 1801011405 metadata/md5-cache/x11-drivers/xf86-video-ast-0.97.0-r1
 1801011405 metadata/md5-cache/x11-drivers/xf86-input-acecad-1.5.0
-1801011405 metadata/md5-cache/x11-drivers/xf86-video-mach64-6.9.5
 1801011405 metadata/md5-cache/x11-drivers/xf86-video-ati-7.9.0
 1801011405 metadata/md5-cache/x11-drivers/xf86-input-mtrack-0.3.1
 1801011405 metadata/md5-cache/x11-drivers/xf86-video-nouveau-1.0.15
-1801011405 metadata/md5-cache/x11-drivers/Manifest.gz
+1801020210 metadata/md5-cache/x11-drivers/Manifest.gz
 1801011405 metadata/md5-cache/x11-drivers/xf86-input-void-1.4.1
 1801011405 metadata/md5-cache/x11-drivers/xf86-video-openchrome-0.6.0
 1801011405 metadata/md5-cache/x11-drivers/xf86-input-fpit-1.4.0
 1801011405 metadata/md5-cache/x11-drivers/xf86-video-newport-0.2.3
-1801011405 metadata/md5-cache/x11-drivers/xf86-video-sunffb-1.2.1
-1801011405 metadata/md5-cache/x11-drivers/xf86-video-i740-1.3.6
 1801011405 metadata/md5-cache/x11-drivers/xf86-video-fbdev-0.4.4
 1801011405 metadata/md5-cache/x11-drivers/xf86-input-penmount-1.5.0
 1801011405 metadata/md5-cache/x11-drivers/nvidia-drivers-378.13-r1
-1801011405 metadata/md5-cache/x11-drivers/xf86-video-opentegra-0.7.0
 1801011405 metadata/md5-cache/x11-drivers/xf86-video-nv-2.1.21
 1801011405 metadata/md5-cache/x11-drivers/xf86-video-omap-0.4.5
 1801011405 metadata/md5-cache/x11-drivers/xf86-input-hyperpen-1.4.1
 1801011405 metadata/md5-cache/x11-drivers/xf86-video-amdgpu-9999
-1801011405 metadata/md5-cache/x11-drivers/xf86-video-freedreno-1.4.0
-1801011405 metadata/md5-cache/x11-drivers/xf86-video-suncg14-1.1.1
 1801011405 metadata/md5-cache/x11-drivers/xf86-video-siliconmotion-1.7.9
 1801011405 metadata/md5-cache/x11-drivers/xf86-video-nouveau-1.0.14
 1801011405 metadata/md5-cache/x11-drivers/xf86-video-modesetting-0.8.1
-1712020139 metadata/md5-cache/x11-drivers/afb-ucode-1.3.11
 1801011405 metadata/md5-cache/x11-drivers/xf86-video-newport-0.2.4
 1801011405 metadata/md5-cache/x11-drivers/xf86-video-amdgpu-1.3.0
-1801011405 metadata/md5-cache/x11-drivers/xf86-video-i128-1.3.6
-1801011405 metadata/md5-cache/x11-drivers/xf86-video-cirrus-1.5.2
 1801011405 metadata/md5-cache/x11-drivers/xf86-input-vmmouse-13.1.0-r1
 1801011405 metadata/md5-cache/x11-drivers/xf86-video-qxl-0.1.5
-1801011405 metadata/md5-cache/x11-drivers/xf86-video-sunleo-1.2.1
-1801011405 metadata/md5-cache/x11-drivers/xf86-video-rendition-4.2.6
-1801011405 metadata/md5-cache/x11-drivers/xf86-video-tga-1.2.2-r1
-1801011405 metadata/md5-cache/x11-drivers/xf86-video-s3-0.6.5-r1
 1801011405 metadata/md5-cache/x11-drivers/xf86-input-libinput-0.26.0
-1801011405 metadata/md5-cache/x11-drivers/xf86-video-s3-0.6.5
 1801011405 metadata/md5-cache/x11-drivers/xf86-video-openchrome-0.5.0
-1801011405 metadata/md5-cache/x11-drivers/xf86-video-suntcx-1.1.2
 1801011405 metadata/md5-cache/x11-drivers/nvidia-drivers-381.22-r1
 1706011238 metadata/md5-cache/x11-drivers/xf86-input-mtrack-0.4.1
 1801011405 metadata/md5-cache/x11-drivers/xf86-video-nouveau-1.0.13
-1801011405 metadata/md5-cache/x11-drivers/xf86-video-sunffb-1.2.2-r1
 1801011405 metadata/md5-cache/x11-drivers/xf86-input-elographics-1.4.1
 1801011405 metadata/md5-cache/x11-drivers/xf86-input-aiptek-1.4.1-r1
 1801011405 metadata/md5-cache/x11-drivers/xf86-video-ast-1.1.5
-1801011405 metadata/md5-cache/x11-drivers/xf86-video-s3virge-1.10.7
 1801011405 metadata/md5-cache/x11-drivers/xf86-video-vesa-2.3.4
 1801011405 metadata/md5-cache/x11-drivers/xf86-input-joystick-1.6.3
 1801011405 metadata/md5-cache/x11-drivers/xf86-video-ati-7.10.0
-1801011405 metadata/md5-cache/x11-drivers/xf86-video-freedreno-1.0.0
 1801011405 metadata/md5-cache/x11-drivers/nvidia-drivers-384.90
 1801011405 metadata/md5-cache/x11-drivers/xf86-video-amdgpu-1.4.0
 1801011405 metadata/md5-cache/x11-drivers/xf86-input-keyboard-1.9.0
 1801011405 metadata/md5-cache/x11-drivers/xf86-video-intel-2.99.917_p20171018
 1801011405 metadata/md5-cache/x11-drivers/nvidia-drivers-304.137
-1801011405 metadata/md5-cache/x11-drivers/xf86-video-trident-1.3.8
 1801011405 metadata/md5-cache/x11-drivers/xf86-input-wacom-0.35.0
 1801011404 metadata/md5-cache/kde-frameworks/knotifyconfig-5.41.0
 1801011404 metadata/md5-cache/kde-frameworks/kunitconversion-5.41.0
@@ -67167,7 +66998,7 @@
 1801011404 metadata/md5-cache/app-backup/bup-0.29.1
 1801011404 metadata/md5-cache/app-backup/dar-2.5.14
 1801011404 metadata/md5-cache/app-backup/snapper-0.5.0
-1801011404 metadata/md5-cache/app-backup/burp-2.0.54
+1801020610 metadata/md5-cache/app-backup/burp-2.0.54
 1801011404 metadata/md5-cache/app-backup/bacula-9.0.6
 1801011404 metadata/md5-cache/app-backup/backup-manager-0.7.14
 1801011404 metadata/md5-cache/app-backup/genbackupdata-1.9
@@ -67212,7 +67043,7 @@
 1801011404 metadata/md5-cache/app-backup/deja-dup-34.3
 1801011404 metadata/md5-cache/app-backup/cpdup-1.18
 1801011404 metadata/md5-cache/app-backup/buttersink-0.6.8
-1801011404 metadata/md5-cache/app-backup/burp-2.1.22
+1801020610 metadata/md5-cache/app-backup/burp-2.1.22
 1801011404 metadata/md5-cache/app-backup/amanda-3.4.5
 1801011404 metadata/md5-cache/app-backup/backup-manager-0.7.5
 1801011404 metadata/md5-cache/app-backup/holland-backup-mysql-meta-1.0.10
@@ -67229,7 +67060,7 @@
 1801011404 metadata/md5-cache/app-backup/holland-backup-sqlite-1.0.10
 1801011404 metadata/md5-cache/app-backup/amanda-3.5-r1
 1709140938 metadata/md5-cache/app-backup/rdedup-1.0.2
-1801011404 metadata/md5-cache/app-backup/Manifest.gz
+1801020610 metadata/md5-cache/app-backup/Manifest.gz
 1801011404 metadata/md5-cache/app-backup/luckybackup-0.4.9
 1801011404 metadata/md5-cache/app-backup/cdbackup-0.7.1-r1
 1801011404 metadata/md5-cache/app-backup/rear-1.15-r1
@@ -67241,7 +67072,7 @@
 1801011404 metadata/md5-cache/app-backup/zbackup-1.4.4
 1801011404 metadata/md5-cache/app-backup/cachedir-1.4
 1801011404 metadata/md5-cache/app-backup/qt4-fsarchiver-0.6.19.6
-1801011404 metadata/md5-cache/app-backup/burp-2.0.54-r2
+1801020610 metadata/md5-cache/app-backup/burp-2.0.54-r2
 1710022239 metadata/md5-cache/app-backup/duply-2.0.3
 1706032309 metadata/md5-cache/app-backup/duply-2.0.2
 1801011404 metadata/md5-cache/app-backup/bareos-16.2.4
@@ -67380,7 +67211,7 @@
 1801011404 metadata/md5-cache/sci-electronics/balsa-4.0-r1
 1801011404 metadata/md5-cache/sci-electronics/alliance-5.0.20110203
 1801011404 metadata/md5-cache/sci-electronics/gnetman-0.0.1_pre20110124
-1801011404 metadata/md5-cache/sci-electronics/Manifest.gz
+1801012110 metadata/md5-cache/sci-electronics/Manifest.gz
 1801011404 metadata/md5-cache/sci-electronics/plcedit-2.2.1
 1801011404 metadata/md5-cache/sci-electronics/linsmith-0.99.30-r1
 1801011404 metadata/md5-cache/sci-electronics/gwave-20090213-r1
@@ -67414,7 +67245,6 @@
 1801011404 metadata/md5-cache/sci-electronics/pulseview-0.4.0
 1801011404 metadata/md5-cache/sci-electronics/iverilog-0.9.6
 1801011404 metadata/md5-cache/sci-electronics/drawtiming-0.7.1-r2
-1801011404 metadata/md5-cache/sci-electronics/ngspice-26
 1801011404 metadata/md5-cache/sci-electronics/geda-1.9.2-r1
 1801011404 metadata/md5-cache/sci-electronics/ngspice-27
 1801011404 metadata/md5-cache/sci-electronics/fritzing-0.9.2b-r2
@@ -67626,7 +67456,7 @@
 1801011405 metadata/md5-cache/x11-wm/ratpoison-1.4.9
 1801011405 metadata/md5-cache/x11-wm/subtle-9999
 1801011405 metadata/md5-cache/x11-wm/notion-9999
-1801011405 metadata/md5-cache/x11-wm/xpra-2.2.1
+1801020610 metadata/md5-cache/x11-wm/xpra-2.2.1
 1801011405 metadata/md5-cache/x11-wm/enlightenment-0.20.5
 1801011405 metadata/md5-cache/x11-wm/windowlab-1.40-r1
 1801011405 metadata/md5-cache/x11-wm/muffin-3.0.5
@@ -67644,7 +67474,7 @@
 1801011405 metadata/md5-cache/x11-wm/marco-1.18.1
 1801011405 metadata/md5-cache/x11-wm/fvwm-2.6.5-r1
 1801011405 metadata/md5-cache/x11-wm/windowlab-1.34
-1801011405 metadata/md5-cache/x11-wm/Manifest.gz
+1801020610 metadata/md5-cache/x11-wm/Manifest.gz
 1801011405 metadata/md5-cache/x11-wm/muffin-3.6.0
 1712042339 metadata/md5-cache/x11-wm/page-1.9.9-r1
 1801011405 metadata/md5-cache/x11-wm/qtile-0.10.5
@@ -67659,10 +67489,10 @@
 1801011405 metadata/md5-cache/x11-wm/subtle-0.11.3244
 1801011405 metadata/md5-cache/x11-wm/i3-4.14.1
 1801011405 metadata/md5-cache/x11-wm/fluxbox-9999
-1801011405 metadata/md5-cache/x11-wm/xpra-1.0.9
+1801020610 metadata/md5-cache/x11-wm/xpra-1.0.9
 1801011405 metadata/md5-cache/x11-wm/blackbox-0.70.1-r1
 1801011405 metadata/md5-cache/x11-wm/awesome-4.0-r1
-1801011405 metadata/md5-cache/x11-wm/xpra-2.1.3
+1801020610 metadata/md5-cache/x11-wm/xpra-2.1.3
 1801011405 metadata/md5-cache/x11-wm/vtwm-5.4.7-r1
 1801011405 metadata/md5-cache/x11-wm/goomwwm-1.0.0-r1
 1801011405 metadata/md5-cache/x11-wm/amiwm-0.21_p2
@@ -67700,9 +67530,9 @@
 1801011405 metadata/md5-cache/x11-wm/i3-9999
 1801011405 metadata/md5-cache/x11-wm/icewm-1.4.0
 1801011405 metadata/md5-cache/x11-wm/dwm-6.1-r1
-1801011405 metadata/md5-cache/x11-wm/xpra-2.0.2
+1801020610 metadata/md5-cache/x11-wm/xpra-2.0.2
 1707270138 metadata/md5-cache/x11-wm/page-1.9.9
-1801011405 metadata/md5-cache/x11-wm/xpra-1.0.6
+1801020610 metadata/md5-cache/x11-wm/xpra-1.0.6
 1801011405 metadata/md5-cache/x11-wm/muffin-2.8.5
 1801011405 metadata/md5-cache/x11-wm/evilwm-1.0.1-r1
 1801011405 metadata/md5-cache/x11-wm/awesome-4.1
@@ -68236,9 +68066,8 @@
 1702282328 metadata/md5-cache/net-dns/dnswalk-2.0.2
 1710271508 metadata/md5-cache/net-dns/coredns-0.9.9
 1801011404 metadata/md5-cache/net-dns/opendnssec-2.0.1-r1
-1801011404 metadata/md5-cache/net-dns/Manifest.gz
+1801012010 metadata/md5-cache/net-dns/Manifest.gz
 1801011404 metadata/md5-cache/net-dns/libidn-1.33-r2
-1801011404 metadata/md5-cache/net-dns/ldns-utils-1.6.12
 1801011404 metadata/md5-cache/net-dns/dnssec-validator-2.2-r1
 1801011404 metadata/md5-cache/net-dns/unbound-1.5.1-r2
 1801011404 metadata/md5-cache/net-dns/opendnssec-2.0.3
@@ -70098,7 +69927,7 @@
 1801011404 metadata/md5-cache/dev-dotnet/mono-addins-0.6.2
 1801011404 metadata/md5-cache/dev-dotnet/vte-sharp-2.24.0-r10
 1801011404 metadata/md5-cache/dev-dotnet/dbus-sharp-0.8.1
-1801011404 metadata/md5-cache/dev-dotnet/Manifest.gz
+1801020940 metadata/md5-cache/dev-dotnet/Manifest.gz
 1801011404 metadata/md5-cache/dev-dotnet/referenceassemblies-pcl-4.6
 1801011404 metadata/md5-cache/dev-dotnet/nini-1.1.0-r2
 1801011404 metadata/md5-cache/dev-dotnet/gio-sharp-0.3-r1
@@ -70120,7 +69949,6 @@
 1801011404 metadata/md5-cache/dev-dotnet/gnome-keyring-sharp-1.0.2-r2
 1801011404 metadata/md5-cache/dev-dotnet/nuget-2.8.7
 1801011404 metadata/md5-cache/dev-dotnet/wnck-sharp-2.24.0-r10
-1801011404 metadata/md5-cache/dev-dotnet/pe-format-2.1.2
 1704032208 metadata/md5-cache/app-xemacs/sieve-1.18
 1704032208 metadata/md5-cache/app-xemacs/hyperbole-1.16
 1704032208 metadata/md5-cache/app-xemacs/xemacs-devel-1.75
@@ -70369,7 +70197,7 @@
 1712010010 metadata/md5-cache/net-misc/iprange-1.0.4
 1801011404 metadata/md5-cache/net-misc/sks-1.1.6-r2
 1702282329 metadata/md5-cache/net-misc/nat-traverse-0.6
-1801011404 metadata/md5-cache/net-misc/quagga-1.2.1
+1801020610 metadata/md5-cache/net-misc/quagga-1.2.1
 1801011404 metadata/md5-cache/net-misc/cgterm-1.6
 1709111138 metadata/md5-cache/net-misc/iperf-2.0.10
 1801011404 metadata/md5-cache/net-misc/pycnb-0.0.4-r1
@@ -70395,7 +70223,6 @@
 1801011404 metadata/md5-cache/net-misc/freerdp-9999
 1801011404 metadata/md5-cache/net-misc/htbinit-0.8.5-r7
 1801011404 metadata/md5-cache/net-misc/ptpd-2.3.1-r1
-1801011404 metadata/md5-cache/net-misc/miniupnpd-2.0.20161216
 1702282329 metadata/md5-cache/net-misc/sshpass-1.05
 1801011404 metadata/md5-cache/net-misc/hath-0.4.1
 1801011404 metadata/md5-cache/net-misc/youtube-dl-2017.12.23
@@ -70411,6 +70238,7 @@
 1801011404 metadata/md5-cache/net-misc/uftp-3.7
 1801011404 metadata/md5-cache/net-misc/socket-burst-dampener-1.1.0
 1801011404 metadata/md5-cache/net-misc/ofono-1.16
+1801012010 metadata/md5-cache/net-misc/aget-0.4.1-r2
 1801011404 metadata/md5-cache/net-misc/dropbox-cli-1.6.0
 1801011404 metadata/md5-cache/net-misc/redir-2.2.1
 1801011404 metadata/md5-cache/net-misc/mosh-1.3.0
@@ -70494,6 +70322,7 @@
 1801011404 metadata/md5-cache/net-misc/clusterssh-4.30.600
 1801011404 metadata/md5-cache/net-misc/streamlink-0.9.0
 1708061709 metadata/md5-cache/net-misc/netprofiles-ims-0.1.0134
+1801012010 metadata/md5-cache/net-misc/ipsvd-1.0.0-r2
 1801011404 metadata/md5-cache/net-misc/megatools-1.9.97
 1801011404 metadata/md5-cache/net-misc/telnet-bsd-1.2-r1
 1801011404 metadata/md5-cache/net-misc/shmux-1.0.2
@@ -70547,7 +70376,7 @@
 1801011404 metadata/md5-cache/net-misc/openvswitch-2.7.2
 1801011404 metadata/md5-cache/net-misc/lldpd-0.9.3-r1
 1801011404 metadata/md5-cache/net-misc/proxychains-4.12-r1
-1801011404 metadata/md5-cache/net-misc/icaclient-13.7.0.10276925
+1801021140 metadata/md5-cache/net-misc/icaclient-13.7.0.10276925
 1801011404 metadata/md5-cache/net-misc/tcpsound-0.3.1-r1
 1801011404 metadata/md5-cache/net-misc/utelnetd-0.1.11-r1
 1801011404 metadata/md5-cache/net-misc/netkit-fingerd-0.17-r3
@@ -70622,7 +70451,7 @@
 1801011404 metadata/md5-cache/net-misc/cfengine-2.2.10-r4
 1801011404 metadata/md5-cache/net-misc/cfengine-3.4.5
 1801011404 metadata/md5-cache/net-misc/dahdi-tools-2.6.2
-1801011404 metadata/md5-cache/net-misc/gerbera-9999
+1801020610 metadata/md5-cache/net-misc/gerbera-9999
 1801011404 metadata/md5-cache/net-misc/hsc-1.0b
 1801011404 metadata/md5-cache/net-misc/smbc-1.2.2-r2
 1801011404 metadata/md5-cache/net-misc/balance-3.57
@@ -70634,7 +70463,6 @@
 1801011404 metadata/md5-cache/net-misc/asterisk-13.17.2
 1801011404 metadata/md5-cache/net-misc/netifrc-0.3.0
 1801011404 metadata/md5-cache/net-misc/dhcp-4.3.6
-1801011404 metadata/md5-cache/net-misc/icaclient-13.6.0.10243651
 1801011404 metadata/md5-cache/net-misc/openntpd-6.2_p1
 1801011404 metadata/md5-cache/net-misc/teamviewer-13.0.5693-r2
 1801011404 metadata/md5-cache/net-misc/mrouted-3.9.5-r1
@@ -70676,24 +70504,20 @@
 1801011404 metadata/md5-cache/net-misc/astmanproxy-1.28.2
 1801011404 metadata/md5-cache/net-misc/cgminer-4.9.2
 1801011404 metadata/md5-cache/net-misc/grdesktop-0.23-r1
-1801011404 metadata/md5-cache/net-misc/aria2-1.32.0
 1711260441 metadata/md5-cache/net-misc/spread-4.3.0-r1
 1801011404 metadata/md5-cache/net-misc/asterisk-rate_engine-0.5.4
-1801011404 metadata/md5-cache/net-misc/ocsync-0.90.4
 1705261209 metadata/md5-cache/net-misc/geoipupdate-2.4.0
 1801011404 metadata/md5-cache/net-misc/netctl-1.9
 1801011404 metadata/md5-cache/net-misc/mosh-9999
 1801011404 metadata/md5-cache/net-misc/putty-0.68
 1801011404 metadata/md5-cache/net-misc/gvrpcd-1.3
 1801011404 metadata/md5-cache/net-misc/dahdi-tools-2.10.1
-1801011404 metadata/md5-cache/net-misc/minissdpd-1.5.20160301
 1711260441 metadata/md5-cache/net-misc/samplicator-1.3.6
 1702282329 metadata/md5-cache/net-misc/jwhois-4.0
 1801011404 metadata/md5-cache/net-misc/nextcloud-client-2.3.3
 1801011404 metadata/md5-cache/net-misc/socat-1.7.3.1
 1801011404 metadata/md5-cache/net-misc/connman-1.29
 1801011404 metadata/md5-cache/net-misc/gsutil-4.27
-1801011404 metadata/md5-cache/net-misc/aria2-1.31.0
 1801011404 metadata/md5-cache/net-misc/guacamole-server-0.9.9-r1
 1702282329 metadata/md5-cache/net-misc/bsdwhois-1.43.2.1
 1801011404 metadata/md5-cache/net-misc/ps3mediaserver-1.90.1
@@ -70701,7 +70525,7 @@
 1702282329 metadata/md5-cache/net-misc/dhcpd-pools-2.21
 1801011404 metadata/md5-cache/net-misc/x2goserver-4.0.1.22
 1801011404 metadata/md5-cache/net-misc/netkit-bootparamd-0.17-r3
-1801011404 metadata/md5-cache/net-misc/Manifest.gz
+1801021140 metadata/md5-cache/net-misc/Manifest.gz
 1801011404 metadata/md5-cache/net-misc/kafka-bin-0.10.2.1-r1
 1801011404 metadata/md5-cache/net-misc/haeredes-0.4.4
 1801011404 metadata/md5-cache/net-misc/rabbitmq-server-3.7.1
@@ -70749,6 +70573,7 @@
 1801011404 metadata/md5-cache/net-misc/youtube-viewer-3.2.0
 1801011404 metadata/md5-cache/net-misc/cmst-2017.03.18
 1801011404 metadata/md5-cache/net-misc/netkit-bootparamd-0.17-r4
+1801021140 metadata/md5-cache/net-misc/icaclient-13.8.0.10299729
 1702282329 metadata/md5-cache/net-misc/bird-1.6.2
 1801011404 metadata/md5-cache/net-misc/networkmanager-openvpn-1.8.0-r1
 1801011404 metadata/md5-cache/net-misc/exabgp-3.2.17
@@ -70847,7 +70672,6 @@
 1801011404 metadata/md5-cache/net-misc/minissdpd-1.5.20161216
 1801011404 metadata/md5-cache/net-misc/putty-0.69
 1702282329 metadata/md5-cache/net-misc/ndisc6-0.9.9-r2
-1801011404 metadata/md5-cache/net-misc/aria2-1.33.0
 1801011404 metadata/md5-cache/net-misc/iputils-99999999
 1801011404 metadata/md5-cache/net-misc/pps-tools-1.0.1
 1801011404 metadata/md5-cache/net-misc/dhcpcd-7.0.0_beta3
@@ -70858,17 +70682,17 @@
 1702282329 metadata/md5-cache/net-misc/stuntman-1.2.9
 1801011404 metadata/md5-cache/net-misc/rdate-1.4-r4
 1801011404 metadata/md5-cache/net-misc/rclone-9999
-1801011404 metadata/md5-cache/net-misc/iputils-20171016_pre
+1801021110 metadata/md5-cache/net-misc/iputils-20171016_pre
 1801011404 metadata/md5-cache/net-misc/bridge-utils-1.5
 1801011404 metadata/md5-cache/net-misc/putty-9999
 1708101309 metadata/md5-cache/net-misc/wput-0.6.1-r1
 1801011404 metadata/md5-cache/net-misc/youtube-viewer-3.2.8
 1801011404 metadata/md5-cache/net-misc/csync-0.50.0
+1801021110 metadata/md5-cache/net-misc/babeld-1.8.0
 1801011404 metadata/md5-cache/net-misc/mico-2.3.13-r9
 1801011404 metadata/md5-cache/net-misc/cfengine-3.6.2
 1801011404 metadata/md5-cache/net-misc/x2goclient-4.1.0.1-r1
 1801011404 metadata/md5-cache/net-misc/s3cmd-2.0.0
-1801011404 metadata/md5-cache/net-misc/npapi-sdk-0.27
 1801011404 metadata/md5-cache/net-misc/tipcutils-2.0.3
 1801011404 metadata/md5-cache/net-misc/netifrc-0.2.2
 1801011404 metadata/md5-cache/net-misc/lambdamoo-1.8.1-r3
@@ -70891,7 +70715,7 @@
 1801011404 metadata/md5-cache/net-misc/datapipe-1.0-r1
 1702282329 metadata/md5-cache/net-misc/aggregate-flim-1.0.2
 1801011404 metadata/md5-cache/net-misc/gns3-server-2.0.3-r1
-1801011404 metadata/md5-cache/net-misc/gerbera-1.1.0-r1
+1801020610 metadata/md5-cache/net-misc/gerbera-1.1.0-r1
 1801011404 metadata/md5-cache/net-misc/wget-1.19.1-r1
 1801011404 metadata/md5-cache/net-misc/networkmanager-openconnect-1.2.4-r1
 1801011404 metadata/md5-cache/net-misc/libteam-1.22
@@ -70935,7 +70759,6 @@
 1801011404 metadata/md5-cache/net-misc/netkit-talk-0.17-r5
 1801011404 metadata/md5-cache/net-misc/clockspeed-conf-0.4.5-r1
 1801011404 metadata/md5-cache/net-misc/ssvnc-1.0.29-r1
-1801011404 metadata/md5-cache/net-misc/autoupnp-0.4.6
 1801011404 metadata/md5-cache/net-misc/axel-2.15
 1702282329 metadata/md5-cache/net-misc/midentd-2.3.1-r2
 1801011404 metadata/md5-cache/net-misc/gwhois-20120626
@@ -70950,7 +70773,6 @@
 1801011404 metadata/md5-cache/net-misc/vino-3.22.0
 1801011404 metadata/md5-cache/net-misc/gofish-1.2
 1801011404 metadata/md5-cache/net-misc/knemo-0.8.0_pre20161211
-1801011404 metadata/md5-cache/net-misc/ipsvd-1.0.0-r1
 1801011404 metadata/md5-cache/net-misc/rygel-0.34.0
 1801011404 metadata/md5-cache/net-misc/grive-0.4.0_pre20150905-r1
 1801011404 metadata/md5-cache/net-misc/udpcast-20120424
@@ -70964,7 +70786,7 @@
 1801011404 metadata/md5-cache/net-misc/gns3-server-1.5.3.1
 1702282329 metadata/md5-cache/net-misc/cbugzilla-0.2.1
 1801011404 metadata/md5-cache/net-misc/getdate-1.2-r1
-1801011404 metadata/md5-cache/net-misc/icaclient-13.7.0.10276927
+1801021140 metadata/md5-cache/net-misc/icaclient-13.7.0.10276927
 1801011404 metadata/md5-cache/net-misc/uftp-3.7.1
 1801011404 metadata/md5-cache/net-misc/iputils-20121221-r1
 1801011404 metadata/md5-cache/net-misc/aria2-1.30.0
@@ -70998,9 +70820,8 @@
 1801011404 metadata/md5-cache/net-misc/termpkg-3.3.9.1-r2
 1801011404 metadata/md5-cache/net-misc/netctl-1.10
 1801011404 metadata/md5-cache/net-misc/ip-sentinel-0.12
-1801011404 metadata/md5-cache/net-misc/aget-0.4.1-r1
 1801011404 metadata/md5-cache/net-misc/kafka-bin-0.11.0.0
-1801011404 metadata/md5-cache/net-misc/quagga-1.2.2
+1801020610 metadata/md5-cache/net-misc/quagga-1.2.2
 1801011404 metadata/md5-cache/net-misc/dropbox-40.3.44
 1702282329 metadata/md5-cache/net-misc/bird-1.6.1
 1702282329 metadata/md5-cache/net-misc/ndisc6-1.0.3
@@ -71279,12 +71100,11 @@
 1712071909 metadata/md5-cache/mail-client/roundcube-1.3.3-r1
 1801011404 metadata/md5-cache/mail-client/mailx-support-20060102-r2
 1801011404 metadata/md5-cache/mail-client/mailx-8.1.2.20050715-r6
-1801011404 metadata/md5-cache/mail-client/mailx-8.1.2.20050715-r7
 1801011404 metadata/md5-cache/mail-client/balsa-2.5.3-r1
 1801011404 metadata/md5-cache/mail-client/trojita-9999
 1801011404 metadata/md5-cache/mail-client/nail-12.4-r3
 1712041539 metadata/md5-cache/mail-client/roundcube-1.2.7
-1801011404 metadata/md5-cache/mail-client/Manifest.gz
+1801012340 metadata/md5-cache/mail-client/Manifest.gz
 1801011404 metadata/md5-cache/mail-client/mutt-1.9.1-r4
 1801011404 metadata/md5-cache/mail-client/sylpheed-3.6.0
 1801011404 metadata/md5-cache/mail-client/evolution-3.22.4
@@ -71300,11 +71120,12 @@
 1712211609 metadata/md5-cache/mail-client/clawsker-1.1.0
 1801011404 metadata/md5-cache/mail-client/neomutt-20171027
 1801011404 metadata/md5-cache/mail-client/claws-mail-3.15.0-r2
-1801011404 metadata/md5-cache/mail-client/novell-groupwise-client-8.0.2.96933
+1801011510 metadata/md5-cache/mail-client/novell-groupwise-client-8.0.2.96933
 1801011404 metadata/md5-cache/mail-client/cone-0.96
 1801011404 metadata/md5-cache/mail-client/drac-1.12-r1
 1801011404 metadata/md5-cache/mail-client/neomutt-20170714
 1801011404 metadata/md5-cache/mail-client/sylpheed-3.5.1
+1801012340 metadata/md5-cache/mail-client/mailx-8.1.2.20160123
 1801011404 metadata/md5-cache/mail-client/alot-0.6
 1801011404 metadata/md5-cache/mail-client/mutt-1.9.2-r1
 1801011404 metadata/md5-cache/mail-client/neomutt-20170912
@@ -71334,7 +71155,7 @@
 1801011404 metadata/md5-cache/sys-apps/shadow-4.5
 1801011404 metadata/md5-cache/sys-apps/idle3-tools-0.9.1
 1801011404 metadata/md5-cache/sys-apps/usbutils-009
-1801011404 metadata/md5-cache/sys-apps/portage-9999
+1801020610 metadata/md5-cache/sys-apps/portage-9999
 1801011404 metadata/md5-cache/sys-apps/timer_entropyd-0.2
 1801011404 metadata/md5-cache/sys-apps/fakeroot-ng-0.17
 1801011404 metadata/md5-cache/sys-apps/util-linux-2.30.2
@@ -71347,7 +71168,6 @@
 1801011404 metadata/md5-cache/sys-apps/baselayout-2.4.1-r2
 1801011404 metadata/md5-cache/sys-apps/ipmitool-1.8.17-r1
 1801011404 metadata/md5-cache/sys-apps/rescan-scsi-bus-1.57-r1
-1801011404 metadata/md5-cache/sys-apps/uam-0.3
 1801011404 metadata/md5-cache/sys-apps/iproute2-4.9.0
 1801011404 metadata/md5-cache/sys-apps/nix-1.11.16
 1801011404 metadata/md5-cache/sys-apps/gawk-4.1.4
@@ -71371,7 +71191,7 @@
 1702282333 metadata/md5-cache/sys-apps/s6-rc-0.0.2.1
 1801011404 metadata/md5-cache/sys-apps/systemd-235-r1
 1801011404 metadata/md5-cache/sys-apps/lshw-02.18b
-1801011404 metadata/md5-cache/sys-apps/logwatch-7.4.3_p20171025
+1801020610 metadata/md5-cache/sys-apps/logwatch-7.4.3_p20171025
 1801011404 metadata/md5-cache/sys-apps/sed-4.3-r1
 1801011404 metadata/md5-cache/sys-apps/darwin-miscutils-10
 1801011404 metadata/md5-cache/sys-apps/fakeroot-1.20.2
@@ -71477,7 +71297,6 @@
 1712082039 metadata/md5-cache/sys-apps/inxi-2.3.47
 1712020139 metadata/md5-cache/sys-apps/collectl-4.0.5
 1801011404 metadata/md5-cache/sys-apps/gentoo-systemd-integration-7
-1801011404 metadata/md5-cache/sys-apps/uam-0.3.1
 1801011404 metadata/md5-cache/sys-apps/frandom-1.1
 1702282333 metadata/md5-cache/sys-apps/servicelog-1.1.14
 1707301239 metadata/md5-cache/sys-apps/opentmpfiles-0.1.2
@@ -71504,6 +71323,7 @@
 1801011404 metadata/md5-cache/sys-apps/s6-2.6.1.0
 1801011404 metadata/md5-cache/sys-apps/util-linux-2.31-r1
 1801011404 metadata/md5-cache/sys-apps/baobab-3.24.0
+1801012210 metadata/md5-cache/sys-apps/mawk-1.3.4_p20171017
 1801011404 metadata/md5-cache/sys-apps/busybox-9999
 1712082039 metadata/md5-cache/sys-apps/inxi-2.3.43
 1801011404 metadata/md5-cache/sys-apps/apparmor-utils-2.12.0
@@ -71554,7 +71374,7 @@
 1801011404 metadata/md5-cache/sys-apps/accountsservice-0.6.45
 1801011404 metadata/md5-cache/sys-apps/install-xattr-0.5
 1801011404 metadata/md5-cache/sys-apps/cpuid-20170122
-1801011404 metadata/md5-cache/sys-apps/logwatch-9999
+1801020610 metadata/md5-cache/sys-apps/logwatch-9999
 1801011404 metadata/md5-cache/sys-apps/spu-tools-2.3.0.136
 1801011404 metadata/md5-cache/sys-apps/lmctfy-0.5.0
 1801011404 metadata/md5-cache/sys-apps/install-xattr-0.5-r1
@@ -71565,9 +71385,9 @@
 1801011404 metadata/md5-cache/sys-apps/ibm-powerpc-utils-papr-1.1.0
 1801011404 metadata/md5-cache/sys-apps/nca-0.9.0-r1
 1801011404 metadata/md5-cache/sys-apps/smartmontools-6.6
+1801020040 metadata/md5-cache/sys-apps/sparc-utils-1.9-r5
 1801011404 metadata/md5-cache/sys-apps/i2c-tools-4.0
 1801011404 metadata/md5-cache/sys-apps/util-linux-2.31
-1801011404 metadata/md5-cache/sys-apps/portage-2.3.19
 1801011404 metadata/md5-cache/sys-apps/elfix-0.9.2
 1801011404 metadata/md5-cache/sys-apps/dbus-1.10.24
 1801011404 metadata/md5-cache/sys-apps/kexec-tools-2.0.16
@@ -71665,13 +71485,13 @@
 1801011404 metadata/md5-cache/sys-apps/ucspi-proxy-0.97
 1801011404 metadata/md5-cache/sys-apps/pv-1.6.6
 1801011404 metadata/md5-cache/sys-apps/likwid-4.1.2
-1711152108 metadata/md5-cache/sys-apps/less-529
+1801020310 metadata/md5-cache/sys-apps/less-529
 1801011404 metadata/md5-cache/sys-apps/superiotool-99999999
 1801011404 metadata/md5-cache/sys-apps/uam-0.3.2
 1801011404 metadata/md5-cache/sys-apps/iproute2-9999
 1801011404 metadata/md5-cache/sys-apps/s6-rc-0.1.0.0
 1801011404 metadata/md5-cache/sys-apps/toybox-9999
-1801011404 metadata/md5-cache/sys-apps/Manifest.gz
+1801020940 metadata/md5-cache/sys-apps/Manifest.gz
 1801011404 metadata/md5-cache/sys-apps/hwids-20170328
 1801011404 metadata/md5-cache/sys-apps/restorecond-9999
 1801011404 metadata/md5-cache/sys-apps/moreutils-0.60-r1
@@ -71685,6 +71505,8 @@
 1801011404 metadata/md5-cache/sys-apps/ifplugd-0.28-r9
 1801011404 metadata/md5-cache/sys-apps/agedu-20170831
 1801011404 metadata/md5-cache/sys-apps/ed-1.13
+1801012210 metadata/md5-cache/sys-apps/darwin-miscutils-12
+1801012240 metadata/md5-cache/sys-apps/microcode-ctl-1.28-r2
 1801011404 metadata/md5-cache/sys-apps/udevil-0.4.4-r1
 1801011404 metadata/md5-cache/sys-apps/lcdutils-0.2
 1801011404 metadata/md5-cache/sys-apps/x86info-1.30
@@ -71784,7 +71606,7 @@
 1708111209 metadata/md5-cache/sys-apps/hprofile-6.1.3
 1801011404 metadata/md5-cache/sys-apps/gnome-disk-utility-3.22.1
 1801011404 metadata/md5-cache/sys-apps/lm_sensors-3.4.0_p20170901
-1801011404 metadata/md5-cache/sys-apps/mawk-1.3.4_p20161120
+1801020140 metadata/md5-cache/sys-apps/mawk-1.3.4_p20161120
 1801011404 metadata/md5-cache/sys-apps/haveged-1.9.1
 1801011404 metadata/md5-cache/sys-apps/iproute2-4.4.0
 1801011404 metadata/md5-cache/sys-apps/darwin-miscutils-11
@@ -71933,6 +71755,7 @@
 1801011404 metadata/md5-cache/sys-apps/policycoreutils-2.7
 1801011404 metadata/md5-cache/sys-apps/zorroutils-0.04
 1801011404 metadata/md5-cache/sys-apps/busybox-1.25.1
+1801020610 metadata/md5-cache/sys-apps/portage-2.3.19-r1
 1801011404 metadata/md5-cache/sys-apps/dtc-9999
 1801011404 metadata/md5-cache/sys-apps/gptfdisk-1.0.1
 1801011404 metadata/md5-cache/sys-apps/pmount-gui-0_pre20130806
@@ -72011,12 +71834,11 @@
 1801011405 metadata/md5-cache/www-servers/civetweb-1.10
 1801011405 metadata/md5-cache/www-servers/nginx-1.13.7
 1801011405 metadata/md5-cache/www-servers/sniproxy-0.5.0
-1801011405 metadata/md5-cache/www-servers/boa-0.94.14_rc21-r1
 1801011405 metadata/md5-cache/www-servers/adsf-1.2.1
 1801011405 metadata/md5-cache/www-servers/thttpd-2.27.1
 1702282335 metadata/md5-cache/www-servers/spawn-fcgi-1.6.4
 1801011405 metadata/md5-cache/www-servers/puma-3.9.1
-1801011405 metadata/md5-cache/www-servers/Manifest.gz
+1801020940 metadata/md5-cache/www-servers/Manifest.gz
 1801011405 metadata/md5-cache/www-servers/xsp-2014.12-r2014120900
 1801011405 metadata/md5-cache/www-servers/tornado-4.5.1
 1801011405 metadata/md5-cache/www-servers/apache-2.2.34
@@ -72047,7 +71869,7 @@
 1705212238 metadata/md5-cache/www-servers/pshs-0.3.2
 1702282335 metadata/md5-cache/www-servers/mongrel2-1.11.0-r1
 1801011405 metadata/md5-cache/www-servers/pshs-9999
-1801011405 metadata/md5-cache/www-servers/nginx-1.12.2-r1
+1801020310 metadata/md5-cache/www-servers/nginx-1.12.2-r1
 1801011405 metadata/md5-cache/www-servers/tomcat-8.0.47
 1801011405 metadata/md5-cache/www-servers/adsf-1.3.0
 1702282335 metadata/md5-cache/www-servers/mongrel2-1.11.0
@@ -72067,7 +71889,7 @@
 1801011404 metadata/md5-cache/media-libs/xvid-1.3.3
 1801011404 metadata/md5-cache/media-libs/libpano13-2.9.18
 1801011404 metadata/md5-cache/media-libs/zvbi-0.2.35-r1
-1801011404 metadata/md5-cache/media-libs/libmypaint-1.3.0
+1801012340 metadata/md5-cache/media-libs/libmypaint-1.3.0
 1801011404 metadata/md5-cache/media-libs/libsndfile-1.0.26
 1801011404 metadata/md5-cache/media-libs/libdvb-0.5.5.1-r3
 1801011404 metadata/md5-cache/media-libs/libmetalink-0.1.1-r1
@@ -72253,6 +72075,7 @@
 1801011404 metadata/md5-cache/media-libs/x265-9999
 1702282326 metadata/md5-cache/media-libs/cimg-1.7.9
 1711221908 metadata/md5-cache/media-libs/opusfile-0.10
+1801012240 metadata/md5-cache/media-libs/bio2jack-0.9-r2
 1801011404 metadata/md5-cache/media-libs/libjsw-1.5.8
 1801011404 metadata/md5-cache/media-libs/gegl-0.3.24
 1801011404 metadata/md5-cache/media-libs/libbluray-9999
@@ -72523,7 +72346,7 @@
 1801011404 metadata/md5-cache/media-libs/libtimidity-0.2.0
 1702282326 metadata/md5-cache/media-libs/libmpdclient-2.9
 1801011404 metadata/md5-cache/media-libs/gavl-1.2.0
-1801011404 metadata/md5-cache/media-libs/Manifest.gz
+1801012340 metadata/md5-cache/media-libs/Manifest.gz
 1801011404 metadata/md5-cache/media-libs/x265-2.4
 1801011404 metadata/md5-cache/media-libs/elles_icc_profiles-20160501.0932
 1801011404 metadata/md5-cache/media-libs/libmtp-1.1.14
@@ -72833,6 +72656,7 @@
 1801011404 metadata/md5-cache/media-libs/chromaprint-1.4.1
 1711172238 metadata/md5-cache/media-libs/exiftool-10.64
 1801011404 metadata/md5-cache/media-libs/libxmlbird-1.2.0
+1801012240 metadata/md5-cache/media-libs/stk-4.5.1-r1
 1801011404 metadata/md5-cache/media-libs/libnspsl-0.1.0
 1801011404 metadata/md5-cache/media-libs/elementary-9999
 1711141738 metadata/md5-cache/media-libs/libcdr-0.1.4
@@ -73043,7 +72867,6 @@
 1801011405 metadata/md5-cache/x11-base/xorg-server-1.19.5
 1801011405 metadata/md5-cache/x11-base/xorg-server-1.19.6
 1801011404 metadata/md5-cache/dev-tex/dvi2tty-5.3.4
-1801011404 metadata/md5-cache/dev-tex/csindex-2.11c-r1
 1801011404 metadata/md5-cache/dev-tex/luatex-0.76.0
 1711240238 metadata/md5-cache/dev-tex/bibtexu-3.71_p20170524
 1801011404 metadata/md5-cache/dev-tex/polytable-0.8.2
@@ -73082,8 +72905,6 @@
 1801011404 metadata/md5-cache/dev-tex/dot2texi-3.0
 1707071809 metadata/md5-cache/dev-tex/bibtexu-3.71_p20160523
 1801011404 metadata/md5-cache/dev-tex/latexmk-445
-1801011404 metadata/md5-cache/dev-tex/floatflt-1.31a
-1801011404 metadata/md5-cache/dev-tex/feynmf-1.08-r5
 1801011404 metadata/md5-cache/dev-tex/revtex-4.1_p2-r1
 1801011404 metadata/md5-cache/dev-tex/chktex-1.7.6
 1702282321 metadata/md5-cache/dev-tex/serienbrief-0.2.5
@@ -73105,6 +72926,7 @@
 1801011404 metadata/md5-cache/dev-tex/hevea-2.31
 1801011404 metadata/md5-cache/dev-tex/texpower-0.2
 1801011404 metadata/md5-cache/dev-tex/flabels-1.0
+1801012140 metadata/md5-cache/dev-tex/feynmf-1.08-r6
 1711112008 metadata/md5-cache/dev-tex/biblatex-apa-7.5
 1702282321 metadata/md5-cache/dev-tex/cpp2latex-2.3-r2
 1801011404 metadata/md5-cache/dev-tex/oesch-20080712
@@ -73119,7 +72941,7 @@
 1712132339 metadata/md5-cache/dev-tex/latexdiff-1.2.0-r1
 1801011404 metadata/md5-cache/dev-tex/luatex-0.70.1-r2
 1702282321 metadata/md5-cache/dev-tex/dvi2gr-0.4
-1801011404 metadata/md5-cache/dev-tex/Manifest.gz
+1801012140 metadata/md5-cache/dev-tex/Manifest.gz
 1801011404 metadata/md5-cache/dev-tex/glossaries-4.12-r1
 1801011404 metadata/md5-cache/dev-tex/tex4ht-20090611_p1038-r3
 1801011404 metadata/md5-cache/dev-tex/isotope-20040401
@@ -73156,10 +72978,12 @@
 1801011404 metadata/md5-cache/dev-tex/notoccite-20000720
 1801011404 metadata/md5-cache/dev-tex/tex4ht-20090611_p1038-r2
 1801011404 metadata/md5-cache/dev-tex/harvard-2.0.5
+1801011940 metadata/md5-cache/dev-tex/floatflt-1.31a-r1
 1801011404 metadata/md5-cache/dev-tex/minted-2.0
 1801011404 metadata/md5-cache/dev-tex/latex-beamer-3.41
 1710181208 metadata/md5-cache/dev-tex/biblatex-apa-7.4
 1709142214 metadata/md5-cache/dev-tex/biber-2.7
+1801011940 metadata/md5-cache/dev-tex/csindex-2.11c-r2
 1801011404 metadata/md5-cache/dev-tex/tth-3.77
 1801011404 metadata/md5-cache/dev-tex/cjk-latex-4.8.4
 1801011404 metadata/md5-cache/dev-tex/envlab-1.2-r1
@@ -75557,6 +75381,7 @@
 1702282336 metadata/md5-cache/x11-plugins/gkrellm-plugins-2.0
 1801011405 metadata/md5-cache/x11-plugins/pidgin-sipe-1.23.0
 1801011405 metadata/md5-cache/x11-plugins/wmcpu-1.4
+1801020110 metadata/md5-cache/x11-plugins/wmcpuwatch-0.2-r1
 1801011405 metadata/md5-cache/x11-plugins/wmacpi-2.3
 1801011405 metadata/md5-cache/x11-plugins/wmsmixer-0.5.1
 1709011439 metadata/md5-cache/x11-plugins/wmmoonclock-1.29
@@ -75572,7 +75397,7 @@
 1801011405 metadata/md5-cache/x11-plugins/pidgin-xmpp-receipts-0.6
 1801011405 metadata/md5-cache/x11-plugins/wmget-0.6.1
 1709011439 metadata/md5-cache/x11-plugins/wmifs-1.8
-1801011405 metadata/md5-cache/x11-plugins/Manifest.gz
+1801020110 metadata/md5-cache/x11-plugins/Manifest.gz
 1801011405 metadata/md5-cache/x11-plugins/gkrellmwireless-2.0.3-r2
 1801011405 metadata/md5-cache/x11-plugins/wmfsm-0.36
 1801011405 metadata/md5-cache/x11-plugins/pidgin-led-notification-0.1
@@ -75584,7 +75409,6 @@
 1801011405 metadata/md5-cache/x11-plugins/wmifinfo-0.10
 1801011405 metadata/md5-cache/x11-plugins/wmfishtime-1.24-r2
 1801011405 metadata/md5-cache/x11-plugins/wmmisc-1.1
-1801011405 metadata/md5-cache/x11-plugins/wmcpuwatch-0.2
 1801011405 metadata/md5-cache/x11-plugins/enigmail-1.9.8.3
 1801011405 metadata/md5-cache/x11-plugins/wmSMPmon-3.1-r1
 1801011405 metadata/md5-cache/x11-plugins/purple-hangouts-0_p20170714
@@ -75970,7 +75794,6 @@
 1801011404 metadata/md5-cache/app-eselect/eselect-lapack-0.1
 1801011404 metadata/md5-cache/app-eselect/eselect-lcdfilter-2
 1702282308 metadata/md5-cache/app-eselect/eselect-gnome-shell-extensions-20120911
-1801011404 metadata/md5-cache/app-eselect/eselect-lib-bin-symlink-0.1
 1702282308 metadata/md5-cache/app-eselect/eselect-oodict-20100228
 1702282308 metadata/md5-cache/app-eselect/eselect-mesa-0.0.10-r1
 1709290638 metadata/md5-cache/app-eselect/eselect-wine-1.2.2
@@ -75994,7 +75817,6 @@
 1801011404 metadata/md5-cache/app-eselect/eselect-opencl-1.1.0-r4
 1706221508 metadata/md5-cache/app-eselect/eselect-blas-0.1
 1706170139 metadata/md5-cache/app-eselect/eselect-chuck-1.0.2
-1801011404 metadata/md5-cache/app-eselect/eselect-repository-1-r1
 1703211907 metadata/md5-cache/app-eselect/eselect-ctags-1.18
 1801011404 metadata/md5-cache/app-eselect/eselect-lib-bin-symlink-0.1.1
 1801011404 metadata/md5-cache/app-eselect/eselect-java-0.3.0
@@ -76005,7 +75827,7 @@
 1801011404 metadata/md5-cache/app-eselect/eselect-php-0.9.4-r5
 1801011404 metadata/md5-cache/app-eselect/eselect-repository-9999
 1702282308 metadata/md5-cache/app-eselect/eselect-cdparanoia-0.1
-1801011404 metadata/md5-cache/app-eselect/Manifest.gz
+1801020940 metadata/md5-cache/app-eselect/Manifest.gz
 1703171438 metadata/md5-cache/app-eselect/eselect-pinentry-0.7
 1801011404 metadata/md5-cache/app-eselect/eselect-opengl-1.3.1-r4
 1801011404 metadata/md5-cache/app-eselect/eselect-java-0.2.0
@@ -76039,7 +75861,7 @@
 1801011404 metadata/md5-cache/app-eselect/eselect-opencl-1.1.0-r2
 1708232039 metadata/md5-cache/app-eselect/eselect-vdr-0.0.3
 1702282308 metadata/md5-cache/app-eselect/eselect-chuck-1.0.1
-1801011404 metadata/md5-cache/app-eselect/eselect-repository-2
+1801020940 metadata/md5-cache/app-eselect/eselect-repository-2
 1706181509 metadata/md5-cache/app-eselect/eselect-emacs-1.18
 1702282309 metadata/md5-cache/app-eselect/eselect-scala-0.1.1
 1702282309 metadata/md5-cache/app-eselect/eselect-sndpeek-1.0.1
@@ -76366,15 +76188,15 @@
 1801011404 metadata/md5-cache/net-ftp/oftpd-0.3.7-r8
 1801011404 metadata/md5-cache/net-ftp/vsftpd-2.3.5
 1801011404 metadata/md5-cache/net-ftp/frox-0.7.18-r6
-1801011404 metadata/md5-cache/net-ftp/filezilla-3.25.2-r1
+1801021240 metadata/md5-cache/net-ftp/filezilla-3.25.2-r1
 1801011404 metadata/md5-cache/net-ftp/proftpd-1.3.5e
 1801011404 metadata/md5-cache/net-ftp/vsftpd-3.0.3
-1801011404 metadata/md5-cache/net-ftp/filezilla-3.25.2
+1801021240 metadata/md5-cache/net-ftp/filezilla-3.25.2
 1801011404 metadata/md5-cache/net-ftp/vsftpd-3.0.2-r1
 1801011404 metadata/md5-cache/net-ftp/pybootd-1.5.0_pre20110524131526
 1801011404 metadata/md5-cache/net-ftp/vsftpd-3.0.2-r2
 1801011404 metadata/md5-cache/net-ftp/oftpd-0.3.7-r7
-1801011404 metadata/md5-cache/net-ftp/Manifest.gz
+1801021240 metadata/md5-cache/net-ftp/Manifest.gz
 1801011404 metadata/md5-cache/net-ftp/oneclickftp-0.5.1
 1801011404 metadata/md5-cache/net-ftp/tftp-hpa-5.2-r1
 1801011404 metadata/md5-cache/net-ftp/atftp-0.7-r5
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 0082629f01c7..7e81e900aa03 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 01 Jan 2018 11:30:01 +0000
+Tue, 02 Jan 2018 10:30:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 01c875ea41ba..5553ca9d0ff4 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-3bee07f5b98403895848e08765949fb4d34a08e8 1514802885 2018-01-01T10:34:45+00:00
+e176bb889db81081f5f991232d0c6604bbe47713 1514884211 2018-01-02T09:10:11+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 28bc466f3a66..4746a4f8886d 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1514804402 Mon 01 Jan 2018 11:00:02 AM UTC
+1514887801 Tue 02 Jan 2018 10:10:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index bd71a0f44646..69b01d213f0e 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Mon, 01 Jan 2018 11:04:27 +0000
+Tue, 02 Jan 2018 10:09:39 +0000
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 7e697125b291..3f8b7ed3ba22 100644
Binary files a/net-dns/Manifest.gz and b/net-dns/Manifest.gz differ
diff --git a/net-dns/ldns-utils/Manifest b/net-dns/ldns-utils/Manifest
index 40b47db3a003..82356be227b8 100644
--- a/net-dns/ldns-utils/Manifest
+++ b/net-dns/ldns-utils/Manifest
@@ -1,8 +1,5 @@
-AUX 1.6.12-cflags.patch 938 BLAKE2B 9dbcc10a21d0fade4422098c325be04a13d46d17021288501801c5e80233ea3695ddaae4a5a8ac1a8d4d818e94ec7995836b03af374b2e1ab3a7cad809b3ad88 SHA512 bd03ef07cdc407d2ad3714027c91339ada3d79bc3302884b05c4e0ada18d93d232cd718b67a35234b98c29a35f26730df631e0854b8a64399498a7e9f83e6216
-DIST ldns-1.6.12.tar.gz 1057607 BLAKE2B c9f20afb850b7ce8849996a808ef29bb3c5596416350854805b9e212925ec58be1440acfdf5f9b2fb2d47c86605eb05f8bb8aceebc0ed9a23cabbad96839e052 SHA512 f928be35a5c0bc2b918f005dd592cc531451f373ed9d77a54d5207a2a80b9d525faabf75bba75483d3476cfeff75a66ad4d9527a84a983216dae4fac30213773
 DIST ldns-1.6.17.tar.gz 1315403 BLAKE2B 67cf163c0fc529730f6de6a7ed3c581a2fdc3be7eb3f1d2cdc4ff51c98e6b78f93fab96d19d665f2dc8592f80d92ec5d3dd16da9760124f0604eb48c09ffd201 SHA512 5de42b4b8622591db51efb0956735deee9cd5e0bee12249a03b65c5b45d7c51bf9c2edb310ef9d7431af49aef77d968bfa2455a7dedfa80cde3d433436c83785
 DIST ldns-1.7.0.tar.gz 1304424 BLAKE2B 2f37aa2d00c1d9cf18711bd4f873f4722df01c4f4d0f627e054f04b2473c0fbf19449e293a130d5c8b98dcebafeb3d7b3f5923ae0244bd80139cea77f2171e06 SHA512 8a4e48bcc2a244b92447a9830b60efbb656fb7955f3559ef2eb6f8e724c4c0208776350c44ccf7dcf1ffe0b7b9d9ccc4cbddc5bc16e8888db494ab4d0bce3bd8
-EBUILD ldns-utils-1.6.12.ebuild 1351 BLAKE2B c2d36cf2b3924821904af1632d3df395d92ec0835030cce8f03d150478ccae743be26e795ab9e6e7a104771bd7119832efcfe05f1b9f9790472d25a91a457d57 SHA512 74b2120348484901b4736f10cc4fc4f36b4ae728fb3173623c8e5274205c1bbe5b6d535ddf62c20e367fedbcdc0591a870fae871ac99679325267a67721b3829
 EBUILD ldns-utils-1.6.17.ebuild 1138 BLAKE2B 0731e3377961d21b35e5a4237d72079a24b22ed76a24efd8deb0d275f9c54ca40968901802b7a25d1033a4fbc6e0f8322775ff23f81263766a6e65e8c9ef6f7d SHA512 3ae6b8549ed43e1957127129094ece798f1e7f64dae5521f83eeb59a37bc72ae7e97963b68fadf3c5446c8c019d3800ce06f7e29acaf2c6e748750aed6db03d0
 EBUILD ldns-utils-1.7.0-r1.ebuild 1193 BLAKE2B f2e5efb2445d3bd17c67fd11f335c1b939a10f64c2681cbb938e3ff93e54f1b1d93ceda71e3ca92793b7762b19892e2a48cf9f51292699e35a30e40d45aeb352 SHA512 3f2269ec3805b6e298dc297c45a34ef76aa393556460b880bc9c543de801c65c8b616d3c936f4f735f2bd2d21d12a38c0bf09a0478a14af3b58e5a78a21d937f
 EBUILD ldns-utils-1.7.0.ebuild 1138 BLAKE2B 7a7d609335d3ee0e6f7591953a3a4217db3685268a9243d89fbdb67014ed5b906522745bad4ed0ab1fc3a36be6e48519991b92377b78578f4f1fbed6cb50ca60 SHA512 7969ea780081157652a9e3c601f19b34b1aef9565c53fdab51e5d4a8f55fc7b29186d5c2a47eb3eb0cf54f2785a1d2cf0ae52b57d83962ecb6b564c588992363
diff --git a/net-dns/ldns-utils/files/1.6.12-cflags.patch b/net-dns/ldns-utils/files/1.6.12-cflags.patch
deleted file mode 100644
index 5e14a20ad37c..000000000000
--- a/net-dns/ldns-utils/files/1.6.12-cflags.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Naur ldns-1.6.12.orig/drill/configure.ac ldns-1.6.12/drill/configure.ac
---- ldns-1.6.12.orig/drill/configure.ac	2011-11-17 00:48:16.000000000 +0900
-+++ ldns-1.6.12/drill/configure.ac	2012-01-12 00:20:51.944503474 +0900
-@@ -33,7 +33,6 @@
- ACX_CHECK_COMPILER_FLAG(xc99, [C99FLAG="-xc99"])
- 
- AC_TYPE_SIZE_T
--ACX_CHECK_COMPILER_FLAG(O2, [CFLAGS="$CFLAGS -O2"])
- 
- ACX_CHECK_COMPILER_FLAG_NEEDED($C99FLAG -D__EXTENSIONS__ -D_BSD_SOURCE -D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600,
- [
-diff -Naur ldns-1.6.12.orig/examples/configure.ac ldns-1.6.12/examples/configure.ac
---- ldns-1.6.12.orig/examples/configure.ac	2011-09-29 22:04:19.000000000 +0900
-+++ ldns-1.6.12/examples/configure.ac	2012-01-12 00:21:03.191504702 +0900
-@@ -31,7 +31,6 @@
- 
- 
- AC_TYPE_SIZE_T
--ACX_CHECK_COMPILER_FLAG(O2, [CFLAGS="$CFLAGS -O2"])
- 
- ACX_CHECK_COMPILER_FLAG_NEEDED($C99FLAG -D__EXTENSIONS__ -D_BSD_SOURCE -D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600,
- [
diff --git a/net-dns/ldns-utils/ldns-utils-1.6.12.ebuild b/net-dns/ldns-utils/ldns-utils-1.6.12.ebuild
deleted file mode 100644
index 6b15334d520a..000000000000
--- a/net-dns/ldns-utils/ldns-utils-1.6.12.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-inherit autotools eutils
-
-MY_P="${P/-utils}"
-DESCRIPTION="Set of utilities to simplify various dns(sec) tasks"
-HOMEPAGE="http://www.nlnetlabs.nl/projects/ldns/"
-SRC_URI="http://www.nlnetlabs.nl/downloads/ldns/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="examples gost ssl"
-
-DEPEND=">=net-libs/ldns-${PV}[gost?,ssl?]
-	examples? ( net-libs/libpcap )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# bug #369339
-	epatch "${FILESDIR}/1.6.12-cflags.patch"
-
-	( cd drill && eautoreconf )
-	( cd examples && eautoreconf )
-}
-
-src_configure() {
-	cd "${S}"/drill
-	econf $(use_with ssl) || die
-
-	if use examples; then
-		cd "${S}"/examples
-		econf \
-			$(use_enable gost) \
-			$(use_enable ssl sha2) \
-			$(use_with ssl) || die
-	fi
-}
-
-src_compile() {
-	emake -C drill || die "emake for drill failed"
-	if use examples; then
-		emake -C examples || die "emake for examples failed"
-	fi
-}
-
-src_install() {
-	cd "${S}"/drill
-	emake DESTDIR="${D}" install || die "emake install for drill failed"
-	dodoc ChangeLog.22-nov-2005 README REGRESSIONS || die
-
-	if use examples; then
-		cd "${S}"/examples
-		emake DESTDIR="${D}" install || die "emake install for examples failed"
-		newdoc README README.examples || die
-	fi
-}
diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index 05b1063beec4..2caaba65c5ff 100644
Binary files a/net-firewall/Manifest.gz and b/net-firewall/Manifest.gz differ
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
Binary files a/net-ftp/Manifest.gz and b/net-ftp/Manifest.gz differ
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
Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ
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 7a447da9bc0c..8a2da0b24dcb 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/aget/Manifest b/net-misc/aget/Manifest
index c3757b0d558c..bc1d24ae0b2d 100644
--- a/net-misc/aget/Manifest
+++ b/net-misc/aget/Manifest
@@ -1,4 +1,4 @@
 AUX aget-0.4.1-r1.patch 2423 BLAKE2B 26c1af35a30931d4c67323a636f4326426efe114cd62ef8ba344c59cc72a1581247483f9f80c3b6ea3d17695f752216d25ebd2983c19585c3e78a27b8f8b7cb2 SHA512 b4c1765634f6f14c19e992fa090b7ed1ec11a5d62fe874602f18466d3ced9c0a2ec255fdb8dcb732f0fbd9be9831fe080509992c86fa7b8f11f40366a523ae28
 DIST aget-0.4.1.tar.gz 12783 BLAKE2B e1716f85fe426a8b5c049d54a0c63ae2ec050ceafe8b7f67a36be23a2750782a96939e82ab53485fd646c078cdc5c64445340d0557b9a5656fdd4378aecc29a8 SHA512 23fd4a7786b905bb10fb8de62dea294e014e0c2ad276614c642ebd3865b262eb88e08308df9a68f418de19a984ad138561d82c67e0226dfb5f56520e8ed15ad7
-EBUILD aget-0.4.1-r1.ebuild 615 BLAKE2B 2cdbc7b2462548e551a5de5c771ac3b88e3542a1de755f1f78ae6d52d167960861c59854abdde2501a4251178f6b1e7871a66b9512f3e29309bee91ad6414d72 SHA512 f4899a197b8fdc02e8101b858adda89ba2b29b067d680fe97cfaf88272a24caae5bebd261d87ca7c1151a866da7fbf55833fa615d2b1a2d2f4a90b58efab6814
+EBUILD aget-0.4.1-r2.ebuild 582 BLAKE2B d1f522198c0949e4346b97135e4ffecf8117933929859707649a771bcf6a4a2ff9d987cc9ab939a665c393a6ba2b65eeba00c241941176a037563edadfde75f2 SHA512 1f6f40bbdfae1eafdbb06de955bfdef4031c78457b06c6ee5c553b7792e9794b00efc350f20122dac1714afbf7f6c97a85a2dd068a03bbc3ea8bc31612551827
 MISC metadata.xml 759 BLAKE2B 04c2f4d6af748358f2d0d0150aa292cf68ef08d3c7f9f665cd64b5bf47fa8c5bb94e6447eb4502c78c050be962f26aa25963dd1816f6d233df5b9d1846cc2063 SHA512 c65b54fcd23ae72aabafd4259831f9bbe19c0e9ea65efeb49fbd703f900ae8b21d565cf1ea508f83064b05bd5df212a9e03991c6c652c9459648e77fdc7e98ec
diff --git a/net-misc/aget/aget-0.4.1-r1.ebuild b/net-misc/aget/aget-0.4.1-r2.ebuild
similarity index 59%
rename from net-misc/aget/aget-0.4.1-r1.ebuild
rename to net-misc/aget/aget-0.4.1-r2.ebuild
index 98a946337d3f..ed4438eb35fd 100644
--- a/net-misc/aget/aget-0.4.1-r1.ebuild
+++ b/net-misc/aget/aget-0.4.1-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=3
+EAPI=6
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="multithreaded HTTP download accelerator"
 HOMEPAGE="http://www.enderunix.org/aget/"
@@ -14,15 +14,15 @@ SLOT="0"
 KEYWORDS="amd64 ~arm ~mips ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PF}.patch
-}
+PATCHES=(
+	"${FILESDIR}"/aget-0.4.1-r1.patch
+)
 
 src_compile() {
-	emake CC="$(tc-getCC)" || die
+	emake CC="$(tc-getCC)"
 }
 
 src_install() {
-	emake DESTDIR="${ED}" install || die
-	dodoc AUTHORS ChangeLog README* THANKS TODO || die
+	emake DESTDIR="${ED}" install
+	dodoc AUTHORS ChangeLog README* THANKS TODO
 }
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/sys-auth/pam-csync/metadata.xml b/net-misc/babeld/metadata.xml
similarity index 65%
rename from sys-auth/pam-csync/metadata.xml
rename to net-misc/babeld/metadata.xml
index 6f49eba8f496..a492b8f65591 100644
--- a/sys-auth/pam-csync/metadata.xml
+++ b/net-misc/babeld/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person"><email>heroxbd@gentoo.org</email></maintainer>
 </pkgmetadata>
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
similarity index 90%
rename from net-misc/icaclient/icaclient-13.6.0.10243651.ebuild
rename to 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/ipsvd/Manifest b/net-misc/ipsvd/Manifest
index b05a0dfdf0e5..63ab95b81545 100644
--- a/net-misc/ipsvd/Manifest
+++ b/net-misc/ipsvd/Manifest
@@ -1,4 +1,4 @@
-AUX ipsvd-1.0.0-fix-parallel-make.diff 1442 BLAKE2B 00162fdc454576fbe2be4ef489b42e5abf9744c236b968a6b933ead874f0099ef540fffa1963cbc864da29fa0e925799780a94dba017544baadabdfc0ec0d854 SHA512 f28e2f8f5bb857cf20df144aa45172c9b28b4b78c71eb27fe3a082395edcf01b526cb47a9a6bc74e53c157d87e28be311607a30576f433385e1a83ed0d3b7b3a
+AUX ipsvd-1.0.0-fix-parallel-make.diff 1449 BLAKE2B 0d90bda1f86bbc0ee5aaa3136b3e72b55d660198178eb40fd5dc715f55d738289ae0c24f50c8e7038e69bdae0c45c61c61ba723228b790c699edd91686d52c08 SHA512 7e6906eb0814d841752e3b8ec36320ec7bac5c8cc0481bfc8630e77ffddd883a5c54b8d8495df4e99f3d9486b66dcb06094f5619a064c3f9b065780a10deb624
 DIST ipsvd-1.0.0.tar.gz 77903 BLAKE2B a69154465ac5e6bb8246863f0b602b2a5705b54eab76b63e3f555597470dee97531d34abb72f190d6b3536c5c75de8c97e45138d7d38e06bd8018d92c2df1a42 SHA512 cbdb461bd5952d3533e1cbf23b4820cea12ec9f96b7c47796304260d8bf201764b95602364102d92e3feb7bf4275d22d8d6447f09a6788cf5cf17371be34b736
-EBUILD ipsvd-1.0.0-r1.ebuild 953 BLAKE2B 3d2ebe7ee417102627f3c8a7d8797b7f9ad51d829b423e484ffefc4b31db91b1a041568fb05ecc7280265bb60f43e875207a249e5603041815236ed051be205d SHA512 0315f73e2428837fcde43d7e16dba645ad5bc02a601fbc00627a98cc9a59c402102b09ca99ad552f0fe264cc54374119089eec7d2099374cdbfb0f4b70b59310
+EBUILD ipsvd-1.0.0-r2.ebuild 897 BLAKE2B 821e8bc31a2d2f9bc6d7f77dc6e7279efbd3eb01c1dc497011daf1e7d598da9ba46e995be45ac36dd2e1a8f4aae00b577fedef53071ad22e0cf675ed208e477f SHA512 731ff9d0543b03567409136828a1f037c06f1a5e682ca44395ca82f352ff1a411698d74d1c897e197a8002e54258f888d13fb5c2d33b01cc9cd1b5cea23d57e3
 MISC metadata.xml 1213 BLAKE2B 3f6fe32492e8941ec6ea1c6fc3ccd515ab473841124121a4ab384b0adc23b84b4973025dae944bc98d325e5d6322787a49fad9f9a5f127df0913475bb471166f SHA512 c80b068e9fb9ec3d63bb13c41386f119b448bcfaa3a7173483ef46c13fb8fd1c142cb4e4eeaaf73d25331326e5a8002d9545ae235bee244d9b272ea710adc456
diff --git a/net-misc/ipsvd/files/ipsvd-1.0.0-fix-parallel-make.diff b/net-misc/ipsvd/files/ipsvd-1.0.0-fix-parallel-make.diff
index 0b29a8e8cbb1..2f770e27061d 100644
--- a/net-misc/ipsvd/files/ipsvd-1.0.0-fix-parallel-make.diff
+++ b/net-misc/ipsvd/files/ipsvd-1.0.0-fix-parallel-make.diff
@@ -1,5 +1,5 @@
---- Makefile.orig	2011-01-21 00:43:02.000000000 +0100
-+++ Makefile	2011-01-21 00:47:27.000000000 +0100
+--- a/src/Makefile	2011-01-21 00:43:02.000000000 +0100
++++ b/src/Makefile	2011-01-21 00:47:27.000000000 +0100
 @@ -61,7 +61,7 @@
  check-ipsvd-cdb: load check-ipsvd-cdb.o uint32_unpack.o unix.a byte.a
  	./load check-ipsvd-cdb uint32_unpack.o unix.a byte.a
diff --git a/net-misc/ipsvd/ipsvd-1.0.0-r1.ebuild b/net-misc/ipsvd/ipsvd-1.0.0-r2.ebuild
similarity index 73%
rename from net-misc/ipsvd/ipsvd-1.0.0-r1.ebuild
rename to net-misc/ipsvd/ipsvd-1.0.0-r2.ebuild
index 4540eca6c7df..2b0e4522e88a 100644
--- a/net-misc/ipsvd/ipsvd-1.0.0-r1.ebuild
+++ b/net-misc/ipsvd/ipsvd-1.0.0-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=3
+EAPI=6
 
-inherit toolchain-funcs flag-o-matic eutils
+inherit toolchain-funcs flag-o-matic
 
 DESCRIPTION="ipsvd is a set of internet protocol service daemons for Unix"
 HOMEPAGE="http://smarden.org/ipsvd/"
@@ -19,10 +19,9 @@ RDEPEND=""
 
 S="${WORKDIR}/net/${P}"
 
-src_prepare() {
-	cd "${S}"/src
-	epatch "${FILESDIR}"/${P}-fix-parallel-make.diff
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-parallel-make.diff
+)
 
 src_configure() {
 	cd "${S}"/src
@@ -36,14 +35,16 @@ src_configure() {
 
 src_compile() {
 	cd "${S}"/src
-	emake || die "make failed"
+	emake
 }
 
 src_install() {
-	dobin src/{tcpsvd,udpsvd,ipsvd-cdb} || die "dobin"
+	dobin src/{tcpsvd,udpsvd,ipsvd-cdb}
 	dodoc package/{CHANGES,README}
 
-	dohtml doc/*.html
 	doman man/ipsvd-instruct.5 man/ipsvd.7 man/udpsvd.8 \
 		man/tcpsvd.8 man/ipsvd-cdb.8
+
+	insinto html
+	dohtml doc/*.html
 }
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/ocsync/Manifest b/net-misc/ocsync/Manifest
deleted file mode 100644
index d91fe31917bd..000000000000
--- a/net-misc/ocsync/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ocsync-0.90.4.tar.bz2 4630698 BLAKE2B 11900f09a9de683f5251cec00984dc0f02a24f066bb696ea11278442eeea9d2555ba9307887e0f3374079deb438262cb464ec78eb9d3e46780be3444672f33ec SHA512 74bf6b083ae4d4c09e3915d777d916a04ebb19aefb21a5a14a49e2079e02c5c60f1f274aa0cab5c227147883eaf1a5f91b6c0546b818c960cc3575cdcdd93d57
-EBUILD ocsync-0.90.4.ebuild 1345 BLAKE2B 6957903cf8fb5a0d4381f98274e18fbe2b5cee7201aa7b10b213012394f52db794ce11cd0494eef05770741ad116607a4c8856a562b4c6357f15b06250e6b381 SHA512 2de3aa36abd8b7108bfeac67508b2f757b488e5d7ec9725271f05e49ab9f3364a6c1b59ea605cbafd0ef5fd29eb18ae2f9a8f4d59a480c515a2eefb70d9c3a96
-MISC metadata.xml 354 BLAKE2B 5a0ff4b19f98eefe67e4b6dc04ea59cdb76abfb4f8799163cf2c87a565660e84182ca565eb641b43b66083d9d9dde12cb156edc84b06e889edf0cc9a60e07d68 SHA512 513b19184444fb46882523fc160043d7d530d202aa253f44ace9fc97fad8dda7748083bd992921d93ebd62a12397e69a086932818e317f75fb7dfa478ab3f1ba
diff --git a/net-misc/ocsync/metadata.xml b/net-misc/ocsync/metadata.xml
deleted file mode 100644
index 4ce4054df697..000000000000
--- a/net-misc/ocsync/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>voyageur@gentoo.org</email>
-		<name>Bernard Cafarelli</name>
-	</maintainer>
-	<use>
-		<flag name="sftp">Enable sftp transfer support via <pkg>net-libs/libssh</pkg></flag>
-	</use>
-</pkgmetadata>
diff --git a/net-misc/ocsync/ocsync-0.90.4.ebuild b/net-misc/ocsync/ocsync-0.90.4.ebuild
deleted file mode 100644
index 37369a8f2f4a..000000000000
--- a/net-misc/ocsync/ocsync-0.90.4.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="A file synchronizer especially designed for you, the normal user"
-HOMEPAGE="http://csync.org/"
-SRC_URI="http://download.owncloud.com/download/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc iconv samba +sftp test"
-
-RESTRICT="test"
-
-RDEPEND="
-	dev-db/sqlite:3
-	>=dev-libs/iniparser-3.1:0
-	net-libs/neon[ssl]
-	iconv? ( virtual/libiconv )
-	samba? ( net-fs/samba )
-	sftp? ( net-libs/libssh )
-	!net-misc/csync
-	!>=net-misc/owncloud-client-1.5.1
-"
-DEPEND="${DEPEND}
-	app-text/asciidoc
-	doc? ( app-doc/doxygen )
-	test? ( dev-libs/check dev-util/cmocka )
-"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -e "s/__FUNCTION__/__func__/" -i \
-		src/csync_log.h src/httpbf/src/httpbf.c \
-		tests/csync_tests/check_csync_log.c || die
-	# proper docdir
-	sed -e "s:/doc/ocsync:/doc/${PF}:" \
-		-i doc/CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use test UNIT_TESTING)
-		$(cmake-utils_use_find_package doc Doxygen)
-		$(cmake-utils_use_find_package samba Libsmbclient)
-		$(cmake-utils_use_find_package sftp LibSSH)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	mv "${D}/usr/etc/ocsync" "${D}/etc/"
-	rm -r "${D}/usr/etc/"
-}
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index c7776e06f6a5..c037ffba6707 100644
Binary files a/net-vpn/Manifest.gz and b/net-vpn/Manifest.gz differ
diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index 39dde0bc20c4..349fb88c821f 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -8,7 +8,7 @@ DIST tor-0.3.1.9.tar.gz 6092702 BLAKE2B c009567b5866ff50159fbcbab05462a860c3e66c
 DIST tor-0.3.2.7-rc.tar.gz 6313975 BLAKE2B ecfe6832b2e9c81f04218f7ec82a63f23913c1dc0a9ec29113e6432eac69b8cc89a9fc6b7c4147cf26e6de141b22574d3118608194641126d961b5f452179e1b SHA512 989bdd4311521528444f4165455365d3c1f1ef5f6a8846bf08db7f84ab8e986cba47f9dfbd3a03ccb6e3f8d813d69289768170a8fd68916e9d6a21fe0484cf87
 DIST tor-0.3.2.8-rc.tar.gz 6345141 BLAKE2B e529847252b819a81e6cce5f5989e72ccb9d8db03221c37e504b47995d36977a67653d59cb7f8378eb3652d256867e3ee319062f9cb6acdcd42a415b08f89954 SHA512 60913c492f903307d485af26ab3752e0058fb97816d62cd29eb8785446bb7eb6f9bd2aca964a0d8c4de039c4d432590dea68c28c4f34eda2f127b50c752be0d4
 EBUILD tor-0.3.1.7.ebuild 2037 BLAKE2B 013b5168cebd2c35948c68e75811ac543b6f156ce4ed5c8fd7cb55231e40b575ee987419a8242095c90ce3f56ded0017e99bc01fd4568c1eb67da6a73e418db2 SHA512 efcb53f76c91cf9cd2403025a3290b170f58f0f03cb62fb2dc82a0e0ec55d263d9757b4cf80a825690b6276a01223091d7f6bc2f4d358ad778a82dac987ac56c
-EBUILD tor-0.3.1.9-r1.ebuild 2088 BLAKE2B 01576aa9f7560cf87ad2a5ccf5940d96e5b41cff9bfa2b7136b383e533203384016221ad99fc054776674143599310efd24b98e13f652407937f7882c2fddd84 SHA512 2dce831cc54a5346d9aa5cd8cb885033c350aac39003d2b78a24fa0a363d49be9a8e4b6f5256daf002ac1476aac13fdfd3f5f765ad809e9638226b72a0960fbd
+EBUILD tor-0.3.1.9-r1.ebuild 2022 BLAKE2B 11fd5a5470747113c53b686b63b8274ba59985a0e12fc34629abb5651df5c0307426ca8dc1cbcfbdba06dccf07c94c0867eb6d58897b55965b4a31bd8165e8f7 SHA512 4945ed247d424bc1f8e0f56c53c7ec708b9bb499546edd5a17e95aea912d9a49a6eb3caeab30cb7709ec5c1535b9b3c0fbdaaea8d935be17f0753748a37ed9e7
 EBUILD tor-0.3.2.7_rc-r1.ebuild 2088 BLAKE2B 01576aa9f7560cf87ad2a5ccf5940d96e5b41cff9bfa2b7136b383e533203384016221ad99fc054776674143599310efd24b98e13f652407937f7882c2fddd84 SHA512 2dce831cc54a5346d9aa5cd8cb885033c350aac39003d2b78a24fa0a363d49be9a8e4b6f5256daf002ac1476aac13fdfd3f5f765ad809e9638226b72a0960fbd
 EBUILD tor-0.3.2.8_rc.ebuild 2088 BLAKE2B 01576aa9f7560cf87ad2a5ccf5940d96e5b41cff9bfa2b7136b383e533203384016221ad99fc054776674143599310efd24b98e13f652407937f7882c2fddd84 SHA512 2dce831cc54a5346d9aa5cd8cb885033c350aac39003d2b78a24fa0a363d49be9a8e4b6f5256daf002ac1476aac13fdfd3f5f765ad809e9638226b72a0960fbd
 MISC metadata.xml 594 BLAKE2B 006e1ebc9876f83cb7cc3dcb7cea9ff0dfc763e9eb47c025e38b7588e1e4fef7c26ab130c61cdd3200b8d3d9be886b3aab377585972be178c93b758aff48c4c3 SHA512 011f77654a507d13c0542e6983df8ec86c5f2cff7cd1408f99c9d4da9d00ffb4b432317b2fd21500e62131e6f7c9bc60235cf55f2b8082391b9fe3bcf924ab2b
diff --git a/net-vpn/tor/tor-0.3.1.9-r1.ebuild b/net-vpn/tor/tor-0.3.1.9-r1.ebuild
index 23286b3b6daa..a07f0d3d2a70 100644
--- a/net-vpn/tor/tor-0.3.1.9-r1.ebuild
+++ b/net-vpn/tor/tor-0.3.1.9-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"
@@ -16,8 +16,7 @@ S="${WORKDIR}/${MY_PF}"
 LICENSE="BSD GPL-2"
 SLOT="0"
 # We need to keyword app-arch/zstd
-#KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~ppc-macos"
+KEYWORDS="amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~ppc-macos"
 IUSE="libressl lzma scrypt seccomp selinux systemd tor-hardening test web zstd"
 
 DEPEND="
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index be9743950526..4a5561b76fa9 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/package.mask b/profiles/package.mask
index c494b6067173..850786613124 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -439,7 +439,7 @@ sci-electronics/cirkuit
 # If you depend on this package, help test KF5-based simon-9999
 # to decide on a possible snapshot. Bugs #640846, 639960, 635816.
 # Masked for removal in 30 days.
-app-accessibility/simon:4
+app-accessibility/simon:0
 
 # Patrice Clement <monsieurp@gentoo.org> (12 Dec 2017)
 # Masked due to a hard dependency on an ancient versions of dev-libs/msgpack
@@ -605,56 +605,12 @@ x11-drivers/xf86-input-pentouch
 # Masked for removal on 2017-12-30
 dev-tex/notoccite
 
-# Bernard Cafarelli <voyageur@gentoo.org> (24 Nov 2017)
-# Upstream removed tarball, no separate release in 3 years
-# Merged in net-misc/owncloud-client since
-# Masked for removal in 30 days. Bug #501228
-net-misc/ocsync
-sys-auth/pam-csync
-
-# Bernard Cafarelli <voyageur@gentoo.org> (24 Nov 2017)
-# Dead upstream, source not available anymore
-# Last open-source update in 2011
-# Masked for removal in 30 days. Bug #638670
-www-apps/eyeos
-
 # Matt Turner <mattst88@gentoo.org> (23 Nov 2017)
 # The modesetting driver is part of the xorg-server package since version 1.17.
 # The separate xf86-video-modesetting package is no longer needed.
 # 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/use.local.desc b/profiles/use.local.desc
index dd19f32986cc..7066dfc3bd53 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -3129,6 +3129,8 @@ games-emulation/fceux:logo - Enable the ability to add a logo screen when creati
 games-emulation/generator:sdlaudio - Enable SDL Audio
 games-emulation/higan:icarus - Build icarus library manager
 games-emulation/higan:udev - Enable udev based input
+games-emulation/m64py:7z - Ensure support for .7z archives.
+games-emulation/m64py:rar - Ensure support for .rar archives.
 games-emulation/mednafen:debugger - Build with internal debugger
 games-emulation/mednafen:pax_kernel - Triggers a paxmarking of the binary
 games-emulation/mupen64plus:audio-sdl - Enable SDL audio plugin.
@@ -4563,6 +4565,7 @@ media-sound/gogglesmm:opus - Enable support for opus codec
 media-sound/herrie:http - Enable http streaming
 media-sound/herrie:xspf - Enable support for reading and saving XSPF playlists
 media-sound/hydrogen:archive - Use libarchive instead of libtar
+media-sound/hydrogen:portmidi - Add portmidi support
 media-sound/jack-audio-connection-kit:coreaudio - Build the CoreAudio driver on Mac OS X systems
 media-sound/jack-audio-connection-kit:cpudetection - Enables runtime cpudetection
 media-sound/jack-audio-connection-kit:pam - Add basic realtime configuration via sys-auth/realtime-base
@@ -6505,7 +6508,6 @@ net-misc/nextcloud-client:shibboleth - Build support for Shibboleth single sign-
 net-misc/ntp:openntpd - Allow ntp to be installed alongside openntpd
 net-misc/ntp:parse-clocks - Add support for PARSE clocks
 net-misc/ntp:samba - Provide support for Samba's signing daemon (needed for Active Directory domain controllers)
-net-misc/ocsync:sftp - Enable sftp transfer support via net-libs/libssh
 net-misc/ofono:atmodem - ETSI AT modem support.
 net-misc/ofono:bluetooth - Enable Bluetooth modem support using net-wireless/bluez.
 net-misc/ofono:cdmamodem - Enable CDMA modem support.
diff --git a/sci-biology/Manifest.gz b/sci-biology/Manifest.gz
index ab77a5ae6d14..57e346c2db2b 100644
Binary files a/sci-biology/Manifest.gz and b/sci-biology/Manifest.gz differ
diff --git a/sci-biology/arb/Manifest b/sci-biology/arb/Manifest
index 7690d418e0f6..52b55979193b 100644
--- a/sci-biology/arb/Manifest
+++ b/sci-biology/arb/Manifest
@@ -1,20 +1,6 @@
-AUX 5.1-bfr-overflow.patch 715 BLAKE2B 04586fda551093d2a3f15af52e10c228f5463f46e9c7c6a57eb4a42cde68800902f2e4a0ba6caec1dc2f6dbace915018bb285cf8d40f24e9b3a234f26762245c SHA512 840dc83a2f6a6c7da05437a72bbc9372a229a18f6de08758141c6ed142a034f4b2954e9a650185fcdcdd5e672cabad32d9b2496098a2369094f502f87143710c
-AUX 5.1-libs.patch 503 BLAKE2B a389b2af00275a66ce2a51570b3d6249eec8cc08afb1b32c3319c51698bcbf581671182f13f0aac612ece57299be787257fe8c885b3c323fc133081f0733ed1a SHA512 9130fd43a7a6c43ac5dce56eeb85cabe881ddd12a2786ae0ec73432584d498afb1b7f28514c9d078e6c19f6654f2ef88192e96cac2f4be5a04474f534a2bdcdd
-AUX 5.2-libpng15.patch 1545 BLAKE2B 657d1bdbcf73be2af4391764df043274acb18f1445ebaa425652a5075a2a6a158c0804405524d0291066267f8509861a6d30a22713cf8b28636c41767aa14078 SHA512 8215bead0ff0d579b43b6c75f82306aacf5248833b13536ec0bbd703433343f2920c2fb68e015ea39b105630c1c06bc45cc9e165f230deddd52e76a2d7f82bdc
-AUX arb-5.2-gcc-47.patch 330 BLAKE2B 441bf38b1b2e34ead2a0fe1d1e15399c3c0d31d321fe93abd347e73b22adb8440c54c7aab4bd50caac43ccd6487ef1c834719f072b4fc8656e7735a431c9fefc SHA512 36b2afbc6c177c44728da92fd596881b5035d5d7b8880fabbdaa360c9f59057816952112bb98ae0fa5b04352ea99b85318f262a6d91001bc177dd1e6069611c0
 AUX arb-6.0.6-arb_install.patch 2752 BLAKE2B ca081a0440a29c59c3e46b883c474a2794656d143e975bd53d74fb7a35901f6fd8acf29ba13d75617d6541e2cf8758d7405472884f0d810fcc6fde0d8e3f5082 SHA512 468d7e1ee599334e593ce95374a29a1815ba8559afb6d773f533a07b0b520115e1aafcbb228ec82f331cd2d580816d68bf2f9351774ed8f52942b13e23eb5746
 AUX arb-6.0.6-glapi.patch 537 BLAKE2B 4b0529f61a089816c0ca8535017db9a9d33ffbcd26a881b740709c639c1e893c93f7a49d2e0b628805edd172ef428360283a41be2c255adf9baa4a6128f04d70 SHA512 249847d0b563460447c7c53167ec50ba541270614943a471aab5c8dccc1c9e253af79746834fd722d33f9a96607e9a382f7ae80fb96656f52d9a143fd4760be5
 AUX arb-6.0.6-tc-flags.patch 1540 BLAKE2B a5a93849998c596b47beaae540648203ff4891f450bef27ffe7e602fc0bb9b61f71b99dc0f98121680e93b3ea9c5e1919e600e431d0a641ab52b698ae4375c32 SHA512 e5bcd297196f473c6cece3e5a28380011f20e5d0389b6de508c4ae0f82f0d6bb4502b755a89b1f9ddf582ab3a9722793c6f7727168b442c08dd99f95799d3418
-DIST arb-5.1-glibc2.10.patch.bz2 24659 BLAKE2B 856b4735c98f13b21af537486f27ae89cca724590f7f4d7975dc7df05d3e3388a29198f6b9bb14b2ef885f5442d6687d6fbcdb44c076656b8e2ff521c633f940 SHA512 a490066efc5001e22bfeab8ce3e05690f5024217261b7b71c5a31116d18611a93f5b15aa7d57fca40e2b5e17e64b695873ccb810bd649b2b109c9b710d3ddfe1
-DIST arb-5.1-linker.patch.bz2 4406 BLAKE2B 3214f875c7d58e9a60032397f34a38ec13fc1672cecca475223fe8b79c684d4839e3e7dcf7c1df8290f00912b6268493bf89d77b744c923b3a9769bb466bef15 SHA512 44518d500be457d16e7f6cd5f0863d2dc48cc8a1c8abcbaea79eefec5cd063258aea78d03e9601cd0bdea3c7e57949373d7a909eeed98bf48a6d98576f298e58
-DIST arb-5.1.tgz 9727285 BLAKE2B 97660214b1dc513a946256cfdcbbefff282bb125e81e05a92005bd62b4ec00a478fb6639c6f5b0b3893e1c49d8eb9f13d04ec36271daec41c41b9093fefea09a SHA512 236f7c40217146cf5b43d15c7252901a09f2081c1da6db1b90d7720d313e21a2808b31879d700bf894b3c576952c43be751fd0027af8a58d953403028589dd8c
-DIST arb-5.2-linker.patch.bz2 4441 BLAKE2B c2554cf4e24ab9257dfac06482f05a42e89ad06ecf1b069d80df16d512ce675a29f7c3dbe0bca6b0f3add910617cc5853462aa5593cb9ccb2fb2656cdd5183c1 SHA512 6afae76a4b403ad3139abd4535b5da8bbf2d16aa5f49e30c86c8f186ac585de6c789e8fa4e402576a67ce8c58468e626a46bde5cfae5869ea2c046a1492fa903
-DIST arb-5.2.tgz 9729004 BLAKE2B 2ae85529c9c7afdbc0debc0317e0ab3772f881b606f849b6cb60872e2e123b612399dc4dcfa07c5e886703478140515fa31e9b69b37383a12d8526ecb771f77b SHA512 d1f9f7273645af7da0e949971b705303f0715ac98869acc0f75d62bfe88751709f5d5dbbc3079b0abe461ddce8262b165426e347ad28bc28a55cdf6c29b5ff56
-DIST arb-5.3-linker.patch.xz 3604 BLAKE2B 0327a94ee4daaca9cc4aa41601ae52b8616d26fd0ede19b36cb2ea72135bc9609d21db74b9588cc79e08242d3e32bb3398d78663c90dc4e3c248877953249789 SHA512 8eb072cd5a3c13b2a6ad0e40f3b155096168dbd70a6e13878d4a62e563903742442373a5e3032d6f78beefe774943fef86f6060e89acd0d18b95a7c0d4a8dec7
-DIST arb-5.3.tgz 9543106 BLAKE2B e67859accad1f5aeae3fe3a85530543beb1141e1fe340760e55b2bcef84f1f5cd18fe82ff75beafbf49b1945def0436d862487a630192345568931a335454210 SHA512 faa924b9c6f437f77ed637798c6fe5fe5c2e6a0f2efc9c1f735133fab9c037c7039fc4ef6f6e5b0408fc39ea5c69c747b1887689f4621b608add593d77930282
 DIST arb-6.0.6.tgz 13286019 BLAKE2B fd9591321111363013084030aef7130ccac580aeb9b16e93e72613dc0b3922873aa3f3b1e76d28c1ed14846c0b0d2d497257366fc5deebf4c40c79f0b7eee859 SHA512 053d4d964d8a299f86d4cab9113f0d2181780bf51e0ccec0459a4d568d09bb4e9723fa8493d8e4fa5c72e6d1f022241721cadf7ceb75ee27142d48f2f9f269b4
-EBUILD arb-5.1-r1.ebuild 2058 BLAKE2B 72c6e8816e06ca0880a7196584d5a372cf82036ac15bc1e70f0f44b3f84937a99e090cba6577a799f2760733e2764eb7cdac6b561f22f13c7a941dacd3ef0048 SHA512 686ba259e12bc336f08a0c9cfbccf52aacec57dd69abb5bdebff636579cfc564ce59efbb105500cf0ad58fcbc7ffb4876d85bff082fed48dd67849b89a7719ed
-EBUILD arb-5.2.ebuild 2064 BLAKE2B ca231f973b29c4e952b33c5055aa4e94d27f29fd28e248494a1a603a1bd95ba159b86e36a1cfdd68772a375db0c4bc5f0096123766bff79125d2df3fb66e852f SHA512 a05aabf3eaa0aca33c28d4e7bf89a119797d56b9d1a66c385e03a71bc8125db50236ce73d1f5e3288f0194e4fe7c75637281f13c9f51ca59061bd42e29a97836
-EBUILD arb-5.3.ebuild 2028 BLAKE2B 14281f761050797da0b40a797845d59292c089a2dca6b65455252d76cbcac240872d3c6a3629ced8315792c90ab9bf246b08e5b915aaf163a4c9b77c7e796a1d SHA512 d614a2b107b0bb9b0e0e1d9fdf647215165a7844cd73fe34870f24f3cbe1a50399e3e790ce202019eb90a42d0d122b20dce2a45bbdb2c134d9520666b79844a2
 EBUILD arb-6.0.6.ebuild 2482 BLAKE2B 7ec03e43d84e8c0f9ccc1465a0c5da113224c02b068dddcf2c3712930d1b309789104f8c074511f243ae8fcc76554bd57d4f2ce3eb73ff23eacb523451d11906 SHA512 afb90afeb3d01aceeddafd52b0e173c240a166e325298ac3eecd3fe130ef8248237a13a6d42c81d66f3103343333a80a19d84e2c077ba6c6ddaf1efb271fa14d
 MISC metadata.xml 267 BLAKE2B 7cf386952842945148119de3263231db4d1046d5f54811f7e303ed8ec4d27cbc1960b99c92daf6f32e5b981c2fb9f50ec666be6193865d6e18541b7427a152a9 SHA512 91ab266d9ab24401bc0fec759c5b6cfcf44a3c5669fc31c7301d79770839bb5dfa0e155d949392ef06176b4a0b2c32b91b1b54b0027f972db61f0a5e54644403
diff --git a/sci-biology/arb/arb-5.1-r1.ebuild b/sci-biology/arb/arb-5.1-r1.ebuild
deleted file mode 100644
index f52beded359c..000000000000
--- a/sci-biology/arb/arb-5.1-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Tools for DNA/RNA sequence database handling and phylogenetic analysis"
-HOMEPAGE="http://www.arb-home.de/"
-SRC_URI="
-	http://download.arb-home.de/release/arb_${PV}/arbsrc.tgz -> ${P}.tgz
-	mirror://gentoo/${P}-glibc2.10.patch.bz2
-	https://dev.gentoo.org/~jlec/${P}-linker.patch.bz2"
-
-LICENSE="arb"
-SLOT="0"
-IUSE="+opengl"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	app-text/sablotron
-	media-libs/libpng
-	media-libs/tiff
-	www-client/lynx
-	x11-libs/libXaw
-	x11-libs/libXpm
-	x11-libs/motif:0
-	opengl? (
-		media-libs/glew
-		media-libs/freeglut
-		|| (
-			media-libs/mesa[motif]
-			( media-libs/mesa x11-libs/libGLw ) ) )"
-RDEPEND="${DEPEND}
-	sci-visualization/gnuplot"
-# Recommended: libmotif3 gv xfig xterm treetool java
-
-src_unpack() {
-	unpack ${A}
-	mv arbsrc* ${P}
-}
-
-src_prepare() {
-	epatch \
-		"${WORKDIR}"/${P}-glibc2.10.patch\
-		"${WORKDIR}"/${P}-linker.patch \
-		"${FILESDIR}"/${PV}-libs.patch \
-		"${FILESDIR}"/${PV}-bfr-overflow.patch
-	sed -i \
-		-e 's/all: checks/all:/' \
-		-e "s/GCC:=.*/GCC=$(tc-getCC) ${CFLAGS}/" \
-		-e "s/GPP:=.*/GPP=$(tc-getCXX) ${CXXFLAGS}/" \
-		-e 's/--export-dynamic/-Wl,--export-dynamic/g' \
-		"${S}/Makefile" || die
-	cp config.makefile.template config.makefile
-	sed -i -e '/^[ \t]*read/ d' -e 's/SHELL_ANS=0/SHELL_ANS=1/' "${S}/arb_install.sh" || die
-	use amd64 && sed -i -e 's/ARB_64 := 0/ARB_64 := 1/' config.makefile
-	use opengl || sed -i -e 's/OPENGL := 1/OPENGL := 0/' config.makefile
-	emake ARBHOME="${S}" links || die
-}
-
-src_compile() {
-	emake ARBHOME="${S}" PATH="${PATH}:${S}/bin" LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${S}/lib" tarfile || die
-	use amd64 && mv arb.tgz arb.64.gentoo.tgz
-	use x86 && mv arb.tgz arb.32.gentoo.tgz
-	ln -s arb.*.tgz arb.tgz || die
-}
-
-src_install() {
-	ARBHOME="${D}/opt/arb" "${S}/arb_install.sh" || die
-	cat <<- EOF > "${S}/99${PN}"
-	ARBHOME=/opt/arb
-	PATH=/opt/arb/bin
-	LD_LIBRARY_PATH=/opt/arb/lib
-	EOF
-	doenvd "${S}/99${PN}" || die
-}
diff --git a/sci-biology/arb/arb-5.2.ebuild b/sci-biology/arb/arb-5.2.ebuild
deleted file mode 100644
index a7388bf9b816..000000000000
--- a/sci-biology/arb/arb-5.2.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Tools for DNA/RNA sequence database handling and phylogenetic analysis"
-HOMEPAGE="http://www.arb-home.de/"
-SRC_URI="
-	http://download.arb-home.de/release/arb_${PV}/arbsrc.tgz -> ${P}.tgz
-	https://dev.gentoo.org/~jlec/distfiles/${P}-linker.patch.bz2"
-
-SLOT="0"
-LICENSE="arb"
-IUSE="+opengl"
-KEYWORDS="~amd64 ~x86"
-
-CDEPEND="app-text/sablotron
-	media-libs/libpng
-	media-libs/tiff
-	www-client/lynx
-	x11-libs/libXaw
-	x11-libs/libXpm
-	x11-libs/motif:0
-	opengl? (
-		media-libs/glew
-		media-libs/freeglut
-		|| (
-			media-libs/mesa[motif]
-			( media-libs/mesa x11-libs/libGLw ) ) )"
-DEPEND="${CDEPEND}
-	sys-process/time"
-RDEPEND="${CDEPEND}
-	sci-visualization/gnuplot"
-# Recommended: libmotif3 gv xfig xterm treetool java
-
-src_unpack() {
-	unpack ${A}
-	mv arbsrc* ${P}
-}
-
-src_prepare() {
-	epatch \
-		"${WORKDIR}"/${P}-linker.patch \
-		"${FILESDIR}"/5.1-libs.patch \
-		"${FILESDIR}"/5.1-bfr-overflow.patch \
-		"${FILESDIR}"/${PV}-libpng15.patch \
-		"${FILESDIR}"/${P}-gcc-47.patch
-	sed \
-		-e 's/all: checks/all:/' \
-		-e "s/GCC:=.*/GCC=$(tc-getCC) ${CFLAGS}/" \
-		-e "s/GPP:=.*/GPP=$(tc-getCXX) ${CXXFLAGS}/" \
-		-e 's:-O4::g' \
-		-e 's:-pipe::g' \
-		-i "${S}/Makefile" || die
-	cp config.makefile.template config.makefile
-	sed -i -e '/^[ \t]*read/ d' -e 's/SHELL_ANS=0/SHELL_ANS=1/' "${S}/arb_install.sh" || die
-	use amd64 && sed -i -e 's/ARB_64 := 0/ARB_64 := 1/' config.makefile
-	use opengl || sed -i -e 's/OPENGL := 1/OPENGL := 0/' config.makefile
-	emake ARBHOME="${S}" links
-}
-
-src_compile() {
-	emake ARBHOME="${S}" PATH="${PATH}:${S}/bin" LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${S}/lib" tarfile
-	use amd64 && mv arb.tgz arb.64.gentoo.tgz
-	use x86 && mv arb.tgz arb.32.gentoo.tgz
-	ln -s arb.*.tgz arb.tgz || die
-}
-
-src_install() {
-	ARBHOME="${D}/opt/arb" "${S}/arb_install.sh" || die
-	cat <<- EOF > "${S}/99${PN}"
-	ARBHOME=/opt/arb
-	PATH=/opt/arb/bin
-	LD_LIBRARY_PATH=/opt/arb/lib
-	EOF
-	doenvd "${S}/99${PN}"
-}
diff --git a/sci-biology/arb/arb-5.3.ebuild b/sci-biology/arb/arb-5.3.ebuild
deleted file mode 100644
index 135bec2695ce..000000000000
--- a/sci-biology/arb/arb-5.3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Tools for DNA/RNA sequence database handling and phylogenetic analysis"
-HOMEPAGE="http://www.arb-home.de/"
-SRC_URI="
-	http://download.arb-home.de/release/arb_${PV}/arbsrc.tgz -> ${P}.tgz
-	https://dev.gentoo.org/~jlec/distfiles/${P}-linker.patch.xz"
-
-SLOT="0"
-LICENSE="arb"
-IUSE="+opengl"
-KEYWORDS="~amd64 ~x86"
-
-CDEPEND="app-text/sablotron
-	media-libs/libpng
-	media-libs/tiff
-	www-client/lynx
-	x11-libs/libXaw
-	x11-libs/libXpm
-	x11-libs/motif:0
-	opengl? (
-		media-libs/glew
-		media-libs/freeglut
-		|| (
-			media-libs/mesa[motif]
-			( media-libs/mesa x11-libs/libGLw ) ) )"
-DEPEND="${CDEPEND}
-	sys-process/time"
-RDEPEND="${CDEPEND}
-	sci-visualization/gnuplot"
-# Recommended: libmotif3 gv xfig xterm treetool java
-
-src_unpack() {
-	unpack ${A}
-	mv arbsrc* ${P}
-}
-
-src_prepare() {
-	epatch \
-		"${WORKDIR}"/${P}-linker.patch \
-		"${FILESDIR}"/5.1-libs.patch \
-		"${FILESDIR}"/5.1-bfr-overflow.patch \
-		"${FILESDIR}"/5.2-libpng15.patch \
-		"${FILESDIR}"/${PN}-5.2-gcc-47.patch
-	sed \
-		-e 's/all: checks/all:/' \
-		-e "s/GCC:=.*/GCC=$(tc-getCC) ${CFLAGS}/" \
-		-e "s/GPP:=.*/GPP=$(tc-getCXX) ${CXXFLAGS}/" \
-		-i "${S}/Makefile" || die
-	cp config.makefile.template config.makefile
-	sed -i -e '/^[ \t]*read/ d' -e 's/SHELL_ANS=0/SHELL_ANS=1/' "${S}/arb_install.sh" || die
-	use amd64 && sed -i -e 's/ARB_64 := 0/ARB_64 := 1/' config.makefile
-	use opengl || sed -i -e 's/OPENGL := 1/OPENGL := 0/' config.makefile
-	emake ARBHOME="${S}" links
-}
-
-src_compile() {
-	emake ARBHOME="${S}" PATH="${PATH}:${S}/bin" LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${S}/lib" tarfile
-	use amd64 && mv arb.tgz arb.64.gentoo.tgz
-	use x86 && mv arb.tgz arb.32.gentoo.tgz
-	ln -s arb.*.tgz arb.tgz || die
-}
-
-src_install() {
-	ARBHOME="${D}/opt/arb" "${S}/arb_install.sh" || die
-	cat <<- EOF > "${S}/99${PN}"
-	ARBHOME=/opt/arb
-	PATH=/opt/arb/bin
-	LD_LIBRARY_PATH=/opt/arb/lib
-	EOF
-	doenvd "${S}/99${PN}"
-}
diff --git a/sci-biology/arb/files/5.1-bfr-overflow.patch b/sci-biology/arb/files/5.1-bfr-overflow.patch
deleted file mode 100644
index 21d21f5ac17f..000000000000
--- a/sci-biology/arb/files/5.1-bfr-overflow.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- ARB_GDE/GDE_HGLfile.cxx |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/ARB_GDE/GDE_HGLfile.cxx b/ARB_GDE/GDE_HGLfile.cxx
-index e353a89..f69635a 100644
---- a/ARB_GDE/GDE_HGLfile.cxx
-+++ b/ARB_GDE/GDE_HGLfile.cxx
-@@ -494,7 +494,7 @@ void ReadGDE(char *filename,NA_Alignment *dataset,int type)
-             if(this_elem->id[0] == '\0')
-                 strncpy(this_elem->id,uniqueID(),79);
-             if(this_elem->short_name[0] == '\0')
--                strncpy(this_elem->short_name,this_elem->id,79);
-+                strncpy(this_elem->short_name,this_elem->id,31);
-             if(this_elem->seqlen == 0)
-                 this_elem->protect=
-                     PROT_BASE_CHANGES+
diff --git a/sci-biology/arb/files/5.1-libs.patch b/sci-biology/arb/files/5.1-libs.patch
deleted file mode 100644
index bf0bacad3286..000000000000
--- a/sci-biology/arb/files/5.1-libs.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/SOURCE_TOOLS/provide_libs.pl b/SOURCE_TOOLS/provide_libs.pl
-index b653a66..b346c96 100644
---- a/SOURCE_TOOLS/provide_libs.pl
-+++ b/SOURCE_TOOLS/provide_libs.pl
-@@ -118,11 +118,6 @@ sub provide_libs($$$) {
-   foreach my $lib (keys %needed_by) {
-     update_lib($lib, $bindir.'/'.$needed_by{$lib}, $addlibsdir);
-   }
--  if ($opengl==1) {
--    foreach my $lib (keys %needed_by_opengl) {
--      update_lib($lib, $bindir.'/'.$needed_by_opengl{$lib}, $addlibsdir);
--    }
--  }
- }
- 
- sub main() {
diff --git a/sci-biology/arb/files/5.2-libpng15.patch b/sci-biology/arb/files/5.2-libpng15.patch
deleted file mode 100644
index 3d750e76efe3..000000000000
--- a/sci-biology/arb/files/5.2-libpng15.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Fix building with libpng-1.5
-
-https://bugs.gentoo.org/show_bug.cgi?id=378353
-
-Patch written by Samuli Suominen <ssuominen@gentoo.org>
---- a/GL/glpng/glpng.c
-+++ b/GL/glpng/glpng.c
-@@ -285,7 +285,7 @@
-     endinfo = png_create_info_struct(png);
- 
-     // DH: added following lines
--    if (setjmp(png->jmpbuf))
-+    if (setjmp(png_jmpbuf(png)))
-     {
-         png_destroy_read_struct(&png, &info, &endinfo);
-         return 0;
-@@ -390,7 +390,7 @@
-     endinfo = png_create_info_struct(png);
- 
-     // DH: added following lines
--    if (setjmp(png->jmpbuf))
-+    if (setjmp(png_jmpbuf(png)))
-     {
-         png_destroy_read_struct(&png, &info, &endinfo);
-         return 0;
-@@ -569,7 +569,7 @@
- #define ALPHA *q
- 
-                 switch (trans) {
--                    case PNG_CALLBACK:
-+                    case PNG_CALLBACKT:
-                         FORSTART
-                             ALPHA = AlphaCallback((unsigned char) r, (unsigned char) g, (unsigned char) b);
-                         FOREND
---- a/GL/glpng/glpng.h
-+++ b/GL/glpng/glpng.h
-@@ -57,7 +57,7 @@
- #define PNG_SIMPLEMIPMAP PNG_SIMPLEMIPMAPS
- 
-     /* Transparency parameters */
--#define PNG_CALLBACK  -3 /* Call the callback function to generate alpha   */
-+#define PNG_CALLBACKT  -3 /* Call the callback function to generate alpha   */
- #define PNG_ALPHA     -2 /* Use alpha channel in PNG file, if there is one */
- #define PNG_SOLID     -1 /* No transparency                                */
- #define PNG_STENCIL    0 /* Sets alpha to 0 for r=g=b=0, 1 otherwise       */
diff --git a/sci-biology/arb/files/arb-5.2-gcc-47.patch b/sci-biology/arb/files/arb-5.2-gcc-47.patch
deleted file mode 100644
index 186e78e450b3..000000000000
--- a/sci-biology/arb/files/arb-5.2-gcc-47.patch
+++ /dev/null
@@ -1,15 +0,0 @@
- AWTI/AWTI_import.cxx |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/AWTI/AWTI_import.cxx b/AWTI/AWTI_import.cxx
-index 8e730ac..e3f9ff4 100644
---- a/AWTI/AWTI_import.cxx
-+++ b/AWTI/AWTI_import.cxx
-@@ -12,6 +12,7 @@
- #include <GEN.hxx>
- 
- #include <climits>
-+#include <unistd.h>
- 
- using namespace std;
- 
diff --git a/sci-biology/fasta/Manifest b/sci-biology/fasta/Manifest
index e674eb25c94b..90848bfe1f68 100644
--- a/sci-biology/fasta/Manifest
+++ b/sci-biology/fasta/Manifest
@@ -1,7 +1,4 @@
-AUX 35.4.10-ldflags.patch 1036 BLAKE2B 5e614e62a99f4ba5808ad33a082c4eb1fb4feb1b7031f69e42a833fdff05c91cf1197a8a838eb347f2c31c59c68536fbae9dad07293d3bd80bdde8f6263a90a5 SHA512 8136536c7f9887920a045dbcd04fa9d01dc0a3b22ed0a1771df715e288d6c889d87b0a6d0f52c947b54185f6a5e92fe902316b502074200a13820cac9dfa6594
 AUX fasta-36.3.5e-ldflags.patch 2781 BLAKE2B e6d4e0984b4dadfc9d38504ab215d769084edc6c79cfe641b6b3fba8264a40add1665027295ec4afa19d26277036bfe1a5103ecdf72ef91a1139542ac8272954 SHA512 5424bb8385def72ff75701c2da153f697520cbec82f36cbed8de0e98f93d399de660e79da7700ab0ff688fd5388cf9f42a30ccc4359335ae02042bf8cbb3aae7
-DIST fasta-35.4.10.tar.gz 618971 BLAKE2B cbc413c13f7d5151add9886eb0fbe1d55d9b1847f406ff8fe614e729c6c3ab155711b6c38a2085eabd3f27506562a98ca8d9f1409525f27fe091b30f3a1e840d SHA512 f04268f0eea59cd40985c86597ab68bef40ee28e6ca914a7182c0edfe943ec8fb2a860558f422f210a4c03f3c34f36c677bd3971bc240cb87695826c755f5a47
 DIST fasta-36.3.5e.tar.gz 943763 BLAKE2B 6234d0aee76af6614e6d25ebcfbdfae080db5bc5adf611aeb6edc53ed7c6cb6cef257bf852ed39bc286527cec4175c251765ce23ea5ff39d12ff8947dba97ac6 SHA512 ddfcae36dadd7e2ed5c8c8c0bda2eed077e9f6cd55e4ebf507690671af156358e9da4e7cb1406d2b8713c326c54a9d829fc25e668b16dfa6df48d18e3a009812
-EBUILD fasta-35.4.10.ebuild 1352 BLAKE2B df91cc22840301e1c0182ce7deb116ddeb468074050e9ce84f1e80ac1456de323aedc54d671616fa789eba71da321be86c58fa8007e0a205a0c6d8f83c17eb35 SHA512 eba62f3358ef8553e61be08759202b941df00d7862901899cafe5fe4d76d1dcd8dcb25d0410720393db8263e3b9bfd5d9c627ca09b726c1a66b14a4200fc60fa
 EBUILD fasta-36.3.5e.ebuild 1625 BLAKE2B 20dd1cc003b8ae7a1cabbbcfa06f6968d6486f86751d08d791dca74e4365358f456f88a398b98e65a4bfa85d7220c6e64e91998d57c2b0c4d422c7d3533cb20d SHA512 618aa434a8271332dc1042c731d6f19d99f08eb90cc156af3b855d8df9664d5efa62a40a043c031205a03e768cf8251d246e4e7b14d7ca14deb47678399e5797
 MISC metadata.xml 267 BLAKE2B 7cf386952842945148119de3263231db4d1046d5f54811f7e303ed8ec4d27cbc1960b99c92daf6f32e5b981c2fb9f50ec666be6193865d6e18541b7427a152a9 SHA512 91ab266d9ab24401bc0fec759c5b6cfcf44a3c5669fc31c7301d79770839bb5dfa0e155d949392ef06176b4a0b2c32b91b1b54b0027f972db61f0a5e54644403
diff --git a/sci-biology/fasta/fasta-35.4.10.ebuild b/sci-biology/fasta/fasta-35.4.10.ebuild
deleted file mode 100644
index 8cad4d2a8b08..000000000000
--- a/sci-biology/fasta/fasta-35.4.10.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="FASTA is a DNA and Protein sequence alignment software package"
-HOMEPAGE="http://fasta.bioch.virginia.edu/fasta_www2/fasta_down.shtml"
-SRC_URI="http://faculty.virginia.edu/wrpearson/${PN}/${PN}3/${P}.tar.gz"
-
-LICENSE="fasta"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="debug cpu_flags_x86_sse2 test"
-
-DEPEND="test? ( app-shells/tcsh )"
-RDEPEND=""
-
-src_prepare() {
-	CC_ALT=
-	CFLAGS_ALT=
-	ALT=
-
-	use debug && append-flags -DDEBUG
-
-	if [[ $(tc-getCC) == *icc* ]]; then
-		CC_ALT=icc
-		ALT="${ALT}_icc"
-	else
-		CC_ALT=$(tc-getCC)
-		use x86 && ALT="32"
-		use amd64 && ALT="64"
-	fi
-
-	if use cpu_flags_x86_sse2 ; then
-		ALT="${ALT}_sse2"
-		append-flags -msse2
-		[[ $(tc-getCC) == *icc* ]] || append-flags -ffast-math
-	fi
-
-	export CC_ALT="${CC_ALT}"
-	export ALT="${ALT}"
-
-	epatch "${FILESDIR}"/${PV}-ldflags.patch
-}
-
-src_compile() {
-	cd src
-	emake -f ../make/Makefile.linux${ALT} CC="${CC_ALT} ${CFLAGS}" HFLAGS="${LDFLAGS} -o" all || die
-}
-
-src_install() {
-	dobin bin/* || die
-	doman doc/{prss3.1,fasta35.1,pvcomp.1,fasts3.1,fastf3.1,ps_lav.1,map_db.1} || die
-	dodoc  FASTA_LIST README doc/{README.versions,readme*,fasta*,changes*} || die
-}
diff --git a/sci-biology/fasta/files/35.4.10-ldflags.patch b/sci-biology/fasta/files/35.4.10-ldflags.patch
deleted file mode 100644
index c3b7a9b56904..000000000000
--- a/sci-biology/fasta/files/35.4.10-ldflags.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/make/Makefile.pcom b/make/Makefile.pcom
-index a808667..405be95 100644
---- a/make/Makefile.pcom
-+++ b/make/Makefile.pcom
-@@ -274,16 +274,16 @@ print_pssm : print_pssm.c getseq.c karlin.c apam.c
- 	$(CC) -o print_pssm $(CFLAGS) print_pssm.c getseq.c karlin.c apam.c $(LIB_M)
- 
- map_db : map_db.c uascii.h ncbl2_head.h
--	$(CC) $(CFLAGS) -o $(BIN)/map_db map_db.c
-+	$(CC) $(CFLAGS) $(HFLAGS) $(BIN)/map_db map_db.c
- 
- list_db : list_db.c
--	$(CC) $(CFLAGS) -o $(BIN)/list_db list_db.c
-+	$(CC) $(CFLAGS) $(HFLAGS) $(BIN)/list_db list_db.c
- 
- lav2ps : lav2plt.o lavplt_ps.o
--	$(CC) -DUNIX -o $(BIN)/lav2ps lav2plt.o lavplt_ps.o -lm
-+	$(CC) -DUNIX $(HFLAGS) $(BIN)/lav2ps lav2plt.o lavplt_ps.o -lm
- 
- lav2svg : lav2plt.o lavplt_svg.o
--	$(CC) -DUNIX -o $(BIN)/lav2svg  lav2plt.o lavplt_svg.o -lm
-+	$(CC) -DUNIX $(HFLAGS) $(BIN)/lav2svg  lav2plt.o lavplt_svg.o -lm
- 
- res_stats : res_stats.o scale_se.o
--	$(CC) -DUNIX -o $(BIN)/res_stats res_stats.o scale_se.o -lm
-+	$(CC) -DUNIX $(HFLAGS) $(BIN)/res_stats res_stats.o scale_se.o -lm
diff --git a/sci-biology/iedera/Manifest b/sci-biology/iedera/Manifest
index dbe92804902a..a9c9e79f4c5a 100644
--- a/sci-biology/iedera/Manifest
+++ b/sci-biology/iedera/Manifest
@@ -1,6 +1,4 @@
 AUX iedera-1.05-fix-buildsystem.patch 385 BLAKE2B ee7ccb9bd08a8be617e0165a4ee6c6f899ef03e297a9839bfa1982960f0e2f132fb8a444d1bdb74c12b55a66068577dd7be127311b71d21b599a4cabe0b3c79e SHA512 7f20d78fce1ab3a9d30290675a6893a73e2935a8842e8ac8a3d4268a0ccd2a3f165ac0201b6bb13978621230f0042460e704f706d6b3e3ee9457d6a4b6417741
-DIST iedera-1.04.tar.gz 123847 BLAKE2B dfb2206fcc5c0703bf6e4f6ea1e44f7fd5a83a00255fa21038fb4a6c0d565fe073c388bbc47abf52034adc1efc76ca9f9b68dd79f8a077392f8b7c7f551ae959 SHA512 7dcbc078d7c7f84c12736573bf5708ef1aaeefcd52af24ed379535069cfb498c17dd166dc84504db7edc19ab628f0af43d0f2744e37b5565234820631784e126
 DIST iedera-1.05.tar.gz 129163 BLAKE2B fe499276da7571be83b847ab98bbe4878470b07fb13ee80ffb55bff1b5674b54fd4bf5e21fa34e10b8296d9c6aad298dbde79910cfa45670ea8afe047de1a979 SHA512 60d35227d5479fea693e8a3c0e629aae9e21f3c7e2be7b2f10aaddcade70cc6525fa18dea1851f73d6c1aadbb5e8776dd4a146b1a81ecfe8c910729a2300066f
-EBUILD iedera-1.04.ebuild 433 BLAKE2B e19da37eb4e19e02c1381023c7da16c2e5bbd140bfbcabc214825e0eaddd48dd8a4d6959ec0f9d3ccb6b1f8dd3cc6d73fcb64725a40c2a010407d1454286ad14 SHA512 c21467718e39ab4599dbe3ee12aa14f3a4ad012084292d0dca191083ce4de26d1e4f61a3902d71377cd76de170a1302a38d54c5354417fb3d78d9afa63163c70
 EBUILD iedera-1.05-r1.ebuild 490 BLAKE2B a343877f79ccc0678765b4548add19e02aa13aa8d434933e7f0218896e838c25ca668d47ab5d9fe3966eaf995f05857b8ab7b4a28bdf568fda0cef917bfd6aa1 SHA512 2d30e9a6a88e085fc1acad0d5b56eb3bf590f26208b56dc195dec84bf7c946cc5d9ae0d36c147b43b812f16c71ddccdb11db28e2c1263ee46be6dd5659ef8754
 MISC metadata.xml 267 BLAKE2B 7cf386952842945148119de3263231db4d1046d5f54811f7e303ed8ec4d27cbc1960b99c92daf6f32e5b981c2fb9f50ec666be6193865d6e18541b7427a152a9 SHA512 91ab266d9ab24401bc0fec759c5b6cfcf44a3c5669fc31c7301d79770839bb5dfa0e155d949392ef06176b4a0b2c32b91b1b54b0027f972db61f0a5e54644403
diff --git a/sci-biology/iedera/iedera-1.04.ebuild b/sci-biology/iedera/iedera-1.04.ebuild
deleted file mode 100644
index 6be6fa802c94..000000000000
--- a/sci-biology/iedera/iedera-1.04.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-DESCRIPTION="A subset seed design tool for DNA sequence alignment"
-HOMEPAGE="http://bioinfo.lifl.fr/yass/iedera.php"
-SRC_URI="http://bioinfo.lifl.fr/yass/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=""
-RDEPEND=""
-
-src_install() {
-	einstall || die
-	dodoc AUTHORS README NEWS
-}
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index 58bb1b96c717..b17eb363303b 100644
Binary files a/sci-electronics/Manifest.gz and b/sci-electronics/Manifest.gz differ
diff --git a/sci-electronics/ngspice/Manifest b/sci-electronics/ngspice/Manifest
index 2b54fe7111ac..c55e46682fc3 100644
--- a/sci-electronics/ngspice/Manifest
+++ b/sci-electronics/ngspice/Manifest
@@ -1,13 +1,9 @@
-AUX ngspice-26-respect-ldflags.patch 728 BLAKE2B 7646de91df0a49ab6f5dc6fe58ed5f4044d80a8e5730dddc249dd5c4fb45aff5bf6b8c9bd249edf6bf9bcd16d501334c5116fceea6d181befc846c084d0521aa SHA512 8183ec06e05d9fc22322e8ddef96b72f83681344abf1d9d150fc2058bf906b0eebb83e97c7f39cd74afe316a49ad7a779a3f61f6cd3a79ca967ce037c84bcb98
 AUX ngspice-27-autoconf_fftw3.patch 959 BLAKE2B bfc7e1eefd9ea591fee57e8e06dae4eddd5e677a6ffe493a274ad1c1ef9a580f05eda805252b837ce95df8bdf083e43beecb864118eee383d70a79fbaec8c0e7 SHA512 880269c6d3f5b1cb8fe7518df4763b5202923cc216481380ff3f4f3e519c181e3027d6310061df58ffac644aaf7255b768e184960c01fe1dd6afbd9ea7c31eec
 AUX ngspice-27-blt_linkage_workaround.patch 305 BLAKE2B d31977f4acbaf9d0f015cb34adf3b27733307ea98dc3c5a0206605546d62b4b207f19f277131bb6f351842e36de3e4df583c6c450d70d9ffee87e160a818ee8d SHA512 2eab1af989d1729d900f75505be0ddad9302705eb10a2aec6966a3abf9446cca66f42972770e2e24a085702bab49976fefa2868f06ffb5651c9197d13dc0bf2a
 AUX ngspice-27-fix_parsing_tcl_commands.patch 448 BLAKE2B d5d3532bca4301aa4c281173cbdf23d33ea61869ea6731d1ebf782e2bca5945a407ae1e566258564d1ab899330b5b7a85fa8c1b2fc79b2214dbf29a2a2c1e5b2 SHA512 ba82cf454d14fbfeb38a4b0942d1e947ca76a54976aec8fcac08913f8a08f12878593bb067ba469ea9a6c818ea6ea372119c500be1841058b840d9928dcf54ad
 AUX ngspice-27-split_terminfo.patch 1081 BLAKE2B 8e44c6fe8447b419986206cc658a255e3c574d81cbbb3079d00f08046978f7a08c8c3e9697fdbf009aa1840df60d0045bd6712351280977cf8e66e3d2d505ab2 SHA512 2e5b7f83045304fbc5b35a9c7aeff3ed343b27d830e4d69bf5b30c631f59965241116afc5d062f3fb16b20710e42897605fc614fecb01997a92c595c47510f66
-DIST ngspice-26-manual.pdf 2141771 BLAKE2B 16956c46640de4696f7197997b170a2b1aad9b2f9fbe299b801de100d8aaca949b5be6f259e353a168ae90d992d91ff65e8a819b49fdf509fae98ec7dfa610d7 SHA512 1c160aeef61d8091a6d788677bcf7ea682393cc886d5d535f87bb800cdae4f095cbf1e833babadea481956b904b4bdb688cc18b80d9d6a29cab33a54275abab1
-DIST ngspice-26.tar.gz 6925987 BLAKE2B 8f8e54000234ea3896a55863df99b6ce83ad322e3049845e0a817635ebfebdc8398e6fa4831727c4798a8d9dce1b1c2a01354505e48dc0b2db9e9036aa2ae5aa SHA512 eb6a81df90de803c9f7544e8d0de7cc413aac169f69d1dec5cc6d2e667b66d42aede7f14c75bcdd10288be0c2ac07863fd4028b9fe59f2f515d680c2ffa41cab
 DIST ngspice-27-manual.pdf 3117788 BLAKE2B 6e271abc50b0139c4776844ea31176d231e68c70ce34d0daec48aefc5ef5a9eac90a77f3141081f38c6ac8d42bb95ec061bf1d43bfd3a4fb13e4822c2eff4f57 SHA512 ed87764715917e2cd832c49e911a2908dba9907f9f01c933cb7f97a92c7f9ff345bc26a2f0561dd34b2eede6874b6a67b4864abf3dcff127bd0306e778e997b5
 DIST ngspice-27.tar.gz 7372998 BLAKE2B ce8590518fa4eb4292c73c4eaefdd9d0da19bca8120b51daae954a5b9d86f51912d2dccb5a827480caadce8321373d96f045226db4986a78bcc9170f2e46f9a5 SHA512 1714f95ab5716c228a0b39395a742e8b9a823e0e6f7e08625d089541ea786df5fd7b9d2982bcec8431e27ac6ba7603ecc507f9cfcb0a6aacd53f5633f52bd2ea
-EBUILD ngspice-26.ebuild 2548 BLAKE2B 533c7db0e236b11332e1f2b572d14b745daa5ce655ad000ad5ef2b5c7cb1248b46f8ad929c8de29de04b5891e4ce15f1361add1f0ff340a8b8db826e1d2b46cd SHA512 89d650f33921f5eba3faede8ae79c5f914e7b1e4d3c192e0bd824ee32ca54c6a0a587a30937bb3c56f1e369fbd8a387f61d381f9fb7e1b3fb9ac05e2ae67f18b
 EBUILD ngspice-27-r1.ebuild 4283 BLAKE2B 67439d2b41e5feee5df3a403c3272770369f071ee119f14a55b3e933ec9c56330f5b7f56bacf41adf831bebfa0b29c9cc07168a95b9c122e66cc00922b5850d0 SHA512 9c7827ef53f3334ebc531bf2163f060b8c9c9ec7ac5661e1b4864523ed6995f5a611c39906482d9c706edba780290f9135dc737ebf53953825413f71c40cda45
 EBUILD ngspice-27.ebuild 1828 BLAKE2B f7e886b443f1d58cce69434a5dd9dd87cbd67cd0d6432b99a7efd857f4f7feb36cec3f56502550227785cbffd51f11b819394d247fd4b45c7ed0862f1e5739c1 SHA512 e2fc30a6ce6ef0ecc83444f4e3a305826bdb7c3591984382e0f1cfd9469d5caf0771d4aacd8c8e0e35fff6eb06e3577c13e655692cf610c30586e02558b2292f
 MISC metadata.xml 613 BLAKE2B 658a1ccd1c1149c4b3626b482b1c80845502b80d0cd9316117f433edc4d2e5106ac92b97c3bebc23c43a82247592cc85068b08eea3caa859f976548f2a890a73 SHA512 791dc0311699db360c5e013f33786fb546119010cb8bbc36fc91ac6a522f1642f4297d8ffb945291ee20ce337647777d06e463083ac6ca0888d36ff0e1a71dcc
diff --git a/sci-electronics/ngspice/files/ngspice-26-respect-ldflags.patch b/sci-electronics/ngspice/files/ngspice-26-respect-ldflags.patch
deleted file mode 100644
index 31fe300b105f..000000000000
--- a/sci-electronics/ngspice/files/ngspice-26-respect-ldflags.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- ngspice-26/src/xspice/icm/makedefs.in
-+++ ngspice-26/src/xspice/icm/makedefs.in
-@@ -44,16 +44,19 @@
- LIBS = -lm
- 
- # Flags to use when linking shared library
--LDFLAGS = -shared
- ifeq ($(ISMINGW), 1)
--  LDFLAGS = -shared @LDFLAGS@
--endif
--ifeq "$(strip $(uname))" "Darwin"
--  LDFLAGS = -bundle -flat_namespace -undefined suppress
--endif
--ifeq "$(strip $(uname))" "SunOS"
--  ifneq "$(CC)" "gcc"
--    LDFLAGS = -G
-+  LDFLAGS += -shared @LDFLAGS@
-+else
-+  ifeq "$(strip $(uname))" "Darwin"
-+    LDFLAGS += -bundle -flat_namespace -undefined suppress
-+  else
-+    ifeq "$(strip $(uname))" "SunOS"
-+      ifneq "$(CC)" "gcc"
-+        LDFLAGS += -G
-+      else
-+        LDFLAGS += -shared
-+      endif
-+    endif
-   endif
- endif
- 
diff --git a/sci-electronics/ngspice/ngspice-26.ebuild b/sci-electronics/ngspice/ngspice-26.ebuild
deleted file mode 100644
index 3c185422f418..000000000000
--- a/sci-electronics/ngspice/ngspice-26.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-
-inherit autotools eutils
-
-DESCRIPTION="The Next Generation Spice (Electronic Circuit Simulator)"
-SRC_URI="mirror://sourceforge/ngspice/${P}.tar.gz
-	mirror://sourceforge/ngspice/${PN}-${PV}-manual.pdf"
-HOMEPAGE="http://ngspice.sourceforge.net"
-LICENSE="BSD GPL-2"
-
-SLOT="0"
-IUSE="X debug readline"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x64-macos"
-
-DEPEND="sys-libs/ncurses
-	readline? ( >=sys-libs/readline-5.0 )
-	X? ( x11-libs/libXaw
-		x11-libs/libXt
-		x11-libs/libX11
-		sci-visualization/xgraph )"
-
-RDEPEND="$DEPEND"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-respect-ldflags.patch
-	sed -e '/CFLAGS=/s: -s::' -i configure.ac || die "sed failed"
-	sed -e 's/_CFLAGS -O2/_CFLAGS/' -i configure.ac || die "sed failed"
-	sed -e '/AM_INIT_AUTOMAKE/s:-Werror::' -i configure.ac || die "sed failed"
-	# builds also with ncurses[tinfo] (bug #458128)
-	sed -e 's/ncurses termcap/ncurses termcap tinfo/g' -i configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	local MYCONF
-	if use debug ; then
-		MYCONF="--enable-debug \
-			--enable-ftedebug \
-			--enable-cpdebug \
-			--enable-asdebug \
-			--enable-stepdebug \
-			--enable-pzdebug"
-	else
-		MYCONF="--disable-debug \
-			--disable-ftedebug \
-			--disable-cpdebug \
-			--disable-asdebug \
-			--disable-stepdebug \
-			--disable-pzdebug"
-	fi
-	# Those don't compile
-	MYCONF="${MYCONF} \
-		--disable-sensdebug \
-		--disable-blktmsdebug \
-		--disable-smltmsdebug"
-
-	econf \
-		${MYCONF} \
-		--enable-xspice \
-		--enable-cider \
-		--enable-ndev \
-		--disable-xgraph \
-		--disable-dependency-tracking \
-		--disable-rpath \
-		$(use_with X x) \
-		$(use_with readline)
-}
-
-# These will need to be looked at some day:
-# --enable-adms
-# --enable-nodelimiting
-# --enable-predictor
-# --enable-newtrunc
-# --enable-openmp
-
-src_install () {
-	local infoFile
-	for infoFile in doc/ngspice.info*; do
-		echo 'INFO-DIR-SECTION EDA' >> ${infoFile}
-		echo 'START-INFO-DIR-ENTRY' >> ${infoFile}
-		echo '* NGSPICE: (ngspice). Electronic Circuit Simulator.' >> ${infoFile}
-		echo 'END-INFO-DIR-ENTRY' >> ${infoFile}
-	done
-
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc ANALYSES AUTHORS BUGS ChangeLog DEVICES NEWS \
-		README Stuarts_Poly_Notes || die "failed to install documentation"
-
-	insinto /usr/share/doc/${PF}
-	doins "${DISTDIR}"/${PN}-${PV}-manual.pdf || die "failed to install manual"
-
-	# We don't need ngmakeidx to be installed
-	rm "${D}"/usr/bin/ngmakeidx
-}
-
-src_test () {
-	# Bug 108405
-	true
-}
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 419123b350c4..171f1fee71c1 100644
Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ
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
Binary files a/sci-misc/Manifest.gz and b/sci-misc/Manifest.gz differ
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 9fb13ba9a77a..2cf5152f2866 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/darwin-miscutils/Manifest b/sys-apps/darwin-miscutils/Manifest
index 53628204daf2..a5007e3e9777 100644
--- a/sys-apps/darwin-miscutils/Manifest
+++ b/sys-apps/darwin-miscutils/Manifest
@@ -2,6 +2,7 @@ AUX darwin-miscutils-5-error.patch 269 BLAKE2B 6bd32d601bbb365bbaa31f41aad8301e9
 AUX darwin-miscutils-5-stdlib.patch 540 BLAKE2B 94948893634901595e2798c0fb44ac2ae05ee610942f08a78ec08024fed61238f220cc6868422ac2663fe6e0afee665d66fc2ad31959e3c53a87cd9d43f0aa6a SHA512 b9ec8b65cc17da06a88fe7570be66682c8dadecd7af1ee6fe95b560340d9bf71516417338fef4ae99fca22069773f5baba499723e78d2b73f5eb5aa5e2eb7463
 AUX darwin-miscutils-5-w.patch 201 BLAKE2B 37af30361b416fa138dc1f2ec0fac35ef6e246a22375651cc84e67e4fd3d479d54ae7337ee93d73c960f2c7c2cc4cd9603271eeb8a502b91c157dca11b94114d SHA512 5fa14a48c74d6b99b135b3c1c8135756a15f3bde9844f25408cabde9e752caee95e891fbb6ea71bdf428b68be0d41219dcaa660e8a936460fe8ab59fe44f7bc4
 AUX darwin-miscutils-6-w64.patch 584 BLAKE2B 00eeab82ac846718a03330bc2a6359e374967429598251c03fa4d952b4af6aa66e13f203f234e474c6d03c877a41264e47f6fbea1d2e51187eb630673293bdf9 SHA512 590b2af77934a66e1e41b2e22440038991ab258854b690d29527b84a06f0ffe1c19d5ff9022f024796c9cec84fefb80afc098749033dfd60ccda337f0059ce40
+DIST adv_cmds-md-147-compile.patch 5423 BLAKE2B f54aaaa8fcecb81fd8e628bcb384f537e572095b8210612c0748017f033e7bb6f9c5b1bd2c544fec23e8002a2ac7b99d840c85a8ca6faadac3b4da2edb77b459 SHA512 951e981b57e7d3d6ef51d638759559581dd4995ce66ec17bb2658f8a298683feb0842d10fd834b713ec39b2a0f671df56049b876d55f17bf1e988d76839fead1
 DIST adv_cmds-md-147.1 3623 BLAKE2B 18b856770f0490ef241e19cc6f1661f6521bcc7f363bff41fbec548388d8f1e2d9e6aea879064cd3d7e7d16f8e0b2ff17ead990051a068a66f520a5ff504afa3 SHA512 459beb2b7c92b8718c76d744bbabf631bf8c329feb65c9434ce8a023c73ceac2d207c95e39c4b90b095a4724a74096a3d1bed9122883eb54e5311dfc64ffc718
 DIST adv_cmds-md-147.c 25945 BLAKE2B 38af9e06e18a15cc74a81464a4c1ecdf98b800eb34f33f6ab6203b60540e693d459805432e51bae1008661aa566830c87357432428f62d8cbea9973b1e5fc59a SHA512 93e70f7d8697652b5a3c661975d21b51545d2eb07de64fd40524fcf0d5016dae9ae1dc63c4a85cb5ad455c8d1c246b7f5f2eac38226dcefbf4cab12b0b1c7592
 DIST developer_cmds-49.tar.gz 307753 BLAKE2B 774259d7b82efc85bf487111e5a3c4c0d4aa3f8a788463b503e4d108c684837327b97882114d3646dfba5f60a1a1a2671e0e574d92e159b5ea014fc9e2c61015 SHA512 3750374c891f6d681829986291d887cacf2c5b1c7a5de94f12c92ded0b3456157b85e57653c6061526d1f6626a7be8a9e6db9c1df09e2bb3e40c7fa20b9b4103
@@ -12,13 +13,16 @@ DIST misc_cmds-23.tar.gz 114747 BLAKE2B 9c4a1376555775a6999437e0712f62200d10be97
 DIST misc_cmds-27.tar.gz 116351 BLAKE2B 00aece4bc8679d9a7a1e114db65bca97e8f855ead64ee0672ac598c28069c56355f4a763fef0e56784ee9d2de9a081ef6f7e6d9390fc79cb0dec25dbe40ec881 SHA512 594560b179f7dafc651d3a336d33bcb7075f2199cf4964e95d63164faf19bd50ef3a6095124f0e4f91c50d1bceeb831fcd81ceecf740e2696a8e7445c1a690d2
 DIST misc_cmds-31.tar.gz 121187 BLAKE2B 3d12a13cbdc7c541b98596ab5ea675d27a0da93a913ee94945dc5b68b3238a85c3fd13472c3ead30219ae3317a6111ba8d22a6e702fe07f927318f5174870a70 SHA512 d49bb8a49c23aa7efaa7db1958676390b4d5ef1b2e57f80b0bea0f10b8b29a6c3ec6d2d7a1248d3af77d382c5113fb3cbf9d3632ca92bb51c01d8c286fd9f25f
 DIST misc_cmds-33.tar.gz 123114 BLAKE2B fb86518067b36de536503df521f1dc5e4f20fa1da74cfee4679dd728862b9ca4c1c272fd0ba39107d058f992acc04c2c98f3f44d6b2fc57386d3c458cfedd68f SHA512 34957adaebe4ce1569464a466e13aaaa6a567c582b784b99dd260c891a417d37a0297bf11acc9eb16dfabed18f42480058ae726e0a56b7d98ed93b59f75a5644
+DIST misc_cmds-34.tar.gz 124023 BLAKE2B 3c634ab540f4b1046e6abe05476a399ea00fd6d35d2d450f68cd7c3f52c8b9321039221659647b6623d5621af1789dba3798ec9f5cff8677653fbb3f295d1d1c SHA512 5e4040c49cc6aed8d4b471cc5d26d978717c9ad29315d40098090d0f7fee5a78289f2092fd6e8c7b7adea31b766cfefdef0da957b86ffb4e0781c13f4b5e4dbe
 DIST shell_cmds-118.tar.gz 162145 BLAKE2B 5f6a2264bcbd9322cb50e39ac6594f083f9d0c0ffa68d67fccc6e4979c59edfab617bb7ffefb4ef647111a1abc7b855a19a1f3b309ad50a6a1f92900305ece6d SHA512 efce064b76087451293a6992b7946fb0811856275796efa9e1e30459edf9eb0462929a1f0d28d189bf7e85fdde4d9e80b8637d042497b1e6e9216c8888d0d57b
 DIST shell_cmds-149.tar.gz 173740 BLAKE2B d1cc69f204925628f812acf0f69704c8c0f5b94ee9b3bd8898ec773657ee6c8a617f1666a9ce9e63898eff1cfbc915b7dfd7a91c51eebe642affa41c14f0f828 SHA512 e0f87db828c994bad73e4340f1957378ce5c84419172ed1d6b9d63809b90edfa447cce658e715565c5c2a7d2eaf0a9ee75e24fdb6d86080063621e0f83eb2a77
 DIST shell_cmds-162.tar.gz 179189 BLAKE2B 975728cbfe262072c9fcc3aee457d3814ceffbd4f3f87a25e5f30d3b581c4ce05c112b2e023e1c132bc836e337e9edf74f699dc3e6cb797be5b589a3cb5eed82 SHA512 784b6b8b3a90967d79f5a60a23e7f31f7bc92712dac9cdb625770f92b58bd6902669aa19bb59997cc654fcc0e27ddd45f60b1990e7da95d0e6c90fd7f2434f95
 DIST shell_cmds-170.tar.gz 212954 BLAKE2B a9616f7604bb73c0d88f8a065441c2f4769747d407458b3844e3e9126c224b42501bf546b1bc82ab6cdfc318861b43318a8a8877e7a054209cbbc7bdaaec0e24 SHA512 b267a9b5e922c9952451ca05e5f9e328504dc46b5776e1a8405f8e41a604d7f184d70742cb6fa6646875bc1789082097c74eabcc151ac5568ba26ed858269ce7
 DIST shell_cmds-198.tar.gz 411088 BLAKE2B 074efebfdc0fb408df54ce763018c74370049d7c977c912c69bc399f3b3551280f1ea76fbd7205ad54ce676422c642431e297f269cafd2ee5fcb4cd916c91548 SHA512 6e3a43f0cd9b1e3799d1ba79f4fcc4c3bb9be178c35cba2bef9227ecc259ca52c39b4d0e39c71d9af689e07f48dbeee6806bd623286f116f7d3ee3889dc7c71f
+DIST shell_cmds-203.tar.gz 428799 BLAKE2B 54103daa8a8758dd34a66f9c34a5fa4cad2e6a2dd36ff838498d82179566eb95c25c49126341ac481889381c2d39ebea3bf57959bb943536a7ba8a90fcf96f67 SHA512 ba9b00d6681d286e6210d49d70e1f526e86b0a76ed794050e9cdbdb8c0cc30dbe82ee9cd908578ddabb19c53c8994f1b84650f08bfeb88ea9f77d4de942c1cb1
 EBUILD darwin-miscutils-10.ebuild 4802 BLAKE2B c98b816e57a3376b955b2090f73659ec6bae7cb0e7545f1bc318905e1d87e7658d9e7a8257eb99cce4c8bedd7ce08d886f5cd488f0dba016b3089e6f49c95a73 SHA512 ee5c9e4938ae770bfb0610b2d5a31ee8d5c0cc3d5bf2f967bdd0ed8579baa0b12d0c99e5ac543ac23b07a7e5364b7eaac03a2b16984a9add99c15b72cf3c7175
 EBUILD darwin-miscutils-11.ebuild 4730 BLAKE2B a4f3910539a26c88bcb655cbefaac196ef331f4d3fa37d754c9c1f9c8c033a413ceee9ea40eb3f3809612e7ca50f1c975ed471e67b7ac805772abd9519871744 SHA512 c9e04da6422c370b04c8054ac2dcef573630a05d5ba21b39cab100f6dd30a43540fd03c9a3aff0e9aaac53fd1307b8130217925b8160c48527277c83e63e08ee
+EBUILD darwin-miscutils-12.ebuild 4329 BLAKE2B ff27b03f3e817f53e2c5bdadfa3b4c4442d1f62905df0938156e5403d0de1dc265597e4a20932caf58b2c872020fa58eff3b8aaae219b7a23e663780d751de59 SHA512 ff43d14c815f3a84a0ffe95ae2ca0b88d3df7bbeadceed151fe77047a44afab1fd835ebaeb4809ff6141eb9f87a8f15f1d783fc50e0600c9d85497677fa7869c
 EBUILD darwin-miscutils-6-r1.ebuild 4255 BLAKE2B d82c786adae41051e547df3cb8a3b0079a51fa07618b0c61b696e696ce4e6f5ec348f52cdc99538e392f33aebed0b88449c073459f7804bea2fbcfdc4dd94538 SHA512 5bec5032b942963bd5652283c5914e2a6f5e4655951ac90ec680a042cc37576b3a47df969f54d4b5276bc799e1c516298e8a605d64e83e485703305384f75151
 EBUILD darwin-miscutils-8.ebuild 4095 BLAKE2B 5fa06daf4a5d44c3b0dee694360bedfd87027d634c683396c4ed0b6d129f401bbc15369269d88c89a8d4a53797d17c240373d2f8aec834f51e28e92ad96f10cf SHA512 748ca7f62e8f4cfca2ff19668a590b63268628cbbd6299e490b220356c0c854987fcca0ceb3b65b2c1fbc545b07bc275c448ab87a1fb15c2cd591baf6f9d17f7
 EBUILD darwin-miscutils-9.ebuild 3955 BLAKE2B 9cc4d2b2279e02d08476b827e3fab4b55cfeaf1e505c43fe151b147c7b933228389255942b6d8eaeb5212aac90b51ee3a9c40b2adb6370af04da36690cf2c4a1 SHA512 de3a869b5880c39d82bfbcaf8b61591324ca10efd0be1e884933ba75b19d61a8670e23c5163389406a1a9c3b6db9b8ee0550a63394dd6c35c5c658295211c60c
diff --git a/sys-apps/darwin-miscutils/darwin-miscutils-12.ebuild b/sys-apps/darwin-miscutils/darwin-miscutils-12.ebuild
new file mode 100644
index 000000000000..96a868b3409d
--- /dev/null
+++ b/sys-apps/darwin-miscutils/darwin-miscutils-12.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs
+
+# from macOS 10.13
+MISC_VER=34
+SHELL_VER=203
+# from DT 8.2.1
+DEV_VER=63
+# from 10.7.4
+MD_VER=147 # adv_cmds-148 in 10.8 has no md, bug #428530
+
+DESCRIPTION="Miscellaneous commands used on macOS, High Sierra 10.13"
+HOMEPAGE="https://www.opensource.apple.com/"
+SRC_URI="https://opensource.apple.com/tarballs/misc_cmds/misc_cmds-${MISC_VER}.tar.gz
+	https://opensource.apple.com/tarballs/shell_cmds/shell_cmds-${SHELL_VER}.tar.gz
+	https://opensource.apple.com/tarballs/developer_cmds/developer_cmds-${DEV_VER}.tar.gz
+	https://opensource.apple.com/source/adv_cmds/adv_cmds-${MD_VER}/md/md.c -> adv_cmds-md-${MD_VER}.c
+	https://opensource.apple.com/source/adv_cmds/adv_cmds-${MD_VER}/md/md.1 -> adv_cmds-md-${MD_VER}.1
+	https://642666.bugs.gentoo.org/attachment.cgi?id=511988 -> adv_cmds-md-${MD_VER}-compile.patch"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
+IUSE=""
+
+# for ncal
+DEPEND="sys-libs/ncurses:="
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}
+
+src_prepare() {
+	cd "${S}"/shell_cmds-${SHELL_VER} || die
+	eapply "${FILESDIR}"/${PN}-6-w64.patch
+
+	mkdir -p "${S}"/adv_cmds-${MD_VER}/md || die
+	cd "${S}"/adv_cmds-${MD_VER} || die
+	cp "${DISTDIR}"/adv_cmds-md-${MD_VER}.c md/md.c || die
+	cp "${DISTDIR}"/adv_cmds-md-${MD_VER}.1 md/md.1 || die
+	eapply "${DISTDIR}"/adv_cmds-md-${MD_VER}-compile.patch
+
+	cd "${S}"
+	eapply_user
+}
+
+src_compile() {
+	local flags=(
+		${CFLAGS}
+		-I.
+		-D__FBSDID=__RCSID
+		-Du_int=uint32_t
+		-include stdint.h
+	)
+
+	v() {
+		echo "$*"
+		$@
+	}
+
+	local TS=${S}/misc_cmds-${MISC_VER}
+	# tsort is provided by coreutils
+	for t in leave units calendar; do
+		cd "${TS}/${t}"
+		echo "in ${TS}/${t}:"
+		v $(tc-getCC) ${flags[@]} -o ${t} ${LDFLAGS} *.c || die
+	done
+	# compile cal separately
+	cd "${TS}/ncal"
+	echo "in ${TS}/ncal:"
+	v $(tc-getCC) ${flags[@]} -c calendar.c || die
+	v $(tc-getCC) ${flags[@]} -c easter.c || die
+	v $(tc-getCC) ${flags[@]} -c ncal.c || die
+	v $(tc-getCC) -o cal ${LDFLAGS} -lncurses calendar.o easter.o ncal.o || die
+
+	TS=${S}/shell_cmds-${SHELL_VER}
+	# only pick those tools not provided by coreutils, findutils
+	for t in \
+		apply getopt hexdump hostname jot kill killall \
+		lastcomm renice script shlock time whereis;
+	do
+		echo "in ${TS}/${t}:"
+		cd "${TS}/${t}"
+		v $(tc-getCC) ${flags[@]} -o ${t} ${LDFLAGS} *.c || die
+	done
+	cd "${TS}/w"
+	sed -i -e '/#include <libutil.h>/d' w.c || die
+	echo "in ${TS}/w:"
+	v $(tc-getCC) ${flags[@]} -DHAVE_UTMPX=1 ${LDFLAGS} -lresolv -o w *.c || die
+
+	TS=${S}/developer_cmds-${DEV_VER}
+	# only pick those tools that do not conflict (no ctags and indent)
+	# do not install lorder, mkdep and vgrind as they are a non-prefix-aware
+	# shell scripts
+	# don't install rpcgen, as it is heavily related to the OS it runs
+	# on (and this is the High Sierra version)
+	for t in asa unifdef what ; do
+		echo "in ${TS}/${t}:"
+		cd "${TS}/${t}" || die
+		v $(tc-getCC) ${flags[@]} -o ${t} ${LDFLAGS} *.c || die
+	done
+
+	# provide this one for gcc-apple
+	TS=${S}/adv_cmds-${MD_VER}
+	for t in md ; do
+		echo "in ${TS}/${t}:"
+		cd "${TS}/${t}" || die
+		v $(tc-getCC) ${flags[@]} -o ${t} ${LDFLAGS} *.c || die
+	done
+}
+
+src_install() {
+	mkdir -p "${ED}"/{,usr/}bin
+
+	local TS=${S}/misc_cmds-${MISC_VER}
+	for t in leave units calendar ; do
+		cp "${TS}/${t}/${t}" "${ED}"/usr/bin/
+		doman "${TS}/${t}/${t}.1"
+	done
+	# copy cal separately
+	cp "${TS}/ncal/cal" "${ED}"/usr/bin/ncal
+	dosym ncal /usr/bin/cal
+	doman "${TS}/ncal/ncal.1"
+	dosym ncal.1 /usr/share/man/man1/cal.1
+
+	TS=${S}/shell_cmds-${SHELL_VER}
+	for t in \
+		apply getopt hexdump hostname jot killall lastcomm \
+		renice script shlock time w whereis;
+	do
+		cp "${TS}/${t}/${t}" "${ED}"/usr/bin/
+		[[ -f "${TS}/${t}/${t}.1" ]] && doman "${TS}/${t}/${t}.1"
+		[[ -f "${TS}/${t}/${t}.8" ]] && doman "${TS}/${t}/${t}.8"
+	done
+	cp "${TS}/w/w" "${ED}"/usr/bin/uptime
+	doman "${TS}/w/uptime.1"
+	for t in hostname kill; do
+		cp "${TS}/${t}/${t}" "${ED}"/bin/
+		doman "${TS}/${t}/${t}.1"
+	done
+
+	TS=${S}/developer_cmds-${DEV_VER}
+	for t in asa unifdef what ; do
+		cp "${TS}/${t}/${t}" "${ED}"/usr/bin/
+		doman "${TS}/${t}/${t}.1"
+	done
+
+	TS=${S}/adv_cmds-${MD_VER}
+	for t in md ; do
+		cp "${TS}/${t}/${t}" "${ED}"/usr/bin/
+		doman "${TS}/${t}/${t}.1"
+	done
+}
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 a1cad93e650b..31fd0171d6ec 100644
--- a/sys-apps/mawk/Manifest
+++ b/sys-apps/mawk/Manifest
@@ -1,7 +1,9 @@
 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.ebuild 883 BLAKE2B deb941193402b058ecf23a7523698416660b09cfefcda6a51b2f2f50aaa72ba5b9230459826d82f9066b4bc8766c72f2a55583e21705f848df0ffa4d966509a5 SHA512 e072d0a8bb7125965bd3e0edea01eff17ef53b17baaf117fa7f5cd910acebd4cbc57f6725a6ae0419cf2eb177fcd3b8f4cdf5c5f0e7bb4d86fdbe86f7b75c9de
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
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.ebuild b/sys-apps/mawk/mawk-1.3.4_p20171017.ebuild
new file mode 100644
index 000000000000..d90cc49f5a39
--- /dev/null
+++ b/sys-apps/mawk/mawk-1.3.4_p20171017.ebuild
@@ -0,0 +1,43 @@
+# 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"
+
+RDEPEND="app-eselect/eselect-awk"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( ACKNOWLEDGMENT CHANGES README )
+
+src_prepare() {
+	default
+	tc-export BUILD_CC
+}
+
+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/microcode-ctl/Manifest b/sys-apps/microcode-ctl/Manifest
index 8eb29df4cd86..d5282921cdca 100644
--- a/sys-apps/microcode-ctl/Manifest
+++ b/sys-apps/microcode-ctl/Manifest
@@ -7,5 +7,6 @@ DIST microcode_ctl-1.28.tar.xz 876760 BLAKE2B 8523bdc59ab21a6ec2e1110116bfb4c7a1
 EBUILD microcode-ctl-1.23.ebuild 1271 BLAKE2B 8a7adc9b789dfdadf4a44ee4301040c0047f4e68bc71d46b04acbfe2b1d9978415d6e184d328d05c39b65a37b59db34d5b274cc1168cf52e93775413862a0a0c SHA512 b5ef619c8b5821e4a52282f34e7e4880962e2d9d6f8f279f3ae7553ca5a72e28c69f4ac921b1370ea199635c63d705e89e78968ff3fe5520556c4732fbf68355
 EBUILD microcode-ctl-1.27.ebuild 1273 BLAKE2B d3b5ac1888e2abce28f63f5f6d92ca4eca7b6714c1fc93ad0f304a0a790ce4c46c7bc8c73a4142b5533c233599989d6cf34347bc0adf26ab54b130b3cf659f31 SHA512 9d23c1914298105aaaf8937162cf7673a09d12dde1778c4bd99d708b09307527bafb3c45a556b78a02460aac3842001f30cf67bafadd5a64fec596013926434a
 EBUILD microcode-ctl-1.28-r1.ebuild 1035 BLAKE2B e82bd192b0ee75ddeb53a1112ddcb1aa5846fe2e8c84137509fa6b723cdd4b96eb6f0d7176d83d538a86ed032f6b19bef726ac31896a2f0617d44b11c1e91a44 SHA512 a63bb4b08ada1fa9e4c114f4a7c8019201e29260282b75cc58247264602191bfe83a4076f8673bb591443f08c3e9e8723e1952f7bcf7bb0951a457572f527964
+EBUILD microcode-ctl-1.28-r2.ebuild 1147 BLAKE2B 9bb9e2be7a589eaf4ffc30ebf95bb9a6f7f38019c5b598659dc7a037fa3051673c2185df8bfc7007205436246214cb40260ae8204f2ba0876ed33350b838bf95 SHA512 c6782fc6a6919a2eda6f6b229c0498b4ff1907cee8eab2dcfdf43017a6849cc996af39202daaadf2d7093c51752984938e7c77090c4b1529b7c2c7001bbdb4aa
 EBUILD microcode-ctl-1.28.ebuild 1273 BLAKE2B d3b5ac1888e2abce28f63f5f6d92ca4eca7b6714c1fc93ad0f304a0a790ce4c46c7bc8c73a4142b5533c233599989d6cf34347bc0adf26ab54b130b3cf659f31 SHA512 9d23c1914298105aaaf8937162cf7673a09d12dde1778c4bd99d708b09307527bafb3c45a556b78a02460aac3842001f30cf67bafadd5a64fec596013926434a
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/microcode-ctl/microcode-ctl-1.28-r2.ebuild b/sys-apps/microcode-ctl/microcode-ctl-1.28-r2.ebuild
new file mode 100644
index 000000000000..4ca58a106615
--- /dev/null
+++ b/sys-apps/microcode-ctl/microcode-ctl-1.28-r2.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 versionator
+
+MY_P=${PN/-/_}-${PV}
+DESCRIPTION="Intel processor microcode update utility"
+HOMEPAGE="https://pagure.io/microcode_ctl"
+SRC_URI="https://releases.pagure.org/${PN/-/_}/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="selinux"
+
+DEPEND=""
+RDEPEND=">=sys-firmware/intel-microcode-20090330[monolithic(+)]
+	selinux? ( sec-policy/selinux-cpucontrol )"
+
+S=${WORKDIR}/${MY_P}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS} ${CPPFLAGS} ${LDFLAGS}"
+}
+
+src_install() {
+	dosbin microcode_ctl
+	doman microcode_ctl.8
+	dodoc Changelog README
+}
+
+pkg_preinst() {
+	local _v
+	for _v in ${REPLACING_VERSIONS}; do
+		if ! version_is_at_least 1.28-r1 ${_v}; then
+			# This is an upgrade
+			elog "The init scripts have been removed as they are unsafe.  If you want to update"
+			elog "the microcode in your system, please use an initramfs.  See bug #528712#41 for"
+			elog "details (and bug #557278 for genkernel users)."
+		fi
+
+		# Show this elog only once
+		break
+	done
+}
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
similarity index 99%
rename from sys-apps/portage/portage-2.3.19.ebuild
rename to 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-auth/Manifest.gz b/sys-auth/Manifest.gz
index bb8b845ae6aa..9b6b63267efc 100644
Binary files a/sys-auth/Manifest.gz and b/sys-auth/Manifest.gz differ
diff --git a/sys-auth/libnss-nis/Manifest b/sys-auth/libnss-nis/Manifest
index 7a976cea95dd..6f141f62bacf 100644
--- a/sys-auth/libnss-nis/Manifest
+++ b/sys-auth/libnss-nis/Manifest
@@ -1,3 +1,3 @@
 DIST libnss-nis-1.4.tar.gz 209887 BLAKE2B ca9c2d66080568cc7748b4df4b0318687cf9dac5717c84a8e84d033a3a0aa0d59b3159c55ad2e1513e161b40acea59c3df8cddaea1ff4897a0599777179bd7f2 SHA512 56338a1dd60b756fb40e7e08c0d7d49ce98b47f684e7278aaf1a521a74f02b23cc73908adbd6ff88057f2f0e42301f827f888fc7af82aa57ff9449a05de73b75
-EBUILD libnss-nis-1.4.ebuild 854 BLAKE2B 5c746ac9f4c2c2fa2b2b864549da801ee2bc18b85150e9b2b7d0eadd8a297a732241459a4d82673ce350a370091de3e399e16c1bd282bb8c1704bfe5bb025a36 SHA512 36a23aa539481c65c0a8990bb13eaf635130a5cba36f1bf4ff9df540c4235f84db62358dcf3670eb9486546298353ac1f3c9d68ea602c439d37338b706633744
+EBUILD libnss-nis-1.4.ebuild 857 BLAKE2B b8e1a3171769414a66bc4ecf410a779e860485530ba8f9c8acb942fad6e031fdf1d13747cdda0a57c298f9c2f5f0375f0a3b5c97e9570f1259b58fb4e1c57330 SHA512 ca7c6959808807d12c9febd483c1f60bca10a01e8a419d5d7ddb07c51281298288f93a848bc65da6f82199924342c58757239df112cac26920b4a228e635b1fb
 MISC metadata.xml 221 BLAKE2B 79f6de476af31c1da59c7aeebab26fa0db49c902398f6f73beeca03d3077820240bc51a25d2945642d9a07470470f2ca9548c2d8f1c63a8592966f6df9955926 SHA512 edb14bd2dae6ad57f77c07fc601cf2782589165c7e48e1e123eff7e47044febfdb1e19d18cd0b240fd2ca494e3401b5aa1f1243480769e0faf5dbfa377d20a3b
diff --git a/sys-auth/libnss-nis/libnss-nis-1.4.ebuild b/sys-auth/libnss-nis/libnss-nis-1.4.ebuild
index 4b6cdff52f8c..48024c4d48a0 100644
--- a/sys-auth/libnss-nis/libnss-nis-1.4.ebuild
+++ b/sys-auth/libnss-nis/libnss-nis-1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64"
 
 RDEPEND="
-	net-libs/libnsl:0=[${MULTILIB_USEDEP}]
+	>net-libs/libnsl-0:0=[${MULTILIB_USEDEP}]
 	net-libs/libtirpc:0=[${MULTILIB_USEDEP}]
 	!<sys-libs/glibc-2.26
 "
diff --git a/sys-auth/pam-csync/Manifest b/sys-auth/pam-csync/Manifest
deleted file mode 100644
index e7e312a6468d..000000000000
--- a/sys-auth/pam-csync/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX pam-csync-0.42.0-cmake.patch 675 BLAKE2B 4c817cf35c53aeba8efa4cb759fa7c39f27e911fe8d1aa6c245be4b1ccc09ede031bc3369145d1a497b541c1a56c1a1e782a962f57359c5abbf5c5bbb8313f81 SHA512 108a06df80a41dcfa8a44e6d2fee83a57f235091117c22efdb8d255dec332268976d88828f439ee3f887c3d573bfe418b1edf08f2a114eac54c39a1ef504243f
-AUX pam-csync-0.42.0-ocsync.patch 691 BLAKE2B 83cc09269a6318c87424845303777a05c323882b20bab3b7eb8191714a14488f145902581c11c9c5004b8b0b2df0a2e7636a90a2c131b239efc61c47b16331ed SHA512 6728f09d9f6d11df4d7bd20cdb7735b01286cdd9962850d158c7583085b095d9531e31387afc8b74e4182daf1f20bdac3a8490be0608ad5d9d421b96d4c9ee29
-DIST pam_csync-0.42.0.tar.gz 30457 BLAKE2B c3f24494cd5732e3dc7eb6bd15ce7c90988395d4e5c2cbbdc0bc03cadc82925fd25f6d891cb2b8fed6f6f2a070f1e57740cd9886611a99a96b846ee9e8cc3dd5 SHA512 ef6d0fbadf6afdf5a5adad1905e976330506fdf60835aa4190959b855fbc2c4c61bd709fe2aaaab731ec5430c999b3fd5e23f3a81c35a7b266b23cd092d24e06
-EBUILD pam-csync-0.42.0-r1.ebuild 584 BLAKE2B 88d04c99842894a74d1aa6d3ddb01c956d852752043bfa2a249a2ee24893cb124c2168dee2ebe5123a34dbba72e2d3955b8f50a16352fa5e649e20004b2bbd0d SHA512 19b2e2b62f3d97641e70ed3857e6449ca7d58942740f0722a7c5a0e28acb7e35a7cfa5f24e263517e580711a1e02a7a395b409969fa5350a656c65b6ef036922
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sys-auth/pam-csync/files/pam-csync-0.42.0-cmake.patch b/sys-auth/pam-csync/files/pam-csync-0.42.0-cmake.patch
deleted file mode 100644
index 2b650d232e2a..000000000000
--- a/sys-auth/pam-csync/files/pam-csync-0.42.0-cmake.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 21dfcf6343cec2feb0e4ebd8b9e22a3aa39e5d9d Mon Sep 17 00:00:00 2001
-From: Jim McDonough <jmcd@samba.org>
-Date: Mon, 10 Mar 2014 10:16:28 -0400
-Subject: [PATCH 1/2] Remove backward compatibility option for newer cmake
- builds to work.
-
----
- src/CMakeLists.txt | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 6732a3f..40225e4 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -41,7 +41,6 @@ include_directories(
-   ${PAM_CSYNC_PRIVATE_INCLUDE_DIRS}
- )
- 
--set(CMAKE_BACKWARDS_COMPATIBILITY "2.2")
- macro_add_plugin(${PAM_CSYNC_LIBRARY} ${pam_SRCS})
- 
- target_link_libraries(${PAM_CSYNC_LINK_LIBRARIES})
--- 
-1.8.4.5
-
diff --git a/sys-auth/pam-csync/files/pam-csync-0.42.0-ocsync.patch b/sys-auth/pam-csync/files/pam-csync-0.42.0-ocsync.patch
deleted file mode 100644
index d0c5ff99955a..000000000000
--- a/sys-auth/pam-csync/files/pam-csync-0.42.0-ocsync.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Since 0.60.0, upstream renamed to "ocsync".
-
---- a/cmake/Modules/FindCSYNC.cmake
-+++ b/cmake/Modules/FindCSYNC.cmake
-@@ -20,7 +20,7 @@
- else (CSYNC_LIBRARIES AND CSYNC_INCLUDE_DIRS)
-   find_path(CSYNC_INCLUDE_DIR
-     NAMES
--      csync/csync.h
-+      ocsync/csync.h
-     PATHS
-       /usr/include
-       /usr/local/include
-@@ -30,7 +30,7 @@
- 
-   find_library(CSYNC_LIBRARY
-     NAMES
--      csync
-+      ocsync
-     PATHS
-       /usr/lib
-       /usr/local/lib
---- a/src/pam_csync.c
-+++ b/src/pam_csync.c
-@@ -50,7 +50,7 @@
- #include <security/pam_modutil.h>
- #include <security/pam_ext.h>
- 
--#include <csync/csync.h>
-+#include <ocsync/csync.h>
- 
- #include "pam_csync.h"
- #include "config.h"
diff --git a/sys-auth/pam-csync/pam-csync-0.42.0-r1.ebuild b/sys-auth/pam-csync/pam-csync-0.42.0-r1.ebuild
deleted file mode 100644
index b8f5552f3eb1..000000000000
--- a/sys-auth/pam-csync/pam-csync-0.42.0-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="PAM module to provide roaming home directories for a user session"
-HOMEPAGE="https://www.csync.org/"
-SRC_URI="https://www.csync.org/files/${P/-/_}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/iniparser-3.1:0
-	>=net-misc/ocsync-0.60.0
-	virtual/pam
-"
-DEPEND="${DEPEND}
-	app-text/asciidoc
-"
-
-S="${WORKDIR}/${P/-/_}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-cmake.patch"
-	"${FILESDIR}/${P}-ocsync.patch"
-)
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index 78fb77c6ea73..4688eab908d9 100644
Binary files a/sys-boot/Manifest.gz and b/sys-boot/Manifest.gz differ
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 712b26512bca..faedb91cb704 100644
Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ
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/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index ae990e6e1224..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 2717 BLAKE2B 733c10624907903578e4a18b71e35cd2953d296b3b4ba6df5b0c7df4a6aca02e2df8b49d74dde817be41890c3300b1ec7439fb5dd2c879bc291e752fa56a3c9d SHA512 c4e873f61fbd4a52712f37b31b1683fb8c13ba0c5e0b14f0699fb7a50218294d491eb0bcd0ad3add9d7f41022ae985895c1c3f11c7e9b60a419ebddf6e26964b
+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-fs/xfsprogs/xfsprogs-4.9.0.ebuild b/sys-fs/xfsprogs/xfsprogs-4.9.0.ebuild
index 8e905636af1b..0d581fec662b 100644
--- a/sys-fs/xfsprogs/xfsprogs-4.9.0.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-4.9.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
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.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
Binary files a/sys-kernel/Manifest.gz and b/sys-kernel/Manifest.gz differ
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 9d387715cb3f..7f806f4a035b 100644
Binary files a/sys-libs/Manifest.gz and b/sys-libs/Manifest.gz differ
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index cf90a6e004da..1d318dc1bafc 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -45,6 +45,6 @@ EBUILD glibc-2.24-r4.ebuild 5047 BLAKE2B 295eeb6cecff9f9b33d428a3f52d68a5af0c92a
 EBUILD glibc-2.25-r10.ebuild 4965 BLAKE2B 060110e8a01add709b5fd4892d7cdaeb71ec3a2300b27f21b103933ac60b3118c075a7dba70d8886d363953323be8473f8cc9fb672456c24fa324674465c9534 SHA512 bf04ea4805336e34479195dc136827ff78c752eb415f54b9a23924d28851554ca9bd9c68a8be264a810e7e74e536d43be5645fa54d79fb00ea2714116bf8d9eb
 EBUILD glibc-2.25-r9.ebuild 5038 BLAKE2B 6bf0e5ad7ff8403fdf35e001418446cb5bc09c4407f28ee04be3e5bf0ab3bb5da57128cea4e4943c81a615b7704ef4e1805d61540b39702702da3723eeee8ada SHA512 e28ab996019d8f3b80523ca4ae2c42857e469ce61eb01d1c248699a37d141223bac5c345b14bd50d18fedd173818d6bc94ab0bcd37aa565cd695bdbbc7dd7b6b
 EBUILD glibc-2.26-r3.ebuild 25373 BLAKE2B b39fb75551e268f4942457d3aa8a06b7e707032ba68388d8303f43bb047299ce976844384d28c0de7d9a0947a769fe7f96beabb4a60c45790465a0fe4c92a556 SHA512 fb21295d3bc781df3882b3eabb1f3d95d7d1465bfd28a4bd45a79a593c3ad61f042d147c0d1dc835e206a3e0fff975724a1295725fbe81a8718307d315719ccd
-EBUILD glibc-2.26-r5.ebuild 25594 BLAKE2B d127817d3554218ee16cae19a1e959083950675e0aaeadaba9185425f28a17141b5d9a578e28dc4b58a376444a8df41a8fac9632f82382e427adfd755132ff6b SHA512 11196cf14c1891e13bc7b6e2b6e687dfd85c6b59328902bd6adf5e068b87e2c96253408e9d8ba8a8c2b7f47b7818017d43b46411be9ea30231c0708866b19da6
+EBUILD glibc-2.26-r5.ebuild 25579 BLAKE2B 8e1717b52232878c58a752bab7f0216130ba67e8372b4d4bfa3dbdb8f4f30bf82d09afa08bc0e09742a5f4a9c408558921087634740719cc46a214b2635f149f SHA512 db50eb559993b128ed09c22c258b051849720f3cc0d72867ddfb76c8b99c90602d279a79f7dad958e58c237e28903424477fd1f980ddc87080719f96d9123970
 EBUILD glibc-9999.ebuild 25821 BLAKE2B c52ab7226bd30f3d3cc674575e8022a84c040e04ae5221ef7e479c71dcb5d74c7d721a8d02aecee42341dbf1c2f111ea3d472d9cd33f83b1f4b0d837af8b7cea SHA512 ead08f31af0d81a53203146e7a6001d3c9b8e182a7ab524efb7fe70188fdf4aa0250c65f02b06e996c2cd2ee705ac7f6394ab7f98ed539125c44d048703ca139
 MISC metadata.xml 1054 BLAKE2B dbc091e54130729385bc02aaa1025885f101caa88d601b1f7670974d89e7e24aae5d37fd6699278a37c0064e1f3232c04954dc127869427317b5d80b499f3813 SHA512 65474b7d32ceb6bafe8ae0e18aa0b46b68cefecce5570a0e8d4a0117019e6540f2feae35cecbebad382b4f06d6e5ae1dfa9b8a61889881e8534956dd42df8e4b
diff --git a/sys-libs/glibc/glibc-2.26-r5.ebuild b/sys-libs/glibc/glibc-2.26-r5.ebuild
index abde9e62f95f..c5a076afbdb0 100644
--- a/sys-libs/glibc/glibc-2.26-r5.ebuild
+++ b/sys-libs/glibc/glibc-2.26-r5.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
@@ -18,8 +18,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="git://sourceware.org/git/glibc.git"
 	inherit git-r3
 else
-	# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-	KEYWORDS=""
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 	SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
 fi
 
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/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 0aae2757c9a3..4f2538920142 100644
Binary files a/www-apps/Manifest.gz and b/www-apps/Manifest.gz differ
diff --git a/www-apps/eyeos/Manifest b/www-apps/eyeos/Manifest
deleted file mode 100644
index 95473286fbac..000000000000
--- a/www-apps/eyeos/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST eyeos-2.5.tar.gz 27820727 BLAKE2B 76116e67dc808ea7f1f3a4b901744bbe7c3541f53a6d5eeca5d53bf93f56151f55f5c5253b84b314378ea722c160e5a79f51e03c59d20a45a04c7883785b1b41 SHA512 8e2ecfff6fcde5dd7a54b260b7fdf9020892d8ca070125646a20c898329a255178fa627b10d54bbc5f98d1aede30c1f3e7afa1fcb6f434dd5a710fa6f46feac1
-EBUILD eyeos-2.5.ebuild 1242 BLAKE2B fdf95d98b4a7c2611773354cf20cb1f716a5fa5a5e33bea80224faf0a016ae444cec4dc7e3b6dd351b656babc65bf54233d21fc9b0f53361087dc52b747d3ee8 SHA512 e5a99f951a2374e84a698b73eb565e8d94e20fc02d80ae8b7b7fc57fe56cd5bbdf40dcb65519a856a666f2a5c96c2906a43ff0ce3115228ac6dc5461ca3db48c
-MISC metadata.xml 624 BLAKE2B 0c1f0734a01fd808205eff0aec2bc53d730f2317d622175f4b4fc5ad54b0c7f3d417d050dc34e3a2a1e782cf81611af690f45dbb7764a9858ffc4e7d137343c0 SHA512 df72301f8bd966901b35477fe3ee2e30cdc546fc5bbdca0f18111627b095dcb9023dbd7b6d442588f9ec79f56bf09afa9f3b2a62b2e5c24dbe286ab3cf181143
diff --git a/www-apps/eyeos/eyeos-2.5.ebuild b/www-apps/eyeos/eyeos-2.5.ebuild
deleted file mode 100644
index 9f40ac764ad3..000000000000
--- a/www-apps/eyeos/eyeos-2.5.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit webapp eutils
-
-DESCRIPTION="AJAX web-based desktop environment"
-HOMEPAGE="http://www.eyeos.org"
-SRC_URI="mirror://sourceforge/eyeos/eyeos2/${P}.tar.gz"
-
-LICENSE="AGPL-3"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-lang/php[curl,crypt,gd,json,mysql,mysqli,pdo,sharedmem,sqlite]
-	virtual/httpd-php"
-
-S=${WORKDIR}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	# Placeholder for first install
-	touch "${ED}/${MY_HTDOCSDIR}"/settings.php
-	webapp_configfile "${MY_HTDOCSDIR}"/settings.php
-	webapp_serverowned "${MY_HTDOCSDIR}"/settings.php
-
-	# Ugly, but eyeos needs write access in too many places
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/eyeos/system
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/eyeos/tmp
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/eyeos/users
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	elog "To finish your install/upgrade, point your browser to the eyeOS installer at:"
-	elog "	http://${VHOST_HOSTNAME}/${PN}/install/"
-	elog "Specific extensions may require additional packages (available or not in"
-	elog "portage), check the installer output"
-	webapp_pkg_postinst
-}
diff --git a/www-apps/eyeos/metadata.xml b/www-apps/eyeos/metadata.xml
deleted file mode 100644
index 8b1ff2f2c914..000000000000
--- a/www-apps/eyeos/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="person">
-		<email>voyageur@gentoo.org</email>
-		<name>Bernard Cafarelli</name>
-	</maintainer>
-	<longdescription>eyeOS is an open source web desktop following the cloud computing concept, written in mainly PHP and XML. It acts as a platform for web applications written using the eyeOS Toolkit. It includes a Desktop environment with more than 60 applications and sys utils</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">eyeos</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 8ad1e4a980d1..80fa9380eb71 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
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-servers/Manifest.gz b/www-servers/Manifest.gz
index 81cabdbebb3b..2e16d17baa37 100644
Binary files a/www-servers/Manifest.gz and b/www-servers/Manifest.gz differ
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
Binary files a/x11-drivers/Manifest.gz and b/x11-drivers/Manifest.gz differ
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 b7ad807dbd38..c91311362c98 100644
Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ
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/slop/Manifest b/x11-misc/slop/Manifest
index b8bcd40cfe88..48a4a899e499 100644
--- a/x11-misc/slop/Manifest
+++ b/x11-misc/slop/Manifest
@@ -1,4 +1,5 @@
 AUX slop-6.3.46-fix-build-system.patch 2274 BLAKE2B cec202a664d3329d7354f63d20e5a197363296d1506e46900ae51d542bc44279ac62fb9668dcaa2cbade49688d210f9fbac7cbbb706feb5382921536b8471c2b SHA512 344396f7cc8c60f09647c434b78183264dede5548e243df3408f46486f489eb14353fa770ba1f604f604a15417a92f84cd51c561b7026b74b854d8ba7d02cc67
 DIST slop-6.3.46.tar.gz 89391 BLAKE2B 0150ca63e4a598e892abd5505e867f01204f29796dc378a7f3d0c041c1a27f000e98962c41cbf8109573575b37449c1869f29f988c5d2046b504382b2a56779d SHA512 9f44bbb8e14e71a17858711d8da902cb9cf5dc65ed47284be15122f2d1793544deab7f0700517bd07e44613662bfbc7f0991f3d36dcf74af6f90de5fbbd79558
 EBUILD slop-6.3.46.ebuild 601 BLAKE2B 769a13a66a24a8067fdafbb6d3cce48090d4193fb40a14a98cd56d1d4d331e642ec50e601b8944e7276037e07cd52b27c0cb0b79295820c1305f63c8601f3051 SHA512 e96b0e0d8f2562f40a8770980dd46b0f7bbce5588b4fb1cb7d62c88a10fa9ae5880d40918db178f5f4ac5ce6c46957a685af528f795009c8094375738308fce4
+EBUILD slop-9999.ebuild 798 BLAKE2B fdb4c2671b9ab455c03293202c83ecdbb4e2f6dc44834116eb53f8cb76e66c6d8beed9a82be5c0067dcb2a2d4b540d3a22bb64fa692b969db7bf324ab644bac6 SHA512 7b47b74ffa960661790ead4795a3a8a8783bc13a18585fbf0255fa6775e98bb790ae5d4db3caaee78c2135a988d715183835e3f2154753c6b96727ad664b1bbe
 MISC metadata.xml 630 BLAKE2B dbf7d848908c12d7104c7cd18cd2ca16114073803bd4600e10906a1fc4f86ddeb646359d26885551d998a279d1e11f0d74ad21b135e14a2bea827ef21ade15f7 SHA512 98eea5cce0e8a692076b5cb423a2f0522151d716ef0c9f346e915bfee8590d32dab59c183180ea7f87561bfb92e3840ad710f890a734640173bbcd471d779b0e
diff --git a/x11-misc/slop/slop-9999.ebuild b/x11-misc/slop/slop-9999.ebuild
new file mode 100644
index 000000000000..4aef7f894258
--- /dev/null
+++ b/x11-misc/slop/slop-9999.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="An application that queries the user for a selection for printing"
+HOMEPAGE="https://github.com/naelstrof/slop"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/naelstrof/slop.git"
+else
+	SRC_URI="https://github.com/naelstrof/slop/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="opengl"
+
+RDEPEND="
+	dev-libs/icu:=
+	x11-libs/libX11
+	x11-libs/libXext
+	opengl? (
+		media-libs/glew:0=
+		virtual/opengl
+		x11-libs/libXrender:=
+	)"
+DEPEND="
+	${RDEPEND}
+	media-libs/glm"
+
+src_configure() {
+	local mycmakeargs=(
+		-DSLOP_OPENGL=$(usex opengl)
+	)
+	cmake-utils_src_configure
+}
diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index 3bfd76510e84..7b1a5053c6ed 100644
Binary files a/x11-plugins/Manifest.gz and b/x11-plugins/Manifest.gz differ
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
similarity index 50%
rename from x11-plugins/wmcpuwatch/wmcpuwatch-0.2.ebuild
rename to 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;
- }