gentoo resync : 18.12.2017

785 files changed, 5861 insertions, 14820 deletions

diff --git a/Manifest b/Manifest
index 9d0cc8e173d8..24bc6831f328 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 28821 BLAKE2B 6d034c01921cdb20e7ccc94294ff45df743a0dfcda473011d59b0876b960681aed6656b3f12683408f388c43e9868192bd7e669672d0c41040b4eb02cde912dc SHA512 d622523ec09a6cd9d9054c855ff68a2cca7b925b1684a8209df38523745b6cc9eb7db7b1046938ecd7c1a88e38c3592f85a58c9800b839e4e58a48e66a804d55
-TIMESTAMP 2017-12-17T08:09:01Z
+MANIFEST Manifest.files.gz 28795 BLAKE2B 330a5d006b019a5f8121af163a8a37b3d3817810e7333d3492c1dc6f1f8a7b8e7c76fd52bc22b0d898ca97b19afc9227e60d38cfe8620ab4538c7aaa4dabdf6a SHA512 9027efecc431aae80bf4276cf219641bd1be96496d14000963eca3ecb68440945a9a05eb65ea699bdf60c1ea28e4c92c80ebdc14f58f702ee193d017356280b2
+TIMESTAMP 2017-12-18T14:09:06Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlo2Jh1fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlo3zAJfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBujg/9HmSEZRBk3vwdwO+78u2nunvH+XYHBwdVem9UhUhgj8I4ChCwA80oOmkE
-DSNGgDtuuZdFHutiyxzKRIn3jhKSoyzffcI51noEYOSrZK5TBuJnZDy36lpzIIC1
-K3djWeHoB+ikC5UfLkhPivDPUv4fUy+5xk/Mrmrqn8Wjk2uFhG2gPp28j3WA9jDq
-xAoG+knf5W/I6iexbHa6JXOliIuCyCRrEFQBF8RqdzfJZ2lW4NfNQh9caGHLeuLW
-BLQOR13tVzewcBqDT87EhcQ28MD0r53BkJpj5cdR+AwNFRYbM5S8kyImmtBB91Xx
-inpw2Q+xbzPzvofE6sPkFYCf1BUIutR1H/ClHuVJ0IwDZWGszzde+IEjYpr4e0Il
-2LZVaEOm/fTyaLLOdNC9KK5ZyMOLrHM3K917ESjtM1o8LzzD5yiFhZ47PcpevJUJ
-Isgl1ddWVeZu2RrwATw+Y8U0XCpeqfsYsQMBeOlrhpCL62HykIjvsEaYjp5JQ7ZD
-8rP3elkZFj31PYkKSwJITjnaIT/7PUXv2CJwG7JEyUzoyzsTa9qEQP4ueVhOZb5b
-nAMWc74QpotMLZEXSx7zYUj4Ezb/+hO54stWaGFMveFo4CcF7enIFmKUv0wN+Lou
-i6lJmOwOL94zKaRG2I24t+vXfaMoel0y3bFzMettd5DuwR9cCiM=
-=HaQg
+klA97hAAntwAuegJ31to6PTijnNxBHlNDAZ4ETka7d6sSGYWigjYJCx6smFL0QRJ
+NQPvCJNIGqK2LSO9u2JYoGbDN741NIqTIkajLyTaq8J6qgxvfDG+ZpPZx6sZfQN3
+cHUJMS9D/C9DpT+TRO55XOm0Rvp+Nyk2ahED9ngg1aEtdC2MJ6BOFHnbos8WMVg4
+Fx011uPV9W9Cn/YrXyQu3bj2jijfdGUdd0jjKvKAk9Ven0YTtB2g0+ed22y7CluP
+En8Nt4yzSKtpXlxT0123rwQOgRWZ4gLuaOs8MAtkYzmqKwXmmnZst2IMqaCe9YAD
+qdPCayHJNcBC3GETvZENaeAQ6ojk4S+7s/kYrOWRkevOQqFrNeu9gOqoSekdr5uD
+BajUcTfmGMvyZVnTvJm/b4qZism8utqPczUz6W6f44OpKjcZGmm0/snHEi0N3N5o
+13m2h0m5+vv3CtVg0mV2VkkADFZZ1MJeM5i2tOQQmAI0SAJgxq+t+RDUbVEX0Voa
+qJAPKctGVG9gxk84Sl4zU+fcAPjTEDjJMXO06RihRzm5O4PyzR14jbp5Np7IlTnn
+3Rw4XRo77/785VSvutEWVtPvOXmS0fuKXINCQ6U676pq5ER4afxRqRcsU7rXxabO
+3OSIyq0gGVb4RJyd9AvmshjBB0UiL/nlnaNNxKGaHVEyWJ1IR0Y=
+=UC8j
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 4535ba083407..994862ffcc08 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 9121a18e5616..6c3fe39e354e 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/cancd/Manifest b/app-admin/cancd/Manifest
index da33bee4008a..7b0327de086b 100644
--- a/app-admin/cancd/Manifest
+++ b/app-admin/cancd/Manifest
@@ -1,9 +1,9 @@
-AUX cancd-0.1.0-build.patch 262 BLAKE2B 59f99f07c8dba6cff4266813c739625457333f9c03373b650a6230bdba12a1a49e7109adb376c54c4a3fca8a8a17ae3fb23e434c2ea11c7faae9431e83c86afa SHA512 cbc3d0bfcdb2abae08268a408d2d7f7bc5898bd07c744878a6d8996dea5ea4f9f308078f9fe05566ee8cd06b3a5e083163f50d69f6795b31952934a88d69c481
+AUX cancd-0.1.0-build-r1.patch 266 BLAKE2B 0f1c43d64e02899b09d2ce4401f951ba60bad8bf31aa41c1c40677266021d2a3869db40f593f84745782d2ceaef226c7e3398b541cd9746496024d2455923ffc SHA512 83886c972ccc4b34fa4255d2b66f7abd286ba8b3929f2c35d85652ff290559ad837f96015f05d47cbae97fed6aec468852e75e0e6ac0bbac1a0538ea889f603b
 AUX cancd-0.1.0-c-cleanup.patch 1648 BLAKE2B 498c2eff05163a49e1499146e24d54e03ea0c8136e925b8ecfadccd7bcfcb77548ce49a31072c4c5d63c36a8c4b161d5d456b4b0247e915f0a6065e3a586637c SHA512 16350363f8f8f7e3843000e3128216d302ea7112608d61ae8d74ca79688588f3b028e1eedf187df06c78f8aaa2c987cdfdf33761adb9e597d4ca617f34b1072e
-AUX cancd-conf.d 496 BLAKE2B ccba9f3b8a2c89f698ccf835b8638948f6f044c9c33754fa711a33b91e09339956996c4e6dbe20a4c876ae3f26baf906fea58a69a5e8fa960d187ee1b63ff7cd SHA512 95d7fdeec35b2b544b9c30ca3c45197195ae8180624971af1c876ad19bedc0e9045edbb8d5bb393ff8d4f2f96dd7258cdeeb30ba58f31326ebff14f21a9efae9
-AUX cancd-init.d 514 BLAKE2B 108cf545fc68a5682a9380ad2327743f53225876f87da85f15b85d642a556290b39bfb32f8959e6c93e046bb518c0c0f7ef0ac043be9d8d62e664f27668eaf3e SHA512 27f46006a90814c41849bf03d45b100361ce49ac83d498e2244db13827620a254140aefee14059a722b08446c62124d25fb029080cc246aea34287a838b31c64
+AUX cancd-conf.d-r1 378 BLAKE2B 2b2b73484d8de7ee533bd217eb78224c3edae2c894c328ed8b17a941b2087461cc2b83483dd27563d162a83ff254b86f6fc564442bdef8510eb0cd14d51a7c0e SHA512 02c27367dda025f2a1b7aada8bc4c5a2cf5b046b4ded22c7bd7f50daa1ee18ffdda5997faa0d9edacfb17b23aedb007c8dbdee11cc2a70f7f9214e77fa1fb919
+AUX cancd-init.d-r1 596 BLAKE2B 5c439792ef8680238aa59e3f441b1b69ac1889e9a9ea4e57828b9969ec38ae0611971d7a52d68fbc676e2162f726a011839a2810991c70d2e7d3f25f81df9011 SHA512 73ed3f87e98822b0d5cc53b4a515ec02cdbbad03551eb58206522f615f2eafe6d2e2e190dcb41d8ec67ccad4d4411cbd1ce9087035539291ba520e2c3a84b2bf
 AUX netconsole-conf.d 751 BLAKE2B a81cdd8aa5be18e55065e1ca27698a2106bea320da98ea149e4da3f8a0817765b593fe816a9dda8adc9f1cde853f4debaf769e551ff97fe9ac24976c6045ab1e SHA512 7095ec6b8595865fc084b39f027efa0818c1348b8bfc8bfbea8d7d05c767f57a8357ae2eb07f13f073143911451e0fa005e1623ec9865076e4350f442cb8648b
 AUX netconsole-init.d 1503 BLAKE2B e03ee0010c92e011070950bdbb538add60a3eb2291b6b7ff9df60baa28d6fce2ce8e80b5750f730d56d6767743cf6daed358feb524359a0410cf678cf33b140f SHA512 33005e692fce59d567e399fca58b81b740cb381ce897f689af7e33785ccd1991506be1af2c09de8f96b6eb3996c5be16c212daee03d304b1fff7095b2ae1491d
 DIST cancd-0.1.0.tar.gz 7634 BLAKE2B 3ff488caf54764df053237d6ae4c39e7db44c5a5ecd1bcb18f3006e31030232ade4d7a93286dce8f58fb2ae7743700fd14939f219b7f5059cd2fb84bbc107b19 SHA512 9b01ed3ea1e27276799d657572645a7b40da9cf80910a73e2de9d733e8f3cfa374e29764b1e5853d7fb5a6835edda3103a1a6d31fd699010f98318631e62c5fb
-EBUILD cancd-0.1.0-r3.ebuild 1197 BLAKE2B 5126ef5fcda7d4b1d41c12a049fc2449c3fad2530468563c298939f59ddca25c75855f2f9bbe410c284251b0b25fe09cd630617b0361afc9bdfa43c08e7ade90 SHA512 4258be990c471d8d5a3df2c735b19c3333bd17be8d878bde92839216df8350220b463f97e5b92753ef9af866e40ed0b6d53df3f0e8c30e52bb71721ec72add1c
+EBUILD cancd-0.1.0-r4.ebuild 1162 BLAKE2B 5060bcf92d4c5495a7a3160ab67e3050eff26889ee005f55fad3e330899bcd3f3333b64468cd1e767f248b0c5f51e21081546f9e8bbf2826055c6b1d12bf4a3c SHA512 e135297de6f711870435a688d5b1fff4b3bffed77c3136cf52de41566c019e01f28d5dc120ae0a4f94a286614c9344330debf5728748013a7459b5377f87a647
 MISC metadata.xml 268 BLAKE2B 914b6995ad966e2b83ec718b2598969b181c119d8805241b0046f69e161ac22a9f769204f4783240056804008475aa406cbd91b9de499ec7840f9595158bd291 SHA512 ffda1db3fd6ac952f41a970e2e496c6a9fd0b12ed11cdf363fd269c3b00f627c6e70421fd545aad61d69594af2e5f43d8ebc197232a39b596d012818fe758850
diff --git a/app-admin/cancd/cancd-0.1.0-r3.ebuild b/app-admin/cancd/cancd-0.1.0-r4.ebuild
index 6ad37a6163ff..d66212991751 100644
--- a/app-admin/cancd/cancd-0.1.0-r3.ebuild
+++ b/app-admin/cancd/cancd-0.1.0-r4.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit eutils
+inherit user
 
-DESCRIPTION="the CA NetConsole Daemon receives output from the Linux netconsole driver"
+DESCRIPTION="CA NetConsole Daemon receives output from the Linux netconsole driver"
 HOMEPAGE="http://oss.oracle.com/projects/cancd/"
 SRC_URI="http://oss.oracle.com/projects/cancd/dist/files/source/${P}.tar.gz"
 
@@ -14,9 +14,14 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
+PATCHES=(
+	"${FILESDIR}/${P}-build-r1.patch"
+	"${FILESDIR}/${P}-c-cleanup.patch"
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-build.patch #246734
-	epatch "${FILESDIR}"/${P}-c-cleanup.patch
+	default
+
 	# slight makefile cleanup
 	sed -i \
 		-e '/^CFLAGS/s,-g,,' \
@@ -27,11 +32,12 @@ src_prepare() {
 
 src_install() {
 	dosbin cancd
-	newinitd "${FILESDIR}"/cancd-init.d cancd
-	newconfd "${FILESDIR}"/cancd-conf.d cancd
+	newinitd "${FILESDIR}"/cancd-init.d-r1 cancd
+	newconfd "${FILESDIR}"/cancd-conf.d-r1 cancd
 	newinitd "${FILESDIR}"/netconsole-init.d netconsole
 	newconfd "${FILESDIR}"/netconsole-conf.d netconsole
-	keepdir /var/crash
-	fowners adm:nobody /var/crash
-	fperms 700 /var/crash
+}
+
+pkg_preinst() {
+	enewuser cancd
 }
diff --git a/app-admin/cancd/files/cancd-0.1.0-build.patch b/app-admin/cancd/files/cancd-0.1.0-build-r1.patch
index b1c99b1cd565..19bc929b2bc0 100644
--- a/app-admin/cancd/files/cancd-0.1.0-build.patch
+++ b/app-admin/cancd/files/cancd-0.1.0-build-r1.patch
@@ -2,8 +2,8 @@ fix building with newer glibc
 
 http://bugs.gentoo.org/246734
 
---- cancd.c
-+++ cancd.c
+--- a/cancd.c
++++ b/cancd.c
 @@ -36,6 +36,7 @@
  #include <libgen.h>
  #include <getopt.h>
diff --git a/app-admin/cancd/files/cancd-conf.d b/app-admin/cancd/files/cancd-conf.d
deleted file mode 100644
index 7b4dd27383c0..000000000000
--- a/app-admin/cancd/files/cancd-conf.d
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# user to run as, root strongly discouraged
-# user should have /bin/false for a shell
-# but file access into /var
-CHUID='adm:nobody'
-
-# port to listen on
-CANCD_PORT=6667
-
-# directory to output to
-CRASH_DIR=/var/crash
-
-# one file per minute, one dir per host/date
-#CRASH_FORMAT="%Q/%Y-%m-%d/%H:%M.log"
-# one file per day, one dir per host
-CRASH_FORMAT="%Q/%Y-%m-%d.log"
diff --git a/app-admin/cancd/files/cancd-conf.d-r1 b/app-admin/cancd/files/cancd-conf.d-r1
new file mode 100644
index 000000000000..13322298f28b
--- /dev/null
+++ b/app-admin/cancd/files/cancd-conf.d-r1
@@ -0,0 +1,14 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# port to listen on
+CANCD_PORT=6667
+
+# directory to output to
+CANCD_LOG_DIR=/var/log/cancd
+
+# one file per minute, one dir per host/date
+#CANCD_LOG_FORMAT="%Q/%Y-%m-%d/%H:%M.log"
+# one file per day, one dir per host
+CANCD_LOG_FORMAT="%Q/%Y-%m-%d.log"
diff --git a/app-admin/cancd/files/cancd-init.d b/app-admin/cancd/files/cancd-init.d
deleted file mode 100644
index eb0d34e1a2ee..000000000000
--- a/app-admin/cancd/files/cancd-init.d
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-}
-
-start() {
-	mkdir -p ${CRASH_DIR}
-	chown ${CHUID} ${CRASH_DIR}
-	chmod 700 ${CRASH_DIR}
-	ebegin "Starting cancd"
-	start-stop-daemon --start --quiet --user ${CHUID} --exec /usr/sbin/cancd  -- -p ${CANCD_PORT} -l "${CRASH_DIR}" -o "${CRASH_FORMAT}"
-	eend ${?}
-}
-
-stop() {
-	ebegin "Stopping cancd"
-	start-stop-daemon --stop --quiet --exec /usr/sbin/cancd
-	eend ${?}
-}
diff --git a/app-admin/cancd/files/cancd-init.d-r1 b/app-admin/cancd/files/cancd-init.d-r1
new file mode 100644
index 000000000000..a2a96f1ce81c
--- /dev/null
+++ b/app-admin/cancd/files/cancd-init.d-r1
@@ -0,0 +1,22 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/sbin/cancd"
+command_args="-p ${CANCD_PORT}
+              -l ${CANCD_LOG_DIR}
+              -o ${CANCD_LOG_FORMAT}"
+command_user="cancd"
+
+# cancd daemonizes itself, but doesn't write a PID file and doesn't
+# have an option to run in the foreground. So the best we can do
+# is try to match the process name when stopping it.
+procname="cancd"
+
+depend() {
+    need net
+}
+
+start_pre() {
+    checkpath --directory --owner cancd --mode 0700 "${CANCD_LOG_DIR}"
+}
diff --git a/app-admin/metalog/Manifest b/app-admin/metalog/Manifest
index 7816b593fe68..defaf736774e 100644
--- a/app-admin/metalog/Manifest
+++ b/app-admin/metalog/Manifest
@@ -4,6 +4,5 @@ AUX metalog.confd 393 BLAKE2B 326653a23ff4e6bc78a4ddebf8af7c517f7b67973063ce1ac6
 AUX metalog.initd 701 BLAKE2B 9cb211b887b7294a11649710d45c104603fa9b9c27469f33c20613b58d0eede015cc7faa7d489530150bacc9ae5c4f4ecdee69ac2a9fbd4eb7157296413d0594 SHA512 45eb2f4c5a99723ac24bdb90726a81efef422aab7c991d1502a0bb728a4138cda74b2f8efb4cc70f1375b21b92039639e8bd5ab01af310991a81fce668f6f096
 AUX metalog.service-r1 153 BLAKE2B 0353f6c1983b7146ce6471be82540aeb87d930e5c9f7334a4133754c52c2c8770c04a9eeb6f9f20ecc41359b1eae135e525d2dbde2471f2d973bb751690703d7 SHA512 72076f6aeab9975dedd824ea1d48b96f6a964d06f529923d4f7a1280a1123a63c0e958f74c6a1417c6362487a69d165bf3eb6c417aae3887ff43ae726f5a30d8
 DIST metalog-3.tar.xz 360784 BLAKE2B 951841d423769cd97e14985e15d5a2499ca351e082c0effe28dc16d46db91235b7ef0448fe32d38b2ed5b53011d04b3375dc87c2a859c49bede2ae177ec16954 SHA512 2ac614bb85fe466308c4ced0842fdab5f056eda60e892189a8220719f1e06a72fce3c76842a2ac8c63a6808c20d8b7a7d8676896e14f7f54e40630ecbd21e289
-EBUILD metalog-3-r1.ebuild 1533 BLAKE2B f634bd40a721f5b80a14f36fe7288b6cda8ae40f852d4de24bd7b3b67fd9abdd45c653872b11d3c296cb923547f668e90e7a1f4c7e3cf2c5b09167aaf9e1d90f SHA512 3e1f0ff8ddd35d3ba9432489ae3ff35e30bc24af43056144c3eacc9a2654378c157699c86ce1ab2ff39c4f38bef8be0d07d21ee9d14ca6978709767ca7b0e87a
-EBUILD metalog-3-r2.ebuild 1489 BLAKE2B a743d9cbd236bf04d08861af23bb29e3a1b416f30646cca202c5a5d7f249332a0ad345c21ea852a28142f100799de4a53ff0e7bbaf0993411c6870100e275c6d SHA512 72c155850389ad0869e633c59c2aba196b91a18955d8464cda60d224030bac5be1943da862a57542b981bbb29cd30695dedc2cdb7f5ff272ac76946a20275dae
+EBUILD metalog-3-r2.ebuild 1488 BLAKE2B 5240b4290bc4df6738312a9c0474ca114b658fc9c55e371dd69c4ce1b680293d3d92899a7aa39a7dfd35db5eb583365fa539f75f203b912000b542dccd1ecbc3 SHA512 c116056aa22037bbfd20d6e53e55b60972821ebec8f0693dfbce8f928401a2cadac3dee4a2520527348b5d7c4174d2cd9e8937306e4a1550fa74d571d0e6e607
 MISC metadata.xml 412 BLAKE2B 669797f6cec852364918cc83bbd58c3902815ca8b060f142ce90ae1af18bbf37ae460aad132ab091a62f3d206f21f2a30a7162423f7fe5490af458ba5464adb8 SHA512 3c5b8ad724089154480e4a1672e714fba022f30e371d317e53c144411ded8d8ca92bddac9eb51503ed9eb9e8069b851a8ff5078f9c9b576542efc54e621a98a8
diff --git a/app-admin/metalog/metalog-3-r1.ebuild b/app-admin/metalog/metalog-3-r1.ebuild
deleted file mode 100644
index b67bb91b753a..000000000000
--- a/app-admin/metalog/metalog-3-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-inherit eutils systemd
-
-DESCRIPTION="A highly configurable replacement for syslogd/klogd"
-HOMEPAGE="http://metalog.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${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"
-IUSE="unicode"
-
-RDEPEND=">=dev-libs/libpcre-3.4"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	app-arch/xz-utils"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.9-metalog-conf.patch
-}
-
-src_configure() {
-	econf $(use_with unicode)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog README NEWS metalog.conf
-
-	into /
-	dosbin "${FILESDIR}"/consolelog.sh || die
-
-	newinitd "${FILESDIR}"/metalog.initd metalog
-	newconfd "${FILESDIR}"/metalog.confd metalog
-	systemd_newunit "${FILESDIR}/${PN}.service-r1" "${PN}.service"
-}
-
-pkg_preinst() {
-	if [[ -d "${ROOT}"/etc/metalog ]] && [[ ! -e "${ROOT}"/etc/metalog.conf ]] ; then
-		mv -f "${ROOT}"/etc/metalog/metalog.conf "${ROOT}"/etc/metalog.conf
-		rmdir "${ROOT}"/etc/metalog
-		export MOVED_METALOG_CONF=true
-	else
-		export MOVED_METALOG_CONF=false
-	fi
-}
-
-pkg_postinst() {
-	if ${MOVED_METALOG_CONF} ; then
-		ewarn "The default metalog.conf file has been moved"
-		ewarn "from /etc/metalog/metalog.conf to just"
-		ewarn "/etc/metalog.conf.  If you had a standard"
-		ewarn "setup, the file has been moved for you."
-	fi
-}
diff --git a/app-admin/metalog/metalog-3-r2.ebuild b/app-admin/metalog/metalog-3-r2.ebuild
index bec325dcdb05..4988c910ee2e 100644
--- a/app-admin/metalog/metalog-3-r2.ebuild
+++ b/app-admin/metalog/metalog-3-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${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"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="unicode"
 
 RDEPEND=">=dev-libs/libpcre-3.4"
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 5189a937061d..561a8276a495 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/tar/Manifest b/app-arch/tar/Manifest
index 6f9324fa6e37..8723b0b4f719 100644
--- a/app-arch/tar/Manifest
+++ b/app-arch/tar/Manifest
@@ -3,7 +3,8 @@ AUX tar-1.29-add-files.patch 6602 BLAKE2B ac4687bccd88e1fb3b2c565901815988b0ff0d
 AUX tar-1.29-extract-pathname-bypass-upstream.patch 1604 BLAKE2B 83364c5dee8d12b7cb67d8497666ec3082e0e209aeb4c84cc26292d43da0820bd14188f3003244a379cf5b6bdb5d3d7d566b42ec2c35d62f1d5713be7395e001 SHA512 c13046f8b0bcc435197c859006b1cfd12b79377f3b90edfd4b77f86ec6d3ca431c716d731be84884f0ec6d6129765cbfbccb5971d0b909c3f45aff8f0b9b45cb
 AUX tar-1.29-extract-pathname-bypass.patch 723 BLAKE2B c63c23dd1f256263cb4d1371e7a3eeccfe1da4aa74c13fd23f9bc1721b06e06d388eb99e1d9d17fb3344875be8b80e2a433f78360c89f6b2b7408302f346d0cc SHA512 ba06ae53b4effcdd0996be07ae03fae7237c579a82d2606fe25100bed447287a68e37282ba2b017eed0c26cb0f4bf77dcdb4fca2f5175e1bbaed91408b0bd54a
 DIST tar-1.29.tar.bz2 2715993 BLAKE2B 656b77a49c463ec7ade87a97b71469dadbf01551131bdf0cfa895b7b2a7d073a4cd51e9bec4169b134d83155aca18af1a89ddb5d14cb1dc0d9968184870d69f3 SHA512 d2cea9892892dfa0c8efd390303b75dccc085c4895e07ced684074592d69729916d6ea12475aa6aff873d076a729bb7dc2499c233edcfb9c7e8e8995481eef3b
+DIST tar-1.30.tar.bz2 2858639 BLAKE2B 82a8b1fbf1eb5c0347b2f8cf35854498e2955eb85eaf041ec44a38bbd9bc82cc7184d5cb858f9905f503c9178ec6d0ed50be2dc27be9933b29e0a18b8e6c0b8f SHA512 07a1157430898fee1a2c6fd3853d59d4ae13998db685669c8c702f73d2466eeb9892f84a5f0495bfe088c8190a643a99ac9f2cb16b85c9fe3ae0d83cc0f338e8
 EBUILD tar-1.29-r1.ebuild 2157 BLAKE2B 4a1e4e3cbbc34cf71f41b5ce9e1f7b8b65a9413fdc3e08bb97f09eb64a4f72b8952461fef59d7b6beca00350ea0b7718d2a4d99d3f9a8a830479d1e194f44641 SHA512 9445561ce892822feb1365f6a227143a3bea6767a19bacea08345057ac2fab80cd5035c81281b27161a443c5103e5432288e9b69ec0fe33218c587ccb9d20a4b
-EBUILD tar-1.29-r2.ebuild 2189 BLAKE2B 8654b43f0a55945e58dc448bf14508bc41f1f008749239408a4055d7ad894a8ef4d5b87eead899c9e07a0793ece33b7583e4cc1fd3cb128225dfae0dc2fcbc28 SHA512 940b2a32fe1058e0a40feb016779927019b45bfa402f4e5a32f44110bd2fea67d08e4df842b9ec93c730a25eb6e6a7408ab01174919828827938875d2579db9c
 EBUILD tar-1.29-r3.ebuild 2237 BLAKE2B a39c564a7349cbe1585566baf6461ef10e3932206af0b7ec82b810050bcd0b756d471605aacc0bf8fd155e18c426a2ba201552b2d9702bd713fb4d4f6ccc8bc2 SHA512 3507c7519fccc100b8f0c12aedfb24ddc907e459a9a66d0cad417f085c05d3d6212654bdf9aabec3ef582f3a90a426c676c34dd7bbbefe79ed76b6f237cf8307
+EBUILD tar-1.30.ebuild 2113 BLAKE2B a4bd375da71e640b23c053badd9bcfc1024bdec8f4374e27a015670900918f643954725f85dea239bb32256b56cdfe96018eff34dc2030a3107474a8dee14c5d SHA512 a1202f7df456107c3c19d080e5daa6534700f7e849b8f78fb74a53495fa5cc7b8d951af31172de8340ce77e39ff7f136627e03d070459ba7f1b82ffc39de5078
 MISC metadata.xml 387 BLAKE2B 6d37d364bd888503b868af168aa496d57abf7bac5c4c69f4c02933b5715312ec65f43babb347d34c665873247e4feaa9b9de2d3bb2d224e1751922c159f2fa87 SHA512 e5bce64bc18a7c6313d0818182941f49ea7e89617c97338fff29297bb2bfc2f4e56a9c124aa97fcb5f2a3a54e0e7cfd209bce09c2ced40a398381b7970c08cf7
diff --git a/app-arch/tar/tar-1.29-r2.ebuild b/app-arch/tar/tar-1.30.ebuild
index 722e7f9b5f0d..7a541404f34b 100644
--- a/app-arch/tar/tar-1.29-r2.ebuild
+++ b/app-arch/tar/tar-1.30.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
-inherit flag-o-matic eutils
+inherit flag-o-matic
 
 DESCRIPTION="Use this to make tarballs :)"
 HOMEPAGE="https://www.gnu.org/software/tar/"
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/tar/${P}.tar.bz2
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="acl elibc_glibc minimal nls selinux static userland_GNU xattr"
 
 RDEPEND="acl? ( virtual/acl )
@@ -21,13 +21,8 @@ DEPEND="${RDEPEND}
 	nls? ( >=sys-devel/gettext-0.10.35 )
 	xattr? ( elibc_glibc? ( sys-apps/attr ) )"
 
-PATCHES=(
-	"${FILESDIR}/${P}-extract-pathname-bypass-upstream.patch" #598334
-)
-
 src_prepare() {
-	epatch "${PATCHES[@]}"
-	epatch_user
+	default
 
 	if ! use userland_GNU ; then
 		sed -i \
@@ -39,16 +34,17 @@ src_prepare() {
 
 src_configure() {
 	use static && append-ldflags -static
-	FORCE_UNSAFE_CONFIGURE=1 \
-	econf \
-		--enable-backup-scripts \
-		--bindir="${EPREFIX}"/bin \
-		--libexecdir="${EPREFIX}"/usr/sbin \
-		$(usex userland_GNU "" "--program-prefix=g") \
-		$(use_with acl posix-acls) \
-		$(use_enable nls) \
-		$(use_with selinux) \
+	local myeconfargs=(
+		--bindir="${EPREFIX}"/bin
+		--enable-backup-scripts
+		--libexecdir="${EPREFIX}"/usr/sbin
+		$(usex userland_GNU "" "--program-prefix=g")
+		$(use_with acl posix-acls)
+		$(use_enable nls)
+		$(use_with selinux)
 		$(use_with xattr xattrs)
+	)
+	FORCE_UNSAFE_CONFIGURE=1 econf "${myeconfargs[@]}"
 }
 
 src_install() {
@@ -69,8 +65,8 @@ src_install() {
 		dosym tar /bin/gtar
 	fi
 
-	mv "${ED}"/usr/sbin/${p}backup{,-tar} || die
-	mv "${ED}"/usr/sbin/${p}restore{,-tar} || die
+	mv "${ED%/}"/usr/sbin/${p}backup{,-tar} || die
+	mv "${ED%/}"/usr/sbin/${p}restore{,-tar} || die
 
 	if use minimal ; then
 		find "${ED}"/etc "${ED}"/*bin/ "${ED}"/usr/*bin/ \
diff --git a/app-arch/unrar/Manifest b/app-arch/unrar/Manifest
index 0119aa5fed85..f5f0ddd8bc03 100644
--- a/app-arch/unrar/Manifest
+++ b/app-arch/unrar/Manifest
@@ -1,5 +1,5 @@
 AUX unrar-5.5.5-build.patch 1021 BLAKE2B f11426cac10efe195a0507ea99c77813284ff8d03aa47f4c10f8d4c93689eac919aa68651bf20393fbadd94bb88439fddaa1448cf00153a2dbfb0468c938f1b1 SHA512 c6875ef2ed3f1cd5e8baae74fdc92c7c44c694169bfaa2b63af10eaacb52dd27ff12360ac6757a82499a0f14fb78cfa1bfbd8391435f95b125a81b2e776f28a0
 AUX unrar-5.5.5-honor-flags.patch 1211 BLAKE2B 8104ac7bf12579218e71147865823da40c3c534a1a13a26f1e59712bfea10c6664a0efce1aff95bd28f35dfb8a50561ff32785416c40c155f047a2368dd76f2d SHA512 a91bc7f4af17fa3a72e6dbd6276afae181554184e8b9ba34c52235d69890ac1e68350d9c14ba7cd207c71220963a26cf1169b965258992cf3b79ec71537c2569
 DIST unrar-5.5.8.tar.gz 222285 BLAKE2B ec6317fc95674a3f282f92762ee89d2fd21d162a96b7b1ea29de9f4ab0ebf0bdb9c3e7141c7146d4bd2e570620db7d7850bc9a8c45a42ef745af1d75d4df5a71 SHA512 9eac83707fa47a03925e5f3e8adf47889064d748304b732d12a2d379ab525b441f1aa33216377d4ef445f45c4e8ad73d2cd0b560601ceac344c60571b77fd6aa
-EBUILD unrar-5.5.8.ebuild 1861 BLAKE2B 194fce94521026875ccc5fbe5b6c5a594f375a7f7d9708d42d3ee5530c385d72d1d29f020a88ca2ad314f641ce6c171d2dcdc227481b29fa36089efbc67efcfc SHA512 dacd50014b98f3698ced2edbc868b59908b6289114cfa0824f88d4190e36664d6e525e3ad677f2db29d3041aba01c54f2f39b9ddcc53b1e6f969a3f0ee8a8f14
+EBUILD unrar-5.5.8.ebuild 1860 BLAKE2B 05707ae5839ec56d2f6238a68fbd52749809e32484bb251a6691191507776996561ac0febf1efad0de6c16bdb82b67ae5f49517b55604953267b7fbae4f347eb SHA512 0f7e829f935d4ad1417b733e384bb9332e12397c18a458c0c456021ce7350862862ac39afa1857faefb013745b0ae823b8d624523f2e3c24d5d27278aa3e650d
 MISC metadata.xml 512 BLAKE2B 260947f2fad1c57508f689b2db22fff72276f40fb91789cfd0b0a2ae63d6710ed186d6350e4a23d19566e3469a097294f95074810652d61cb752a54dfe92ac80 SHA512 4a8c151dbda173dada5635cbd844459a1d999c6c41a2e140a09ba31536e1856d896141471c65b5cb52c9c92229f55c211e01ba23b975f4d25442ffc55ae6a13d
diff --git a/app-arch/unrar/unrar-5.5.8.ebuild b/app-arch/unrar/unrar-5.5.8.ebuild
index 309bb4d4bcb1..870cc370fd97 100644
--- a/app-arch/unrar/unrar-5.5.8.ebuild
+++ b/app-arch/unrar/unrar-5.5.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="unRAR"
 # subslot = soname version
 SLOT="0/5"
-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"
+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=""
 
 RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index 7ee7a324cdbf..c413c172c9a4 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -1,6 +1,6 @@
 DIST xz-5.2.2.tar.gz 1464228 BLAKE2B aea079d094ad23e305eb273c4b126816d36ec3b92e6d626bdf6cb6903bb49183c764b97a85eda52dfe5fb5ebc9bb87913a8caa0523a00acc2d2f4edf70b1418f SHA512 8d6249f93c5c43e1c8eeb21f93b22330fd54575e20bbb4af3d06721192d9f0ca3351878964c9640238ac410b7dd9f16329793c7be7355c7ca0db92c6db6ab813
 DIST xz-5.2.3.tar.gz 1490665 BLAKE2B 470791a67fe635165559b0364c9c0e968f3fc32ba7af53d0173d620ca65c68428e0d4d18ada341a063ea3eabb1b51a71cf873218ca0622fd41e01c20a6f04078 SHA512 a5eb4f707cf31579d166a6f95dbac45cf7ea181036d1632b4f123a4072f502f8d57cd6e7d0588f0bf831a07b8fc4065d26589a25c399b95ddcf5f73435163da6
-EBUILD xz-utils-5.2.2.ebuild 2097 BLAKE2B 3ecb6c0db1210b0fb246cfe39a43f7dcbc7a2b8961655d16ded35184d9acbc67442c2c7c8c554f2cb3e2d92404ffe0bad0fbfa8bb76353d4f5623ed50882afd1 SHA512 19a6df27b09c8911375424a287d138b15e6db3f3c51dcd3b95fc83b3cf2bcffbd8779622e3c398e7a7d623b83b87bb4a272b98976ec12a4248b2ab826bb25f60
-EBUILD xz-utils-5.2.3.ebuild 2111 BLAKE2B 9727e5e45e5265c69e6c1f2211f4bea175354ba59251eaa7bafe30635ec6d7fccaf025cc405061aa8fe7f200d466c157ff53fe028d71449fd80d069cb71d198f SHA512 6f8d099b820445cc5ae05cb62a8e582dc80f0dc9decbe448bedd85fd340ac35313e4d510b61cd1126bb2d95f4776a69e960572a604e29b05cd6736711e500efc
-EBUILD xz-utils-9999.ebuild 2108 BLAKE2B 29a572a22b9979fb25267e3cd857ec6c0c5426d98357e01d5022550e0ed9529c407a4e977a72653a2b5944436be7dfaba206c7133af61f6abb1a2a76c894604c SHA512 46dd4e4c6de3863c0ed400de486905e408eeb33a4d3b2a9155db68001342d89a3a80334b8916df65a90d5b8fdfa4b7ea1220d328a68e97d6f423b4c1af7e85ed
-MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
+EBUILD xz-utils-5.2.2.ebuild 2099 BLAKE2B 5ba3aa8d0f75b216aec28b9fdfde482f008a499ad83e7e77339d19b42fcb4746dc8ecbab40a8bcc90a47409fc5aed9f4fea94698336db1606e85a95f2eb27dfc SHA512 c08130f3f0a71af52f0307f29570112e33b657ca1ea81836d31b4a78bcee20afc02c0e456a0d011325c3f6ee34610aecb4f5de8f258517a9c9ebaa85d128b739
+EBUILD xz-utils-5.2.3.ebuild 2607 BLAKE2B 150f322fb1a07ff66f46e0839a3e9123be7feb048baaaa4efce4c099dac1e7729a302d9aef860e225c88b681dfff443a19d0ad96f17d9848d3b8b456adab6a3d SHA512 3a492a0b8f063e11fe88109f22d2635f6499076d6785ff01f9900add586ce9108d1367974dcb1f93bc65c47d8ce2eb8127e7e4b499430466e7d592dbe0be128e
+EBUILD xz-utils-9999.ebuild 2604 BLAKE2B e2bfd9bf478dc11c5b93aa17b81b5738175255239d1ec79193ba4e69d50cf9d0c1fbfde4a3256d601b651234d5a1baef91c15caa620820e93c58b2ef986a6e65 SHA512 a03a44c48ded24c0a00015d592714a903fd0fc244f67f0c7198e2dd140afee6a59b26ae4c71e3e9d55ddd7b003b954b8b8348fca47ae193aec58f550b8f9f012
+MISC metadata.xml 462 BLAKE2B 66d5625b239d042389ce8fef820efdc3ce3b5cbf21f6d0aedc4874d450ea1897dc8438575f3efc5a491ea857a8b990e6a51b16d0ff0b4982b41307bb52535cf1 SHA512 8f4ca7b987587a240f932ff1719f096de148db6e11c4e0af5f2f55552cab5d0af1256be337dbe8493b584d2c25a70a308dc28b90712078fb58f40cae37cfe5b1
diff --git a/app-arch/xz-utils/metadata.xml b/app-arch/xz-utils/metadata.xml
index 56c124413057..fac09b73379a 100644
--- a/app-arch/xz-utils/metadata.xml
+++ b/app-arch/xz-utils/metadata.xml
@@ -5,4 +5,9 @@
 	<email>base-system@gentoo.org</email>
 	<name>Gentoo Base System</name>
 </maintainer>
+<use>
+	<flag name='extra-filters'>Build additional filters that are not
+		used in any of the default xz presets. This includes delta
+		and BCJ coders, additional match finders and SHA256 checks.</flag>
+</use>
 </pkgmetadata>
diff --git a/app-arch/xz-utils/xz-utils-5.2.2.ebuild b/app-arch/xz-utils/xz-utils-5.2.2.ebuild
index 227aa3cf924f..738007c75cbf 100644
--- a/app-arch/xz-utils/xz-utils-5.2.2.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.2.ebuild
@@ -9,13 +9,13 @@ EAPI="4"
 inherit eutils multilib toolchain-funcs libtool multilib-minimal
 
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="http://git.tukaani.org/xz.git"
+	EGIT_REPO_URI="https://git.tukaani.org/xz.git"
 	inherit git-2 autotools
 	SRC_URI=""
 	EXTRA_DEPEND="sys-devel/gettext dev-vcs/cvs >=sys-devel/libtool-2" #272880 286068
 else
 	MY_P="${PN/-utils}-${PV/_}"
-	SRC_URI="http://tukaani.org/xz/${MY_P}.tar.gz"
+	SRC_URI="https://tukaani.org/xz/${MY_P}.tar.gz"
 	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~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"
 	S=${WORKDIR}/${MY_P}
 	EXTRA_DEPEND=
diff --git a/app-arch/xz-utils/xz-utils-5.2.3.ebuild b/app-arch/xz-utils/xz-utils-5.2.3.ebuild
index b074679f0e09..219b2145b252 100644
--- a/app-arch/xz-utils/xz-utils-5.2.3.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.3.ebuild
@@ -9,13 +9,13 @@ EAPI=5
 inherit eutils multilib toolchain-funcs libtool multilib-minimal
 
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="http://git.tukaani.org/xz.git"
+	EGIT_REPO_URI="https://git.tukaani.org/xz.git"
 	inherit git-2 autotools
 	SRC_URI=""
 	EXTRA_DEPEND="sys-devel/gettext dev-vcs/cvs >=sys-devel/libtool-2" #272880 286068
 else
 	MY_P="${PN/-utils}-${PV/_}"
-	SRC_URI="http://tukaani.org/xz/${MY_P}.tar.gz"
+	SRC_URI="https://tukaani.org/xz/${MY_P}.tar.gz"
 	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"
 	S=${WORKDIR}/${MY_P}
 	EXTRA_DEPEND=
@@ -27,7 +27,7 @@ HOMEPAGE="http://tukaani.org/xz/"
 # See top-level COPYING file as it outlines the various pieces and their licenses.
 LICENSE="public-domain LGPL-2.1+ GPL-2+"
 SLOT="0"
-IUSE="elibc_FreeBSD nls static-libs +threads"
+IUSE="elibc_FreeBSD +extra-filters nls static-libs +threads"
 
 RDEPEND="!<app-arch/lzma-4.63
 	!app-arch/lzma-utils
@@ -35,6 +35,9 @@ RDEPEND="!<app-arch/lzma-4.63
 DEPEND="${RDEPEND}
 	${EXTRA_DEPEND}"
 
+# Tests currently do not account for smaller feature set
+RESTRICT="!extra-filters? ( test )"
+
 src_prepare() {
 	if [[ ${PV} == "9999" ]] ; then
 		eautopoint
@@ -45,12 +48,27 @@ src_prepare() {
 }
 
 multilib_src_configure() {
+	local myconf=(
+		$(use_enable nls)
+		$(use_enable threads)
+		$(use_enable static-libs static)
+	)
+	multilib_is_native_abi ||
+		myconf+=( --disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts} )
+	if ! use extra-filters; then
+		myconf+=(
+			# LZMA1 + LZMA2 for standard .lzma & .xz files
+			--enable-encoders=lzma1,lzma2
+			--enable-decoders=lzma1,lzma2
+			# those are used by default, depending on preset
+			--enable-match-finders=hc3,hc4,bt4
+			# CRC64 is used by default, though some (old?) files use CRC32
+			--enable-checks=crc32,crc64
+		)
+	fi
+
 	use elibc_FreeBSD && export ac_cv_header_sha256_h=no #545714
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable nls) \
-		$(use_enable threads) \
-		$(use_enable static-libs static) \
-		$(multilib_is_native_abi || echo --disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts})
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
 }
 
 multilib_src_install() {
diff --git a/app-arch/xz-utils/xz-utils-9999.ebuild b/app-arch/xz-utils/xz-utils-9999.ebuild
index cf2f6076d65b..26f34b6536a2 100644
--- a/app-arch/xz-utils/xz-utils-9999.ebuild
+++ b/app-arch/xz-utils/xz-utils-9999.ebuild
@@ -9,13 +9,13 @@ EAPI=5
 inherit eutils multilib toolchain-funcs libtool multilib-minimal
 
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="http://git.tukaani.org/xz.git"
+	EGIT_REPO_URI="https://git.tukaani.org/xz.git"
 	inherit git-2 autotools
 	SRC_URI=""
 	EXTRA_DEPEND="sys-devel/gettext dev-vcs/cvs >=sys-devel/libtool-2" #272880 286068
 else
 	MY_P="${PN/-utils}-${PV/_}"
-	SRC_URI="http://tukaani.org/xz/${MY_P}.tar.gz"
+	SRC_URI="https://tukaani.org/xz/${MY_P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~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"
 	S=${WORKDIR}/${MY_P}
 	EXTRA_DEPEND=
@@ -27,7 +27,7 @@ HOMEPAGE="http://tukaani.org/xz/"
 # See top-level COPYING file as it outlines the various pieces and their licenses.
 LICENSE="public-domain LGPL-2.1+ GPL-2+"
 SLOT="0"
-IUSE="elibc_FreeBSD nls static-libs +threads"
+IUSE="elibc_FreeBSD +extra-filters nls static-libs +threads"
 
 RDEPEND="!<app-arch/lzma-4.63
 	!app-arch/lzma-utils
@@ -35,6 +35,9 @@ RDEPEND="!<app-arch/lzma-4.63
 DEPEND="${RDEPEND}
 	${EXTRA_DEPEND}"
 
+# Tests currently do not account for smaller feature set
+RESTRICT="!extra-filters? ( test )"
+
 src_prepare() {
 	if [[ ${PV} == "9999" ]] ; then
 		eautopoint
@@ -45,12 +48,27 @@ src_prepare() {
 }
 
 multilib_src_configure() {
+	local myconf=(
+		$(use_enable nls)
+		$(use_enable threads)
+		$(use_enable static-libs static)
+	)
+	multilib_is_native_abi ||
+		myconf+=( --disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts} )
+	if ! use extra-filters; then
+		myconf+=(
+			# LZMA1 + LZMA2 for standard .lzma & .xz files
+			--enable-encoders=lzma1,lzma2
+			--enable-decoders=lzma1,lzma2
+			# those are used by default, depending on preset
+			--enable-match-finders=hc3,hc4,bt4
+			# CRC64 is used by default, though some (old?) files use CRC32
+			--enable-checks=crc32,crc64
+		)
+	fi
+
 	use elibc_FreeBSD && export ac_cv_header_sha256_h=no #545714
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable nls) \
-		$(use_enable threads) \
-		$(use_enable static-libs static) \
-		$(multilib_is_native_abi || echo --disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts})
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
 }
 
 multilib_src_install() {
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 09267e89bd22..5de83896e69c 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest
index 56f8de517f12..07529ab38e6c 100644
--- a/app-backup/bacula/Manifest
+++ b/app-backup/bacula/Manifest
@@ -3,12 +3,10 @@ AUX 5.2.12/bacula-5.2.12-depend.patch 627 BLAKE2B e2d356a9c157c5ba3979c8008b3627
 AUX 5.2.3/bacula-5.2.3-Makefile.patch 924 BLAKE2B ea4e413f5e1ddb5d23aa030e5d7a4e96b23cd987fc86d2958c5275994198f8aa3705b5554e545440f31cfaed45283e34a08aa4e27087d81edc192d1e9884d63f SHA512 f1b5da39d01f6b00851810c6a0cbcda9ac0561fb165054f6f2c4540943b41af9d524a6a8aca1ae87d55fa8624aecf44c3c0db03c2d7c22690a84c16994289eed
 AUX 5.2.3/bacula-5.2.3-as-needed.patch 765 BLAKE2B be4e29d48974afd31894535dc89c51094f50344609ed1525c46d39a600778df5b458ce5587500a3455cb6e4b601c24dfdd567ad1cd264d108b9852d34e47e64e SHA512 5e303c5c53d6cef8e875d32811d23a9b6f354c394a6dce11646ad3f4c827b03cf1bd3c0267ff8873e1a176eb0b33314b712d8c9dc3c4c4ba24306d80b3bae4c7
 AUX 5.2.3/bacula-5.2.3-doc.patch 464 BLAKE2B d91cb05c18167f0fb00cef5181af07bbe771332b081b9c19c05c3199ebb543f0011d06830048921de6a3a4380500fda3b8871745e744f17605223a2eddf78ff3 SHA512 c4127364c9472f2f7d51ed1b4753e1c539e88c91bf7d796f1594f6c5e193a366fe169ee35818fd21349c3218a3b5631bd7f5110e2674744eb13ba5bbcc82a341
-AUX 5.2.3/bacula-5.2.3-fix-static.patch 2893 BLAKE2B 015dc18409d33b203345c0bc3c7d1d9d7eb1eb0f5a9fb53aa33d0618218bf699ccfd3a3d6f2595c3102941c2bc834d32fe8f61363c4e2c8c8d872971aa0a2908 SHA512 134c6cc739b3beec20fe6e227f7cd8fb8a04d25d039bd25764162e9ccd9b8c99000e0a985748b9d857bc04b19812ef9fbb7d435085501e3183b2c5f4097c57bc
 AUX 5.2.3/bacula-5.2.3-ldflags.patch 389 BLAKE2B 9e1d80037755eba2ae47951aa1e603ac3bac1b26f1cbc0681730ab7ba08846f4670989c517bfe02a6b869b880456e992d3e40fd0d7488d63494a547a902c3c24 SHA512 811fd6ffc2a1c4aeef3afd9001fd2bf01c70ef3f75ed6949ec6b064a9e6ce7a4893ffe464e5c9c67e33fdf92e00b0601500930165891b70d403d31a2ee347434
 AUX 5.2.3/bacula-5.2.3-lib-search-path.patch 631 BLAKE2B 6d7f724d96d3111a09290549dd573f34fbbc856b3eb29671c928b597ce0cdf280f26028e27501f32e312326d9cf1face699ea6e67214e3c2beb6009f6f92f9af SHA512 cad584561a0f1be761c1e5dfd1e777215630aa174d26479397844873dabc63fb717a0123747f532bfc868c4943c1c1e48f12e0c2d4e05fdc871c1c7d6d80f3a2
 AUX 5.2.3/bacula-5.2.3-openssl-1.patch 863 BLAKE2B 32d49a53c8f639e762bd964f4fa1426952ccb2fd595717e015ee9c060e182d9189cf1749cb5e9d90d8712a0b1c3800ad98ba175e48935e7b6d172e6474719456 SHA512 729f01b5e88230561482cbe87fd185707be28ba92252e54a5111f0154f7d3df9cec9e31ee932bbdb34fe8b5e212cf43dc74d46460f68579e5f953ffe565a7a2c
 AUX 7.0.2/bacula-7.0.2-depend.patch 599 BLAKE2B be676329434260e65f7dcbefbfa8d9a04998856ab6743e5f3577e9e316346a22eed45a02960ed8590c946e079ba1e9d814061f67d6ef25c0a72f8bcafe38a48e SHA512 0474e077d89c5b1552f8b1929209db380ac67ca29add78987ad1593b139647a2d1822a0d89c3b117ca93024bffd74da7da5a5f23bc5095492c0cc9e4eddb24f6
-AUX 7.0.2/bacula-7.0.2-fix-static.patch 2651 BLAKE2B 81acb1279e65af19076799bee43f2c1ce016bef5010b0d758b893dc35e442e57ee7ad270d720804bd5918338913e2f660d97cf416137309a6b0f615a9c5cb7b4 SHA512 c3e23760672547ab8cd2591400eb80b8021685069d3069d9e06cdde4de79a7bcb552c189792b3c4aa006dcfcf08f6bde1d4e154efd83cf9882f5bdb5b8cf77e5
 AUX 7.2.0/bacula-7.2.0-doc.patch 435 BLAKE2B 65d528b337f9a3e2eaf456b6dad37ddc59bc1a3f6e54208899346a6bc285fe2b19a464b39cc0c9439c4266baf98c1b3a06afd235b3ee7c88373d3c890163e01a SHA512 27d2839658e3471487dce023c806261e5b5d03212f12eab75885b9b61eb22e57c96e85c07a5f81c812974963904ab81b6ce15abf5381647bd2188abd14139b34
 AUX 7.2.0/bacula-7.2.0-fix-static.patch 2599 BLAKE2B 8b9119b0d6f47cace3e77a93434bec735276ddc8295157aaca67778dad1bbd62603201c011d5457f36b92b0ba9e7975fc4d0d7ca06d33decf510dd805759d210 SHA512 12b241ca20e7d3eff3c4fdf495c3f4f2074e41196379ae3bf5d655299413c0dec263200644745d081e77253fe20b07845d567de71dedb7564a6f64f134c3c905
 AUX 9.0.2/bacula-9.0.2-fix-static.patch 3637 BLAKE2B 4119db6091fdaf7d8d103a166ce672c405da8093e2a04eef5e9bda1cc0e0cde997fef378d92e0fa1531c39281e877aa10f8dd939377924fc7252d6c228722c86 SHA512 218febc3ccbfeccea4a5b05f6086aeff7f4e0e88e3a6670a8a0406101e7276c35d254f4bfa6b6782ea5bdcd1ad8fc5080cff80bb9befcf4d7f968075eb850360
@@ -24,16 +22,15 @@ AUX newscripts/bacula-dir.initd 318 BLAKE2B f482ce3c49ff8106244b62946ab8bc4ab14d
 AUX newscripts/bacula-fd.initd 253 BLAKE2B 38b87d2868f7cc0afb3270f81445832bdf876d20919bf3f5a779595507e50185457464371878b3e18293302a0c1016bce3aca7e432837397bde64a0e6188be8a SHA512 8230bde8cbfdf2fc4892fb90891a85e36b2be42e4f2ea2140248f08f22bcfe3f1d8c3b419347a9b40143c3f2b4c75d7834cbadb3ed8b8372462580ffcf268bf7
 AUX newscripts/bacula-sd.initd 252 BLAKE2B c27f6635ca72c96fc74d1d27c252934ca516cf768a5fec5e043a19d14e7fa67ccfbd6bbbf5da8ee6b718ca7f232565b23216f8ef3adc372681ea4f6bf763f46e SHA512 f4e1252d3e106ebd842cb23c6994cbe29e48e07cff15726479628d1cc5695bd45a0102652203316efcf8a3b3454ad2ca08ee7c6a673880064d15f96c43c395d4
 DIST bacula-5.2.13.tar.gz 4243395 BLAKE2B 5cad5d2675f8a2dd28a76c1a4e4c649d1bf9b031e5e4febfb537a72a0481c2f7c3e80d39b84657238bc147b58174ce544749aed70882f66678edfaa2fb51ac2f SHA512 dfdff353f5b6ed4d85013dc292526706bbd67066f7057a114012172926c819c8df1eb8779166d5a90db3a49a5584f0a8daf7566cc93cf4fa3f1bdda245b55cf0
-DIST bacula-7.0.5.tar.gz 3216406 BLAKE2B 3b0263e254122362e745ac1f8d821f862d0be63cdd0b314c7eb915f52ad07296218ec7c5679a19993c38d26a5ba4146fbc8152bd04c7ae3b9204e41e5104d3b0 SHA512 df7908769fd13a1cb2e0491d3773577db40c0f1c010b887c6dc6d7e0bc0b408fbfc260e6d5a2a34975e5b424152c7f558b33aeedea45f366636739295641394b
 DIST bacula-7.4.4.tar.gz 3312271 BLAKE2B 9c68a3e0d2b610bb65137d15533de272eda2ffc22ba6e73ff9b8631a5d8ca45fc5595928eeb28a577a8e055ccaf82d275424c756b7f4abf9690175b20c75d847 SHA512 37f1fd0d91f027fc12cd43b5e575abf0f8d9ccad805775bd308a06cff843b77cfc599e0d45eaf83536c1be669a5189c35744b5774adaefa606fed31d63888029
 DIST bacula-7.4.6.tar.gz 3312673 BLAKE2B d614b3b58970cfeda2de66108c8663a7f42da8302ac6b19c77a70a81830b5f93c13913dd930d3a35abfbc6910a7dd4757f4ed2a9a2ac70ea3bb5ec0ca986038a SHA512 2d8c47d184dd5d611bf3d209f0d39b0d2e60763bbb757a393c1ddb2fb361de855a4d53d4cbd76f4fda555cc7c069e79eefcb57fc01389a98dec6dc7815d0cde7
 DIST bacula-7.4.7.tar.gz 3312991 BLAKE2B 5ce6306613ac649e0e4fff97d967f174640c3c478a408f003e031a265c83a8b28b3212fa798d9724759c45f2efa5b7c3a5edc607f1be9e3e3d1bfb4d94bfe854 SHA512 2dcffe3f02de8e7dedc11f58aeca58fb95486757579065564753376d3fab7699d7577c189d0d34f8490706d773cd6a95d42ef1f35facb95e6fff10dad085c0d0
 DIST bacula-9.0.3.tar.gz 3951688 BLAKE2B ca7972ff6910f63ae4eb4b828322d9137534462b57fbbac9e110d02795a46d9186d1877e7a17b4c08d671e12ee35c7cf025fbe034c865e5eeeac10c01303a246 SHA512 025cdcc3d92f2674cda7ed2f7d050a8826daf71d0f435d2b34b2514d3f03ab09a299a1882d9d9d51134445f8ba71bb38dc3fabf12d28877604a1b88d92623f7f
+DIST bacula-9.0.6.tar.gz 3984215 BLAKE2B 89d0c83ae1ffd2c2677f5882eebc0feac12780a78f9fcf6d30e44981a09f29dd8bd3f0e55ba963a0ed03099117f2d645cf0402cf528fe939d88210ed547ea157 SHA512 a85b8e089951eb9949c9906af45f204a69cd4a7d2e0f29439b74a29ade20c05a49a8c38665189a46c0ad07af0c97380485e10da6aa53dfc47a22934f589f265e
 EBUILD bacula-5.2.13-r5.ebuild 12205 BLAKE2B 2931fedd3d737d7516f8ddda7182b4c544044c2b9692d0570e89d9f0f0567eb3c579fe72e741fee5bfdbba5d446860e932d70b3306eef28f41930ba60d7bb26b SHA512 5bfa0d04a2ffb8ae2804825c90cd163d5ecbe72469f7c0834200aae86406e8556dedd6939a4148ad61d32eab1b91b1d7a20c28f5ed0606b1b5d227a58f0aaef4
-EBUILD bacula-7.0.5-r1.ebuild 11554 BLAKE2B c898230b5eac96767d3b43d194d93d59d0b78e9ce4c1d7e8bb4b6f1aecbbd37300e34b7ef7d31aabb9db749235466475eec76740e6fe45631d6e0e81d9c1e548 SHA512 5ea59a326e4a4263c73eb07ac98b0700c540fee7bb34899dcd862fe51cbf774a6394ab4e7576536f16871c0e44f6365bc55507a362e3fc8c41da2725debe6d39
-EBUILD bacula-7.0.5-r2.ebuild 11663 BLAKE2B 467331a8b3ea4b88015887d566ed615caca78dbdceb892fbf42de4e0ecbed2167d95bbe731ebf24c0630ab4781de1d898cefa83357f09cbd5778369f6cd17be2 SHA512 a29163b5a24b5d1a2ec8c50dfb68696b62f348751616780920fdca2b29f75db79671d8f7560728468eb24a9909f890107ea4feae2da7fffea8d2cab385932325
 EBUILD bacula-7.4.4-r2.ebuild 11838 BLAKE2B 92f5d0e449df88ca2a71c93483f9b39e3b48d5032392cc45dc3bbf503751ef4c355800baeed03e2a052df31010d51081f8e5cff2313db41502dc97f0fb34a96d SHA512 4a7d1d1a5700bd14dec4121292c5e6b6868498665b76dd2d1f516bf2dbfffb433ba3d014b7eefbe32cd90e85c407d18638103c0dee9dd17fe30e039686dd8bc5
 EBUILD bacula-7.4.6.ebuild 11866 BLAKE2B 92e8f89091d44ce6ca67a36cc01d13c5462f681446cee52250db08d4f4921eb6bb70558b0bed27c44bd3eadb3e24e1f472cfa1072a4f8075717cb9ae56da7473 SHA512 f84a1f04067ece6f9666a111a14be2013a992bfb4aef5f450f065899a06f61a74100732461f8a9a94b1e9b9ae075164bd9564886ec1b20de6ede9fcff6cbfd26
 EBUILD bacula-7.4.7.ebuild 11866 BLAKE2B 92e8f89091d44ce6ca67a36cc01d13c5462f681446cee52250db08d4f4921eb6bb70558b0bed27c44bd3eadb3e24e1f472cfa1072a4f8075717cb9ae56da7473 SHA512 f84a1f04067ece6f9666a111a14be2013a992bfb4aef5f450f065899a06f61a74100732461f8a9a94b1e9b9ae075164bd9564886ec1b20de6ede9fcff6cbfd26
 EBUILD bacula-9.0.3.ebuild 11951 BLAKE2B 55d8dae509ee19c19f6c4e0dfa7b75d55f5f76ca74dd07b89991e431289dd2833e83da9b2367e663d2c4817d69a3b53d356c2ad8d837d472d3d95d37dab797cc SHA512 5d1ce8edf72b57a290ce991cc54c672c45d4e35588bb81963faace7d63f8211296afe2aab85b6c7d86ab6659bec6a03b14d063159bbbae19195910bc2f862c7e
+EBUILD bacula-9.0.6.ebuild 11975 BLAKE2B a6583a0b62fdcda8eed514e52947abf61e2b3f14d5e662500749a584fe6a67b2b04f10a48a5d9f84a23b43b52247b9a867308e5c269531bf423f273c18b48228 SHA512 7f79eb42b9d48f2073bcb4c43333d26c64fb2a43bddcf398483a5b98a025291d037854eec80965e86e1054e6341cdb03184a7ec297bd017a8284a53c302686ca
 MISC metadata.xml 626 BLAKE2B 5794ff725aacf865d2f20f402d057e6358a2c68be16f760f1446b2de5292c9582247ab86417131063e181168f003e1d6f5d200ac0dc3d47da24a3bca688dd93c SHA512 69d63f22a63a53daada5561d751f9903932c9a4596c164894a9aa6465a0f4ac90af99548439545fff1cfbcac9a1eb266a91119cbf73cb13edebd16b440613e55
diff --git a/app-backup/bacula/bacula-7.0.5-r1.ebuild b/app-backup/bacula/bacula-7.0.5-r1.ebuild
deleted file mode 100644
index b1ca466cc162..000000000000
--- a/app-backup/bacula/bacula-7.0.5-r1.ebuild
+++ /dev/null
@@ -1,402 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils multilib qt4-r2 systemd user libtool
-
-MY_PV=${PV/_beta/-b}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Featureful client/server network backup suite"
-HOMEPAGE="http://www.bacula.org/"
-SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE="acl bacula-clientonly bacula-nodir bacula-nosd examples ipv6 logwatch mysql postgres qt4 readline +sqlite ssl static tcpd vim-syntax X"
-
-DEPEND="
-	dev-libs/gmp:0
-	!bacula-clientonly? (
-		postgres? ( dev-db/postgresql:*[threads] )
-		mysql? ( virtual/mysql )
-		sqlite? ( dev-db/sqlite:3 )
-		!bacula-nodir? ( virtual/mta )
-	)
-	qt4? (
-		dev-qt/qtsvg:4
-		x11-libs/qwt:5
-	)
-	logwatch? ( sys-apps/logwatch )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	readline? ( sys-libs/readline:0 )
-	static? (
-		acl? ( virtual/acl[static-libs] )
-		sys-libs/zlib[static-libs]
-		dev-libs/lzo[static-libs]
-		sys-libs/ncurses:=[static-libs]
-		ssl? ( dev-libs/openssl:0[static-libs] )
-	)
-	!static? (
-		acl? ( virtual/acl )
-		sys-libs/zlib
-		dev-libs/lzo
-		sys-libs/ncurses:=
-		ssl? ( dev-libs/openssl:0 )
-	)"
-RDEPEND="${DEPEND}
-	!bacula-clientonly? (
-		!bacula-nosd? (
-			sys-block/mtx
-			app-arch/mt-st
-		)
-	)
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
-
-REQUIRED_USE="!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) )
-				static? ( bacula-clientonly )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	#XOR and !bacula-clientonly controlled by REQUIRED_USE
-	use mysql && export mydbtype="mysql"
-	use postgres && export mydbtype="postgresql"
-	use sqlite && export mydbtype="sqlite3"
-
-	# create the daemon group and user
-	if [ -z "$(egetent group bacula 2>/dev/null)" ]; then
-		enewgroup bacula
-		einfo
-		einfo "The group 'bacula' has been created. Any users you add to this"
-		einfo "group have access to files created by the daemons."
-		einfo
-	fi
-
-	if use bacula-clientonly && use static && use qt4; then
-		ewarn
-		ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt4' useflag."
-		ewarn
-	fi
-
-	if ! use bacula-clientonly; then
-		if [ -z "$(egetent passwd bacula 2>/dev/null)" ]; then
-			enewuser bacula -1 -1 /var/lib/bacula bacula,disk,tape,cdrom,cdrw
-			einfo
-			einfo "The user 'bacula' has been created.  Please see the bacula manual"
-			einfo "for information about running bacula as a non-root user."
-			einfo
-		fi
-	fi
-}
-
-src_prepare() {
-	# adjusts default configuration files for several binaries
-	# to /etc/bacula/<config> instead of ./<config>
-	pushd src >&/dev/null || die
-	for f in console/console.c dird/dird.c filed/filed.c \
-		stored/bcopy.c stored/bextract.c stored/bls.c \
-		stored/bscan.c stored/btape.c stored/stored.c \
-		qt-console/main.cpp; do
-		sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bacula/|g' "${f}" \
-			|| die "sed on ${f} failed"
-	done
-	popd >&/dev/null || die
-
-	# bug 466688 drop deprecated categories from Desktop file
-	sed -i -e 's/Application;//' scripts/bat.desktop.in || die
-
-	# bug 466690 Use CXXFLAGS instead of CFLAGS
-	sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die
-
-	# drop automatic install of unneeded documentation (for bug 356499)
-	epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-doc.patch
-
-	# bug #310087
-	epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch
-
-	# bug #311161
-	epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-lib-search-path.patch
-
-	# bat needs to respect LDFLAGS
-	epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-ldflags.patch
-
-	# bug #328701
-	epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch
-
-	epatch "${FILESDIR}"/7.0.2/${PN}-7.0.2-fix-static.patch
-
-	# do not strip binaries
-	sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die
-	sed -i -e "s/strip /# strip /" src/console/Makefile.in || die
-
-	# fix file not found error during make depend
-	epatch "${FILESDIR}"/7.0.2/${PN}-7.0.2-depend.patch
-
-	# Fix systemd unit files:
-	# bug 497748
-	sed -i -e '/Requires/d' platforms/systemd/*.service.in || die
-	sed -i -e '/StandardOutput/d' platforms/systemd/*.service.in || die
-	# bug 504370
-	sed -i -e '/Alias=bacula-dir/d' platforms/systemd/bacula-dir.service.in || die
-
-	# Fix tmpfiles config for client-only (no bacula user) install
-	# NOTE: Change only first occurance (user) not second (group)
-	# bug 528398
-	if use bacula-clientonly; then
-		sed -i -e 's/bacula/root/' platforms/systemd/bacula.conf.in || die
-	fi
-
-	# fix bundled libtool (bug 466696)
-	# But first move directory with M4 macros out of the way.
-	# It is only needed by i autoconf and gives errors during elibtoolize.
-	mv autoconf/libtool autoconf/libtool1 || die
-	elibtoolize
-}
-
-src_configure() {
-	local myconf=''
-
-	if use bacula-clientonly; then
-		myconf="${myconf} \
-			$(use_enable bacula-clientonly client-only) \
-			$(use_enable !static libtool) \
-			$(use_enable static static-cons) \
-			$(use_enable static static-fd)"
-	else
-		myconf="${myconf} \
-			$(use_enable !bacula-nodir build-dird) \
-			$(use_enable !bacula-nosd build-stored)"
-		# bug #311099
-		# database support needed by dir-only *and* sd-only
-		# build as well (for building bscan, btape, etc.)
-		myconf="${myconf} \
-			--with-${mydbtype} \
-			--enable-batch-insert"
-	fi
-
-	# do not build bat if 'static' clientonly
-	if ! use bacula-clientonly || ! use static; then
-		myconf="${myconf} \
-			$(use_enable qt4 bat)"
-	fi
-
-	myconf="${myconf} \
-		$(use_with X x) \
-		$(use_enable !readline conio) \
-		$(use_enable readline) \
-		$(use_with readline readline /usr) \
-		$(use_with ssl openssl) \
-		$(use_enable ipv6) \
-		$(use_enable acl) \
-		$(use_with tcpd tcp-wrappers)"
-
-	econf \
-		--libdir=/usr/$(get_libdir) \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html \
-		--with-pid-dir=/var/run \
-		--sysconfdir=/etc/bacula \
-		--with-subsys-dir=/var/lock/subsys \
-		--with-working-dir=/var/lib/bacula \
-		--with-logdir=/var/lib/bacula \
-		--with-scriptdir=/usr/libexec/bacula \
-		--with-systemd=$(systemd_get_unitdir) \
-		--with-dir-user=bacula \
-		--with-dir-group=bacula \
-		--with-sd-user=root \
-		--with-sd-group=bacula \
-		--with-fd-user=root \
-		--with-fd-group=bacula \
-		--enable-smartalloc \
-		--disable-afs \
-		--host=${CHOST} \
-		${myconf}
-	# correct configuration for QT based bat
-	if use qt4 ; then
-		pushd src/qt-console
-		eqmake4
-		popd
-	fi
-}
-
-src_compile() {
-	# Make build log verbose (bug #447806)
-	emake NO_ECHO=""
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	doicon scripts/bacula.png
-
-	# install bat icon and desktop file when enabled
-	# (for some reason ./configure doesn't pick this up)
-	if use qt4 && ! use static ; then
-		doicon src/qt-console/images/bat_icon.png
-		domenu scripts/bat.desktop
-	fi
-
-	# remove some scripts we don't need at all
-	rm -f "${D}"/usr/libexec/bacula/{bacula,bacula-ctl-dir,bacula-ctl-fd,bacula-ctl-sd,startmysql,stopmysql}
-
-	# rename statically linked apps
-	if use bacula-clientonly && use static ; then
-		pushd "${D}"/usr/sbin || die
-		mv static-bacula-fd bacula-fd || die
-		mv static-bconsole bconsole || die
-		popd || die
-	fi
-
-	# extra files which 'make install' doesn't cover
-	if ! use bacula-clientonly; then
-	    # the database update scripts
-		diropts -m0750
-		insinto /usr/libexec/bacula/updatedb
-		insopts -m0754
-		doins "${S}"/updatedb/*
-		fperms 0640 /usr/libexec/bacula/updatedb/README
-
-		# the logrotate configuration
-		# (now unconditional wrt bug #258187)
-		diropts -m0755
-		insinto /etc/logrotate.d
-		insopts -m0644
-		newins "${S}"/scripts/logrotate bacula
-
-		# the logwatch scripts
-		if use logwatch; then
-			diropts -m0750
-			dodir /etc/log.d/scripts/services
-			dodir /etc/log.d/scripts/shared
-			dodir /etc/log.d/conf/logfiles
-			dodir /etc/log.d/conf/services
-			pushd "${S}"/scripts/logwatch >&/dev/null || die
-			emake DESTDIR="${D}" install
-			popd >&/dev/null || die
-		fi
-	fi
-
-	if ! use qt4; then
-		rm -vf "${D}"/usr/share/man/man1/bat.1*
-	fi
-	rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.1*
-	if use bacula-clientonly || use bacula-nodir; then
-		rm -vf "${D}"/usr/share/man/man8/bacula-dir.8*
-		rm -vf "${D}"/usr/share/man/man8/dbcheck.8*
-		rm -vf "${D}"/usr/share/man/man1/bsmtp.1*
-		rm -vf "${D}"/usr/libexec/bacula/create_*_database
-		rm -vf "${D}"/usr/libexec/bacula/drop_*_database
-		rm -vf "${D}"/usr/libexec/bacula/make_*_tables
-		rm -vf "${D}"/usr/libexec/bacula/update_*_tables
-		rm -vf "${D}"/usr/libexec/bacula/drop_*_tables
-		rm -vf "${D}"/usr/libexec/bacula/grant_*_privileges
-		rm -vf "${D}"/usr/libexec/bacula/*_catalog_backup
-	fi
-	if use bacula-clientonly || use bacula-nosd; then
-		rm -vf "${D}"/usr/share/man/man8/bacula-sd.8*
-		rm -vf "${D}"/usr/share/man/man8/bcopy.8*
-		rm -vf "${D}"/usr/share/man/man8/bextract.8*
-		rm -vf "${D}"/usr/share/man/man8/bls.8*
-		rm -vf "${D}"/usr/share/man/man8/bscan.8*
-		rm -vf "${D}"/usr/share/man/man8/btape.8*
-		rm -vf "${D}"/usr/libexec/bacula/disk-changer
-		rm -vf "${D}"/usr/libexec/bacula/mtx-changer
-		rm -vf "${D}"/usr/libexec/bacula/dvd-handler
-	fi
-
-	# documentation
-	dodoc ChangeLog ReleaseNotes SUPPORT technotes
-
-	# install examples (bug #457504)
-	if use examples; then
-		docinto examples/
-		dodoc -r examples/*
-	fi
-
-	# vim-files
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins scripts/bacula.vim
-		insinto /usr/share/vim/vimfiles/ftdetect
-		newins scripts/filetype.vim bacula_ft.vim
-	fi
-
-	# setup init scripts
-	myscripts="bacula-fd"
-	if ! use bacula-clientonly; then
-		if ! use bacula-nodir; then
-			myscripts="${myscripts} bacula-dir"
-		fi
-		if ! use bacula-nosd; then
-			myscripts="${myscripts} bacula-sd"
-		fi
-	fi
-	for script in ${myscripts}; do
-		# copy over init script and config to a temporary location
-		# so we can modify them as needed
-		cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd"
-		cp "${FILESDIR}/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
-
-		# now set the database dependancy for the director init script
-		case "${script}" in
-			bacula-dir)
-				case "${mydbtype}" in
-					sqlite3)
-						# sqlite databases don't have a daemon
-						sed -i -e 's/need "%database%"/:/g' "${T}/${script}".initd || die
-						;;
-					*)
-						# all other databases have daemons
-						sed -i -e "s:%database%:${mydbtype}:" "${T}/${script}".initd || die
-						;;
-				esac
-				;;
-			*)
-				;;
-		esac
-
-		# install init script and config
-		newinitd "${T}/${script}".initd "${script}"
-		newconfd "${T}/${script}".confd "${script}"
-	done
-
-	systemd_dounit "${S}"/platforms/systemd/bacula-{dir,fd,sd}.service
-	systemd_dotmpfilesd "${S}"/platforms/systemd/bacula.conf
-
-	# make sure the working directory exists
-	diropts -m0750
-	keepdir /var/lib/bacula
-
-	# make sure bacula group can execute bacula libexec scripts
-	fowners -R root:bacula /usr/libexec/bacula
-}
-
-pkg_postinst() {
-	if use bacula-clientonly; then
-		fowners root:bacula /var/lib/bacula
-	else
-		fowners bacula:bacula /var/lib/bacula
-	fi
-
-	if ! use bacula-clientonly && ! use bacula-nodir; then
-		einfo
-		einfo "If this is a new install, you must create the ${mydbtype} databases with:"
-		einfo "  /usr/libexec/bacula/create_${mydbtype}_database"
-		einfo "  /usr/libexec/bacula/make_${mydbtype}_tables"
-		einfo "  /usr/libexec/bacula/grant_${mydbtype}_privileges"
-		einfo
-	fi
-
-	if use sqlite; then
-		einfo
-		einfo "Be aware that Bacula does not officially support SQLite database anymore."
-		einfo "Best use it only for a client-only installation. See Bug #445540."
-		einfo
-	fi
-
-	einfo "Please note that 'bconsole' will always be installed. To compile 'bat'"
-	einfo "you have to enable 'USE=qt4'."
-	einfo
-}
diff --git a/app-backup/bacula/bacula-7.0.5-r2.ebuild b/app-backup/bacula/bacula-9.0.6.ebuild
index cd88dc439ad2..4cbd1b5794bb 100644
--- a/app-backup/bacula/bacula-7.0.5-r2.ebuild
+++ b/app-backup/bacula/bacula-9.0.6.ebuild
@@ -15,12 +15,12 @@ SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
 LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="acl bacula-clientonly bacula-nodir bacula-nosd examples ipv6 logwatch mysql postgres qt4 readline +sqlite ssl static tcpd vim-syntax X"
+IUSE="acl bacula-clientonly bacula-nodir bacula-nosd examples ipv6 libressl logwatch mysql postgres qt4 readline +sqlite ssl static tcpd vim-syntax X"
 
 DEPEND="
 	dev-libs/gmp:0
 	!bacula-clientonly? (
-		postgres? ( dev-db/postgresql:*[threads] )
+		postgres? ( dev-db/postgresql:=[threads] )
 		mysql? ( virtual/mysql )
 		sqlite? ( dev-db/sqlite:3 )
 		!bacula-nodir? ( virtual/mta )
@@ -37,14 +37,20 @@ DEPEND="
 		sys-libs/zlib[static-libs]
 		dev-libs/lzo[static-libs]
 		sys-libs/ncurses:=[static-libs]
-		ssl? ( dev-libs/openssl:0[static-libs] )
+		ssl? (
+			!libressl? ( dev-libs/openssl:0=[static-libs] )
+			libressl? ( dev-libs/libressl:0=[static-libs] )
+		)
 	)
 	!static? (
 		acl? ( virtual/acl )
 		sys-libs/zlib
 		dev-libs/lzo
 		sys-libs/ncurses:=
-		ssl? ( dev-libs/openssl:0 )
+		ssl? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
 	)"
 RDEPEND="${DEPEND}
 	!bacula-clientonly? (
@@ -112,13 +118,13 @@ src_prepare() {
 	sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die
 
 	# drop automatic install of unneeded documentation (for bug 356499)
-	epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-doc.patch
+	epatch "${FILESDIR}"/7.2.0/${PN}-7.2.0-doc.patch
 
 	# bug #310087
 	epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch
 
 	# bug #311161
-	epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-lib-search-path.patch
+	epatch "${FILESDIR}"/9.0.2/${PN}-9.0.2-lib-search-path.patch
 
 	# bat needs to respect LDFLAGS
 	epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-ldflags.patch
@@ -126,7 +132,10 @@ src_prepare() {
 	# bug #328701
 	epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch
 
-	epatch "${FILESDIR}"/7.0.2/${PN}-7.0.2-fix-static.patch
+	epatch "${FILESDIR}"/9.0.2/${PN}-9.0.2-fix-static.patch
+
+	# fix soname in libbaccat.so bug #602952
+	epatch "${FILESDIR}/bacula-fix-sonames.patch"
 
 	# do not strip binaries
 	sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die
@@ -144,16 +153,9 @@ src_prepare() {
 	# bug 584442 and 504368
 	sed -i -e 's/@dir_user@/root/g' platforms/systemd/bacula-dir.service.in || die
 
-	# Fix tmpfiles config for client-only (no bacula user) install
-	# NOTE: Change only first occurance (user) not second (group)
-	# bug 528398
-	if use bacula-clientonly; then
-		sed -i -e 's/bacula/root/' platforms/systemd/bacula.conf.in || die
-	fi
-
 	# fix bundled libtool (bug 466696)
 	# But first move directory with M4 macros out of the way.
-	# It is only needed by i autoconf and gives errors during elibtoolize.
+	# It is only needed by autoconf and gives errors during elibtoolize.
 	mv autoconf/libtool autoconf/libtool1 || die
 	elibtoolize
 }
@@ -174,9 +176,15 @@ src_configure() {
 		# bug #311099
 		# database support needed by dir-only *and* sd-only
 		# build as well (for building bscan, btape, etc.)
-		myconf="${myconf} \
-			--with-${mydbtype} \
+		myconf="${myconf}
+			--with-${mydbtype}"
+		if use mysql; then
+		    myconf="${myconf} \
+			--disable-batch-insert"
+		else
+		    myconf="${myconf} \
 			--enable-batch-insert"
+		fi
 	fi
 
 	# do not build bat if 'static' clientonly
@@ -270,10 +278,10 @@ src_install() {
 		# the logwatch scripts
 		if use logwatch; then
 			diropts -m0750
-			dodir /etc/log.d/scripts/services
-			dodir /etc/log.d/scripts/shared
-			dodir /etc/log.d/conf/logfiles
-			dodir /etc/log.d/conf/services
+			dodir /usr/share/logwatch/scripts/services
+			dodir /usr/share/logwatch/scripts/shared
+			dodir /etc/logwatch/conf/logfiles
+			dodir /etc/logwatch/conf/services
 			pushd "${S}"/scripts/logwatch >&/dev/null || die
 			emake DESTDIR="${D}" install
 			popd >&/dev/null || die
@@ -309,7 +317,7 @@ src_install() {
 	fi
 
 	# documentation
-	dodoc ChangeLog ReleaseNotes SUPPORT technotes
+	dodoc ChangeLog ReleaseNotes SUPPORT
 
 	# install examples (bug #457504)
 	if use examples; then
@@ -339,7 +347,7 @@ src_install() {
 		# copy over init script and config to a temporary location
 		# so we can modify them as needed
 		cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd"
-		cp "${FILESDIR}/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
+		cp "${FILESDIR}/newscripts/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
 
 		# now set the database dependancy for the director init script
 		case "${script}" in
@@ -365,7 +373,6 @@ src_install() {
 	done
 
 	systemd_dounit "${S}"/platforms/systemd/bacula-{dir,fd,sd}.service
-	systemd_dotmpfilesd "${S}"/platforms/systemd/bacula.conf
 
 	# make sure the working directory exists
 	diropts -m0750
@@ -389,6 +396,13 @@ pkg_postinst() {
 		einfo "  /usr/libexec/bacula/make_${mydbtype}_tables"
 		einfo "  /usr/libexec/bacula/grant_${mydbtype}_privileges"
 		einfo
+
+		ewarn "ATTENTION!"
+		ewarn "The format of the database may have changed."
+		ewarn "If you just upgraded from a version below 9.0.0 you must run"
+		ewarn "'update_bacula_tables' now."
+		ewarn "Make sure to have a backup of your catalog before."
+		ewarn
 	fi
 
 	if use sqlite; then
diff --git a/app-backup/bacula/files/5.2.3/bacula-5.2.3-fix-static.patch b/app-backup/bacula/files/5.2.3/bacula-5.2.3-fix-static.patch
deleted file mode 100644
index c875c40eced3..000000000000
--- a/app-backup/bacula/files/5.2.3/bacula-5.2.3-fix-static.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- src/console/Makefile.in.orig	2011-10-30 14:10:41.100802721 -0400
-+++ src/console/Makefile.in	2011-10-30 14:14:42.330488174 -0400
-@@ -29,10 +29,11 @@
- GETTEXT_LIBS = @LIBINTL@
- 
- CONS_INC=@CONS_INC@
- CONS_LIBS=@CONS_LIBS@
- CONS_LDFLAGS=@CONS_LDFLAGS@
-+ZLIBS=@ZLIBS@
- 
- .SUFFIXES:	.c .o
- .PHONY:
- .DONTCARE:
- 
-@@ -46,17 +47,17 @@
- 	@echo " "
- 
- 
- bconsole: Makefile $(CONSOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
- 	$(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \
--	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
--	      $(OPENSSL_LIBS)
-+	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \
-+	      $(OPENSSL_LIBS) $(LIBS)
- 
- static-bconsole: Makefile $(CONSOBJS) ../lib/libbac.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
- 	$(LIBTOOL_LINK) $(CXX) -static $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \
--	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
--	      $(OPENSSL_LIBS)
-+	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \
-+	      $(OPENSSL_LIBS) $(LIBS)
- 	strip $@
- 
- 
- Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
- 	cd $(topdir) \
---- src/filed/Makefile.in.orig	2011-10-30 08:03:42.000000000 -0400
-+++ src/filed/Makefile.in	2011-10-30 14:15:28.018102837 -0400
-@@ -92,17 +92,17 @@
- 	@rm -f bacula-fd.exe
- 
- bacula-fd:  Makefile $(SVROBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@
- 	@echo "Linking $@ ..."
- 	$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(SVROBJS) \
--	  $(WIN32LIBS) $(FDLIBS) $(ZLIBS) $(LZOLIBS) -lbacfind -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(LIBS) \
--	  $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS)
-+	  $(WIN32LIBS) $(FDLIBS) $(ZLIBS) $(LZOLIBS) -lbacfind -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) \
-+	  $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS)
- 
- static-bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind.a ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@
- 	$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../findlib -o $@ $(SVROBJS) \
--	   $(WIN32LIBS) $(FDLIBS) $(ZLIBS) $(LZOLIBS) -lbacfind -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(LIBS) \
--	   $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS)
-+	   $(WIN32LIBS) $(FDLIBS) $(ZLIBS) $(LZOLIBS) -lbacfind -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) \
-+	   $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS)
- 	strip $@
- 
- Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
- 	cd $(topdir) \
- 	  && CONFIG_FILES=$(thisdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/app-backup/bacula/files/7.0.2/bacula-7.0.2-fix-static.patch b/app-backup/bacula/files/7.0.2/bacula-7.0.2-fix-static.patch
deleted file mode 100644
index 0f1b2afd0579..000000000000
--- a/app-backup/bacula/files/7.0.2/bacula-7.0.2-fix-static.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- src/console/Makefile.in.orig	2011-10-30 14:10:41.100802721 -0400
-+++ src/console/Makefile.in	2011-10-30 14:14:42.330488174 -0400
-@@ -29,10 +29,11 @@
- GETTEXT_LIBS = @LIBINTL@
- 
- CONS_INC=@CONS_INC@
- CONS_LIBS=@CONS_LIBS@
- CONS_LDFLAGS=@CONS_LDFLAGS@
-+ZLIBS=@ZLIBS@
- 
- .SUFFIXES:	.c .o
- .PHONY:
- .DONTCARE:
- 
-@@ -46,17 +47,17 @@
- 	@echo " "
- 
- 
- bconsole: Makefile $(CONSOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
- 	$(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \
--	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
--	      $(OPENSSL_LIBS)
-+	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \
-+	      $(OPENSSL_LIBS) $(LIBS)
- 
- static-bconsole: Makefile $(CONSOBJS) ../lib/libbac.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
- 	$(LIBTOOL_LINK) $(CXX) -static $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \
--	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
--	      $(OPENSSL_LIBS)
-+	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \
-+	      $(OPENSSL_LIBS) $(LIBS) $(ZLIBS)
- 	strip $@
- 
- 
- Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
- 	cd $(topdir) \
---- src/filed/Makefile.in.orig	2012-06-28 16:52:03.000000000 +0200
-+++ src/filed/Makefile.in	2012-08-16 11:08:09.000000000 +0200
-@@ -89,13 +89,13 @@
- bacula-fd:  Makefile $(SVROBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
- 	@echo "Linking $@ ..."
- 	$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(SVROBJS) \
--	  $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \
--	  $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
-+	  $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \
-+	  $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
- 
- static-bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
- 	$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../findlib -o $@ $(SVROBJS) \
--	   $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \
--	   $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
-+	   $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \
-+	   $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
- 	strip $@
- 
- Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 9e80088a71e9..3f8e277a2020 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/acme-tiny/Manifest b/app-crypt/acme-tiny/Manifest
index 25b1ca9734a4..8108624d7365 100644
--- a/app-crypt/acme-tiny/Manifest
+++ b/app-crypt/acme-tiny/Manifest
@@ -2,6 +2,6 @@ AUX acme-tiny-PR101-contactinfo.patch 4110 BLAKE2B b9ea7e33d59afc9e432a5533894dd
 AUX acme-tiny-PR50-setup.py.patch 4568 BLAKE2B d88c62ab1e30bf67036c104b2d39d300a6e4e89d45115126f31137692c721d995620fb40d6110be5ee02e439d3f8315f8cebe96f52ec4250d1dddf20a6cfe79b SHA512 41daa64e2517950f3863bf0573aa80304fb43a2221f4ea048b52fac64c5cc3b91b52d3dd6b6d791760c29accf26383a559f2956f27467528a1f7eb11ae8449d3
 AUX acme-tiny-PR87-readmefix.patch 821 BLAKE2B f785d2403e368765eee41afc2c6e929ac3c9b0505c6a51d0057b7a14fc6458353519392d8c97c4f123e852589b762a877dc48a040031f156647bf9f11951bda7 SHA512 20dde53915bfc93cd48811cedfdf95405ed7322c277615c0f24969d9071a416db9dff51ce8c0c93af46e9ecfc3ae10bf0ab777576ea2f30a0a5419bd2b406404
 DIST acme-tiny-20170917.tar.gz 10516 BLAKE2B e9d4ae170579cd5379dbb4d900d051bc1789ac994eb491aafb9952cd004b3e3feed20ef505f88587035f3f16163e7965a1b3883caaaa8c2327fca6be0240a17f SHA512 0bfb0d064f21f9d89e3c5863f33c7326c02948a42e2c8dc11c7b5baaf5e0dfcaeba0ad461b2ad12e292cc14f64b44f331f11b56dda6592a4663baf0714048700
-EBUILD acme-tiny-20170917.ebuild 1101 BLAKE2B b63d644588e52c4fa0a6dd7a24a0677ab5b55ce24eb07e8ea917841f3859d34befc497930abbf315d81781b984ba3ea7e89365c54d2aefd15398326ff49c77c1 SHA512 4389b68c2a1e59e088369a279eb9312fd9beb00ac8f48bbc2d4a7bfd451775c79cc185ca5a667b955a41e1e14c6749693863c0d85106abf5b465561ab7b8dfd0
-EBUILD acme-tiny-99999999.ebuild 1101 BLAKE2B b63d644588e52c4fa0a6dd7a24a0677ab5b55ce24eb07e8ea917841f3859d34befc497930abbf315d81781b984ba3ea7e89365c54d2aefd15398326ff49c77c1 SHA512 4389b68c2a1e59e088369a279eb9312fd9beb00ac8f48bbc2d4a7bfd451775c79cc185ca5a667b955a41e1e14c6749693863c0d85106abf5b465561ab7b8dfd0
+EBUILD acme-tiny-20170917.ebuild 1105 BLAKE2B 20bbc1d5c97de09d06426c323b7d42e290312c9c7d5059fb922ddffdb05da5f10f0ba4471371716f622f93404556cb4916ec301b4436475d5145826e245dd276 SHA512 3939b70cdb1b924fbfc067378f1357ceee0c789dcaba4f3071b7a6550959d01f161617ee00df1a14c66209beb68f4c46f01d6e4e5c61230ed4c4d3800b6aabf4
+EBUILD acme-tiny-99999999.ebuild 1105 BLAKE2B 20bbc1d5c97de09d06426c323b7d42e290312c9c7d5059fb922ddffdb05da5f10f0ba4471371716f622f93404556cb4916ec301b4436475d5145826e245dd276 SHA512 3939b70cdb1b924fbfc067378f1357ceee0c789dcaba4f3071b7a6550959d01f161617ee00df1a14c66209beb68f4c46f01d6e4e5c61230ed4c4d3800b6aabf4
 MISC metadata.xml 429 BLAKE2B 101ebd6c130b6955951254d1c7e759dbf7d5dc08d899c2bf1793e3e73ad2aec4761782d9bcbd708a42a0217cda22255fb645cc6f88792aa0a5445c6b2df79289 SHA512 7c0ff5126424ad18a75bd73fdab208397aedf79df6c6a3fc776efe1000ac9f41e3cd056e65da68fbba507940328c0308074ce9335c4be38a8197f7545728d9da
diff --git a/app-crypt/acme-tiny/acme-tiny-20170917.ebuild b/app-crypt/acme-tiny/acme-tiny-20170917.ebuild
index c185d2543155..b85a76447997 100644
--- a/app-crypt/acme-tiny/acme-tiny-20170917.ebuild
+++ b/app-crypt/acme-tiny/acme-tiny-20170917.ebuild
@@ -31,7 +31,7 @@ RDEPEND="dev-libs/openssl:0"
 PATCHES=( "${FILESDIR}/${PN}-PR50-setup.py.patch" )
 
 pkg_setup() {
-	if [[ ${PV} != 9999 ]]; then
+	if [[ ${PV} != 99999999 ]]; then
 		export SETUPTOOLS_SCM_PRETEND_VERSION="0.1.dev79+n${HASH:0:7}.d$(date +%Y%m%d)"
 	fi
 }
diff --git a/app-crypt/acme-tiny/acme-tiny-99999999.ebuild b/app-crypt/acme-tiny/acme-tiny-99999999.ebuild
index c185d2543155..b85a76447997 100644
--- a/app-crypt/acme-tiny/acme-tiny-99999999.ebuild
+++ b/app-crypt/acme-tiny/acme-tiny-99999999.ebuild
@@ -31,7 +31,7 @@ RDEPEND="dev-libs/openssl:0"
 PATCHES=( "${FILESDIR}/${PN}-PR50-setup.py.patch" )
 
 pkg_setup() {
-	if [[ ${PV} != 9999 ]]; then
+	if [[ ${PV} != 99999999 ]]; then
 		export SETUPTOOLS_SCM_PRETEND_VERSION="0.1.dev79+n${HASH:0:7}.d$(date +%Y%m%d)"
 	fi
 }
diff --git a/app-dicts/Manifest.gz b/app-dicts/Manifest.gz
index 64d919996055..335fdb8ff9ae 100644
--- a/app-dicts/Manifest.gz
+++ b/app-dicts/Manifest.gz
diff --git a/app-dicts/gnome-dictionary/Manifest b/app-dicts/gnome-dictionary/Manifest
index 32e022162af6..e53c4c326598 100644
--- a/app-dicts/gnome-dictionary/Manifest
+++ b/app-dicts/gnome-dictionary/Manifest
@@ -1,5 +1,7 @@
 DIST gnome-dictionary-3.20.0.tar.xz 871916 BLAKE2B 8f2c2ad2f93c8d6f97b3609427923352c975c5a35899b645683cbda13f5eb4b1b7630f05ff95a0a42ecaef8227c21ab3cab8c637b6d1172d46d60f5c637e9170 SHA512 9be2564b5bf543e80afdb946c16b16e2daf6c31875e352b7c2d7e34436791fc9470eadb42eba3a4c1893e2f2568e6bb88d19ea4a0b8dbb2eca2dd4c95aeaf229
 DIST gnome-dictionary-3.24.0.tar.xz 878756 BLAKE2B c6e7d16965147eea44b2fe438f94c31488cd3b6edeb9e815d5a9314ca46de793596844cc8fae5daa77110011549ed598924591a6ef4c675e6c7d743ed660d3e6 SHA512 1c31149b02978a1840563941767e3ce2be4f6a5e790eb9126c0f0c50d932987f46447fe3bac0e2eb8ce87be1521d13e56d8a14e86407e367a6dd76cd5a77de30
+DIST gnome-dictionary-3.24.1.tar.xz 880500 BLAKE2B f730276612d2578e7b25121b49be9639cf7a9fc67bda9687285f6d3873d3b825301246447d968b24ed29240a1b0e7fc48d63c8454e704b799eebdf340f5f6da2 SHA512 b3ee838888a97e914add58dd4b61fa096b9488aab360815f2e7b674e7a57b237849a1ccaf107c1e94968e534b24ee24d827c42a3a1b0dfd8c5ef25eeb90456d3
 EBUILD gnome-dictionary-3.20.0.ebuild 1030 BLAKE2B f4fee35b925276939363fb807b65f38336c43a7311fe2ff943c4c3249190ba32957bef6959ce32e2c529d10ac83904e081af32faef5867e6f98083e3f05d86e9 SHA512 a8ea676441356eb5ffd912efaafcff2f4d50fcf8b2dee05b529ff86d9f3fb3db73e4aefb2d5f6fa875c10c840bb6318d8484140cb6f3100d450b8cf4509386e9
 EBUILD gnome-dictionary-3.24.0.ebuild 1034 BLAKE2B 6f704cfd5338f3291e1fc6d4e43b32eb7fc1679fd3474d952d6d9d13781d1f22f7b0704907eb7a61503049631d11bccf90163d799c23ac4c67c24f5c43a7ac0a SHA512 290457aea7645de74718303621508627c8efd80892216c63bce1579633fb1a0be0616c185fbf86124ba7dc38c39c44ae0b6e8ebf230f160735517228017a16b4
+EBUILD gnome-dictionary-3.24.1.ebuild 1034 BLAKE2B 6f704cfd5338f3291e1fc6d4e43b32eb7fc1679fd3474d952d6d9d13781d1f22f7b0704907eb7a61503049631d11bccf90163d799c23ac4c67c24f5c43a7ac0a SHA512 290457aea7645de74718303621508627c8efd80892216c63bce1579633fb1a0be0616c185fbf86124ba7dc38c39c44ae0b6e8ebf230f160735517228017a16b4
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-dicts/gnome-dictionary/gnome-dictionary-3.24.1.ebuild b/app-dicts/gnome-dictionary/gnome-dictionary-3.24.1.ebuild
new file mode 100644
index 000000000000..72899df9509a
--- /dev/null
+++ b/app-dicts/gnome-dictionary/gnome-dictionary-3.24.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="Dictionary utility for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Dictionary"
+
+LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+"
+SLOT="0/10" # subslot = suffix of libgdict-1.0.so
+IUSE="debug +introspection ipv6"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.42:2[dbus]
+	x11-libs/cairo:=
+	>=x11-libs/gtk+-3.21.1:3
+	x11-libs/pango
+	introspection? ( >=dev-libs/gobject-introspection-1.42:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	gnome-base/gsettings-desktop-schemas
+	!<gnome-extra/gnome-utils-3.4
+"
+# ${PN} was part of gnome-utils before 3.4
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-doc-am-1.15
+	>=dev-util/intltool-0.40
+	dev-util/itstool
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+"
+
+src_configure() {
+	gnome2_src_configure \
+		$(usex debug --enable-debug=yes ' ') \
+		$(use_enable introspection) \
+		$(use_enable ipv6)
+}
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index e09979063760..bfb9ffaa2786 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/e-uae/Manifest b/app-emulation/e-uae/Manifest
index 3dd75879cd08..1d5e494d095c 100644
--- a/app-emulation/e-uae/Manifest
+++ b/app-emulation/e-uae/Manifest
@@ -1,5 +1,4 @@
 AUX e-uae-0.8.29_rc4-high-cpu-usage.patch 399 BLAKE2B 0b8d1126bafe49ecf1ca03c23efe51287a8b8b565084560caae054f2997d61c86f248e2bca3b511bf6e283fed8c47639d5ea266a147acc77cbb4b1cabc3b7f94 SHA512 a0d6dbe9dedbabb7700e2199d62814732a0d6f09be7758aa70565ba4d4cc1a86d848e3a9b5c743871a0052ee1b19b03615ee38a174634c7a339d218bab350b18
 DIST e-uae-0.8.29-WIP4.tar.bz2 1122718 BLAKE2B 4120e7d14e4ee1a8be04839680c30dc57286524a68eb8036a8f48a0724c3581884045c2ad11bb8409a88b2f43bd132b92083e1e1cc088c5b4768f3b6dfdef458 SHA512 63d5c60ca017ba7ffaba32c4d7edceba0410b773066cc58e226c8cc2c92152eb3689698b0affe478cc63c996c731fbbf56d9028dfd000394d904f193f860473f
-EBUILD e-uae-0.8.29_rc4-r2.ebuild 4262 BLAKE2B a0cac4a45221baf189d94a7195c56ee1f27dc84cb665ec97d75d49162ce3863bca72dc989b987626e5464f28be395dfcd80de229e53d20f3e610cd8f362b48e2 SHA512 36d9ea8f03060b6f8ab1a8cd6171b718b6e8e7acf46a32075ca21fce2e114cfe2a80ddb1a524b03cd3d6e1d8c421203af515442f07ed6896307564ff914acd49
 EBUILD e-uae-0.8.29_rc4-r3.ebuild 4185 BLAKE2B 1e59421bdcac3a9a08601feadbcd401f7b625b84b1a75821501d21d8c2410b78423b8cc1bfc48e36a51661f46fc563651e5c4389f1eb90f174486f7894c66546 SHA512 feb662e50ffd86c592c0c00b1b93fa8548d8c8b4a507e18f9f949ba9e10d8b554efd95d333b31c64cbb6efff61c455bae15a82d1f9582f1be4d075c1419f9f65
 MISC metadata.xml 465 BLAKE2B ddab23755d4ac531a0963f024bd4aff9b727f94a3aed47184a32a7e6f6c0b6b9d441c74cccd29028e831c9f290c8539a263317cc0e0d23928932a2f68c576429 SHA512 d66cf721c85633855983c22d2fd18e75635afe1fdd987b12a35f23caf1acb241398815ae643682864d3cd5099983b9b9c7581828ccd4668aca9d5b56fe9a8a00
diff --git a/app-emulation/e-uae/e-uae-0.8.29_rc4-r2.ebuild b/app-emulation/e-uae/e-uae-0.8.29_rc4-r2.ebuild
deleted file mode 100644
index ed2d49d5ea66..000000000000
--- a/app-emulation/e-uae/e-uae-0.8.29_rc4-r2.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-
-inherit eutils flag-o-matic pax-utils
-
-DESCRIPTION="The Ubiquitous Amiga Emulator with an emulation core largely based on WinUAE"
-HOMEPAGE="http://www.rcdrummond.net/uae/"
-# We support _rcX for WIPX versions and _preYYYYMMDD for CVS snapshots.
-if [[ "${PV%%_rc*}" = "${PV}" ]] ; then
-	# _pre is used, cvs version
-	my_ver=${PV%%_pre*}
-	snap_ver=${PV##*_pre}
-	S="${WORKDIR}"/${PN}-${my_ver}-${snap_ver}
-	SRC_URI="http://www.rcdrummond.net/uae/test/${snap_ver}/${PN}-${my_ver}-${snap_ver}.tar.bz2"
-else
-	my_ver=${PV%%_rc*}
-	WIP_ver=${PV##*_rc}
-	S="${WORKDIR}"/${PN}-${my_ver}-WIP${WIP_ver}
-	SRC_URI="http://www.rcdrummond.net/uae/${PN}-${my_ver}-WIP${WIP_ver}/${PN}-${my_ver}-WIP${WIP_ver}.tar.bz2"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="X dga ncurses sdl alsa oss sdl-sound capslib"
-
-# Note: opposed to ./configure --help zlib support required! Check
-# src/Makefile.am that includes zfile.c unconditionaly.
-RDEPEND="X? ( x11-libs/libXt
-			 x11-libs/libxkbfile
-			 x11-libs/libXext
-			 x11-misc/xkeyboard-config
-			 dga? ( x11-libs/libXxf86dga
-				    x11-libs/libXxf86vm )
-			)
-		!X? ( sdl? ( media-libs/libsdl )
-			  !sdl? ( sys-libs/ncurses ) )
-		alsa? ( media-libs/alsa-lib )
-		!alsa? ( sdl-sound? ( media-libs/sdl-sound ) )
-		capslib? ( >=games-emulation/caps-20060612 )
-		sys-libs/zlib
-		virtual/cdrtools"
-
-DEPEND="${RDEPEND}
-		X? ( dga? ( x11-proto/xf86vidmodeproto
-					x11-proto/xf86dgaproto ) )"
-
-src_prepare() {
-	# Fix for high cpu use when compiled with --disable-audio
-	use alsa || use sdl-sound || use oss || epatch "${FILESDIR}"/${P}-high-cpu-usage.patch
-}
-
-src_configure() {
-	strip-flags
-
-	local myconf
-
-	# Sound setup.
-	if use alsa; then
-		elog "Choosing alsa as sound target to use."
-		myconf="--with-alsa --without-sdl-sound"
-	elif use sdl-sound ; then
-		if ! use sdl ; then
-			ewarn "sdl-sound is not enabled because sdl USE flag is disabled. Leaving"
-			ewarn "sound on oss autodetection."
-			myconf="--without-alsa --without-sdl-sound"
-			ebeep
-		else
-			elog "Choosing sdl-sound as sound target to use."
-			ewarn "E-UAE with the SDL audio back-end doesn't work correctly in Linux."
-			ewarn "Better use alsa... You've been warned ;)"
-			ebeep
-			myconf="--without-alsa --with-sdl-sound"
-		fi
-	elif use oss ; then
-		elog "Choosing oss as sound target to use."
-		ewarn "oss will be autodetected. See output of configure."
-		myconf="--without-alsa --without-sdl-sound"
-	else
-		ewarn "There is no alsa, sdl-sound or oss in USE. Sound target disabled!"
-		myconf="--disable-audio"
-	fi
-
-	# VIDEO setup. X is autodetected (there is no --with-X option).
-	if use X ; then
-		elog "Using X11 for video output."
-		ewarn "Fullscreen mode is not working in X11 currently. Use sdl."
-		myconf="$myconf --without-curses --without-sdl-gfx"
-		use dga && ewarn "To use dga you have to run e-uae as root."
-		use dga && myconf="$myconf --enable-dga --enable-vidmode"
-	elif use sdl ; then
-		elog "Using sdl for video output."
-		myconf="$myconf --with-sdl --with-sdl-gfx --without-curses"
-	elif use ncurses; then
-		elog "Using ncurses for video output."
-		myconf="$myconf --with-curses --without-sdl-gfx"
-	else
-		ewarn "There is no X or sdl or ncurses in USE!"
-		ewarn "Following upstream falling back on ncurses."
-		myconf="$myconf --with-curses --without-sdl-gfx"
-		ebeep
-	fi
-
-	# bug #415787
-	myconf="$myconf --disable-ui"
-
-	myconf="$myconf $(use_with capslib caps)"
-
-	myconf="$myconf --with-zlib"
-
-	# And explicitly state defaults:
-	myconf="$myconf --enable-aga"
-	myconf="$myconf --enable-autoconfig --enable-scsi-device --enable-cdtv --enable-cd32"
-	myconf="$myconf --enable-bsdsock"
-
-	econf ${myconf} \
-		--with-libscg-includedir="${EPREFIX}"/usr/include/scsilib \
-		|| die "./configure failed"
-}
-
-src_compile() {
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	# The emulator needs to be able to create executable heap
-	# - doesn't need trampoline emulation though.
-	pax-mark me "${ED}/usr/bin/uae"
-
-	# Rename it to e-uae
-	mv "${ED}/usr/bin/uae" "${ED}/usr/bin/e-uae"
-	mv "${ED}/usr/bin/readdisk" "${ED}/usr/bin/e-readdisk"
-
-	dodoc docs/* README ChangeLog
-}
diff --git a/app-emulation/spim/Manifest b/app-emulation/spim/Manifest
index 7b537e250197..150814403c8a 100644
--- a/app-emulation/spim/Manifest
+++ b/app-emulation/spim/Manifest
@@ -1,6 +1,5 @@
 AUX spim-8.0-r1-respect_env.patch 5058 BLAKE2B dabd459ef87e3c9db6304703d2067297f4be53af269ab9b1335dc38302c2e828ab6e9b357e45619fbe4dbdb375abb2dd91795e728a25e9772b3bdaf0a7e3e846 SHA512 adc8bb7815f15a0dfbd67e14875d7f5773c3b0153e9f031a957a9b6deeb0cf2dfd1983b835d7446467433c044a1caea0c13ba43ee5e4f77d5096cd62e2c27948
 AUX xspim.svg 8364 BLAKE2B 0a2f13b78c87e821b6d669a750ea1be0003442f75c20c5387954c1e6c11f99f80b9e1a42ea88bc4e894011ff08cb8b40450674ec415d1be18eb63d5e2a9b0188 SHA512 1860705ef2677b5bd84b7cdf4daf3143033050e5ed014e22d63fc3bec48a0a296a9767fa7cbf7ab71f31c5cc712e40be0799a9c43b96c789273de7604d57c0d5
 DIST spim-8.0.tar.gz 355204 BLAKE2B c7da952df552c5e070c601e7c3d251f15988d377e1c9943730f6cf8eee1e3b64ec4a05b56d4bdbc181b811aa349e3b08fccf0b9ccfc3efe2c0e410580e70dd7f SHA512 c4eb66863a931b74d6c6ecd92860d16fd6369c85caecba1e71a1149e73e708502d1070f17a9beb6d0af1368db1ee5a85c040b596866a1236275cdd410a661adf
-EBUILD spim-8.0-r1.ebuild 1657 BLAKE2B 49409b65a0cb79baa5a09f3f359a7e2c6b9610e88c70e1d520d17877694b426bb7872b191d94c6b586bd3a42bdc3c5f992ff251afe9600251e69980a11526936 SHA512 659885a8a65cfe8e254f76e0c845ceb44966fd10b94585845f0a3b8e9f259606b98042d75af1f0d8bd0803469fce28b4176a3251c560dad1a895460e08cfe23b
 EBUILD spim-8.0-r2.ebuild 1570 BLAKE2B 6a03d3b73d84f3a7bbf2b97d31f24465e23762fcb43b30239b5448ed9effce184d7bd6fc5e2ffd0714e3c5be44f0051f219b69a940d443d466bf7e76cd2d1fda SHA512 743da7bb89dcadb1be9bdbdebc86b64594d8b37d666230809f3440fb2df2f547ba25c78cfd43f6cc0d828e4071905f4f7915d2d78f8f98fa9be3e3145051888f
 MISC metadata.xml 465 BLAKE2B a26e388f7a6a0610e0fb4d4c59b0d1a60c3934927f41e0d953dfab8cef1c9fc5da06902263ba29d984db1f0d1d3f636d503b8fe605571f4976e9bbd3e28cf4be SHA512 624df1312b5a85232c892f18eb39a62877c085d79461cf875b46a107eeaf5b99a9062e8f175a62c80565d42b26144ab2227d2f97b2d67fe16e66890e2843fe6c
diff --git a/app-emulation/spim/spim-8.0-r1.ebuild b/app-emulation/spim/spim-8.0-r1.ebuild
deleted file mode 100644
index afb39577ff43..000000000000
--- a/app-emulation/spim/spim-8.0-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=3
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="MIPS Simulator"
-HOMEPAGE="http://spimsimulator.sourceforge.net/"
-SRC_URI="http://www.cs.wisc.edu/~larus/SPIM/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="doc X"
-
-RDEPEND="X? ( media-fonts/font-adobe-100dpi
-	x11-libs/libXaw
-	x11-libs/libXp )"
-DEPEND="${RDEPEND}
-	X? ( x11-misc/imake
-		x11-proto/xproto )
-	>=sys-apps/sed-4
-	sys-devel/bison"
-# test hangs forever, disabling it
-RESTRICT="test"
-
-src_prepare() {
-	# fix bugs 240005 and 243588
-	epatch "${FILESDIR}/${PF}-respect_env.patch"
-
-	#fix bug 330389
-	sed -i -e 's:-12-\*-75-:-14-\*-100-:g' xspim/xspim.c || die
-}
-
-src_configure() {
-	tc-export CC
-	emake -C spim configuration || die
-
-	if use X; then
-		emake -C xspim configuration || die
-	fi
-}
-
-src_compile() {
-	emake DESTDIR="${EPREFIX}" -C spim || die
-
-	if use X; then
-		emake DESTDIR="${EPREFIX}" EXCEPTION_DIR=/var/lib/spim \
-			-C xspim -j1 xspim || die
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${ED}" -C spim install || die
-	newman Documentation/spim.man spim.1 || die
-
-	if use X; then
-		emake DESTDIR="${ED}" -C xspim install || die
-		newman Documentation/xspim.man xspim.1 || die
-	fi
-
-	doicon "${FILESDIR}"/xspim.svg || die
-	make_desktop_entry xspim xSPIM xspim "ComputerScience;Science;Education"
-
-	dohtml Documentation/SPIM.html || die
-	dodoc ChangeLog Documentation/BLURB README VERSION || die
-	if use doc ; then
-		dodoc Documentation/TeX/{cycle,spim}.ps || die
-	fi
-}
-
-src_test() {
-	emake -C spim test || die
-}
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index bda704a79e47..4890ac09efa2 100644
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
diff --git a/app-eselect/eselect-miniaudicle/Manifest b/app-eselect/eselect-miniaudicle/Manifest
index 0728017ebb26..9b8e711e8d1e 100644
--- a/app-eselect/eselect-miniaudicle/Manifest
+++ b/app-eselect/eselect-miniaudicle/Manifest
@@ -1,5 +1,4 @@
 AUX miniaudicle-1.0.1_list.patch 609 BLAKE2B 62ddbbe8e038abc5f0052a92bd87b76d2360ce4cc66c7fb103fe70070ec88734d8ca3123eecba03c4e29e63057696bad8df4be6ad1748eeb27f5aeb20d43f375 SHA512 891564338f5e8abb27168cf73636c68b9ff2fcd2a4397c59386686d77196df7df5f51c48c09d1472ff1fa6805c75768ad304cba7180e1b9912ba8a262111e2d0
 DIST miniaudicle.eselect-1.0.1.bz2 1284 BLAKE2B a38ae814fd968a6c00d44fe2e178a33f06664ac7ac090a8ed57a8ddac67dcc07bb76360ddcd0dbcac8bda600c12c32e815065a9f7b2c96929edbdb517548c912 SHA512 259a9e566fcdaae04ed845c1fc797faba422dd562da3721d6d07c1b6ea6de856f7e9fe4dfe5c6895b464231c3e9dfa7fa8718a49085fc3e8f79b9e4c4c340085
-EBUILD eselect-miniaudicle-1.0.1-r1.ebuild 631 BLAKE2B d1936bc4d76451b93cfe0d52e7becee0b56bac179f29deb8dc836eabd1d11cfad39638a8b31920df488532b740199a8cc38405c59ca3c45395ce8c13474dd304 SHA512 b707348535a45bd55410de5766e78efd104f9998f4178ab80a7b6472e39a1c383bc608559546a411ba881645a6269837da83a93d2243d05b26f843cf3271a135
 EBUILD eselect-miniaudicle-1.0.1-r2.ebuild 631 BLAKE2B 68af7bf03cbfc146c498059284303ff6c779827970e0281fd0564c3bde9a565284c0197650c76c3cdd7b2439f4d4ebdf767164a6d53e3caeef1d4e46569f390b SHA512 1b0c527cd639630c251026322bb6f15c06f98e02f0839d77e39516b07a2f0e7f102fdf69a66ee8bef14e0722a34e91b0fed2e4065bc774f30ad56a0dcd436973
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-eselect/eselect-miniaudicle/eselect-miniaudicle-1.0.1-r1.ebuild b/app-eselect/eselect-miniaudicle/eselect-miniaudicle-1.0.1-r1.ebuild
deleted file mode 100644
index 1e7b96c335d3..000000000000
--- a/app-eselect/eselect-miniaudicle/eselect-miniaudicle-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=3
-
-inherit eutils
-
-DESCRIPTION="Manages the /usr/bin/miniAudicle symlink"
-HOMEPAGE="https://www.gentoo.org/"
-SRC_URI="mirror://gentoo/miniaudicle.eselect-${PV}.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=app-admin/eselect-1.2.3"
-
-src_prepare() {
-	# Fixes listing as described in bug 320189, not upstream yet
-	epatch "${FILESDIR}"/miniaudicle-1.0.1_list.patch
-}
-
-src_install() {
-	insinto /usr/share/eselect/modules
-	newins "${WORKDIR}/miniaudicle.eselect-${PV}" miniaudicle.eselect || die
-}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 27794eb092e8..882fa8de9e13 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/anki/Manifest b/app-misc/anki/Manifest
index 0e4e8f8711fe..b6f87436d548 100644
--- a/app-misc/anki/Manifest
+++ b/app-misc/anki/Manifest
@@ -1,3 +1,4 @@
+AUX anki-2.1.0_beta25-web-folder.patch 498 BLAKE2B 5a89ac454e8b4c551c7593bc8d428f9512d1304bd7fd5aa9380a301d92f10ca126a1a319c2ec831d1d5be99c6941c4307a2b674f0a15d2d554b1443fdf053421 SHA512 779806afd6c0eaaac149c89bbe8da2394630aa5a611001307808339f29237b4d7f3db7e1f66241ef67e179a5ab96d64371e1b198044cd9f88389d03a5c9d8478
 DIST anki-2.0.31.tgz 3329290 BLAKE2B e0aeb020e545b308d56893c1864f5a4e8835a85444066fb325fd0394c334189324b7be012429642503c4dcb113bfaf10c7a4d0c140bd43ab2a862960b79c3b12 SHA512 3e6e29247d83b026ece6974007c848822360a812838dbb718cf3f1423fc9d015236b027944cd99f3b419e0fe4fe6cb2390d185f00646af727ec8e76f4aa3cbb8
 DIST anki-2.0.33.tgz 3376646 BLAKE2B 0118c08dc903387b0b17255addc1efa550e4b9408f21804d35207cf1bb58006f2a5114bf6425b30ceeb8d438d8da7cd2a56274a9bceb24a8eaeb98646d2ba6a8 SHA512 ac2df1ac94e5aa4cc04c17d41b8f96788b5f321860bc20b4a167d5ee0161ca4f7f586fda08ac9910a706ec3e7d1bd692d2e74f3de56997c9ce480122396e0d6d
 DIST anki-2.0.34.tgz 3411136 BLAKE2B 7d488077165d2b01b89b62bb4d81b084b38a7d0bbf4a376ba0f7694cfef95d2a148a05af13d8a14babedf2fac835f2c8d196b380f422902f311779b020ea64d6 SHA512 289e937be7174b24b5213166d5d434a265ebef313815dbe105de6e21c83c6cf0cba93000e489b050fc5a04fc80bac25a71e7a42adad55bf2a1a2a246890dacdd
@@ -7,6 +8,7 @@ DIST anki-2.0.41.tgz 3422038 BLAKE2B 43f816b47ec17381de192f71680b3df8a0dade74379
 DIST anki-2.0.43.tgz 3422113 BLAKE2B 04bd8c028122dfd74fdeb92297da7bd7af04fc093e87bd156bc61558a328a8249115baf14a666eeb7a7ce7b29e2276d1ef03e028a916d178fa88080ad229aea2 SHA512 e50ee4cf6fd7be266b6d38682e28a06b51cc42a2667f35fbafa755152d47bbadb2fbd2baa771d13e73f39973a4102d626fbe7327a5de05efbc3700d7a2c9909c
 DIST anki-2.0.47.tgz 3422231 BLAKE2B 192803df52a97cfe31f58914453836aa8dfd341572f812855e551faf9345506acce0176c0966c08e6b8ffac4f5ff36eb5eb76eac9ebc397ebe27e1fec0233e62 SHA512 5e4bbaac6d60506f43adfec1c4ff83285ac423405bfba57b566e7a9d632a22cf0f9ca7fe3eff3ce56c516a6cbb0112e5251319f11ba984d74bffd2c25e04c64a
 DIST anki-2.1.0_beta25.tgz 4117303 BLAKE2B 0f7021c4da4efa918c285fa6bf85242e52999d0f340d4a882651cf1e2857ac015f6f99967d4a7fee6df92a2b3c4849eb838707b08abd04d534f4d21ce28eb749 SHA512 9ddf984c575df00fe9b7974f24166a0f18d63e904b3d9bd4370de506828a251efed0fb319f06dc23c6852aae46e552994c6633880603a6e746d4d242b9e627f8
+DIST anki-2.1.0_beta27.tgz 4127906 BLAKE2B b4f83cc30dc3e89f3ca17c03ba8dcfc9a487de43d8ac564d5dc83488e286c302816c8a8140aa764b596404194c5f3727218deec303ef201ccaef38b945d8b32d SHA512 50b4ece1361ecafdfe08dad04e9b622b1e8ba2224bfef7e4660c95f81cb8f525d892170548d741ff53bc19ff4c13863f488a71c31c8328511fea3203d2c345f1
 EBUILD anki-2.0.31.ebuild 1548 BLAKE2B 86eeb8986612f9772848c51ae3106e4b3cf0aaa1462266d6312f48be41f2ea6448df8477f6699f92a19270fe5a63cfb51309b51b5f66d3fce2657396abb4e9d5 SHA512 c53dadfb9ed9106915de6f456de56975688578f01617e928e043c79271ee573150d64b0f010d6026423833a065faf63e24410bf42859920911258ea49093aca4
 EBUILD anki-2.0.33.ebuild 1294 BLAKE2B ab10bda89d0b1b2801e2b7690fb5cbb2015f7673427934f9c2cf4f3909d33bea9131e50b6154b00260d850e87c6580b34b34bf8d49569ec891665cb6361ded17 SHA512 1a2abf48874cb5facea0c85ad10278d7a6e90d7c0d23e5fc9e7de203f12a221450673ed11f54d8f1f400368691b2d8d64c7c15bbe7596fa01a497e42c1a838cd
 EBUILD anki-2.0.34.ebuild 1296 BLAKE2B 4d3c6ed18c4dafac170ff8584908857d6b67dcdd511cf7ab7e5aedbc233fbcdec51c6031599728959615d269afc5eb249d6955c5b8790e5e00402c500049558b SHA512 88a5c498fa2ff9aeda8ccbce9ad2ba515e1e3a088531e00310052298fa60eae6b40ec640418ff37c9f451f11dfc87971e71a3c8c628ab4271ff2702003468aef
@@ -15,5 +17,6 @@ EBUILD anki-2.0.36.ebuild 1296 BLAKE2B 4d3c6ed18c4dafac170ff8584908857d6b67dcdd5
 EBUILD anki-2.0.41.ebuild 1325 BLAKE2B 5ee3436415524e8e515d2882757171e047679a0a06858c2f83ac277dc7f95aff174ddd86e5bc4b0443a7b5a13d8265f84b0efc08b2d52074141be2cb2e838751 SHA512 5dc09ba11eb492f6d77ed90cd113e29bca357f6d49b357481e1c99ec73d22bbcf0423db9abf1dda8dc0488927455970007c851ce188738625cadde6a46f3a5bc
 EBUILD anki-2.0.43.ebuild 1407 BLAKE2B 45724e254c0ec8523144634d20010efb9898447285991ba3f4ad0faf4be76786e5d36ef3bf5a4e2aa942a02bbdcb2f2f0b75ef7cacd374b971f4225de1e169dc SHA512 6d52decb78cfd69476ec57e135b00fe77dd83fdd51af9ca92938e8208016fd381296d287e4213be50ed4243e6680b12606a792d8a8916f150899a60665464fb9
 EBUILD anki-2.0.47.ebuild 1407 BLAKE2B 45724e254c0ec8523144634d20010efb9898447285991ba3f4ad0faf4be76786e5d36ef3bf5a4e2aa942a02bbdcb2f2f0b75ef7cacd374b971f4225de1e169dc SHA512 6d52decb78cfd69476ec57e135b00fe77dd83fdd51af9ca92938e8208016fd381296d287e4213be50ed4243e6680b12606a792d8a8916f150899a60665464fb9
-EBUILD anki-2.1.0_beta25.ebuild 1459 BLAKE2B c4e039f1cf321e19ab17b32a8b24707029eccf441ee74925d343b8a90fe68ba6f80ed3eeecc9a896dd9637b220ee7fdd8fdb0ea78055c9a19b57b58810085e0b SHA512 d111bb91d6e77d6b7abe777e0d2e3e1774735ae5967e9c44c19c13b0e51bcadce2d410f18113bc23be2b26b356c438631cd630bde40891e49a6e5adf58f619ad
+EBUILD anki-2.1.0_beta25.ebuild 1881 BLAKE2B ff530eefc984bd972004a51c5b958102e31ace78ce8042b567311e8a79ed65b44ed901c675f58b7a386400a1bb3beee6dffe9ecc598ced33d10afd6fb7ce565c SHA512 8faab45dd5c2def4a01083669569f4389f975ed43359b072b24f62e80f32009de34b6b6c5939998f829d4f90d47eb6be310e589f2410b038f7cf7d40bbdf121a
+EBUILD anki-2.1.0_beta27.ebuild 1906 BLAKE2B e59b807d0f57e661c8ebe916dca9cb2b67c3e4161229d2d1af30b5c4dc59aa497678ec8ac4fead542b36677de2395d19f890d02acf83c6b1e8d33e3553938751 SHA512 e5d6b3ee23ab3a5aad0c77f23281e3bc3ba50e26ea66de5d1885d55e6639f70f46ce019ba2b309d86b6a6900c5ba3ab26d42542d743dc8c8d10479436aecf44c
 MISC metadata.xml 619 BLAKE2B a41d6e72dccb367627bfc34855a7f2dc657021907f1940c837ea99f134bf30cccb84157c6eea96944fee4e4d5275c329b5721abcabfb31b3a572b86789cd0ed2 SHA512 8b6656964a3c2cee9761b278839f31546a3fe2a4efd500cd015658af3502b548888e939bbeee45ead9c88632ade12c7f0ed33fcf8cdfc6d0ac91de63ac8bb351
diff --git a/app-misc/anki/anki-2.1.0_beta25.ebuild b/app-misc/anki/anki-2.1.0_beta25.ebuild
index ac3413e622b6..71268203040c 100644
--- a/app-misc/anki/anki-2.1.0_beta25.ebuild
+++ b/app-misc/anki/anki-2.1.0_beta25.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
-PYTHON_COMPAT=( python3_4 python3_5 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="sqlite"
 
-inherit eutils python-single-r1
+inherit eutils python-single-r1 xdg
 
 DESCRIPTION="A spaced-repetition memory training program (flash cards)"
 HOMEPAGE="https://apps.ankiweb.net"
@@ -18,13 +18,16 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
-IUSE="latex +recording +sound"
+IUSE="latex +recording +sound test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
 	dev-python/PyQt5[gui,svg,webkit,${PYTHON_USEDEP}]
 	>=dev-python/httplib2-0.7.4[${PYTHON_USEDEP}]
-	dev-python/beautifulsoup[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/decorator[${PYTHON_USEDEP}]
+	dev-python/markdown[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/send2trash[${PYTHON_USEDEP}]
 	recording? (
 		media-sound/lame
@@ -34,25 +37,32 @@ RDEPEND="${PYTHON_DEPS}
 	latex? (
 		app-text/texlive
 		app-text/dvipng
-	)"
-DEPEND=""
+	)
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+PATCHES=( "${FILESDIR}"/${P}-web-folder.patch )
 
 pkg_setup() {
 	python-single-r1_pkg_setup
 }
 
 src_prepare() {
+	default
 	sed -i -e "s/updates=True/updates=False/" \
 		aqt/profiles.py || die
 }
 
-# Nothing to configure or compile
-src_configure() {
+src_compile() {
 	:;
 }
 
-src_compile() {
-	:;
+src_test() {
+	sed -e "s:nosetests:${EPYTHON} ${EROOT}usr/bin/nosetests:" \
+		-i tools/tests.sh || die
+	./tools/tests.sh || die
 }
 
 src_install() {
@@ -68,4 +78,9 @@ src_install() {
 	# Localization files go into the anki directory:
 	python_moduleinto anki
 	python_domodule locale
+
+	# not sure if this is correct, but
+	# site-packages/aqt/mediasrv.py wants the directory
+	insinto /usr/share/anki
+	doins -r web
 }
diff --git a/app-misc/anki/anki-2.1.0_beta27.ebuild b/app-misc/anki/anki-2.1.0_beta27.ebuild
new file mode 100644
index 000000000000..470db2ae7ad8
--- /dev/null
+++ b/app-misc/anki/anki-2.1.0_beta27.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_6 )
+PYTHON_REQ_USE="sqlite"
+
+inherit eutils python-single-r1 xdg
+
+DESCRIPTION="A spaced-repetition memory training program (flash cards)"
+HOMEPAGE="https://apps.ankiweb.net"
+
+MY_P="${P/_/}"
+SRC_URI="https://apps.ankiweb.net/downloads/beta/${MY_P}-source.tgz -> ${P}.tgz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="latex +recording +sound test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/PyQt5[gui,svg,webkit,${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.7.4[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/decorator[${PYTHON_USEDEP}]
+	dev-python/markdown[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/send2trash[${PYTHON_USEDEP}]
+	recording? (
+		media-sound/lame
+		>=dev-python/pyaudio-0.2.4[${PYTHON_USEDEP}]
+	)
+	sound? ( media-video/mplayer )
+	latex? (
+		app-text/texlive
+		app-text/dvipng
+	)
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.1.0_beta25-web-folder.patch )
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	sed -i -e "s/updates=True/updates=False/" \
+		aqt/profiles.py || die
+}
+
+src_compile() {
+	:;
+}
+
+src_test() {
+	sed -e "s:nosetests:${EPYTHON} ${EROOT}usr/bin/nosetests:" \
+		-i tools/tests.sh || die
+	./tools/tests.sh || die
+}
+
+src_install() {
+	cp tools/runanki.system tools/anki
+	doicon ${PN}.png
+	domenu ${PN}.desktop
+	doman ${PN}.1
+
+	dodoc README.md README.development
+	python_domodule aqt anki
+	python_doscript tools/anki
+
+	# Localization files go into the anki directory:
+	python_moduleinto anki
+	python_domodule locale
+
+	# not sure if this is correct, but
+	# site-packages/aqt/mediasrv.py wants the directory
+	insinto /usr/share/anki
+	doins -r web
+}
diff --git a/app-misc/anki/files/anki-2.1.0_beta25-web-folder.patch b/app-misc/anki/files/anki-2.1.0_beta25-web-folder.patch
new file mode 100644
index 000000000000..19b196c4ace7
--- /dev/null
+++ b/app-misc/anki/files/anki-2.1.0_beta25-web-folder.patch
@@ -0,0 +1,11 @@
+--- anki-2.1.0beta25/aqt/mediasrv.py
++++ anki-2.1.0beta25/aqt/mediasrv.py
+@@ -13,7 +13,7 @@
+ # locate web folder in source/binary distribution
+ def _getExportFolder():
+     # running from source?
+-    srcFolder = os.path.join(os.path.dirname(__file__), "..")
++    srcFolder = os.path.join(os.path.dirname(__file__), "..", "..", "..", "..", "share", "anki")
+     webInSrcFolder = os.path.abspath(os.path.join(srcFolder, "web"))
+     if os.path.exists(webInSrcFolder):
+         return webInSrcFolder
diff --git a/app-misc/color/Manifest b/app-misc/color/Manifest
index b2f08c46eb0e..09671a68b029 100644
--- a/app-misc/color/Manifest
+++ b/app-misc/color/Manifest
@@ -1,5 +1,4 @@
 AUX 1.2-ldflags.patch 404 BLAKE2B e07b9c473e8b673d11c3837c6759c5beacc58fcf81ed1b9f0804d614fedc524983c237eb83be33182a384997f666842af554a950d26d8e7106f109ab5beee6b1 SHA512 44c774102cf9800b38d0831be640758a802cb2fdc2949036617ee23a47565944d514ecbee6532d2f426c766aef48814f362f7e0cb27ce8b280295af106426380
 DIST color-1.2.tar.gz 10040 BLAKE2B 1359f77e88c1c20d3643d6b00cad43fe5fbdb26d406d338132a5541668482c1a14e452ff502c10164f2d32d5c79b390328ffdad85012093d69fd767255f08fda SHA512 58f7d379bca3352b2e39eab83d2fa5891df86c45722541eb810becce813c8e866f28b856ed244a75b173f0dab5dbdc84ceb91d96175dcd2484e29abb98ba87ac
-EBUILD color-1.2-r1.ebuild 928 BLAKE2B 0eea3419323e7fd5ce411d681d385d9f45e1b73363b5620b31cc9a0ee63014ce68e998dcd61546c28f9e0cf25b01c8905b487de65c2690af1ed0f9e7100778b2 SHA512 7f0243170bcc20ee29f9cde198a2e8c77fb46b2a1b22f0e32bdfc0f1046671773ca8ebb87927f5ba1bce8688bee879e490a69de2dfeb58fa4586a630e688b403
-EBUILD color-1.2-r2.ebuild 901 BLAKE2B 9c0eb4975f57c6e97e8acab664f13a1f59a7163a57b94f56c68ef9526ac1046b469963c5ec4670f565dd374efc7d9d9f45f07b19222bd3b271f6cd1359208012 SHA512 d4a970dfe571ee1765d7b61c89e5eca6464af362df225553250ec482f789353fbc67ad15fc14036d76fb3b968a7351f2ab45b08b6ad93e04e3e008b42c391ccb
+EBUILD color-1.2-r2.ebuild 900 BLAKE2B 6957a36ac51ab4e082e7738ecce00a8e760da19dd04048b9ab0822eb0931114d5839e6f0ce195550bceefc69279c4259715ea350f34f8558fa18129720c86ac6 SHA512 d033d6fde544788f6867636f7ef0222c8edec1f5ccf5d5327caa843a48f0a30ec610732f08fa536e033793b707049e6ea05810206cc47e028761984a869ed92c
 MISC metadata.xml 588 BLAKE2B a751663c366701d7dccc560ea5e3961c5a2c428d98c341b8b74267c5bb1369c200fcf8c8f5c9d88fcd17ef072c3d98994501be12ff35445cb2c9397a44ec901f SHA512 eb169977c0c6512fc4a6bdd31083a0175bc2c5688f6eafc36807dd82494e2bea9dd263f3c2982ac059f50589cbcfbaf03b1e49eff20f7fc99c1f1b76c5f0fae6
diff --git a/app-misc/color/color-1.2-r1.ebuild b/app-misc/color/color-1.2-r1.ebuild
deleted file mode 100644
index 5a0666ada122..000000000000
--- a/app-misc/color/color-1.2-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Easily add ANSI colouring to shell scripts"
-HOMEPAGE="http://www.runslinux.net/?page_id=10"
-SRC_URI="http://runslinux.net/projects/color/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-ldflags.patch
-	tc-export CC
-}
-
-src_install() {
-	dobin color || die "dobin failed"
-	dodoc CHANGELOG README || die
-
-	# symlink for british users.
-	dosym color /usr/bin/colour || die
-}
-
-pkg_postinst() {
-	elog "For information on using colour in your shell scripts,"
-	elog "run \`color\` without any arguments."
-	elog
-	elog "To see all the colours available, use this command"
-	elog "	$ color --list"
-	elog
-	elog "More examples are available in ${EPREFIX}/usr/share/doc/${PF}."
-}
diff --git a/app-misc/color/color-1.2-r2.ebuild b/app-misc/color/color-1.2-r2.ebuild
index 417e2f29c155..198bbcc3a821 100644
--- a/app-misc/color/color-1.2-r2.ebuild
+++ b/app-misc/color/color-1.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://runslinux.net/projects/color/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE=""
 
 src_prepare() {
diff --git a/app-misc/countrycodes/Manifest b/app-misc/countrycodes/Manifest
index 0d696e2963b1..f9cb73a1ac69 100644
--- a/app-misc/countrycodes/Manifest
+++ b/app-misc/countrycodes/Manifest
@@ -2,5 +2,5 @@ AUX 1.0.5-Makefile.patch 1034 BLAKE2B 54c932527ba2eb9cfc9906571ab4e683e854359b67
 DIST countrycodes-1.0.5.tar.gz 18621 BLAKE2B 1f2e1fb0f96d1388687929895c310e1e93c320f4d3f3f4cfe19c50d2ab850bafcefb5e13cfdaed546237ae5873eb95ae574ac47c0048bc2fa37c96158b5082fe SHA512 d62beaaccdbc8f7e14f3edf0044aeeef6375a3deffc0e4246a49fb8209ed7256208c878f811950c5c3bfda729988a46c173aecec72ee66e8843932d97064f035
 EBUILD countrycodes-1.0.5-r1.ebuild 779 BLAKE2B 3ed03fcf595652fd0cbccb4ab35add74a243a546e5b7776a1201a166ba9e20001f9bf51789f530021f6903d8b1fdb49e34a69987081be3d0d47c57f251db3f81 SHA512 df6a20cdb6634bded9ff057623280d36989df3337bbde00b175fe8d75f095d2e3c02740c5e13994a188d7916fa5227b92f835368aad4a1e9dab6ff7c913d0ac9
 EBUILD countrycodes-1.0.5-r2.ebuild 740 BLAKE2B 83c64a8aa6ef050c3b806995cbf97186278ce7b443590a2adcd6400a2f259b58ecdcb8d5ff4896036b79d77ba1ab8b080e24d0586bb2805add75c787104799eb SHA512 d086a6445262ac67c4785d42f05d9067adeda4f7b8a1457f487393ca8bcd7db5556d7df20ddaf4a2fe7e2ec3d5abbc62ec4b1680138fad05d7bfce83b7d19e12
-EBUILD countrycodes-1.0.5-r3.ebuild 723 BLAKE2B dd8fe0002b833626fe58e5d9494314a6ba1c8ca1ebc0cf8d836bf48770a24b9967d22b31bfe0030ac43aaa37f0c75537cf0015d61596b82f2ffd5c7d53b827d9 SHA512 87f426e2ac6beeb3b13053139bdd89edf880479a693e718cf83b8bf8de092f601f35e2fedd4b7d2fa63c7bc20af193e1b45ec215ff2a702c3539eaee4a1f7023
+EBUILD countrycodes-1.0.5-r3.ebuild 722 BLAKE2B 1fbb1a60ec2a7c46863836660730b17c45b718e7640a710d5e2bfa237e0ca9f213d03b16331d2cc7e4f14954314b1c9725c23e17746bcffeb739eeeb4453f5e2 SHA512 579efc2e84cf9876b693b88a07f741a55dd3977df76d71cfcf84143427e772d0ef27b14c8deca8ac5171da9a5e83e972251195f811d5e2abdbc044d1f1b93734
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-misc/countrycodes/countrycodes-1.0.5-r3.ebuild b/app-misc/countrycodes/countrycodes-1.0.5-r3.ebuild
index a1ccc0e0d3ac..ce3a3d069812 100644
--- a/app-misc/countrycodes/countrycodes-1.0.5-r3.ebuild
+++ b/app-misc/countrycodes/countrycodes-1.0.5-r3.ebuild
@@ -11,11 +11,11 @@ SRC_URI="http://www.grigna.com/diego/linux/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 
 S="${WORKDIR}"/${P}/src
 
-PATCHES=( "${FILESDIR}"/${PV}-Makefile.patch )
+PATCHES=( "${FILESDIR}/${PV}-Makefile.patch" )
 
 src_prepare() {
 	default
diff --git a/app-misc/khard/Manifest b/app-misc/khard/Manifest
new file mode 100644
index 000000000000..11792bd64a96
--- /dev/null
+++ b/app-misc/khard/Manifest
@@ -0,0 +1,3 @@
+DIST khard-0.11.4.tar.gz 5060159 BLAKE2B 2c176c8bc9651dfd05f3792a66a242eae44b64f9114098916ec8c6e91643c5d57a19f916a0f6e0c559738e1a6c59f88596a54068ba048219a7e4a4d60447a0fe SHA512 f8dda3dd34e529e24276933f5f7354891b8259dfabb8818b4d3898174fb3d8b8a1f24cf81038901e521ef8aeeacec37b45b34c6e4c7eb0022b212a2f476cd9ab
+EBUILD khard-0.11.4.ebuild 1087 BLAKE2B 5cf2902ac38f6c1791468e4b02592ad344ecde189fdf76d62cbee95cc6eb6c3dc5627707d45894445646644483b43860a2fcf90679f4bdd2c01c1a39ba03e147 SHA512 9785cf6c983b9cb4b5e4d9e9f2ab4cfb029171879275dfaef7c7cb89183fe17b7cf88daeef8b3dc7e74695f2a645f4d7509c4076fbc70ba5437b576dc34919fd
+MISC metadata.xml 266 BLAKE2B 26c95c6cc1dcbace4970a140ba8b335259f226d9a2e6a01e1e7aac0af9aaeac09e2a28b26d28db8ce0a389d2d887936c65ff6621c3890e7ee0af63b0eb9c386c SHA512 ff17b710e7d931dc1459eeedd1d83de834cb888168bd9d4d8b5fcfe92bc88180a1b3933a3c34e61bfe2876ac058db9e4b826cedb2482c73dd72e2a39304eb55f
diff --git a/app-misc/khard/khard-0.11.4.ebuild b/app-misc/khard/khard-0.11.4.ebuild
new file mode 100644
index 000000000000..69d8bce4c098
--- /dev/null
+++ b/app-misc/khard/khard-0.11.4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+inherit distutils-r1
+DESCRIPTION="Console CardDAV client"
+HOMEPAGE="https://github.com/scheibler/khard"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="zsh-completion"
+
+if [ "${PV}" == "9999" ]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/scheibler/khard"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/atomicwrites[${PYTHON_USEDEP}]
+	dev-python/configobj[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/vdirsyncer[${PYTHON_USEDEP}]
+	>dev-python/vobject-0.9.3[${PYTHON_USEDEP}]
+"
+# vobject-0.9.3 breaks khard, see
+# https://github.com/scheibler/khard/issues/87
+# https://github.com/eventable/vobject/issues/39
+
+DOCS=( AUTHORS CHANGES README.md misc/khard/khard.conf.example )
+
+src_install() {
+	distutils-r1_src_install
+
+	if use zsh-completion; then
+		insinto /usr/share/zsh/site-functions
+		doins misc/zsh/_khard
+	fi
+}
diff --git a/app-misc/khard/metadata.xml b/app-misc/khard/metadata.xml
new file mode 100644
index 000000000000..d8dfe0cd2f21
--- /dev/null
+++ b/app-misc/khard/metadata.xml
@@ -0,0 +1,8 @@
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>andrey_utkin@gentoo.org</email>
+	<name>Andrey Utkin</name>
+</maintainer>
+<longdescription>Console CardDAV client</longdescription>
+</pkgmetadata>
diff --git a/app-misc/leave/Manifest b/app-misc/leave/Manifest
index 8467ff54dd49..858a2268cd9e 100644
--- a/app-misc/leave/Manifest
+++ b/app-misc/leave/Manifest
@@ -1,6 +1,5 @@
 AUX README 455 BLAKE2B 5fbc04499c0fd5b636edf37f54e64025c5ad0bbd13d4639559020f11887c45598343e383206e916eb73f59b581f5c78cdc05fa350be59cbc388002b1c639079b SHA512 86135607b70026c849d0851fe4c9aeadc2385eebe2be93949d519f566810916d26388a191c16a88d451d653cb2f6f6ce896948e9f07b9f994c02403898f28242
 AUX leave-fix-makefile.diff 453 BLAKE2B b3252ac7d1bcd41268dc525469b9a35624a0ad34dc4645ce122e59ef08275dba297960f3497a19570b35af7ccefc65454f697be748964da4b44043aad7fb4241 SHA512 a13da158f33c672c28e9e1b5fd169db9c7fcec55f533874ee237c529a4da21b9c68e400ff0f9a3e604c8b487d0548ed6a8693ebaa50b12b660a989f50b60d83a
 DIST leave-20100918.tar.gz 3477 BLAKE2B 2a709c653f2f853d50822fe83bb4f7894aea57ad3d0c15fb4ca4b5c3abccf63f0cd3344f379691e7721915e2bb5f6f1c61506f265e9cd6d74175ae4657e72376 SHA512 69df594800159bc80baeb3945aad144ceabe21bdac22ed2cd706b0ec610895dc82e58bae59ed0230eb97e909812bc90237b7c70e965125e7fa6767972a6259d1
-EBUILD leave-20100918-r1.ebuild 635 BLAKE2B 5e5be25b8429a1c136eae836618f8ae21aae62936a4001824a9a8ddc1aff26a3eb40f67ecd72edadab16b6540497f16e1329e96ce803fabf2330fc375c60bffa SHA512 9f9788796021320951f08f130a5e4eb45aa2b8c9f0a303e716e3070d236946c17a3259e8a1fe7111153a8c64a554d634f776c5fcd25768106a03ba042dacc8c2
-EBUILD leave-20100918.ebuild 724 BLAKE2B f523835048a653a55f492fd003a69a4fa97ea42f34dda59c15b70bb472b49add8042af444e65c719d2d128cf76612ba6cad271eaafc11fe667fd68581b57c47b SHA512 308bd9f7f8b6245da0c2921e22c922ac969a65d00600fd26b20e341a5ab98c44afdc6cf8b9508056da84d5089fa984084229f90f9d2cba413cc48565d1252cc0
+EBUILD leave-20100918-r1.ebuild 632 BLAKE2B 547942512b07bd3f3f5863fde9d7f71d128719525e02d513caab4ac1d4877102e05e5e3193f8b469d16cd832d50f6418fe5192f7c0808200827057336a7ec384 SHA512 cb4b211e94ec8d8f5c7b23f1f7910da8fb13a20afaddc649b44d8a8cc526b346e10efee3ddef90a8b96e6ecbb10e280c2ff28b0da6e466e9c05beacc82ef13c3
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-misc/leave/leave-20100918-r1.ebuild b/app-misc/leave/leave-20100918-r1.ebuild
index 88f50869253e..f9514aa08ae4 100644
--- a/app-misc/leave/leave-20100918-r1.ebuild
+++ b/app-misc/leave/leave-20100918-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-fix-makefile.diff"
diff --git a/app-misc/leave/leave-20100918.ebuild b/app-misc/leave/leave-20100918.ebuild
deleted file mode 100644
index 9a8f79245f1f..000000000000
--- a/app-misc/leave/leave-20100918.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Command-line tool from FreeBSD that reminds you when its time to leave"
-HOMEPAGE="http://www.freebsd.org/cgi/cvsweb.cgi/src/usr.bin/leave/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-fix-makefile.diff"
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}"\
-		|| die "emake failed"
-}
-
-src_install() {
-	dobin leave || die "dobin failed"
-	doman leave.1 || die "doman failed"
-	dodoc "${FILESDIR}/README" || die "dodoc failed"
-}
diff --git a/app-misc/qlcplus/Manifest b/app-misc/qlcplus/Manifest
index dd8af7fe830d..24618dea9b1a 100644
--- a/app-misc/qlcplus/Manifest
+++ b/app-misc/qlcplus/Manifest
@@ -1,6 +1,3 @@
-DIST qlcplus-4.10.5b.tar.gz 8959726 BLAKE2B 6b2925d913b8cd16014004975c176f5d5de456daf67957ac2fe2b0e624b2b74c302dbbc5122148878ee3eddd2688e724dfe4e9a52c6b1f6877b12fd2b5b3e05f SHA512 c989764d52fc60af8d98c3a65ef7e6ba5cd823e5d487a2153dffc9a00f5e176666ced5c0f771b04a35957bee3de84ca927326c45764a34d9bf3c8886dede9d2f
 DIST qlcplus-4.11.1.tar.gz 9394093 BLAKE2B 0b91359217b723ed184f6a609ee0ef0a39f5f08aa8933abc7a3c429e4d5a3b2d1dc8ef454c00a172bc0e7b8f7fb0779d7fbba96ed5fafe403853f2a3bb8ce7b8 SHA512 14efdbe5cd53da592a58b48efb1daf7dda2a4e19d7d20792d34674af2aa1b9c287cfd58673db7838885642bb2ebfaf9b462be41d33f8d89497cb61dfab7246df
-EBUILD qlcplus-4.10.5b-r1.ebuild 1189 BLAKE2B e6b305ed868495a58ec515f1b511be84fa24a94e6c5adc403c2f1e8d9d17b8e27a477ebd519477882de4a34736ba34cf2c408ec40bcfb93f728f61028ca34399 SHA512 942db0ea457d1975121bcd75705370be3a1fe44853e4fcc794437ca17c8b6f3bd73b7e28c03d1d14deba3e0505c55dadfeedcde2e2c91f6df20ded512a15ebb0
-EBUILD qlcplus-4.10.5b-r2.ebuild 1308 BLAKE2B a752e67d9a1f321cce61673f98f8cbd88dc7c53ab436805816b6005801f731d03ecc523d1fcb6f1b7a721ca972bc4387e6c4ab66b28e6a0808c145128d1294de SHA512 79b6f707eb9c7006f7e42a6267e28bbb481678042916733e4c4fc067e9f9fdc3c9cbeea456b1c388bd252c24dc912e9db2206070bba756fedbf66fa415795054
 EBUILD qlcplus-4.11.1.ebuild 1307 BLAKE2B 6b1d664e7370bb3e21465c8bed0b966e634d106797004f0997df552db14daec41f9f0b2a9a5d4d99a718c0248534416f4e8110c705b65771ee9ef755a74baf7c SHA512 1c8d14210707b7d758056bf80b5d1736db088cc46b0b1d790f4ffd8232eff307020a24d3b4038345e3943d0749ba40240a92b059e08a1089473c715040cec997
 MISC metadata.xml 326 BLAKE2B 8d391e1f300d364a5e985caad82387023c6f9d6081313b571ece49d2f5daf60f25527685bb7567ad18cbe3234202f8fe53b0a786b401477687b5b8ec39dfc1d9 SHA512 5de2dc43ec5ae4d9a2c598cfac00dc124a956040d0721cb867acc5c4ed312e8c9ef415205eaaed8ff5742281251c970a5ade2eae6280b62477f4fda3fedc2504
diff --git a/app-misc/qlcplus/qlcplus-4.10.5b-r1.ebuild b/app-misc/qlcplus/qlcplus-4.10.5b-r1.ebuild
deleted file mode 100644
index 9d4d685ddec7..000000000000
--- a/app-misc/qlcplus/qlcplus-4.10.5b-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils udev vcs-snapshot virtualx
-
-DESCRIPTION="QLC+ - Q Light Controller Plus to control DMX interfaces"
-HOMEPAGE="http://www.qlcplus.org/"
-SRC_URI="https://github.com/mcallegari/${PN}/archive/QLC+_${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	|| ( dev-embedded/libftdi:1 dev-embedded/libftdi:0 )
-	dev-libs/glib:2
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5[widgets]
-	dev-qt/qtnetwork:5
-	dev-qt/qtscript:5
-	dev-qt/qttest:5
-	dev-qt/qtwidgets:5
-	media-libs/alsa-lib
-	media-libs/libmad
-	media-libs/libsndfile
-	sci-libs/fftw:3.0
-	virtual/libusb:0
-	virtual/libusb:1
-	virtual/udev
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	sed -e "s:/etc/udev/rules.d:${EROOT}lib/udev/rules.d:" -i \
-		plugins/hid/hid.pro \
-		plugins/udmx/src/src.pro \
-		plugins/dmxusb/src/src.pro \
-		plugins/spi/spi.pro \
-		plugins/peperoni/unix/unix.pro || die
-	sed -e "/UDEVRULESDIR/s:/etc/udev/rules.d:$(get_udevdir)/rules.d:" \
-		-i variables.pri || die
-}
-
-src_configure() {
-	eqmake5
-}
-
-src_test() {
-	virtx emake check
-}
diff --git a/app-misc/qlcplus/qlcplus-4.10.5b-r2.ebuild b/app-misc/qlcplus/qlcplus-4.10.5b-r2.ebuild
deleted file mode 100644
index 9d50c6300aa1..000000000000
--- a/app-misc/qlcplus/qlcplus-4.10.5b-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils udev vcs-snapshot virtualx xdg
-
-DESCRIPTION="QLC+ - Q Light Controller Plus to control DMX interfaces"
-HOMEPAGE="http://www.qlcplus.org/"
-SRC_URI="https://github.com/mcallegari/${PN}/archive/QLC+_${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	|| ( dev-embedded/libftdi:1 dev-embedded/libftdi:0 )
-	dev-libs/glib:2
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5[widgets]
-	dev-qt/qtnetwork:5
-	dev-qt/qtscript:5
-	dev-qt/qttest:5
-	dev-qt/qtwidgets:5
-	media-libs/alsa-lib
-	media-libs/libmad
-	media-libs/libsndfile
-	sci-libs/fftw:3.0
-	virtual/libusb:0
-	virtual/libusb:1
-	virtual/udev
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	sed -e "s:/etc/udev/rules.d:${EROOT}lib/udev/rules.d:" -i \
-		plugins/hid/hid.pro \
-		plugins/udmx/src/src.pro \
-		plugins/dmxusb/src/src.pro \
-		plugins/spi/spi.pro \
-		plugins/peperoni/unix/unix.pro || die
-	sed -e "/UDEVRULESDIR/s:/etc/udev/rules.d:$(get_udevdir)/rules.d:" \
-		-i variables.pri || die
-}
-
-src_configure() {
-	eqmake5
-
-	# sandbox error "mkdir /usr/share/qlcplus" 
-	# see https://bugs.gentoo.org/621500#c2
-	export INSTALL_ROOT="${D}"
-}
-
-src_test() {
-	virtx emake check
-}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 65ac6551e06b..86f2cf27ee2e 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/crf++/Manifest b/app-text/crf++/Manifest
index 6a2c84a3f50b..8b3150097504 100644
--- a/app-text/crf++/Manifest
+++ b/app-text/crf++/Manifest
@@ -1,6 +1,4 @@
-AUX crf++-0.54-gcc46.patch 297 BLAKE2B a284ca06af5d752adc6017344abfede30b6e6939b316197f904081baa426e8558be862956d400a0b9434891c853f7d7b4464c1a66309f5906da41fa5d6c2e193 SHA512 3390be3aee788af08969a02ebcc4a645537d635e47091da528a6fa1a3d43a20e677287d47070bdc97b3b0c4f8aeabd5a5c107d598919a5e9882ef180f704c390
-DIST CRF++-0.54.tar.gz 809008 BLAKE2B ed23b998ee5a37afc3f429ac04a8e6f57febb93dec469c68c7db1fbb3dfb1d1df7a2ddeb48ab758a6548f60bc920b8c7a3d6f418776a2a110812457245a3f6e9 SHA512 4198ad9423776a44d02db51a655a35f36db767ec623f55de426b3415179ac7187b91d23c6ef9a2cf3d1c38e14507fc7681006ff2ba50dcfc771a7d5e9d1c5760
+AUX crf++-automake-1.13.patch 216 BLAKE2B 129027abc820acf499b9fd49ea152f0d404c458af0584c0f7acc3dde6a02c46f1f14f96321b0ea7e2d00e9345276e8bdefb2206cc475772e5c23890143c78d0d SHA512 5bd02a0d3f67e37d544255984341beda8c958e5f76ce51521fd2157eb7dc70dfb1d43d30913e4d02e7dfe21526f04520f6539e28a58beed6e577a31b5d4a16ca
 DIST CRF++-0.58.tar.gz 790570 BLAKE2B 8fdd3fea3e30f4196560e2e265519c961739aabbad75e9805040a8f7da0f501620d6bb2c4f589c6d0c8bb79af5c8f46bbe27b610a4ec6a0db632fef219ea5b46 SHA512 676b3e9ed89b5fb2f246175b58c384f10cab09fff8329c07311fed3832f55dbad26a25d2946c9efaa75cd8026517cb9e1742bb70ca26187367747852073e4eb9
-EBUILD crf++-0.54.ebuild 1118 BLAKE2B c7e9750fe440add09c74750ede0b930cea6d978658d68225b0e4adc0084d178b637ebd122b756ac7695d5ece1f52919333dd9fe58c76c3de3a4b3dd310a22ee6 SHA512 7ae040f57b491421e2c6689f0b54ba3d963aadd1e67721177ed44aeb6539e3d40f229f652a695fe863fe752634b8d3600f00e6e78e8ec4ae807fe36971c414e5
-EBUILD crf++-0.58.ebuild 1097 BLAKE2B 53f3ec7866c58afb271e3b13b0d30354393716850ada6dfc4d645308e12a4d45a7fe8a11b74b7bd293006dd76de245cb8798c67e2036b937e8c256ccc700b97b SHA512 2b452d9e7be197a3100061040d606fac3df07bc61deb3a3fad69ff65fde3ab7b5e3fdcb2a57b45b29f7a23f8459d987a00be51be6a02874d6b15a27415bde91c
-MISC metadata.xml 666 BLAKE2B 01126fb5d24a9c8dfa3d8aca0516a132245bef92219100fd9970415153abbd80414cddcb1948a82617164f7515687fe01a950b326b200bdb71901a5bb9fb7312 SHA512 922c14845da38ed461a50f654bd858f1d1de04642bdd40ba353f87000fb1d0150dfe9fa2e52ed5b4d8dd2e8f64b636c94577cf74a9c138f0aebd1a0d9da462d8
+EBUILD crf++-0.58.ebuild 1142 BLAKE2B f3b9572d8fcedf2245d7e1ad51e5c43d9b13559c1894b47d9ca784fbdd447507e808f9df5c2f708f29dec06758740e0180770319ead3ddc56e77516c9330e707 SHA512 ecf7045059470e8a318fc8c46ae38af0eac567382755d29f5594d6f87f30baf35fb9c86a0a79d87f2b300c3675684924791a0656463a4191d94327c099bbbc30
+MISC metadata.xml 669 BLAKE2B 12280d15998c56ac4c2e3bd3e80fd2a22eb150b979836d8600df3d5a36008807f0cc7fd91b84cd3717c379c9ca603ce110a88c3f86b48e29be983f99faa1b6a0 SHA512 d479bf4332884e2dfdd57b6c496b585f7e55adad2200dd22684a9fe6f1cc1c69049fec20d3ee0683543119c4f4935c83cda7d6a501b44e51e612249283fda7f3
diff --git a/app-text/crf++/crf++-0.54.ebuild b/app-text/crf++/crf++-0.54.ebuild
deleted file mode 100644
index 204eda151148..000000000000
--- a/app-text/crf++/crf++-0.54.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-inherit autotools eutils
-
-MY_P="${P/crf/CRF}"
-DESCRIPTION="Yet Another CRF toolkit for segmenting/labelling sequential data"
-HOMEPAGE="http://crfpp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/crfpp/${MY_P}.tar.gz"
-
-LICENSE="|| ( BSD LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
-IUSE="examples static-libs"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	sed -i \
-		-e "/CFLAGS/s/-O3/${CFLAGS}/" \
-		-e "/CXXFLAGS/s/-O3/${CXXFLAGS}/" \
-		configure.in || die
-
-	# bug #365921
-	epatch "${FILESDIR}/${P}-gcc46.patch"
-
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable static-libs static) || die
-}
-
-src_test() {
-	for task in example/* ; do
-		(
-			cd "${task}"
-			./exec.sh || die "failed test in ${task}"
-		)
-	done
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	if ! use static-libs ; then
-		find "${ED}" -name "*.la" -type f -delete || die
-	fi
-
-	dodoc AUTHORS README || die
-	dohtml -r doc/* || die
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}
-		doins -r example || die
-	fi
-}
diff --git a/app-text/crf++/crf++-0.58.ebuild b/app-text/crf++/crf++-0.58.ebuild
index 7518e894e2e9..c358043e7e8e 100644
--- a/app-text/crf++/crf++-0.58.ebuild
+++ b/app-text/crf++/crf++-0.58.ebuild
@@ -1,55 +1,61 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="3"
-inherit autotools eutils
+EAPI="6"
+
+inherit autotools
+
+MY_P="${P^^[crf]}"
 
-MY_P="${P/crf/CRF}"
 DESCRIPTION="Yet Another CRF toolkit for segmenting/labelling sequential data"
-HOMEPAGE="https://crfpp.googlecode.com/svn/trunk/doc/index.html"
-SRC_URI="https://crfpp.googlecode.com/files/${MY_P}.tar.gz"
+HOMEPAGE="https://taku910.github.io/crfpp/"
+SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
 
 LICENSE="|| ( BSD LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"
 IUSE="examples static-libs"
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=( "${FILESDIR}"/${PN}-automake-1.13.patch )
+HTML_DOCS=( doc/. )
+
 src_prepare() {
 	sed -i \
 		-e "/CFLAGS/s/-O3/${CFLAGS}/" \
 		-e "/CXXFLAGS/s/-O3/${CXXFLAGS}/" \
-		configure.in || die
+		configure.in
 
+	default
+	mv configure.{in,ac} || die
 	eautoreconf
 }
 
 src_configure() {
-	econf $(use_enable static-libs static) || die
+	econf $(use_enable static-libs static)
 }
 
 src_test() {
-	for task in example/* ; do
-		(
-			cd "${task}"
-			./exec.sh || die "failed test in ${task}"
-		)
+	local d
+	for d in example/*; do
+		cd "${d}"
+		./exec.sh || die "failed test in ${d}"
+		cd - >/dev/null
 	done
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install
+	einstalldocs
 
-	if ! use static-libs ; then
-		find "${ED}" -name "*.la" -type f -delete || die
+	if use examples; then
+		docompress -x /usr/share/doc/${PF}/example
+		insinto /usr/share/doc/${PF}
+		doins -r example
 	fi
 
-	dodoc AUTHORS README || die
-	dohtml -r doc/* || die
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}
-		doins -r example || die
+	if ! use static-libs; then
+		find "${ED}" -name "*.la" -type f -delete || die
 	fi
 }
diff --git a/app-text/crf++/files/crf++-0.54-gcc46.patch b/app-text/crf++/files/crf++-0.54-gcc46.patch
deleted file mode 100644
index 93cb54020cfc..000000000000
--- a/app-text/crf++/files/crf++-0.54-gcc46.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur CRF++-0.54.orig/path.h CRF++-0.54/path.h
---- CRF++-0.54.orig/path.h	2009-04-05 20:42:35.000000000 +0900
-+++ CRF++-0.54/path.h	2011-05-31 01:31:43.845198215 +0900
-@@ -8,6 +8,7 @@
- #ifndef CRFPP_PATH_H_
- #define CRFPP_PATH_H_
- 
-+#include <cstddef>
- #include <vector>
- #include "node.h"
- 
diff --git a/app-text/crf++/files/crf++-automake-1.13.patch b/app-text/crf++/files/crf++-automake-1.13.patch
new file mode 100644
index 000000000000..afff7edc0707
--- /dev/null
+++ b/app-text/crf++/files/crf++-automake-1.13.patch
@@ -0,0 +1,10 @@
+--- a/configure.in
++++ b/configure.in
+@@ -240,6 +240,6 @@
+ AC_MSG_RESULT([yes])
+ 
+ AC_SUBST(datarootdir)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ AC_OUTPUT([Makefile Makefile.msvc swig/version.h])
+ 
diff --git a/app-text/crf++/metadata.xml b/app-text/crf++/metadata.xml
index 4fea4cf917d6..edc6c2bf83c2 100644
--- a/app-text/crf++/metadata.xml
+++ b/app-text/crf++/metadata.xml
@@ -13,6 +13,6 @@
 		Information Extraction and Text Chunking.
 	</longdescription>
 	<upstream>
-		<remote-id type="sourceforge">crfpp</remote-id>
+		<remote-id type="github">taku910/crfpp</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-text/dos2unix/Manifest b/app-text/dos2unix/Manifest
index 8ffaf6a851e5..891e3e57a5fa 100644
--- a/app-text/dos2unix/Manifest
+++ b/app-text/dos2unix/Manifest
@@ -1,7 +1,5 @@
-DIST dos2unix-7.3.4.tar.gz 640991 BLAKE2B 143ba62d859105147a0095732dd83f76cfe6a0e2ebcdd6753d8ea3ce47dcbb8372c0006da8be4c4e4efc2af93ba365a4a8d8bc8d451cc562944cec0251e523fd SHA512 29958a2c702acc112b10f3fcb43fbff3b860c6d1f725c153af9a52dc20736755604f77bec37299dc88923a9e9b2ad73b994e9bc6f42f2757fe1819dd9873d710
 DIST dos2unix-7.3.5.tar.gz 662133 BLAKE2B e24f77d92fe0c5931f9ca762b79a1713b14cc39b7566f78d55c4fd58bb7d3c0de1f2a8add8ffd6c3fa26a6bae73c412572fc71701e26b7b52f15b51b0de0d294 SHA512 beafefa715d894ec51bd808b18485bcf413f93b888203486e659f7e30b922b32b2f1da2305ef9ae85e54085ba3819bd512957bb872b529fe4728000cec7d3e58
 DIST dos2unix-7.4.0.tar.gz 710339 BLAKE2B 629c4a410f0cbb0b5b0fdb89c03fbec1965759a747309ad8a4459820bf2151d1861f4040d67ce6934ca27cfc3b6d0495eccd0966045803f065b10520808d9686 SHA512 41be6b0c747f4a8e316eccecd468c8250aa6791962485569eb9496def60818ae434d619b5cfb5f80f15f8d17800314f5aefe229dc5d37faaa34e1270575175e9
-EBUILD dos2unix-7.3.4.ebuild 2026 BLAKE2B 4a38cbc0ce58d756615ecc1fdb1c699f81bef3219eb8716e4e72fbfe969b4e9aeaec1cd8ed445acf6ce215af1db523baa6dc0c29957aa4c5d77a87e71efd5618 SHA512 5e251e9ff961e07e91fef0c462d32f4e3b0ad7b7cfbb38a35b11c9a784b79256a4a4073a55adc4e96ff67fc896f85f2d007662cef8cfb09061709a02ddb4d760
 EBUILD dos2unix-7.3.5.ebuild 2037 BLAKE2B edfc091f5ae520b92c58aa58b5273a1748c07741a64ad37fa9b06458c257b2e394fd43c56ae46c562f40a8331c9360e486f7d1e27957bff1f6e0c783b4f5a0f8 SHA512 be9ba30896b2e246b978ec3184c593c85e06e3b223fcdce599874645477f35c4161a6a1261379dbed08db2556eb9c472f6a89959a636887cfdd51ff924377dbe
 EBUILD dos2unix-7.4.0.ebuild 2046 BLAKE2B b76c15a3753bcfe22324fd3caafd4e4a1286d6d96bc379a3e23854dcc9bb7bb1344e7661cbdcc846caa1e740bee2a428f88408dea8ea6298735d15e2d8ffbfc5 SHA512 27fc2bd3e3e43512d4ab571ca5ddfb4f6ba8e0940eb8bd65c9d90f0c602822334f5789f3a2101311006fb614708ca32396ae8c3d24b8b313aa9248c8cd76d350
 MISC metadata.xml 343 BLAKE2B c4023a36777a79352885528afd87e7709255ccf7f02d9ba28e29eb11f6c67c2775eeeec4f2db95b427b94859e70e7cd276984bca828eb872116e7ec33751c31c SHA512 12f79ed9fdd8df3c05110ea2a31123ca92a855cdf9287910802cb4e68c384764cc84c29929376426b23bfe9699574dbbdc2105d82c6e2701aa9fe67079d867f3
diff --git a/app-text/dos2unix/dos2unix-7.3.4.ebuild b/app-text/dos2unix/dos2unix-7.3.4.ebuild
deleted file mode 100644
index 3b4310036b01..000000000000
--- a/app-text/dos2unix/dos2unix-7.3.4.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="da de eo es fr hu ja nb nl pl pt_BR ru sr sv uk vi zh_CN zh_TW"
-
-inherit l10n toolchain-funcs
-
-DESCRIPTION="Convert DOS or MAC text files to UNIX format or vice versa"
-HOMEPAGE="http://www.xs4all.nl/~waterlan/dos2unix.html https://sourceforge.net/projects/dos2unix/"
-SRC_URI="
-	http://www.xs4all.nl/~waterlan/${PN}/${P}.tar.gz
-	mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
-IUSE="debug nls test"
-
-RDEPEND="
-	!app-text/hd2u
-	virtual/libintl"
-
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-	test? ( virtual/perl-Test-Simple )
-	dev-lang/perl"
-
-handle_locales() {
-	# Make sure locale list is kept up-to-date.
-	local detected sorted
-	detected=$(echo $(printf '%s\n' */*.po | sed -e 's:.*/::' -e 's:.po$::' | sort -u))
-	sorted=$(echo $(printf '%s\n' ${PLOCALES} | sort -u))
-	if [[ ${sorted} != "${detected}" ]] ; then
-		eerror "The ebuild needs to be kept in sync."
-		eerror "PLOCALES: ${sorted}"
-		eerror "po*/*.po: ${detected}"
-		die "sync PLOCALES"
-	fi
-
-	# Deal with selective install of locales.
-	rm_loc() { rm po*/$1.po || die; }
-	l10n_for_each_disabled_locale_do rm_loc
-}
-
-src_prepare() {
-	default
-
-	handle_locales
-
-	sed \
-		-e '/^LDFLAGS/s|=|+=|' \
-		-e '/CFLAGS_OS \+=/d' \
-		-e '/LDFLAGS_EXTRA \+=/d' \
-		-e "/^CFLAGS/s|-O2|${CFLAGS}|" \
-		-i Makefile || die
-
-	if use debug ; then
-		sed -e "/^DEBUG/s:0:1:" \
-			-e "/EXTRA_CFLAGS +=/s:-g::" \
-			-i Makefile || die
-	fi
-
-	tc-export CC
-}
-
-lintl() {
-	# same logic as from virtual/libintl
-	use !elibc_glibc && use !elibc_uclibc && use !elibc_musl && echo "-lintl"
-}
-
-src_compile() {
-	emake prefix="${EPREFIX}/usr" \
-		$(usex nls "LDFLAGS_EXTRA=$(lintl)" "ENABLE_NLS=")
-}
-
-src_install() {
-	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" \
-		$(usex nls "" "ENABLE_NLS=") install
-}
diff --git a/app-text/psutils/Manifest b/app-text/psutils/Manifest
index 959ebd0edbd1..b017afac520d 100644
--- a/app-text/psutils/Manifest
+++ b/app-text/psutils/Manifest
@@ -1,6 +1,5 @@
 AUX psutils-1.17-ldflags.patch 1417 BLAKE2B fa54e0f8cab31336dbe95db96313e345e9cd3a03f2c92855c5bc5fbc4054e89193ade6b346f52edf61f58f20330dacc8d7df32a5ec1769ed7ff62b4eacb36368 SHA512 179b1551516a8acc9f4f9859b4bbe06a6d6e2ba0ddfe20c147a143e6795d61d9cb4f55107866d7a891f0be0dbebaf11d836f4c129205da44ba561a133d69ab08
 AUX psutils-1.17-no-fixmacps.patch 1176 BLAKE2B fdf9653e881e05340445560ba5cb3303bc42e46a1605ee19d675023174aa7bf73d9b4cc37ba3bbafee9b3829974981ff58284acf7079f9b2a3fedbac9d28b2af SHA512 707ebb4594b341044e27cd3fb35402b4d3144eb52f9baffcc633dbde69b53717da148b6c03074411cb95dcf50b48ba87df4ad6c2ec3b24f37b0951c40012efdc
 DIST psutils_1.17.dfsg.orig.tar.gz 40296 BLAKE2B c74cde600e841e876892f3c0cfd20ab5d1ed87135e0bc952b19baf90315b95f89bf177b66deeeb91862fc2c620f688ba49972673bf9f4b4ff250590f0b2fc848 SHA512 a4ee49ecea9a948c0cfb8b51d10471409ec461a07bb94c1158c64e433f02ede4770fcb961d6ec79088bf247176db9757389d3e1cf5b64246b3b90b5584b59ff3
-EBUILD psutils-1.17-r2.ebuild 1002 BLAKE2B 583400dc99c191cf10c68aaafb1e8bc76f2541df978017cff7d746d381a0dbf9203b1eb7c2f35c2458d57c1f08da3a571faf7da829cec6209bb531ba3dbf1e56 SHA512 01b3277af28ec70dd8bb6afbaabf6a2410787ef032b189fde69c40ca61323b2a76b03f8555c4be840174b47a6a59e78eb10103b4acb1061f7b09ab4d7a838e7f
-EBUILD psutils-1.17-r3.ebuild 1000 BLAKE2B f6595e96bba6c1117b5c42f43ffaf6042e84d36d78a89ea65740c423f56819e31de1ec15795b8b3573bc7f6b8316896831cac7432ffab8256a5ed2ba4c4c408c SHA512 b0fb5b9acec3d19be87b68c0577136ffec43fa881fdd203f9074e4377bf3a42b7147d2787c921cdd46d43a040975fc6b2bd000a71a8ee2a30a355169c23a824b
+EBUILD psutils-1.17-r3.ebuild 999 BLAKE2B 283c673f8eed7948d71baa0a16af860cbb93c97bebf63519a44f9c8aee340a14b8153718aa91f60d5d02f64c1d9971c61af718b93e2939f56b7154c11ee14d87 SHA512 78143446eabfdfb5400e80ad6576086918259a68987627f036d6f557208369746087020ce5d1ccd613f17060045fd57bf10e11626e34364dc6835380cb75dca9
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/psutils/psutils-1.17-r2.ebuild b/app-text/psutils/psutils-1.17-r2.ebuild
deleted file mode 100644
index a91ce6307be9..000000000000
--- a/app-text/psutils/psutils-1.17-r2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=3
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="PostScript Utilities"
-HOMEPAGE="http://web.archive.org/web/20110722005140/http://www.tardis.ed.ac.uk/~ajcd/psutils/"
-SRC_URI="mirror://debian/pool/main/p/${PN}/${PN}_${PV}.dfsg.orig.tar.gz"
-
-LICENSE="psutils"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-
-S="${WORKDIR}/${P}.orig"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-ldflags.patch"
-	epatch "${FILESDIR}/${P}-no-fixmacps.patch"
-	sed \
-		-e "s:/usr/local:\$(DESTDIR)${EPREFIX}/usr:" \
-		"${S}/Makefile.unix" > "${S}/Makefile"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" || die
-}
-
-src_install () {
-	dodir /usr/{bin,share/man}
-	emake DESTDIR="${D}" install || die
-	dodoc README
-}
diff --git a/app-text/psutils/psutils-1.17-r3.ebuild b/app-text/psutils/psutils-1.17-r3.ebuild
index 201879533dcb..551a8ecd7021 100644
--- a/app-text/psutils/psutils-1.17-r3.ebuild
+++ b/app-text/psutils/psutils-1.17-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/p/${PN}/${PN}_${PV}.dfsg.orig.tar.gz"
 
 LICENSE="psutils"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/app-text/sablotron/Manifest b/app-text/sablotron/Manifest
index bcd28dd33826..789082e576a1 100644
--- a/app-text/sablotron/Manifest
+++ b/app-text/sablotron/Manifest
@@ -1,5 +1,4 @@
 AUX 1.0.3-libsablot-expat.patch 286 BLAKE2B 07728a2d174343133946519934a0b10aa0ea0d2c7e5ba73401b8c16ead71f059f78b24236bc96e17baf2467a5765ce0d82e67e97bb48225a9ba0fc5ac8a163d0 SHA512 29b7ae2798696439d3b181196677a7e7beacecac39abae631c73aff2d77e608bbf0088100953db78feb82cba37f89350da238cf8053e694c8ff0b3d8e8837040
 DIST Sablot-1.0.3.tar.gz 607597 BLAKE2B 429df09361d233b290e1179d5a3fbe7b421b834c23ff32d72466f007fd4ce19e810d68483b1b0314e943f2ff0f3713a3f28a357a71c69722883f5c85499cb582 SHA512 836c1a9d09317194333619461b0e5ea312277cadb6df5ae5ed327bdfee4090970bd3056ec0b3bd6aa8a3e3289af1bc5c1461c9fe15b53a944f1042190c485031
-EBUILD sablotron-1.0.3-r1.ebuild 1057 BLAKE2B 5ab7ab0806b504ac8f477813056c3ee3a415b98011e8110be9da2a8a408ea2c17bdbba605d7339a823229a5026f83927064e83bd9a4efe6f031563c58b8f688a SHA512 62772d0c8409284fc2d02c6e8cf7e303912c62f1a8544ab7de085069353a8bb9d60e3b52b4689cdb66de0e630acbffb97bf0d9630dc51199dc7461247c7ed3ed
-EBUILD sablotron-1.0.3.ebuild 1092 BLAKE2B 698260be8d4fcb56c980c857769bf6ab9bb0f2fff072cbe1f04cc4095ee3cb7ff25ee2aa4764a732c86670a1b83349143901fa4c7a2b4b3af38f394eb0945dbe SHA512 99577a5aa616f985af56735a42928ca36a6367c86e0b191fc699b4b2848b04f40f24616f7afdd7e70c44217e707d1fb8c40430362109547bb2c06c702292432c
+EBUILD sablotron-1.0.3-r1.ebuild 1053 BLAKE2B e969fcfc506eaf71ca7534edb4e2bfdf7fec8c2813fb156511d61e99dcc860e0f5c3e0ae574dc50bb885cd8f03cc24530fa06f0179549815b0a6f98510d62225 SHA512 a3145154f2be9d371e1cbf33589f6da3723ef3106c38a6f278c3840043f58137bd7d072af0602c065665773ebf471a711fdc81dbadf400f8619aecd5e0aa21eb
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/sablotron/sablotron-1.0.3-r1.ebuild b/app-text/sablotron/sablotron-1.0.3-r1.ebuild
index ae7713536658..622e9320de00 100644
--- a/app-text/sablotron/sablotron-1.0.3-r1.ebuild
+++ b/app-text/sablotron/sablotron-1.0.3-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://download-1.gingerall.cz/download/sablot/${MY_P}.tar.gz"
 # Sablotron can optionally be built under GPL, using MPL for now
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="perl"
 
 RDEPEND=">=dev-libs/expat-1.95.6-r1"
diff --git a/app-text/sablotron/sablotron-1.0.3.ebuild b/app-text/sablotron/sablotron-1.0.3.ebuild
deleted file mode 100644
index c9118189fdc2..000000000000
--- a/app-text/sablotron/sablotron-1.0.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-
-inherit base autotools
-
-MY_PN="Sablot"
-MY_P="${MY_PN}-${PV}"
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="An XSLT Parser in C++"
-HOMEPAGE="http://www.gingerall.org/sablotron.html"
-SRC_URI="http://download-1.gingerall.cz/download/sablot/${MY_P}.tar.gz"
-
-# Sablotron can optionally be built under GPL, using MPL for now
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="perl"
-
-RDEPEND=">=dev-libs/expat-1.95.6-r1"
-DEPEND="${RDEPEND}
-	>=dev-perl/XML-Parser-2.3"
-
-PATCHES=( "${FILESDIR}/1.0.3-libsablot-expat.patch" )
-
-src_prepare() {
-	base_src_prepare
-	sed -i configure.in -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' || die
-	eautoreconf
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		$(use_enable perl perlconnect) \
-		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Install failed"
-
-	dodoc README README_JS RELEASE src/TODO
-}
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 83e71b1a9f78..fc50e26b4955 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/glibmm/Manifest b/dev-cpp/glibmm/Manifest
index 18a49ecff34c..2fa6d5cc63b8 100644
--- a/dev-cpp/glibmm/Manifest
+++ b/dev-cpp/glibmm/Manifest
@@ -1,5 +1,7 @@
 DIST glibmm-2.50.1.tar.xz 6444576 BLAKE2B dbbdb79d8de9510f9bec770523ca7f4c93d287cbd9890b2fbc08712f6a2815186ee792f6339820a14aa9e4d49c9d1735c6c6651994cc4e03549f0d96b33f87ad SHA512 4f25c75c1628ca2f4db1c29cebc63187d372603066b06aa6a66c6da792f9e02cb4a413e41f058a81e2d5a2b38d625de13df76115b278f010ce2fc493fe6e6bbb
 DIST glibmm-2.52.0.tar.xz 6450592 BLAKE2B 2ea123bd193c7a745f52b2357c620fdaaef34c6e349100e732c8a1efde921db6bb0c97de3a61e0e300b98a04eb1c218f1b216c01d36e62d60ea9897a075826ec SHA512 45cbbe4ce4ba04dcadbcc3b46159dda194235c10a7287075724b0e1c19db2e4db061dc2a66823205f6884b30e2ef87ceafdf9cc2970212a2424535dbe3b9a262
+DIST glibmm-2.52.1.tar.xz 6451164 BLAKE2B 740178b51a2263ecc4778833fa6f2fd3913cdfc4e93b1a732a1b0ec9d43eb4ed60ab6bea48e02081d75a3ec1f98a149ebff47ced54dcce07e7ae011b2d20452d SHA512 702158762cb28972b315ab98dc00a62e532bda08b6e76dc2a2556e8cb381c2021290891887a4af2fbff5a62bab4d50581be73037dc8e0dc47d5febd6cbeb7bda
 EBUILD glibmm-2.50.1.ebuild 1636 BLAKE2B cedaf300eff88a5df1e9b758ba425ad29547642a5c345715a5196b8904f1f5dba0b5c85fd7d5424c2044c9832cf817758cb0086d9deb92484484c1316a4f417b SHA512 d8c11ace8919ff16e950798269d88f83bdde55377f66ba34e47947acbb856273b42bae549393055997ce02077aaf281b1238f6a2a2d4c706d24293d9b64317d3
 EBUILD glibmm-2.52.0.ebuild 1645 BLAKE2B 8698e80fbb0f777d63f2d6b6a4fbd9b80d3b6d014c53bb43984562bc583e32971a4ae4d6caac344b7ffac37e48847a9a61d4db98ef5d227741f95bca09e1cdae SHA512 903a9087feab8a973851471b0dbfbe485b2b1f7e208982c8113980b5f33fbef8b47a2aaf2a3999404c7a80ed2f95664ca0a57f873da0bda97fe3ee1c0b10762a
+EBUILD glibmm-2.52.1.ebuild 1645 BLAKE2B 8698e80fbb0f777d63f2d6b6a4fbd9b80d3b6d014c53bb43984562bc583e32971a4ae4d6caac344b7ffac37e48847a9a61d4db98ef5d227741f95bca09e1cdae SHA512 903a9087feab8a973851471b0dbfbe485b2b1f7e208982c8113980b5f33fbef8b47a2aaf2a3999404c7a80ed2f95664ca0a57f873da0bda97fe3ee1c0b10762a
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-cpp/glibmm/glibmm-2.52.1.ebuild b/dev-cpp/glibmm/glibmm-2.52.1.ebuild
new file mode 100644
index 000000000000..6b4fa6640641
--- /dev/null
+++ b/dev-cpp/glibmm/glibmm-2.52.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2 multilib-minimal
+
+DESCRIPTION="C++ interface for glib2"
+HOMEPAGE="https://www.gtkmm.org"
+
+LICENSE="LGPL-2.1+ GPL-2+" # GPL-2+ applies only to the build system
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="doc debug test"
+
+RDEPEND="
+	>=dev-libs/libsigc++-2.9.1:2[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.50.0:2[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+# dev-cpp/mm-common needed for eautoreconf
+
+src_prepare() {
+	if ! use test; then
+		# don't waste time building tests
+		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' \
+			-i Makefile.am Makefile.in || die "sed 1 failed"
+	fi
+
+	# don't build examples - we want to install example sources, not binaries
+	sed 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' \
+		-i Makefile.am Makefile.in || die "sed 2 failed"
+
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" gnome2_src_configure \
+		$(use_enable debug debug-refcounting) \
+		$(multilib_native_use_enable doc documentation) \
+		--enable-deprecated-api
+}
+
+multilib_src_test() {
+	cd tests
+	default
+
+	for i in */test; do
+		${i} || die "Running tests failed at ${i}"
+	done
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	find examples -type d -name '.deps' -exec rm -rf {} \; 2>/dev/null
+	find examples -type f -name 'Makefile*' -exec rm -f {} \; 2>/dev/null
+	dodoc -r examples
+}
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 61025e5c2ad1..b06f52546b1e 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/sqlitebrowser/Manifest b/dev-db/sqlitebrowser/Manifest
index 919782ed3663..1517a327599e 100644
--- a/dev-db/sqlitebrowser/Manifest
+++ b/dev-db/sqlitebrowser/Manifest
@@ -1,8 +1,8 @@
-AUX sqlitebrowser-3.10.1-unbundle.patch 1578 BLAKE2B 7c07caa81086a4a9a30660df837fbc34cb140ab531c1760a72739f868f0277b58c7e76f83d2c59a8b8b4ae843828551ca8beaa93c6d23ca5cf5df55a8ad4623b SHA512 26a58ef43da1b1cc295bc3c2cc6cc173f9dd4f9523732a03f31069bb9b10f810c9f0d0c40a7d31d37d2c520a4d4a8a4b2b2ff6795a4f780fee8e2b6da0edce5f
+AUX sqlitebrowser-3.10.1-unbundle.patch 3313 BLAKE2B 91dda803cb2eed55a56568f4d2cc0519b33b59447fcdfee49705aa0bfce84009092b0e73ab0ae79b03fc30f20220b1ca8cebbd83b66d1f8fdd36c47669403019 SHA512 71b758dc1f412b1ed5d778e8ca5fc65eb99276acf5c81fc4812bf31251a0380b8e4fbc84a00718e5959ae7cb504cda06339e24cf070b8a2de1b0fce46cfb595f
 AUX sqlitebrowser-3.7.0-unbundle.patch 475 BLAKE2B 1e2783eec7d7c054d18920fc88617f143220669a5c69c62b024fa33922eff9d13e3c4ba5e453d6b1767defdd8a918156094c1234ed3d6ad632ee4b3d919f6540 SHA512 4f90c4df8ef49943489b239f675a86259536b988585182c8b804f4ed6d38b5aabd83b32b21952329332d8520945304a4f9fea6287631a9a58ce5f311d9242fdb
 AUX sqlitebrowser-3.9.1-cmake.patch 774 BLAKE2B 5773d3f70bc45348a4e3fc35fce57ad7eac416e7cc4d94eceb31ecc5e0ca2ed9dce837c299083e800b1ec7d80bd67d10ee60cf44c5a6915f39c619ef07f048f4 SHA512 f1a64286036d5c05e279fbf430f55400eb8f840564c0d9460424a42f87c4bd8d4f4e2c52c39e07d0bd3a50fa4a1e59bf591c53b1d28d2ef367af2ba25edae299
 DIST sqlitebrowser-3.10.1.tar.gz 1992186 BLAKE2B 105333118a404aab48abe5ecbe83b425109b60adf40d3a3b7766c7036954996539bd133da4b3e3b1e2d819223842d107710b6b24aada6bb298462e062296dabf SHA512 da9650fff6cd7984e8f438b254318b5da46209eb21a375569ec1b4dd898a41d99d61d6682f2979a56d5c39d552ed42f443215900c1cebe95350e4624415f69c4
 DIST sqlitebrowser-3.9.1.tar.gz 1704713 BLAKE2B 447a9e20fe4236feea2684703ac7f38b1c03f0ded352653b41bbec7d6380691776177fee1428fd67ac96190ed6752cedd76a9883cfa12584fec464cbf98707d3 SHA512 c1e88063fac864f60a9802ae378e13d6f3a09e2f4e71e50c6abca4967a941c444a64617bad2dfc743cf9a6be554af9c73e4c61533300ed9a51652234ffdbd225
-EBUILD sqlitebrowser-3.10.1.ebuild 1417 BLAKE2B 0e5c0be58c5354d623c652e948e1128d53cf63f31ec6ee1693257b14186b79eb49be65817fa4c81fd100e03fa180f7d602e5873ec4c460f96258c608faf595f0 SHA512 7f7b0eaab46c4e01d9746ebe190e1fa3ad084a3ffa3e4ffe729c01df5411aa7463e3c47b6357341d4ff9b1bf3a45aad4cb6d08999565044733ced5100e2d21da
+EBUILD sqlitebrowser-3.10.1.ebuild 1380 BLAKE2B 3b7318374706616863cea99049f8108ee3fefbf779042ab397d19ad2a8d056386af566860b48e816955c1d1306be057aa5e786fb9596c54fea2d234adda275ef SHA512 8f9d0ec924150591d8fad23370a02b14cd1194cf1d455a366099254429f06e67e1397135f4d16fb6df5085d3c459bd73537f11c787e5e725f7986064fe46b19b
 EBUILD sqlitebrowser-3.9.1-r1.ebuild 1439 BLAKE2B 355dc9a6af52f1879559b7774d93f226e46a9998de3557c0f52d2b8ecde160e9c777bcc7ac4c8d33d74337972d6def9ada5d404b36d456133df000ca552623da SHA512 ad218ab7dc42f42487868aeba8fef1f282369bfc2508e6cbd20f0da1c6101f93ff3b157970e34046be20dfd98a2418763941c679d31dde82940cfc2a480b0cee
 MISC metadata.xml 740 BLAKE2B 43e5727769b3fa3fee9fe4514993988877b08a3a21816031cd21ae497a66801d6ba4993236e656b7de4161d22837975bb6d8e9cf93ebfd416235dd622a0b8758 SHA512 697ae7be911f1ce3a8b0c0f9f8509ac5fd338463b7b692ca320ab41ed7676fcc3d7db59e759cfbe82c6d2a1fa9d85a1eeefeda3bca702f56832f336ee7fd0369
diff --git a/dev-db/sqlitebrowser/files/sqlitebrowser-3.10.1-unbundle.patch b/dev-db/sqlitebrowser/files/sqlitebrowser-3.10.1-unbundle.patch
index 9e2ad3e910b7..b774e41ecd83 100644
--- a/dev-db/sqlitebrowser/files/sqlitebrowser-3.10.1-unbundle.patch
+++ b/dev-db/sqlitebrowser/files/sqlitebrowser-3.10.1-unbundle.patch
@@ -57,3 +57,49 @@ index fdf5b4c..ffba6d7 100644
  find_package(Qt5Widgets REQUIRED)
  find_package(Qt5LinguistTools REQUIRED)
 
+--- sqlitebrowser-3.10.1/src/tests/CMakeLists.txt
++++ sqlitebrowser-3.10.1/src/tests/CMakeLists.txt
+@@ -49,9 +49,6 @@
+ else()
+     target_link_libraries(test-sqlobjects antlr)
+ endif()
+-link_directories("${CMAKE_CURRENT_BINARY_DIR}/${QSCINTILLA_DIR}")
+-add_dependencies(test-sqlobjects qscintilla2)
+-target_link_libraries(test-sqlobjects qscintilla2)
+ add_test(test-sqlobjects test-sqlobjects)
+ 
+ # test-import
+@@ -118,7 +118,4 @@
+ else()
+     target_link_libraries(test-regex antlr)
+ endif()
+-link_directories("${CMAKE_CURRENT_BINARY_DIR}/${QSCINTILLA_DIR}")
+-add_dependencies(test-regex qscintilla2)
+-target_link_libraries(test-regex qscintilla2)
+ add_test(test-regex test-regex)
+--- sqlitebrowser-3.10.1/src/src.pro
++++ sqlitebrowser-3.10.1/src/src.pro
+@@ -153,10 +150,7 @@
+     }
+ }
+ 
+ LIBPATH_QHEXEDIT=$$OUT_PWD/../libs/qhexedit
+-LIBPATH_ANTLR=$$OUT_PWD/../libs/antlr-2.7.7
+-LIBPATH_QCUSTOMPLOT=$$OUT_PWD/../libs/qcustomplot-source
+-LIBPATH_QSCINTILLA=$$OUT_PWD/../libs/qscintilla/Qt4Qt5
+ unix {
+     LIBS += -ldl
+ }
+@@ -197,9 +193,9 @@
+ }
+ 
+ UI_DIR = .ui
+-INCLUDEPATH += $$PWD/../libs/antlr-2.7.7 $$PWD/../libs/qhexedit $$PWD/../libs/qcustomplot-source $$PWD/../libs/qscintilla/Qt4Qt5 $$PWD/..
+-LIBS += -L$$LIBPATH_QHEXEDIT -L$$LIBPATH_ANTLR -L$$LIBPATH_QCUSTOMPLOT -L$$LIBPATH_QSCINTILLA -lantlr -lqhexedit -lqcustomplot -lqscintilla2
+-DEPENDPATH += $$PWD/../libs/antlr-2.7.7 $$PWD/../libs/qhexedit $$PWD/../libs/qcustomplot-source $$PWD/../libs/qscintilla/Qt4Qt5
++INCLUDEPATH += $$PWD/../libs/qhexedit $$PWD/..
++LIBS += -L$$LIBPATH_QHEXEDIT -L$$LIBPATH_ANTLR -L$$LIBPATH_QCUSTOMPLOT -L$$LIBPATH_QSCINTILLA -lantlr -lqhexedit -lqcustomplot -lqscintilla2_qt5
++DEPENDPATH += $$PWD/../libs/qhexedit
+ 
+ unix {
+     # The executable
diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.10.1.ebuild b/dev-db/sqlitebrowser/sqlitebrowser-3.10.1.ebuild
index c661e29a9f2c..42732d6e3e70 100644
--- a/dev-db/sqlitebrowser/sqlitebrowser-3.10.1.ebuild
+++ b/dev-db/sqlitebrowser/sqlitebrowser-3.10.1.ebuild
@@ -36,8 +36,7 @@ PATCHES=(
 src_prepare() {
 	cmake-utils_src_prepare
 	# https://github.com/qingfengxia/qhexedit still bundled
-	# x11-libs/qscintilla[qt4?,qt5?] still bundled
-	find libs/{antlr-2.7.7,qcustomplot-source} -delete || die
+	find libs/{antlr-2.7.7,qcustomplot-source,qscintilla} -delete || die
 
 	sed -e "/^project/ s/\".*\"/sqlitebrowser/" -i CMakeLists.txt || die
 
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 4c8cbeae71d0..675b60d9702d 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/jdbc-informix/Manifest b/dev-java/jdbc-informix/Manifest
index 359a589e1577..cd2f6e6c5a77 100644
--- a/dev-java/jdbc-informix/Manifest
+++ b/dev-java/jdbc-informix/Manifest
@@ -1,3 +1,3 @@
-DIST JDBC.3.00.JC3.tar 18447872 SHA256 b8a894c0aff02bd690d2082cb4e0e4d2f8e73ff59e3cbdafd28562346902ced7 SHA512 1f5d0848964b6e805ea735745e8af94664b55dcdf8de664d649b0b261eeac5f36ed0a6cff9bbfdd70b3b574c28b988013c97b1c2011fbcb51f21262f8dda0525 WHIRLPOOL 242e88daa3b3f7b4fbd9611e28ad3e979098d4ab3fd1f2f188843bb60301a7c1b71f20bfcb84da7ce8a9b2e0da75d2d6afc32cab878f4195955571707e6e239c
+DIST JDBC.3.00.JC3.tar 18447872 BLAKE2B 61951967bf1d9bd21583fd4270ccd5b177613896f4864a0bcbd9ecaf995e8a097238cb0f4b1f9f65f8012344b88bbd5b91440507192f2e2a63a39f0595a28ce9 SHA512 1f5d0848964b6e805ea735745e8af94664b55dcdf8de664d649b0b261eeac5f36ed0a6cff9bbfdd70b3b574c28b988013c97b1c2011fbcb51f21262f8dda0525
 EBUILD jdbc-informix-3.00.3.ebuild 1649 BLAKE2B 2f00610dcbf9769bc9b301ff6c1e97d00cc1d0e42daccc8745c055eb75c39f009eaab7cc8ef16faec09bf572e7ccb5b6e26fcdeaa9ba19c06a2b7ab7668f7831 SHA512 a5f50f50e43b3d16f819da314df8866d29b4d5fac9b7af278b1a10f8412ab24d4d60f9d2b4cfdfac8cd834919f6544d253f32dfee72ab5e2cfaac70ffecd5970
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/oracle-jdk-bin/Manifest b/dev-java/oracle-jdk-bin/Manifest
index ac5693deccf9..39ed9eb8e831 100644
--- a/dev-java/oracle-jdk-bin/Manifest
+++ b/dev-java/oracle-jdk-bin/Manifest
@@ -1,4 +1,5 @@
 AUX fontconfig.Gentoo.properties 11196 BLAKE2B 31abb25a488c4680ee6a276d4c4fd0f0c8da5572a923cc1f755a6baf6ef007453c1cda4fb280fa108ae124c888a5b36b05658a9695dc5311f859742fbf9e7a79 SHA512 1802e52383a04efd0d7fb4d6a3903f99128dce90afcb10b9dd0d3515e5feafb807449024dbe5742c7dfa9d43736e474412e1a289e06b29cf3a58e59deedd56f9
+AUX oracle-jdk-bin-9.env.sh 497 BLAKE2B 281d53c547c2067359af307846c29f31683cd18c8d7b305de278398eed254d0c3cdcd153b9ae67edfea7f09190f1da5d26f26026c0c4125b5ecbf8a730c9c433 SHA512 e9eee113974c0d570cccaed0a71917dd12d806248db128bafa1fcf744838ff9181f5b53b791e726e178e2164da1b2d901a43eefc37b25a3776288c137231b2d8
 AUX oracle-jdk-bin.env.sh 833 BLAKE2B 2e8254aff8d35795f073fb599c1c51dcd2ecb0356b4e90977577b9cd41376c3517a72e634bfb1420c37c8149af89044f48aa374480b26a19c875d4c1b78390eb SHA512 8d41679b4631016dbe98b15368ed027df9e6f4d96db17133c56bbf16b9a81be908d139617bc5350aa6b0e51bddc56bb1ce1abc5a8a4fad74868172cfdde6ffd8
 DIST jdk-8u152-linux-arm32-vfp-hflt-demos.tar.gz 10405226 BLAKE2B 07abee47a2911e2f98220e3152be1d037931c1afa36bd95d197e8fa611a8dd3a9e9755afbf9b348497ac93471cbfe43348f9d72bc719714746c22eb5c4785d6c SHA512 774b1957142ca489e362ef6ab48ce152196b64c00d779d051f76421fdf4a52cd7a741cfe3336b02c05f432fd2cb95728cdfd992f4ea3fee56047b40e7ce95053
 DIST jdk-8u152-linux-arm32-vfp-hflt.tar.gz 81729798 BLAKE2B 794f20dd05088aea228365b8e27af4475e90bc0d905bfc600651ffbe11cb92d1ebaa212f0e700572d0016eec952373c0f0b7463073205324d81b22ea0538e491 SHA512 c548c18e2e2c9e2c87ad24841348b676628a33023a70aa0a5dab56d031c1d9c7a4813240a046db96631025d034ed333fec81c8099f02a7c9efd39fecd4592e32
@@ -14,5 +15,9 @@ DIST jdk-8u152-solaris-sparcv9-demos.tar.gz 9769313 BLAKE2B a811ceae2a7ee8d6081b
 DIST jdk-8u152-solaris-sparcv9.tar.gz 104117809 BLAKE2B 1dc8e1297594bdd84186d4422dfc8fff94a78e0316f8873920c79342e7d0ab504794296622f0357acf137a3170f263acd0b2c1dd7179e50ff538b5648abf5a4b SHA512 9b87d11325e22bfb5f8e852ef4dcd182f091dcedfe71e5b19cc5a7d82f9f7ccb060b53512bc938d0e617648a8aa766bb722690751521b9a2cc3820507342548d
 DIST jdk-8u152-solaris-x64-demos.tar.gz 9756596 BLAKE2B 4a5ca101e20d1693eaca23120bc3244412276d51dcf7700dd5142b9d23b90a7ff0d3599dce7862e38a183ea9e1ea67afbc075bdfe84908811bec700a928f46f6 SHA512 1aeaf732ad3956ede4baa005f34024750e03919ef81b608229a3df556b47db1255ce027e4278891644433db0c360225a3e81e9a547d298a4b958beb8691f8ff2
 DIST jdk-8u152-solaris-x64.tar.gz 101758540 BLAKE2B 18b04a0eebc618148bdb215d4ca286fce141fb91dc9c0f05de2520eb073a819161af7a1533b3ecdab9961080ad52acd523b771c23a8a3da8797f0adaf974164e SHA512 4dd9606be347a61a03c0f670915c4e790d4f5eef80a67922342b539dcae7132b3157df04cd33e5f72fdc7e6fcb43e21b3b387e2da159cdfea0feb01183c68aa0
+DIST jdk-9.0.1_linux-x64_bin.tar.gz 354531775 BLAKE2B c8b81f2286a0c3c4aa8f617f4638fb0dfd70a318acb31ff6a650f566aaa0752a8bc0023ec2e4af99e2a0b6f63f30b21ac1e46d920beec486966f498a37e49cea SHA512 c62ae164553830ef2ab8fbeb6d8674ac0db3e845cabe969f33acf79beb66a16ca5096f4c3d5712d87a55b1a791ac0908b4909e8276661ee24900ad8e0a983a55
+DIST jdk-9.0.1_osx-x64_bin.dmg 400669840 BLAKE2B 1fbdbc46c2771a8d7c0d38074e4d145ad3ed32bc1f9ad6bbadecb232e5d96f8bb607839309a7fffcf9fa6731c9f43586033ab96ff1a2761c44a1d19618fc0999 SHA512 f84ea7be92b3cb219fb3b2c642e0ea088cacd252a7a795f9b65483eba7cc15bfa2ff139112d18c3eae1e7618b6aa457aca3aaaec8218581a54c81f263ab02a22
+DIST jdk-9.0.1_solaris-sparcv9_bin.tar.gz 216899843 BLAKE2B 54d5f6d903722f805d9d471aec40b8ac5bb74fa316caf81cd7e1b32f20263f2417b7edcfd6415708b9abee04cba5ad350417af3649f6c5a2c7f71fc5dd5f2639 SHA512 76ed079f2adb7b922dbfb56feb2c6aa3e30e745328b5beab4f67966b42dde509cc0e92c80bf7e5e43b1415d24350e49e3f229d15ddac3ecaa8f8a500b2f6bb79
 EBUILD oracle-jdk-bin-1.8.0.152-r1.ebuild 10432 BLAKE2B 723f8be3fdaf73d1cabdc1d0004d6de431263755d712935686b41da08f9f5a7d3954428e4bf78ce371d12500bd0b5017c0dde2182e2778377643a0d0deeaf771 SHA512 9530367083792aceb6a0264a9b1df4268b3221f5061624be9d343fe193def4c56b57d503d29543127f64474f3a03c4f1ce4ecdfd20a468ba6c193feaadcda8e6
-MISC metadata.xml 947 BLAKE2B 9855b0bed4c616d5b4d0f1b33b8b83b100708b65ac1da3f3c4fa6dc3d4c3c848c46f956d597fb073ce9dfa399bf484c9a46244b3d341794aff2dc9a5173bb6d6 SHA512 e75227c3209a5b85ac0d8f3e0f26752bbe88eca1575e00e75be80beedd65b78765a420fefe33571c6ac90412cf1b3db5768f75e8d6e478714d4f177f100fd815
+EBUILD oracle-jdk-bin-9.0.1.ebuild 6710 BLAKE2B 1a01ddad717d764e8459f0bbf5665da82a224f5b3c6319bc7852da1d0a78c4ce0597ecef068176837b6deeeb439d65b42828229ff84cb925773b5333436004dc SHA512 d2fc8e409bcc5f3b261fad7f9404a257eba2273336c2c811b02454e24865276ffdb25302d89660235ddde82c8790eabe5421bd73a2c00b895e779090e13620be
+MISC metadata.xml 1200 BLAKE2B 3ed6f9dd71a1c26a5292a56f89f8ce8ed72475b0c5139cb03afb47559ae464e0ed64ae4ed5a023bc2a2d316c77805a8820762a4dbfa091f612fd2729fe2f17f5 SHA512 1c104de4d08e61cb3cb14755536e7ed74df233325a673fcd83ca930335d35e77408653a4e2f962de792e186dd7ad9457e3898be159af61842610801ea00b9d9f
diff --git a/dev-java/oracle-jdk-bin/files/oracle-jdk-bin-9.env.sh b/dev-java/oracle-jdk-bin/files/oracle-jdk-bin-9.env.sh
new file mode 100644
index 000000000000..503707550e23
--- /dev/null
+++ b/dev-java/oracle-jdk-bin/files/oracle-jdk-bin-9.env.sh
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+VERSION="Oracle JDK ${PV}"
+JAVA_HOME="${EPREFIX}/opt/${P}"
+JDK_HOME="${EPREFIX}/opt/${P}"
+JAVAC="\${JAVA_HOME}/bin/javac"
+PATH="\${JAVA_HOME}/bin"
+ROOTPATH="\${JAVA_HOME}/bin"
+LDPATH="\${JAVA_HOME}/lib/:\${JAVA_HOME}/lib/server/"
+MANPATH=""
+PROVIDES_TYPE="JDK JRE"
+PROVIDES_VERSION="${SLOT}"
+BOOTCLASSPATH=""
+GENERATION="2"
+ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/oracle-jdk-bin/metadata.xml b/dev-java/oracle-jdk-bin/metadata.xml
index 165190f3d7ec..1951d0d61240 100644
--- a/dev-java/oracle-jdk-bin/metadata.xml
+++ b/dev-java/oracle-jdk-bin/metadata.xml
@@ -10,6 +10,9 @@
     <flag name="commercial">Install features requiring a commercial license for production use</flag>
     <flag name="derby">Install bundled Derby (Java database)</flag>
     <flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs (used to be X flag)</flag>
+    <flag name="gentoo-vm">Allow this JDK to be recognised by Gentoo (package manager, eselect, java-config, EXPERIMENTAL!)</flag>
+    <flag name="gtk2">Enable GTK+ 2 support in JavaFX</flag>
+    <flag name="gtk3">Enable GTK+ 3 support in JavaFX</flag>
     <flag name="javafx">Install JavaFX libraries</flag>
     <flag name="jce">Install Java Cryptographic Extension Unlimited Strength Jurisdiction Policy Files</flag>
     <flag name="source">Install JVM (and optionally JavaFX) sources</flag>
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-9.0.1.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-9.0.1.ebuild
new file mode 100644
index 000000000000..f86453303c61
--- /dev/null
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-9.0.1.ebuild
@@ -0,0 +1,239 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop gnome2-utils java-vm-2 prefix
+
+KEYWORDS="-* ~amd64 ~x64-macos ~sparc64-solaris"
+
+declare -A ARCH_FILES
+ARCH_FILES[amd64]="jdk-${PV}_linux-x64_bin.tar.gz"
+ARCH_FILES[sparc64-solaris]="jdk-${PV}_solaris-sparcv9_bin.tar.gz"
+ARCH_FILES[x64-macos]="jdk-${PV}_osx-x64_bin.dmg"
+
+for keyword in ${KEYWORDS//-\*} ; do
+	SRC_URI+=" ${keyword#\~}? ( ${ARCH_FILES[${keyword#\~}]} )"
+done
+
+DESCRIPTION="Oracle's Java SE Development Kit"
+HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
+LICENSE="Oracle-BCLA-JavaSE"
+SLOT="${PV%%.*}"
+IUSE="alsa commercial cups doc +fontconfig +gentoo-vm gtk2 gtk3 headless-awt javafx nsplugin selinux source"
+REQUIRED_USE="javafx? ( alsa fontconfig ^^ ( gtk2 gtk3 ) )"
+RESTRICT="fetch preserve-libs strip"
+QA_PREBUILT="*"
+
+# NOTES:
+#
+# * cups is dlopened.
+#
+# * libpng is also dlopened but only by libsplashscreen, which isn't
+#   important, so we can exclude that.
+#
+# * We still need to work out the exact AWT and JavaFX dependencies
+#   under MacOS. It doesn't appear to use many, if any, of the
+#   dependencies below.
+#
+RDEPEND="!x64-macos? (
+		!headless-awt? (
+			x11-libs/libX11
+			x11-libs/libXext
+			x11-libs/libXi
+			x11-libs/libXrender
+			x11-libs/libXtst
+		)
+		javafx? (
+			dev-libs/atk
+			dev-libs/glib:2
+			dev-libs/libxml2:2
+			dev-libs/libxslt
+			media-libs/freetype:2
+			x11-libs/gdk-pixbuf
+			x11-libs/libX11
+			x11-libs/libXtst
+			x11-libs/libXxf86vm
+			x11-libs/pango
+			virtual/opengl
+
+			gtk2? (
+				x11-libs/cairo
+				x11-libs/gtk+:2
+			)
+			gtk3? (
+				x11-libs/cairo[glib]
+				x11-libs/gtk+:3
+			)
+		)
+	)
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	doc? ( dev-java/java-sdk-docs:${SLOT} )
+	fontconfig? ( media-libs/fontconfig:1.0 )
+	!prefix? ( sys-libs/glibc:* )
+	selinux? ( sec-policy/selinux-java )"
+
+pkg_nofetch() {
+	einfo "Please download ${ARCH_FILES[${ARCH}]} and move it to"
+	einfo "${DISTDIR}:"
+	einfo
+	einfo "  http://www.oracle.com/technetwork/java/javase/downloads/jdk9-downloads-3848520.html"
+	einfo
+	einfo "If the above mentioned URL does not point to the correct version anymore,"
+	einfo "please download the file from Oracle's Java download archive:"
+	einfo
+	einfo "  http://www.oracle.com/technetwork/java/javase/downloads/java-archive-javase9-3934878.html"
+	einfo
+}
+
+src_unpack() {
+	if use x64-macos ; then
+		S="${WORKDIR}/Contents/Home"
+		mkdir -p "${T}"/dmgmount || die
+		hdiutil attach "${DISTDIR}/${A}" -mountpoint "${T}"/dmgmount || die
+		xar -Oxf "${T}"/dmgmount/JDK\ ${PV}.pkg jdk${PV//.}.pkg/Payload | zcat | cpio -idv || die
+		hdiutil detach "${T}"/dmgmount || die
+	else
+		S="${WORKDIR}/jdk-${PV}"
+		default
+	fi
+}
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}${dest#/}"
+
+	# Create files used as storage for system preferences.
+	mkdir .systemPrefs || die
+	touch .systemPrefs/.system.lock || die
+	touch .systemPrefs/.systemRootModFile || die
+
+	if ! use alsa ; then
+		rm -vf lib/libjsoundalsa.* || die
+	fi
+
+	if ! use commercial ; then
+		rm -vfr jmods/*.jfr.* lib/jfr* \
+			lib/missioncontrol || die
+	fi
+
+	if use headless-awt ; then
+		rm -vf lib/lib*{[jx]awt,splashscreen}* \
+		   bin/{appletviewer,javaws,policytool} || die
+	fi
+
+	if ! use javafx ; then
+		rm -vf lib/lib*{decora,fx,glass,prism}* \
+		   lib/libgstreamer-lite.* lib/*fx* \
+		   bin/javapackager jmods/javafx* || die
+	else
+		if ! use gtk2 ; then
+			rm -vf lib/libglassgtk2.* || die
+		elif ! use gtk3 ; then
+			rm -vf lib/libglassgtk3.* || die
+		fi
+	fi
+
+	if ! use nsplugin ; then
+		rm -vf lib/libnpjp2.* || die
+	else
+		local nsplugin=$(echo lib/libnpjp2.*)
+		local nsplugin_link=${nsplugin##*/}
+		nsplugin_link=${nsplugin_link/./-${PN}-${SLOT}.}
+		dosym "${dest}/${nsplugin}" "/usr/$(get_libdir)/nsbrowser/plugins/${nsplugin_link}"
+	fi
+
+	if ! use source ; then
+		rm -v lib/src.zip || die
+	fi
+
+	# Even though plugins linked against multiple ffmpeg versions are
+	# provided, they generally lag behind what Gentoo has available.
+	rm -vf lib/libavplugin* || die
+
+	# Prune all fontconfig files so that libfontconfig will be used.
+	rm -v lib/fontconfig.* || die
+
+	# Install desktop file for the Java Control Panel. Using
+	# ${PN}-${SLOT} to prevent file collision with JRE and other slots.
+	if [[ -d lib/desktop/icons ]] ; then
+		local icon
+		pushd lib/desktop/icons >/dev/null || die
+		for icon in */*/apps/sun-jcontrol.png ; do
+			insinto /usr/share/icons/"${icon%/*}"
+			newins "${icon}" sun-jcontrol-${PN}-${SLOT}.png
+		done
+		popd >/dev/null || die
+		make_desktop_entry \
+			"${dest}"/bin/jcontrol \
+			"Java Control Panel for Oracle JDK ${SLOT}" \
+			sun-jcontrol-${PN}-${SLOT} \
+			"Settings;Java;"
+	fi
+
+	dodir "${dest}"
+	cp -pPR bin conf include jmods lib "${ddest}" || die
+
+	# Only install Gentoo-specific fontconfig if flag is disabled.
+	# https://docs.oracle.com/javase/8/docs/technotes/guides/intl/fontconfig.html
+	if ! use fontconfig ; then
+		insinto "${dest}"/lib/
+		doins "$(prefixify_ro "${FILESDIR}"/fontconfig.Gentoo.properties)"
+	fi
+
+	# Needs to be done before CDS, bug #215225.
+	java-vm_set-pax-markings "${ddest}"
+
+	# See bug #207282.
+	einfo "Creating the Class Data Sharing archives"
+	"${ddest}/bin/java" -server -Xshare:dump || die
+
+	# Remove empty dirs we might have copied.
+	find "${D}" -type d -empty -exec rmdir -v {} + || die
+
+	if use x64-macos ; then
+		local lib
+		for lib in lib{decora_sse,glass,prism_{common,es2,sw}}.dylib ; do
+			ebegin "Fixing self-reference of ${lib}"
+			install_name_tool \
+				-id "${EPREFIX}${dest}"/lib/${lib} \
+				"${ddest}"/lib/${lib} || die
+			eend $?
+		done
+	fi
+
+	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-9.env.sh
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	java-vm-2_pkg_postinst
+
+	if ! use headless-awt && ! use javafx ; then
+		ewarn "You have disabled the javafx flag. Some modern desktop Java applications"
+		ewarn "require this and they may fail with a confusing error message."
+	fi
+
+	if use gentoo-vm ; then
+		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
+		ewarn "recognised by the system. This will almost certainly break things."
+	else
+		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
+		ewarn "will not be recognised by the system. For example, simply calling"
+		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
+		ewarn "fully supports Java 9. This JDK must therefore be invoked using its"
+		ewarn "absolute location under ${EPREFIX}/opt/${P}."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	java-vm-2_pkg_postrm
+}
diff --git a/dev-java/oracle-jre-bin/Manifest b/dev-java/oracle-jre-bin/Manifest
index 21d30ee9ce9d..9b82f7cb2eb0 100644
--- a/dev-java/oracle-jre-bin/Manifest
+++ b/dev-java/oracle-jre-bin/Manifest
@@ -1,6 +1,11 @@
 AUX fontconfig.Gentoo.properties 11196 BLAKE2B 31abb25a488c4680ee6a276d4c4fd0f0c8da5572a923cc1f755a6baf6ef007453c1cda4fb280fa108ae124c888a5b36b05658a9695dc5311f859742fbf9e7a79 SHA512 1802e52383a04efd0d7fb4d6a3903f99128dce90afcb10b9dd0d3515e5feafb807449024dbe5742c7dfa9d43736e474412e1a289e06b29cf3a58e59deedd56f9
-AUX oracle-jre-bin.env.sh 785 BLAKE2B d3091f03cc7954e92a16ca43ae08869380a640325104853a87ddb01a07111fbc82990409123e1e96f051a19f60a06ae00f8a96ff646c5f696b62ac38d167684e SHA512 fee30a728d97822e0189e6687ac285e72270207d43ae2859159cbd212b3897cfa153aa27f66b06ee704ac24637f2d88b579c3aedc4026fd8508d59622e68b0e6
+AUX oracle-jre-bin-9.env.sh 493 BLAKE2B 938985505c591afe17468af2314fd3e15c79205d141eb032055f0dcdb252a4931662d719ac28870ae72c5fd2f0901addb3bb552fa071f637ed674061f313fea2 SHA512 d98fbbcb422258f604489e630d4a3743ab44f9bc9648fdadf62da82ab4a8ff53cf9713e28d448eaa6c9e7fa412158a2fcdb26cb91c4abb3f8100c084d14977dd
+AUX oracle-jre-bin.env.sh 749 BLAKE2B b8c1f54712f4d41fd78bae4e7ad9e351516487b3c4573593674c1f340c4f9bafe9a283c35f8c3f136e1f93a6b0c8f6cf85837b4532db62059c7e66f05d7e0610 SHA512 273fafcafabd64946932eb42552476aeea2a9fc1c803cbcaa4f86b4fc8c80d109abdad068bf2063d7ea7e7c2d2794d7dc96dca6aae5ef8787b98ad57f467fa69
 DIST jre-8u152-linux-i586.tar.gz 83131659 BLAKE2B 5f0619eb8c0f5937d2c5da573f40daaf46d1fad27fd57fab7b422017dadc2ae51399c3a99ba6044443d535f12b2a891a7b767d7da06f8567ef19eb74f7c92b33 SHA512 8bd655ae97c333ed57991ed6d13d2c2647f85e5a1c853dd76031b8e7689db9a1b183bc665acc5b9f989139b34300ac65ab65c80e18234d6d1b06a4512fc4e542
 DIST jre-8u152-linux-x64.tar.gz 80061016 BLAKE2B 5aa25c152aae5e106bd9cb3b1b14125437531991f082548faf0b12f7e52a77e9dd01f178806d48d71d99c718358798b214a64acdfd1afa55e3791c6d78aabf95 SHA512 7c58ff2c3ac9af423ffab0ebfbfa7b4842072f6554569d76a99f8c82fa6935e36dbcf811f9c5510d71fc87db9520e684d877d99cae95f4874578ba42157ce85d
+DIST jre-9.0.1_linux-x64_bin.tar.gz 86986075 BLAKE2B cf9bc51097d3e22a8adc2296cd2e6f3680db228ba549b66b7c2a01b002ed8f376daa97d07552e52b24b6de0c751303e3f52fe179aa986d6a1a0a3140e466fcb7 SHA512 6d0cb54fa2500936bf3e9d37c9f86c5c259afc88df04aa5e8b151fdaf90ac0665eeaa5f7f50281fe8c73a5697075e139ff7b3dd9f3af60eb84635d4dac4696cb
+DIST jre-9.0.1_osx-x64_bin.tar.gz 74606780 BLAKE2B 825189d9da379defc472e98f9953e1c2c1cb908b578883e71a95e78bc6c338ac862f4493a79aad55cc90f520a8d6a27fafd30ccc300940dfada6ac29811595c1 SHA512 2751ac8b1f9098990047624aba6e764fe783170c95a99755244c233c331ffc52606c334151a1aced504dd12a84cffe0ba1050ed8482df24fc4a6fffc72b18b20
+DIST jre-9.0.1_solaris-sparcv9_bin.tar.gz 54821972 BLAKE2B 979296c5ed8917acc70655da72a00c0b771f40c18da4ca2b403cf4a2c5361f0a09821aa487e5f3c9d2cd057e6d8cbd7efdd48ac22fa2fc36352e8a6cc051f84f SHA512 c3ab0837acda00cdc532a528ee648c8e5334ee263fabaf7b2e86488f84615779431ccaf8d421e10cc00aa46fafebb0d52ed6358541de21c42cc801e7bac17bf4
 EBUILD oracle-jre-bin-1.8.0.152-r1.ebuild 6433 BLAKE2B b8d6d8af36e186c06aa9df958b316aeb6974b5e90b29b72c7a2c2c06ecf461fafa517eedb50f131a9d18850f325e949c9c6e702f0028115d7fbdb45a39796488 SHA512 2b26c0a9250fa719b1da5370b8cb632a6bcf6f2336cabe21d086ed73030757776d94de13e3be8a64b1002dfcf3af61501f6a08eb6e903b79888df0e9b96c9908
-MISC metadata.xml 743 BLAKE2B 8669a83860c5bde6fa4dc380173d97756cac52e46cfd60effebe73088e35b8e31876e0c2d267201cb2c739afaed94515ec90ec2b2b2e346664b02bd173540bda SHA512 31515728907e1fdc96fe6a27f62585c528370a544a306b4a3a26cf86d8a248211e3852e4a532d9a59be0e534393e6f11bd46df39b439084eb1234d7a6bea4d42
+EBUILD oracle-jre-bin-9.0.1.ebuild 6271 BLAKE2B 6921bb42d99f25b55c06be1b1e8b86ce748c1d610f5a70e9cbb9376f221cb40eb0150cad55b857be5f27fb60bbbceb669bb81b97faf67a9f82378f2687efd19a SHA512 5237fab65b48a29b5229955ffce011b293bcffe2eef0a9e2f8627a06f0b6df0db16161f70ac03a039e30b9921442162a803da1a8ce541bd28896a0362811cf28
+MISC metadata.xml 996 BLAKE2B 0ceaf014bbef2817e869d5364997a44f77be90717bd01a09114b18e9318f58b61e3f4048f3b22a7ee8430a1042695f313066e996c15db71ee0775cf73aa7f1ef SHA512 043f1e701ac085678dbbb662994f6b67c78634990d721c65de97b392555e3a2fe5bfaccbe00f48c5dbd7c4e48837c6662d70306bf7cb3485ee3b2efa440b7afe
diff --git a/dev-java/oracle-jre-bin/files/oracle-jre-bin-9.env.sh b/dev-java/oracle-jre-bin/files/oracle-jre-bin-9.env.sh
new file mode 100644
index 000000000000..7e6f9a0e6684
--- /dev/null
+++ b/dev-java/oracle-jre-bin/files/oracle-jre-bin-9.env.sh
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+VERSION="Oracle JRE ${PV}"
+JAVA_HOME="${EPREFIX}/opt/${P}"
+JDK_HOME="${EPREFIX}/opt/${P}"
+JAVAC="\${JAVA_HOME}/bin/javac"
+PATH="\${JAVA_HOME}/bin"
+ROOTPATH="\${JAVA_HOME}/bin"
+LDPATH="\${JAVA_HOME}/lib/:\${JAVA_HOME}/lib/server/"
+MANPATH=""
+PROVIDES_TYPE="JRE"
+PROVIDES_VERSION="${SLOT}"
+BOOTCLASSPATH=""
+GENERATION="2"
+ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/oracle-jre-bin/files/oracle-jre-bin.env.sh b/dev-java/oracle-jre-bin/files/oracle-jre-bin.env.sh
index eaf356787d8d..a52547ca506f 100644
--- a/dev-java/oracle-jre-bin/files/oracle-jre-bin.env.sh
+++ b/dev-java/oracle-jre-bin/files/oracle-jre-bin.env.sh
@@ -5,8 +5,8 @@ VERSION="Oracle JRE ${PV}"
 JAVA_HOME="${EPREFIX}/opt/${P}"
 JDK_HOME="${EPREFIX}/opt/${P}"
 JAVAC="\${JAVA_HOME}/bin/javac"
-PATH="\${JAVA_HOME}/bin:\${JAVA_HOME}/bin"
-ROOTPATH="\${JAVA_HOME}/bin:\${JAVA_HOME}/bin"
+PATH="\${JAVA_HOME}/bin"
+ROOTPATH="\${JAVA_HOME}/bin"
 LDPATH="\${JAVA_HOME}/lib/$(get_system_arch)/:\${JAVA_HOME}/lib/$(get_system_arch)/server/"
 MANPATH="${EPREFIX}/opt/${P}/man"
 PROVIDES_TYPE="JRE"
diff --git a/dev-java/oracle-jre-bin/metadata.xml b/dev-java/oracle-jre-bin/metadata.xml
index edb6ab75a53c..b9fe447b1280 100644
--- a/dev-java/oracle-jre-bin/metadata.xml
+++ b/dev-java/oracle-jre-bin/metadata.xml
@@ -9,6 +9,9 @@
   <use>
     <flag name="commercial">Install features requiring a commercial license for production use</flag>
     <flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs (used to be X flag)</flag>
+    <flag name="gentoo-vm">Allow this JRE to be recognised by Gentoo (package manager, eselect, java-config, EXPERIMENTAL!)</flag>
+    <flag name="gtk2">Enable GTK+ 2 support in JavaFX</flag>
+    <flag name="gtk3">Enable GTK+ 3 support in JavaFX</flag>
     <flag name="javafx">Install JavaFX libraries</flag>
     <flag name="jce">Install Java Cryptographic Extension Unlimited Strength Jurisdiction Policy Files</flag>
   </use>
diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-9.0.1.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-9.0.1.ebuild
new file mode 100644
index 000000000000..81ca64dc5cc8
--- /dev/null
+++ b/dev-java/oracle-jre-bin/oracle-jre-bin-9.0.1.ebuild
@@ -0,0 +1,229 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop gnome2-utils java-vm-2 prefix
+
+KEYWORDS="-* ~amd64 ~x64-macos ~sparc64-solaris"
+
+declare -A ARCH_FILES
+ARCH_FILES[amd64]="jre-${PV}_linux-x64_bin.tar.gz"
+ARCH_FILES[sparc64-solaris]="jre-${PV}_solaris-sparcv9_bin.tar.gz"
+ARCH_FILES[x64-macos]="jre-${PV}_osx-x64_bin.tar.gz"
+
+for keyword in ${KEYWORDS//-\*} ; do
+	SRC_URI+=" ${keyword#\~}? ( ${ARCH_FILES[${keyword#\~}]} )"
+done
+
+DESCRIPTION="Oracle's Java SE Runtime Environment"
+HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
+LICENSE="Oracle-BCLA-JavaSE"
+SLOT="${PV%%.*}"
+IUSE="alsa commercial cups +fontconfig +gentoo-vm gtk2 gtk3 headless-awt javafx nsplugin selinux"
+REQUIRED_USE="javafx? ( alsa fontconfig ^^ ( gtk2 gtk3 ) )"
+RESTRICT="fetch preserve-libs strip"
+QA_PREBUILT="*"
+
+# NOTES:
+#
+# * cups is dlopened.
+#
+# * libpng is also dlopened but only by libsplashscreen, which isn't
+#   important, so we can exclude that.
+#
+# * We still need to work out the exact AWT and JavaFX dependencies
+#   under MacOS. It doesn't appear to use many, if any, of the
+#   dependencies below.
+#
+RDEPEND="!x64-macos? (
+		!headless-awt? (
+			x11-libs/libX11
+			x11-libs/libXext
+			x11-libs/libXi
+			x11-libs/libXrender
+			x11-libs/libXtst
+		)
+		javafx? (
+			dev-libs/atk
+			dev-libs/glib:2
+			dev-libs/libxml2:2
+			dev-libs/libxslt
+			media-libs/freetype:2
+			x11-libs/gdk-pixbuf
+			x11-libs/libX11
+			x11-libs/libXtst
+			x11-libs/libXxf86vm
+			x11-libs/pango
+			virtual/opengl
+
+			gtk2? (
+				x11-libs/cairo
+				x11-libs/gtk+:2
+			)
+			gtk3? (
+				x11-libs/cairo[glib]
+				x11-libs/gtk+:3
+			)
+		)
+	)
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	fontconfig? ( media-libs/fontconfig:1.0 )
+	!prefix? ( sys-libs/glibc:* )
+	selinux? ( sec-policy/selinux-java )"
+
+pkg_nofetch() {
+	einfo "Please download ${ARCH_FILES[${ARCH}]} and move it to"
+	einfo "${DISTDIR}:"
+	einfo
+	einfo "  http://www.oracle.com/technetwork/java/javase/downloads/jre9-downloads-3848532.html"
+	einfo
+	einfo "If the above mentioned URL does not point to the correct version anymore,"
+	einfo "please download the file from Oracle's Java download archive:"
+	einfo
+	einfo "  http://www.oracle.com/technetwork/java/javase/downloads/java-archive-javase9-3934878.html"
+	einfo
+}
+
+src_unpack() {
+	if use x64-macos ; then
+		S="${WORKDIR}/jre-${PV}.jre/Contents/Home"
+	else
+		S="${WORKDIR}/jre-${PV}"
+	fi
+
+	default
+}
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}${dest#/}"
+
+	# Create files used as storage for system preferences.
+	mkdir .systemPrefs || die
+	touch .systemPrefs/.system.lock || die
+	touch .systemPrefs/.systemRootModFile || die
+
+	if ! use alsa ; then
+		rm -vf lib/libjsoundalsa.* || die
+	fi
+
+	if ! use commercial ; then
+		rm -vfr lib/jfr* || die
+	fi
+
+	if use headless-awt ; then
+		rm -vf lib/lib*{[jx]awt,splashscreen}* \
+		   bin/javaws || die
+	fi
+
+	if ! use javafx ; then
+		rm -vf lib/lib*{decora,fx,glass,prism}* \
+		   lib/libgstreamer-lite.* lib/*fx* || die
+	else
+		if ! use gtk2 ; then
+			rm -vf lib/libglassgtk2.* || die
+		elif ! use gtk3 ; then
+			rm -vf lib/libglassgtk3.* || die
+		fi
+	fi
+
+	if ! use nsplugin ; then
+		rm -vf lib/libnpjp2.* || die
+	else
+		local nsplugin=$(echo lib/libnpjp2.*)
+		local nsplugin_link=${nsplugin##*/}
+		nsplugin_link=${nsplugin_link/./-${PN}-${SLOT}.}
+		dosym "${dest}/${nsplugin}" "/usr/$(get_libdir)/nsbrowser/plugins/${nsplugin_link}"
+	fi
+
+	# Even though plugins linked against multiple ffmpeg versions are
+	# provided, they generally lag behind what Gentoo has available.
+	rm -vf lib/libavplugin* || die
+
+	# Prune all fontconfig files so that libfontconfig will be used.
+	rm -v lib/fontconfig.* || die
+
+	# Install desktop file for the Java Control Panel. Using
+	# ${PN}-${SLOT} to prevent file collision with JDK and other slots.
+	if [[ -d lib/desktop/icons ]] ; then
+		local icon
+		pushd lib/desktop/icons >/dev/null || die
+		for icon in */*/apps/sun-jcontrol.png ; do
+			insinto /usr/share/icons/"${icon%/*}"
+			newins "${icon}" sun-jcontrol-${PN}-${SLOT}.png
+		done
+		popd >/dev/null || die
+		make_desktop_entry \
+			"${dest}"/bin/jcontrol \
+			"Java Control Panel for Oracle JRE ${SLOT}" \
+			sun-jcontrol-${PN}-${SLOT} \
+			"Settings;Java;"
+	fi
+
+	dodir "${dest}"
+	cp -pPR	bin conf lib "${ddest}" || die
+
+	# Only install Gentoo-specific fontconfig if flag is disabled.
+	# https://docs.oracle.com/javase/8/docs/technotes/guides/intl/fontconfig.html
+	if ! use fontconfig ; then
+		insinto "${dest}"/lib/
+		doins "$(prefixify_ro "${FILESDIR}"/fontconfig.Gentoo.properties)"
+	fi
+
+	# Needs to be done before CDS, bug #215225.
+	java-vm_set-pax-markings "${ddest}"
+
+	# See bug #207282.
+	einfo "Creating the Class Data Sharing archives"
+	"${ddest}/bin/java" -server -Xshare:dump || die
+
+	# Remove empty dirs we might have copied.
+	find "${D}" -type d -empty -exec rmdir -v {} + || die
+
+	if use x64-macos ; then
+		local lib
+		for lib in lib{decora_sse,glass,prism_{common,es2,sw}}.dylib ; do
+			ebegin "Fixing self-reference of ${lib}"
+			install_name_tool \
+				-id "${EPREFIX}${dest}"/lib/${lib} \
+				"${ddest}"/lib/${lib} || die
+			eend $?
+		done
+	fi
+
+	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-9.env.sh
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	java-vm-2_pkg_postinst
+
+	if ! use headless-awt && ! use javafx ; then
+		ewarn "You have disabled the javafx flag. Some modern desktop Java applications"
+		ewarn "require this and they may fail with a confusing error message."
+	fi
+
+	if use gentoo-vm ; then
+		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JRE"
+		ewarn "recognised by the system. This will almost certainly break things."
+	else
+		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JRE"
+		ewarn "will not be recognised by the system. For example, simply calling"
+		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
+		ewarn "fully supports Java 9. This JRE must therefore be invoked using its"
+		ewarn "absolute location under ${EPREFIX}/opt/${P}."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	java-vm-2_pkg_postrm
+}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 9b35e2435ac3..0f206d834258 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index b6204a069a4c..f2ca1f3a2328 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -11,7 +11,7 @@ DIST ruby-patches-2.3.6.tar.bz2 3030 BLAKE2B 7c1e80ff0569a03672f53820c665933056b
 DIST ruby-patches-2.4.2.tar.bz2 3443 BLAKE2B d90cfb496ad8701fccb061fd314a7f2394b251c921f270f17c8335f617e71dacc8e4a2df4e76842b67eb34627e5f5291d8a2723f6dfed53a36ace3abad95a179 SHA512 fb8349c67c72caf10ec12c4b5410194b4df24345446c2e3b6c6176d00727bfe803f4a905ef094a2d52315b6f4c3ce74fb8fbaa2fdf5efe46e6ccb24bf8418b17
 DIST ruby-patches-2.4.3.tar.bz2 2898 BLAKE2B e46502dbb0aa25c3d71693a6c04b433bd4de60f194cdd283517c4b08da190356885d9bca4a6765402088185fa8ec681156e8e8eecf0703a2c1ea7bb81adc0bf9 SHA512 d767d43c7df737469247e42e1c4205b8c6850c8f335a2869c884f145c037e9bab10492cc7cd2903f5c33e232cdc5bbdabb3e8da837c7bf420b9d58d1d33149ed
 EBUILD ruby-2.2.8.ebuild 6914 BLAKE2B 7c2786f023183c10e863890e9fac82228985d67bdde66546df59079c8a5c7b053b02e909ea5f6c0efc86df37c1d5ba000caa0a1c49cb260ed41291764f556aaa SHA512 2b5ab88539f49a91f4876598a910bfd80eb1789e738aa5c25489e12d9f7acefece189681c4600dd378da79049ae3712b0e90e2ec414163ef99333e54a0b5da68
-EBUILD ruby-2.2.9.ebuild 6923 BLAKE2B 77b3134671dcd0510757eb071d5daf0c85e4ad2bfe6abeb693fcfaf3e8418de91f811a59912aa63ed5d0d4aca0f21162188c66115e6b0d56ba0fc22d655b98e1 SHA512 1c0201e8fdde8eb8eaf564749a0dbc6faac440e7d01d5e4dac877549de5e20979c6d4ab8c9e6cf26a6151f80cab5313b40af5f7443e7ca330896ecbdf9c63acb
+EBUILD ruby-2.2.9.ebuild 6922 BLAKE2B bbad6f6d45603f72d8ffaed94523f6129e68a5e41a0536c4ce0030d1bbdd5f3250e3c795025852f74ae1ecc1c96e0682638889a87aaafc938a6cfba8248ac1a1 SHA512 19dbdbc9da93dc2bda7a0d7583bc4db0055881da3512894e0b03b0c5c96441d5f276646abc6660d7efd2ded89c91fb55e084e57ef7576faddf83ed3278439a6b
 EBUILD ruby-2.3.5.ebuild 6877 BLAKE2B 5d55fe0c3bd56afed1c040fba22f7ead461ef5c55edb43bf1d7a435db24921434f1a2a7d48f473d2bdc3d56f714ffbc3c0c3de24855f1b8aee10b0e3266b89f0 SHA512 059ec424075082c9809a0951dec55e38b9861124632b10167ed696081ed2402c14a7575dfb9a62152529957f768f69f6bf6424d70a85e5b6d3374884ea86d1fc
 EBUILD ruby-2.3.6.ebuild 6877 BLAKE2B 5d55fe0c3bd56afed1c040fba22f7ead461ef5c55edb43bf1d7a435db24921434f1a2a7d48f473d2bdc3d56f714ffbc3c0c3de24855f1b8aee10b0e3266b89f0 SHA512 059ec424075082c9809a0951dec55e38b9861124632b10167ed696081ed2402c14a7575dfb9a62152529957f768f69f6bf6424d70a85e5b6d3374884ea86d1fc
 EBUILD ruby-2.4.2.ebuild 6978 BLAKE2B 0262a40a78def3c9a83931573282cd2da8aa3ebeff7cdd8d36c3064a75cac1ef2d4196c0e7dc814d3f33473af17bc343ed77ecb7e807aa1848d826dcc0a1b6d1 SHA512 c6f48c8357e5248046ec8e811d6e96c57c073d5494cefded64baf1b5c177bc9e7a4a5e545b3ca5e977bd648066b568b1f5c9df59387540f2a145159e75f09795
diff --git a/dev-lang/ruby/ruby-2.2.9.ebuild b/dev-lang/ruby/ruby-2.2.9.ebuild
index bde37ba6f666..93d6bddb47db 100644
--- a/dev-lang/ruby/ruby-2.2.9.ebuild
+++ b/dev-lang/ruby/ruby-2.2.9.ebuild
@@ -30,7 +30,7 @@ SRC_URI="mirror://ruby/2.2/${MY_P}.tar.xz
 		 https://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl tk xemacs ncurses +readline"
 
 RDEPEND="
diff --git a/dev-lang/vala/Manifest b/dev-lang/vala/Manifest
index 2df5b8511912..1448cfc08768 100644
--- a/dev-lang/vala/Manifest
+++ b/dev-lang/vala/Manifest
@@ -3,9 +3,11 @@ DIST vala-0.34.8.tar.xz 2778228 BLAKE2B ce48baeaa2ba88e09234c8a6e14c6aed60771476
 DIST vala-0.34.9.tar.xz 2783952 BLAKE2B e90728075ac546e8abc125886182abd5fc357be5138bfea1ed058f41bf07968e55e032469cc068cefdb6a4d53f1c029ca7e728c57b00f6b9845e32c4410e8258 SHA512 8128dfbb50d0db2317feb4a358310de972ecb6f4dccaceb4d55cf3a024f4d83422e3137c92238e1a0a0b4766367ad307909a1310445017c71944ac30fc68d01f
 DIST vala-0.36.4.tar.xz 2846516 BLAKE2B 9b310457249ff0d75a76abcf7bcf3855bf0f75f3115883ab11ea04c4faf982fa3ddacc4245eacad7aebb62bbf1ef29f7866b6260d275b135c85ecba6173186d3 SHA512 cc804b9ad0bda4968660084c5d5e38761b0d478a6c504d3d2e6188fdd2deef4a4315d7278191f19b3bcbee66e0b02733deb6050d168305c85cef8f203ecc13ac
 DIST vala-0.36.5.tar.xz 2849320 BLAKE2B 5592ff226869ea4aacc8a485a6f1c7fcf62a81acce6039946b01179aa3529f8beb76a1d468cd373fb2b823e156f0cca8f6855b910166e607d0936e30fa6e1511 SHA512 1059fb52aa0d40fc04e8bc46a8cd54e1538554aa32e0e92e4a27779558fa1a9f460988d27667a613d958f3eb9dbe02fdac7e1632b91e8324bdfb5663e1cf0aac
+DIST vala-0.36.7.tar.xz 2854668 BLAKE2B 2fcb528b26a56ee9f9d362ec1891c873ee26580132c052554a3d021fea32c0cee6dc6e8c6419f88798f5066a70d54084757893b2d46e3b286b441a51a4169c92 SHA512 7a6daac5be72240ae998b2c26e240a8b6bbc44c8bb6a036357fc0419cd7b40e14ea76c8125eb49a8d252627425613512410ba7868eb579b13d299e2ff0f4082b
 EBUILD vala-0.32.1.ebuild 730 BLAKE2B 9450d1f91714a86dedd803aafcfbb5aa744416e3c65792b566975b654cd96c9537be76c72c40ce041c38c01a4733abd4859274f0f56c5895efb37297c168aff3 SHA512 398bbcbedcce2e1dabd2c86d0c770f78bd380833e117d07196872e732a7763213747996ef5a44a68d4bac52f0a30de6f4361620acfaf3e87b1278771d02cfbbd
 EBUILD vala-0.34.8.ebuild 730 BLAKE2B 4103e7fb4100c296d33f2d101a9abde439f055937a6198517626f2f2c2c1acf73dc4b495f23d71b4130ae561c1b1a5930b87aa3abd99f1d95b1c3d0ef02754ca SHA512 c8b77206bb700f239dd7900b2dcba92be66a817292945f5e4c497e60eff6560ab12236f5ade4ffa4d868f9292b709e782de16d3ee7b890d8fe4ce3ceafd062b8
 EBUILD vala-0.34.9.ebuild 732 BLAKE2B bdcd463faf51f81e3e2dc711b2a08cbfc1efa9f08a211c8328d44f94ffbac79019fc5d07a77fc90350fe084fe76c5c480105fdf93e23287709db2ec5336fb2c2 SHA512 f3ee38d761d4cd1be6b255e09a3e48f6579f56dc13749066388c7934fa33dbd9cf8f1a45cf2b8e2b90deddc5e7aa4731450540332ee36dd6f825f664f34c63f1
 EBUILD vala-0.36.4.ebuild 822 BLAKE2B 29abd8f141edf688132a4a71de0d52a5e4a523c7892592ba885e697c877e8e525738a4d4cedcb08e6e19ab5b471146db20cdba1f52366807f03a07558d234d86 SHA512 6071be0ef45009914e22d54f6f860f3f77ef1d7d5338d1743eac455863a26eaa2f7bb740e72bc84e4d8edd208f180001c58553a79acae9d17baee3e38f62f27a
 EBUILD vala-0.36.5.ebuild 822 BLAKE2B 29abd8f141edf688132a4a71de0d52a5e4a523c7892592ba885e697c877e8e525738a4d4cedcb08e6e19ab5b471146db20cdba1f52366807f03a07558d234d86 SHA512 6071be0ef45009914e22d54f6f860f3f77ef1d7d5338d1743eac455863a26eaa2f7bb740e72bc84e4d8edd208f180001c58553a79acae9d17baee3e38f62f27a
+EBUILD vala-0.36.7.ebuild 822 BLAKE2B 29abd8f141edf688132a4a71de0d52a5e4a523c7892592ba885e697c877e8e525738a4d4cedcb08e6e19ab5b471146db20cdba1f52366807f03a07558d234d86 SHA512 6071be0ef45009914e22d54f6f860f3f77ef1d7d5338d1743eac455863a26eaa2f7bb740e72bc84e4d8edd208f180001c58553a79acae9d17baee3e38f62f27a
 MISC metadata.xml 255 BLAKE2B 51dc9e0030d68ac68f075bb4a7b4c5f42122c16f354e10463d7338e652b272b26fa1eb12a144ed4a00d29a020af4df19029d909b4591162347184b1684402c94 SHA512 1970039db79f50391650a9fea933485c6102d1165946ab8efe9395403a02f49d4b17c2942795282469ac7c0306e7353002dcbaa797fb1060982b31ea3540b98b
diff --git a/dev-lang/vala/vala-0.36.7.ebuild b/dev-lang/vala/vala-0.36.7.ebuild
new file mode 100644
index 000000000000..6b41e12db525
--- /dev/null
+++ b/dev-lang/vala/vala-0.36.7.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="Compiler for the GObject type system"
+HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
+
+LICENSE="LGPL-2.1"
+SLOT="0.36"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-libs/glib-2.32:2
+	>=dev-libs/vala-common-${PV}
+"
+DEPEND="${RDEPEND}
+	!${CATEGORY}/${PN}:0
+	dev-libs/libxslt
+	sys-devel/flex
+	virtual/pkgconfig
+	virtual/yacc
+	test? (
+		dev-libs/dbus-glib
+		>=dev-libs/glib-2.26:2
+		dev-libs/gobject-introspection )
+"
+
+src_configure() {
+	# weasyprint enables generation of PDF from HTML
+	gnome2_src_configure \
+		--disable-unversioned \
+		VALAC=: \
+		WEASYPRINT=:
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 38a212fcc5a7..40fef9d33918 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/gmime/Manifest b/dev-libs/gmime/Manifest
index 2d2e14938714..4dc6c548d477 100644
--- a/dev-libs/gmime/Manifest
+++ b/dev-libs/gmime/Manifest
@@ -1,5 +1,7 @@
 DIST gmime-2.6.23.tar.xz 5216588 BLAKE2B e173a7dbd418663ebbc55b856359bf9286c3791827f9b7f89da48dd7c3609e77312546f9489c08d34a7dcaeb78659789809d5fafc1323cbae9b9f1c4a316c659 SHA512 2ff6718b7a555cd5b34848399f29c7d0aa5a15e1f3cb46e9258c499e874191ee00f41b737386805d3000bad34367d174a25c45d38ba90cba7902400e733afa14
 DIST gmime-3.0.2.tar.xz 751944 BLAKE2B e5d8843e209ca589cb1dddb96093fde8727617b8cb6e2012ae047d343c485ee2398398e20be365090af9d7b4afcfe248897ee21181fc79bff376861ac1b4428a SHA512 246f489c168ce7e04fab664b7e9ae7772ae52f0063fb0eac9153460d84fa5d9712457d81fbd1bdcdadb7e03007cf71ed3bad5287f1639214f54167427c9209ca
+DIST gmime-3.0.3.tar.xz 761844 BLAKE2B 5e4a3d0cfc9768b714dc7ee1b80e06d3c2cc0a71269339d43fc9edd341d4b6b269ece347864dc2ffc9e647503e82163bfdd8701036a1db45d278ab169cdc2edd SHA512 7a4c3026a73f4eb5c9b7717fa6dc0010191dd1ce5296792f5fb58c813a843db7377e70c7d36b59461927424f15df2b9ab58cea425b6ce64ca56f75fe8bbfca5d
 EBUILD gmime-2.6.23.ebuild 1735 BLAKE2B 53f9f6f52467235a3de521c880fcf55a6a9f3498000c52557fcac809d7ae118640c35204a61c2f69ac2d99db68b3232c6a672b99dbe658a0d5eac299ea987fa9 SHA512 2fbc586acb1dea60334039199a75f796bdd222ac5451c47ab76b2f8453adb4a2850d52dabb0c9d30af9a31332d5804bcc7891ceff5c58b78a61b2b54d0dd0354
 EBUILD gmime-3.0.2.ebuild 1565 BLAKE2B 7cb85de4a7f06d7e58df10f0c6ee060894c3bea4addea13fc977be57884c42b0c117171b421d7e7b8597882ac2f037a6238c69536ba9f2c3e523201c1f68a80e SHA512 5c887be7059c20a2166771651d5b221e0a228f9b12f0b0f38f1fdf83b00ad3c3d8e94f072c0d00bbff0ee0aef448922acb333b123b5e69f16de75d034eeb8ea3
+EBUILD gmime-3.0.3.ebuild 1565 BLAKE2B 7cb85de4a7f06d7e58df10f0c6ee060894c3bea4addea13fc977be57884c42b0c117171b421d7e7b8597882ac2f037a6238c69536ba9f2c3e523201c1f68a80e SHA512 5c887be7059c20a2166771651d5b221e0a228f9b12f0b0f38f1fdf83b00ad3c3d8e94f072c0d00bbff0ee0aef448922acb333b123b5e69f16de75d034eeb8ea3
 MISC metadata.xml 407 BLAKE2B 6079e838028f6063248e1dfe1b1b720c2bde65fe73512d4749aeda39aa9bd01b5bd047217e51be2ec6ab1050551f6e2f1c1d7162400261c841be312f8538df6e SHA512 0567710e8d8d0a61a0828325440aa243d8517d94767069d165c106fc5d1b96e5f952738874772ef9f28d1a391d3c47939a2ee32ecf3f8321ec00ee81d646d502
diff --git a/dev-libs/gmime/gmime-3.0.3.ebuild b/dev-libs/gmime/gmime-3.0.3.ebuild
new file mode 100644
index 000000000000..8b16292c8a03
--- /dev/null
+++ b/dev-libs/gmime/gmime-3.0.3.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VALA_USE_DEPEND="vapigen"
+
+inherit flag-o-matic gnome2 vala
+
+DESCRIPTION="Utilities for creating and parsing messages using MIME"
+HOMEPAGE="http://spruce.sourceforge.net/gmime/ https://developer.gnome.org/gmime/stable/"
+
+SLOT="3.0"
+LICENSE="LGPL-2.1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="crypt doc idn static-libs test vala"
+
+RDEPEND="
+	>=dev-libs/glib-2.32.0:2
+	sys-libs/zlib
+	crypt? ( >=app-crypt/gpgme-1.8.0:1= )
+	idn? ( net-dns/libidn )
+	vala? (
+		$(vala_depend)
+		>=dev-libs/gobject-introspection-1.30.0:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.8
+	virtual/libiconv
+	virtual/pkgconfig
+	doc? ( app-text/docbook-sgml-utils )
+	test? ( app-crypt/gnupg )
+"
+# gnupg is needed for tests if --enable-cryptography is enabled, which we do unconditionally
+
+src_prepare() {
+	gnome2_src_prepare
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	if [[ ${CHOST} == *-solaris* ]]; then
+		# bug #???, why not use --with-libiconv
+		append-libs iconv
+	fi
+
+	gnome2_src_configure \
+		$(use_enable crypt crypto) \
+		$(use_enable static-libs static) \
+		$(use_enable vala) \
+		$(use_with idn libidn) \
+		$(usex doc "" DB2HTML=)
+}
+
+src_compile() {
+	gnome2_src_compile
+	if use doc; then
+		emake -C docs/tutorial html
+	fi
+}
+
+src_install() {
+	gnome2_src_install
+
+	if use doc ; then
+		docinto tutorial
+		dodoc -r docs/tutorial/html/
+	fi
+}
diff --git a/dev-libs/libgudev/Manifest b/dev-libs/libgudev/Manifest
index 1a633331878d..84b08713a0ef 100644
--- a/dev-libs/libgudev/Manifest
+++ b/dev-libs/libgudev/Manifest
@@ -1,7 +1,5 @@
-DIST libgudev-230.tar.xz 257528 BLAKE2B dc59ef3c93df0c34f3ecce35c54218cae99baa45a43107a3a1394b4d1a4c46c1dc0d13e7cf993c14a81e92c22afcd60f6f2f0b80c1796960203cacf8855739a0 SHA512 682e08f1a406bd323a59268d9d2fde9efd015a7e0cd5958c5c4e0bc94b593d071a9b824c8b9dfc104c93e555342b1a74a63da91834e10558a9646c9195ef6fbd
 DIST libgudev-231.tar.xz 270088 BLAKE2B fd258c9d187b72262916d70af29924727dd739bfd66f315a221021e6c2cfa0c6e451ed3d22097af4c9a91581985126cf4bc96f7c9eee40e84a4d54fc542bcc0f SHA512 3989025168c9e7e5e3f7813ee903a63f697ad390d3060121d0f45ee31031014c23a26f4287f3e6ad97d582131d0d568be31baa0b68f6f64ae337e926b3fe2625
 DIST libgudev-232.tar.xz 270904 BLAKE2B 90b2ec011f065929bd560398de9cfa8c365f9b84d205c816f2d7a98391d96bde47449eb77bc76b1e486af7dfdb3ed6525f216549e0dc3571b2ee672920438c98 SHA512 f648a41e2a6af7e26634c7cc259fdc47bb6e6ffb329324d157f340e42928e28c2059a0e923b9b0aaecd1ee3ecafbc7b55e5652f1f77bc1b88367b97057a1bedc
-EBUILD libgudev-230-r1.ebuild 981 BLAKE2B 6b72c7a6e91dca8638c07ba182229980d366216f483937ea5a6fc8c09aee20da1eda016da5dcf8a2ffb402c19a85556f9fe81b507ddf26f65eee86661eb87c15 SHA512 21e41267b5eebd63d9d7417634129988ae780ad8f7563de68466b18841699201b471d92b6566d1bbbd460455214bfc42d7156cd80601af6142585ec963e0985d
 EBUILD libgudev-231.ebuild 1091 BLAKE2B 59588a6254ed309b11870f2914b7e36b0943862114afb1d28df48639a8a2ce94365e63bb51bc6d19485134d5fdd15b29837e1bf97e383eec312bf7d7da46bb19 SHA512 ee901c98f33607ed81cd0343fddac24e260eccf941d05d478b1f7ae99105d7932f2fdd008feb1cca935c157a675abaa5ce2c2f1a7312f02797ae34d254885e74
 EBUILD libgudev-232.ebuild 1092 BLAKE2B 980ffd8266e1a9d40e7f59d3128f67460962704a81b099654f01c161f1b12cc95230cab4d6f6c8207e1a02babdb34c4b414b51be23f7120c309e45e2ec8bb04b SHA512 c71f43f66a6b15b551df08cb8d981596cf1a06eca3b963d0ce2f4ca7a9e041e72386333475955f823c738d1aba6c51f5d92e1b5ecde6c12f4a4e24fb0176ae24
 MISC metadata.xml 361 BLAKE2B 82ce1db7744cf4c9d543621978add958e480a57053f250d98d756d2d476e2ad84adf8ee41e8c332eaaec255ce9440223579ea072aadb89023c1bfd359acc6d1a SHA512 5306c2af0867c2122471d13cf49ebe04cccd62897c82d73b66b52792d784ca7bfd7d2cafa0821998084e78b43505fc449040bb46c2b406ba2d50b8a92af03f1f
diff --git a/dev-libs/libgudev/libgudev-230-r1.ebuild b/dev-libs/libgudev/libgudev-230-r1.ebuild
deleted file mode 100644
index 20fdfd488671..000000000000
--- a/dev-libs/libgudev/libgudev-230-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
-
-inherit gnome2 multilib-minimal
-
-DESCRIPTION="GObject bindings for libudev"
-HOMEPAGE="https://wiki.gnome.org/Projects/libgudev"
-
-LICENSE="LGPL-2.1"
-SLOT="0/0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE="introspection static-libs"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.22.0:2=[${MULTILIB_USEDEP},static-libs?]
-	>=virtual/libudev-199:=[${MULTILIB_USEDEP},static-libs?]
-	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	!sys-fs/eudev[gudev(-)]
-	!sys-fs/udev[gudev(-)]
-	!sys-apps/systemd[gudev(-)]
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/gtk-doc-am-1.18
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-"
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} gnome2_src_configure \
-		$(multilib_native_use_enable introspection) \
-		$(use_enable static-libs static)
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index 8787c6946582..5da7be0d3a08 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -17,14 +17,13 @@ AUX libxml2-2.9.4-nullptrderef.patch 1577 BLAKE2B 49200d8569d65c44d8cc644d445591
 AUX libxml2-2.9.4-nullptrderef2.patch 1785 BLAKE2B 0a4ef54d7a61c5cbbc3fc308e06e41347a9c840411acf13b5471a2aaa74a6801c6f01ff455230076154cd51c47f42102368bade10ab9625075673803a9c78411 SHA512 406379a787c1bd45f1b3c128c94182250e4200d5a577ae15dab574ce590857124bda896fd677bce1950658a1ff7b4ea6fc95b52a9ea31daf47ab5c66e03460d5
 AUX libxml2-2.9.4-osd-validation.patch 2318 BLAKE2B 65f4dd532286a7a2d0ee620d297f4ea9210910fc21985c7c9ed68ccf339bce5a4715f3282a0bba2681567669a4b23fe4a8278df42a9c198a793d5379b6dd5260 SHA512 cbe2c2a2faef1013a185a9c5ed750c4e98c81b7749fcc208748f84acd1c4035e5e01c95b7895f40d01dc7928f0ce3ef70eb0d1e2a096d389b0683a2050d8ceb3
 DIST libxml2-2.9.4.tar.gz 5374830 BLAKE2B eb0df2310a7a92084475ccd9bf538cc1c85861b2a8c766e91267b671c18eae3113016abd7bb198b6a239230cb2b9b908b9618fec11d36db10fd5cf6eac03ad3f SHA512 f5174ab1a3a0ec0037a47f47aa47def36674e02bfb42b57f609563f84c6247c585dbbb133c056953a5adb968d328f18cbc102eb0d00d48eb7c95478389e5daf9
-DIST libxml2-2.9.5.tar.gz 5466888 BLAKE2B 2f7bfaca7bab47b6fe347ff54cff8665c0e13b54fa5e2f0967c0f2006fda83e9332b65a357bd7b5fc91997d5d0195fef58317ec37c8780e7f3445edfe766e5b2 SHA512 197dbd1722e5f90eea43837323352f48d215e198aa6b95685645ef7511e2beba8aadc0dd67e099c945120c5dbe7f8c9da5f376b22f447059e9ffa941c1bfd175
 DIST libxml2-2.9.6.tar.gz 5469624 BLAKE2B cb8fc74044876b2ddf9742a4a84d685ce6cd1e41a991ee79fd70a9175c54d2a9a3d3a2c3229a4ce177fcd4e30b0cee08c7cf3a36fef68b179db0ce521fbbf3b0 SHA512 5ef80f895374bd5dd3bcd5f00c715795f026bf45d998f8f762c0cdb739b8755e01de40cf853d98a3826eacef95c4adebe4777db11020e8d98d0bda921f55a0ed
+DIST libxml2-2.9.7.tar.gz 5467389 BLAKE2B e15082fb87fb41a7aab6f39120b1d1bbd0325af8009bb3b74c69a98bf7347a39f59055762df157dcf223a79ac84f17535cb40af0a9a461ee3d2c1d55f4832e1b SHA512 da06cb7c5032ef4b7c8e902fabb9d2c74634c42c161be07a7c66a00d53a68029f89b0d4de32a6b9d4ff338c2d1d9c4e53aefb9cf50cb1c2d6c6b06b442ef42d5
 DIST xmlts20080827.tar.gz 638940 BLAKE2B c5aab959c6e0698acd5b9be82b48a8ac26f4d01cc03f9acfff20d344f97f4711fc6d4a524ae70457147e8e30c72e27b6726829e1dd21896286aa974ed60774e7 SHA512 7325d0977c4427fc4944b291ccf896a665f654cc24399e5565c12a849c2bc3aef4fa3ee42a09ac115abcb6570c51a8fbd052c38d64d164279ecdecad5a4e884d
 DIST xsts-2002-01-16.tar.gz 6894439 BLAKE2B 1e9ec63d2c104655e64249e07440a04d862fcbcd4d4e19745d81b34994319b510a531c9d6df1491fae1e90b5d0764f0f1a827251ca8df5d613178b0eab01ef25 SHA512 43300af6d39c1e2221b0ed7318fe14c7464eeb6eb030ed1e22eb29b4ab17f014e2a4c8887c3a46ae5d243e3072da27f00f4e285498ae6f1288177d38d1108288
 DIST xsts-2004-01-14.tar.gz 2761085 BLAKE2B 41545995fb3a65d053257c376c07d45ffd1041a433bfbdb46d4dd87a5afb60c18c8629a3d988323f9e7a1d709775b5a7e5930276a7121c0725a22705c0976e36 SHA512 32854388d7e720ad67156baf50bf2bae7bd878ca3e35fd7e44e57cad3f434f69d56bbbedd61509f8a1faf01c9eae74a078df8fe130780b182c05c05cb1c39ebe
 EBUILD libxml2-2.9.4-r1.ebuild 6888 BLAKE2B cad917e8d19e16fcb5736b39be4760f976b9aa20b320f6bd486c455192eb3c3e6bbf94c8742691a34ebc399f9b6ae42804871319ed99be075f126fa97f9de5d0 SHA512 3bfaae862504766bbe9c673046e8eda870d309173f9ec43cc7ad1649c34f9115b7be71e4b6cbb6fd38d01d57cbb10137ea23482c4e517c9f056213a16c974b29
-EBUILD libxml2-2.9.4-r2.ebuild 7391 BLAKE2B 533aeec5ba4f92a26216eaa94086259fd9e18793e9d70c0d06183b99d7b7dbb402d1af251f83a89d450912eb18f31a1402bc0c8956e66a0bfafc7e56a9ed623e SHA512 4632742786d19c6e81f1e26160ada7862e9ab7b0ac57dcd4fb02d45d403533a2555736c3b7adeb104689e27bf3d7d524916417be633bbf7f96ceb5e69b050a7d
 EBUILD libxml2-2.9.4-r3.ebuild 7671 BLAKE2B 6e8054440bf2dd8387f689513e834c42bf643e60c3f270f5aa9d128fb7e3d30ee04f90e20b6f2ff37b525c23ec6b62d5531dcc6ffadae59bf73a81e0721ebc49 SHA512 ce3cd2d3db2a4f489f9024cbe8c7d343fd94b1b8736debbe98084ebe76d828cb1e236169b9ab114e7278c886d58814835f4639b865bf198af528cc681236fa54
-EBUILD libxml2-2.9.5.ebuild 6387 BLAKE2B dae78ba11a69c6a4decafa992e910f4cfd643e578522089895697506d4b5f34492458cff62e0c6143a88541b737f05161622702e33dc4179adf2dbbc0e93ea5f SHA512 9740e84ec0ab1fbe1cd3fba542a2f0b8b5dc7341cc6ccaa4f7552f522412921477f1cbc47c3f614a0fd6728d18a0642e50fa31fe46e481bc6e17b5a2e197a9fd
 EBUILD libxml2-2.9.6.ebuild 6380 BLAKE2B d1467bc90e287697a2488d8be3c4fe0328bfa91db01c1c094c97c2a2e1cc9d45eccf04433bec744e26c6218cee9b446b5386f51ea7f16daf142eafbaac003410 SHA512 b71ab4d1b14ecd1acfd33e82b887efa296b6e461265f8b77d9410a5a6744843aa570666e893f63923975df03899e8c59c739f771289a913d87080174088e9cbb
+EBUILD libxml2-2.9.7.ebuild 6378 BLAKE2B 87b3a4353bb5ec93642122e5b042620ef980ca4b8060af2d4c1d8ab9ed55559c11aa495c038e2fc3f77d1a17c0c4f853f7991180d95c64aa74682006883c1cf9 SHA512 7c072e202140707b610a6ff9cf9ae988d546ef0ed186d7a8f7e63b4141ed92b7390301cb232d993e620ede2e4e86d272ad15af3cfe21e1da44876c3c1ca64531
 MISC metadata.xml 347 BLAKE2B 0593bb4362c2ed60dbe07c41872832992f9b993a4c155cddf82ce362f1ddd4c8eb9fa00e5b4457e9a24b22b697d92ef55dde231918fa0e6bdac0a736fce37f66 SHA512 6a094316da6ea1fb160b539788923a2dc01d7ef6304f924f628a438714663a51c8d1adaa97800516a64055a8adf6999ae2899b5a976db680967dcc298e22444d
diff --git a/dev-libs/libxml2/libxml2-2.9.4-r2.ebuild b/dev-libs/libxml2/libxml2-2.9.4-r2.ebuild
deleted file mode 100644
index 465cae6a0a7e..000000000000
--- a/dev-libs/libxml2/libxml2-2.9.4-r2.ebuild
+++ /dev/null
@@ -1,231 +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} )
-PYTHON_REQ_USE="xml"
-
-inherit libtool flag-o-matic ltprune python-r1 autotools prefix multilib-minimal
-
-DESCRIPTION="Version 2 of the library to manipulate XML files"
-HOMEPAGE="http://www.xmlsoft.org/"
-
-LICENSE="MIT"
-SLOT="2"
-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 ~x86-winnt"
-IUSE="debug examples icu ipv6 lzma python readline static-libs test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
-XSTS_NAME_1="xmlschema2002-01-16"
-XSTS_NAME_2="xmlschema2004-01-14"
-XSTS_TARBALL_1="xsts-2002-01-16.tar.gz"
-XSTS_TARBALL_2="xsts-2004-01-14.tar.gz"
-XMLCONF_TARBALL="xmlts20080827.tar.gz"
-
-SRC_URI="ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz
-	test? (
-		${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1}
-		${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2}
-		http://www.w3.org/XML/Test/${XMLCONF_TARBALL} )"
-
-RDEPEND="
-	>=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
-	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:= )
-"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	virtual/pkgconfig
-	hppa? ( >=sys-devel/binutils-2.15.92.0.2 )
-"
-
-S="${WORKDIR}/${PN}-${PV%_rc*}"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/xml2-config
-)
-
-src_unpack() {
-	# ${A} isn't used to avoid unpacking of test tarballs into $WORKDIR,
-	# as they are needed as tarballs in ${S}/xstc instead and not unpacked
-	unpack ${P/_rc/-rc}.tar.gz
-	cd "${S}" || die
-
-	if use test; then
-		cp "${DISTDIR}/${XSTS_TARBALL_1}" \
-			"${DISTDIR}/${XSTS_TARBALL_2}" \
-			"${S}"/xstc/ \
-			|| die "Failed to install test tarballs"
-		unpack ${XMLCONF_TARBALL}
-	fi
-}
-
-src_prepare() {
-	default
-
-	DOCS=( AUTHORS ChangeLog NEWS README* TODO* )
-
-	# Patches needed for prefix support
-	eapply "${FILESDIR}"/${PN}-2.7.1-catalog_path.patch
-
-	eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c
-
-	# Fix build for Windows platform
-	# https://bugzilla.gnome.org/show_bug.cgi?id=760456
-	eapply "${FILESDIR}"/${PN}-2.8.0_rc1-winnt.patch
-
-	# Disable programs that we don't actually install.
-	# https://bugzilla.gnome.org/show_bug.cgi?id=760457
-	eapply "${FILESDIR}"/${PN}-2.9.2-disable-tests.patch
-
-	# Fix python detection, bug #567066
-	# https://bugzilla.gnome.org/show_bug.cgi?id=760458
-	eapply "${FILESDIR}"/${PN}-2.9.2-python-ABIFLAG.patch
-
-	# Apply round of security patches wrt bugs 
-	# 589816, 597112, 597114, 597116.  This will be included
-	# in the next upstream release
-	eapply "${FILESDIR}"/${PN}-2.9.4-CVE-2016-4658.patch
-	eapply "${FILESDIR}"/${PN}-2.9.4-CVE-2016-5131.patch
-	eapply "${FILESDIR}"/${PN}-2.9.4-nullptrderef.patch
-	eapply "${FILESDIR}"/${PN}-2.9.4-nullptrderef2.patch
-
-	# Apply round of security patches wrt bugs:
-	# 599192, 586886, 618604, 622914, 605208, 623206
-	# This will be included in the next upstream release
-	eapply "${FILESDIR}"/${P}-CVE-2017-5969.patch
-	eapply "${FILESDIR}"/${P}-osd-validation.patch
-	eapply "${FILESDIR}"/${P}-CVE-2017-9049-9050.patch
-	eapply "${FILESDIR}"/${P}-CVE-2017-9047-9048.patch
-	eapply "${FILESDIR}"/${P}-heap-buffer-overflow.patch
-	eapply "${FILESDIR}"/${P}-CVE-2016-9318.patch
-	eapply "${FILESDIR}"/${P}-CVE-2017-7375.patch
-
-	# Avoid final linking arguments for python modules
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -i -e '/PYTHON_LIBS/s/ldflags/libs/' configure.ac || die
-	fi
-
-	# Please do not remove, as else we get references to PORTAGE_TMPDIR
-	# in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
-	# We now need to run eautoreconf at the end to prevent maintainer mode.
-#	elibtoolize
-#	epunt_cxx # if we don't eautoreconf
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# filter seemingly problematic CFLAGS (#26320)
-	filter-flags -fprefetch-loop-arrays -funroll-loops
-
-	# USE zlib support breaks gnome2
-	# (libgnomeprint for instance fails to compile with
-	# fresh install, and existing) - <azarah@gentoo.org> (22 Dec 2002).
-
-	# The meaning of the 'debug' USE flag does not apply to the --with-debug
-	# switch (enabling the libxml2 debug module). See bug #100898.
-
-	# --with-mem-debug causes unusual segmentation faults (bug #105120).
-
-	libxml2_configure() {
-		ECONF_SOURCE="${S}" econf \
-			--with-html-subdir=${PF}/html \
-			$(use_with debug run-debug) \
-			$(use_with icu) \
-			$(use_with lzma) \
-			$(use_enable ipv6) \
-			$(use_enable static-libs static) \
-			$(multilib_native_use_with readline) \
-			$(multilib_native_use_with readline history) \
-			"$@"
-	}
-
-	libxml2_py_configure() {
-		mkdir -p "${BUILD_DIR}" || die # ensure python build dirs exist
-		run_in_build_dir libxml2_configure "--with-python=${ROOT%/}${PYTHON}" # odd build system, also see bug #582130
-	}
-
-	libxml2_configure --without-python # build python bindings separately
-
-	if multilib_is_native_abi && use python; then
-		python_foreach_impl libxml2_py_configure
-	fi
-}
-
-multilib_src_compile() {
-	default
-	if multilib_is_native_abi && use python; then
-		local native_builddir=${BUILD_DIR}
-		python_foreach_impl libxml2_py_emake top_builddir="${native_builddir}" all
-	fi
-}
-
-multilib_src_test() {
-	default
-	multilib_is_native_abi && use python && python_foreach_impl libxml2_py_emake test
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" \
-		EXAMPLES_DIR="${EPREFIX}"/usr/share/doc/${PF}/examples install
-
-	if multilib_is_native_abi && use python; then
-		python_foreach_impl libxml2_py_emake \
-			DESTDIR="${D}" \
-			docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \
-			exampledir="${EPREFIX}"/usr/share/doc/${PF}/python/examples \
-			install
-		python_foreach_impl python_optimize
-	fi
-}
-
-multilib_src_install_all() {
-	# on windows, xmllint is installed by interix libxml2 in parent prefix.
-	# this is the version to use. the native winnt version does not support
-	# symlinks, which makes repoman fail if the portage tree is linked in
-	# from another location (which is my default). -- mduft
-	if [[ ${CHOST} == *-winnt* ]]; then
-		rm -rf "${ED}"/usr/bin/xmllint
-		rm -rf "${ED}"/usr/bin/xmlcatalog
-	fi
-
-	rm -rf "${ED}"/usr/share/doc/${P}
-	einstalldocs
-
-	if ! use examples; then
-		rm -rf "${ED}"/usr/share/doc/${PF}/examples
-		rm -rf "${ED}"/usr/share/doc/${PF}/python/examples
-	fi
-
-	prune_libtool_files --modules
-}
-
-pkg_postinst() {
-	# We don't want to do the xmlcatalog during stage1, as xmlcatalog will not
-	# be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887.
-	if [[ "${ROOT}" != "/" ]]; then
-		elog "Skipping XML catalog creation for stage building (bug #208887)."
-	else
-		# need an XML catalog, so no-one writes to a non-existent one
-		CATALOG="${EROOT}etc/xml/catalog"
-
-		# we dont want to clobber an existing catalog though,
-		# only ensure that one is there
-		# <obz@gentoo.org>
-		if [[ ! -e ${CATALOG} ]]; then
-			[[ -d "${EROOT}etc/xml" ]] || mkdir -p "${EROOT}etc/xml"
-			"${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}"
-			einfo "Created XML catalog in ${CATALOG}"
-		fi
-	fi
-}
-
-libxml2_py_emake() {
-	pushd "${BUILD_DIR}/python" > /dev/null || die
-	emake "$@"
-	popd > /dev/null
-}
diff --git a/dev-libs/libxml2/libxml2-2.9.5.ebuild b/dev-libs/libxml2/libxml2-2.9.7.ebuild
index dc7fa4d365c0..24cea539bb64 100644
--- a/dev-libs/libxml2/libxml2-2.9.5.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.7.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.xmlsoft.org/"
 
 LICENSE="MIT"
 SLOT="2"
-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 ~x86-winnt"
+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="debug examples icu ipv6 lzma python readline static-libs test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -75,7 +75,7 @@ src_prepare() {
 
 	# Fix build for Windows platform
 	# https://bugzilla.gnome.org/show_bug.cgi?id=760456
-	eapply "${FILESDIR}"/${PN}-2.8.0_rc1-winnt.patch
+	# eapply "${FILESDIR}"/${PN}-2.8.0_rc1-winnt.patch
 
 	# Fix python detection, bug #567066
 	# https://bugzilla.gnome.org/show_bug.cgi?id=760458
diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest
index 83f7a136d924..a8a539b85cbb 100644
--- a/dev-libs/vala-common/Manifest
+++ b/dev-libs/vala-common/Manifest
@@ -3,9 +3,11 @@ DIST vala-0.34.8.tar.xz 2778228 BLAKE2B ce48baeaa2ba88e09234c8a6e14c6aed60771476
 DIST vala-0.34.9.tar.xz 2783952 BLAKE2B e90728075ac546e8abc125886182abd5fc357be5138bfea1ed058f41bf07968e55e032469cc068cefdb6a4d53f1c029ca7e728c57b00f6b9845e32c4410e8258 SHA512 8128dfbb50d0db2317feb4a358310de972ecb6f4dccaceb4d55cf3a024f4d83422e3137c92238e1a0a0b4766367ad307909a1310445017c71944ac30fc68d01f
 DIST vala-0.36.4.tar.xz 2846516 BLAKE2B 9b310457249ff0d75a76abcf7bcf3855bf0f75f3115883ab11ea04c4faf982fa3ddacc4245eacad7aebb62bbf1ef29f7866b6260d275b135c85ecba6173186d3 SHA512 cc804b9ad0bda4968660084c5d5e38761b0d478a6c504d3d2e6188fdd2deef4a4315d7278191f19b3bcbee66e0b02733deb6050d168305c85cef8f203ecc13ac
 DIST vala-0.36.5.tar.xz 2849320 BLAKE2B 5592ff226869ea4aacc8a485a6f1c7fcf62a81acce6039946b01179aa3529f8beb76a1d468cd373fb2b823e156f0cca8f6855b910166e607d0936e30fa6e1511 SHA512 1059fb52aa0d40fc04e8bc46a8cd54e1538554aa32e0e92e4a27779558fa1a9f460988d27667a613d958f3eb9dbe02fdac7e1632b91e8324bdfb5663e1cf0aac
+DIST vala-0.36.7.tar.xz 2854668 BLAKE2B 2fcb528b26a56ee9f9d362ec1891c873ee26580132c052554a3d021fea32c0cee6dc6e8c6419f88798f5066a70d54084757893b2d46e3b286b441a51a4169c92 SHA512 7a6daac5be72240ae998b2c26e240a8b6bbc44c8bb6a036357fc0419cd7b40e14ea76c8125eb49a8d252627425613512410ba7868eb579b13d299e2ff0f4082b
 EBUILD vala-common-0.32.1.ebuild 2533 BLAKE2B 6cd8150927a49de7daa2d3a6394b72ad7e06b33a1459eea21b52e1fb751b7095d5b731930af9d22647e5767bebd5d028b3aadbdb9d6c6e097999c1c17e566907 SHA512 798a4ab1f0d5b22ee2a3cd259e89a52ef6b122bb9605f1cbcf346f8aba5bdfad4c49d9ac1c19127e3244b011ad914173123a3418121a7c2ece32c8970169c9de
 EBUILD vala-common-0.34.8.ebuild 2533 BLAKE2B 6cd8150927a49de7daa2d3a6394b72ad7e06b33a1459eea21b52e1fb751b7095d5b731930af9d22647e5767bebd5d028b3aadbdb9d6c6e097999c1c17e566907 SHA512 798a4ab1f0d5b22ee2a3cd259e89a52ef6b122bb9605f1cbcf346f8aba5bdfad4c49d9ac1c19127e3244b011ad914173123a3418121a7c2ece32c8970169c9de
 EBUILD vala-common-0.34.9.ebuild 2535 BLAKE2B ff30d3e3b29b56ed395a4e09b76615e0a8ad5e1d344fcf51f89d9b399555dc7042dd121deb3770eba691576c4d580b1e48e712227ec47ec5c0bd7c779e974d1f SHA512 09d1b43b7b947b9970a14c0bb26a43f0f8c1cc2d23e078eb32d0c15ce7b3118b16eadafd1ba0247a5737d04c458140fabfa4175eec44fdde47a6b634b6ce57e4
 EBUILD vala-common-0.36.4.ebuild 2542 BLAKE2B 115fde004f43b28050b2ba90f834b3c06c953bc29b8c7581920cce6d876ea5f80ff96bc57b0b7a05e953a773631ee15419d97359e80a4ec80000943f3eebab2b SHA512 dc92e98e84d726421ff40e073ca8218257d2edfedb3d1e45fefdbf1c8a030e27dd4b85bebf5a472e74a93a4bd0e03d5ce5d1e07151965101401590cb2f6306d0
 EBUILD vala-common-0.36.5.ebuild 2542 BLAKE2B 115fde004f43b28050b2ba90f834b3c06c953bc29b8c7581920cce6d876ea5f80ff96bc57b0b7a05e953a773631ee15419d97359e80a4ec80000943f3eebab2b SHA512 dc92e98e84d726421ff40e073ca8218257d2edfedb3d1e45fefdbf1c8a030e27dd4b85bebf5a472e74a93a4bd0e03d5ce5d1e07151965101401590cb2f6306d0
+EBUILD vala-common-0.36.7.ebuild 2542 BLAKE2B 115fde004f43b28050b2ba90f834b3c06c953bc29b8c7581920cce6d876ea5f80ff96bc57b0b7a05e953a773631ee15419d97359e80a4ec80000943f3eebab2b SHA512 dc92e98e84d726421ff40e073ca8218257d2edfedb3d1e45fefdbf1c8a030e27dd4b85bebf5a472e74a93a4bd0e03d5ce5d1e07151965101401590cb2f6306d0
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/vala-common/vala-common-0.36.7.ebuild b/dev-libs/vala-common/vala-common-0.36.7.ebuild
new file mode 100644
index 000000000000..01ce4db1896f
--- /dev/null
+++ b/dev-libs/vala-common/vala-common-0.36.7.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME_ORG_MODULE="vala"
+
+inherit gnome.org
+
+DESCRIPTION="Build infrastructure for packages that use Vala"
+HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x64-solaris"
+IUSE=""
+
+# Previously ${PN} was part of dev-lang/vala
+RDEPEND="
+	!<dev-lang/vala-0.10.4-r2
+	!<dev-lang/vala-0.12.1-r1:0.12
+	!<dev-lang/vala-0.14.2-r2:0.14
+	!<dev-lang/vala-0.16.1-r2:0.16
+	!<dev-lang/vala-0.17.5:0.18
+"
+DEPEND=""
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+	insinto /usr/share/aclocal
+	doins vala.m4 vapigen/vapigen.m4
+	insinto /usr/share/vala
+	doins vapigen/Makefile.vapigen
+}
+
+pkg_postinst() {
+	# Hack to prevent alternatives_auto_makesym in previously installed
+	# dev-lang/vala's pkg_postrm from overwriting vala-common's files
+	if has_version '<dev-lang/vala-0.10.4-r2:0.10' && [[ -f "${EROOT}usr/share/aclocal/vala-0-10.m4" ]]; then
+		ebegin "Removing old vala-0.10 macros"
+		rm "${EROOT}usr/share/aclocal/vala-0-10.m4" &> /dev/null
+		eend $?
+	fi
+	if has_version '<dev-lang/vala-0.12.1-r1:0.12' && [[ -f "${EROOT}usr/share/aclocal/vala-0-12.m4" ]]; then
+		ebegin "Removing old vala-0.12 macros"
+		rm "${EROOT}usr/share/aclocal/vala-0-12.m4" &> /dev/null
+		eend $?
+	fi
+	if has_version '<dev-lang/vala-0.14.2-r2:0.14' && [[ -f "${EROOT}usr/share/aclocal/vala-0-14.m4" ]]; then
+		ebegin "Removing old vala-0.14 macros"
+		rm "${EROOT}usr/share/aclocal/vala-0-14.m4" &> /dev/null
+		eend $?
+	fi
+	if has_version '<dev-lang/vala-0.16.1-r2:0.16' && [[ -f "${EROOT}usr/share/aclocal/vala-0-16.m4" ]]; then
+		ebegin "Removing old vala-0.16 macros"
+		rm "${EROOT}usr/share/aclocal/vala-0-14.m4" &> /dev/null
+		eend $?
+		if [[ -f "${EROOT}usr/share/vala-0.16/Makefile.vapigen" ]]; then
+			ebegin "Removing old vala-0.16 makefile template"
+			rm "${EROOT}usr/share/vala-0.16/Makefile.vapigen" &> /dev/null
+			eend $?
+		fi
+	fi
+	if has_version '<dev-lang/vala-0.17.5:0.18' && [[ -f "${EROOT}usr/share/aclocal/vala-0-18.m4" ]]; then
+		ebegin "Removing old vala-0.18 macros"
+		rm "${EROOT}usr/share/aclocal/vala-0-12.m4" &> /dev/null
+		eend $?
+		if [[ -f "${EROOT}usr/share/vala-0.18/Makefile.vapigen" ]]; then
+			ebegin "Removing old vala-0.18 makefile template"
+			rm "${EROOT}usr/share/vala-0.18/Makefile.vapigen" &> /dev/null
+			eend $?
+		fi
+	fi
+}
diff --git a/dev-libs/wayland-protocols/Manifest b/dev-libs/wayland-protocols/Manifest
index 2bb17078a9fa..21a178b16354 100644
--- a/dev-libs/wayland-protocols/Manifest
+++ b/dev-libs/wayland-protocols/Manifest
@@ -1,12 +1,6 @@
-DIST wayland-protocols-1.10.tar.xz 117652 BLAKE2B 96f5f87d62c291021c2dbb0a44c0565303aa88464597238b5865896ca58dfe2b04d82afe01c0aa2c521fdfe89bb639c569350817bf89cc0247cbb2cf79e2f4fd SHA512 4cecee723c67b483ecb2a1e36e415935a90f080307531d8fb27cb3f0fe1ae10c1f2aae9b919c8744c2e33cb52943d15202aee960302763a338bdcd16fea7aeb5
 DIST wayland-protocols-1.11.tar.xz 117852 BLAKE2B 314f247efdffd0dbc46664e2abe7fade0cb0a36ef77310660f978ea9677c33acd60b1512a5dc2fdbfc40b8e1444da7bb4089e091433bbf2bc4b5ab41e97514ca SHA512 6a6f816dd24f338182ddf11e2daa2db4f048f9153c618bd75712b6e02fccc41294c6c5f33692e858f54bab6b644b1dff49ca223ca2c8410a4afb8aa1b39e34a6
 DIST wayland-protocols-1.7.tar.xz 113220 BLAKE2B 262465cd3daa21709071f37d1e2345923055b5f183dd422c5f83e8e5b3b697e19276a37c76637cab4177a1ef91b22f0f41198daf4872c38ad08a03f07eece957 SHA512 291a3226cc538de3b81bdffa5de513b305a946bfc3481e21c254fcc6a023e0cf2ff1869509c7ae193da02460f1d4a3c5cd5f1ca13b2550886acffcc636fb30d2
-DIST wayland-protocols-1.8.tar.xz 112124 BLAKE2B 84b21f22d963d8a9c243e2bd76738c3da9809068139f57f1a409a428e6aa624d1342af00927837c7d9a62b714ef4b022dbec58ca8cf5472c33db46b63a4c1ac9 SHA512 8d9bbd4eb52c0b727c75f0379e53e29a197ce21f5a0a10a6351c053e26a635b53dcb418fa44f0fa5e0484d1457681a7f69afd3c98f2095be16ae1b0d0aeb0c50
-DIST wayland-protocols-1.9.tar.xz 116152 BLAKE2B aa9e4b1c34f5e30fee763032c93024395aafbe5c52bf30b531f1c2d239aed5ffc5876dc94394aebd0e22c7f56128a9b389a18cd3634382d3260b154d311a69b4 SHA512 16154520dd355ba9d459baf942945c6b7d267ab4463a31eba76f5d300569ffa993641f65d3e2cde89d735767a3bf743382449f58c5f42521dbdc7db1b1d0dc0d
-EBUILD wayland-protocols-1.10.ebuild 882 BLAKE2B a6d7ea9ad13dbae61eb3697b8b3b4399af94cebf6ad1865eff9fb199a1d9350073b3cfd54ab0a60979d8d3447502d2dfd389d4221346f9bd3fd80dbce3b1c919 SHA512 6ca78bc30217efaeb3f9075eca5d6bd9afa4ad97c26617e92b2184596b6d25ae0b0f9acad02016cbcdc4a27ce258397b95070e3fdd9e26902fc9eddb2d4c5d9d
 EBUILD wayland-protocols-1.11.ebuild 893 BLAKE2B ccd88de54579c9b1796f4bd00586e0362c418d42a0f0bd32e5de5a031f13eba169559f46aacf79e9a66ce3ebdb5e54f95a18a0cd0d961b63bcbe0dd627899806 SHA512 f104237a70a09f676f0378c99017bf8323fe4648a33618f6d95fbff24efc212b27413999a0f0c49eb94f77049f73c2453bd1753bfdb9d037ca094da7970e9a51
 EBUILD wayland-protocols-1.7.ebuild 891 BLAKE2B 89bd528ac051ac71795318ed2bb4b68a32585dbf28ee72dd5e1284819d9acc28154d6bf7c0e6acc784461a8ee948bb0e25dabfe8d1745e0ea41ae62f027604f7 SHA512 d246c9ff9a9520dbf039f67cede7150892366748a26f8f3eb7d6f4650efa1f43a2bfcfe33961a98174061dbbb74665edd7cd74d0b2a1b2e7acd971862a60791f
-EBUILD wayland-protocols-1.8.ebuild 900 BLAKE2B 526608e7ef610933915839746260b1689bddc97b2964300ac301b55f4d7b9663ee1c008894c03893877a0f1509044eefb9d59919c5be1543d28cda74a2747377 SHA512 fdfbcb2e75363768a2589ba25218181ae2d501131aed11287b3d35c7a0ff03199c5780d94cb8b10e0ac278d81d145cc7ef19a4556debc107312e32948dee509c
-EBUILD wayland-protocols-1.9.ebuild 900 BLAKE2B 526608e7ef610933915839746260b1689bddc97b2964300ac301b55f4d7b9663ee1c008894c03893877a0f1509044eefb9d59919c5be1543d28cda74a2747377 SHA512 fdfbcb2e75363768a2589ba25218181ae2d501131aed11287b3d35c7a0ff03199c5780d94cb8b10e0ac278d81d145cc7ef19a4556debc107312e32948dee509c
 EBUILD wayland-protocols-9999.ebuild 900 BLAKE2B 526608e7ef610933915839746260b1689bddc97b2964300ac301b55f4d7b9663ee1c008894c03893877a0f1509044eefb9d59919c5be1543d28cda74a2747377 SHA512 fdfbcb2e75363768a2589ba25218181ae2d501131aed11287b3d35c7a0ff03199c5780d94cb8b10e0ac278d81d145cc7ef19a4556debc107312e32948dee509c
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/wayland-protocols/wayland-protocols-1.10.ebuild b/dev-libs/wayland-protocols/wayland-protocols-1.10.ebuild
deleted file mode 100644
index 3c94786ff4ba..000000000000
--- a/dev-libs/wayland-protocols/wayland-protocols-1.10.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="git://anongit.freedesktop.org/git/wayland/${PN}"
-	GIT_ECLASS="git-r3"
-	EXPERIMENTAL="true"
-	AUTOTOOLS_AUTORECONF=1
-fi
-
-inherit autotools-utils ${GIT_ECLASS}
-
-DESCRIPTION="Wayland protocol files"
-HOMEPAGE="https://wayland.freedesktop.org/"
-
-if [[ $PV = 9999* ]]; then
-	SRC_URI="${SRC_PATCHES}"
-else
-	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-libs/wayland"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_test() {
-	export XDG_RUNTIME_DIR="${T}/runtime-dir"
-	mkdir "${XDG_RUNTIME_DIR}" || die
-	chmod 0700 "${XDG_RUNTIME_DIR}" || die
-
-	autotools-utils_src_test
-}
diff --git a/dev-libs/wayland-protocols/wayland-protocols-1.8.ebuild b/dev-libs/wayland-protocols/wayland-protocols-1.8.ebuild
deleted file mode 100644
index 15cac561d897..000000000000
--- a/dev-libs/wayland-protocols/wayland-protocols-1.8.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/wayland/wayland-protocols.git"
-	GIT_ECLASS="git-r3"
-	EXPERIMENTAL="true"
-	AUTOTOOLS_AUTORECONF=1
-fi
-
-inherit autotools-utils ${GIT_ECLASS}
-
-DESCRIPTION="Wayland protocol files"
-HOMEPAGE="https://wayland.freedesktop.org/"
-
-if [[ $PV = 9999* ]]; then
-	SRC_URI="${SRC_PATCHES}"
-else
-	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-libs/wayland"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_test() {
-	export XDG_RUNTIME_DIR="${T}/runtime-dir"
-	mkdir "${XDG_RUNTIME_DIR}" || die
-	chmod 0700 "${XDG_RUNTIME_DIR}" || die
-
-	autotools-utils_src_test
-}
diff --git a/dev-libs/wayland-protocols/wayland-protocols-1.9.ebuild b/dev-libs/wayland-protocols/wayland-protocols-1.9.ebuild
deleted file mode 100644
index 15cac561d897..000000000000
--- a/dev-libs/wayland-protocols/wayland-protocols-1.9.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/wayland/wayland-protocols.git"
-	GIT_ECLASS="git-r3"
-	EXPERIMENTAL="true"
-	AUTOTOOLS_AUTORECONF=1
-fi
-
-inherit autotools-utils ${GIT_ECLASS}
-
-DESCRIPTION="Wayland protocol files"
-HOMEPAGE="https://wayland.freedesktop.org/"
-
-if [[ $PV = 9999* ]]; then
-	SRC_URI="${SRC_PATCHES}"
-else
-	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-libs/wayland"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_test() {
-	export XDG_RUNTIME_DIR="${T}/runtime-dir"
-	mkdir "${XDG_RUNTIME_DIR}" || die
-	chmod 0700 "${XDG_RUNTIME_DIR}" || die
-
-	autotools-utils_src_test
-}
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index d49bf05fbcb1..b494dda51dba 100644
--- a/dev-perl/Manifest.gz
+++ b/dev-perl/Manifest.gz
diff --git a/dev-perl/Net-Subnet/Manifest b/dev-perl/Net-Subnet/Manifest
index 6f78228b0acc..1c588869ac05 100644
--- a/dev-perl/Net-Subnet/Manifest
+++ b/dev-perl/Net-Subnet/Manifest
@@ -1,4 +1,5 @@
 AUX 1.30.0-pod-spelling.patch 491 BLAKE2B b8ac6e5132ae00d69a18a2882473638481c27e8618cfcdfd6e6f6cd350f71b54e4e53fd677621b2f1ac6f65bb3c999bf6745080595fca559853359dc7d734c2f SHA512 0eb9cdd317f78fd2d49e5d90eed52538f00a24f9019c757acc2280bf5d21bc606999197806816acc665ed13a9456b8a53eeee81e41222f2b0b0959734a697dc7
 DIST Net-Subnet-1.03.tar.gz 4305 BLAKE2B 95f9a04920196c1161a26f7f4ad1fc4a88e564c4f359e1f000a2560399024ff3ad11c5eabd52e26c843bcb7f8c5ec1adabc127c362ba3e02e0cd524a883b32b1 SHA512 a28518e63736021c2c33959c13b54ec4dce0f43854f824c551b585db96ef001e62f6ce413cbc946aaa6cfa28cc4631973074c8980c1b0507f37390f4d8c70fd4
+EBUILD Net-Subnet-1.30.0-r1.ebuild 546 BLAKE2B 738acf2d1990f766f531bfc0d66e07a281ff411ddb11996fc6662c34a1c35f6c730ecd9003674a355127a2e17a86f9198f5cde942e7dfff8e6f3a1b0d7b06246 SHA512 a9bf0286d3752f971e4ccabaaaaec5c4b1dec5722f359045e57dced66ed39f7c6e6e89464ee6480ea361558345f106bf9ce14a1dd8375c8b40ae51f452dbbc44
 EBUILD Net-Subnet-1.30.0.ebuild 550 BLAKE2B 835905ab3693d457380e68d72a9364a1152ed6e951974f73b28a23825a9a7a0718d2e7cf22fbac7f4220af477b4d9886283ed7f7b9acdbe1582b4605c0660b5b SHA512 1fa9fc98a520a87a8af4666366e130a2d02670e04c80f9f4fc271fd2295ab694dccf382dff521d9e5498e7c259be1303f0b1e0b6abf2119098df090296a855e9
-MISC metadata.xml 334 BLAKE2B 5af053aa5f7c466ad38f163285069d94868f4aec37886c4c3510f89aee9dbcdd58efe432b7dd4ba8cbf66a393c5f91ee0c6d1f31010b431c4bc1d3093b75aac2 SHA512 4a3e188f156b94e2e17d3cbc2a14a74b0b8f96af9ffce0494a2dd0be21de51afbb0a1aac767670ed3f0c158fcd383f3d963879373d77b779104556a0e4cb7589
+MISC metadata.xml 392 BLAKE2B 734c2f60ea9f274c323106afb4f802e8c5c054d15e2eed88457d11bb290d116d63eafbe759a60f6f91002fe85c24730566fb7611763c0bedb2d8a455c69ae116 SHA512 70c88d7ba867e8395fe5d129cb1d62908df39c968aa94ee8df3662d511a1a0cbe5698b72a9edde38310e752322fdb58396183e06fec590d6280229b9f69c64b2
diff --git a/dev-perl/Net-Subnet/Net-Subnet-1.30.0-r1.ebuild b/dev-perl/Net-Subnet/Net-Subnet-1.30.0-r1.ebuild
new file mode 100644
index 000000000000..355fd3179459
--- /dev/null
+++ b/dev-perl/Net-Subnet/Net-Subnet-1.30.0-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=JUERD
+DIST_VERSION=1.03
+inherit perl-module
+
+DESCRIPTION="Fast IP-in-subnet matcher for IPv4 and IPv6, CIDR or mask"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+
+RDEPEND="
+	>=dev-perl/Socket6-0.250.0
+"
+DEPEND="${RDEPEND}"
+PATCHES=( ${FILESDIR}/${PV}-pod-spelling.patch )
diff --git a/dev-perl/Net-Subnet/metadata.xml b/dev-perl/Net-Subnet/metadata.xml
index b712450fc81d..3cdb951bb93f 100644
--- a/dev-perl/Net-Subnet/metadata.xml
+++ b/dev-perl/Net-Subnet/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="cpan">Net-Subnet</remote-id>
+    <remote-id type="cpan-module">Net::Subnet</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Net-Trackback/Manifest b/dev-perl/Net-Trackback/Manifest
index 60040e5b82a4..04b934f07cdc 100644
--- a/dev-perl/Net-Trackback/Manifest
+++ b/dev-perl/Net-Trackback/Manifest
@@ -1,3 +1,4 @@
 DIST Net-Trackback-1.01.tar.gz 9067 BLAKE2B cc56cffe541eacd030a27d703235571278c3702380e9ee6d4ecfa938654004e6dda22c946740c5e67e087adb5ff60aa2bb5b043caa819c3881bf1093c6c797b1 SHA512 4936734bcd44c14383d7b6ec6899ebeb048a46ba9f82e337406ef52e2803a52ab6203588d6a36e30db77cc227b6b59257f8924031c6234c45cfa9b305f51b588
+EBUILD Net-Trackback-1.10.0-r1.ebuild 393 BLAKE2B 3c2074188e7c0b2c996eb8a598d668cbfe57455736cb15e9a250962ccc4111e34f7195c8186a1a39410149bca953014acf2a2656095edad699479646ae91547c SHA512 40db99fd21243183ab56ae92dfc3ed51c395d2f6b31f79d3abf07a0e6deef2764769ffdca1cc4dc6a07af91459cd6e153969eb7e25d02f0e10df5c61c09d94ee
 EBUILD Net-Trackback-1.10.0.ebuild 423 BLAKE2B 2126ee76b5dca6995a0dcf3998c7291aa5902a15002d3f1534af56d1620cea5ff16ca460bae7cf0a14ef8e6c542fb3782ef670a24f9c988f0ee6896e6e1347a7 SHA512 dc4b7a2209fa844f2f9f7878d31cea1da2fa260c9c858bd74295c0005f821f1d7d49b0d54ac8fb554516c8e1cc47c45663b5ee2c7e98b6fd48dc15aba09534ed
-MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
+MISC metadata.xml 718 BLAKE2B a146b6c250cdf52ea32ca8b0a1eb45ba746c0dbcab1354f22d0d7923343199f2d5e9d4702326be264fb1db36ef15da07029609da30bcea88b6a594549fab2124 SHA512 9fe122bc2d32d3303a716e0ee5306acd62b367b4173205de4a516434712f4e361671f0be894733df938cb1ecd7289a03b0e2d5963e4ce9bec3286cb5454044d6
diff --git a/dev-perl/Net-Trackback/Net-Trackback-1.10.0-r1.ebuild b/dev-perl/Net-Trackback/Net-Trackback-1.10.0-r1.ebuild
new file mode 100644
index 000000000000..b72ac189d876
--- /dev/null
+++ b/dev-perl/Net-Trackback/Net-Trackback-1.10.0-r1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+DIST_VERSION=1.01
+DIST_AUTHOR=TIMA
+inherit perl-module
+
+DESCRIPTION="Object-oriented interface for developing Trackback clients and servers"
+IUSE=""
+
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND=">=dev-perl/libwww-perl-5.831.0
+	>=dev-perl/Class-ErrorHandler-0.10.0"
+RDEPEND="${RDEPEND}"
diff --git a/dev-perl/Net-Trackback/metadata.xml b/dev-perl/Net-Trackback/metadata.xml
index 51930499ab60..a1bea2f7a38b 100644
--- a/dev-perl/Net-Trackback/metadata.xml
+++ b/dev-perl/Net-Trackback/metadata.xml
@@ -5,4 +5,13 @@
 		<email>perl@gentoo.org</email>
 		<name>Gentoo Perl Project</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="cpan">Net-Trackback</remote-id>
+		<remote-id type="cpan-module">Net::Trackback</remote-id>
+		<remote-id type="cpan-module">Net::Trackback::Client</remote-id>
+		<remote-id type="cpan-module">Net::Trackback::Data</remote-id>
+		<remote-id type="cpan-module">Net::Trackback::Message</remote-id>
+		<remote-id type="cpan-module">Net::Trackback::Ping</remote-id>
+		<remote-id type="cpan-module">Net::Trackback::Server</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-perl/Net-Whois-IP/Manifest b/dev-perl/Net-Whois-IP/Manifest
index 923e708afc49..f3faccfdc33b 100644
--- a/dev-perl/Net-Whois-IP/Manifest
+++ b/dev-perl/Net-Whois-IP/Manifest
@@ -1,3 +1,4 @@
 DIST Net-Whois-IP-1.19.tar.gz 25192 BLAKE2B 41dff899207f548a4a3fae1c011c6d46692ec14a601fc4bebe0f976371ab5a170db64db4e330c706832142a0577bdd57c9261993e9c354877dbe46f44c739f86 SHA512 80d1be9dc6c8e9da74df97524f1a804f6ab64f1e016509944b1ba970c2a508e46cd6d633c6cfc2e9fa5d3fc8240500f81cbc90a27bdeab26cb7b590ba97758ae
+EBUILD Net-Whois-IP-1.190.0-r1.ebuild 1208 BLAKE2B 2a26220d690974ab226e275108658b286cf4da96f1d4025e04da5446d7f6b3881a917e926af31488c20f9a97b37567603a3c2e10267182bcee24e5391158d93e SHA512 dbaa8220a9d1554b8d57ab0708d06b78fbd5101fca04002318f92456631228d668ccf7c6d922a47063be14e8f9323406747282630ce7841608b5bc24b079c71a
 EBUILD Net-Whois-IP-1.190.0.ebuild 794 BLAKE2B 94cd1c6e9ff30942fdab50128bcc7909d6e5666631e58dc87b33ea94858c62e8f841e6e789634e34d7d3855cef6ec999b08b0a607c27a6d67f40926acf3c2634 SHA512 088b3b96a608af471e57e9d8ea50c4c014612acc9fee470398a169bc4194ccd4bd83d60f8bed4f9702378d9ad7aca08e3d1841aabc997a5579455401caa3f9fd
-MISC metadata.xml 371 BLAKE2B 8690216719666584fbacbe4c9a1b622de7b0f36a38ee70c320ae2d664fb46e8c27dfa604d92fc71f093128572bbaa3a906bc2b371ca929d0096c1aed73e2f133 SHA512 828b617d47d6cea61dcb4eaec4386c9844f0588d18e0ecd8694611a30265caf9700b2be69396bcd1a4c156236e5e5e1ae51f12d53bc061db22cba62d353637ec
+MISC metadata.xml 511 BLAKE2B 95f9e9610aa9ef5e95ab37f004f7fa0fa841ecaa6d5838b276fa738138bb5ce3169e464f126fd156ce503ce3a5feb1d660b4ae9ede9eca8f01ac253280cc12e2 SHA512 98c89481190eb891b08446f738e696898f9d7ce6ceaa6b852bbbf3d90aafdc5b7c224d75c537f5aae1da8f1c999cae9bcea0fd2f8eb8ac8efe9b1cb00957e122
diff --git a/dev-perl/Net-Whois-IP/Net-Whois-IP-1.190.0-r1.ebuild b/dev-perl/Net-Whois-IP/Net-Whois-IP-1.190.0-r1.ebuild
new file mode 100644
index 000000000000..32f794ca21f1
--- /dev/null
+++ b/dev-perl/Net-Whois-IP/Net-Whois-IP-1.190.0-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_VERSION=${PV%0.0}
+DIST_AUTHOR=BSCHMITZ
+inherit perl-module
+
+DESCRIPTION="Perl extension for looking up the whois information for ip addresses"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+PERL_RM_FILES=(
+	"test.pl" # gets installed otherwise :(
+)
+RDEPEND="
+	dev-perl/Regexp-IPv6
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
+src_test() {
+	local MODULES=(
+		"Net::Whois::IP ${DIST_VERSION}"
+	)
+	local failed=()
+	for dep in "${MODULES[@]}"; do
+		ebegin "Compile testing ${dep}"
+			perl -Mblib="${S}" -M"${dep} ()" -e1
+		eend $? || failed+=( "$dep" )
+	done
+	if [[ ${failed[@]} ]]; then
+		echo
+		eerror "One or more modules failed compile:";
+		for dep in "${failed[@]}"; do
+			eerror "  ${dep}"
+		done
+		die "Failing due to module compilation errors";
+	fi
+	# # All tests defined require networking
+	#  and all fail.
+	# https://rt.cpan.org/Public/Bug/Display.html?id=110961
+	# local my_test_control
+	# my_test_control=${DIST_TEST_OVERRIDE:-${DIST_TEST:-do parallel}}
+	# if ! has network ${my_test_control} ; then
+	#	perl_rm_files "t/test1.t" "t/testx.t"
+	# fi
+	# perl-module_src_test
+}
diff --git a/dev-perl/Net-Whois-IP/metadata.xml b/dev-perl/Net-Whois-IP/metadata.xml
index 74081c2bc74c..dffda38316da 100644
--- a/dev-perl/Net-Whois-IP/metadata.xml
+++ b/dev-perl/Net-Whois-IP/metadata.xml
@@ -9,4 +9,8 @@
     <email>perl@gentoo.org</email>
     <name>Gentoo Perl Project</name>
   </maintainer>
+  <upstream>
+    <remote-id type="cpan">Net-Whois-IP</remote-id>
+    <remote-id type="cpan-module">Net::Whois::IP</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Net-Z3950-ZOOM/Manifest b/dev-perl/Net-Z3950-ZOOM/Manifest
index 80e2628e642f..14a6cad33ade 100644
--- a/dev-perl/Net-Z3950-ZOOM/Manifest
+++ b/dev-perl/Net-Z3950-ZOOM/Manifest
@@ -1,3 +1,5 @@
+AUX Net-Z3950-ZOOM-1.28-network-tests.patch 6346 BLAKE2B 7057da20a3241402c411d7b572674c1f6a3c9c3ab35e8ee841c60b34e8c49c8bceee9b288fc8256f7a1cd16715ad8ff2ce718a320e258c7870367bb28a9866f8 SHA512 daa687aaeb6bc504f1ea33102bdcc82b355bd9cbf4ca8c4a0c894cbfe0b40caff4e43b7ec7c88e299fa9b7ba2648911ef106bf7c2d5a953aba84f95941acba60
 DIST Net-Z3950-ZOOM-1.28.tar.gz 66800 BLAKE2B 747fdc742914edcf0c12e40a03ee593a45177bda6020489055a8e3e208c1ef02c709360fc2a72b7102e0d707c6920a01925b24be351eea4786103b6c5433d21e SHA512 647ec0e7e572a10307be76c469781423f3cdd176c9d968bc93746f22570b11208dc3364e8835fa1840dfb10de7a5df0d683ff06aeae2f1a67db13a8f810871eb
 EBUILD Net-Z3950-ZOOM-1.280.0-r1.ebuild 350 BLAKE2B ca893d45748e160209fc266a8364833ccc63de27eb69c01d55f29790b3628296fd649f553a1a3cf2c31bf544f1c14278bd6f797aa1ae09aa6d54f0546915d250 SHA512 ade8399a7e71b2723e1922e7accc6e10a0fae0b4d4995969338cc27b06dd40fd18ceb252443adcaba47f6b8382ae186bc9e64e35883a46c79fa38640700f801c
+EBUILD Net-Z3950-ZOOM-1.280.0-r2.ebuild 408 BLAKE2B 6f5c60734fa9f420571d60bcf9979245ea1a6654749e9808c4de6920ba18568493a3e7b87e5bf45937a536ec03c0e471aa20a3349ea7b29a491f9fe1144498e2 SHA512 8a0f30cb47e183d906274bffcdeffcc1bbca069d37bac8b52f90c43c197a863d9605aa6dea5ce8fb7631d5ad792a445dadfd316471cb92e45b94e1ab5a546e57
 MISC metadata.xml 1684 BLAKE2B 12eb6f17b81fb79b5260d8480bfb4ddf222284c8dd6132c099bffc056db0c7aa90df8b65d2790076f623edebef7f470f0d76de4283cb31e137bb5a96dc9aee3f SHA512 1ffa5d22a2b2be9fcb6592ec5a22f1d14c9d18fd28fc13e82cd38f93dd286b84f12e834fcd22a724d8a7d513528b153c85c9627844d09a23ad3c7dfd89330146
diff --git a/dev-perl/Net-Z3950-ZOOM/Net-Z3950-ZOOM-1.280.0-r2.ebuild b/dev-perl/Net-Z3950-ZOOM/Net-Z3950-ZOOM-1.280.0-r2.ebuild
new file mode 100644
index 000000000000..8934b5a75d3f
--- /dev/null
+++ b/dev-perl/Net-Z3950-ZOOM/Net-Z3950-ZOOM-1.280.0-r2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=MIRK
+DIST_VERSION=1.28
+inherit perl-module
+
+DESCRIPTION="Perl extension for invoking the ZOOM-C API"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/yaz-2.1.50
+	dev-perl/MARC-Record
+"
+DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/${PN}-1.28-network-tests.patch" )
diff --git a/dev-perl/Net-Z3950-ZOOM/files/Net-Z3950-ZOOM-1.28-network-tests.patch b/dev-perl/Net-Z3950-ZOOM/files/Net-Z3950-ZOOM-1.28-network-tests.patch
new file mode 100644
index 000000000000..be9a2aa3e3ba
--- /dev/null
+++ b/dev-perl/Net-Z3950-ZOOM/files/Net-Z3950-ZOOM-1.28-network-tests.patch
@@ -0,0 +1,299 @@
+From dd0b1305d9d44167a10e224179a4d25b997dfb8c Mon Sep 17 00:00:00 2001
+From: Kent Fredric <kentnl@gentoo.org>
+Date: Sun, 17 Dec 2017 20:08:01 +1300
+Subject: Disable network-dependent tests when NO_NETWORK_TESTING is defined
+
+---
+ t/1-Net-Z3950-ZOOM.t | 6 ++++++
+ t/12-query.t         | 6 ++++++
+ t/13-resultset.t     | 6 ++++++
+ t/14-sorting.t       | 6 ++++++
+ t/15-scan.t          | 6 ++++++
+ t/16-packages.t      | 6 ++++++
+ t/18-charset.t       | 6 ++++++
+ t/19-events.t        | 6 ++++++
+ t/2-ZOOM.t           | 6 ++++++
+ t/22-query.t         | 6 ++++++
+ t/23-resultset.t     | 6 ++++++
+ t/24-sorting.t       | 6 ++++++
+ t/25-scan.t          | 6 ++++++
+ t/26-packages.t      | 6 ++++++
+ t/28-charset.t       | 6 ++++++
+ t/29-events.t        | 6 ++++++
+ 16 files changed, 96 insertions(+)
+
+diff --git a/t/1-Net-Z3950-ZOOM.t b/t/1-Net-Z3950-ZOOM.t
+index a23ba48..673d9c3 100644
+--- a/t/1-Net-Z3950-ZOOM.t
++++ b/t/1-Net-Z3950-ZOOM.t
+@@ -3,6 +3,12 @@
+ 
+ use strict;
+ use warnings;
++BEGIN {
++  $ENV{NO_NETWORK_TESTING} and do { 
++    print "1..0 # SKIP due to NO_NETWORK_TESTING=1";
++    exit;
++  };
++}
+ use Test::More tests => 23;
+ BEGIN { use_ok('Net::Z3950::ZOOM') };
+ 
+diff --git a/t/12-query.t b/t/12-query.t
+index d21204b..c100699 100644
+--- a/t/12-query.t
++++ b/t/12-query.t
+@@ -3,6 +3,12 @@
+ 
+ use strict;
+ use warnings;
++BEGIN {
++  $ENV{NO_NETWORK_TESTING} and do { 
++    print "1..0 # SKIP due to NO_NETWORK_TESTING=1";
++    exit;
++  };
++}
+ use Test::More tests => 41;
+ BEGIN { use_ok('Net::Z3950::ZOOM') };
+ 
+diff --git a/t/13-resultset.t b/t/13-resultset.t
+index b3e6225..e8a4eaa 100644
+--- a/t/13-resultset.t
++++ b/t/13-resultset.t
+@@ -3,6 +3,12 @@
+ 
+ use strict;
+ use warnings;
++BEGIN {
++  $ENV{NO_NETWORK_TESTING} and do { 
++    print "1..0 # SKIP due to NO_NETWORK_TESTING=1";
++    exit;
++  };
++}
+ use Test::More tests => 24;
+ BEGIN { use_ok('Net::Z3950::ZOOM') };
+ 
+diff --git a/t/14-sorting.t b/t/14-sorting.t
+index 341ed44..3f663d4 100644
+--- a/t/14-sorting.t
++++ b/t/14-sorting.t
+@@ -3,6 +3,12 @@
+ 
+ use strict;
+ use warnings;
++BEGIN {
++  $ENV{NO_NETWORK_TESTING} and do { 
++    print "1..0 # SKIP due to NO_NETWORK_TESTING=1";
++    exit;
++  };
++}
+ use Test::More tests => 29;
+ use MARC::Record;
+ 
+diff --git a/t/15-scan.t b/t/15-scan.t
+index fea22a0..a723e43 100644
+--- a/t/15-scan.t
++++ b/t/15-scan.t
+@@ -3,6 +3,12 @@
+ 
+ use strict;
+ use warnings;
++BEGIN {
++  $ENV{NO_NETWORK_TESTING} and do { 
++    print "1..0 # SKIP due to NO_NETWORK_TESTING=1";
++    exit;
++  };
++}
+ use Test::More tests => 81;
+ 
+ BEGIN { use_ok('Net::Z3950::ZOOM') };
+diff --git a/t/16-packages.t b/t/16-packages.t
+index 1cdd022..de3ae56 100644
+--- a/t/16-packages.t
++++ b/t/16-packages.t
+@@ -12,6 +12,12 @@
+ 
+ use strict;
+ use warnings;
++BEGIN {
++  $ENV{NO_NETWORK_TESTING} and do { 
++    print "1..0 # SKIP due to NO_NETWORK_TESTING=1";
++    exit;
++  };
++}
+ use Test::More tests => 39;
+ 
+ BEGIN { use_ok('Net::Z3950::ZOOM') };
+diff --git a/t/18-charset.t b/t/18-charset.t
+index 72e0ead..05fdbd6 100644
+--- a/t/18-charset.t
++++ b/t/18-charset.t
+@@ -3,6 +3,12 @@
+ 
+ use strict;
+ use warnings;
++BEGIN {
++  $ENV{NO_NETWORK_TESTING} and do { 
++    print "1..0 # SKIP due to NO_NETWORK_TESTING=1";
++    exit;
++  };
++}
+ use Test::More tests => 9;
+ 
+ BEGIN { use_ok('Net::Z3950::ZOOM') };
+diff --git a/t/19-events.t b/t/19-events.t
+index 3c286b2..cecd221 100644
+--- a/t/19-events.t
++++ b/t/19-events.t
+@@ -3,6 +3,12 @@
+ 
+ use strict;
+ use warnings;
++BEGIN {
++  $ENV{NO_NETWORK_TESTING} and do { 
++    print "1..0 # SKIP due to NO_NETWORK_TESTING=1";
++    exit;
++  };
++}
+ use Test::More tests => 23;
+ 
+ BEGIN { use_ok('Net::Z3950::ZOOM') };
+diff --git a/t/2-ZOOM.t b/t/2-ZOOM.t
+index d644068..e6bda5a 100644
+--- a/t/2-ZOOM.t
++++ b/t/2-ZOOM.t
+@@ -3,6 +3,12 @@
+ 
+ use strict;
+ use warnings;
++BEGIN {
++  $ENV{NO_NETWORK_TESTING} and do { 
++    print "1..0 # SKIP due to NO_NETWORK_TESTING=1";
++    exit;
++  };
++}
+ use Test::More tests => 23;
+ BEGIN { use_ok('ZOOM') };
+ 
+diff --git a/t/22-query.t b/t/22-query.t
+index 4ffbd63..a5cb283 100644
+--- a/t/22-query.t
++++ b/t/22-query.t
+@@ -3,6 +3,12 @@
+ 
+ use strict;
+ use warnings;
++BEGIN {
++  $ENV{NO_NETWORK_TESTING} and do { 
++    print "1..0 # SKIP due to NO_NETWORK_TESTING=1";
++    exit;
++  };
++}
+ use Test::More tests => 41;
+ BEGIN { use_ok('ZOOM') };
+ 
+diff --git a/t/23-resultset.t b/t/23-resultset.t
+index 7a026ff..ac0977a 100644
+--- a/t/23-resultset.t
++++ b/t/23-resultset.t
+@@ -3,6 +3,12 @@
+ 
+ use strict;
+ use warnings;
++BEGIN {
++  $ENV{NO_NETWORK_TESTING} and do { 
++    print "1..0 # SKIP due to NO_NETWORK_TESTING=1";
++    exit;
++  };
++}
+ use Test::More tests => 24;
+ BEGIN { use_ok('ZOOM') };
+ 
+diff --git a/t/24-sorting.t b/t/24-sorting.t
+index e7f1b77..64251ae 100644
+--- a/t/24-sorting.t
++++ b/t/24-sorting.t
+@@ -3,6 +3,12 @@
+ 
+ use strict;
+ use warnings;
++BEGIN {
++  $ENV{NO_NETWORK_TESTING} and do { 
++    print "1..0 # SKIP due to NO_NETWORK_TESTING=1";
++    exit;
++  };
++}
+ use Test::More tests => 29;
+ use MARC::Record;
+ 
+diff --git a/t/25-scan.t b/t/25-scan.t
+index 01aba9e..042e0ab 100644
+--- a/t/25-scan.t
++++ b/t/25-scan.t
+@@ -3,6 +3,12 @@
+ 
+ use strict;
+ use warnings;
++BEGIN {
++  $ENV{NO_NETWORK_TESTING} and do { 
++    print "1..0 # SKIP due to NO_NETWORK_TESTING=1";
++    exit;
++  };
++}
+ use Test::More tests => 81;
+ 
+ BEGIN { use_ok('ZOOM') };
+diff --git a/t/26-packages.t b/t/26-packages.t
+index e60b5f3..eb7f7b3 100644
+--- a/t/26-packages.t
++++ b/t/26-packages.t
+@@ -3,6 +3,12 @@
+ 
+ use strict;
+ use warnings;
++BEGIN {
++  $ENV{NO_NETWORK_TESTING} and do { 
++    print "1..0 # SKIP due to NO_NETWORK_TESTING=1";
++    exit;
++  };
++}
+ use Test::More tests => 39;
+ 
+ BEGIN { use_ok('ZOOM') };
+diff --git a/t/28-charset.t b/t/28-charset.t
+index 16773f0..6abe21d 100644
+--- a/t/28-charset.t
++++ b/t/28-charset.t
+@@ -3,6 +3,12 @@
+ 
+ use strict;
+ use warnings;
++BEGIN {
++  $ENV{NO_NETWORK_TESTING} and do { 
++    print "1..0 # SKIP due to NO_NETWORK_TESTING=1";
++    exit;
++  };
++}
+ use Test::More tests => 9;
+ 
+ BEGIN { use_ok('ZOOM') };
+diff --git a/t/29-events.t b/t/29-events.t
+index 5c0ef4b..9bb2ba4 100644
+--- a/t/29-events.t
++++ b/t/29-events.t
+@@ -3,6 +3,12 @@
+ 
+ use strict;
+ use warnings;
++BEGIN {
++  $ENV{NO_NETWORK_TESTING} and do { 
++    print "1..0 # SKIP due to NO_NETWORK_TESTING=1";
++    exit;
++  };
++}
+ use Test::More tests => 23;
+ 
+ BEGIN { use_ok('ZOOM') };
+-- 
+2.15.1
+
diff --git a/dev-perl/NetxAP/Manifest b/dev-perl/NetxAP/Manifest
index e23c6ee10a3b..31a5d12fb1d4 100644
--- a/dev-perl/NetxAP/Manifest
+++ b/dev-perl/NetxAP/Manifest
@@ -1,3 +1,5 @@
+DIST NetxAP-0.02-patches-1.tar.xz 2912 BLAKE2B f07a22b792b6e876786fb54749d73e10ed9bce2c87c1f56395c53c0aeb0696d12e8ad6590bf33adbf922a57a2b21a9797907c2a205bc69ba0cdb8dfa5598d4ab SHA512 5b54ad9de0467cfdf2876c72552d9a5bd678dc717acd02187dce5d7f405c9a710e4ec65c5b9f44c1d7d0e111e04255e99d27a0fac7950c90df1713875605c28d
 DIST NetxAP-0.02.tar.gz 33374 BLAKE2B 551dcdfe26836f7a3be4c92a5d1eb3e0ad9a14effd977e1d9263a55eff5d795a7e0899de75d1a3f1246b684b33726ec6aeaab763f4cdbe10dc2082f3b6528090 SHA512 72b2cb8e68f462f8dbbda6b1008344be5cd6b120ea7a7f14c3b83dc3f0b649171416cc1d86caefaf6732a9eea978a7fb502cd9315c9d4399d114f80caac8eccf
 EBUILD NetxAP-0.20.0-r1.ebuild 405 BLAKE2B 8362b3efbab6a06fe28b62c956c821fe82c1138cbff951267c262975cdb8d1be34b42d0d6561147c62202089f13de5a6509aed01aa04395434e69bd651ffc8db SHA512 c4370723eda85363171fb6a2e0481411b4288aa46297a107c9e99d0e2e16f0dbdb90d1db3d474c93eb50d938aba1dd4aa67466c927280411efafd322f565f24e
+EBUILD NetxAP-0.20.0-r2.ebuild 697 BLAKE2B 0a6fe3810c229f8aa402546e1a460213cab5a8cd7df598e8d6fb066d5b4842123c6514fa00fc6dbf7116eb72379fe384925cedc2f10555a9d87ac8884fdd594e SHA512 9b0a6256ed87e35783846a5a8cf224d3bb85b4c56864b435a9dc29f239078d0b26f0afc7395fb7153b6ca95d9b22d8e69243bc4fb8e3798da9c4f8e5eda5c82b
 MISC metadata.xml 2380 BLAKE2B d7c0964d9f485ac336512c9e1dec4ec14068075539b7bc1c83103aff492f647870c893d11db07248bc4df6cb11c37e30ed9537c6191789a5a5cd3a6e90fd26b6 SHA512 b7ce0e85527acc10695dd72c1497dc05e88b2bdfe89318944c2cbf4dd7d8398c14ab8e9147f6e40b8f221f4c592b98542919a43563f41fbc5823fa8183f4d668
diff --git a/dev-perl/NetxAP/NetxAP-0.20.0-r2.ebuild b/dev-perl/NetxAP/NetxAP-0.20.0-r2.ebuild
new file mode 100644
index 000000000000..a4a234053305
--- /dev/null
+++ b/dev-perl/NetxAP/NetxAP-0.20.0-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=KJOHNSON
+DIST_VERSION=0.02
+DIST_EXAMPLES=("examples/*")
+
+inherit perl-module
+
+PATCH_BASE="${PN}-0.02-patches-1"
+
+DESCRIPTION="A base class for protocols such as IMAP, ACAP, IMSP, and ICAP"
+SRC_URI+=" 	mirror://gentoo/${PATCH_BASE}.tar.xz  https://dev.gentoo.org/~kentnl/distfiles/${PATCH_BASE}.tar.xz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="virtual/perl-MIME-Base64
+	dev-perl/MD5
+	dev-perl/Digest-HMAC
+	virtual/perl-Digest-MD5
+"
+DEPEND="${RDEPEND}
+	test? (
+		net-mail/uw-imap
+	)
+"
+src_prepare() {
+	eapply "${WORKDIR}/patches"
+	perl-module_src_prepare
+}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 606ac3cf6fa3..07210fb64535 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/backports-unittest-mock/Manifest b/dev-python/backports-unittest-mock/Manifest
index 1ed54f99b76d..c70bea916dd9 100644
--- a/dev-python/backports-unittest-mock/Manifest
+++ b/dev-python/backports-unittest-mock/Manifest
@@ -2,5 +2,5 @@ DIST backports.unittest_mock-1.2.1.tar.gz 4580 BLAKE2B c935c378bae1f39e0658f4be0
 DIST backports.unittest_mock-1.3.tar.gz 4687 BLAKE2B a01712eaf5cb32d7da803aa9034f68508faa4d8db8d6f6eb02e20cb9f42c4e6bda3b409a0e2f676b6b7782f16d78877da6f093af6ac1f1deb100b19969570787 SHA512 71741db5c2e43beac8c72dbffa0efd4bbae140177f56c3b2bca3e13a3aebd8a418b5ad7654421899980f73b8dbfb3b02d85d2dfcd7b3827047fa6ba84a8dcfff
 EBUILD backports-unittest-mock-1.2.1-r1.ebuild 1327 BLAKE2B 3fa3778a780a330cb90c5270e3f505324e393296dbe361703b9c7c5f9980ec0847c24f5d1bd38ef72bf80781c356c23084ef42d4e1ae2993675b0610e0b745c8 SHA512 c97899d949bdff414b6c714989cbc673a1e4639003033dda61c85555deb8ca90446230a714cbfaaa87130b702c4b5becde1e9f8b36100657c5d38d9f89646876
 EBUILD backports-unittest-mock-1.2.1.ebuild 1227 BLAKE2B fcc6f659db7bad1f15d564693a40ec95cbff67ec8031dbe29923d62de7907fc71ccbc914f219cecb6b271750e29fcc10b3414a022e91b0d85f7d5fc55a0fa944 SHA512 682fd1d5f7ea37c91328657dd06b89e72d88fc6109b7da3b05f4c08d115389e81e67a8e988cbc7e81258d771159cc4134d44d18234c4f6d756fe09dc8a37e122
-EBUILD backports-unittest-mock-1.3.ebuild 1441 BLAKE2B 606f279ae075d9b0fc0cb5ea1278db2304ababe0206d8dc6749a9712786d5759602f1c864a134942bce1311c96b0f81b9b49ed44cc4ee96d327e4c901d496ec0 SHA512 51ba9734a27663d26a436f5f03515b6dc26282bb59c7f2baf938eedd635c527b47b93e793d66c94f39b45c3e797cc732804d90d125ab066c96d7b998c8cbdb93
+EBUILD backports-unittest-mock-1.3.ebuild 1448 BLAKE2B cd0162f2b052244a60ecb3ccda10c1f465e83568b2cb75e69b9bae3086c1c7ba58f6f73b868146a47fa5659f246ce2f20690426e618a07686ffdc2520c9f9df9 SHA512 e27fec31069107f68060364aa1ae6b13739bb481be4c3ded9693b6140a591c9740da75ad75e81d47db018b2f3feafff459319ecde088c7ea509fe371b9586b21
 MISC metadata.xml 858 BLAKE2B f85dba9357ce8da05df41b2fc04c34a9a0010a3c7ff88c8246978fa73ce541562e6f4c73808a378f9039c646a0a3af855404a38e5b4b3d41ab584926dc461910 SHA512 076bb148f419c52a09fa1a89cebd65c0e581828a261da7e62eeab3c30a4e8db4db95af4ee6a5fb1e117a1815ec2e7b4bace522879d9e2773e37ba8b10b247eff
diff --git a/dev-python/backports-unittest-mock/backports-unittest-mock-1.3.ebuild b/dev-python/backports-unittest-mock/backports-unittest-mock-1.3.ebuild
index 1adf549558ef..77849e50b336 100644
--- a/dev-python/backports-unittest-mock/backports-unittest-mock-1.3.ebuild
+++ b/dev-python/backports-unittest-mock/backports-unittest-mock-1.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="doc test"
 
 RDEPEND="dev-python/backports[${PYTHON_USEDEP}]
diff --git a/dev-python/dbusmock/Manifest b/dev-python/dbusmock/Manifest
index a55acddd2914..569733db270c 100644
--- a/dev-python/dbusmock/Manifest
+++ b/dev-python/dbusmock/Manifest
@@ -4,5 +4,5 @@ AUX 0.16.9-replace-dbus-launch.patch 2851 BLAKE2B ddbfe3ffb7a5b55af448e5312340a8
 DIST dbusmock-0.16.7.tar.gz 70544 BLAKE2B 4b7bcf4207362b61cdabce7752db07e76f8ab1e2ac96d1c9415a143ba6e8f8cfd51ff1bb0d051d58df5f7fddd96c6b871c10e377f975984cd83f2e2f9c7efdac SHA512 749728b966b1e067a0a8bd61ee64c1c7ff22751ccb48e15096d041e78c6e779d787160ee191e90daa3177b92c0ee45c66af74b2dd4e4bcb570892b431ec13467
 DIST dbusmock-0.16.9.tar.gz 71014 BLAKE2B d1c0853cfd06848f1d10afdd8de764814054a44080b44e1ac2ef3a1658a538f1e4c7f5936d65658c16da33ccbc2e94f35d2746f200fc6791f645e1eccc55f6fd SHA512 3aa91f6ede054ed3d3a69f68f3886094e881d266a8f09c7d08a34d10b080a77facde8aae01e75232472c2e643574fe897dae2c3588f5ad9ecf4ec4e67f404f54
 EBUILD dbusmock-0.16.7.ebuild 1009 BLAKE2B dc8525d7f369fc1a3b06f308c2721a3c121b71379533e9b990098da9ff4339f528f9b728c0e20ddb600b6a07b1d0fed82b33004eb9e01bd26b48ddfd4415409c SHA512 2ea59870f377a3c5f0c4cd126ead42275356a576f88e7512ba045dc2258fb37d22bb0df8dd0be0f7d62316e919c31661cde9406a1df56d30b2d43ee8771f90ae
-EBUILD dbusmock-0.16.9.ebuild 1061 BLAKE2B 2ee8ac1ee82cbac52319698ff2e180121f02fae6b2584512914de2aa62a6d4f5b9f98962e3b0615edff62d5dfad4428bb09fb72a38fca18f040178cb6f9ac13b SHA512 d1c9bdebfabd11e0db1f7dbf7f9a477c90b53737f1a147e43916b01e286e3b302c8f0d127b98fc5f90dce5caeaff90cc479b60b891886c735965b88150e91d43
+EBUILD dbusmock-0.16.9.ebuild 1068 BLAKE2B a1f29c42f6812f51fd5b20e123e617762e0b18d5cd63d599497948104ac2da335c317a6ce342bd1a0d5cc09ecae35ae956ae0a279b6207f0ba02801d10aa486a SHA512 4a48de3f282aead6eb8ec58a7d39c5041d64d5feeb16932bbe0dba5e34b02d02275bf144f6b339ab270251886c1e16d5567e9fb8ec5f90ab48c730c2262cc89e
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/dev-python/dbusmock/dbusmock-0.16.9.ebuild b/dev-python/dbusmock/dbusmock-0.16.9.ebuild
index 1ec19dbae4f0..d6d14b2d291a 100644
--- a/dev-python/dbusmock/dbusmock-0.16.9.ebuild
+++ b/dev-python/dbusmock/dbusmock-0.16.9.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/jaraco-packaging/Manifest b/dev-python/jaraco-packaging/Manifest
index 08555957bb23..45dade34961e 100644
--- a/dev-python/jaraco-packaging/Manifest
+++ b/dev-python/jaraco-packaging/Manifest
@@ -1,3 +1,3 @@
 DIST jaraco.packaging-4.1.tar.gz 8820 BLAKE2B 43c14e12439d161f9a42005dcaed4d6945fa35ec3498bed81d2e6d10b08b056838dcf92fd6319951dddcfc908c8d33796bd9515aa5e77a04c02298cdcfd240ba SHA512 381ac1ba3a8eeea1235e719d98b61e38399d3fea1310732b0e2f921a3d46544efbb12c23c03bfa3ecfa07697458cb8930ca5156df7b411509c7b1da0b673d7cd
-EBUILD jaraco-packaging-4.1.ebuild 1180 BLAKE2B 41cede50e4bacb527ab4159b72c2f70e7b3eed8ffb78aff16194b08a961063d557458910783cd42b441fd3d4c49dbb77847e4f088f071936644b971132f6892d SHA512 876cbda0e7f43e0f466740377eeb69256815fc58241ae576359bca951739181ec518c7b3dca3175c47bd19de61d51e3218fa963d5abbea618439390df5afe798
+EBUILD jaraco-packaging-4.1.ebuild 1187 BLAKE2B 92458c3d2188f42a13c751aaea9a39743483f4ef9cad2a552e0c2efcd49f45ff1904a3f1dabc73d3f22d37d730b91cdd6a95cebf087ca58c3bfd0f6fd634b6a9 SHA512 a4f2aa6e4fa498118bd60323bb1663eb07bbcaaf8cd2e2c1c767193c10b4c9051b1ccaefd67e1a1df6490f168932cb684c42a746f12463ab4273e6f6cfedc343
 MISC metadata.xml 683 BLAKE2B 25b11a2a24ca06ab9adf0962d870a763588af81bbde85446779ec51735b7e11ee3cd5dfff59fdedf304cefe9fe7d1c2867e917b4a0b5a08777ab2986fccd2f00 SHA512 b6f9d4889c3591dd7e70a4945408a75ccb7eda388599cf9fbf0020ca15152ce4b585b61f8f669980b01386fd277dbe3f8f97e633a148f60726b5260d216f3071
diff --git a/dev-python/jaraco-packaging/jaraco-packaging-4.1.ebuild b/dev-python/jaraco-packaging/jaraco-packaging-4.1.ebuild
index 8b47400689a7..2eae4f942bc9 100644
--- a/dev-python/jaraco-packaging/jaraco-packaging-4.1.ebuild
+++ b/dev-python/jaraco-packaging/jaraco-packaging-4.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="doc test"
 
 RDEPEND=">=dev-python/six-1.4[${PYTHON_USEDEP}]"
diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index 2682198b3347..b1760ef06137 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -1,7 +1,9 @@
 DIST keyring-10.3.3.tar.gz 39531 BLAKE2B cb1f790ab13e30a3cbcb101bbfee0dd3b9b64744edf5ae9a5f2221c3de44a8ea5b60590a0c5868454b38dab9437107cb0da04cf247fdead54fc8787afa74ff2b SHA512 6087b9553d3a8df4abbcc0bacc18d769fda04c092781bd79817ceb5984a2548b5c3a4a2bda15a95040b9db59750a91d8eebbc2420d5f9dbd2fa3d6f10884e26a
 DIST keyring-10.4.0.tar.gz 39632 BLAKE2B c284c42b46ed07b8e7aa6d3cd609887afd7bc890a3390274c719003cca70ddfc9fa8ae3a88d314d1d33e690e8a80718434b608105335beccf0858abad9a5d28e SHA512 34b1503588fedd480b2031d5557349bc6cd70108e68205a38338e091d2865df512f9a9aa3525fb11fbbb9bc06b2cfa759685495ca94b4044ec034070aa3dc0bb
 DIST keyring-10.5.0.tar.gz 40664 BLAKE2B 6a556ccf6819729e68700b58583b9a92c6785100d8f30130bb3778ad74085fcab9cfa4eca3c381ecabedff397649b9dd2d50c8c6a4d6d6c1e22d34b7ac813056 SHA512 da1cd064ae896458b1bfc6906a3d40abaa45b6e69f5760fb87d7f7176eab2c909515bbf6e3f01ecd821e340fd1f967ef2aed02053d4211e87533ea4fd6b4e08c
+DIST keyring-10.5.1.tar.gz 40755 BLAKE2B 0a4914a0f07ac898487258c8ae700ccc6883aea8581d58b3802d971f6079a646fe45467562ac752d965ff39c8b68f7fdbf5daec7f947bf88e6bca6ddb09393a6 SHA512 2e18487c061d67b866390e4f2f740ceb281b75e9ead01c00e2851aec9f56cffb6268334b35d64b498eaa719639fceceb29cf6adf46c6930e3506c04f672e897c
 EBUILD keyring-10.3.3.ebuild 761 BLAKE2B ec1f8073c9a930db5fac94b2bb69c58753cfc42f4dbd148a8de4a5ddef4b5a43fc414f3b65a7c847650bfb52368175a67c7916f0f860853c5eb05ff5133b6afb SHA512 09240d0c2463587ec9656e61e2db74d7efcd2c79fa8bc9428e191e0220cc4edde49092fef638ec74abdf924daeb6c5420b8e28d15e4e34972f7feecc19c3fe9a
 EBUILD keyring-10.4.0.ebuild 880 BLAKE2B 8ffb9aa55b279716aab789f14cb76dd3f6fdad0b37dbc54eb04383dbe22e2a2d4bfdcc840e12ed44a09c87b4c23b36722a4067fa41c830352452bf4ff02352af SHA512 a6d152bc4446e1a4d37e152c2bb1011ce7225c2fd3609533b73abf33bed6f18a5a0f38dbecf765e91f40cdf47fe126e34bf6c4730b926cc3c3bc21978847a802
 EBUILD keyring-10.5.0.ebuild 932 BLAKE2B e3106520824b8b325d519f71353ca31d46d0f522cb5ff6d11cab88185e4dd9d4005e2b939ef9dcef4f2a91a097e5bf5749f8095a5145decd4d296cf93ee7af43 SHA512 0343f6b0fafa81dde6771476a63f6262a275be55322e177f12b19fe2b414ab2a8545b670852d6c2738f9269b8ef63f80880d9564882c6ff8525d45ec0f3c3792
+EBUILD keyring-10.5.1.ebuild 934 BLAKE2B 3d8229ca9a57e8a9413871d68d6153d33b294d476e8f56e50a9ee63c54e00a6ba8224a57d89fb518cb55be2596a61fa09197b6816fc8a6e3de5d5da9218a4d36 SHA512 c3a3870be3dc46da5733db046740f735bdf6a0808335371ab29c32566143bb4fb7e9ab90846204a727a3aa4c783ab16c40a8aa7416f9ddd03c007de30af79a23
 MISC metadata.xml 672 BLAKE2B dc2296acdb196c85c9cd2c2badc6ee991258e43f340576990610fb975837dd9e24c0f2aee0d24c6b8e79e17436719b17e5ef3a4d9c356b08ecc5f33881cff2bc SHA512 19e907e069f6e6092791babdd8b914791d1c52c32187747edc127ce4c80ecad2da1edcdf6e6387c15f9c2b041767b9072668197087afc3644b7713837d5f2ac9
diff --git a/dev-python/keyring/keyring-10.5.1.ebuild b/dev-python/keyring/keyring-10.5.1.ebuild
new file mode 100644
index 000000000000..fa82fef2cc57
--- /dev/null
+++ b/dev-python/keyring/keyring-10.5.1.ebuild
@@ -0,0 +1,38 @@
+# 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
+
+DESCRIPTION="Provides access to the system keyring service"
+HOMEPAGE="https://github.com/jaraco/keyring"
+SRC_URI="mirror://pypi/k/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="PSF-2"
+KEYWORDS="~arm ~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+	dev-python/secretstorage[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+		dev-python/collective-checkdocs[${PYTHON_USEDEP}]
+	)"
+RDEPEND=""
+
+src_unpack() {
+	unpack $A
+	# This is an interactive test.
+	rm -f "${S}"/keyring/tests/backends/test_kwallet.py
+}
+
+python_test() {
+	py.test -v -v || die "testsuite failed under ${EPYTHON}"
+}
diff --git a/dev-python/pexpect/Manifest b/dev-python/pexpect/Manifest
index b34090aa9920..35f418a95e9f 100644
--- a/dev-python/pexpect/Manifest
+++ b/dev-python/pexpect/Manifest
@@ -1,5 +1,5 @@
 DIST pexpect-3.3.tar.gz 132330 BLAKE2B 3dcbc10aa6029fdcc7930bca355583c146661d21820f2fafa2886bfe130c2c0d632bf9edfa5f96f5eae68b5dc7202e1d4bdcc3ea8593ee98346cdd7c354b6ac9 SHA512 66cc501f1c7bb8ba0be4cdc0db840629f51416dc54ae44dc770adb38f1a385116b0a8b9bc7f1cc1447f05ede36ef1b519f5c4e710e6cb736c923ecfc87497cfa
 DIST pexpect-4.2.1.tar.gz 143980 BLAKE2B b5cb9c7847eabdf8778bddc6b208520edb9b3611d7a981fae6e371fa6deafebe142ba8361e3a1d21187cd692576c91d732f3def75e19989296f50b2a9fb4d4c6 SHA512 796474c87559cb9f4e2dfe72564d70c75e1aac4f57c4f3e4033a56c8842a48380ae0d5fafdad7f1ea6718b25c272fe4a611a59db44e69afb1f2bbf7e00256261
 EBUILD pexpect-3.3.ebuild 1068 BLAKE2B 966e9db3bc3297e67a97f5520863bf7bc782fd232d33f7b8ff2194d80bc1eecf14ce4b15bd47fd93ebb77bb545de67da222062a6e9826ce4a90c7ee811aad923 SHA512 0273ebbbba5c3ce1f60956fd7c8b99f374d148e40e6fdc6910e0febc71bd6bc64e83f28f01520ed54a0dc1b400e8b9f6131d63020a2d79974f04b673a13bb5b6
-EBUILD pexpect-4.2.1.ebuild 1168 BLAKE2B cd38de53bd3c743755bcc282c9c5583580c22ddd83ee2e631cfb09081df7c4b125159fc1573c7b043396209a8c9c52e11e7fa34abbeacb5c364a7eeee3be1d9d SHA512 39a08356f57e7600479ac5b61407da6e7d074d65268aa731fa40713e0dc9db60267c70d3a1d87cea08ece8a4d18192fc75e768e272de597c6a2bd25471bd10af
+EBUILD pexpect-4.2.1.ebuild 1167 BLAKE2B 4940428c2fcfa46a9414ebded2974e237ab444c6ae3670608c09adce5df667cfa4bb006756e93bb3e538a2465e17e82f3c4c500c27cd1b499677e12369cda085 SHA512 5e054ad606ec614c25ee0148a25af89fc5c5effbd9a0f5119e27ac5b808fd246831c337a90f7b5b427b3538cde8c6b0778dd6ff54e9edf9afe3216c61cd018d5
 MISC metadata.xml 377 BLAKE2B 72c4b35c12a770df9344987af8c7a392c3aed05296a4876902987ef946239f8318ee833cc81a7f004719e954670a83e84a3813bcdaac48912efad885515de1ea SHA512 31e65b2ce9ec12e9d3e95ed651841b8aad6a24330fe20b4bfd6351267423ff5005ac3cb2e89dbb8f024cf60705d3f06a8a1309169a029eb5246ddc45a8d76464
diff --git a/dev-python/pexpect/pexpect-4.2.1.ebuild b/dev-python/pexpect/pexpect-4.2.1.ebuild
index d9cc1ad9d34b..77687dda1c77 100644
--- a/dev-python/pexpect/pexpect-4.2.1.ebuild
+++ b/dev-python/pexpect/pexpect-4.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN: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 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc examples test"
 
 RDEPEND=">=dev-python/ptyprocess-0.5[${PYTHON_USEDEP}]"
diff --git a/dev-python/pycairo/Manifest b/dev-python/pycairo/Manifest
index 71b35a3e8902..dfecf6f9a1df 100644
--- a/dev-python/pycairo/Manifest
+++ b/dev-python/pycairo/Manifest
@@ -4,6 +4,6 @@ DIST pycairo-1.10.0.tar.bz2 246556 BLAKE2B fd04135ef5c4591641cd3ec29aad4de709469
 DIST pycairo-1.15.3.tar.gz 177056 BLAKE2B cba4a212c3537d5718a73742468444b01372902d86f88558cf63ab2ec1999dac036b349d84dff0bdcae5126998c5e921f05bab54b708a29ca2381b8d1371ac44 SHA512 1fc75d193eacb976f2e5a594aa07409a0f80ccb21921065c1794961143785eed48be1966d2d2d3e2d0428f9b4e956994dd851d21f3c3cb91fbc27b007a901ce8
 DIST pycairo-1.15.4.tar.gz 178436 BLAKE2B 23c5064f537b8d8be12bb64df375c1d5be8962f80adf2437115dde59c18c3755a693b0cb8b3bee248ce8c906f23acfa264f2da6e02770bc59d823beba1bc9e7b SHA512 7e785d23393a8d0c5aca9a4440eb64b0eca9a60c1a18b0dc8452edd6de9422c743d082530387bcbedd34d52377d0892ad395998e9467ba08e22c318684cbee34
 EBUILD pycairo-1.10.0-r5.ebuild 4801 BLAKE2B 9ded1e263bdfa4ffb0c3191372936a674afe9f54daea7f322febfa800360d81e0dd5e828307afc4d89b0a1229ebbcb15855f5640e49868e78313afd5adafa1ba SHA512 0af881180b25a67fa8102bbdb03d0fce758343f251b970da05dab48df024e0e46ec35c1d42288a68004d5bde66c925b6f734f985022e404c70b4ece014a3768a
-EBUILD pycairo-1.15.3.ebuild 1610 BLAKE2B 0b11885274036dfbfccb47414478abdfd4da09fcc69c5e91ace0bc87fe7067db29d03ca75753d7ac6706727583d01d1aff390290f8e9e0f72a9c4d44fd97073a SHA512 1f26cdb5991073636cce6eaf3b21ef5f21ad1911ed6ee20d61d625552b691250ca0af4144eecfc3f9d21e42c2b2c029682bfb9650d0faaf46c4fff29991d9447
+EBUILD pycairo-1.15.3.ebuild 1609 BLAKE2B 2eb74d67f6c42d952b79bf2ae0b22c8c1643f20043bc9357676deca9d362c9dbf186ab2be51ad2477dadc34224d04c7e7f1ff70125e835ef43f77db6f930c338 SHA512 54e3676a71e3b56e3e6f421778e4a9932bea7d1698f21068e941cea7f271b5167fc5e8dac8007671b3ed2f3654d89f95563487952bcd9023a0124449df4a200f
 EBUILD pycairo-1.15.4.ebuild 1616 BLAKE2B f587a875f864f1d08465f421e48b2935378dfe9c2e5a6d421aa39b1d00f11c6622fae6e0fe95bc3bc79a8126b069f77599daa5a2c191ee47399d58d52fb1753d SHA512 f8fc6a76feb2a2544c558965a2004151e8a259de7466195c02a18657e614fd956b94b21c1038a5868a74c904f8fe20f3eb06c9c352b73a83688d6fcf8ff57c0b
 MISC metadata.xml 246 BLAKE2B 3a28b3bb42a0352827a446ea608867a7782fe682458527ef441a528a22c9f951dc203639934a69ffb520f63aadce3037df28bf8c5304b3a5921b336142f9f246 SHA512 3245fb694492b2f698fb63aac02e66fb8a94fe35eabda45df4790bec043a1ea552e112315334001902f070093bb73e7b741aa3004757404aed97ebdb86cc9fbc
diff --git a/dev-python/pycairo/pycairo-1.15.3.ebuild b/dev-python/pycairo/pycairo-1.15.3.ebuild
index 9cc7f2956b27..e1a9e6509c4e 100644
--- a/dev-python/pycairo/pycairo-1.15.3.ebuild
+++ b/dev-python/pycairo/pycairo-1.15.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pygobject/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+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"
 IUSE="doc examples test xcb"
 
 # Note: xpyb is used as the C header, not Python modules
diff --git a/dev-python/python-nbxmpp/Manifest b/dev-python/python-nbxmpp/Manifest
index f14b0d61643e..ab27993181aa 100644
--- a/dev-python/python-nbxmpp/Manifest
+++ b/dev-python/python-nbxmpp/Manifest
@@ -1,5 +1,7 @@
 DIST python-nbxmpp-0.5.3.tar.gz 1514066 BLAKE2B ad2ab143b171eb4bf6d815a9547ba7deecf54b51c9dfd72b465cb99cc06bdd63e9fe419bd12db8a2c26fb188eea0d78de0447457ec417af2fe8606e04e2e94d3 SHA512 a55ce4c05683d46c12cf085c5436ba544044f0ab71ad7c87dbb25cba02c28109089131b617ff51191d294efe50e80171dd2305ead4052bec921b0ad5ad920e20
 DIST python-nbxmpp-0.5.6.tar.gz 1330311 BLAKE2B 8db09bf02c3bb6a82092a419066b2af9900c494b6bc840097f3055dd9bd1fcc80520a7b4d2f7fb84b762499d677648fe952828995bada128089d538aff1db460 SHA512 1ae90dc6d7117e8fae837975dbc4b84a848caef451c8ef99fb106148a12e29429255d0595c0eee26cb185d01e42a84ddb7636f41d4ee259fedf26cf0d956a43c
+DIST python-nbxmpp-0.6.1.tar.gz 1331188 BLAKE2B d8ddad6897c6b98f20a3abfad66f3968b6fa318e2516ecba0b888c199a293770eb26222117821f145fddf4ee0ffd95968b767c0d0445fef2f0513a43aefac752 SHA512 399608b7be39e802d3302004b97f67120ba80aa870331553399f3d35d161ea01f04f690b65b9d6e82e30472701d981a539c89e608b741ae96d54ce6be11f03f2
 EBUILD python-nbxmpp-0.5.3.ebuild 506 BLAKE2B b99d0d491d0e13a3b2bdfd0de153fd7c0043e86cc9c7d9539f5f2db53ac849b466f87ef28ed3ecdaa4b7b27cd7c3606f863de9cd4eea507bcecb3f239760ef55 SHA512 f757a834a61b2ae023758894dcff03254409f49ed5f4d49d145849b8bd207d50c00e53dd67fb5469c18dd3395551746161c6c2d5d70213469675f975b155d0bb
 EBUILD python-nbxmpp-0.5.6.ebuild 526 BLAKE2B 14b4d2f0ca89c5d540813abd5f22b0b220f57712e5fcda4eb78d0695ce20b5cc9e6b6902bdfb7eec201f906768d3f3e92553005b6c2263a1b802afa28a34c2f9 SHA512 fd81b6eb36dc348f3ced4a12d7644e4b04f901f3363de31adf6ebd97a7b2cc9ec165518b450a98bb929bc6c6905276989031fed656d863b7be4be565422b04b6
+EBUILD python-nbxmpp-0.6.1.ebuild 531 BLAKE2B 140575ac533fa20f064223a3815ef4b86d0d5678ffc77883011c9160c0f51e46b0760ee5df2d6d49ce6ef3ca2218a9919cc6c3c4de239aa366e5e4391aaa8acc SHA512 738d09ea0f82d449969e07a5d6642ba83bf2432d42583bb691629371d64a74ae4cf43772e95825b609b6ebd1550b7e5ca71157c289aa245983ab5c5424b9429c
 MISC metadata.xml 246 BLAKE2B 3a28b3bb42a0352827a446ea608867a7782fe682458527ef441a528a22c9f951dc203639934a69ffb520f63aadce3037df28bf8c5304b3a5921b336142f9f246 SHA512 3245fb694492b2f698fb63aac02e66fb8a94fe35eabda45df4790bec043a1ea552e112315334001902f070093bb73e7b741aa3004757404aed97ebdb86cc9fbc
diff --git a/dev-python/python-nbxmpp/python-nbxmpp-0.6.1.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-0.6.1.ebuild
new file mode 100644
index 000000000000..d46f49ff6305
--- /dev/null
+++ b/dev-python/python-nbxmpp/python-nbxmpp-0.6.1.ebuild
@@ -0,0 +1,17 @@
+# 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 vcs-snapshot
+
+DESCRIPTION="Python library to use Jabber/XMPP networks in a non-blocking way"
+HOMEPAGE="http://python-nbxmpp.gajim.org/"
+SRC_URI="https://dev.gajim.org/gajim/python-nbxmpp/repository/archive.tar.gz?ref=nbxmpp-${PV} -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
diff --git a/dev-python/stripe/Manifest b/dev-python/stripe/Manifest
index 03d1d42246f7..ca3625edaad2 100644
--- a/dev-python/stripe/Manifest
+++ b/dev-python/stripe/Manifest
@@ -1,3 +1,3 @@
-DIST stripe-1.71.1.tar.gz 198408 BLAKE2B 103634c66063429b413be64ae247461bcaeb2c3bfdf342bd85eebf080a6250050c75571c7dff8cbda781113e6864bab90479ec74535e67b539836a153d615c4d SHA512 be381a8349cb4356b188e648b55c0e2e9ea580aed00b89e1a2fa3a9743c4091d1f0b45a132664c29f149a885eeb139d117ab3685600865e13d7a7bd3765c9af8
-EBUILD stripe-1.71.1.ebuild 600 BLAKE2B 7ec19ae05c62d9120909f935f35401cd427e613358b1c864f8bf9044b4c47919b07160d0e568595b7ffb96817edbc9ad7e5b4400cf0c60b73b56f428088de858 SHA512 d80be59c9ce388abd60ca672a6e08e5ff25281ef1cc80aefc0b94f9a59a35d11d0ce8da0d2a6efedaa71538ed0a5540e667c44f017825f98c4aa7f1bbd424308
+DIST stripe-1.75.3.tar.gz 181924 BLAKE2B acbbc05db9bb7ed61d5ea0995f69164d3c781a54d8e033aa4e74f0d7334993b70f21799a022ede69219c7a23dfa516e8e340b5009b7cb26142ac077dce24babf SHA512 30c95740bbf2a756ebd4e9453195907c8239bd9e36377363429ee269ef27e04fe60bdc3bde921a5be0ad7ab59ea1859dbcfbbf39d6da8b81aa163cfc7793ea5e
+EBUILD stripe-1.75.3.ebuild 457 BLAKE2B a2c8a2c7f8de450ce46064be766b8953d80f276bdd0a95e3687ec2cfb28475d1bbbe4353956c2e6c9f765db985baee1651359e4e17baf5ab1ca9a12bf29f6581 SHA512 d8c6012d0957a21bee6a433857796a050cb6de2cd08b67e071cbea9b713ce4d8427fa037d8e263eb99f613093bc270865a7a8650ad6345ddcb45d4238acdfea9
 MISC metadata.xml 539 BLAKE2B 9232265d094774d1f04cba8e358a9655034184c10561bb8db4f8188381fdf7583971f67d5418f2969ad4a12db46a94b4c87c3eb9486eb0ac251fad9bb68f7707 SHA512 f0052ba8457139d76ddce67313bc973564237b409801d3d6da181c495c2d80184076cbe36468850a1ddcd60de50327e728fc3433a8a4bfe9608713a33fdbe9c1
diff --git a/dev-python/stripe/stripe-1.71.1.ebuild b/dev-python/stripe/stripe-1.75.3.ebuild
index 674033205871..5c90df0de3ce 100644
--- a/dev-python/stripe/stripe-1.71.1.ebuild
+++ b/dev-python/stripe/stripe-1.75.3.ebuild
@@ -13,18 +13,9 @@ SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
+IUSE=""
 
 RDEPEND=">=dev-python/requests-0.8.8"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/unittest2
-		dev-python/mock
-		dev-python/pycurl
-		)"
+DEPEND="${RDEPEND}"
 
 DOCS="LONG_DESCRIPTION.rst"
-
-python_test() {
-	${PYTHON:-python} -Wall setup.py test || die
-}
diff --git a/dev-python/vobject/Manifest b/dev-python/vobject/Manifest
index 878d27a205bf..eb375ba23aa2 100644
--- a/dev-python/vobject/Manifest
+++ b/dev-python/vobject/Manifest
@@ -1,3 +1,5 @@
 DIST vobject-0.9.3.tar.gz 57744 BLAKE2B 01a9083faa7f2a84e2f6f09d9f9f14afb5558d86aefb1a9d5c7e3c8f0e664d6a292f79a340c1a32e510637784cdfb0f02d713e0bcdbb99d1531c50e742192063 SHA512 d77dac2e885ea752e900a2f6e3d9cf24fdd3365d1e9e2ba51c5c38b2889a62aaa61e5562799eb8063b5d4ded0bcd43108cd7e5d028cf7dbe72008b208b8e2e76
+DIST vobject-0.9.5.tar.gz 215577 BLAKE2B 0312a0c1377ce8141e32422fbf9b4dab253398ccf83bb530929ac052537213b065d7550cd0d926a52a00e27271faa942797b65899fcbe3b8b955ca15c6a114a8 SHA512 087b394ad6c48c359ee1cabb90cbc85cb305ed9e65199f33c19f386c7075b70273e5fddcf7fde5356b140ead7a581efd917594e4d493e720c4e1a632f797acc7
 EBUILD vobject-0.9.3.ebuild 784 BLAKE2B 4296e4516e0c0d4a57c09c78362c6cf0b282480a9b20bf502ad2eb3c00dd4b27e5193aac0000b3210b53ec5405f6d1c2c9a2541024d9d2d8b7a571bc1e16aa52 SHA512 b5ea279b288290184a0eb28ff7de1453b26d23fb125ae5a28ae133bdaf808cb223fa73b4797578b530075516bbd36e63fbd4c9c9933ebf5e61e98cf3dd3a1380
+EBUILD vobject-0.9.5.ebuild 786 BLAKE2B a07466d6ffe5e6fff8bf41b999c02b5b39eb479069324f95def4140657676193d85ac17494f2fe3b547a7cdc9bb481a92767874ac6b1fd353f14d8e73a3fba59 SHA512 bb1f3534b98fb030bba319f4753d838d8906472b133248f36ae3ed01ed89287ab17814fe935e372b272038708c7976a1f382aec7dfb6cf45ac1e0eed3d0c6222
 MISC metadata.xml 322 BLAKE2B e0e386d11610176cc9b83ec3e1c6cf3d53306b01dbe272be61538592057e125ae6eb196e60e8c6588d80a3f8413f9f5bbe9e373f7e6670f1bb53bd043cd9be39 SHA512 d50380968c2886e5fb7971f90ee38189b9f325513eb0e0e039638ec0b466b3c54c20be5ac056a49fd28923e061d658200898f26850dcbe2c0d58114c0b732a02
diff --git a/dev-python/vobject/vobject-0.9.5.ebuild b/dev-python/vobject/vobject-0.9.5.ebuild
new file mode 100644
index 000000000000..aaf93db14a72
--- /dev/null
+++ b/dev-python/vobject/vobject-0.9.5.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Python package for parsing and generating vCard and vCalendar files"
+HOMEPAGE="http://eventable.github.io/vobject/
+	https://pypi.python.org/pypi/vobject
+	https://github.com/eventable/vobject"
+SRC_URI="https://github.com/eventable/vobject/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-python/python-dateutil-2.4.0[${PYTHON_USEDEP}]
+	dev-python/setuptools"[${PYTHON_USEDEP}]
+DEPEND="${RDEPEND}"
+
+DOCS=( ACKNOWLEDGEMENTS.txt README.md )
+
+python_test() {
+	"${EPYTHON}" tests.py || die "Testing failed under ${EPYTHON}"
+}
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 74672c956e82..e38e5a686156 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/minitest/Manifest b/dev-ruby/minitest/Manifest
index b602e3ffeaba..96e6152bbeaf 100644
--- a/dev-ruby/minitest/Manifest
+++ b/dev-ruby/minitest/Manifest
@@ -5,7 +5,7 @@ DIST minitest-5.3.3.gem 67072 BLAKE2B 58511cd3cf5e8cadc78427a4818f973aa59873cd35
 DIST minitest-5.8.4.gem 72192 BLAKE2B 364cd5da716e33b9c4a6e0b1e249864445205a759b289f940379db033c25edda776177bb2435df75d30b51602193a1f039e72bf3515cfcc4cdbcc83e5a7815e6 SHA512 92569e41e334f209260ac77f9157f1dac8824111c6a810d954f7c66d24cf7a16d7d874186288580bf1f800889d8bdfc80437691d91208990878c295e14c1f906
 DIST minitest-5.9.1.gem 73216 BLAKE2B 553143159ddc688ee0961a1714aded658dea3b6d5823bfa1555e96d25506eed2a789ad0b31939da1947e3e1d21fa9b4a9f59f3b429354283baa8c28fcda1a444 SHA512 4b02ea62297ad5be8bbc8d541405b0d73668ec7fe0f78318fb85fcc35321d934285df13aac2f3e5c4f9cb303b2689bca36a13bf1f8359486f9c66d4ca2fc6e72
 EBUILD minitest-4.7.5-r1.ebuild 755 BLAKE2B 8bbc1e959aaa032aa41c151bf19a294229421d3e0f3ff8491411f65c4a0bbea3be5d0e925277fd70c797865795cb58feca6ae2a9828e3384220d6dec88fb6fb1 SHA512 3af943e583afb74c7006994e2e93f5386b1b0f3d16c66489f28f9580694e28b0b59d7af5829135460552ab38b7483286688602a695cb8125496f4b3510df114c
-EBUILD minitest-4.7.5-r2.ebuild 951 BLAKE2B f199c1f122069f2e8226551f335d2022ca97a7b6dd059a87f4902243709685a09c5b640647c1a56cc2350bdc846334cb4b533ab8c25d702dee16cfbf16031f61 SHA512 3c8e41b67d1ee7014f457b1da6937ac059ecce4af67a24b2f05468d19a79ebb63a90e33fe1912495707d37ee342a2f0181a85c199190e93abb3d6f7356078b32
+EBUILD minitest-4.7.5-r2.ebuild 950 BLAKE2B 117592333e5190c15631c14286fb357222aea9f2b989b9d5e07e70f170f1e8f5c95b68da32928b4679c4c911c32f2cfdf7c12038ec6eadc0e02dc38abcff868e SHA512 8d9f6916caa962b706b4e0eba49ca28472060cd7ab297fb2cc72f08580cb369f71b97aa8e60bc818de9275ec2e392c4d6192a28f0d653d43728c25be91fde1db
 EBUILD minitest-5.10.2.ebuild 806 BLAKE2B 38d0fe4a589a70a3002d54f7faf8d9252fc988746bb55b1d8ee2318770e77b8cd32bd3d9b298b1b4629181f58b84612d125f0b67d50bed37a3be77ed89756d10 SHA512 5c6c2c91f11eeafe874fb60b3c351ad304cfd81cbacec656aba32b27b549f9e5d21cfd486b6e2a90cfbf1c1cfab6cc8ab654fa82f3b0149328e6e72ccade4084
 EBUILD minitest-5.10.3.ebuild 806 BLAKE2B 38d0fe4a589a70a3002d54f7faf8d9252fc988746bb55b1d8ee2318770e77b8cd32bd3d9b298b1b4629181f58b84612d125f0b67d50bed37a3be77ed89756d10 SHA512 5c6c2c91f11eeafe874fb60b3c351ad304cfd81cbacec656aba32b27b549f9e5d21cfd486b6e2a90cfbf1c1cfab6cc8ab654fa82f3b0149328e6e72ccade4084
 EBUILD minitest-5.3.3-r1.ebuild 817 BLAKE2B a2173c0cb66ae8fbce47f13b0afd04f78ffff56c246670462f7cee90a73b6f26435c4489f3dcc4a35bcacba892a752c8681341ad896425565890c21b2c162737 SHA512 b96a9b0b391626ec3579314fb4d5e4d2635a8b78bdc3acec904519c78c87b633e5ed015fed19f7bba04a47adb7d2808495354e7ae378847c88cd4fcff3d84c53
diff --git a/dev-ruby/minitest/minitest-4.7.5-r2.ebuild b/dev-ruby/minitest/minitest-4.7.5-r2.ebuild
index b23c1dfca08c..88373253f030 100644
--- a/dev-ruby/minitest/minitest-4.7.5-r2.ebuild
+++ b/dev-ruby/minitest/minitest-4.7.5-r2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/seattlerb/minitest"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 each_ruby_prepare() {
diff --git a/dev-ruby/mustermann/Manifest b/dev-ruby/mustermann/Manifest
new file mode 100644
index 000000000000..00f99c4acee7
--- /dev/null
+++ b/dev-ruby/mustermann/Manifest
@@ -0,0 +1,3 @@
+DIST mustermann-1.0.1.gem 51712 BLAKE2B d81e67ca6eeee89004aba2c8c152671f37b4f77c8c3ee8d88cb7a028c9145b922a298e6a40998ec1e9e3cbcfbb282c9324147a49fd5694a72e3fabf67aaf9e2a SHA512 6fbe0a0a2af41a4276283029ef3883e031080c7e1394e9a1e496c9de0dfbdd9dea3c753fc9fd64718f3d1d04ed61ea865165bab96e53c1b8b1258d91c5231562
+EBUILD mustermann-1.0.1.ebuild 508 BLAKE2B bafc5723c6b4b0b3d4895d2716b5cf78c6920ce65bcff5c8430d03cb4c265bd8b515e2b1ea48633b2ecccf414f53ed3e2af8eba4a67f74edb4cbd92bc3bc9a68 SHA512 e5c6482ed59ea261e8f6dd268067926351736c14a066ca5fe8bd587e55d365ae50a7172806e7f8c3f5e7f333a7b6166829add89663c1755221f5b77eed631e6a
+MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/mustermann/metadata.xml b/dev-ruby/mustermann/metadata.xml
new file mode 100644
index 000000000000..28ab0c15f206
--- /dev/null
+++ b/dev-ruby/mustermann/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-ruby/mustermann/mustermann-1.0.1.ebuild b/dev-ruby/mustermann/mustermann-1.0.1.ebuild
new file mode 100644
index 000000000000..5dc350ef6924
--- /dev/null
+++ b/dev-ruby/mustermann/mustermann-1.0.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby22 ruby23 ruby24"
+
+# There are specs but they depend heavily on unpackaged code.
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A library implementing patterns that behave like regular expressions"
+HOMEPAGE="https://github.com/sinatra/mustermann"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~amd64"
+IUSE=""
diff --git a/dev-ruby/rubygems/Manifest b/dev-ruby/rubygems/Manifest
index 0010ee54892b..6ef70c1d6d35 100644
--- a/dev-ruby/rubygems/Manifest
+++ b/dev-ruby/rubygems/Manifest
@@ -4,5 +4,7 @@ AUX conf.d-gem_server 81 BLAKE2B 2019f1b5085a824e1a9e0551a8b224391b1db777f15aea7
 AUX gentoo-defaults.rb 972 BLAKE2B 4353b782296ad04f400fbdbd67dcc2f26b23a9bc4a716d107a8f98c5058676c675eb42e1d5e0a7214cd74df9148d54220c0202189938c45f4000301e52a3a73f SHA512 fd5a33c433041efeefba4bb8d550b8db66f31d4c0966188f07943f4f575ee9e13da6ef6fd66f89a4b3b979c5b310d96e2876407b79aee6ed404ca3027859160c
 AUX init.d-gem_server2 503 BLAKE2B 7c602202ba101a5ed7e74a67bc4183085a98fdefb5528afbf975a9f834ce71eb1342bf2ff6206ec6fb8fbb893c908f1aa1cb7a067ec9f161a6205de220ee5259 SHA512 8b9386b93a8ef43fffba5a8c4c5232265a9b0d146d24839e75874721d3377ae0c3d0f52f14592e54c9ee94d26d7a81bb125b25f8c270253cc27e4a76dd64757d
 DIST rubygems-2.6.14.tgz 769418 BLAKE2B 13821b21c7ac4087667c45d7b7e515023e80552072e11bfaa98393f573f361c60bed07bf9aa69d31952deb66e75db3c9b616372203ee7d1fa98a7775eff4c1f5 SHA512 7743845bc5265df3782f85a23896cbb250d8a2bbc9934a27f274b001afa7aa62f7f00f616296f74747ea612d2cb37dd7f533c931aa72550d84c64d2a73d60daf
+DIST rubygems-2.7.3.tgz 849187 BLAKE2B 8e30001f6312fcf3643104530216910c8eed7157e5b74a9f7b047963e7d2ba8e7d429b431474e683dfb3529c2c551a9daf1fc5c19532f67b95542ce26848d9f6 SHA512 2782331b31947a23f85b285a3d5e7b66e34fe5847bc84dca4f1e6bfe33ce187ab0cbc814229de8111aa19490b656ca78b7c821e4ea6b425449991c01371b7565
 EBUILD rubygems-2.6.14.ebuild 4063 BLAKE2B 1ec9da0c225d24faec7dabe1055ead71a31625c7c71981b034761d5cccf4fed8053cbb87312afcb8c439fb805b75af306b7ed5f19d921084ce2616f1a99fc45e SHA512 40ae44ce042618b30297e2495ac5524ad58ab6b3d0b8081bf073707079c819915325940da9ca6ca7163e101b359dc19fee9637a684ca22ed2bb0b1a00d7d01a3
+EBUILD rubygems-2.7.3.ebuild 4133 BLAKE2B 0f6b46c4b3388e40f01ff4691282ff40689cf0fb8e3ae61251a14950530b7b74ce618adb7d3d103436c29ce42f5253778eae02ce428c4d027bf12048f1473b99 SHA512 816399873dd3ba549e8222d377aa800d42be3742c7d64c07c6e513266322bebf7cf922691fc966483a1fd4bbc435839d06b2c2ddea20d718d585c156972cabd0
 MISC metadata.xml 335 BLAKE2B c86eaf3d37fad025b8f6ca0b03e65b1b472716b4fda4ca4d08b415b29a63405d8e7b2684d309091c90411c5fe809e5129c6e0c0c4e7a982b4aa062ffdd0ca7fb SHA512 fd7bf880ad68fe5f1fe8eb79f9662af87831ed499517d5a97e22f18a4ddafc69d53118f020e15c3b8b171fe144bf6cb0ce799beaa6e4e4bdc01c984ab582388e
diff --git a/dev-ruby/rubygems/rubygems-2.7.3.ebuild b/dev-ruby/rubygems/rubygems-2.7.3.ebuild
new file mode 100644
index 000000000000..89904eb2b140
--- /dev/null
+++ b/dev-ruby/rubygems/rubygems-2.7.3.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby22 ruby23 ruby24"
+
+inherit ruby-ng prefix
+
+DESCRIPTION="Centralized Ruby extension management system"
+HOMEPAGE="https://rubygems.org/"
+LICENSE="|| ( Ruby MIT )"
+
+SRC_URI="https://rubygems.org/rubygems/${P}.tgz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE="server test"
+
+PDEPEND="server? ( >=dev-ruby/builder-2.1 )"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/minitest-4:0
+		dev-ruby/rdoc
+	)"
+
+all_ruby_prepare() {
+
+	mkdir -p lib/rubygems/defaults || die
+	cp "${FILESDIR}/gentoo-defaults.rb" lib/rubygems/defaults/operating_system.rb || die
+
+	eprefixify lib/rubygems/defaults/operating_system.rb
+
+	# Disable broken tests when changing default values:
+	sed -i -e '/test_default_path/,/^  end/ s:^:#:' test/rubygems/test_gem.rb || die
+
+	# Skip tests for default gems that all fail
+	sed -i -e '/test_default_gems_use_full_paths/,/^  end/ s:^:#:' test/rubygems/test_gem.rb || die
+	sed -i -e '/test_execute_ignore_default_gem_verbose/,/^  end/ s:^:#:' test/rubygems/test_gem_commands_cleanup_command.rb || die
+	sed -i -e '/test_execute_default_gem/,/^  end/ s:^:#:' test/rubygems/test_gem_commands_contents_command.rb test/rubygems/test_gem_commands_pristine_command.rb || die
+	sed -i -e '/test_execute_\(default_details\|show_default_gems\)/,/^  end/ s:^:#:' test/rubygems/test_gem_commands_query_command.rb || die
+	sed -i -e '/test_execute_all/,/^  end/ s:^:#:' test/rubygems/test_gem_commands_uninstall_command.rb || die
+	sed -i -e '/\(test_default_gem\|test_check_executable_overwrite\|test_require_works_after_cleanup\)/,/^  end/ s:^:#:' \
+		test/rubygems/test_{gem_installer,require}.rb || die
+	sed -i -e '/test_\(load_default_gem\|default_spec_stub\)/,/^  end/ s:^:#:' test/rubygems/test_gem_specification.rb || die
+	sed -i -e '/test_uninstall_default_gem/,/^  end/ s:^:#:' test/rubygems/test_gem_uninstaller.rb || die
+	rm -f test/rubygems/test_gem_indexer.rb || die
+	sed -i -e '/test_\(require_when_gem_defined\|realworld_default_gem\)/,/^  end/ s:^:#:' test/rubygems/test_require.rb || die
+	rm -f test/rubygems/test_gem_commands_setup_command.rb || die
+
+	# Avoid tests playing tricks with ruby engine that don't seem to
+	# work for us.
+	rm test/rubygems/test_gem_request_set_gem_dependency_api.rb || die
+
+	# Avoid test requiring network access
+	sed -i -e '/test_download_to_cache/askip "requires network access"' test/rubygems/test_gem_remote_fetcher.rb || die
+}
+
+each_ruby_compile() {
+	# Not really a build but...
+	sed -i -e 's:#!.*:#!'"${RUBY}"':' bin/gem
+}
+
+each_ruby_test() {
+	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
+	#unset RUBYOPT
+
+	if [[ "${EUID}" -ne "0" ]]; then
+		RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" ${RUBY} -I.:lib:test \
+			-e 'Dir["test/**/test_*.rb"].each { |tu| require tu }' || die "tests failed"
+	else
+		ewarn "The userpriv feature must be enabled to run tests, bug 408951."
+		eerror "Testsuite will not be run."
+	fi
+}
+
+each_ruby_install() {
+	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
+	unset RUBYOPT
+	export RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}"
+
+	pushd lib &>/dev/null
+	doruby -r *
+	popd &>/dev/null
+
+	local sld=$(ruby_rbconfig_value 'sitelibdir')
+	insinto "${sld#${EPREFIX}}"  # bug #320813
+	newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb || die
+
+	newbin bin/gem $(basename ${RUBY} | sed -e 's:ruby:gem:') || die
+}
+
+all_ruby_install() {
+	dodoc History.txt README.md
+
+	if use server; then
+		newinitd "${FILESDIR}/init.d-gem_server2" gem_server || die "newinitd failed"
+		newconfd "${FILESDIR}/conf.d-gem_server" gem_server || die "newconfd failed"
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -n $(readlink "${ROOT}"usr/bin/gem) ]] ; then
+		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
+	fi
+
+	ewarn
+	ewarn "To switch between available Ruby profiles, execute as root:"
+	ewarn "\teselect ruby set ruby(23|24|...)"
+	ewarn
+}
diff --git a/dev-ruby/uuidtools/Manifest b/dev-ruby/uuidtools/Manifest
index 790e94c893f9..668670ceee52 100644
--- a/dev-ruby/uuidtools/Manifest
+++ b/dev-ruby/uuidtools/Manifest
@@ -1,3 +1,3 @@
 DIST uuidtools-2.1.5.gem 25600 BLAKE2B 8219d559d92d86e7a87b97d4eda9454b6c203f89beb4a74ff619f51470d339c4063b1982ffb6f8acd5b9c206ac7d0dc537e968b1744a030a4f6cd629a358fc7a SHA512 c56e6329e48638bd5049d348beedec7fadb9ee7a133a5013ddd41ae98baa8213d8944903059729c9ca4f38b24d9b565b5653332685982337a4233f11d4865ac0
-EBUILD uuidtools-2.1.5-r1.ebuild 1075 BLAKE2B fe7ec7ed5c580307104d80bac76999a5dd46619a53d3d4ff4194133a5e2ad81eb46dae6317ef2282489c07b7c639348b2eae983b60281acf1077f298dbba32ab SHA512 31cd36260186455459f05b12f373ba42b35d3e856d43396047ba40732e75b962bb9d4d140c43842345bd1fd9bfe31e824a1fa496ce5d3ae33bdde3fcf03d5249
+EBUILD uuidtools-2.1.5-r1.ebuild 1068 BLAKE2B b0ee34ec4ace5684c4ccdc5cc5870b402c0a00e1f5f3f018322720ca322dc28453ff6c6a0a56d2d15a5e853585fbf66bdca1fa8405c3b96c96e3de8f528934b0 SHA512 cf7de73fe9ad476284a9d52570e92fc44677cc4e5741298c5cea17998065d0ba9d5f4651edc22a663f6f6d983fc402b207025deec58c2fa43b023ca92182ba66
 MISC metadata.xml 539 BLAKE2B 5a99e5c959879b57b6b604bd90b1e7c91fbee2608653e4a6b6cb135012f5c964a1b07ff90f9f8702c99a639df9a143c308722df4c0bcd1e8beea2259d3e9fc39 SHA512 6f697164bc069b62ade929d31fda162c1d25e33fedc1135985cad7bdc80d256db169aa8ee3f2293a9dc56667a1e1d4f75834ca1d4b3c3310e3b26ed85079f09e
diff --git a/dev-ruby/uuidtools/uuidtools-2.1.5-r1.ebuild b/dev-ruby/uuidtools/uuidtools-2.1.5-r1.ebuild
index 9e1a46f21371..5facdb568b94 100644
--- a/dev-ruby/uuidtools/uuidtools-2.1.5-r1.ebuild
+++ b/dev-ruby/uuidtools/uuidtools-2.1.5-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 3cbbaf2aa836..240ab2223f4e 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/glade/Manifest b/dev-util/glade/Manifest
index 4c34342baeb5..4d90b85607a5 100644
--- a/dev-util/glade/Manifest
+++ b/dev-util/glade/Manifest
@@ -1,4 +1,6 @@
 AUX glade-3.14.1-doc-version.patch 853 BLAKE2B b7cad3cc9d49cfe24189ba21bffaec2c524d3c7953d722b3b03d57ad68297fee6757330c1a2d90f36bcfe52d1d9ef4d95b81eeb19109bc8957f671ac40d31573 SHA512 cc9aec06f6acdfdf538de7043f9f753768e0e4c26fa9eef7e52b4e42aa6fd3836185c18ffd51abfc2aa3e6f5b2472e68914112230d2b8856e8a3c61e9d865ecf
 DIST glade-3.20.0.tar.xz 3492928 BLAKE2B bab8682ec83a98f7f405a667e9fc9ad4b0fa334e0f1f3b1ba5bd8e17af1c61c65031ebe2fe56b8321df142f5a4d8dec348793bba0fc3c195c6722d635d52a291 SHA512 58c8da3522c75470f5b42492bddd83f61d828fa2a3fb8a78d15813f6d1f1df22bd808f25ae7228bf2e821bacdcc5665b889bac3ea8364c4dac288f95e817e98a
+DIST glade-3.20.2.tar.xz 3535064 BLAKE2B 33e5e9477556ac5f645cf13658ff1eebdaf046c1bbbcf5ac528c00f9b5f76943ede8140cc6a3b73dc27ed96c363208700031306f19478ba0e9e2fbae8319f500 SHA512 45f850ed4d409aaf11153da45398e7974d7b85235bf5d5043bc11755c3e4d1201f59ed854786162a7414f0521c818982560d4e226f93625b9253dc598793118a
 EBUILD glade-3.20.0.ebuild 2390 BLAKE2B 22cd5f2417192d963cbb2ff1376d9fa4b5eb44aba78f53c233dc5fd159fb93fa2c03096d71a35cd89321dd2d1f28092a503a4fd0f5cc8883da76854d9a470292 SHA512 98673ca19010e2a63c5c7c9c79dbfdb65939324004c7be6d8b846684411af444ef1fc499234296bfff24d5f8e03842781378d6099356af8b6dc236e757bdf047
+EBUILD glade-3.20.2.ebuild 2398 BLAKE2B e647eac6105adaaf6f8831b200e1f5095cedb7ec7129a8c1fefd7992c42747bc0f9f939d72f907838b5cf33ff7d3ce53a02bd305d2f67d62b380363794882045 SHA512 0743e8e2f3216d4f2c79d520ae58d8d521f59b60fa5093568c8714a8eb39e54e1533a2f106cd1e34baf5bc87eb53b1bec9dc7c5c0a18cb4d80e5b1e6bd4f0105
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/glade/glade-3.20.2.ebuild b/dev-util/glade/glade-3.20.2.ebuild
new file mode 100644
index 000000000000..2f8c73bbc2ca
--- /dev/null
+++ b/dev-util/glade/glade-3.20.2.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 python-single-r1 versionator virtualx
+
+DESCRIPTION="A user interface designer for GTK+ and GNOME"
+HOMEPAGE="https://glade.gnome.org/"
+
+LICENSE="GPL-2+ FDL-1.1+"
+SLOT="3.10/6" # subslot = suffix of libgladeui-2.so
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+
+IUSE="debug +introspection python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	dev-libs/atk[introspection?]
+	>=dev-libs/glib-2.32:2
+	>=dev-libs/libxml2-2.4.0:2
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:2[introspection?]
+	>=x11-libs/gtk+-3.20.0:3[introspection?]
+	x11-libs/pango[introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-python/pygobject-3.8:3[${PYTHON_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/yelp-tools
+	dev-libs/libxslt
+	>=dev-util/gtk-doc-am-1.13
+	>=dev-util/intltool-0.41.0
+	dev-util/itstool
+	virtual/pkgconfig
+
+	dev-libs/gobject-introspection-common
+	gnome-base/gnome-common
+"
+# eautoreconf requires:
+#	dev-libs/gobject-introspection-common
+#	gnome-base/gnome-common
+
+PATCHES=(
+	# To avoid file collison with other slots, rename help module.
+	# Prevent the UI from loading glade:3's gladeui devhelp documentation.
+	"${FILESDIR}"/${PN}-3.14.1-doc-version.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--enable-gladeui \
+		--enable-libtool-lock \
+		$(usex debug --enable-debug ' ') \
+		$(use_enable introspection) \
+		$(use_enable python)
+}
+
+src_test() {
+	virtx emake check
+}
+
+src_install() {
+	# modify Name in .desktop file to avoid confusion with other slots
+	sed -e 's:^\(Name.*=Glade\):\1 '$(get_version_component_range 1-2): \
+		-i data/glade.desktop || die "sed of data/glade.desktop failed"
+	# modify name in .devhelp2 file to avoid shadowing with glade:3 docs
+	sed -e 's:name="gladeui":name="gladeui-2":' \
+		-i doc/html/gladeui.devhelp2 || die "sed of gladeui.devhelp2 failed"
+	gnome2_src_install
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	if ! has_version dev-util/devhelp ; then
+		elog "You may want to install dev-util/devhelp for integration API"
+		elog "documentation support."
+	fi
+}
diff --git a/dev-util/tmake/Manifest b/dev-util/tmake/Manifest
index 4147c2a3ddb5..be8489dda2d2 100644
--- a/dev-util/tmake/Manifest
+++ b/dev-util/tmake/Manifest
@@ -1,4 +1,3 @@
 DIST tmake-2.12.tar.bz2 47558 BLAKE2B f5c4a590ec6077b12ffa6b37f00adc168d596466fa5ff30622e34b624eb931bef63af47b3c8eaa2d8c844b80d69cfc355adc4f0e965768e28efb31077515f0af SHA512 203a37aca7d391cf8bf7c27d9e5a9825472e9464f745d50b40343f71986ea5a48030372fa858ad5dade0807951f5c413145b9521ee1da416ff4952f8bb845ada
-EBUILD tmake-2.12-r1.ebuild 604 BLAKE2B fcaa07efb85a9bb287fa94de989984312aef781e39fb74a128050acf1dbec3a48a9d10fc16c5a7182cdd4e385765ca459da6ccb961d13d7597cf9886192307ee SHA512 ce72c71b8c7ee1c8bb555bd1b110918f74ab1271c515120233b795cc9e8b619e35e9a61dd12ef8732097086afc00ad9b1d3f2598482d4cf8de1edede255ed538
-EBUILD tmake-2.12.ebuild 606 BLAKE2B d37fed132b654060da9a629151099d3f0407889671192349cab9f61c6498db7e99fdcc20c9769e31122d362d9edd51e69836ba9f7b7ab504e0412ebc61336953 SHA512 fc23d5b01823ea2ca8b86eaae599a01f33edabb79c5d9831ba59bb1ab895eb7274353caf794a40ea234da7e850f7f5b715670b771671cd5d29ae699356b60090
+EBUILD tmake-2.12-r1.ebuild 603 BLAKE2B 43ca0d6c1e8d548d3f44ac8aa1551df477bc35dcc9f5fb7026a29ac89ae1c8009aa51489e279aaca80047fca1d87aff36f4c83e7e4ab19ba101a8c30557dce51 SHA512 58b7ac43992ef84d86592fe645474c60c4442a6fb1d96ae8c8a7a319967f3efcc193dfce5feebbab2f92f2d665fd749dd3e6ce2e148df19f86f44937ef9ba959
 MISC metadata.xml 242 BLAKE2B 5b51e51743b76e23cca3fa6f94f415455bb8f2cffff01037ad7a864d2006ffbe59af69a9bdae6de30050ec49bf966725f36b5e0409ecf7f2ac41981df67c4a87 SHA512 6212facd652d416cf5e57a8607563f29573595984ffd05f5d0ce068fa48d6ad9155cf9fea6308702cc9f6ee36e27d38dd35c13ba3b47a3500c5d6124880b0869
diff --git a/dev-util/tmake/tmake-2.12-r1.ebuild b/dev-util/tmake/tmake-2.12-r1.ebuild
index 3ba97bf561f6..48958d9544cd 100644
--- a/dev-util/tmake/tmake-2.12-r1.ebuild
+++ b/dev-util/tmake/tmake-2.12-r1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://tmake.sourceforge.net"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ppc x86 ~x86-linux ~ppc-macos"
 IUSE=""
 
 RDEPEND=">=dev-lang/perl-5"
diff --git a/dev-util/tmake/tmake-2.12.ebuild b/dev-util/tmake/tmake-2.12.ebuild
deleted file mode 100644
index 751d77e77003..000000000000
--- a/dev-util/tmake/tmake-2.12.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-
-DESCRIPTION="A Cross platform Makefile tool"
-SRC_URI="mirror://sourceforge/tmake/${P}.tar.bz2"
-HOMEPAGE="http://tmake.sourceforge.net"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86 ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND=">=dev-lang/perl-5"
-
-src_install () {
-	dobin bin/tmake bin/progen
-	dodir /usr/lib/tmake
-	cp -pPRf "${S}"/lib/* "${ED}"/usr/lib/tmake
-	dodoc README
-	dohtml -r doc/*
-	echo "TMAKEPATH=\"${EPREFIX}/usr/lib/tmake/linux-g++\"" > "${T}"/51tmake
-	doenvd "${T}"/51tmake
-}
diff --git a/dev-util/valkyrie/Manifest b/dev-util/valkyrie/Manifest
index 5af143ca8ed8..08faefd3de46 100644
--- a/dev-util/valkyrie/Manifest
+++ b/dev-util/valkyrie/Manifest
@@ -1,6 +1,5 @@
 AUX valkyrie-2.0.0-gcc47.patch 963 BLAKE2B f59186ccad8e4b568fad06bc63f735d87ac67e5ebf9cb2fd47cfc7080ff845c6dc85d72c997f6a00ed24ffbb20b78feb0bf2884e64197add2df9b6b5add8015c SHA512 fac2ad08f7726ce448568e6d6f705e85140d2e4846ff150e7b7a3b2a64bc328fd885e17d62c2a5fac70049bb946e3013471bde35cf2e76b0a55155fc50cf5362
 AUX valkyrie-2.0.0-prefix.patch 329 BLAKE2B 20baef5d99b4c4eaf892309914e55c65aeb100973a4e16625c620760b6d9d4ddc460474d1142a47024ef4532b536ab37b169c3db81910f5c80ab59778e590f7a SHA512 67e98f5251d5d4d7831fca702eef4e639e4909af790387d018af2511e9151d4be0e827035d3f1ac6eb61b1115216943a811b32ada3cb5b45573ae089d5571ca6
 DIST valkyrie-2.0.0.tar.bz2 260690 BLAKE2B 842761f7ad2dfd135e1407d3d13bf3ae81db7f9d2fd6c362c378a65d9476fc2d955be8be56e0701e4b8ccbcd7234236b0752799d8afc46e9c46536ffef925d46 SHA512 435abb17ecad114c3e492fa193e508bad7ca61884bd09bf1bf0b8398c63151d33e571fea927b84f05bc2b647183af441da1550161a6f766db9e9a15d00cfc888
-EBUILD valkyrie-2.0.0-r1.ebuild 529 BLAKE2B 023dbaad817c87834e3363f0661b7b50fb912aa30af7e049e959d3306befdd3a1c71b55d0d0ecbc354a0fbd9b7b0d82f94479385715edaeabfa8790012825bad SHA512 dd049b09d016d54134490e9c354a267a2ed041b7bfd03ef7b6789675ad6eee88f9ebdd4408812815eecca58a28b18b9b84b83e51f1724f80bb682ab08a398e03
-EBUILD valkyrie-2.0.0.ebuild 528 BLAKE2B 202d48ad4c6f76daf3bab3c2a10d1dd4430a8669aff86227b40a99b87337a671dc8b3c1df980559b7954e4f06bf3d23157a39ea8e56204282a7e59e145539e99 SHA512 f799284de3948fcd06736cf0cbc66d17d8923901ab49239d06317446ecb07fd9fadb225184dcb90b6647dc666f9ec44040e0c5a8d9b9341dcd38b13e15597ce3
+EBUILD valkyrie-2.0.0-r1.ebuild 528 BLAKE2B 70d999d96c0d90eb63df756281ca3b855b970f1a54f9a73f509ab08560eae00d1a91a41572319f2af04e36c00be880c39e5c14c908994ca936eb0629bedff889 SHA512 855533f7deebae542b955daeb82c41fbeca984486fcc59180536e9bae58e35a500468d13836803f9dc41a280d21bd3e386f2b3ab499e86a089ee67ef9440ab84
 MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
diff --git a/dev-util/valkyrie/valkyrie-2.0.0-r1.ebuild b/dev-util/valkyrie/valkyrie-2.0.0-r1.ebuild
index ad327d55dacd..76a94a36b00f 100644
--- a/dev-util/valkyrie/valkyrie-2.0.0-r1.ebuild
+++ b/dev-util/valkyrie/valkyrie-2.0.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.valgrind.org/downloads/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=">=dev-util/valgrind-3.6.0
diff --git a/dev-util/valkyrie/valkyrie-2.0.0.ebuild b/dev-util/valkyrie/valkyrie-2.0.0.ebuild
deleted file mode 100644
index 23baa9225410..000000000000
--- a/dev-util/valkyrie/valkyrie-2.0.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=3
-
-inherit qt4-r2
-
-DESCRIPTION="Graphical front-end to the Valgrind suite of tools"
-HOMEPAGE="http://www.valgrind.org/"
-SRC_URI="http://www.valgrind.org/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=">=dev-util/valgrind-3.6.0
-	dev-qt/qtgui:4
-	dev-qt/qtcore:4"
-RDEPEND="${DEPEND}"
-
-DOCS=( README )
-PATCHES=(
-	"${FILESDIR}"/${P}-prefix.patch
-	"${FILESDIR}"/${P}-gcc47.patch
-)
diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz
index 92703cb33293..b7d80b553a7b 100644
--- a/games-action/Manifest.gz
+++ b/games-action/Manifest.gz
diff --git a/games-action/descent1-data/Manifest b/games-action/descent1-data/Manifest
index c3e902134b9f..d43089b00c93 100644
--- a/games-action/descent1-data/Manifest
+++ b/games-action/descent1-data/Manifest
@@ -1,4 +1,4 @@
 DIST descent-game-content-10to14a-patch.zip 439853 BLAKE2B 75f90bbbf664237bbbfbe1aed3ff500c24b72b45beee1361b7823c6758c5dd5daf2693de8c4f3bc8deb77e915811237f28464628caf17c58478cfb111524354c SHA512 b71ec888509c77dc8ebc94d5a172a27ab0b16ddfdcb47ac243cefe33b87bbca82df843d9a4bffad8c6f345bfefd89e9e3564353922b00c81ef993e409950eb59
-DIST setup_descent_2.1.0.8.exe 25876928 SHA256 0d2d3e436e0011ec3eb888c8980bb8fd1c9258b0d4f9a0a7ad20a7a85c0d3046 SHA512 bab4269900b7ff0808d4495d5e01d2ebe987b5c37544e3651ff215fe8632b31ad4880ef3f968bd551b1462b9c5d1d392317f1ffec26c5314c76d8341800da876 WHIRLPOOL 1a3c09e59d36f9a2a02c7225846d76246e9612a2bc7e15559380a16cebac25453df0e084a82d9953978e1baf23715ee01f3a26a8def9c4add66e54dd821f6519
+DIST setup_descent_2.1.0.8.exe 25876928 BLAKE2B 84cb4fddde5308c4e88f7733f0706f2a2ed57b64396d4174d655290aa17886bb99cf8eabff5647ad8518aa76b3821afb3561bcd9a8475e3723bc802ec8fbe8a3 SHA512 bab4269900b7ff0808d4495d5e01d2ebe987b5c37544e3651ff215fe8632b31ad4880ef3f968bd551b1462b9c5d1d392317f1ffec26c5314c76d8341800da876
 EBUILD descent1-data-1.4a.ebuild 2697 BLAKE2B e72b5c240842c218975c5f7198e473bc8786c331e1055d00f92ba249974fbee46132ff6b415effc5e003958bac510a44c841719529eed8e12c4881183e6fb443 SHA512 dabc8465ad7a923601442ed42a30c32f9c55a9dbbfe890fbf62cca4324bc628ec2e9eb38c80075f7e6ed222cbffa1c57ae071853d3316105e1648f70a3db236e
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-action/descent2-data/Manifest b/games-action/descent2-data/Manifest
index b1485c4714e0..2e9dc6231c3a 100644
--- a/games-action/descent2-data/Manifest
+++ b/games-action/descent2-data/Manifest
@@ -1,5 +1,5 @@
 DIST d2xptch12.tgz 158419 BLAKE2B e4bd0d33fa8912b87f8018673c2f9fa9d965f96787b7af76da5473e0c6b06ca78303977cdb6e1f85affefe187b2f1e947eb477313b379bf2464e2a0ba95b74bf SHA512 14d59280e685a9c3d5e23e1d535f37f89768e022b795067793a994c5150685addfcacbd2dc52231804240d01d17d57b1db04335d41bc5930e3c8a845ebbb396b
-DIST setup_descent2_2.1.0.10.exe 554371624 SHA256 e787d95574f8a4bf3c442ad49e837186319d3bb041a33a00df726be3be7c9750 SHA512 0db1935864eb59002cc995dfe9c40badd72d0a3dcec61092b0760481cd3d1316db17631c05043b938e4b958d696c508ce379face9baa260dcc598c77b4460618 WHIRLPOOL 1f13b652c79752772cf2a151ca7663443e8936be352ddb100e140b00bc6f88a13ba5d4dfad17cb07ed78ed5b629fad1aaeeb7424a2216b68761c4065b6f8ac3c
+DIST setup_descent2_2.1.0.10.exe 554371624 BLAKE2B fb05302652c7ba46c06d314453a03430850404c05fb8d43681b7505bdf1a3901d0875f0a63379b121c7338d9b3092410cfa77c5d98690c98b27b0bffaf00ae3d SHA512 0db1935864eb59002cc995dfe9c40badd72d0a3dcec61092b0760481cd3d1316db17631c05043b938e4b958d696c508ce379face9baa260dcc598c77b4460618
 EBUILD descent2-data-1.0.ebuild 2106 BLAKE2B d46ec60d5fe0a9e82d4656a091d4c955df09f7c067acbb64b177b137e41f71b89fffea619f3fda2af38a567f6292f97cf65c5d9dabaf83d2ba95e5fcdf29eab6 SHA512 9b6356245f8945f1e564c61b32fbf6fa9c7f610846d271f53567920aac9edbe41a0a9a802e8d35a5a03269e87d83bce86b5b4a52c94e0dd00cdfb6a5b2890d5f
 EBUILD descent2-data-1.2.ebuild 2892 BLAKE2B b101311a0d5d880f068c90cb3cd70d2277bce1ef351c94a598c4247ccd2062cb4dad4d67a32c0f9c3d398891c6c5c517ce2baad61140c6dbd7e7f66f61221fd6 SHA512 81a9717dd2ace1af3852a2324bfbfe5226642fba07d9ce14906cb278d80385f6be77b73b58a9907364acfc45b2d38b70cc9a57fd0aa77f39cfed90edcf30ae26
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index 5a78bf9877e0..89f9d97fd64b 100644
--- a/games-arcade/Manifest.gz
+++ b/games-arcade/Manifest.gz
diff --git a/games-arcade/aquaria/Manifest b/games-arcade/aquaria/Manifest
index 932b2f86c8b9..c34fa6805a20 100644
--- a/games-arcade/aquaria/Manifest
+++ b/games-arcade/aquaria/Manifest
@@ -1,3 +1,3 @@
-DIST aquaria-lnx-humble-bundle.mojo.run 209499691 SHA256 1001a5bbc66cd72e64963afbb3f866432ca1b6e880d9da969ebd5fd224202fdd SHA512 4ae491ade644df73f676c7bd7c36aa79140aa7c4a312ecd613ba1c900506123ae37c644200433c0045713bb8f3f88e90e58be64d2fea6eee4e7015cd3e157738 WHIRLPOOL 65e117bfe824c0424a1a4de0662b50234fe21ff566a0d2e7ad9257637bdde44927495203a51b7c70cc8b7090334f65d398afd3743bb8a62fa85babb5b3e1d637
+DIST aquaria-lnx-humble-bundle.mojo.run 209499691 BLAKE2B e592e451f192136b419281b2e55244d9baaae39bf462cd30a1bc4ad26a5ca825634309423ef3e51ae18f35023169417b1d7d78a19a3f4abf9415072d947586dd SHA512 4ae491ade644df73f676c7bd7c36aa79140aa7c4a312ecd613ba1c900506123ae37c644200433c0045713bb8f3f88e90e58be64d2fea6eee4e7015cd3e157738
 EBUILD aquaria-1.1.3-r1.ebuild 1089 BLAKE2B 80cdf759fb8652fe6b9e1fbb6f8b4465f8662495bcbd990583a81d0ddda20b2cee87ded4ef866528cc44d5329bdee8529bd0f67ec3dc3d87217a8ca4c3f87061 SHA512 7013cb6feb1fb6c38c419fdb1af8cae57d9f33a726a7626f25c5e2bf44963c4a29b0f7ac980d5ee934ccfcab8dfacf6c687d14951e34362f35e7c827a2edde1b
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index 5b858f863f45..83e874694ca8 100644
--- a/games-fps/Manifest.gz
+++ b/games-fps/Manifest.gz
diff --git a/games-fps/duke3d-data/Manifest b/games-fps/duke3d-data/Manifest
index 098c0febb369..dba8847e6603 100644
--- a/games-fps/duke3d-data/Manifest
+++ b/games-fps/duke3d-data/Manifest
@@ -1,3 +1,3 @@
-DIST gog_duke_nukem_3d_atomic_edition_2.0.0.8.sh 31823668 SHA256 7c70e60c621a13bdc2cd34048022df638ad478cae646f338021f7deea411f63b SHA512 9c74299ac2db58aed4eb50367e15124bea6073cdba6ba5f403032a292d141ba734943af4c15e776cc0a4087a6f92c85d2413a1a525660b75aa0da457b2fac378 WHIRLPOOL dde14e901711b17c87d5edc92587ef4c999c1ffdcf9c67f5527c92b65cd1d23774149dee12c7e9055a476d0b266acbb23519602e32a80a99f47dc3f9d751b44d
+DIST gog_duke_nukem_3d_atomic_edition_2.0.0.8.sh 31823668 BLAKE2B a08dc85615129a5527abd2fcbb94e5e9ce4c188d41bed1fd600a45847e54f5d3480c234bf712f77433858206193e60fd63dd3997a340770b564ab22d46b73990 SHA512 9c74299ac2db58aed4eb50367e15124bea6073cdba6ba5f403032a292d141ba734943af4c15e776cc0a4087a6f92c85d2413a1a525660b75aa0da457b2fac378
 EBUILD duke3d-data-1.0-r3.ebuild 1819 BLAKE2B 90e19787d5c70744abb73041e86a4fffb024b4faced761d092d7e3d91957e664bf246d786d001cdc840aa381822caae92d9b78974029341917af4d932d022ecc SHA512 47bc8097c39e47ad09c7f841e363a8b7ec8be5e08b9fb6725115bebf8586b5e6aa1781138b8498b40181fa9a6e7b08058976367ddc707cfd8b08a65d3efabefb
 MISC metadata.xml 339 BLAKE2B afb442a147713d5f9000bb54afb2b62841086063b530f74a1da843ed7d08c3ffa995d98964f5e59b344c54eea7ea27ccc3eb563ea94e31452b352c80dc3848d3 SHA512 f5cfb8b76fafaea5c08660ecb9ed1a3d25efc85898b37a249c945547c4c4fc40335ec19711025955e12f6e3922f418f81e42c5dcc9a7f8ad82d3cc9dabbe50ef
diff --git a/games-fps/openarena/Manifest b/games-fps/openarena/Manifest
index 602757c0e49e..f3204a2a0964 100644
--- a/games-fps/openarena/Manifest
+++ b/games-fps/openarena/Manifest
@@ -2,5 +2,5 @@ AUX openarena-0.8.8-makefile.patch 763 BLAKE2B 0e671cf5be41b48670954fa133d11806b
 AUX openarena-0.8.8-unbundling.patch 3054 BLAKE2B f1f90e3d61d77ec2d36fcc9ce55a53d456084b9862687b49037fceefca7758784e886bf66a689fba7a202a3ead60823311c9f31da804509dc3b60e4b12869964 SHA512 85a7300e78f741d0bcb4c949e17ffac13790bbdf0942fc739fa357ac5cec7a27c67393bb42342981a78fbb12141e3a9e1ffead352db6073bdf63b4135f4dbb43
 DIST openarena-0.8.8.zip 425189255 BLAKE2B f8a8d20cee344a615907e85b8487b8211246888b63d001b5f0fe1b676a699d9268cdf15d7c749837e5789ef254e959f289d9026a1ea3924f50b291a4c7224f28 SHA512 9fa4dabe8a3428dc3cbec97f3b4d20c04569c14cdd00b60e6391c6dd61e310f246ff5ec97e7549821b3d6f5f94b140eb5411a2ddd83dafcad66937b7f78ea8dd
 DIST openarena-engine-source-0.8.8.tar.bz2 3777830 BLAKE2B c20e2ad37aeb3467e2ebd90eab599c4e25a2dc834df81286b01bde9c7081b1b954e3524e5c4110bddcbda5593a40e595aa0a1eae8f20b98a06b4410fcb93f4c8 SHA512 d4ba3655fae500cf5b7475c83d39c81b6abc759da15cfb4ea9e1dc0f47ffb11c1bbbc2b6f85d613ab1d729978eda93d4d7677c9a45a33853e363c820d8b81c43
-EBUILD openarena-0.8.8.ebuild 1780 BLAKE2B 5207475981d293ff02895bd317174c6c177675374d036edc398be1d1965fdf19eaeac1aaf962330e69c8bc1a0d36602fc8e00ab09c94e5251086da58fa242de1 SHA512 18f2830e7e7f0f53ce5afb51189fbec3baf686cf876617d318de3e66d993dd041f80ceb2b5a060567814c4011b32ed9585e6538e5b363be4f21dc5b1dd917313
+EBUILD openarena-0.8.8.ebuild 1803 BLAKE2B 83820d6aa6c6965cc9d384559febe17901b218cf39d5eb6f649c7df13f5f0fd7f5007156ea176e997b38a4a027c8741d91c553f9548fa96fcb20ac7b3c6e0486 SHA512 bd45e7eb583a40fd32bf98b56bb5fded460daa14d90e59ab3ead83b019ea3f3295c915dbfef8bbb57b2f9c3570402e766f1b90b3bd20571e1ab4885265019f74
 MISC metadata.xml 329 BLAKE2B e35a14a26bbcd2aa34d851acbc510d5e4ba3fa9ee9dc9ecc1c75995c6b8d3f0aea569f55c402295f1835e71d2d8609c226ccd20f9c4f5819c071c54e7d19e08b SHA512 40e88c8cec824e6c3d815516c018292ec64e5b968ede35a4c3c235331cfb32370ceffa954f01ceedffbf64e182f4e6c753a5fe45ce2ed627b6383dfc6b0d39f7
diff --git a/games-fps/openarena/openarena-0.8.8.ebuild b/games-fps/openarena/openarena-0.8.8.ebuild
index f35c2fbe563e..63ae43948870 100644
--- a/games-fps/openarena/openarena-0.8.8.ebuild
+++ b/games-fps/openarena/openarena-0.8.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,10 +14,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+curl +openal +vorbis"
 
-RDEPEND="virtual/opengl
+RDEPEND="
 	media-libs/libsdl[joystick,opengl,video]
 	media-libs/speex
+	media-libs/speexdsp
 	virtual/jpeg:0
+	virtual/opengl
 	x11-libs/libXext
 	x11-libs/libX11
 	x11-libs/libXau
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index 1e51ba4dee8b..6dc5ed20c8c8 100644
--- a/gnome-base/Manifest.gz
+++ b/gnome-base/Manifest.gz
diff --git a/gnome-base/dconf-editor/Manifest b/gnome-base/dconf-editor/Manifest
index 3af7a7ba94d1..bb4fa258c899 100644
--- a/gnome-base/dconf-editor/Manifest
+++ b/gnome-base/dconf-editor/Manifest
@@ -1,3 +1,5 @@
 DIST dconf-editor-3.22.3.tar.xz 394760 BLAKE2B 9270d75f64bb0426de2667f7f40d6ec862c3486cc25df7f5103fc3ca4ab6692aaa41b18434a77c7dcb26b0cff4d65f73a0ebb15b07aa48e7e3eb21924a8cf8c6 SHA512 0e1ddce6e970ea23329c6233ed87e6d4541b6f1e991e3159bda44c43b8092a4d983acbca18bbedb88304ac1afb541a15073a261dab9ffe94c94cfd06e3e412dc
+DIST dconf-editor-3.24.3.tar.xz 503520 BLAKE2B 57b0b0de36e2bb5cef33e0171e77f506f16f240d5ab4ab79d7689b7541ce445bce4d87753f312cf9353b2aa44d5cb2f7c734050a5f57ba2b7eae9894fb74d0e3 SHA512 10c98df210cd465e21601342963a19cd5a255abfaa6e96c833070db52d13531288237a129471bf9424d7ea8fef4c2cd4954652850bbb57dd161ce9cf99265361
 EBUILD dconf-editor-3.22.3.ebuild 737 BLAKE2B 08a39097a3b99a70c08f8ab13ab956d3b482d7c513256e31feb003f10f1869864dd65d86a7235fa00616cc054275287b93c2ccf4368bbb4a60619aa7bc25b767 SHA512 98c32c0c2d72a9ee208bccb0c8ed6b0896b2a84d0931d4fd4819271892b74332c98ff0e62bacdc62bfbe32d87bd028f767a1699818ec4828489af7315fb83d54
+EBUILD dconf-editor-3.24.3.ebuild 722 BLAKE2B dd68399ac20f0e4bd211ef33e22240baeac9caee9d6743589b240b5018bcbc937c2ac214d6451b031b555d03041d28a2b6c66260c1e3d2dbd4085c1578b02e64 SHA512 6d50a603c86dec977a851b57fe6f1954d3abe3fefb2c40dcfdfcdf830384784635561545d79caab36ae1b3f71f6b52cca6e974253e3d570977450bf1f14deb01
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/dconf-editor/dconf-editor-3.24.3.ebuild b/gnome-base/dconf-editor/dconf-editor-3.24.3.ebuild
new file mode 100644
index 000000000000..3e2a46395979
--- /dev/null
+++ b/gnome-base/dconf-editor/dconf-editor-3.24.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2
+
+DESCRIPTION="Graphical tool for editing the dconf configuration database"
+HOMEPAGE="https://git.gnome.org/browse/dconf-editor"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~arm-linux ~x86-linux"
+
+COMMON_DEPEND="
+	dev-libs/appstream-glib
+	>=dev-libs/glib-2.46.0:2
+	>=gnome-base/dconf-0.25.1
+	>=x11-libs/gtk+-3.22.0:3
+"
+DEPEND="${COMMON_DEPEND}
+	>=sys-devel/gettext-0.19.7
+	virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+	!<gnome-base/dconf-0.22[X]
+"
+
+src_configure() {
+	gnome2_src_configure \
+		VALAC="$(type -P true)"
+}
diff --git a/gnome-base/libgnome-keyring/Manifest b/gnome-base/libgnome-keyring/Manifest
index 73dd5bb885b6..ea87bf8d9f0d 100644
--- a/gnome-base/libgnome-keyring/Manifest
+++ b/gnome-base/libgnome-keyring/Manifest
@@ -1,4 +1,3 @@
 DIST libgnome-keyring-3.12.0.tar.xz 435092 BLAKE2B 16e02ce3509b98e325658fc64e5731a872a050a9bf1b39dc81347a53aaee2fd4726ab9b0a41c7451249954a01144488e720f8356e77dda5bc9da5f78416d30e1 SHA512 dd1777b6e0dd774feb86dbc72d9f2a85f2143e2772a09c438b84aec468ddc5e7ee5ebd534d24f079e5daf4757f2918d0621e26fb671fde0fcef9c74d30f8b9bd
 EBUILD libgnome-keyring-3.12.0-r1.ebuild 1732 BLAKE2B f8f7149c43b0406f53d380e4a28e155375ce3d51086ea6220709f8606b2c30955168d7af32217ee7436dfbea91cca52b193625f67488c965e1c9932ddfd04651 SHA512 5ca4a6468c96da508a4d28bc12d9bbb11b7647f943e4b39dca6c433bcb8848f354297f7cc1c2968f36fdefa78355e7ba386670b46f102ad9c3eef47344f14bdf
-EBUILD libgnome-keyring-3.12.0.ebuild 1414 BLAKE2B e48fd254eddcc10b69a2930e791392c1a0aa210a4d667ea245358954d67c4f904bd4331bada0396c1c47da239703a0754c3df48fdf4f74d91ca05ed54aee97e3 SHA512 a8040b8b5358dbe9861c8c515ae0bedb4ba5b93a5d15a77526f988ab856c2548e409e0b8b8b3daf34444bea0dfc7f7ee1db5075a44d8da19a77f6882c915c412
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0.ebuild b/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0.ebuild
deleted file mode 100644
index 29881bdad1ba..000000000000
--- a/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-VALA_MIN_API_VERSION="0.16"
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 python-any-r1 vala
-
-DESCRIPTION="Compatibility library for accessing secrets"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeKeyring"
-
-LICENSE="LGPL-2+ GPL-2+" # tests are GPL-2
-SLOT="0"
-IUSE="debug +introspection test vala"
-REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris"
-
-RDEPEND="
-	>=dev-libs/glib-2.16.0:2
-	>=dev-libs/libgcrypt-1.2.2:0=
-	>=sys-apps/dbus-1
-	>=gnome-base/gnome-keyring-3.1.92
-	introspection? ( >=dev-libs/gobject-introspection-1.30.0 )
-"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( ${PYTHON_DEPS} )
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-
-	# FIXME: Remove silly CFLAGS, report upstream
-	sed -e 's:CFLAGS="$CFLAGS -g:CFLAGS="$CFLAGS:' \
-		-e 's:CFLAGS="$CFLAGS -O0:CFLAGS="$CFLAGS:' \
-		-i configure.ac configure || die "sed failed"
-}
-
-src_configure() {
-	gnome2_src_configure $(use_enable vala)
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	dbus-launch emake check || die "tests failed"
-}
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 1c148250c160..e4f8c2b2753a 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/gucharmap/Manifest b/gnome-extra/gucharmap/Manifest
index e381758c7702..e96d3250d23b 100644
--- a/gnome-extra/gucharmap/Manifest
+++ b/gnome-extra/gucharmap/Manifest
@@ -1,9 +1,11 @@
 AUX gucharmap-3.4.1.1-fix-doc.patch 348 BLAKE2B c6bf73a5e9940557fa43da04b8212ca527b9abdfaccf7f1522c9a6dfcb52af8f6c05a56a683621eb64c34452464605d7a5a98b77ab9b67224f5c84acc0b1cf68 SHA512 d6e468ce2bbd258e01be0125a1b16529c89ce9758c24504d91550181af3b3e7c6b0e4171d3b26c252339f099927d43a7184f967764d564a4ebf28610968d8d27
 DIST gucharmap-10.0.0.tar.xz 1034780 BLAKE2B 9ebcff1f182de52aa12c40de93c80d2942316fb718330872932034cd9bee66e41a667bd70e6d632e17accda66413b18bdf9addf6a892510d5798ad21fa8908de SHA512 e097e54cfd4e6a8fd47992d163128bc8e87c0c6aa81718f900d7367fa6d88a528815c7bb87bfcaddd145aaa8b1c8068fdf6da6fe2a1c90381ff555b43712f33a
+DIST gucharmap-10.0.3.tar.xz 1713960 BLAKE2B 0a0412c7a4d46c25112d9bb33d64e82b448e981a2ecb9a5ed5ce5e96657e5264e14262b15c4e5af6b3d023c20193a7471071c5d346f0d48e22583b07e92d51f7 SHA512 0815ca39311db4dc3ff5202f1303cad72bc204f4eef4d2ec83465123ff856eeb552a583666419ad4a3bf9d3ddcf294883fc8e24e32c30814916b41bc14a108fe
 DIST gucharmap-3.0.1.tar.bz2 3275481 BLAKE2B 80dde7791abdc72677add9c65c59f810e6c6952116b92db34059c4c40d2657246b17844c105e68f32c86294e9b4e71e9d48e6f0522855465734d7c24e8d17608 SHA512 4d8a2276b5cb1a0b0fadca2a8522755c5884985a12d5b19341b9cefcd7f749ec1286c0271419e38ec84be7edcfa1293e7f0263eb682c75387d692792de3e1fb1
 DIST gucharmap-9.0.2.tar.xz 1023120 BLAKE2B f0ea1b2e866abea180c062ea2559f6f26b80d38c66aac838ee2e6371ea4a09a14842a51e2e4e7d9ffb0e0bf052a7c6f21e92843c8f36eb6edc52a73063bef0f3 SHA512 33fa2989e263ba30bc430b8181009dd5d491dd2b453f6047369dc49dafb4f58be67dd9f1320b7005325236519a794eb4564fbd39a1d976133001f4f983ae1370
 DIST gucharmap-9.0.4.tar.xz 1029684 BLAKE2B f2af9c422abceb98783b6ea6a29241383cc6220410cd45a4c1fc04ce57fc51bc629fc4560d5ad852b19f1b85fc0276e68b423b2f6579e8f973794b2528b9cb7c SHA512 2d2ce94796cb40bcaf14930624ddd788af1c49d464be1fc5d4ab8112df14054ce1324c86eaf028921266494f9fbb41d29a7b40db810fb15280d470fd26be6df2
 EBUILD gucharmap-10.0.0.ebuild 1657 BLAKE2B ec474434445f2186a5a8d04e8a6678d38a1b696cc070723d5e98c40ed74e25918ef0bbc86e4ac074c8a9c79f8e256c4eaeed87aad783d25830f2600993bab3c5 SHA512 21f017c0ed58fa0f39fa4a575aae66f93438a933bc3ef83e92f4153e4472dbd41758e82572976181dd68d006abd282da0ab70082a84a570660174c04505f201c
+EBUILD gucharmap-10.0.3.ebuild 1657 BLAKE2B ec474434445f2186a5a8d04e8a6678d38a1b696cc070723d5e98c40ed74e25918ef0bbc86e4ac074c8a9c79f8e256c4eaeed87aad783d25830f2600993bab3c5 SHA512 21f017c0ed58fa0f39fa4a575aae66f93438a933bc3ef83e92f4153e4472dbd41758e82572976181dd68d006abd282da0ab70082a84a570660174c04505f201c
 EBUILD gucharmap-3.0.1-r200.ebuild 1470 BLAKE2B 9f817d96745a0fbf907aec0b13d6be14a99c815af50846ae6ccbd4a84d826d7ff8635ff893a69a9e0be4f9d199977264eb34cf60c8f75b817f4f2d3df73fc6ad SHA512 254fec449e286c8df0f273f5cde96d1571baebc0384a8e5ac69e17808ce14f7a49fdabd44b0d5f584c7935a33c7eb395c34db2df315d4ba9ae155471499bda65
 EBUILD gucharmap-9.0.2.ebuild 1649 BLAKE2B 46f9ec6ad8452f2e850cc21a6bee29275e0c27c7ede9535a563a292a72ced0791492c003e81c8019b11513b6c8a52dc38705599c7c136398cebd38f05d66bf10 SHA512 493545976a8d527349a4318b7aa18e84da54c1e7c49fecdd28640e1c9555ce0877051bf1a3c108c9806c6f6837fdd452d548f80cb33b82a02380aebf58e410fe
 EBUILD gucharmap-9.0.4.ebuild 1652 BLAKE2B e4aec8bf19549e555279cda8fcd4b696143d374afb8242af68ae13f1cab5e93db7f6914f1b6bcf5971920c7133c1493f3d6627bced6c8d6c77195c57b8706c7b SHA512 63aab9e62f8aaafbad65c0da024827ff0035c3eabf85b34672d9a3e57be73a3b71c1ad15c156eb3801a49d0e1d101dab3dcabc1ce7b0756f9b7a7e64d062a3b0
diff --git a/gnome-extra/gucharmap/gucharmap-10.0.3.ebuild b/gnome-extra/gucharmap/gucharmap-10.0.3.ebuild
new file mode 100644
index 000000000000..b701e7d0a464
--- /dev/null
+++ b/gnome-extra/gucharmap/gucharmap-10.0.3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 vala versionator
+
+DESCRIPTION="Unicode character map viewer and library"
+HOMEPAGE="https://wiki.gnome.org/Apps/Gucharmap"
+
+LICENSE="GPL-3"
+SLOT="2.90"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+
+IUSE="debug +introspection test vala"
+REQUIRED_USE="vala? ( introspection )"
+
+UNICODE_VERSION=$(get_version_component_range 1-2)
+
+COMMON_DEPEND="
+	=app-i18n/unicode-data-${UNICODE_VERSION}*
+	>=dev-libs/glib-2.32:2
+	>=x11-libs/pango-1.2.1[introspection?]
+	>=x11-libs/gtk+-3.16:3[introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	!<gnome-extra/gucharmap-3:0
+"
+DEPEND="${RDEPEND}
+	app-text/yelp-tools
+	dev-util/desktop-file-utils
+	>=dev-util/gtk-doc-am-1
+	>=dev-util/intltool-0.40
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? (	app-text/docbook-xml-dtd:4.1.2 )
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	# prevent file collisions with slot 0
+	sed -e "s:GETTEXT_PACKAGE=gucharmap$:GETTEXT_PACKAGE=gucharmap-${SLOT}:" \
+		-i configure.ac configure || die "sed configure.ac configure failed"
+
+	# avoid autoreconf
+	sed -e 's/-Wall //g' -i configure || die "sed failed"
+
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# unihan is not really conditional
+	# https://bugzilla.gnome.org/show_bug.cgi?id=768210#c5
+	gnome2_src_configure \
+		--disable-static \
+		--with-unicode-data=/usr/share/unicode-data \
+		$(usex debug --enable-debug=yes ' ') \
+		$(use_enable introspection) \
+		$(use_enable vala)
+}
diff --git a/gnustep-apps/Manifest.gz b/gnustep-apps/Manifest.gz
index 49344a3bd708..ed9482c7549f 100644
--- a/gnustep-apps/Manifest.gz
+++ b/gnustep-apps/Manifest.gz
diff --git a/gnustep-apps/textedit/Manifest b/gnustep-apps/textedit/Manifest
index dd2ed2e4311d..cfc85c585580 100644
--- a/gnustep-apps/textedit/Manifest
+++ b/gnustep-apps/textedit/Manifest
@@ -1,6 +1,5 @@
 AUX textedit-0.95_pre20100427-gcc47.patch 1138 BLAKE2B c1d070e651a162a95f538bcd5ce67068d0c95e12f984c33f7e18dd2c1bda3eb514748930cf88fa20214680eecbdccce5261b0a3451433ef76771fe22241c73bc SHA512 d270ae159399c6a3c3bf8dc815aaf0cbc294151944ff08fe8691093fc8fa26332ec75a86afece97c3b73abb68660cc0e5fbe7ef1145b0a155aeda347c6c3c13e
 AUX textedit-0.95_pre20100427-nsinvalidargument.patch 706 BLAKE2B 3946e4e16f6de2312e779a9f0e16502d5a98d4581cf82e929212af171932ca1280311d837bda2cb5ae97e979211f66a9199f5aa063ad1078ab6f62bfeba2be2b SHA512 251418c683a8b29f47ddd8c67d59573673931576de6455b1365003f51f9c7a3ff53b4e3041e78fe0ed8eeaec62dd730a3c4da13cf30de9b0fea64423fc943f18
 DIST textedit-0.95_pre20100427.tar.gz 131332 BLAKE2B 443c54e243ca23bc1805778e912847f02bd118a9859a61f0c959a4cdeeba91f77daeb53f45f2de4d83defa421d11f3f5ae0c15585ee6ffbbe8dbb108f9a1b6e1 SHA512 df46ce1d0eb61ee776a0c4318f743f365d4d632ec0bbf9d04d1e6afbd35456f4a396fcafcac70e924475ccb2bb8dbbbf7dea18a68014f9634212c2803db59596
-EBUILD textedit-0.95_pre20100427-r1.ebuild 496 BLAKE2B 5b88c02d6bcbea5379a0990ed8db39a708be63682c10fee59b9e186c1ffa66690dd8dc8d402bac709104020d4cfa81ad96a4406d3fe60b9ee6708b097650ccc8 SHA512 34e3f30e1c9cce2a51c915dc9a171105e5c228f6d4f1eaab5541781d42ca35d88144727b2d0e4fa89857bdb6710a133b2fb14d59424e8c2935d1fe0d19c6da84
-EBUILD textedit-0.95_pre20100427.ebuild 444 BLAKE2B 35177e055cf365f2315c2e32f482b2f5873d8f427f80723774c2bee6ab1cf7037dfe3c75b43b83f87c3440d2df0d73c4d806c11545587080fb938277b14a1cd3 SHA512 115e2232d97f94d97360a2cefba631f82b095c43dab7eafa615abd3038ea9a22cfa60881e45e8c8f02b3394700f3b5a145e45421af1716065d9c3b19ea567849
+EBUILD textedit-0.95_pre20100427-r1.ebuild 495 BLAKE2B 6bd0e12deaba0fcb5619ea00bd3600ff4a6ed5d0461c246188fbf6bffe11cc5dd16fd94690af10d00f6342fe6aae9dee163fdb6ee291414347f79495b09914c2 SHA512 b8ba3064d37b692d45ec276de39de9252359df9a3d9a6ca006e5afb33aaa0d94a554f270bbb0fd6ae4eba5eb57c18eb02f71c4ffc80a7db9c1094f3516b31fef
 MISC metadata.xml 394 BLAKE2B b7f81fb353d28af53c512d9382e041958efbfcd5f14d68b091f5b5a2f0cb7d36d26c4080dbeff5ef5138061143f06df62b016c97fccad12332ad1b4bb78f2240 SHA512 3ec6a6a517708d591b37510f55b26e22d42e31b42b24b8221a6834158dfa59ec42916c93ccf72a2043454bcb23235b322fc5419213f7122d6a2a7a96665e063e
diff --git a/gnustep-apps/textedit/textedit-0.95_pre20100427-r1.ebuild b/gnustep-apps/textedit/textedit-0.95_pre20100427-r1.ebuild
index c6e42e5aa470..c1ded6382b92 100644
--- a/gnustep-apps/textedit/textedit-0.95_pre20100427-r1.ebuild
+++ b/gnustep-apps/textedit/textedit-0.95_pre20100427-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ DESCRIPTION="A text editor with font, color, and style capabilities for GNUstep"
 HOMEPAGE="http://www.nongnu.org/backbone/"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
 
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
diff --git a/gnustep-apps/textedit/textedit-0.95_pre20100427.ebuild b/gnustep-apps/textedit/textedit-0.95_pre20100427.ebuild
deleted file mode 100644
index 7da8c47165a3..000000000000
--- a/gnustep-apps/textedit/textedit-0.95_pre20100427.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=3
-inherit eutils gnustep-2
-
-S=${WORKDIR}/TextEdit
-
-DESCRIPTION="A text editor with font, color, and style capabilities for GNUstep"
-HOMEPAGE="http://www.nongnu.org/backbone/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-KEYWORDS="amd64 ~ppc x86"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc47.patch
-}
diff --git a/licenses/MSjdbcEULA40 b/licenses/MSjdbcEULA40
deleted file mode 100644
index a389675d3bdc..000000000000
--- a/licenses/MSjdbcEULA40
+++ /dev/null
@@ -1,136 +0,0 @@
-MICROSOFT SOFTWARE LICENSE TERMS
-
-MICROSOFT JDBC DRIVER 4.0 FOR SQL SERVER
-
-These license terms are an agreement between Microsoft Corporation
-(or based on where you live, one of its affiliates) and you. Please
-read them. They apply to the software named above, which includes the
-media on which you received it, if any. The terms also apply to any
-Microsoft
-• updates,
-• supplements,
-• Internet-based services, and
-• support services
-for this software, unless other terms accompany those items. If so,
-those terms apply.
-BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS. IF YOU DO NOT ACCEPT
-THEM, DO NOT USE THE SOFTWARE.
-If you comply with these license terms, you have the rights below.
-
-1. INSTALLATION AND USE RIGHTS. You may install and use any number of
-copies of the software on your devices to design, develop and test
-your programs.
-
-2. SCOPE OF LICENSE. The software is licensed, not sold. This
-agreement only gives you some rights to use the software. Microsoft
-reserves all other rights. Unless applicable law gives you more rights
-despite this limitation, you may use the software only as expressly
-permitted in this agreement. In doing so, you must comply with any
-technical limitations in the software that only allow you to use it in
-certain ways. You may not
-• disclose the results of any benchmark tests of the software to any
-third party without Microsoft’s prior written approval;
-• work around any technical limitations in the software;
-• reverse engineer, decompile or disassemble the software, except and
-only to the extent that applicable law expressly permits, despite this
-limitation;
-• make more copies of the software than specified in this agreement or
-allowed by applicable law, despite this limitation;
-• publish the software for others to copy;
-• rent, lease or lend the software;
-• transfer the software or this agreement to any third party; or
-• use the software for commercial software hosting services.
-
-3. BACKUP COPY. You may make one backup copy of the software. You may
-use it only to reinstall the software.
-
-4. DOCUMENTATION. Any person that has valid access to your computer or
-internal network may copy and use the documentation for your internal,
-reference purposes.
-
-5. EXPORT RESTRICTIONS. The software is subject to United States
-export laws and regulations. You must comply with all domestic and
-international export laws and regulations that apply to the software.
-These laws include restrictions on destinations, end users and end
-use. For additional information, see www.microsoft.com/exporting.
-
-6. SUPPORT SERVICES. Because this software is “as is,” we may not
-provide support services for it.
-
-7. ENTIRE AGREEMENT. This agreement, and the terms for supplements,
-updates, Internet-based services and support services that you use,
-are the entire agreement for the software and support services.
-
-8. APPLICABLE LAW.
-a. United States. If you acquired the software in the United States,
-Washington state law governs the interpretation of this agreement and
-applies to claims for breach of it, regardless of conflict of laws
-principles. The laws of the state where you live govern all other
-claims, including claims under state consumer protection laws, unfair
-competition laws, and in tort.
-b. Outside the United States. If you acquired the software in any
-other country, the laws of that country apply.
-
-9. LEGAL EFFECT. This agreement describes certain legal rights. You
-may have other rights under the laws of your country. You may also
-have rights with respect to the party from whom you acquired the
-software. This agreement does not change your rights under the laws of
-your country if the laws of your country do not permit it to do so.
-
-10. DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED “AS-IS.” YOU BEAR
-THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES,
-GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS
-UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE
-EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED
-WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NON-INFRINGEMENT.
-
-11. LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN
-RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO
-U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING
-CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.
-This limitation applies to
-• anything related to the software, services, content (including code)
-on third party Internet sites, or third party programs; and
-• claims for breach of contract, breach of warranty, guarantee or
-condition, strict liability, negligence, or other tort to the extent
-permitted by applicable law.
-It also applies even if Microsoft knew or should have known about the
-possibility of the damages. The above limitation or exclusion may not
-apply to you because your country may not allow the exclusion or
-limitation of incidental, consequential or other damages.
-Please note: As this software is distributed in Quebec, Canada, some
-of the clauses in this agreement are provided below in French.
-Remarque : Ce logiciel étant distribué au Québec, Canada, certaines
-des clauses dans ce contrat sont fournies ci-dessous en français.
-EXONÉRATION DE GARANTIE. Le logiciel visé par une licence est offert
-« tel quel ». Toute utilisation de ce logiciel est à votre seule
-risque et péril. Microsoft n’accorde aucune autre garantie expresse.
-Vous pouvez bénéficier de droits additionnels en vertu du droit local
-sur la protection des consommateurs, que ce contrat ne peut modifier.
-La ou elles sont permises par le droit locale, les garanties
-implicites de qualité marchande, d’adéquation à un usage particulier
-et d’absence de contrefaçon sont exclues.
-LIMITATION DES DOMMAGES-INTÉRÊTS ET EXCLUSION DE RESPONSABILITÉ POUR
-LES DOMMAGES. Vous pouvez obtenir de Microsoft et de ses fournisseurs
-une indemnisation en cas de dommages directs uniquement à hauteur de
-5,00 $ US. Vous ne pouvez prétendre à aucune indemnisation pour les
-autres dommages, y compris les dommages spéciaux, indirects ou
-accessoires et pertes de bénéfices.
-Cette limitation concerne :
-• tout ce qui est relié au logiciel, aux services ou au contenu
-(y compris le code) figurant sur des sites Internet tiers ou dans des
-programmes tiers ; et
-• les réclamations au titre de violation de contrat ou de garantie, ou
-au titre de responsabilité stricte, de négligence ou d’une autre faute
-dans la limite autorisée par la loi en vigueur.
-Elle s’applique également, même si Microsoft connaissait ou devrait
-connaître l’éventualité d’un tel dommage. Si votre pays n’autorise pas
-l’exclusion ou la limitation de responsabilité pour les dommages
-indirects, accessoires ou de quelque nature que ce soit, il se peut
-que la limitation ou l’exclusion ci-dessus ne s’appliquera pas à votre
-égard.
-EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques.
-Vous pourriez avoir d’autres droits prévus par les lois de votre pays.
-Le présent contrat ne modifie pas les droits que vous confèrent les
-lois de votre pays si celles-ci ne le permettent pas.
diff --git a/licenses/Manifest.gz b/licenses/Manifest.gz
index 74728335f5e6..a91143064ae5 100644
--- a/licenses/Manifest.gz
+++ b/licenses/Manifest.gz
diff --git a/licenses/Oracle-BCLA-JavaSE b/licenses/Oracle-BCLA-JavaSE
index 8e8fe933e8db..09ebe95a3e35 100644
--- a/licenses/Oracle-BCLA-JavaSE
+++ b/licenses/Oracle-BCLA-JavaSE
@@ -2,83 +2,91 @@
 # links -dump http://www.oracle.com/technetwork/java/javase/terms/license/index.html
 # For up-to-date version with html links, please check the URL
 
-   Oracle Binary Code License Agreement for the Java SE Platform Products
+   Oracle Binary Code License Agreement for the Java SE Platform Products and
+   JavaFX
 
-   ORACLE  AMERICA, INC. ("ORACLE"), FOR AND ON BEHALF OF ITSELF AND ITS
-   SUBSIDIARIES AND AFFILIATES UNDER COMMON CONTROL, IS WILLING TO  LICENSE 
-   THE SOFTWARE  TO YOU ONLY UPON THE CONDITION THAT YOU ACCEPT ALL OF THE
-   TERMS  CONTAINED IN THIS BINARY CODE LICENSE AGREEMENT AND SUPPLEMENTAL 
-   LICENSE TERMS (COLLECTIVELY "AGREEMENT").  PLEASE READ THE AGREEMENT 
-   CAREFULLY.  BY SELECTING THE "ACCEPT LICENSE AGREEMENT" (OR THE
-   EQUIVALENT) BUTTON AND/OR BY USING THE SOFTWARE YOU ACKNOWLEDGE THAT YOU
-   HAVE READ THE TERMS AND AGREE TO THEM.  IF YOU ARE AGREEING TO THESE TERMS
-   ON BEHALF OF A  COMPANY OR OTHER LEGAL ENTITY, YOU REPRESENT THAT YOU HAVE
-   THE LEGAL  AUTHORITY TO BIND THE LEGAL ENTITY TO THESE TERMS.  IF YOU DO
-   NOT HAVE SUCH  AUTHORITY, OR IF YOU DO NOT WISH TO BE BOUND BY THE TERMS,
-   THEN SELECT THE "DECLINE LICENSE AGREEMENT" (OR THE EQUIVALENT) BUTTON AND
-   YOU MUST NOT USE THE SOFTWARE ON THIS SITE OR ANY OTHER MEDIA ON WHICH THE
-   SOFTWARE IS CONTAINED.
+   ORACLE AMERICA, INC. ("ORACLE"), FOR AND ON BEHALF OF ITSELF AND ITS
+   SUBSIDIARIES AND AFFILIATES UNDER COMMON CONTROL, IS WILLING TO LICENSE
+   THE SOFTWARE TO YOU ONLY UPON THE CONDITION THAT YOU ACCEPT ALL OF THE
+   TERMS CONTAINED IN THIS BINARY CODE LICENSE AGREEMENT AND SUPPLEMENTAL
+   LICENSE TERMS (COLLECTIVELY "AGREEMENT"). PLEASE READ THE AGREEMENT
+   CAREFULLY. BY SELECTING THE "ACCEPT LICENSE AGREEMENT" (OR THE EQUIVALENT)
+   BUTTON AND/OR BY USING THE SOFTWARE YOU ACKNOWLEDGE THAT YOU HAVE READ THE
+   TERMS AND AGREE TO THEM. IF YOU ARE AGREEING TO THESE TERMS ON BEHALF OF A
+   COMPANY OR OTHER LEGAL ENTITY, YOU REPRESENT THAT YOU HAVE THE LEGAL
+   AUTHORITY TO BIND THE LEGAL ENTITY TO THESE TERMS. IF YOU DO NOT HAVE SUCH
+   AUTHORITY, OR IF YOU DO NOT WISH TO BE BOUND BY THE TERMS, THEN SELECT THE
+   "DECLINE LICENSE AGREEMENT" (OR THE EQUIVALENT) BUTTON AND YOU MUST NOT
+   USE THE SOFTWARE ON THIS SITE OR ANY OTHER MEDIA ON WHICH THE SOFTWARE IS
+   CONTAINED.
 
-   1.  DEFINITIONS.  "Software" means the Java SE Platform Products in binary
-   form that you selected for download, install or use from Oracle or its
-   authorized licensees, any other machine readable materials (including, but
-   not limited to,  libraries,  source  files,  header  files, and data 
-   files), any updates or error corrections provided by Oracle, and any user
-   manuals, programming guides and other documentation provided to you by
-   Oracle under this Agreement.  "General Purpose Desktop Computers and
-   Servers" means computers,  including desktop and laptop computers, or
-   servers, used for general  computing functions under end user control
-   (such as but not specifically  limited to email, general purpose Internet
-   browsing, and office suite  productivity tools).  The use of Software in
-   systems and solutions that provide dedicated functionality (other than as
-   mentioned above) or designed  for use in embedded or function-specific
-   software applications, for example but not limited to: Software embedded
-   in or bundled with industrial control systems, wireless mobile telephones,
-   wireless handheld devices, netbooks, kiosks, TV/STB, Blu-ray Disc devices,
-   telematics and network control switching equipment, printers and storage
-   management systems, and other related systems are excluded from this
-   definition and not licensed under this  Agreement.  "Programs" means Java
-   technology applets and applications  intended to run on the Java Platform,
-   Standard Edition platform on Java-enabled General Purpose Desktop
-   Computers and Servers.  "Commercial Features" means those features
-   identified in Table 1-1 (Commercial Features In Java SE Product Editions)
-   of the Software documentation accessible at 
-   http://www.oracle.com/technetwork/java/javase/documentation/index.html. 
-   "README File" means the README file for the Software accessible at
-   http://www.oracle.com/technetwork/java/javase/terms/readme/index.html.
+   1. DEFINITIONS. "Software" means the software identified above in binary
+   form that you selected for download, install or use (in the version You
+   selected for download, install or use) from Oracle or its authorized
+   licensees and/or those portions of such software produced by jlink as
+   output using a Program’s code, when such output is in unmodified form in
+   combination, and for sole use with, that Program, as well as any other
+   machine readable materials (including, but not limited to, libraries,
+   source files, header files, and data files), any updates or error
+   corrections provided by Oracle, and any user manuals, programming guides
+   and other documentation provided to you by Oracle under this Agreement.
+   The Java Linker (jlink) is available with Java 9 and later versions. 
+   "General Purpose Desktop Computers and Servers" means computers, including
+   desktop and laptop computers, or servers, used for general computing
+   functions under end user control (such as but not specifically limited to
+   email, general purpose Internet browsing, and office suite productivity
+   tools). The use of Software in systems and solutions that provide
+   dedicated functionality (other than as mentioned above) or designed for
+   use in embedded or function-specific software applications, for example
+   but not limited to: Software embedded in or bundled with industrial
+   control systems, wireless mobile telephones, wireless handheld devices,
+   kiosks, TV/STB, Blu-ray Disc devices, telematics and network control
+   switching equipment, printers and storage management systems, and other
+   related systems are excluded from this definition and not licensed under
+   this Agreement. "Programs" means (a) Java technology applets and
+   applications intended to run on the Java Platform, Standard Edition
+   platform on Java-enabled General Purpose Desktop Computers and Servers;
+   and (b) JavaFX technology applications intended to run on the JavaFX
+   Runtime on JavaFX-enabled General Purpose Desktop Computers and Servers.
+   “Java SE LIUM” means the Licensing Information User Manual – Oracle Java
+   SE and Oracle Java Embedded Products Document accessible at
+   http://www.oracle.com/technetwork/java/javase/documentation/index.html.
+   “Commercial Features” means those features that are identified as such in
+   the Java SE LIUM under the “Description of Product Editions and Permitted
+   Features” section.
 
-   2.  LICENSE TO USE.  Subject to the terms and conditions of this
-   Agreement   including, but not limited to, the Java Technology
-   Restrictions of the  Supplemental License Terms, Oracle grants you a
-   non-exclusive, non-transferable, limited license without license fees to
-   reproduce and use internally the Software complete and unmodified for the
-   sole purpose of  running Programs.  THE LICENSE SET FORTH IN THIS SECTION
-   2 DOES NOT EXTEND TO THE COMMERCIAL FEATURES.  YOUR RIGHTS AND OBLIGATIONS
-   RELATED TO THE COMMERCIAL FEATURES ARE AS SET FORTH IN THE SUPPLEMENTAL
-   TERMS ALONG WITH ADDITIONAL LICENSES FOR DEVELOPERS AND PUBLISHERS.
+   2. LICENSE TO USE. Subject to the terms and conditions of this Agreement
+   including, but not limited to, the Java Technology Restrictions of the
+   Supplemental License Terms, Oracle grants you a non-exclusive,
+   non-transferable, limited license without license fees to reproduce and
+   use internally the Software complete and unmodified for the sole purpose
+   of running Programs. THE LICENSE SET FORTH IN THIS SECTION 2 DOES NOT
+   EXTEND TO THE COMMERCIAL FEATURES. YOUR RIGHTS AND OBLIGATIONS RELATED TO
+   THE COMMERCIAL FEATURES ARE AS SET FORTH IN THE SUPPLEMENTAL TERMS ALONG
+   WITH ADDITIONAL LICENSES FOR DEVELOPERS AND PUBLISHERS.
 
-   3.  RESTRICTIONS.  Software is copyrighted.  Title to Software and all
+   3. RESTRICTIONS. Software is copyrighted. Title to Software and all
    associated intellectual property rights is retained by Oracle and/or its
-   licensors.  Unless enforcement is prohibited by applicable law, you may
-   not modify, decompile, or reverse engineer Software.  You acknowledge that
-   the Software is developed for general use in a variety of information
+   licensors. Unless enforcement is prohibited by applicable law, you may not
+   modify, decompile, or reverse engineer Software. You acknowledge that the
+   Software is developed for general use in a variety of information
    management applications; it is not developed or intended for use in any
    inherently dangerous applications, including applications that may create
    a risk of personal injury. If you use the Software in dangerous
    applications, then you shall be responsible to take all appropriate
-   fail-safe, backup, redundancy, and other measures to ensure its safe use. 
-   Oracle disclaims any express or implied warranty of fitness for such
-   uses.  No right, title or interest in or to any trademark,  service mark,
-   logo or trade name of Oracle or its licensors is granted under this 
-   Agreement.  Additional restrictions for developers and/or publishers
-   licenses are set forth in the Supplemental License Terms.
+   fail-safe, backup, redundancy, and other measures to ensure its safe use.
+   Oracle disclaims any express or implied warranty of fitness for such uses.
+   No right, title or interest in or to any trademark, service mark, logo or
+   trade name of Oracle or its licensors is granted under this Agreement.
+   Additional restrictions for developers and/or publishers licenses are set
+   forth in the Supplemental License Terms.
 
-   4.  DISCLAIMER OF WARRANTY.  THE SOFTWARE IS PROVIDED "AS IS" WITHOUT
-   WARRANTY OF ANY KIND.  ORACLE FURTHER DISCLAIMS ALL WARRANTIES, EXPRESS
-   AND IMPLIED, INCLUDING WITHOUT LIMITATION, ANY IMPLIED WARRANTIES OF
-   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT. 
+   4. DISCLAIMER OF WARRANTY. THE SOFTWARE IS PROVIDED "AS IS" WITHOUT
+   WARRANTY OF ANY KIND. ORACLE FURTHER DISCLAIMS ALL WARRANTIES, EXPRESS AND
+   IMPLIED, INCLUDING WITHOUT LIMITATION, ANY IMPLIED WARRANTIES OF
+   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
 
-   5.  LIMITATION OF LIABILITY.  IN NO EVENT SHALL ORACLE BE LIABLE FOR ANY
+   5. LIMITATION OF LIABILITY. IN NO EVENT SHALL ORACLE BE LIABLE FOR ANY
    INDIRECT, INCIDENTAL, SPECIAL, PUNITIVE OR CONSEQUENTIAL DAMAGES, OR
    DAMAGES FOR LOSS OF PROFITS, REVENUE, DATA OR DATA USE, INCURRED BY YOU OR
    ANY THIRD PARTY, WHETHER IN AN ACTION IN CONTRACT OR TORT, EVEN IF ORACLE
@@ -86,217 +94,229 @@
    LIABILITY FOR DAMAGES HEREUNDER SHALL IN NO EVENT EXCEED ONE THOUSAND
    DOLLARS (U.S. $1,000).
 
-   6.  TERMINATION.  This Agreement is effective until terminated.  You may
-   terminate this Agreement at any time by destroying all copies of
-   Software.  This Agreement will terminate immediately without notice from
-   Oracle if you  fail to comply with any provision of this Agreement. 
-   Either party may  terminate this Agreement immediately should any Software
-   become, or in either party's opinion be likely to become, the subject of a
-   claim of infringement  of any intellectual property  right.  Upon
-   termination, you must destroy all copies of Software.
+   6. TERMINATION. This Agreement is effective until terminated. You may
+   terminate this Agreement at any time by destroying all copies of Software.
+   This Agreement will terminate immediately without notice from Oracle if
+   you fail to comply with any provision of this Agreement. Either party may
+   terminate this Agreement immediately should any Software become, or in
+   either party's opinion be likely to become, the subject of a claim of
+   infringement of any intellectual property right. Upon termination, you
+   must destroy all copies of Software.
 
-   7.  EXPORT  REGULATIONS.  You agree that U.S. export control laws and
-   other applicable export and import laws govern your use of the Software,
+   7. EXPORT REGULATIONS. You agree that U.S. export control laws and other
+   applicable export and import laws govern your use of the Software,
    including technical data; additional information can be found on Oracle's
-   Global Trade Compliance web site (http://www.oracle.com/products/export).
-   You agree that neither the Software nor any direct product thereof will be
-   exported, directly, or indirectly, in violation of these laws, or will be
-   used for any purpose prohibited by these laws including, without
-   limitation, nuclear, chemical, or biological weapons proliferation. 
+   Global Trade Compliance web site
+   (http://www.oracle.com/us/products/export). You agree that neither the
+   Software nor any direct product thereof will be exported, directly, or
+   indirectly, in violation of these laws, or will be used for any purpose
+   prohibited by these laws including, without limitation, nuclear, chemical,
+   or biological weapons proliferation.
 
-   8.  TRADEMARKS AND LOGOS.  You acknowledge and agree as between you
-   and Oracle that Oracle owns the ORACLE and JAVA trademarks and all ORACLE-
-   and JAVA-related trademarks, service marks, logos and other brand
-   designations ("Oracle Marks"), and you agree to comply with the Third
-   Party Usage Guidelines for Oracle Trademarks currently located at
-   http://www.oracle.com/us/legal/third-party-trademarks/index.html.  Any use
+   8. TRADEMARKS AND LOGOS. You acknowledge and agree as between you and
+   Oracle that Oracle owns the ORACLE and JAVA trademarks and all ORACLE- and
+   JAVA-related trademarks, service marks, logos and other brand designations
+   ("Oracle Marks"), and you agree to comply with the Third Party Usage
+   Guidelines for Oracle Trademarks currently located at
+   http://www.oracle.com/us/legal/third-party-trademarks/index.html. Any use
    you make of the Oracle Marks inures to Oracle's benefit.
 
-   9.  U.S.  GOVERNMENT LICENSE RIGHTS.  If Software is being acquired by or
-   on  behalf of the U.S. Government or by a U.S. Government prime contractor
-   or  subcontractor (at any tier), then the Government's rights in Software
-   and accompanying documentation shall be only those set forth in this
-   Agreement. 
+   9. U.S. GOVERNMENT LICENSE RIGHTS. If Software is being acquired by or on
+   behalf of the U.S. Government or by a U.S. Government prime contractor or
+   subcontractor (at any tier), then the Government's rights in Software and
+   accompanying documentation shall be only those set forth in this
+   Agreement.
 
-   10.  GOVERNING  LAW.  This agreement is governed by the substantive and
+   10. GOVERNING LAW. This agreement is governed by the substantive and
    procedural laws of California. You and Oracle agree to submit to the
    exclusive jurisdiction of, and venue in, the courts of San Francisco, or
    Santa Clara counties in California in any dispute arising out of or
-   relating to this agreement. 
+   relating to this agreement.
 
-   11.  SEVERABILITY.  If any  provision of this  Agreement is held to be
+   11. SEVERABILITY. If any provision of this Agreement is held to be
    unenforceable, this Agreement will remain in effect with the provision
    omitted, unless omission would frustrate the intent of the parties, in
    which case this Agreement will immediately terminate.
 
-   12.  INTEGRATION.  This Agreement is the entire agreement  between you and
-   Oracle relating to its subject matter.  It supersedes all prior or
-   contemporaneous oral or written communications, proposals,
-   representations  and warranties and prevails over any  conflicting  or
-   additional  terms  of  any  quote, order, acknowledgment, or other
-   communication between the parties  relating to its subject matter during
-   the term of this Agreement.  No modification of this Agreement will be 
-   binding,  unless  in  writing  and  signed  by an  authorized
-   representative of each party.
+   12. INTEGRATION. This Agreement is the entire agreement between you and
+   Oracle relating to its subject matter. It supersedes all prior or
+   contemporaneous oral or written communications, proposals, representations
+   and warranties and prevails over any conflicting or additional terms of
+   any quote, order, acknowledgment, or other communication between the
+   parties relating to its subject matter during the term of this Agreement.
+   No modification of this Agreement will be binding, unless in writing and
+   signed by an authorized representative of each party.
 
    SUPPLEMENTAL LICENSE TERMS
 
-   These  Supplemental  License  Terms add to or modify  the terms of the
-   Binary Code License Agreement.  Capitalized terms not defined in these
-   Supplemental  Terms shall have the same meanings ascribed to them in the
-   Binary Code License Agreement.  These Supplemental Terms shall supersede
-   any  inconsistent or conflicting terms in the Binary Code License
+   These Supplemental License Terms add to or modify the terms of the Binary
+   Code License Agreement. Capitalized terms not defined in these
+   Supplemental Terms shall have the same meanings ascribed to them in the
+   Binary Code License Agreement. These Supplemental Terms shall supersede
+   any inconsistent or conflicting terms in the Binary Code License
    Agreement, or in any license contained within the Software.
 
-   A.  COMMERCIAL FEATURES.  You may not use the Commercial Features for
+   A. COMMERCIAL FEATURES. You may not use the Commercial Features for
    running Programs, Java applets or applications in your internal business
-   operations or for any commercial or production  purpose, or for any
-   purpose other than as set forth in Sections B, C, D and E of these
-   Supplemental Terms.  If You want to use the Commercial Features for any
-   purpose other than as permitted in this Agreement, You must obtain a
-   separate license from Oracle.
+   operations or for any commercial or production purpose, or for any purpose
+   other than as set forth in Sections B, C, D and E of these Supplemental
+   Terms. If You want to use the Commercial Features for any purpose other
+   than as permitted in this Agreement, You must obtain a separate license
+   from Oracle.
 
-   B.  SOFTWARE INTERNAL USE FOR DEVELOPMENT LICENSE GRANT.  Subject to the
+   B. SOFTWARE INTERNAL USE FOR DEVELOPMENT LICENSE GRANT. Subject to the
    terms and conditions of this Agreement and restrictions and exceptions set
-   forth in the README File incorporated herein by reference,  including, but
-   not limited to the Java Technology Restrictions of these  Supplemental
-   Terms, Oracle grants you a non-exclusive, non-transferable,  limited
+   forth in the Java SE LIUM incorporated herein by reference, including, but
+   not limited to the Java Technology Restrictions of these Supplemental
+   Terms, Oracle grants you a non-exclusive, non-transferable, limited
    license without fees to reproduce internally and use internally the
    Software complete and unmodified for the purpose of designing, developing,
    and testing your Programs.
 
-   C.  LICENSE TO DISTRIBUTE SOFTWARE.  Subject to the terms and conditions
-   of this Agreement and restrictions and exceptions set forth in the  
-   README File, including, but not limited to the Java Technology
-   Restrictions of these Supplemental Terms, Oracle grants you a
-   non-exclusive, non-transferable, limited license without fees to reproduce
-   and distribute the  Software, provided that (i) you distribute the
-   Software complete and  unmodified and only bundled as part of, and for the
-   sole purpose of running, your Programs, (ii) the Programs add significant
-   and primary functionality  to the Software, (iii) you do not distribute
-   additional  software intended to replace any component(s) of the Software,
-   (iv) you do not remove or alter any proprietary legends or notices
-   contained in the Software, (v) you only distribute the Software subject to
-   a license agreement that: (a) is a complete, unmodified reproduction of
-   this Agreement; or (b) protects Oracle's  interests consistent with the
-   terms contained in this Agreement and that includes the notice set forth
-   in Section G, and (vi) you agree to defend and indemnify Oracle and its
-   licensors from and against any damages, costs, liabilities, settlement
-   amounts and/or expenses (including  attorneys' fees)  incurred in
-   connection  with any claim, lawsuit or action by any third party that
-   arises or results from the use or distribution of any and all Programs
-   and/or Software.
+   C. LICENSE TO DISTRIBUTE SOFTWARE. Subject to the terms and conditions of
+   this Agreement and restrictions and exceptions set forth in the Java SE
+   LIUM, including, but not limited to the Java Technology Restrictions and
+   Limitations on Redistribution of these Supplemental Terms, Oracle grants
+   you a non-exclusive, non-transferable, limited license without fees to
+   reproduce and distribute the Software, provided that (i) you distribute
+   the Software complete and unmodified and only bundled as part of, and for
+   the sole purpose of running, your Programs, (ii) the Programs add
+   significant and primary functionality to the Software, (iii) you do not
+   distribute additional software intended to replace any component(s) of the
+   Software, (iv) you do not remove or alter any proprietary legends or
+   notices contained in the Software, (v) you only distribute the Software
+   subject to a license agreement that: (a) is a complete, unmodified
+   reproduction of this Agreement; or (b) protects Oracle's interests
+   consistent with the terms contained in this Agreement and that includes
+   the notice set forth in Section H, and (vi) you agree to defend and
+   indemnify Oracle and its licensors from and against any damages, costs,
+   liabilities, settlement amounts and/or expenses (including attorneys'
+   fees) incurred in connection with any claim, lawsuit or action by any
+   third party that arises or results from the use or distribution of any and
+   all Programs and/or Software. The license set forth in this Section C does
+   not extend to the Software identified in Section G.
 
-   D.  LICENSE TO DISTRIBUTE REDISTRIBUTABLES.  Subject to the terms and
+   D. LICENSE TO DISTRIBUTE REDISTRIBUTABLES. Subject to the terms and
    conditions of this Agreement and restrictions and exceptions set forth in
-   the README  File, including but not limited to the Java Technology
-   Restrictions of these Supplemental Terms, Oracle grants you a
-   non-exclusive,  non-transferable, limited license without fees to
-   reproduce and distribute  those files specifically identified as
-   redistributable in the   README File ("Redistributables") provided that:
-   (i) you distribute the  Redistributables complete and unmodified, and only
-   bundled as part of Programs, (ii) the Programs add significant and primary
-   functionality to the  Redistributables, (iii) you do not distribute
-   additional software intended to supersede any component(s) of the
-   Redistributables (unless otherwise specified in the applicable README
-   File), (iv) you do not remove or alter any proprietary legends or notices
-   contained in or on the Redistributables, (v)  you only distribute the
-   Redistributables pursuant to a license agreement  that: (a) is a complete,
-   unmodified reproduction of this Agreement; or (b) protects Oracle's
-   interests consistent with the terms contained in the Agreement and
-   includes the notice set forth in Section G, (vi) you agree to defend and
-   indemnify Oracle and its licensors from and against any damages,  costs,
-   liabilities, settlement amounts and/or expenses (including  attorneys' 
+   the Java SE LIUM, including but not limited to the Java Technology
+   Restrictions and Limitations on Redistribution of these Supplemental
+   Terms, Oracle grants you a non-exclusive, non-transferable, limited
+   license without fees to reproduce and distribute those files specifically
+   identified as redistributable in the Java SE LIUM ("Redistributables")
+   provided that: (i) you distribute the Redistributables complete and
+   unmodified, and only bundled as part of Programs, (ii) the Programs add
+   significant and primary functionality to the Redistributables, (iii) you
+   do not distribute additional software intended to supersede any
+   component(s) of the Redistributables (unless otherwise specified in the
+   applicable Java SE LIUM), (iv) you do not remove or alter any proprietary
+   legends or notices contained in or on the Redistributables, (v) you only
+   distribute the Redistributables pursuant to a license agreement that: (a)
+   is a complete, unmodified reproduction of this Agreement; or (b) protects
+   Oracle's interests consistent with the terms contained in the Agreement
+   and includes the notice set forth in Section H, (vi) you agree to defend
+   and indemnify Oracle and its licensors from and against any damages,
+   costs, liabilities, settlement amounts and/or expenses (including
+   attorneys' fees) incurred in connection with any claim, lawsuit or action
+   by any third party that arises or results from the use or distribution of
+   any and all Programs and/or Software. The license set forth in this
+   Section D does not extend to the Software identified in Section G.
+
+   E. DISTRIBUTION BY PUBLISHERS. This section pertains to your distribution
+   of the JavaTM SE Development Kit Software (“JDK”) with your printed book
+   or magazine (as those terms are commonly used in the industry) relating to
+   Java technology ("Publication"). Subject to and conditioned upon your
+   compliance with the restrictions and obligations contained in the
+   Agreement, Oracle hereby grants to you a non-exclusive, nontransferable
+   limited right to reproduce complete and unmodified copies of the JDK on
+   electronic media (the "Media") for the sole purpose of inclusion and
+   distribution with your Publication(s), subject to the following terms: (i)
+   You may not distribute the JDK on a stand-alone basis; it must be
+   distributed with your Publication(s); (ii) You are responsible for
+   downloading the JDK from the applicable Oracle web site; (iii) You must
+   refer to the JDK as JavaTM SE Development Kit; (iv) The JDK must be
+   reproduced in its entirety and without any modification whatsoever
+   (including with respect to all proprietary notices) and distributed with
+   your Publication subject to a license agreement that is a complete,
+   unmodified reproduction of this Agreement; (v) The Media label shall
+   include the following information: “Copyright [YEAR], Oracle America, Inc.
+   All rights reserved. Use is subject to license terms. ORACLE and JAVA
+   trademarks and all ORACLE- and JAVA-related trademarks, service marks,
+   logos and other brand designations are trademarks or registered trademarks
+   of Oracle in the U.S. and other countries.” [YEAR] is the year of Oracle's
+   release of the Software; the year information can typically be found in
+   the Software’s “About” box or screen. This information must be placed on
+   the Media label in such a manner as to only apply to the JDK; (vi) You
+   must clearly identify the JDK as Oracle's product on the Media holder or
+   Media label, and you may not state or imply that Oracle is responsible for
+   any third-party software contained on the Media; (vii) You may not include
+   any third party software on the Media which is intended to be a
+   replacement or substitute for the JDK; (viii) You agree to defend and
+   indemnify Oracle and its licensors from and against any damages, costs,
+   liabilities, settlement amounts and/or expenses (including attorneys'
    fees) incurred in connection with any claim, lawsuit or action by any
-   third  party that arises or results from the use or distribution of any
-   and all Programs and/or Software.
+   third party that arises or results from the use or distribution of the JDK
+   and/or the Publication; ; and (ix) You shall provide Oracle with a written
+   notice for each Publication; such notice shall include the following
+   information: (1) title of Publication, (2) author(s), (3) date of
+   Publication, and (4) ISBN or ISSN numbers. Such notice shall be sent to
+   Oracle America, Inc., 500 Oracle Parkway, Redwood Shores, California 94065
+   U.S.A , Attention: General Counsel.
 
-   E.  DISTRIBUTION BY PUBLISHERS.  This section pertains to your
-   distribution  of the JavaTM SE Development Kit Software with your printed
-   book or magazine (as those terms are commonly used in the industry)
-   relating to Java technology ("Publication").  Subject to and conditioned
-   upon your compliance  with the restrictions and obligations contained in
-   the Agreement, Oracle hereby grants to you a non-exclusive,
-   nontransferable limited right to reproduce complete and unmodified copies
-   of the Software on electronic  media (the "Media") for the sole purpose of
-   inclusion and distribution with your Publication(s), subject to the
-   following terms: (i) You may not distribute  the Software on a stand-alone
-   basis; it must be distributed with your Publication(s); (ii) You are
-   responsible for downloading the Software from the applicable Oracle web
-   site; (iii) You must refer to the Software as JavaTM SE Development Kit;
-   (iv) The Software must be reproduced in its entirety and without any
-   modification whatsoever (including with respect to all proprietary
-   notices) and distributed with your Publication subject to a license
-   agreement that is a complete, unmodified reproduction of this Agreement;
-   (v) The Media label shall include the following information:  Copyright
-   2011, Oracle America, Inc.  All rights reserved.  Use is subject to
-   license terms.  ORACLE and JAVA trademarks and all ORACLE- and
-   JAVA-related trademarks, service marks, logos and other brand
-   designations are trademarks or registered  trademarks of Oracle in the
-   U.S. and other countries.  This information must be placed on the Media 
-   label in such a manner as to only apply to the Oracle  Software;  (vi) You
-   must clearly identify the Software as Oracle's product on the Media 
-   holder or Media label, and you may not state or imply that Oracle is
-   responsible for any third-party software contained on the Media; (vii) You
-   may not include any third  party software on the Media which is intended
-   to be a  replacement or substitute for the Software; (viii) You agree to
-   defend and indemnify Oracle and its licensors from and against any
-   damages, costs, liabilities, settlement amounts and/or expenses
-   (including  attorneys'  fees) incurred in connection with any claim,
-   lawsuit or action by any third party that arises or results from the use
-   or distribution of the Software and/or the Publication; ; and (ix) You
-   shall provide Oracle with a written notice for each Publication; such
-   notice shall include the following information: (1) title of Publication,
-   (2) author(s), (3) date of Publication,  and (4)  ISBN or ISSN  numbers. 
-   Such notice shall be sent to  Oracle America, Inc.,  500 Oracle  Parkway,
-   Redwood Shores,  California  94065 U.S.A , Attention:  General Counsel.
+   F. JAVA TECHNOLOGY RESTRICTIONS. You may not create, modify, or change the
+   behavior of, or authorize your licensees to create, modify, or change the
+   behavior of, classes, interfaces, or subpackages that are in any way
+   identified as "java", "javax", "sun", “oracle” or similar convention as
+   specified by Oracle in any naming convention designation.
 
-   F.  JAVA TECHNOLOGY RESTRICTIONS.  You may not create, modify, or change
-   the behavior of, or authorize your licensees to create, modify, or change
-   the behavior of, classes, interfaces, or subpackages that are in any way 
-   identified  as  "java", "javax", "sun", "oracle" or similar convention
-   as   specified by Oracle in any naming convention designation.
+   G. LIMITATIONS ON REDISTRIBUTION. You may not redistribute or otherwise
+   transfer patches, bug fixes or updates made available by Oracle through
+   Oracle Premier Support, including those made available under Oracle's Java
+   SE Support program.
 
-   G.  COMMERCIAL FEATURES NOTICE.  For purpose of complying with
-   Supplemental Term Section  C.(v)(b) and D.(v)(b), your license agreement
-   shall include the following notice, where the notice is displayed in a
-   manner that anyone using the Software will see the notice:
+   H. COMMERCIAL FEATURES NOTICE. For purpose of complying with Supplemental
+   Term Section C.(v)(b) and D.(v)(b), your license agreement shall include
+   the following notice, where the notice is displayed in a manner that
+   anyone using the Software will see the notice:
 
    Use of the Commercial Features for any commercial or production purpose
-   requires a separate license from Oracle.  "Commercial Features" means
-   those features identified Table 1-1 (Commercial Features In Java SE
-   Product Editions) of the Software documentation accessible at
-   http://www.oracle.com/technetwork/java/javase/documentation/index.html
+   requires a separate license from Oracle. “Commercial Features” means those
+   features that are identified as such in the Licensing Information User
+   Manual – Oracle Java SE and Oracle Java Embedded Products Document,
+   accessible
+   at http://www.oracle.com/technetwork/java/javase/documentation/index.html,
+   under the “Description of Product Editions and Permitted Features”
+   section.
+    
+   I. SOURCE CODE. Software may contain source code that, unless expressly
+   licensed for other purposes, is provided solely for reference purposes
+   pursuant to the terms of this Agreement. Source code may not be
+   redistributed unless expressly provided for in this Agreement.
 
-   H.  SOURCE CODE.  Software may contain source code that, unless
-   expressly   licensed for other purposes, is provided solely for reference
-   purposes  pursuant to the terms of this Agreement.  Source code may not be
-   redistributed  unless  expressly  provided for in this Agreement.
+   J. THIRD PARTY CODE. Additional copyright notices and license terms
+   applicable to portions of the Software are set forth in the Java SE LIUM
+   accessible at
+   http://www.oracle.com/technetwork/java/javase/documentation/index.html. In
+   addition to any terms and conditions of any third party
+   opensource/freeware license identified in the Java SE LIUM, the disclaimer
+   of warranty and limitation of liability provisions in paragraphs 4 and 5
+   of the Binary Code License Agreement shall apply to all Software in this
+   distribution.
 
-   I.  THIRD PARTY CODE.  Additional copyright notices and license terms
-   applicable to portions of the Software are set forth in the
-   THIRDPARTYLICENSEREADME file accessible at
-   http://www.oracle.com/technetwork/java/javase/documentation/index.html. 
-   In addition to any terms and conditions of any third party
-   opensource/freeware license identified in the  THIRDPARTYLICENSEREADME
-   file, the disclaimer of warranty and limitation of liability  provisions
-   in  paragraphs 4 and 5 of the Binary Code License Agreement shall apply to
-   all Software in this distribution.
-
-   J.  TERMINATION FOR INFRINGEMENT.  Either party may terminate this
-   Agreement immediately should any Software become, or in either party's
-   opinion be likely to become, the subject of a claim of infringement of any
+   K. TERMINATION FOR INFRINGEMENT. Either party may terminate this Agreement
+   immediately should any Software become, or in either party's opinion be
+   likely to become, the subject of a claim of infringement of any
    intellectual property right.
 
-   K.  INSTALLATION AND AUTO-UPDATE.  The Software's installation and
+   L. INSTALLATION AND AUTO-UPDATE. The Software's installation and
    auto-update processes transmit a limited amount of data to Oracle (or its
-   service  provider) about those specific processes to help Oracle
-   understand and optimize them.  Oracle does not associate the data with
-   personally  identifiable  information.  You can find more  information
-   about the data Oracle collects as a result of your Software download at
+   service provider) about those specific processes to help Oracle understand
+   and optimize them. Oracle does not associate the data with personally
+   identifiable information. You can find more information about the data
+   Oracle collects as a result of your Software download at
    http://www.oracle.com/technetwork/java/javase/documentation/index.html.
 
-   For inquiries please contact:  Oracle America, Inc., 500 Oracle Parkway,
+   For inquiries please contact: Oracle America, Inc., 500 Oracle Parkway,
+
    Redwood Shores, California 94065, USA.
 
-   Last updated May 17, 2011
+   Last updated 21 September 2017
diff --git a/licenses/Vidyo-EULA b/licenses/Vidyo-EULA
deleted file mode 100644
index d049a24f2931..000000000000
--- a/licenses/Vidyo-EULA
+++ /dev/null
@@ -1,53 +0,0 @@
-
-Vidyo End User License Agreement including Limited Warranty, and Disclaimer of Warranty
-
-End User License Agreement
-
-VIDYO, Inc. is a Delaware corporation with a principal place of business 433 Hackensack Ave., 6th floor, Hackensack, NJ 07601 (Vidyo).
-
-IMPORTANT: PLEASE READ THIS END USER LICENSE AGREEMENT CAREFULLY. DOWNLOADING, INSTALLING OR USING VIDYO OR VIDYO-SUPPLIED SOFTWARE CONSTITUTES ACCEPTANCE OF THIS AGREEMENT. 
-THIS LICENSE OF THE SOFTWARE IS VALID ONLY UPON THE CONDITION THAT YOU ACCEPT ALL OF THE TERMS CONTAINED IN THIS LICENSE AGREEMENT. YOUR ACCEPTANCE WILL BE BY INSTALLING OR DOWNLOADING THE SOFTWARE, OR USING THE EQUIPMENT THAT CONTAINS THIS SOFTWARE.  YOU ARE BINDING YOURSELF AND THE BUSINESS ENTITY THAT YOU REPRESENT (COLLECTIVELY, "CUSTOMER") TO THIS AGREEMENT. IF YOU DO NOT AGREE TO ALL OF THE TERMS OF THIS AGREEMENT, THEN VIDYO IS UNWILLING TO LICENSE THE SOFTWARE TO YOU AND (A) DO NOT DOWNLOAD, INSTALL OR USE THE SOFTWARE,  (B) YOU MAY RETURN THE SOFTWARE FOR A FULL REFUND,  OR, IF THE SOFTWARE IS SUPPLIED AS PART OF ANOTHER VIDYO PRODUCT, YOU MAY RETURN THE ENTIRE PRODUCT  FOR A FULL REFUND. YOUR RIGHT TO RETURN AND REFUND EXPIRES 30 DAYS AFTER YOUR RECEIPT OF THE SOFTWARE FROM VIDYO OR AN AUTHORIZED VIDYO RESELLER, AND APPLIES ONLY IF YOU ARE THE ORIGINAL END USER PURCHASER.
-
-Vidyo's technology is covered by U.S Pat. Nos. 7,593,032 B3 and 7,643,560, as well as additional International patents or pending U.S. or International patent applications owned by Vidyo, Inc.
-
-Conditioned upon compliance with the terms and conditions of this Agreement, Vidyo grants to Customer a nonexclusive and nontransferable license to use for Customer's internal business purposes the Software and the Documentation for which Customer has paid the required license fees. "Documentation" means written information (whether contained in user or technical manuals, training materials, specifications or otherwise) specifically pertaining to the Software and made available by Vidyo with the Software in any manner (including on CD-Rom, or on-line). Customer's license to use the Software shall be limited to, and Customer shall not use the Software in excess of, a single Vidyo Product as set forth in the applicable Purchase Order which has been accepted by Vidyo and for which Vidyo has been paid the required license fee.  Unless otherwise expressly provided in the Documentation, Customer shall use the Software solely as embedded in, for execution on, or (where the applicable documentation permits installation on non-Vidyo equipment) for communication with Vidyo equipment owned or leased by Customer and used for Customer's internal business purposes. No other uses of the Software are authorized by this Agreement and any unauthorized use of the Software shall be a violation of the terms of this license and Agreement.
-
-Note For evaluation or beta copies for which Vidyo does not charge a license fee, the above requirement to pay license fees does not apply. 
-
-Use of Products.  Products are not authorized for use in critical safety or other applications where any failure may reasonably be anticipated to result in bodily injury, loss of life, or catastrophic damage to property.  If Customer uses or sells the Products for use in any such applications, Customer acknowledges that such sale or use is at Customer's sole risk.   Customer will indemnify, defend and hold Vidyo and its suppliers harmless from and against any and all liabilities and costs arising out of or in connection with such sale or use.
-
-Limited Warranty 
-
-Express Warranty : Vidyo warrants that for a period of one (1) year following shipment of the Product (i) the Product hardware shall be free from defects in materials and workmanship and (ii) the Licensed Software substantially conforms to its published specification.  For instructions to make and process claims under this warranty, please contact the Vidyo authorized reseller from whom you acquired the Product
-
-Except for the foregoing, the Software is provided AS IS. This limited warranty extends only to the Customer who is the original licensee. Customer's sole and exclusive remedy and the entire liability of Vidyo and its suppliers and licensors under this limited warranty will be, at Vidyo's option, repair, replacement, or refund of the Product if reported (or, upon request, returned) to Vidyo or the party supplying the Product to Customer. In no event does Vidyo warrant that the Software is error free or that Customer will be able to operate the Software without problems or interruptions. In addition, due to the continual development of new techniques for intruding upon and attacking networks, Vidyo does not warrant that the Software or any equipment, system or network on which the Software is used will be free of vulnerability to intrusion or attack. 
-
-Restrictions. This warranty does not apply if the Software, Product or any other equipment upon which the Software is authorized to be used (a) has been altered, except by Vidyo or its authorized representative, (b) has not been installed, operated, repaired, or maintained in accordance with instructions supplied by Vidyo, (c) has been subjected to abnormal physical or electrical stress, misuse, negligence, or accident; or (d) is licensed, for beta, evaluation, testing or demonstration purposes. This warranty also does not apply to (e) any temporary Soft-ware modules; (f) any Software for which Vidyo does not receive a license fee. 
-          
-DISCLAIMER OF WARRANTY 
-
-EXCEPT AS SPECIFIED IN THIS WARRANTY, ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS, AND WARRANTIES INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTY OR CONDITION OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, SATISFACTORY QUALITY, NON-INTERFERENCE, ACCURACY OF INFOR-MATIONAL CONTENT, OR ARISING FROM A COURSE OF DEALING, LAW, USAGE, OR TRADE PRACTICE, ARE HEREBY EXCLUDED TO THE EXTENT ALLOWED BY APPLICABLE LAW AND ARE EXPRESSLY DISCLAIMED BY VIDYO, ITS SUPPLIERS AND LICENSORS.TO THE EXTENT AN IMPLIED WARRANTY CANNOT BE EXCLUDED, SUCH WARRANTY IS LIMITED IN DURATION TO THE EXPRESS WARRANTY PERIOD. BECAUSE SOME STATES OR JURISDICTIONS DO NOT ALLOW LIMITATIONS ON HOW LONG AN IMPLIED WARRANTY LASTS, THE ABOVE LIMITATION MAY NOT APPLY. THIS WARRANTY GIVES CUSTOMER SPECIFIC LEGAL RIGHTS, AND CUSTOMER MAY ALSO HAVE OTHER RIGHTS WHICH VARY FROM JURISDICTION TO JURISDICTION. This disclaimer and exclusion shall apply even if the express warranty set forth above fails of its essential purpose. 
- 
-General Limitations. 
-This is a license, not a transfer of title, to the Software and Documentation, and Vidyo and/or its licensor(s), retain(s) ownership of all copies of the Software and Documentation and intellectual property rights of the Product and Software. Customer acknowledges that the Products, Software and Documentation contain intellectual property rights (such as international and united states trade secrets, copyrights, patents, and patents pending) of Vidyo, its suppliers or licensors including but not limited to the specific internal design and structure of individual programs and associated interface information. Accordingly, except as otherwise expressly provided under this Agreement, Customer shall have no right and Customer specifically agrees not to: (i) transfer, assign or sublicense its license rights to any other person or entity, or use the Software on unauthorized or secondhand Vidyo equipment, and Customer acknowledges that any attempted transfer, assignment, sublicense or use shall be void; (ii) make error corrections to or otherwise modify or adapt the Product, Software or create derivative works based upon the Software, or permit third parties to do the same;(iii) reverse engineer or decompile, decrypt, disassemble or otherwise reduce the Software to human-readable form, except to the extent otherwise expressly permitted under applicable law notwithstanding this restriction; (iv) use or permit the Software to be used to perform services for third parties, whether on a service bureau or time sharing basis or otherwise, without the express written authorization of Vidyo; or (v) disclose, provide, or otherwise make available trade secrets contained within the Products, Software and Document-ation in any form to any third party without the prior written consent of Vidyo. Customer shall implement reasonable security measures to protect such trade secrets. To the extent required by law, and at Customer's written request, Vidyo shall provide Customer with the interface information needed to achieve interoperability between the Software and another independently created program, on payment of Vidyo's applicable fee, if any. Customer shall observe strict obligations of confidentiality with respect to such information and shall use such information in compliance with any applicable terms and conditions upon which Vidyo makes such information available. 
-
-Unless otherwise expressly specified all taxes and duties relating to this Agreement, the Products, or Software are excluded and shall be Customer's responsibility.
- 
-Software, Upgrades and Additional Copies. 
-
-For purposes of this Agreement, "Software" shall include (and the terms and conditions of this Agreement shall apply to) computer programs, including firmware, as provided to Customer by Vidyo or an authorized Vidyo reseller, and any upgrades, updates, bug fixes or modified versions thereto (collectively, "Upgrades") or backup copies of the Software licensed or provided to Customer by Vidyo or an authorized Vidyo reseller. NOTWITHSTANDING ANY OTHER PROVISION OF THIS AGREEMENT: (1) CUSTOMER HAS NO LICENSE OR RIGHT TO USE ANY ADDITIONAL COPIES OR UPGRADES UNLESS CUSTOMER, AT THE TIME OF ACQUIRING SUCH COPY OR UPGRADE, ALREADY HOLDS A VALID LICENSE TO THE ORIGINAL SOFTWARE AND HAS PAID THE APPLICABLE FEE FOR THE UPGRADE OR ADDITIONAL COPIES; (2) USE OF UPGRADES IS LIMITED TO VIDYO EQUIPMENT FOR WHICH CUSTOMER IS THE ORIGINAL END USER PURCHASER OR LESSEE OR WHO OTHERWISE HOLDS A VALID LICENSE TO USE THE SOFTWARE WHICH IS BEING UPGRADED; AND (3) THE MAKING AND USE OF ADDITIONAL COPIES IS LIMITED TO NECESSARY BACKUP PURPOSES ONLY. 
-
-Proprietary Notices. Customer agrees to maintain and reproduce all copyright and other proprietary notices on all copies, in any form, of the Software in the same form and manner that such copyright and other proprietary notices are included on the Software. Except as expressly authorized in this Agreement, Customer shall not make any copies or duplicates of any Software without the prior written permission of Vidyo.
- 
-Term and Termination. This Agreement and the license granted herein shall remain effective until terminated as specified in the related order or under this section. Customer may terminate this Agreement and the license any time by destroying all copies of Software and any Documentation. Customer's rights under this Agreement will terminate immediately without notice from Vidyo if Customer fails to comply with any provision of this Agreement. Upon termination, Customer shall destroy all copies of Software and Documentation in its possession or control. All confidentiality obligations of Customer and all limitations of liability and disclaimers and restrictions of warranty shall survive termination of this Agreement. In addition, the provisions of the sections titled " United States Government Restricted Rights." and "General Terms Applicable to the Limited Warranty Statement and End User License" shall survive termination of this Agreement. Any other clauses which by their terms are required for the enforcement of this Agreement shall survive termination. 
-
-Export. Products, Software and Documentation, including technical data, may be subject to U.S. export control laws, including the U.S. Export Administration Act and its associated regulations, and may be subject to export or import regulations in other countries. Customer agrees to comply strictly with all such regulations and acknowledges that it has the responsibility to obtain licenses to export, re-export, or import Products, Software and Documentation.
-
-United States Government Restricted Rights.
-The Software and Documentation are provided with Restricted Rights and qualify as `commercial items' consisting of `commercial computer software' and`computer software documentation' as such terms are defined and used at FAR (48 C.F.R.) 2.101 and FAR 12.212 . Use, duplication, or disclosure by the government is subject to restrictions as set forth in subparagraph (c)(f)(ii) of the Rights in Technical Data and Computer Software clause at DFARS 252.227-7013 or subparagraphs (c) (1) and (2) of the Commercial Computer Software-Restricted Rights at 48 C.F.R. S:52.227-19, as applicable.
-            
-General Terms Applicable to the End User License, Limited Warrant Statement and Disclaimer of Liabilities. REGARDLESS WHETHER ANY REMEDY SET FORTH HEREIN FAILS OF ITS ESSENTIAL PURPOSE OR OTHERWISE, IN NO EVENT WILL VIDYO OR ITS SUPPLIERS BE LIABLE FOR ANY LOST REVENUE, PROFIT, OR LOST OR DAMAGED DATA, BUSINESS INTERRUPTION, LOSS OF CAPITAL, OR FOR SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL, OR PUNITIVE DAMAGES HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY OR WHETHER ARISING OUT OF THE USE OF OR INABILITYTO USE SOFTWARE OR OTHERWISE AND EVEN IF VIDYO OR ITS SUPPLIERS OR LICENSORS HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. In no event shall Vidyo's or its suppliers' or licensors' liability to Customer, whether in contract, tort (including negligence), breach of warranty,or otherwise, exceed the price paid by Customer for the Software that gave rise to the claim or if the Software is part of another Vidyo Product, the price paid for such other Vidyo Product. BECAUSE SOME STATES OR JURISDICTIONS DO NOT ALLOW LIMITATION OR EXCLUSION OF CONSEQUENTIAL OR INCIDENTAL DAMAGES, THE ABOVE LIMITATION MAY NOT APPLY TO YOU.
-
-Customer agrees that the limitations of liability and disclaimers set forth herein will apply regardless of whether Customer has accepted the Software or any other product or service delivered by Vidyo. Customer acknowledges and agrees that Vidyo has set its prices to end users and to Vidyo's authorized resellers and entered into this Agreement in reliance upon the disclaimers of warranty and the limitations of liability set forth herein, that the same reflect an allocation of risk between the parties (including the risk that a contract remedy may fail of its essential purpose and cause consequential loss), and that the same form an essential basis of the bargain between the parties. The validity, construction and performance of this Agreement shall be governed by and construed in accordance with the laws of the State of New Jersey, United States, without reference to or application of choice of law rules or principles. The exclusive venue for any dispute arising under this Agreement shall be within the competent courts in the State of New Jersey, USA. The United Nations Convention on the International Sale of Goods shall not apply. If any portion hereof is found to be void or unenforceable, the remaining provisions of the Agreement shall remain in full force and effect. Except as expressly provided herein, this Agreement constitutes the entire agreement between the parties with respect to the terms herein and Documentation and supersedes any conflicting or additional terms contained in any purchase order or elsewhere, all of which terms are excluded. This Agreement has been written in the English language, and the parties agree that the English version will govern. 
-
-Infringement Indemnification.(a) Vidyo will defend or settle, at its expense, any action brought against Customer based upon the claim that the Software or Product, if used within the scope of the License granted under this Agreement, directly infringe a registered United States, European Union or Commonwealth patent or copyright; provided, however, that: (i) Customer shall notify Vidyo promptly in writing of any such claim; (ii) Customer shall not enter into any settlement or compromise any claim without Vidyo's prior written consent; (iii) Vidyo shall have sole control of any such action and settlement negotiations; and (iv) Customer shall provide Vidyo with information and assistance, at Vidyo's request, necessary to settle or defend such claim. Vidyo agrees to pay all damages and costs finally awarded against Customer attributable to such claim. The foregoing states the sole liability of Vidyo and the exclusive remedy of Customer for any infringement of intellectual property rights by the Product or any other items provided by Vidyo hereunder.(b) If the Product or Software becomes, or in the opinion of Vidyo may become, the subject of a claim of infringement of any third party right, Vidyo may, at its option and in its discretion: (i) procure for Customer the right to use the Product free of any liability; (ii) replace or modify the Product to make it non-infringing; or (iii) repurchase the applicable licenses or Products. (c) Customer will defend or settle, at its expense, any action brought against Vidyo based upon the claim that any modifications to the Product or combination of the Product with products infringes or violates any third party right; provided, however, that: (i) Vidyo shall notify Customer promptly in writing of any such claim; (ii) Vidyo shall not enter into any settlement or compromise any such claim without Customer's prior written consent; iii) Customer shall have sole control of any such action and settlement negotiations; and (iv) Vidyo shall provide Customer with information and assistance, at Customer's request and expense, necessary to settle or defend such claim. Customer agrees to pay all damages and costs finally awarded against Vidyo attributable to such claim.(d) Notwithstanding Subsection (a) above, Vidyo assumes no liability hereunder for, and shall have no obligation to defend Customer or to pay costs, damages or attorney's fees for, any claim based upon any modifications to the Product not provided by Vidyo or combination of the Product with other products.
diff --git a/licenses/vmware b/licenses/vmware
deleted file mode 100644
index 68daa07960bf..000000000000
--- a/licenses/vmware
+++ /dev/null
@@ -1,221 +0,0 @@
-                   END USER LICENSE AGREEMENT
-             FOR VMWARE(TM) DESKTOP SOFTWARE PRODUCT
-
-
-VMWARE, INC. LICENSES THIS DESKTOP SOFTWARE PRODUCT TO YOU SUBJECT TO
-YOUR ACCEPTANCE OF ALL OF THE TERMS CONTAINED IN THIS END USER LICENSE
-AGREEMENT ("EULA").  READ THE TERMS OF THIS EULA CAREFULLY.  IF YOU DO
-NOT ACCEPT THIS AGREEMENT AND YOU HAVE PROOF OF PAYMENT, YOU MAY RETURN
-THE UNOPENED SOFTWARE TO THE LOCATION AT WHICH YOU ACQUIRED IT WITHIN
-THIRTY  (30) DAYS FOR A REFUND OF THE LICENSE FEE.  IF YOU ARE VIEWING
-THIS EULA ELECTRONICALLY, SELECT THE "YES" BUTTON AT THE BOTTOM OF THIS
-PAGE TO INDICATE YOUR AGREEMENT TO THE TERMS OF THIS EULA.  IF YOU ARE NOT
-WILLING TO BE BOUND BY ITS TERMS, SELECT THE "NO" BUTTON AT THE BOTTOM OF
-THIS PAGE AND THE REGISTRATION OR INSTALLATION PROCESS WILL NOT CONTINUE.
-
-NOTICE TO CUSTOMER
-If you do not agree to the terms of this EULA, do not install, activate,
-or use this software.  This EULA is a contract between you (either an
-individual or an entity) and VMware, Inc. ("VMware"), which governs
-your use of the VMware software product that accompanies this EULA
-and related software components, which may include associated media,
-printed materials, and online or electronic documentation.
-
-DEFINITIONS
-In this EULA, the Desktop software and associated media, printed
-materials, and online or electronic documentation are collectively
-referred to as the "Software."  When installed, the Software enables
-you to run one or more instances of third-party operating systems
-("Guest Operating Systems") and applications on a single computer system.
-A software activation file and a serial number ("Software License Key")
-issued to you by VMware are required to use the Software.  The term
-"Number of Licensed Users" means the number one (1), unless you received
-a VMware License Certificate with this software product, in which case
-the term "Number of Licensed Users" means the Number of Licensed Users
-set forth on the VMware License Certificate.
-
-WARNING FOR EVALUATION LICENSEES
-The Software can be activated with a no-cost evaluation Software
-License Key.  Evaluation Software License Keys have an expiration date
-("Expiration Date").  If you activate the Software with an evaluation
-Software License Key: (i) you may use the Software until the Expiration
-Date only to evaluate the suitability of the Software for licensing
-on a for-fee basis; (ii) the limited 90-day warranty below is not
-applicable to you; and (iii) THE SOFTWARE IS PROVIDED TO YOU "AS IS"
-WITHOUT WARRANTY OF ANY KIND, WHETHER EXPRESS, IMPLIED, STATUTORY, OR
-OTHERWISE.  VMWARE BEARS NO LIABILITY FOR ANY DAMAGES RESULTING FROM USE
-(OR ATTEMPTED USE) OF THE SOFTWARE THROUGH OR AFTER THE EXPIRATION DATE,
-AND HAS NO DUTY TO PROVIDE SUPPORT TO YOU.
-
-LICENSE
-The Software is licensed, not sold.  Subject to the terms and limitations
-of this EULA, VMware hereby grants you a nonexclusive, nontransferable
-license, without rights to sublicense, to (i) make a number of copies
-of the Software less than or equal to the Number of Licensed Users for
-the purpose of installing a single copy of the Software on an equivalent
-number of computers, each of which is running a validly licensed copy
-of the operating system for which the Software is designed; (ii) use
-the Software License Key to activate each copy of the Software made in
-accordance with sub-clause (i); (iii) have up to the Number of Licensed
-Users use the Software (in object code form only) solely for your
-own internal information processing services and computing needs; and
-(iv) use the documentation accompanying the Software in connection with
-permitted uses of the Software.  If you are an entity, each copy of the
-Software may be used by one designated individual user only.  The total
-number of designated users may not exceed the Number of Licensed Users.
-Each copy of the Software may not be used by any other person, whether or
-not such person is employed by or otherwise associated with your entity.
-
-LIMITED SHARED USE LICENSE
-For shared use computing laboratory environments within academic
-institutions, the license grant above shall be modified to permit use
-of the Software on a single computer system without the limitation
-that such use be limited to the designated user(s); provided that any
-such user(s) agree to and abide by the terms of this EULA; provided
-further that you must acquire and dedicate a Software License Key for
-each separate computer system on which the Software is installed. Under
-this shared computing laboratory use license, a computing laboratory at
-an academic institution having ten computers loaded with the Software
-on which no more than five users would concurrently access and use the
-Software, for example, would require ten Software License Keys. Unless
-the computing laboratory is operated and maintained by and within an
-academic institution, this limited shared use license does not apply.
-
-LICENSE LIMITATIONS
-You may not copy the Software except for a reasonable number of
-machine-readable copies of the Software for backup or archival purposes
-and except as expressly permitted in the License section above.  You may
-not share or use concurrently the Software except as expressly permitted
-in the Limited Shared Use License section above.  You may not remove
-any titles, trademarks or trade names, copyright notices, legends, or
-other proprietary markings on the Software.  You are not granted any
-rights to any trademarks or service marks of VMware.  VMware retains
-all rights not expressly granted to you.
-
-LICENSE AS UPGRADE OF PREVIOUSLY LICENSED PRODUCT
-If you purchased this Desktop software product as an upgrade at the
-applicable upgrade price, then you must have previously purchased a
-prior version of this Desktop software product at the applicable product
-(not upgrade) price.  If you have not purchased a prior version at the
-applicable product price, then please contact the vendor from whom you
-purchased the upgrade, or, if you are unable to contact your vendor,
-VMware, to make payment for the difference between the upgrade price
-and the product price within thirty (30) days of the date you purchased
-the upgrade.  If you do not make the appropriate payment to your vendor
-or VMware within thirty (30) days, this EULA will automatically terminate
-and you must comply with the termination provisions below.
-
-LICENSES REQUIRED FOR THIRD-PARTY SOFTWARE
-The Software allows multiple Guest Operating Systems and applications to
-run on a single computer system. You are responsible for obtaining any
-licenses necessary to operate any such third-party software, including
-Guest Operating Systems. In the event that the Software includes a valid
-licensed copy of a Guest Operating System for pre-installation with
-the Software, the use of such Guest Operating System shall be defined
-by the end user license agreement for that Guest Operating System.
-By explicitly accepting this EULA, or by installing, copying, downloading,
-accessing, or otherwise using the Software and/or Software License Key,
-you are acknowledging and agreeing to be bound by the terms of the end
-user license agreement for the pre-installed Guest Operating System,
-which terms accompany the Guest Operating System.
-
-PROPRIETARY RIGHTS RESERVED BY VMWARE
-VMware retains all right, title, and interest in and to the Software and
-the Software License Key and in all related copyrights, trade secrets,
-patents, trademarks, and any other intellectual and industrial property
-and proprietary rights, including registrations, applications, renewals,
-and extensions of such rights.
-
-RESTRICTIONS
-You may not (i) sell, lease, license, sublicense, or otherwise transfer
-in whole or in part the Software or the Software License Key to another
-party; (ii) provide, disclose, divulge or make available to, or permit
-use of the Software in whole or in part by, any third party, including
-contractors, without VMware's prior written consent; (iii) decompile,
-disassemble, reverse engineer, or otherwise attempt to derive source code
-from the Software, in whole or in part; (iv) modify or create derivative
-works based upon the Software; or (v) use the Software to provide network,
-application hosting or other services to third parties, or otherwise
-use the Software on a service bureau or hosting basis for your customers.
-
-SUPPORT SERVICES
-VMware may provide limited web-based support services related to
-the Software for a period of thirty (30) days after the date of
-purchase. Additional support services may be purchased separately.
-Any such support services provided by VMware will be governed by the
-VMware polices and programs described in online documentation and other
-VMware provided materials.  Any supplemental software code or related
-materials that VMware provides to you as part of any support services are
-to be considered part of the Software and are subject to the terms and
-conditions of this EULA.  VMware may use any technical information you
-provide to VMware for any VMware business purposes without restriction,
-including for product support and development. VMware will not use
-information in a form that personally identifies you.
-
-UPDATES AND UPGRADES NOT INCLUDED
-This EULA does not give you any rights to any updates or upgrades to the
-Software or to any extensions or enhancements to the Software developed
-by VMware at any time in the future.  Rights to any future developments
-will be governed by a separate subscription contract that you may sign
-with VMware or by the end user license agreement relating to those
-developments, in each case as described in the online documentation or
-other VMware provided materials.
-
-TERMINATION
-VMware may terminate this EULA if you fail to comply with any term of
-this EULA.  In the event of termination, you must destroy all copies of
-the Software and Software License Key.  In addition you must remove all
-copies of the Software from the computer(s) on which it is installed.
-
-GOVERNMENT RESTRICTIONS
-You may not export or re-export the Software except in compliance with
-the United States Export Administration Act and the related rules and
-regulations and similar non-U.S. government restrictions, if applicable.
-The Software and accompanying documentation are deemed to be "commercial
-computer software" and "commercial computer software documentation,"
-respectively, pursuant to DFAR Section 227.7202 and FAR Section 12.212(b),
-as applicable.  Any use, modification, reproduction, release, performing,
-displaying, or disclosing of the Software by the U.S. Government shall
-be governed solely by the terms of this EULA.
-
-LIMITED WARRANTY
-VMware warrants that the media, if any, on which the Software is delivered
-will be free of defects and that the Software will substantially conform
-to the description contained in the applicable documentation, in each
-case for a period of 90 days after the date of delivery of the Software
-License Key.  EXCEPT FOR THE PRECEDING EXPRESS LIMITED WARRANTY, VMWARE
-MAKES AND YOU RECEIVE NO WARRANTIES  ON THE SOFTWARE, EXPRESS, IMPLIED,
-STATUTORY, OR IN ANY OTHER PROVISION OF THIS EULA OR COMMUNICATION
-WITH YOU, AND VMWARE SPECIFICALLY DISCLAIMS ANY IMPLIED WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
-
-LIMITATION OF LIABILITY
-IN NO EVENT WILL VMWARE BE LIABLE FOR ANY LOST PROFITS OR BUSINESS
-OPPORTUNITIES, LOSS OF USE, BUSINESS INTERRUPTION, LOSS OF DATA, OR
-ANY OTHER INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-UNDER ANY THEORY OF LIABILITY, WHETHER BASED IN CONTRACT, TORT,
-NEGLIGENCE, PRODUCT LIABILITY, OR OTHERWISE.  THIS LIMITATION SHALL
-APPLY REGARDLESS OF WHETHER VMWARE HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES. VMWARE'S LIABILITY UNDER THIS EULA WILL NOT, IN ANY EVENT,
-EXCEED THE LICENSE FEES, IF ANY, PAID BY YOU TO VMWARE FOR THE SOFTWARE
-LICENSED BY YOU UNDER THIS EULA.
-
-GENERAL
-This EULA is governed by the laws of the State of California,
-U.S.A. without regard to conflict of law principles. The United Nations
-Convention for the International Sale of Goods shall not apply.  This EULA
-is the entire agreement between us and supersedes any other communications
-or advertising with respect to the Software.  If any provision of this
-EULA is held invalid, the remainder of this EULA shall continue in full
-force and effect.  This EULA may be modified only by written agreement
-signed by authorized representatives of you and VMware.
-
-CONTACT INFORMATION
-If you have any questions about this EULA, or if you want to contact
-VMware for any reason, please direct all correspondence to: VMware,
-Inc., 3145 Porter Drive, Building F, Palo Alto, CA 94304, United States
-of America or email info@vmware.com.
-
-VMware is a trademark of VMware, Inc.
-
-
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index ced14cbcc8d4..04ebb71d313c 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest
index fe1fdfbd0e13..be62630449ce 100644
--- a/mail-client/claws-mail/Manifest
+++ b/mail-client/claws-mail/Manifest
@@ -1,10 +1,8 @@
 AUX claws-mail-3.15.0-old_profile_segfault.patch 2758 BLAKE2B 64b98598814de6ac03894a7750a1da40edda7b8468c32b87f74c83f1fd6027c51d1804a95570909525630b7aff6f1eac81c1d8ad55f87538f32f03bac85aad83 SHA512 3ef1a001b6817d42b626754160aeb971263cca066294d9683403079d08eadbe86a9661ff6dbc8f3034c10db12d6d8b99a74f22f315b03fcf6e8ee581ca44583b
-DIST claws-mail-3.13.2.tar.xz 5582600 BLAKE2B c1dd3e86e4b36e2823c910ddce6541a18ef693935994e6be9492496dcfced4263c389e893c807a32d019ac06f7382df8eabfe737f4cf4f2fc529c69e31131a95 SHA512 7356a4286fc76e215746de846f412e80b4d21c3be90ac8edd7719be2874569f953ce5c094e4a20b0c467db994d710135fc14bcb01f8fb4e947bf7d1666261ea3
-DIST claws-mail-3.14.1.tar.xz 5812444 BLAKE2B ba4f65a594bb824fe37ef8dc470fae0b8c0bd416fa6e60f712be0808203d9786aace04fcb8091c6caf38c718a49511629a121bcd9a979643bca013b69af2c203 SHA512 ee1653ebd14b8aee76e97ce81ec203e0beeea7074eba0aa34c69bceb0a80135cdb16e508009cb479047d5112abd7eaa4bdb7e46722f33a88419fb24eeb75ac30
 DIST claws-mail-3.15.0.tar.xz 5665648 BLAKE2B f25356372b65f2df072eb2774fca87514c2da59811e78650e26ae58c1b518e229cba62cf1b0d0ad72107e292c9d87450f7d2508c02f34c5c9c70d944f9866823 SHA512 667cb0ea2f7c5d8e8b6046313ed7698c378f504caeeaa54348ba228317538dfc040e4ddf80f4aaa1491858a7803954e89599b1e479febe7cf1ab4bae5a638dc8
 DIST claws-mail-3.15.1.tar.xz 5665468 BLAKE2B c6d4c5875f82f836815193b330427bdd533be5445706fc437b1c30be8e52325a2b824e8a1d1332bb286ac9ea2bd4b872943709d9ff78b20a6a3ff5b781808d25 SHA512 11113ab2bc75571b9a71b11ee3f7fe4773ff7b17132f29e6637aa7b7b9a7f8ed125430ee7e5ab5c9842463d776a96be150d7c8e1e3d682b955dd582a6a6ce68c
-EBUILD claws-mail-3.13.2.ebuild 5610 BLAKE2B 4bbe46b7ee7c0615a59c71c97222fd32f4fbba580fbe38e9f75fecefe66612aa8048fe35604998fb36ff805eaf1911c2372f5e1c6105d8663a9288699684aee3 SHA512 3e51d2f66fed531e77b498210026bc23362e092f775a60cf24695490e405880c7a45c99ba48b31679acdd57bfe613db1f850b7f645e244b341ee66ebbc7b398d
-EBUILD claws-mail-3.14.1-r1.ebuild 5570 BLAKE2B 4aab7e9636a2148e4258fb61e7f7e00c439aa9955bb599aada5de82eb0d1623b4d25b2a20ef490ca284a337786824af94fcb27a36c55b16b875a032363af482f SHA512 6b3913627ae1c11ede1f9c07b44206445ff0713cd725c6b02c86eeb856264e5a00f5080ca29dd871401b6041aae82af0b9b3a7b23c9c06d2ef12f63d8d582a76
+DIST claws-mail-3.16.0.tar.xz 5913948 BLAKE2B 6744045de6bc3945221569a9ae1cdcd849ec11c4f5dbfe966ca70c7c2ab3f5d9ded1dbd5bcedffdc756809c1802d31d955b5c6c53f20a00be5abc861db340d0f SHA512 5c96e21b4c5117b67ccfe4178c68e2f1b1449f882d6ecf22041e41f08fd607c6ce7afe6c7fdbd039da7ffc5673d366551b15d3e4b7de8d758fc1554a8eadc55e
 EBUILD claws-mail-3.15.0-r2.ebuild 5772 BLAKE2B 0425ac3ea56b9877d29ff7423c1f819563657c313e4de0e0e7269a0d4289480394fba59ca2399af40cb6dc74ac0b8064e9c6377b5bd032c3a13d931601b56bb8 SHA512 dc8cec723c25881eb73c876996ac48ef95a5d3c19cb4ce2eb55a7e37b33b7c1b3549f462d21f0a8204199c590205933a334004b9b810e42bc520572c1a3b511a
 EBUILD claws-mail-3.15.1.ebuild 5715 BLAKE2B 2ad97877ac1c200044d6419922396c7e8f389df75aaee53f80f04cb551ee2463d09592b0cd4d90758fef09016f7a1a26d615036d58630146a2ee17fbcb1b0b3d SHA512 a27fbf82daa240cb27975ebc254ae9a7cf4b04d6cb6750276a91b7746579a5bb561172c73b7a8e384adc0c7eca419e198cd5241c5350399c5d19ece1bb9aa396
-MISC metadata.xml 1716 BLAKE2B 7822f11d535e99ac8ce2a918b5aef1f0979f045e1f4422d66d41e0af8a78d2e3b14791a172d8ccb6eaa7c1cd73a7596662114dbd16cea07b102b4d65d1e94739 SHA512 2246148a5fe3ecd1b097a1037ba08ef2c175b7d93ceaeb7e9b2a49b9397a47e9f98e4a510f3f2224e94a3aa7982af2b77df2c917496a01c44602e866924b3a5b
+EBUILD claws-mail-3.16.0.ebuild 5715 BLAKE2B 2ad97877ac1c200044d6419922396c7e8f389df75aaee53f80f04cb551ee2463d09592b0cd4d90758fef09016f7a1a26d615036d58630146a2ee17fbcb1b0b3d SHA512 a27fbf82daa240cb27975ebc254ae9a7cf4b04d6cb6750276a91b7746579a5bb561172c73b7a8e384adc0c7eca419e198cd5241c5350399c5d19ece1bb9aa396
+MISC metadata.xml 1601 BLAKE2B 7827fe2821ee1e9a6ddc747f269de28106a0ad9855fce1a298a0bef5a00de1383d0798bd3239e888dd0f88b477112ec14d4dcb9488c1709d6064b9fe9a2bad13 SHA512 824a2702d57d86e0ebfd451e12f374010559956e5770c65028c819b799de4e72a156c80587278fff7d246a5f402aeee8a30fae53a4c84a8922cd050a7c1c9340
diff --git a/mail-client/claws-mail/claws-mail-3.13.2.ebuild b/mail-client/claws-mail/claws-mail-3.13.2.ebuild
deleted file mode 100644
index 3f0fc0bfdde9..000000000000
--- a/mail-client/claws-mail/claws-mail-3.13.2.ebuild
+++ /dev/null
@@ -1,187 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-AUTOTOOLS_AUTORECONF=yes
-
-inherit autotools-utils multilib gnome2-utils eutils python-single-r1
-
-DESCRIPTION="An email client (and news reader) based on GTK+"
-HOMEPAGE="http://www.claws-mail.org/"
-
-SRC_URI="http://www.claws-mail.org/download.php?file=releases/${P}.tar.xz"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="alpha amd64 ~arm hppa ~mips ~ppc ~ppc64 sparc x86 ~x86-fbsd"
-
-IUSE="archive bogofilter calendar clamav dbus debug doc gdata gtk3 +imap ipv6 ldap +libcanberra +libindicate +libnotify networkmanager nntp +notification pda pdf perl +pgp python rss session sieve smime spamassassin spam-report spell +gnutls startup-notification valgrind webkit xface"
-REQUIRED_USE="libcanberra? ( notification )
-	libindicate? ( notification )
-	libnotify? ( notification )
-	networkmanager? ( dbus )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	smime? ( pgp )"
-
-COMMONDEPEND=">=sys-devel/gettext-0.12.1
-	gdata? ( >=dev-libs/libgdata-0.17.1 )
-	gtk3? ( x11-libs/gtk+:3 )
-	!gtk3? ( >=x11-libs/gtk+-2.20:2 )
-	pda? ( >=app-pda/jpilot-0.99 )
-	gnutls? ( >=net-libs/gnutls-2.2.0 )
-	ldap? ( >=net-nds/openldap-2.0.7 )
-	pgp? ( >=app-crypt/gpgme-0.4.5 )
-	valgrind? ( dev-util/valgrind )
-	dbus? ( >=dev-libs/dbus-glib-0.60 )
-	spell? ( >=app-text/enchant-1.0.0 )
-	imap? ( >=net-libs/libetpan-0.57 )
-	nntp? ( >=net-libs/libetpan-0.57 )
-	startup-notification? ( x11-libs/startup-notification )
-	session? ( x11-libs/libSM
-			x11-libs/libICE )
-	archive? ( app-arch/libarchive
-		>=net-misc/curl-7.9.7 )
-	bogofilter? ( mail-filter/bogofilter )
-	notification? (
-		libnotify? ( x11-libs/libnotify )
-		libcanberra? (  media-libs/libcanberra[gtk] )
-		libindicate? ( dev-libs/libindicate:3[gtk] )
-		dev-libs/glib:2
-	)
-	smime? ( >=app-crypt/gpgme-0.4.5 )
-	calendar? ( >=net-misc/curl-7.9.7 )
-	pdf? ( app-text/poppler[cairo] )
-	spam-report? ( >=net-misc/curl-7.9.7 )
-	webkit? ( >=net-libs/webkit-gtk-1.0:2 )
-"
-
-DEPEND="${COMMONDEPEND}
-	app-arch/xz-utils
-	xface? ( >=media-libs/compface-1.4 )
-	virtual/pkgconfig"
-
-RDEPEND="${COMMONDEPEND}
-	pdf? ( app-text/ghostscript-gpl )
-	clamav? ( app-antivirus/clamav )
-	networkmanager? ( net-misc/networkmanager )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS}
-		>=dev-python/pygtk-2.10.3 )
-	rss? ( net-misc/curl
-		dev-libs/libxml2 )
-	app-misc/mime-types
-	x11-misc/shared-mime-info"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	# Don't use libsoup-gnome (bug #565924)
-	export HAVE_LIBSOUP_GNOME=no
-
-	local myeconfargs=(
-		$(use_enable debug crash-dialog)
-		$(use_enable valgrind valgrind)
-		$(use_enable doc manual)
-		$(use_enable gtk3)
-		$(use_enable ipv6)
-		$(use_enable ldap)
-		$(use_enable dbus dbus)
-		$(use_enable networkmanager)
-		$(use_enable pda jpilot)
-		$(use_enable session libsm)
-		$(use_enable spell enchant)
-		$(use_enable gnutls)
-		$(use_enable startup-notification)
-		$(use_enable xface compface)
-		$(use_enable archive archive-plugin)
-		$(use_enable bogofilter bogofilter-plugin)
-		$(use_enable calendar vcalendar-plugin)
-		$(use_enable clamav clamd-plugin)
-		$(use_enable gdata gdata-plugin)
-		$(use_enable notification notification-plugin)
-		$(use_enable pdf pdf_viewer-plugin)
-		$(use_enable perl perl-plugin)
-		$(use_enable pgp pgpmime-plugin)
-		$(use_enable pgp pgpinline-plugin)
-		$(use_enable pgp pgpcore-plugin)
-		$(use_enable python python-plugin)
-		$(use_enable rss rssyl-plugin)
-		$(use_enable spamassassin spamassassin-plugin)
-		$(use_enable sieve managesieve-plugin)
-		$(use_enable smime smime-plugin)
-		$(use_enable spam-report spam_report-plugin)
-		$(use_enable webkit fancy-plugin)
-		--enable-alternate-addressbook
-		--enable-nls
-		--enable-acpi_notifier-plugin
-		--enable-address_keeper-plugin
-		--enable-att_remover-plugin
-		--enable-attachwarner-plugin
-		--enable-fetchinfo-plugin
-		--enable-mailmbox-plugin
-		--enable-newmail-plugin
-		--enable-tnef_parse-plugin
-		--disable-generic-umpc
-		--disable-bsfilter-plugin
-	)
-
-	# libetpan is needed if user wants nntp or imap functionality
-	if use imap || use nntp; then
-		myeconfargs+=( --enable-libetpan )
-	else
-		myeconfargs+=( --disable-libetpan )
-	fi
-
-	autotools-utils_src_configure
-}
-
-src_install() {
-	local DOCS=( AUTHORS ChangeLog* INSTALL* NEWS README* TODO* )
-	autotools-utils_src_install
-
-	# Makefile install claws-mail.png in /usr/share/icons/hicolor/48x48/apps
-	# => also install it in /usr/share/pixmaps for other desktop envs
-	# => also install higher resolution icons in /usr/share/icons/hicolor/...
-	insinto /usr/share/pixmaps
-	doins ${PN}.png
-	local res resdir
-	for res in 64x64 128x128 ; do
-		resdir="/usr/share/icons/hicolor/${res}/apps"
-		insinto ${resdir}
-		newins ${PN}-${res}.png ${PN}.png
-	done
-
-	docinto tools
-	dodoc tools/README*
-
-	domenu ${PN}.desktop
-
-	einfo "Installing extra tools"
-	cd "${S}"/tools
-	exeinto /usr/$(get_libdir)/${PN}/tools
-	doexe *.pl *.py *.conf *.sh
-	doexe tb2claws-mail update-po uudec uuooffice
-
-	# kill useless files
-	rm -f "${D}"/usr/lib*/claws-mail/plugins/*.{a,la}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	ewarn "When upgrading from version 3.9.0 or below some changes have happened:"
-	ewarn "- There are no individual plugins in mail-client/claws-mail-* anymore, but they are integrated mostly controlled through USE flags"
-	ewarn "- Plugins with no special dependencies are just built and can be loaded through the interface"
-	ewarn "- The gtkhtml2, dillo and trayicon plugins have been dropped entirely"
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/mail-client/claws-mail/claws-mail-3.14.1-r1.ebuild b/mail-client/claws-mail/claws-mail-3.16.0.ebuild
index 8a2efc8f690f..69f04ac6397a 100644
--- a/mail-client/claws-mail/claws-mail-3.14.1-r1.ebuild
+++ b/mail-client/claws-mail/claws-mail-3.16.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
-inherit autotools gnome2-utils eutils python-single-r1
+inherit autotools gnome2-utils python-single-r1 xdg-utils
 
 DESCRIPTION="An email client (and news reader) based on GTK+"
 HOMEPAGE="http://www.claws-mail.org/"
@@ -13,9 +13,9 @@ SRC_URI="http://www.claws-mail.org/download.php?file=releases/${P}.tar.xz"
 
 SLOT="0"
 LICENSE="GPL-3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86"
 
-IUSE="archive bogofilter calendar clamav dbus debug doc gdata +gnutls gtk3 +imap ipv6 ldap +libcanberra +libindicate +libnotify networkmanager nls nntp +notification pda pdf perl +pgp python rss session sieve smime spamassassin spam-report spell startup-notification valgrind xface"
+IUSE="archive bogofilter calendar clamav dbus debug doc gdata +gnutls gtk3 +imap ipv6 ldap +libcanberra +libindicate +libnotify networkmanager nls nntp +notification pda pdf perl +pgp python rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind xface"
 REQUIRED_USE="libcanberra? ( notification )
 	libindicate? ( notification )
 	libnotify? ( notification )
@@ -24,14 +24,18 @@ REQUIRED_USE="libcanberra? ( notification )
 	smime? ( pgp )"
 
 COMMONDEPEND="
+	net-mail/ytnef
 	archive? (
 		app-arch/libarchive
 		>=net-misc/curl-7.9.7
 	)
 	bogofilter? ( mail-filter/bogofilter )
-	calendar? ( >=net-misc/curl-7.9.7 )
+	calendar? (
+		>=dev-libs/libical-2.0.0
+		>=net-misc/curl-7.9.7
+	)
 	dbus? ( >=dev-libs/dbus-glib-0.60 )
-	gdata? ( >=dev-libs/libgdata-0.17.1 )
+	gdata? ( >=dev-libs/libgdata-0.17.2 )
 	gnutls? ( >=net-libs/gnutls-3.0 )
 	gtk3? ( x11-libs/gtk+:3 )
 	!gtk3? ( >=x11-libs/gtk+-2.20:2 )
@@ -56,6 +60,7 @@ COMMONDEPEND="
 	spam-report? ( >=net-misc/curl-7.9.7 )
 	spell? ( >=app-text/enchant-1.0.0 )
 	startup-notification? ( x11-libs/startup-notification )
+	svg? ( >=gnome-base/librsvg-2.40.5 )
 	valgrind? ( dev-util/valgrind )
 "
 
@@ -137,12 +142,13 @@ src_configure() {
 		$(use_enable spamassassin spamassassin-plugin)
 		$(use_enable spell enchant)
 		$(use_enable startup-notification)
+		$(use_enable svg)
 		$(use_enable valgrind valgrind)
 		$(use_enable xface compface)
 	)
 
 	# libetpan is needed if user wants nntp or imap functionality
-	if use imap || use nntp; then
+	if use imap || use nntp ; then
 		myeconfargs+=( --enable-libetpan )
 	else
 		myeconfargs+=( --disable-libetpan )
@@ -177,7 +183,7 @@ src_install() {
 	doexe tb2claws-mail update-po uudec uuooffice
 
 	# kill useless files
-	rm -f "${D}"/usr/lib*/claws-mail/plugins/*.{a,la}
+	rm -f "${ED%/}"/usr/lib*/claws-mail/plugins/*.{a,la}
 }
 
 pkg_preinst() {
@@ -190,8 +196,10 @@ pkg_postinst() {
 	ewarn "- Plugins with no special dependencies are just built and can be loaded through the interface"
 	ewarn "- The gtkhtml2, dillo and trayicon plugins have been dropped entirely"
 	gnome2_icon_cache_update
+	xdg_desktop_database_update
 }
 
 pkg_postrm() {
 	gnome2_icon_cache_update
+	xdg_desktop_database_update
 }
diff --git a/mail-client/claws-mail/metadata.xml b/mail-client/claws-mail/metadata.xml
index dd8c6462dc0e..2cddcb6d4d52 100644
--- a/mail-client/claws-mail/metadata.xml
+++ b/mail-client/claws-mail/metadata.xml
@@ -34,8 +34,6 @@
 			plugin</flag>
 		<flag name="valgrind">Add support for memory debugging
 			using valgrind</flag>
-		<flag name="webkit">Enables HTML e-mail rendering by using
-			the <pkg>net-libs/webkit-gtk</pkg> library.</flag>
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">sylpheed-claws</remote-id>
diff --git a/mail-client/nail/Manifest b/mail-client/nail/Manifest
index e8516550acb5..b63d6cbefc40 100644
--- a/mail-client/nail/Manifest
+++ b/mail-client/nail/Manifest
@@ -1,7 +1,5 @@
 AUX nail-12.4-debian.patch 1060 BLAKE2B dc07866c7871391e9bbddecfb5bb5addec4cffc16b93f03d0b6288a4fb95fdc546813ee16dd7a3eb3a03ded2c6889fe3c3e5a9b5fc8414d53b53079f17642ca4 SHA512 3cf37a64acf205bb8404e87e93cd920ee71ae8a9a2af147c21ef7d7b4684a05c1bf38eb3cf9e7a7fef7c883fb48de2324d3a687064f1adea3ab3949d6dcce513
 AUX nail-12.4-openssl-1.patch 1860 BLAKE2B e91b6a9f334060c6393aaa20120c0ce21bc6048c24aa097d57fd4eb73300ce864d6631e0b3a1202c43a9baab1bc11873e21d91f12d0478f8e81649ca9337bb6c SHA512 6496973734f4a4c724c3dc7c46a8fde160e4bd456405737098d65d193581c891e697d728b7ebc7cb0317f9ede9b39110e1b27b2bce896aee9eec85474758eeca
 DIST mailx-12.4.tar.bz2 271482 BLAKE2B ad011ef648036f10f800097c56a34cc5b882b808a7886eea86fa3dfc6f5a9a5b4e64e86e9b842384e4f55ce998ee8832176ce7e325c646ac26a187cbf26406a0 SHA512 a0e29972f552bd630ce1a14f70e61661815118520bcd4a00b6cad53f3270d3d08c835ff6982ba8800eb380a5b46f54eb6e60fb7533b5f41c916af45d29605af8
-EBUILD nail-12.4-r2.ebuild 2370 BLAKE2B 75c7511b910f99eec39004ac9ad52c5b271568fdffad6c6445261cea1e5bb435db1dc91de92a51ec7974d33a26d140ebfda9f33f2966ff26e81489d5b344e3e8 SHA512 026e36fffa7fe7386aa72fe1ad7fb498d37be430ed31937491edaa0b591d8963aa59597a770f0e0c7042bccf2ae9fbb96ea00d3e4143d1d543801e4c01e69dc2
-EBUILD nail-12.4-r3.ebuild 2436 BLAKE2B 764a0035f1f58447a10a2045553732365669a8de76c9e8542f5ddddeb0f0c24e31a10121d497b416aecfdc10e1c900a6ff3f9a5a0861c646ce7c79536eda5840 SHA512 fb42d0c912a55932d30216ff97ff7aa9832a8745465beb230e8f7cc978358f2da015d77b2fe5bbe76164fb7594c0847ea0d5c98682c672f7b7fba2ca820ac8f0
-EBUILD nail-12.4.ebuild 2177 BLAKE2B c0e767df2c9c19f7976d4eb0eb633fd472dbd8b117fa33735e86861487bccf3e0a9ccd6a4c7bb820957ca67ea2c23465c9eae97038d0d50f13ef9e42cab2f11f SHA512 e8697a8be27325b82aa4ff17b80878bbf0ea9bafa2c5bfa473789538efbb397b1e27c2aaa755f9ccddded1e7daef8262e36d7e2ab561ad78b35fa3a438a24762
+EBUILD nail-12.4-r3.ebuild 2431 BLAKE2B ca5556e0e56597904b4315aadaff3a66df315c0c2f48ca69ccade567241982ba13e3931dba39f16768feef741aa9b0487545d1ad1e656ddaa8c3f2ab692b9bed SHA512 abfd5dceda88571f26a8ae6c79739f4e270e600f8f5b5429b532c0ed84e85fddf2a2e809ea18858c3ed85ed49f7a34b7dae1389414fdd5bc81def832faedf958
 MISC metadata.xml 907 BLAKE2B c93a11b1488fe3c37220f683bdcc5fac0bf8bfb003ef0166c4632bb178047d7ae819294a83442f75e22fedfc2f50a31c24208833962d27158b59bc094e6fba79 SHA512 7f03613e2f7f8621b996d59a63505882925e755bbc8567a2c3dce3db0304e19ee007df2633fde5232877b71161eb51d037cf205a42b926d36d3aad111a9636d3
diff --git a/mail-client/nail/nail-12.4-r2.ebuild b/mail-client/nail/nail-12.4-r2.ebuild
deleted file mode 100644
index ca0cec9d82f5..000000000000
--- a/mail-client/nail/nail-12.4-r2.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-
-inherit eutils toolchain-funcs
-
-HOMEPAGE="http://heirloom.sourceforge.net/"
-DESCRIPTION="an enhanced mailx-compatible mail client"
-LICENSE="BSD"
-
-MY_PN="mailx"
-MY_P="${MY_PN}-${PV}"
-SRC_URI="mirror://sourceforge/project/heirloom/heirloom-${MY_PN}/${PV}/${MY_P}.tar.bz2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="ssl net kerberos"
-
-RDEPEND="
-	net? (
-		ssl? ( dev-libs/openssl )
-		kerberos? ( virtual/krb5 )
-	)
-	!mail-client/mailx
-	!net-mail/mailutils
-"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-undef() {
-	sed -i -e "/$1/s:#define:#undef:" config.h || die
-}
-
-droplib() {
-	sed -i -e "/$1/s:^:#:" LIBS || die
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-debian.patch \
-		"${FILESDIR}"/${P}-openssl-1.patch
-	# Do not strip the binary
-	sed -i -e '/STRIP/d' Makefile
-}
-
-src_configure() {
-	# Build config.h and LIBS, neccesary to tweak the config
-	# use -j1 because it will produce bogus output otherwise
-	emake -j1 config.h LIBS || die
-
-	# Logic to 'configure' the package
-
-	if ! use ssl || ! use net ; then
-		undef 'USE_\(OPEN\)\?SSL'
-		droplib -lssl
-	fi
-
-	if ! use kerberos || ! use net ; then
-		undef 'USE_GSSAPI'
-		droplib -lgssapi_krb5
-	fi
-
-	if ! use net ; then
-		undef 'HAVE_SOCKETS'
-	fi
-}
-
-src_compile() {
-	# No configure script to check for and set this
-	tc-export CC
-
-	emake \
-		CPPFLAGS="${CPPFLAGS} -D_GNU_SOURCE" \
-		PREFIX="${EPREFIX}"/usr SYSCONFDIR="${EPREFIX}"/etc \
-		SENDMAIL="${EPREFIX}/usr/sbin/sendmail" \
-		MAILSPOOL='/var/spool/mail' \
-		|| die "emake failed"
-}
-
-src_install () {
-	# Use /usr/sbin/sendmail by default and provide an example
-	cat <<- EOSMTP >> nail.rc
-
-		# Use the local sendmail (/usr/sbin/sendmail) binary by default.
-		# (Uncomment the following line to use a SMTP server)
-		#set smtp=localhost
-
-		# Ask for CC: list too.
-		set askcc
-	EOSMTP
-
-	emake DESTDIR="${D}" \
-		UCBINSTALL=$(type -p install) \
-		PREFIX="${EPREFIX}"/usr SYSCONFDIR="${EPREFIX}"/etc install \
-		|| die
-
-	dodoc AUTHORS README || die
-
-	dodir /bin
-	dosym ../usr/bin/mailx /bin/mail || die
-	dosym mailx /usr/bin/mail || die
-	dosym mailx /usr/bin/Mail || die
-
-	dosym mailx.1 /usr/share/man/man1/mail.1 || die
-	dosym mailx.1 /usr/share/man/man1/Mail.1 || die
-}
diff --git a/mail-client/nail/nail-12.4-r3.ebuild b/mail-client/nail/nail-12.4-r3.ebuild
index 1c0270cfcb5d..6cd0f0c264bf 100644
--- a/mail-client/nail/nail-12.4-r3.ebuild
+++ b/mail-client/nail/nail-12.4-r3.ebuild
@@ -13,7 +13,7 @@ MY_PN="mailx"
 MY_P="${MY_PN}-${PV}"
 SRC_URI="mirror://sourceforge/project/heirloom/heirloom-${MY_PN}/${PV}/${MY_P}.tar.bz2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="libressl ssl net kerberos"
 
 RDEPEND="
diff --git a/mail-client/nail/nail-12.4.ebuild b/mail-client/nail/nail-12.4.ebuild
deleted file mode 100644
index 00e9a0fd8c72..000000000000
--- a/mail-client/nail/nail-12.4.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-
-inherit eutils toolchain-funcs
-
-HOMEPAGE="http://heirloom.sourceforge.net/"
-DESCRIPTION="an enhanced mailx-compatible mail client"
-LICENSE="BSD"
-
-MY_PN="mailx"
-MY_P="${MY_PN}-${PV}"
-SRC_URI="mirror://sourceforge/project/heirloom/heirloom-${MY_PN}/${PV}/${MY_P}.tar.bz2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE="ssl net kerberos"
-
-RDEPEND="
-	ssl? ( dev-libs/openssl )
-	kerberos? ( virtual/krb5 )
-	!mail-client/mailx
-	!net-mail/mailutils
-"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-remove_ssl() {
-	elog "Disabling SSL support"
-	sed -i -e 's~#define USE_\(OPEN\)\?SSL~#undef USE_\1SSL~' config.h
-	sed -i -e 's~-ssl~~' -e 's~-lcrypto~~' LIBS
-}
-
-remove_sockets() {
-	elog "Not enabling sockets (thus disabling IMAP, POP and SMTP)"
-	sed -i -e 's~#define HAVE_SOCKETS~#undef HAVE_SOCKETS~' config.h
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-debian.patch \
-		"${FILESDIR}"/${P}-openssl-1.patch
-	# Do not strip the binary
-	sed -i -e '/STRIP/d' Makefile
-}
-
-src_configure() {
-	# Build config.h and LIBS, neccesary to tweak the config
-	make config.h LIBS
-
-	# Logic to 'configure' the package
-	if use net && ! use ssl ; then
-		remove_ssl
-	elif ! use net ; then
-		# Linking to ssl without net support is pointless
-		remove_ssl
-		remove_sockets
-	fi
-}
-
-src_compile() {
-	# No configure script to check for and set this
-	tc-export CC
-
-	emake \
-		CPPFLAGS="${CPPFLAGS} -D_GNU_SOURCE"
-		PREFIX="${EPREFIX}"/usr SYSCONFDIR="${EPREFIX}"/etc \
-		MAILSPOOL='/var/spool/mail' \
-		|| die "emake failed"
-}
-
-src_install () {
-	# Use /usr/lib/sendmail by default and provide an example
-	cat <<- EOSMTP >> nail.rc
-
-		# Use the local sendmail (/usr/lib/sendmail) binary by default.
-		# (Uncomment the following line to use a SMTP server)
-		#set smtp=localhost
-	EOSMTP
-
-	make DESTDIR="${D}" \
-		UCBINSTALL=$(type -p install) \
-		PREFIX="${EPREFIX}"/usr SYSCONFDIR="${EPREFIX}"/etc install \
-		|| die
-	dodoc AUTHORS README
-	dodir /bin
-	dosym /usr/bin/mailx /bin/mail
-	dosym /usr/bin/mailx /usr/bin/mail
-	dosym /usr/bin/mailx /usr/bin/Mail
-}
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index 72ee5d7c01a9..dce57db820ae 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index 971b562e7006..71f4eef1579d 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -26,8 +26,8 @@ DIST exim-4.89.tar.bz2 1844430 BLAKE2B 255bb3f27a264d92bf4664cf1278beabffa888006
 DIST exim-pdf-4.89.1.tar.bz2 1942785 BLAKE2B 588298b2c3007a94d40370463dec52d9b5c44b72e8c93e9b749e0ed513f1da045b58140f8802edfd9a5e9dd2d9911f70b4d4cdde3b3952c794c6abd9744ed3d9 SHA512 0b7944237fcadf708570c39a7963246fc70579fecafc746ed8e210c3319eed64a4678162c8c4243e84f48396b3b8bcbc3626523984a716b85564ee50c5712333
 DIST exim-pdf-4.89.tar.bz2 1924606 BLAKE2B f03182d51f4cc5b71cb65c2e0bcf74142f8110b6bfbd5b0fc05e321b692ebde5dbc84c4562a39ee85065f4d2db0654e6a189c826bfdea19051f56969d4ca74e2 SHA512 b04ea2e4dcdb1aaf52ef77ccd76e6599c68c4c6e5a98090720dbd3c50f7191bf3f6cd7dc2089a765c47576311780809cff547f85f004caec411d0f1ac9985299
 DIST system_filter.exim.gz 3075 BLAKE2B d05e872b5cef377d29126cda03fc0a74c8777b2119b76ff43da6e8de808035eb9bfcb034a85d81824f135d484e864bfc0629fc1af2c228a7277d5ee7cf9cde79 SHA512 cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3
-EBUILD exim-4.89-r1.ebuild 12241 BLAKE2B bd193a4137fdc6be1615fe85d60b0c4aad676b2158b47592a20545f068292b1b92f71ac36b22da24b0aae6ed1cc12b701fd5d72bb7d3adec8c995730e0da83b3 SHA512 7ff6fa9d2b968a65e4b1e014f4bc1c53d7d1282a45893132aafdbceb403172a02c1455242a266960b4d403db3ca981fffaa8cc82028964e2c72dac8a0da347dc
-EBUILD exim-4.89-r3.ebuild 12401 BLAKE2B 40e24ad653011522ff3d42b2fac04be3a603ebe106d980ae64640fff8399a62df1503826fad1bc80a1f2bbd6eed8e08492c9bd49dfb461967ca408f68ed19a50 SHA512 4a529526216963f566d5c30ecdfadbfdbeac276d8187b90b8e6aa6be17b6bffda64ae66e9ae7b77ada193812125669d72a524fd9095af58ee2561cfd7df0d76a
-EBUILD exim-4.89-r5.ebuild 12544 BLAKE2B d7eeac8177ebce7364facb549e5ff9201cd2e4ee8db1657a8983c841848a2538e25dbc7332348301db0efa6164aac20edf2214cfb99809c80aeb198254b8a126 SHA512 17349f3ee92aff0ff43ac13911c0d6a5004f3c8a63dea19b5c3ded6a08c52f8aa219f6a6a559ded9c2b0da8c5cb803e2688f6b0938a1f2a9c732ebf57b2985d5
-EBUILD exim-4.89.1.ebuild 12267 BLAKE2B 885d2f6d47f2d24ae64ddd81dca542489d8da050b7ca4cc5a66cfb449fd8aaa77a4a37cf6aaa1e826e2c2f750baa28bef256d37a9e18c88f5887b123d0a26f5d SHA512 e7e55e2781974982ba1ba5de76210bebb806853ca0ccc6f6fd82b3574964b099ee066c34a499edbfeca62ee258d4b7f813f6d583d6c542650a8c94286e628233
+EBUILD exim-4.89-r1.ebuild 12275 BLAKE2B ddda4ce9e499eef9243a0239e290b8a4af85cd247cfe1bb2ae0b4a77974a96ffa2559623d5ff8e0034985b8ca25e1fcf11ec1c432d82ed31b0c9d3d801ab00c6 SHA512 954fc08d9d7b319f404e349abbcde6188717cbd6012ed325f673615e79766bbd360993ad7afe6b17976162e965b94b2b5a7eb127ccacf868b8a82048ae0d1f70
+EBUILD exim-4.89-r3.ebuild 12435 BLAKE2B bf255c5a66084c23320f37929de45731364690a23961982ade4a6b44027e01048f66caa9f30f5f42f37345aa99c8c3e9441452a724db69225dae6ffdbd5b755e SHA512 2da4c674e67518521c0e7adbb0be23265e024425625b9d1ac47061233368f7279d4a482e7507b8e245c2113c0fd197ae3d982c4946ecfeefd8f995713726e2b5
+EBUILD exim-4.89-r5.ebuild 12578 BLAKE2B 771ba0b738fa44cd62611ddb8e7c402100b30af0255053dd463ab35debeac1ca6faf70b4c9bace4b128e9bf341995c0c3dd192c0d41ca6114eeab0377fe71e41 SHA512 4c417876d681f11d8f5a0b6a97825621cbc137e19ff48f9f8d9d38f5c6ce6d1277c9de80d1ec4c5cc388fa3b4e83cdd8e1280c4b0c9bda5886434455707a6eb0
+EBUILD exim-4.89.1.ebuild 12301 BLAKE2B 7ecad73cd39ee34c1bfb6a52f0fa93151e308f0a80b799a78ab1284e4a9798344a60ba89c223239085fb0dd9c1ed75cef1e780771e22f0e9df36850b9f4fbdf7 SHA512 f3bb3a44600d182aa03c7fe813afe7801e72e852da03777d9cc2572b1928856cdca5622b44634732ae98d5b4eac480b90464064aefcaf4906f9a266ea00c6e63
 MISC metadata.xml 2482 BLAKE2B 8cc92e47224d8afbc72bd61d6651887f5211c4ebe36ae1d38e55ed395dee9574307b075bcf36fcd0761be0358c2bc27cfc0e60294a48483b444d4534f5c0b9da SHA512 dcda0d8164098a41d7defa30b84b36bfdc6fc1fecce2dc680aa22341f67be9dad281bdee0b6f9028459b4a62d4f3a83a16bd1cdca99238b114532c7b06f5c25f
diff --git a/mail-mta/exim/exim-4.89-r1.ebuild b/mail-mta/exim/exim-4.89-r1.ebuild
index affe15065466..604e97786eca 100644
--- a/mail-mta/exim/exim-4.89-r1.ebuild
+++ b/mail-mta/exim/exim-4.89-r1.ebuild
@@ -59,6 +59,7 @@ COMMON_DEPEND=">=sys-apps/sed-4.0.5
 	sqlite? ( dev-db/sqlite )
 	radius? ( net-dialup/freeradius-client )
 	virtual/libiconv
+	elibc_glibc? ( net-libs/libnsl )
 	"
 	# added X check for #57206
 DEPEND="${COMMON_DEPEND}
diff --git a/mail-mta/exim/exim-4.89-r3.ebuild b/mail-mta/exim/exim-4.89-r3.ebuild
index 69652375c313..da1e74e4eee1 100644
--- a/mail-mta/exim/exim-4.89-r3.ebuild
+++ b/mail-mta/exim/exim-4.89-r3.ebuild
@@ -59,6 +59,7 @@ COMMON_DEPEND=">=sys-apps/sed-4.0.5
 	sqlite? ( dev-db/sqlite )
 	radius? ( net-dialup/freeradius-client )
 	virtual/libiconv
+	elibc_glibc? ( net-libs/libnsl )
 	"
 	# added X check for #57206
 DEPEND="${COMMON_DEPEND}
diff --git a/mail-mta/exim/exim-4.89-r5.ebuild b/mail-mta/exim/exim-4.89-r5.ebuild
index 696c16c8b2c0..226c7601533a 100644
--- a/mail-mta/exim/exim-4.89-r5.ebuild
+++ b/mail-mta/exim/exim-4.89-r5.ebuild
@@ -59,6 +59,7 @@ COMMON_DEPEND=">=sys-apps/sed-4.0.5
 	sqlite? ( dev-db/sqlite )
 	radius? ( net-dialup/freeradius-client )
 	virtual/libiconv
+	elibc_glibc? ( net-libs/libnsl )
 	"
 	# added X check for #57206
 DEPEND="${COMMON_DEPEND}
diff --git a/mail-mta/exim/exim-4.89.1.ebuild b/mail-mta/exim/exim-4.89.1.ebuild
index 4f9f9564ba7d..55536b6c0d35 100644
--- a/mail-mta/exim/exim-4.89.1.ebuild
+++ b/mail-mta/exim/exim-4.89.1.ebuild
@@ -59,6 +59,7 @@ COMMON_DEPEND=">=sys-apps/sed-4.0.5
 	sqlite? ( dev-db/sqlite )
 	radius? ( net-dialup/freeradius-client )
 	virtual/libiconv
+	elibc_glibc? ( net-libs/libnsl )
 	"
 	# added X check for #57206
 DEPEND="${COMMON_DEPEND}
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index d52ea46e8379..a9377bf34f79 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/zbar/Manifest b/media-gfx/zbar/Manifest
index b2bf023354da..c7fdc6ae9664 100644
--- a/media-gfx/zbar/Manifest
+++ b/media-gfx/zbar/Manifest
@@ -7,5 +7,5 @@ DIST zbar-0.10.tar.bz2 592602 BLAKE2B e3379bb915d52912e9d64b4166c60e0625b1c3aae0
 DIST zbar-0.10_p20121015.zip 991578 BLAKE2B 021dfa3920a838fd7bab12b09600ac6949c1495045691c4cc547bfb6ec647658c60984da248b882eabfc0bb123b90401dd3a32adcd66726b1e7072662e303d18 SHA512 7bb74ea5b096093b283c44787547ad0b886281628d012aa7b03ddb477732feb1e12d4d5a661191d34b53b7b272a237f67840e219b0ac5e2803da478a1ddba7a1
 EBUILD zbar-0.10-r6.ebuild 1742 BLAKE2B 1ef919eae08a5aca610dcede6c34b5f6325f20cd384a406642d3f040efc7ff2b01f8e2d8d6a75a9abac290bf9dcd4e2b9dbcf5e197c1e8b9842d9d83d039eda9 SHA512 6a03ed2a6ed2b3a1c28cd58703600869148428030151f779324fc06d32d6fd1eae74584c40c53aba3f38b999229a01e2ce275fbb8e31885d951efa5ad42f9897
 EBUILD zbar-0.10_p20121015-r1.ebuild 2397 BLAKE2B 2fa90db3ece690a7b988139e1fcdd089892967d9141a4dff719af8b4d91a8ff3bd16168a978ab298bac54338c41b8cedd9e03cb9cda9bdda2d8186142cf16067 SHA512 b5f6232d3fce9cb1842d5630537ff52056b185036506bae78f605dc5d2f0ec54f5d41edb2d58b6caa379e1f7dfdd266fcc9bd0d454eada9c73507924ae9dad55
-EBUILD zbar-0.10_p20121015-r2.ebuild 2850 BLAKE2B 06ef146c77bf80a98d6de7bee1649ad479128a4249861174409f8ad3e430ddd481d43cf835f3059052635e5c6a620377040dd4a31d567fd6f31119278c5ffd12 SHA512 dc4efb0cbbc4fb467731d5cccbd0e52d12b37c9f14a97e3b105b353fd65bfcf461f0c0bf2f6613af153941e86698f6f2ed9645ae6ed9d2fb39ad27e25375dde3
+EBUILD zbar-0.10_p20121015-r2.ebuild 3646 BLAKE2B 4ae7fd9a1927dfae76efbadcbb7ab9529f1f0378ac96b086112d09d7562bddff2dee8e4016840cf70bc9441dc3dbbde50a1520454be4dc3345c51b1a2172215c SHA512 7d914e641de1f63ecf9fa5a4e6f5d0fb830fa92fdf2e013a4cd7c3c39525d309f274c7219a3c9634ccf2b47d01484f014d80d942a34e031c29afc5527de27576
 MISC metadata.xml 317 BLAKE2B f900040957f979d0931359e9399f89d60de14ef9e7d359de21f5c02807748a3efb0004926ab2890708511908b21aba7b824eace5bd13f5194c7f6bb633d4bd98 SHA512 911dee4073890017c8816d892b3e77e460328fc8e25e59c3ba74eafc909de73d743ac8c1c3015385bcbba1e7f175796704f6b1be6b1f37e0ce652da1749ee830
diff --git a/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild b/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild
index 3a552305df63..186a80e32ccd 100644
--- a/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild
+++ b/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild
@@ -36,7 +36,9 @@ CDEPEND="gtk? ( dev-libs/glib:2[${MULTILIB_USEDEP}]
 RDEPEND="${CDEPEND}
 	java? ( >=virtual/jre-1.4 )"
 DEPEND="${CDEPEND}
-	java? ( >=virtual/jdk-1.4 )
+	java? ( >=virtual/jdk-1.4
+		test? ( dev-java/junit:4
+			dev-java/hamcrest-core:1.3 ) )
 	test? ( ${PYTHON_DEPS} )
 	app-arch/unzip
 	sys-devel/gettext
@@ -60,6 +62,10 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-0.10-python-crash.patch \
 		"${FILESDIR}"/${PN}-0.10-v4l2-uvcvideo.patch
 
+	# fix use of deprecated qt4 function, bug 572488
+	sed -e 's:numBytes:byteCount:g' \
+		-i "${S}"/include/zbar/QZBarImage.h || die
+
 	if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then
 		eapply "${FILESDIR}/${P}-ImageMagick-7.diff"
 	fi
@@ -79,15 +85,29 @@ multilib_src_configure() {
 	if multilib_is_native_abi && use java; then
 		export JAVACFLAGS="$(java-pkg_javac-args)"
 		export JAVA_CFLAGS="$(java-pkg_get-jni-cflags)"
+		if use test ; then # bug 629078
+			java-pkg_append_ CLASSPATH .
+			java-pkg_append_ CLASSPATH $(java-pkg_getjar --build-only junit-4 junit.jar)
+			java-pkg_append_ CLASSPATH $(java-pkg_getjar --build-only hamcrest-core-1.3 hamcrest-core.jar)
+		fi
 	fi
 
 	append-cppflags -DNDEBUG
+
+	# different flags for image/graphics magick (bug 552350)
+	myimagemagick="--without-imagemagick"
+	has_version media-gfx/imagemagick &&
+		myimagemagick="$(multilib_native_use_with imagemagick)"
+	mygraphicsmagick="--without-graphicsmagick"
+	has_version media-gfx/graphicsmagick &&
+		mygraphicsmagick="$(multilib_native_use_with imagemagick graphicsmagick)"
 	ECONF_SOURCE=${S} \
 	econf \
 		$(multilib_native_use_with java) \
 		$(use_with jpeg) \
 		$(use_with gtk) \
-		$(multilib_native_use_with imagemagick) \
+		${myimagemagick} \
+		${mygraphicsmagick} \
 		$(multilib_native_use_with python) \
 		$(use_with qt4 qt) \
 		$(use_enable static-libs static) \
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 830aa29f7a98..f017779ec818 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 5fd804e6ec61..6332806d6a65 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,16 +1,8 @@
 DIST harfbuzz-1.4.5.tar.bz2 1474461 BLAKE2B 8f2fb5c20c92afe3fb344bf4d4024090d68ab60c6d899c9805eec0bc6d0a714a3d98bfb6718ea4225da68b19e95db357c744dcba310076f4c56ed590985c9d1d SHA512 dd505ef950ef1d702a820987d8e93097e4c4fd9f725d18e69dd756ea21d4d5624eb2edfc8563f89947e3913bf5efa1834092e06ea02821744b0b588ce2ceb00e
 DIST harfbuzz-1.4.6.tar.bz2 1475086 BLAKE2B 8fb082016bc50e8ae2ab9244ae2ac0b01dc5967ab14ec6aeba52a66b4926327f6c0cb7bce0020cd8183c07c57a41de1255a5782218fda87290cbad2c29d08860 SHA512 aade3902adadf3a8339ba1d05279e639da7cb53981adc64e2a2d32a5d49335a6a9782a62cdf80beca569ec8a639792bf0368c0b6ecad08f35bc85878678aa096
-DIST harfbuzz-1.4.8.tar.bz2 1587622 BLAKE2B 406c7b9b431d2633674bd394f0706c1473def25aaf21bae1db6074a81f63a45ba0fe0c7e0cd67fb5dcee9ea382deede6eba55e380bd714cab876d23f0b9076b9 SHA512 056a2c02f803439b39086e3ea988e424f5512b3213844f9008c62f5448a8ccdba525f532e7ed54641820a4ef6dc5bc4d13d4f7bfb39ff904f5939c855d294152
-DIST harfbuzz-1.5.1.tar.bz2 1615704 BLAKE2B e0753bd43547bbf7408a93a7ba25c3fc9a83e622f84c4e5bd7b400ca3f901d12bf63a334790e6276eb1e83314b46db402c41e7d752c527ef141666a4950c2ed0 SHA512 e5235c9fe4524059128f97e2773056533803b40db70c18b43c8dc6e27a970efc40d9ce6e8754ae7075c245cf8f4386b33e922a6edb3b6a722a596cb7759b8b36
-DIST harfbuzz-1.6.3.tar.bz2 1643142 BLAKE2B cf0f1737cd1bd0b2b606d797c1067dc0ba61fd132afca81fba62316e728febabc957151c4696dc19aa2304a87e55a81e18584031dbce62c5958356f8338503a1 SHA512 37d1a161d9074e9898d9ef6cca6dffffc725005828d700744553b0145373b69bcd3b08f507d49f4c2e05850d9275a54f15983356c547c86e5e3c202cc7cbfbe8
-DIST harfbuzz-1.7.1.tar.bz2 1662385 BLAKE2B 131c6618168e69a74548661375e04c323f529b8fc9b0aed2de41ac42ace585fc4c305a4b46c87c2befe7738a61fc74383bb54c0f02d1442be01dadae110b1474 SHA512 e78c96a4debfc4761075aca50de111acf394bb966c038b8cebc26fd01a113d53492946709cf54dcc30d87bb6b5d920509181b5a0fc9ea0a010a399e94ad090b7
 DIST harfbuzz-1.7.2.tar.bz2 1708416 BLAKE2B d182bdfa163e07ff41bf36e30373470bf0dded24b1c748f1114f09b3aec628f41111c4b3d6830c3f0d46206d5468816e3efb495a023747825adcdf2a9b516e39 SHA512 a895c96a1c4096622c797a5a877e80529ce63e3bd3adea9f68994b32e13e7b3be14cdfe824d338f48b12f49de537f7d0f6db14f422ea896697667c672daeb1cc
 EBUILD harfbuzz-1.4.5.ebuild 3090 BLAKE2B e1a760f7ccd3b6fd7dd4de7e1aa2e6b37911171dcc1781dd6dbfa7780596c4e8e3e67ef6419439e65ca554d904071daf9105a60aea7a9e8de6dea63e819a6363 SHA512 bcc8829b5f60bafc34337d1cbf2c88bdcceae0e55ab28de5a0972bb83046e4895cc35705346b562310f281a2b357bb57d6fb35e3ec8eccd627e4a3de96e44f24
 EBUILD harfbuzz-1.4.6-r2.ebuild 3168 BLAKE2B 75af613d4d940aa3666825a6a5124785c8bd69fd29b465a0ba93ade43c603239aba07cd1c7c6d9c13a8044dbd57c51e8bfa5095025fdb72a2ee6ddefc55a5ab7 SHA512 713d5114cb344c9b31d61f75f14e1a6a10fe0e578d61ca03af1ad4ffd0af7a2192943ff930ff621b4fcf041ca3a7787af1b4aa5094a21a2bb1cedd4fc19ed433
-EBUILD harfbuzz-1.4.8.ebuild 3163 BLAKE2B f7b5020d32f758b354a0a4b4e836b60ccb2168cb7094fba0be740b594ea5aa2ae0d8400926b1e0440817a7b41f4ef2a3979c50f040477430f9d3489ee43df59e SHA512 9bdf551bb6f9667eed236e9f5cca9be01a68f78110bad24ce707c797db24d9a1aed5d1e3ebf549511897985d867190a66758af3501f68cff27a797c7e83159f8
-EBUILD harfbuzz-1.5.1.ebuild 3163 BLAKE2B f7b5020d32f758b354a0a4b4e836b60ccb2168cb7094fba0be740b594ea5aa2ae0d8400926b1e0440817a7b41f4ef2a3979c50f040477430f9d3489ee43df59e SHA512 9bdf551bb6f9667eed236e9f5cca9be01a68f78110bad24ce707c797db24d9a1aed5d1e3ebf549511897985d867190a66758af3501f68cff27a797c7e83159f8
-EBUILD harfbuzz-1.6.3.ebuild 3163 BLAKE2B f7b5020d32f758b354a0a4b4e836b60ccb2168cb7094fba0be740b594ea5aa2ae0d8400926b1e0440817a7b41f4ef2a3979c50f040477430f9d3489ee43df59e SHA512 9bdf551bb6f9667eed236e9f5cca9be01a68f78110bad24ce707c797db24d9a1aed5d1e3ebf549511897985d867190a66758af3501f68cff27a797c7e83159f8
-EBUILD harfbuzz-1.7.1.ebuild 3163 BLAKE2B f7b5020d32f758b354a0a4b4e836b60ccb2168cb7094fba0be740b594ea5aa2ae0d8400926b1e0440817a7b41f4ef2a3979c50f040477430f9d3489ee43df59e SHA512 9bdf551bb6f9667eed236e9f5cca9be01a68f78110bad24ce707c797db24d9a1aed5d1e3ebf549511897985d867190a66758af3501f68cff27a797c7e83159f8
 EBUILD harfbuzz-1.7.2.ebuild 3156 BLAKE2B 6fde808c6a76f27bd5ef3a799a0060ce871944d83fd3b58066a7a65d44d395c8952ab9e2895878c614e70beff33bbf96f1cd008ff0be1924d43d227146c5e01f SHA512 f8139a893baf0adf76396b06c25665dbabc5c434bd7e46c2b6d585ec3808b063b6eb5a2b00572851aed4a65b9591dffca595392427b23827aacc9f6fe68516ac
 EBUILD harfbuzz-9999.ebuild 3193 BLAKE2B 50345bc2c90c47ba8e51cc8ae0097b42c063ff890d5f830f8bc20bdab91cc90470973ded3f8f8d0716040bacb25dd0b38ff3c53ab483fff8614f93ee3d7c24da SHA512 270388b8d4368ae5dd996a2e53bd54091265ae666d14a2c937facbeda4040d78f1dbff883f5ec0e16c335f489dd3717c851136192fabb4870b7c65557f4bdb8d
 MISC metadata.xml 645 BLAKE2B aadcef9412392874d361b5c09e7450bf88db64fa704558553861cf16ffd1a5b5715291fefc0624e3ad0d86a537cdbd2b810fa093b289428e68a19c82049188ef SHA512 645e451768a5dba2e16d18b51ece20fa28172450bf22e29fe73ed29748f712187f997ce2f6f0a24c725f0cb10434b4a65c6de9a5fd1aa7d820e00b7dca8b8b63
diff --git a/media-libs/harfbuzz/harfbuzz-1.4.8.ebuild b/media-libs/harfbuzz/harfbuzz-1.4.8.ebuild
deleted file mode 100644
index da388e5fba70..000000000000
--- a/media-libs/harfbuzz/harfbuzz-1.4.8.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/harfbuzz"
-[[ ${PV} == 9999 ]] && inherit git-r3 autotools
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils flag-o-matic libtool multilib-minimal python-any-r1 xdg-utils
-
-DESCRIPTION="An OpenType text shaping engine"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
-[[ ${PV} == 9999 ]] || SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.bz2"
-
-LICENSE="Old-MIT ISC icu"
-SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
-
-IUSE="+cairo debug fontconfig +glib +graphite icu +introspection static-libs test +truetype"
-REQUIRED_USE="introspection? ( glib )"
-
-RDEPEND="
-	cairo? ( x11-libs/cairo:= )
-	fontconfig? ( media-libs/fontconfig:1.0[${MULTILIB_USEDEP}] )
-	glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
-	graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
-	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
-	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	virtual/pkgconfig
-	test? ( ${PYTHON_DEPS} )
-"
-# eautoreconf requires gobject-introspection-common
-# ragel needed if regenerating *.hh files from *.rl
-[[ ${PV} = 9999 ]] && DEPEND="${DEPEND}
-	>=dev-libs/gobject-introspection-common-1.34
-	dev-util/ragel
-"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-	if ! use debug ; then
-		append-cppflags -DHB_NDEBUG
-	fi
-}
-
-src_prepare() {
-	default
-
-	xdg_environment_reset
-
-	if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then
-		# on Darwin/Solaris we need to link with g++, like automake defaults
-		# to, but overridden by upstream because on Linux this is not
-		# necessary, bug #449126
-		sed -i \
-			-e 's/\<LINK\>/CXXLINK/' \
-			src/Makefile.am || die
-		sed -i \
-			-e '/libharfbuzz_la_LINK = /s/\<LINK\>/CXXLINK/' \
-			src/Makefile.in || die
-		sed -i \
-			-e '/AM_V_CCLD/s/\<LINK\>/CXXLINK/' \
-			test/api/Makefile.in || die
-	fi
-
-	[[ ${PV} == 9999 ]] && eautoreconf
-	elibtoolize # for Solaris
-
-	# failing test, https://bugs.freedesktop.org/show_bug.cgi?id=89190
-	sed -e 's#tests/arabic-fallback-shaping.tests##' -i test/shaping/Makefile.in || die "sed failed"
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" \
-	# harfbuzz-gobject only used for instrospection, bug #535852
-	econf \
-		--without-coretext \
-		--without-uniscribe \
-		$(use_enable static-libs static) \
-		$(multilib_native_use_with cairo) \
-		$(use_with fontconfig) \
-		$(use_with glib) \
-		$(use_with introspection gobject) \
-		$(use_with graphite graphite2) \
-		$(use_with icu) \
-		$(multilib_native_use_enable introspection) \
-		$(use_with truetype freetype)
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/docs/html docs/html || die
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --modules
-}
diff --git a/media-libs/harfbuzz/harfbuzz-1.5.1.ebuild b/media-libs/harfbuzz/harfbuzz-1.5.1.ebuild
deleted file mode 100644
index da388e5fba70..000000000000
--- a/media-libs/harfbuzz/harfbuzz-1.5.1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/harfbuzz"
-[[ ${PV} == 9999 ]] && inherit git-r3 autotools
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils flag-o-matic libtool multilib-minimal python-any-r1 xdg-utils
-
-DESCRIPTION="An OpenType text shaping engine"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
-[[ ${PV} == 9999 ]] || SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.bz2"
-
-LICENSE="Old-MIT ISC icu"
-SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
-
-IUSE="+cairo debug fontconfig +glib +graphite icu +introspection static-libs test +truetype"
-REQUIRED_USE="introspection? ( glib )"
-
-RDEPEND="
-	cairo? ( x11-libs/cairo:= )
-	fontconfig? ( media-libs/fontconfig:1.0[${MULTILIB_USEDEP}] )
-	glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
-	graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
-	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
-	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	virtual/pkgconfig
-	test? ( ${PYTHON_DEPS} )
-"
-# eautoreconf requires gobject-introspection-common
-# ragel needed if regenerating *.hh files from *.rl
-[[ ${PV} = 9999 ]] && DEPEND="${DEPEND}
-	>=dev-libs/gobject-introspection-common-1.34
-	dev-util/ragel
-"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-	if ! use debug ; then
-		append-cppflags -DHB_NDEBUG
-	fi
-}
-
-src_prepare() {
-	default
-
-	xdg_environment_reset
-
-	if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then
-		# on Darwin/Solaris we need to link with g++, like automake defaults
-		# to, but overridden by upstream because on Linux this is not
-		# necessary, bug #449126
-		sed -i \
-			-e 's/\<LINK\>/CXXLINK/' \
-			src/Makefile.am || die
-		sed -i \
-			-e '/libharfbuzz_la_LINK = /s/\<LINK\>/CXXLINK/' \
-			src/Makefile.in || die
-		sed -i \
-			-e '/AM_V_CCLD/s/\<LINK\>/CXXLINK/' \
-			test/api/Makefile.in || die
-	fi
-
-	[[ ${PV} == 9999 ]] && eautoreconf
-	elibtoolize # for Solaris
-
-	# failing test, https://bugs.freedesktop.org/show_bug.cgi?id=89190
-	sed -e 's#tests/arabic-fallback-shaping.tests##' -i test/shaping/Makefile.in || die "sed failed"
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" \
-	# harfbuzz-gobject only used for instrospection, bug #535852
-	econf \
-		--without-coretext \
-		--without-uniscribe \
-		$(use_enable static-libs static) \
-		$(multilib_native_use_with cairo) \
-		$(use_with fontconfig) \
-		$(use_with glib) \
-		$(use_with introspection gobject) \
-		$(use_with graphite graphite2) \
-		$(use_with icu) \
-		$(multilib_native_use_enable introspection) \
-		$(use_with truetype freetype)
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/docs/html docs/html || die
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --modules
-}
diff --git a/media-libs/harfbuzz/harfbuzz-1.6.3.ebuild b/media-libs/harfbuzz/harfbuzz-1.6.3.ebuild
deleted file mode 100644
index da388e5fba70..000000000000
--- a/media-libs/harfbuzz/harfbuzz-1.6.3.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/harfbuzz"
-[[ ${PV} == 9999 ]] && inherit git-r3 autotools
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils flag-o-matic libtool multilib-minimal python-any-r1 xdg-utils
-
-DESCRIPTION="An OpenType text shaping engine"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
-[[ ${PV} == 9999 ]] || SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.bz2"
-
-LICENSE="Old-MIT ISC icu"
-SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
-
-IUSE="+cairo debug fontconfig +glib +graphite icu +introspection static-libs test +truetype"
-REQUIRED_USE="introspection? ( glib )"
-
-RDEPEND="
-	cairo? ( x11-libs/cairo:= )
-	fontconfig? ( media-libs/fontconfig:1.0[${MULTILIB_USEDEP}] )
-	glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
-	graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
-	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
-	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	virtual/pkgconfig
-	test? ( ${PYTHON_DEPS} )
-"
-# eautoreconf requires gobject-introspection-common
-# ragel needed if regenerating *.hh files from *.rl
-[[ ${PV} = 9999 ]] && DEPEND="${DEPEND}
-	>=dev-libs/gobject-introspection-common-1.34
-	dev-util/ragel
-"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-	if ! use debug ; then
-		append-cppflags -DHB_NDEBUG
-	fi
-}
-
-src_prepare() {
-	default
-
-	xdg_environment_reset
-
-	if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then
-		# on Darwin/Solaris we need to link with g++, like automake defaults
-		# to, but overridden by upstream because on Linux this is not
-		# necessary, bug #449126
-		sed -i \
-			-e 's/\<LINK\>/CXXLINK/' \
-			src/Makefile.am || die
-		sed -i \
-			-e '/libharfbuzz_la_LINK = /s/\<LINK\>/CXXLINK/' \
-			src/Makefile.in || die
-		sed -i \
-			-e '/AM_V_CCLD/s/\<LINK\>/CXXLINK/' \
-			test/api/Makefile.in || die
-	fi
-
-	[[ ${PV} == 9999 ]] && eautoreconf
-	elibtoolize # for Solaris
-
-	# failing test, https://bugs.freedesktop.org/show_bug.cgi?id=89190
-	sed -e 's#tests/arabic-fallback-shaping.tests##' -i test/shaping/Makefile.in || die "sed failed"
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" \
-	# harfbuzz-gobject only used for instrospection, bug #535852
-	econf \
-		--without-coretext \
-		--without-uniscribe \
-		$(use_enable static-libs static) \
-		$(multilib_native_use_with cairo) \
-		$(use_with fontconfig) \
-		$(use_with glib) \
-		$(use_with introspection gobject) \
-		$(use_with graphite graphite2) \
-		$(use_with icu) \
-		$(multilib_native_use_enable introspection) \
-		$(use_with truetype freetype)
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/docs/html docs/html || die
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --modules
-}
diff --git a/media-libs/harfbuzz/harfbuzz-1.7.1.ebuild b/media-libs/harfbuzz/harfbuzz-1.7.1.ebuild
deleted file mode 100644
index da388e5fba70..000000000000
--- a/media-libs/harfbuzz/harfbuzz-1.7.1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/harfbuzz"
-[[ ${PV} == 9999 ]] && inherit git-r3 autotools
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils flag-o-matic libtool multilib-minimal python-any-r1 xdg-utils
-
-DESCRIPTION="An OpenType text shaping engine"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
-[[ ${PV} == 9999 ]] || SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.bz2"
-
-LICENSE="Old-MIT ISC icu"
-SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
-
-IUSE="+cairo debug fontconfig +glib +graphite icu +introspection static-libs test +truetype"
-REQUIRED_USE="introspection? ( glib )"
-
-RDEPEND="
-	cairo? ( x11-libs/cairo:= )
-	fontconfig? ( media-libs/fontconfig:1.0[${MULTILIB_USEDEP}] )
-	glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
-	graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
-	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
-	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	virtual/pkgconfig
-	test? ( ${PYTHON_DEPS} )
-"
-# eautoreconf requires gobject-introspection-common
-# ragel needed if regenerating *.hh files from *.rl
-[[ ${PV} = 9999 ]] && DEPEND="${DEPEND}
-	>=dev-libs/gobject-introspection-common-1.34
-	dev-util/ragel
-"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-	if ! use debug ; then
-		append-cppflags -DHB_NDEBUG
-	fi
-}
-
-src_prepare() {
-	default
-
-	xdg_environment_reset
-
-	if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then
-		# on Darwin/Solaris we need to link with g++, like automake defaults
-		# to, but overridden by upstream because on Linux this is not
-		# necessary, bug #449126
-		sed -i \
-			-e 's/\<LINK\>/CXXLINK/' \
-			src/Makefile.am || die
-		sed -i \
-			-e '/libharfbuzz_la_LINK = /s/\<LINK\>/CXXLINK/' \
-			src/Makefile.in || die
-		sed -i \
-			-e '/AM_V_CCLD/s/\<LINK\>/CXXLINK/' \
-			test/api/Makefile.in || die
-	fi
-
-	[[ ${PV} == 9999 ]] && eautoreconf
-	elibtoolize # for Solaris
-
-	# failing test, https://bugs.freedesktop.org/show_bug.cgi?id=89190
-	sed -e 's#tests/arabic-fallback-shaping.tests##' -i test/shaping/Makefile.in || die "sed failed"
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" \
-	# harfbuzz-gobject only used for instrospection, bug #535852
-	econf \
-		--without-coretext \
-		--without-uniscribe \
-		$(use_enable static-libs static) \
-		$(multilib_native_use_with cairo) \
-		$(use_with fontconfig) \
-		$(use_with glib) \
-		$(use_with introspection gobject) \
-		$(use_with graphite graphite2) \
-		$(use_with icu) \
-		$(multilib_native_use_enable introspection) \
-		$(use_with truetype freetype)
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/docs/html docs/html || die
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --modules
-}
diff --git a/media-libs/libbdplus/Manifest b/media-libs/libbdplus/Manifest
index 6df5c9928295..ad520e516c10 100644
--- a/media-libs/libbdplus/Manifest
+++ b/media-libs/libbdplus/Manifest
@@ -1,4 +1,4 @@
 DIST libbdplus-0.1.2.tar.bz2 319828 BLAKE2B bdf8868dc511b22fd6926b4b29cfae513ca5c9f30433314c99bf31aefb5842eea1042e514383d1c1ff96ee6c62f3220a542973eb1017df8dd48aecd7f81237ac SHA512 e00e7bc9f52b9275646593b753ba646b052255be94a7241965f4dbe4734f8f6a072973ed4b9997957f939236b0633897c295749f79e232188430795be5b5087b
 EBUILD libbdplus-0.1.2.ebuild 867 BLAKE2B 9f325b587a0f0de78286dd5134c0e3f16917cb70b3097638f0d3388eccdde4d299ac35a8b59bb2f101ccc3cbfabee0ac4c5393919422203ab74b2e082552dc74 SHA512 d5e8b5449fbd808fdc995f5288232485feea1434807d515b3da0ed47518b3a7b783726d15583dbf9f100a95dddf911b6869ecd71701d32d7ac0903a63474d3d9
-EBUILD libbdplus-9999.ebuild 853 BLAKE2B 127edf6c48c3d25c6c4cb966b10dd822304d0d394a7d24cc215ea85afe1a00bc44a8e894cdbe0d7e230f13e4faacdd8edc08a43eb481a72b404645550f2d86c2 SHA512 0daa825a8c8f4c51a40dc6d353d05e8b357b89045df2285098bb80dc24263d4db18ef9ab65d7fc1b98b6cb7e5c3b53bdcf8756aec6f7eef62f972ed84e91458f
+EBUILD libbdplus-9999.ebuild 857 BLAKE2B 42271ea484be88d0b2fd5da1cc0ac0b856f7885eb51169870eaa33d656bddbfeb44ed1ee2076b4f6cb5270bad29f7d41451b344cb2fcf90c1f3cc3163b617353 SHA512 7629003346d942fc8f43771e8fd06c102f12ecb50e9e1735636e3cae46a83fa4edb3005f77b2069eff7edf167228c58deb48ffafa611ef0f59de68e7442d6f13
 MISC metadata.xml 346 BLAKE2B 7a42d692f3ccc8badbed9bc2d06f4b06891f0fc46d53501de443dbff04b71c6db74f78a310cd484945be3b2035ae001804443bff1a18dcd5b0ef24474453910e SHA512 c45e738ea1fa2ff40738465bcafc8b6c89e7d5dfd3c89250118bc3c531120ee14022c04fe0a2bd5cbe950dd66935be35254239fc61eb947b597328809735693f
diff --git a/media-libs/libbdplus/libbdplus-9999.ebuild b/media-libs/libbdplus/libbdplus-9999.ebuild
index f9796986f408..a0e3a3fa2f97 100644
--- a/media-libs/libbdplus/libbdplus-9999.ebuild
+++ b/media-libs/libbdplus/libbdplus-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,7 @@ inherit autotools-multilib
 
 if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
-	EGIT_REPO_URI="https://git.videolan.org/${PN}.git"
+	EGIT_REPO_URI="https://git.videolan.org/git/${PN}.git"
 else
 	SRC_URI="https://downloads.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2"
 	KEYWORDS="~amd64 ~x86"
diff --git a/media-libs/speex/Manifest b/media-libs/speex/Manifest
index f5f8be01c765..057ca7f95dfd 100644
--- a/media-libs/speex/Manifest
+++ b/media-libs/speex/Manifest
@@ -2,6 +2,6 @@ AUX speex-1.2.0-configure.patch 920 BLAKE2B 57b43aee0c57d6f0bf29202573d8f5caa65d
 AUX speex-1.2_rc1-r1-configure.patch 1153 BLAKE2B ef6e7e227b19b532a89c819481050aa9aab5c805934ae12f6ab2f666f6e7d056f4375cb0cce31a688c4b725fda057ad01e5b400b5024313c788f02af5880ebd6 SHA512 4cc6ca75ca85861e37fa4084d5614c941ec31459d2c2770264f024c2143cb305a6c63df1b9fd62a14c9f68e45254cd880cc5dd7094fc593f34378a23d2318f84
 DIST speex-1.2.0.tar.gz 1047080 BLAKE2B 928e044e1195d4d977497cd1275a07323df233ee85e3ec188f362720f96303c2fc2002c1147c2ac93ca03570ff98428d983eb7d00439c9cdbe131041d9aa2697 SHA512 7fe10838c7d1bafcbe42295b82b79262420dba793b8a4388e2f73a3007850b5572face1b5308d9f4e8d7dfc9cb1c016cbad88cd65b2892667986107ed946836b
 DIST speex-1.2rc1.tar.gz 1061882 BLAKE2B 1ce4a2c6682c7142cec64dab7075525ffb485d43f61aabab82e01333df2e59c04dba56bf8982a28dd544011dab45db03b4830430303e9610846ed79d77d69d0f SHA512 bdf1ddb2d60496ab220b94c1bec7a43f267fc964fdbb5cc9f24b71b9b571f237f5ce98c1d74b02699d71a95281f4694ff464ebec25e3b135244e5b3099cb1813
-EBUILD speex-1.2.0-r1.ebuild 1666 BLAKE2B 2ac35164d2035fcc92eed7d64200bbea2811f2075395653f3a9a921cc3febfe504969e4dde1598a4cd9b048f7098b6f13c6d61b2c843594626ffc12a8ca591b9 SHA512 30db740ec5ba0f9e33a0536552e1d592b6c3099c55cd5c893e94d11f62c94d7b8731281eec7fd7b390d49987cb2d8e5f45e7fe8e265e7d02dd074afcddeaf0e6
+EBUILD speex-1.2.0-r1.ebuild 1668 BLAKE2B 3cf16fad2ddebb807f346615c48daf313c77d90d5fa4e9e48488675644accfa171896ff920b9507005fdec7410f2d8778d235b52018a9f7f9964bad7e59c4c47 SHA512 89b61391d3afc92e51c0b9b2734ad3d886935e00b5c0bdfe49d216d7d58425f96d72599f3226bc9cbb99b596515299dae6fcfd7a2048f85cb1e41984c9df73e5
 EBUILD speex-1.2_rc1-r2.ebuild 1585 BLAKE2B a0f2e029fac58e02469d8fc71c201052311e6a6de7a3b500ba832491f3c3fd389a7459a592e837e971f16c64240255e839ad06bae5ac062ad8d190a1f71d2d5e SHA512 16920e4bd2a50e933b9a288e0f4a91fee1e2bcfd62adac3f2a438e8f0896a72eef7e35e644c795605caaacb92d3bd880eed8618014d1df53136400818038b1ab
 MISC metadata.xml 495 BLAKE2B a93e81b5e5b7c39cd680dbd8294451e3b034f1506e0c48d36d2a6e7525638bfc7dee964541b0e03847e43a344689d97de94e245dc4bc8099674a24b12a0a4115 SHA512 6b6a16e69139c71477c76a96c2aec025992a28079a15db234bc624619dc6ee5b3d20025418a49a0119d75b9964dd91fb38459c642c53a98b6bb444c6698beeb8
diff --git a/media-libs/speex/speex-1.2.0-r1.ebuild b/media-libs/speex/speex-1.2.0-r1.ebuild
index bf424f56d190..0c0c99a1cdff 100644
--- a/media-libs/speex/speex-1.2.0-r1.ebuild
+++ b/media-libs/speex/speex-1.2.0-r1.ebuild
@@ -8,8 +8,8 @@ MY_P=${P/_}
 MY_P=${MY_P/_p/.}
 
 DESCRIPTION="Audio compression format designed for speech"
-HOMEPAGE="http://www.speex.org/"
-SRC_URI="http://downloads.xiph.org/releases/speex/${MY_P}.tar.gz"
+HOMEPAGE="https://www.speex.org/"
+SRC_URI="https://downloads.xiph.org/releases/speex/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/media-libs/speexdsp/Manifest b/media-libs/speexdsp/Manifest
index 23600b63a4cf..17d200d03141 100644
--- a/media-libs/speexdsp/Manifest
+++ b/media-libs/speexdsp/Manifest
@@ -1,4 +1,8 @@
+AUX speexdsp-1.2_rc3-config_types.h.patch 2188 BLAKE2B 1e0c25b5e65a5999f5284abf0516aee5bb5ed0906c46d5d1e44b406236404ed00a8f0b0df5e6093a7cbdb10c453d4ab69b8df63ebb127d47a6930d546476099f SHA512 075a88f7f16d4744c95a9208ff4e803bfc28bff99113c3e919a9ce24c8e6bf91eedcbe9d487b668428db357092cc5db455e6256020cec598120c971734258b07
 AUX speexdsp-1.2_rc3-configure.patch 1506 BLAKE2B 76276ba7cc0c7143da55d90be9a60ea697dc13f9ad65d7d24a83606b14c543700788e9213d1562371203ace9d45131cb52103d7f045ddf17adc0e30fd3876013 SHA512 95a95e5ca052b6ab3091ce9c461e7356f029e65b47a0a0f291448325acceb23c5cb12d81dbdecec13945b70fa8161e479bc6767de484c2c2f13a5299a3b9304c
+AUX speexdsp-1.2_rc3-overflow.patch 2211 BLAKE2B 36a5aaedd730d8847046ce8cb9453678cf7aa503e060b25fb24e57516bbaaa7b987d3abb93fab741933c3fd43c490a090ac9fd64a6fbb2496f3a0364029c6b50 SHA512 f948be7513ed33a133a19bf571b8b1395f37b86715e2426a59105494d16c269c54c3a32c916f89af7e5b4b1d4aff90839e2b1ed2b13de482e54ac05bef449b31
 DIST speexdsp-1.2rc3.tar.gz 901771 BLAKE2B 85d047df82fc06906598da39ae653aa245c246bfea75c02d25f7811983babdab6a8499c9b563e0d7d2145fa490674df2cf0a05989884ffb3c2c2a183415ce841 SHA512 29dfa8345df025eeb076561648a9b5c0485692be699b6da3c2a3734b4329187a1c2eb181252f4df12b21f1309ecdf59797437dfb123d160fd723491ab216e858
+EBUILD speexdsp-1.2_rc3-r1.ebuild 1466 BLAKE2B 3778e15394c69370bd493a1130f716954861fd9bab81244da11bee3f5a5ad3fad42e368b7b6219999fdc125b70b2257518c3a7ce657654239d777782b1cd59f1 SHA512 148ab93d88edea7e6fd50ea7fa8a5011d13b4609778f03b61d63ef5457074a7f8a6daf0ab1cc6de402ce6fe0bf4391345b15466d9fa8c466c86ec0a7a70d7b76
+EBUILD speexdsp-1.2_rc3-r2.ebuild 1501 BLAKE2B a01e9399df050e756942af7e0f03f9ebddd5d7e2c5ce5001c2d0a426709143392bbd42e0571db058cfe0be667610a9d7a09784fa8b0881291eeb0b3dfd0d709e SHA512 00d4b78cb735e13e6d9ace27d9594d7bdea3aa02e7eff1ec75d6abad9f5063c129626dec2c7e0bb4f1e6f4a732a036425108cfa3e3a19b1a56517ae0b6466e13
 EBUILD speexdsp-1.2_rc3.ebuild 1422 BLAKE2B 3e2720efc4fa740ba5ba18c0dcbcff580f4b572baf2c5840aece7cad18464862394c25db7a0fff2f9be996cf3d18f85feb6d393d31be6975b35fc9712e78d129 SHA512 16cb6141e84d413af8be8652c60398612bead1a95f9bfb6e26c2ec9260885a2bd9db910a35ff34123f6095c6502946859623169e364daf86935530b972e98f53
 MISC metadata.xml 342 BLAKE2B 5b793ea5060e3e8359d6b50ebd5211471de0d72608086d1d0a67c655cc30c15e0b0db4545a578882144f9f1f4913779037ff76aeeb94002db2b162db78a6364e SHA512 32081e424d3f4ad3fd0ef4979c339d1139cb2298e6703210ff741b77a8b3bf2e1d4b550b0d76a1bd0c4dc5ac465b3ebdd1fe86da45d46586cd3560261f73c457
diff --git a/media-libs/speexdsp/files/speexdsp-1.2_rc3-config_types.h.patch b/media-libs/speexdsp/files/speexdsp-1.2_rc3-config_types.h.patch
new file mode 100644
index 000000000000..835769dde707
--- /dev/null
+++ b/media-libs/speexdsp/files/speexdsp-1.2_rc3-config_types.h.patch
@@ -0,0 +1,61 @@
+From c470e2e89a6ca75b507437467692cd684b71a526 Mon Sep 17 00:00:00 2001
+From: Tanu Kaskinen <tanu.kaskinen@linux.intel.com>
+Date: Sun, 5 Jul 2015 18:10:19 +0300
+Subject: [PATCH] Don't rely on HAVE_STDINT_H et al. being defined
+
+Not everyone who includes speexdsp_config_types.h will have a test
+which defines those, and if we've chosen to use the stdint types at
+configure time then we know exactly which header(s) are available, so
+just choose the best one then and generate the header to use it.
+
+This patch, including the above text, is copied from a commit in the
+speex repository[1]. The original commit for speex was made by Ron
+<ron@debian.org>.
+
+[1] https://git.xiph.org/?p=speex.git;a=commitdiff;h=774c87d6cb7dd8dabdd17677fc6da753ecf4aa87
+
+Signed-off-by: Tanu Kaskinen <tanu.kaskinen@linux.intel.com>
+---
+ configure.ac                             | 6 ++++++
+ include/speex/speexdsp_config_types.h.in | 8 +-------
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2cd2d1e..1de0c23 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -334,6 +334,12 @@ AC_SUBST([USIZE16])
+ AC_SUBST([SIZE32])
+ AC_SUBST([USIZE32])
+ 
++AS_IF([test "$ac_cv_header_stdint_h" = "yes"],    [INCLUDE_STDINT="#include <stdint.h>"],
++      [test "$ac_cv_header_inttypes_h" = "yes"],  [INCLUDE_STDINT="#include <inttypes.h>"],
++      [test "$ac_cv_header_sys_types_h" = "yes"], [INCLUDE_STDINT="#include <sys/types.h>"])
++
++AC_SUBST([INCLUDE_STDINT])
++
+ AC_CONFIG_FILES([
+            Makefile libspeexdsp/Makefile doc/Makefile SpeexDSP.spec
+            include/Makefile include/speex/Makefile speexdsp.pc
+diff --git a/include/speex/speexdsp_config_types.h.in b/include/speex/speexdsp_config_types.h.in
+index 02b82fd..5ea7b55 100644
+--- a/include/speex/speexdsp_config_types.h.in
++++ b/include/speex/speexdsp_config_types.h.in
+@@ -1,13 +1,7 @@
+ #ifndef __SPEEX_TYPES_H__
+ #define __SPEEX_TYPES_H__
+ 
+-#if defined HAVE_STDINT_H
+-#  include <stdint.h>
+-#elif defined HAVE_INTTYPES_H
+-#  include <inttypes.h>
+-#elif defined HAVE_SYS_TYPES_H
+-#  include <sys/types.h>
+-#endif
++@INCLUDE_STDINT@
+ 
+ typedef @SIZE16@ spx_int16_t;
+ typedef @USIZE16@ spx_uint16_t;
+-- 
+2.1.4
+
diff --git a/media-libs/speexdsp/files/speexdsp-1.2_rc3-overflow.patch b/media-libs/speexdsp/files/speexdsp-1.2_rc3-overflow.patch
new file mode 100644
index 000000000000..3a413625085e
--- /dev/null
+++ b/media-libs/speexdsp/files/speexdsp-1.2_rc3-overflow.patch
@@ -0,0 +1,66 @@
+From a2133f5904ddb616b6578920bd2199f5accb484d Mon Sep 17 00:00:00 2001
+From: Tristan Matthews <tmatth@videolan.org>
+Date: Fri, 24 Apr 2015 15:55:32 -0400
+Subject: [PATCH] preprocess: prevent rare overflow on overlap-add
+
+Reported-by: Fabian Henze <flyser42@gmx.de>
+---
+ libspeexdsp/arch.h       | 3 +++
+ libspeexdsp/preprocess.c | 2 +-
+ libspeexdsp/resample.c   | 6 ------
+ 3 files changed, 4 insertions(+), 7 deletions(-)
+
+diff --git a/libspeexdsp/arch.h b/libspeexdsp/arch.h
+index 6b3bc5d..c2de991 100644
+--- a/libspeexdsp/arch.h
++++ b/libspeexdsp/arch.h
+@@ -101,6 +101,8 @@ typedef spx_word32_t spx_sig_t;
+ #define SIG_SHIFT    14
+ #define GAIN_SHIFT   6
+ 
++#define WORD2INT(x) ((x) < -32767 ? -32768 : ((x) > 32766 ? 32767 : (x)))
++
+ #define VERY_SMALL 0
+ #define VERY_LARGE32 ((spx_word32_t)2147483647)
+ #define VERY_LARGE16 ((spx_word16_t)32767)
+@@ -203,6 +205,7 @@ typedef float spx_word32_t;
+ #define DIV32(a,b)     (((spx_word32_t)(a))/(spx_word32_t)(b))
+ #define PDIV32(a,b)     (((spx_word32_t)(a))/(spx_word32_t)(b))
+ 
++#define WORD2INT(x) ((x) < -32767.5f ? -32768 : ((x) > 32766.5f ? 32767 : floor(.5+(x))))
+ 
+ #endif
+ 
+diff --git a/libspeexdsp/preprocess.c b/libspeexdsp/preprocess.c
+index c080581..3053eb5 100644
+--- a/libspeexdsp/preprocess.c
++++ b/libspeexdsp/preprocess.c
+@@ -980,7 +980,7 @@ EXPORT int speex_preprocess_run(SpeexPreprocessState *st, spx_int16_t *x)
+ 
+    /* Perform overlap and add */
+    for (i=0;i<N3;i++)
+-      x[i] = st->outbuf[i] + st->frame[i];
++      x[i] = WORD2INT(ADD32(EXTEND32(st->outbuf[i]), EXTEND32(st->frame[i])));
+    for (i=0;i<N4;i++)
+       x[N3+i] = st->frame[N3+i];
+ 
+diff --git a/libspeexdsp/resample.c b/libspeexdsp/resample.c
+index 4940a64..4e47d67 100644
+--- a/libspeexdsp/resample.c
++++ b/libspeexdsp/resample.c
+@@ -83,12 +83,6 @@ static void speex_free (void *ptr) {free(ptr);}
+ #define M_PI 3.14159265358979323846
+ #endif
+ 
+-#ifdef FIXED_POINT
+-#define WORD2INT(x) ((x) < -32767 ? -32768 : ((x) > 32766 ? 32767 : (x)))  
+-#else
+-#define WORD2INT(x) ((x) < -32767.5f ? -32768 : ((x) > 32766.5f ? 32767 : floor(.5+(x))))  
+-#endif
+-               
+ #define IMAX(a,b) ((a) > (b) ? (a) : (b))
+ #define IMIN(a,b) ((a) < (b) ? (a) : (b))
+ 
+-- 
+2.1.4
+
diff --git a/media-libs/speexdsp/speexdsp-1.2_rc3-r1.ebuild b/media-libs/speexdsp/speexdsp-1.2_rc3-r1.ebuild
new file mode 100644
index 000000000000..b8f99c5a28a6
--- /dev/null
+++ b/media-libs/speexdsp/speexdsp-1.2_rc3-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools flag-o-matic multilib-minimal
+
+MY_P=${P/_}
+MY_P=${MY_P/_p/.}
+
+DESCRIPTION="Audio compression format designed for speech -- DSP"
+HOMEPAGE="https://www.speex.org/"
+SRC_URI="https://downloads.xiph.org/releases/speex/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_arm_neon static-libs"
+
+RDEPEND="!<media-libs/speex-1.2.0"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}/${P}-configure.patch"
+	"${FILESDIR}/${P}-config_types.h.patch"
+)
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e 's:noinst_PROGRAMS:check_PROGRAMS:' \
+		libspeexdsp/Makefile.am || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	append-lfs-flags
+
+	# Can also be configured with one of:
+	# --enable-fixed-point             (no floating point)
+	# --with-fft=proprietary-intel-mkl (mkl)
+	# --with-fft=gpl-fftw3             (fftw)
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable static-libs static) \
+		$(use_enable cpu_flags_x86_sse sse) \
+		$(use_enable cpu_flags_x86_sse2 sse2) \
+		$(use_enable cpu_flags_arm_neon neon)
+}
+
+multilib_src_install_all() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/speexdsp/speexdsp-1.2_rc3-r2.ebuild b/media-libs/speexdsp/speexdsp-1.2_rc3-r2.ebuild
new file mode 100644
index 000000000000..ef469e1dd724
--- /dev/null
+++ b/media-libs/speexdsp/speexdsp-1.2_rc3-r2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools flag-o-matic multilib-minimal
+
+MY_P=${P/_}
+MY_P=${MY_P/_p/.}
+
+DESCRIPTION="Audio compression format designed for speech -- DSP"
+HOMEPAGE="https://www.speex.org/"
+SRC_URI="https://downloads.xiph.org/releases/speex/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_arm_neon static-libs"
+
+RDEPEND="!<media-libs/speex-1.2.0"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}/${P}-configure.patch"
+	"${FILESDIR}/${P}-config_types.h.patch"
+	"${FILESDIR}/${P}-overflow.patch"
+)
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e 's:noinst_PROGRAMS:check_PROGRAMS:' \
+		libspeexdsp/Makefile.am || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	append-lfs-flags
+
+	# Can also be configured with one of:
+	# --enable-fixed-point             (no floating point)
+	# --with-fft=proprietary-intel-mkl (mkl)
+	# --with-fft=gpl-fftw3             (fftw)
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable static-libs static) \
+		$(use_enable cpu_flags_x86_sse sse) \
+		$(use_enable cpu_flags_x86_sse2 sse2) \
+		$(use_enable cpu_flags_arm_neon neon)
+}
+
+multilib_src_install_all() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/x264/Manifest b/media-libs/x264/Manifest
index b8507edf27aa..45f64bfdc4bc 100644
--- a/media-libs/x264/Manifest
+++ b/media-libs/x264/Manifest
@@ -2,5 +2,5 @@ DIST x264-snapshot-20160712-2245.tar.bz2 730644 BLAKE2B 3d80d831c5a13ab95f9a4ba2
 DIST x264-snapshot-20170701-2245.tar.bz2 750527 BLAKE2B ccf276da31383ab4b4a1ac48866bc49b4b2bc5913361c933fa2359de4d6e90cca091dd4aba781f3735a5b28d6ce006aa9d4e149ba48745b80cb971c2952ca867 SHA512 28fc9850c36ac385fced6dec9a0f68a5605a68805e1ef7b8cedcd78917eaa1ad6e47e57fe5a74fee0a6e482f3a33de6011f675e6c77b5db94c8fe01d5c5f3e9f
 EBUILD x264-0.0.20160712.ebuild 1996 BLAKE2B 57431a358195c6c3a061603ceef6dac39c5e74f1ce6c71505a4e670a6f4ca1daa2a43234184d4721cc03142a86d462616fd43f5ba9d4aa7340c5a01767749d6f SHA512 086681d299da2130bd4362d20af2d7085297616a28b8b12bf540bb60bd8032dc934597d39437b5c12805d6e48bef6c6afc2cefd569291325ef597ae6c11d2599
 EBUILD x264-0.0.20170701.ebuild 2004 BLAKE2B c59d90d4b867326eadd48ad6ba6e5699957102734cc90b55d61b1b77840b06eb0388ed03dbf51b3b84cf021e6754171cf342cbb9bc820bc768cfa3becf038f9f SHA512 0c1cc83a896dd0cc594d74bfa7324c88055425a433513c8422a32dc6b81d234c1d3472a02cd5c0b6716a08ce8ec79198de7f4bfc578b601356010ed913816805
-EBUILD x264-9999.ebuild 2004 BLAKE2B c59d90d4b867326eadd48ad6ba6e5699957102734cc90b55d61b1b77840b06eb0388ed03dbf51b3b84cf021e6754171cf342cbb9bc820bc768cfa3becf038f9f SHA512 0c1cc83a896dd0cc594d74bfa7324c88055425a433513c8422a32dc6b81d234c1d3472a02cd5c0b6716a08ce8ec79198de7f4bfc578b601356010ed913816805
+EBUILD x264-9999.ebuild 2008 BLAKE2B 43bb99253b7b08b983bf88875eaf3266824da8f9d218e25debb07a051c8ca06e2522d5fb927c8fbaf7c05fb5b3ce495bb7fe03ea20f6e50c5ffbe3228dcecd0a SHA512 6bad12ae9c94be31e1a9abed620193ae4772017f3c8b051539669aff6a8c98189c6fca1d70c37082d86f11e9d33ac29dbb113af01b751376f4ef630c4d6ec321
 MISC metadata.xml 589 BLAKE2B c7ee19e724c9c449efda7bf1733193d71c547bc3a80efb51d6b562a8d0134bb618d1daad542cc61fc5d0026467a4336ec0754f238e441cad8cfe72296c4eae07 SHA512 7a4acc6f2cf54f66efee1fedb379ea155559ddca1ff8bae88b5a8638b23555515e9cc31dff7ae6bb16e6d716e616dcb4b508870ad78ab1fe461ba8b7056f524e
diff --git a/media-libs/x264/x264-9999.ebuild b/media-libs/x264/x264-9999.ebuild
index 3d55a45da84b..d23274765863 100644
--- a/media-libs/x264/x264-9999.ebuild
+++ b/media-libs/x264/x264-9999.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="A free library for encoding X264/AVC streams"
 HOMEPAGE="https://www.videolan.org/developers/x264.html"
 if [[ ${PV} == 9999 ]]; then
 	inherit git-2
-	EGIT_REPO_URI="https://git.videolan.org/x264.git"
+	EGIT_REPO_URI="https://git.videolan.org/git/x264.git"
 else
 	inherit versionator
 	MY_P="x264-snapshot-$(get_version_component_range 3)-2245"
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 18d46c5409b0..551d25087b1e 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/amb-plugins/Manifest b/media-plugins/amb-plugins/Manifest
index 3f636b40c858..3739326864ac 100644
--- a/media-plugins/amb-plugins/Manifest
+++ b/media-plugins/amb-plugins/Manifest
@@ -1,5 +1,4 @@
 AUX amb-plugins-0.8.1-Makefile.patch 1490 BLAKE2B 5274789504fd46d939210c5c1fdd90ca2a903779771ba9536dd97487b7930001bcde7362443a27c18a28dcc0634a79d10df66a7db05ca0e41aa6d0974e79c2be SHA512 5909563375e3337a613147c2cc7f189d7e2b2b0ddf98193631b7bb5313d57f93cb2f2727fcd3bc447c325b7bd436ff1969440e240e69c2c6e7d315f9e9af9851
 DIST AMB-plugins-0.8.1.tar.bz2 28988 BLAKE2B 10146c75f26d6225e69a1214d25d8e28508e722938193bbb1ccf109956986a62a6cc382e81387da31a03f39a31e79fd77720129ab42d9108bdf2e11283b936d3 SHA512 cdf0f6f656012f1e9d31f54d4446392223165327804f44c8d767904c51ab54a858099f8ad5f57362494d1a3cd73c4b258b4748022b5d9b3f860ab4bb84dd4a71
-EBUILD amb-plugins-0.8.1-r1.ebuild 728 BLAKE2B d13d93392be7c36b7695125f0b730bba5971bdc7ddb782175478f94f3db85c70cc8756a4f0c8c857f02a6d1a1a478670b4d15264cff35cfbefe8954e0c26ede3 SHA512 d1d1207d1ef8de6d6642113248398f81910ceef0c9cc77b5f77e603b48af595474e1d3861e98486912147cebc2910cb29175c3c467184fbfd024150380c2c7d4
-EBUILD amb-plugins-0.8.1.ebuild 708 BLAKE2B 4a72307324c2d29bfd1f0679af596387a22c52b2e43df8daa586c51533fed64c59190e818d57952c7d39603368073e5eba7f44dd0e2aaf821f14c15761d847a4 SHA512 7ccb6034d670d470eae4b9d134887d13846b0f7836b76a21daa0e82eb744d392b59f4c79aca729a2227bc827bd6d8443224c2ff5ab9c5b30bdefebf9a73c3738
+EBUILD amb-plugins-0.8.1-r1.ebuild 727 BLAKE2B c033f128fb4a52eb37c707cea8fbe5cd2156baccf770ad035ec636e9c3e5f0f3724040ae1e709c2b01ec44b8bc5f563edf4a79d0f83453e93f3bb3a1769d7d94 SHA512 080f44ac2e400b84f04e4f9893c640b2a9ecd0c9ce890e668adfa1e5ea152c0fd7c8332b17ffd7b659d7db2c1f6cc7ad81b8d91ff5133eeedc6972653358da45
 MISC metadata.xml 259 BLAKE2B 91d2cc7f9ffec656984dd18988a2590a831985a51c93d540af04f796a82b49fedb3adbd5eae9c4c502aa8b4132252c0816589d47d7e8030d9e943dd852f3503d SHA512 1884a7f7d50806bd4addad63ca916f7e27388c953e6345e15fe20d500c217f5f0fcc05fcfa6e20220c28a870801f5e8aab538f5c7f8f211d27de27c98abdb600
diff --git a/media-plugins/amb-plugins/amb-plugins-0.8.1-r1.ebuild b/media-plugins/amb-plugins/amb-plugins-0.8.1-r1.ebuild
index 78d85242cbd1..d3620b95e120 100644
--- a/media-plugins/amb-plugins/amb-plugins-0.8.1-r1.ebuild
+++ b/media-plugins/amb-plugins/amb-plugins-0.8.1-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/"
 SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="media-libs/ladspa-sdk"
diff --git a/media-plugins/amb-plugins/amb-plugins-0.8.1.ebuild b/media-plugins/amb-plugins/amb-plugins-0.8.1.ebuild
deleted file mode 100644
index 3f8906ac31a7..000000000000
--- a/media-plugins/amb-plugins/amb-plugins-0.8.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=3
-
-inherit base multilib toolchain-funcs eutils
-
-MY_P=${P/amb/AMB}
-
-DESCRIPTION="AMB-plugins ladspa plugin package. Filters by Fons Adriaensen"
-HOMEPAGE="http://www.kokkinizita.net/linuxaudio/"
-SRC_URI="http://www.kokkinizita.net/linuxaudio/downloads/${MY_P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="media-libs/ladspa-sdk"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=( "${FILESDIR}/${P}-Makefile.patch" )
-
-src_compile() {
-	tc-export CXX
-	emake || die
-}
-
-src_install() {
-	dodoc AUTHORS README
-	insinto /usr/$(get_libdir)/ladspa
-	insopts -m0755
-	doins *.so
-}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 38652eada019..757abff58b6f 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index e4fae5f518cc..68041f139fb0 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -9,5 +9,5 @@ DIST mpd-0.20.10.tar.xz 778828 BLAKE2B c16b955ace770cf3d5da2ccad81fd3089cf2e60bf
 DIST mpd-0.20.12.tar.xz 781072 BLAKE2B 0f305efa94dca844ebc9e4548d0f57ce01c0274c49f40fe3fc8510b8f2748f2cf623125c16da382a8495aa6eeb1a8b9707a3bb46a5fa8a0657c9ffa11fbcb5dc SHA512 3e221edc71cc65f9da46aa4f1d0bc2f8ca701cc4a103ea8efb08191918312b2f3b0023288e3dcabe0779e81ee6f628773d779462e09a55f2c090cca0e3d099af
 EBUILD mpd-0.19.19.ebuild 7647 BLAKE2B 2de50fb5264ba419b33613cf38f653ccbf842f6c17c64d2d84ef6124fc998da10e36f79b414126f1a93c903707e70d49e5ad18983502c4ba73bddc80f7017abf SHA512 8c69f7db31ae45d0531dfd4f98984bbd88c70118ffa9188ae6be2152105accadedacf7219883700ed1f40e9c32a02f37dcb1d2c809ff452223241606f7d86169
 EBUILD mpd-0.20.10.ebuild 7248 BLAKE2B f70bdff7954b8881eabc937b636363011fc7431053a79fabcadf71ed4e46e3b07053c43aebf92525e5176b243228c6eb1b409baa37ac70e116068434d74cd4cd SHA512 97d69bc1331e6642b8f1c644dced54a0d3d1e45b5888161359e9d556281632b917138f8d0044422dd0219a817e83341103a8fa35d2b332af670a6b6f8ab5e829
-EBUILD mpd-0.20.12.ebuild 7290 BLAKE2B 19f3015e2b6e208ab12b08b97c893379310457af069981eb816f8977fad3a620f9691a736ae3b4d1f561326807799643003dd3cef3bb46f33f6f3cf8a65d9670 SHA512 c0ad23ccb2b63bee9934c7a7d60b1900ed8cbccb487d28f382c0e3a42dce37458ac920fc1800b05fcae39559907669fcc56c43bd489921c11795e737ef22dbb4
+EBUILD mpd-0.20.12.ebuild 7314 BLAKE2B dde2d3d78b80234f8019a533ea57314336590b4fc6c6488a3c9fa411bbc0e92f3a89a99ac9b99113f68c281a24b3dc31713deaafb37c915fe4d47e3ca05510d0 SHA512 a7c94315bf5213daa24015c90ab01468403a2dae5018f56a6a33f8c6b09e6a0433a49336c1e29f1cfca4439f70c622465a5c9d3e367eeb1ad24bf965fd340a31
 MISC metadata.xml 2496 BLAKE2B d4e284d95b673e3e2ace7d681bcb577c1d3ef2d43f708de060ed6a595a478e82fccf3487587d1f71c7f1cbbd510c0bc698e0a78806968a1332f7174aceef6319 SHA512 712f6b0c5fc58250521ccebd68b5af708868a1f1b9c398eec3d24434206bd56da70c26dcab52793826fd82d456c0c608ff21558ab514faf329face07e0aae1cc
diff --git a/media-sound/mpd/mpd-0.20.12.ebuild b/media-sound/mpd/mpd-0.20.12.ebuild
index 695a4b188efa..856bef046087 100644
--- a/media-sound/mpd/mpd-0.20.12.ebuild
+++ b/media-sound/mpd/mpd-0.20.12.ebuild
@@ -43,7 +43,10 @@ CDEPEND="
 	ao? ( media-libs/libao[alsa?,pulseaudio?] )
 	audiofile? ( media-libs/audiofile )
 	bzip2? ( app-arch/bzip2 )
-	cdio? ( dev-libs/libcdio-paranoia )
+	cdio? (
+		dev-libs/libcdio:=
+		dev-libs/libcdio-paranoia
+	)
 	curl? ( net-misc/curl )
 	expat? ( dev-libs/expat )
 	faad? ( media-libs/faad2 )
diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index 9cf23f30a3df..96f4965e5158 100644
--- a/media-tv/Manifest.gz
+++ b/media-tv/Manifest.gz
diff --git a/media-tv/tvheadend/Manifest b/media-tv/tvheadend/Manifest
index e434039482fd..55bca4e216c2 100644
--- a/media-tv/tvheadend/Manifest
+++ b/media-tv/tvheadend/Manifest
@@ -6,5 +6,5 @@ AUX tvheadend.initd 376 BLAKE2B 9ea5ac60f0f93f2f656d4de3516568502b2527a4d4956583
 AUX tvheadend.service 512 BLAKE2B b51bb6facda5287e038059f6234f7fd585ffd33a9a0483e1a9d89fe3cfa35bfc2859718b7a3e4774bf2159c0bf4c791b1424d9933c985d123f5763fec7f7573b SHA512 48fa16a3511ebed58d60b81227c483c4aac734abf096b14474f18cff55a9c44a7972c09d28fd2f6b622e91c5bc810869804da65e4a9676c6f684ba655430b695
 DIST tvheadend-4.2.4.tar.gz 21526564 BLAKE2B 19c571bb253041bd122306eaa516071d096d747b03eaf623b45b79fc0511633a75f1a0925a890207c994da001a2ba3404d1860b91236adae34e307bcf8c57796 SHA512 333a3509da198f5d96316f30fd010a216262315614db302c83405de78d29b32b1d878c0abd7fae2214713107e6955478ee3222b18888a84c57810035af882df4
 EBUILD tvheadend-4.2.4.ebuild 2974 BLAKE2B 62c7b046ce561fc8d85f8cf4bcf02531f611213877abc7aa7926d72e8490462763584221ed2d6aac5db91d1128f0d443a2bc8c98609db859481c2e193bb699b9 SHA512 bed3ac3bc460824f0b8c3ba0bff4b8299c31ff7a50b316a1bb12f06d00e85165ca17ae1189fbe18278d9db9ec0f79751921ffe672688b50685762cdfd8d44332
-EBUILD tvheadend-9999.ebuild 3769 BLAKE2B 2d2e57abb5786a19f6f50b33e1f11f2d3d12883735cd94c0d5bda0c04bc6b90badc417391228abda44c291d3ef5b4cc39cca057e7ccac26ca3d4c4f0156118a2 SHA512 23f7fd58dde6f2a46e7726ba899af498a4ee1f5be96c9961c851397e97b5d94aba744e72721db8938fad13ad8648c9efe5ee0f82794482ea2fe35366c3ab23aa
-MISC metadata.xml 1452 BLAKE2B 7c89c4b517de4e2a4910c6b943f655a77f9f5e378b8ccb1eabfb13615b0302ff74f1d6c2e9cb33d595b919c5ad19f9ea9998ba0e7644fcf656cfb3e72398fc02 SHA512 e213a5f0041fc562efcc4dbf48ea8cf7fd3a2fa9e68dbd8cd8dc925a316cb9c56756d9ce874c878d12721e25a4b80dae6539f8cfde4ccaa69e24b353bbdb36f8
+EBUILD tvheadend-9999.ebuild 3722 BLAKE2B 905b13ea537621cf3998fa9535480fa81b698bb6ca76c136f7b57f1123d9889718489e14e3abe0f71f8ef970453bc6cf5d200f03838c15b8640d487467324fcb SHA512 5c3eea75d17790f4d9537d88add017ad5c26b8ee5cc39797d59a2e7da4da63f8404a7be4ef951bb6b3b0f9fea4ddf6c759f51c04abc7744f20e6967842b6959a
+MISC metadata.xml 1512 BLAKE2B 447bca95c9993c2014810364bf9bac16c2ba30566469a2cbde75d73f7dbce316e418e41270822b5430ea64271da78b3eb2d70e712732e222b885701e0e520274 SHA512 c04617520590aa7facb8f368d31b1b73d31d37b20c91294db1b20b40c501f74b9544055ce05d94157fd06351cc1136ff1be9e2cdb5c0e9664242e0653f2859fa
diff --git a/media-tv/tvheadend/metadata.xml b/media-tv/tvheadend/metadata.xml
index ad28ad1f4b6f..0b905954f504 100644
--- a/media-tv/tvheadend/metadata.xml
+++ b/media-tv/tvheadend/metadata.xml
@@ -9,6 +9,7 @@
 		<flag name="capmt">Enable support for capmt (dvbapi) protocol</flag>
 		<flag name="constcw">Enable support for the constcw protocol</flag>
 		<flag name="cwc">Enable support for the cwc (newcamd) protocol</flag>
+		<flag name="ddci">Enable support for DDCI hardware</flag>
 		<flag name="dvbcsa">Enable decryption of the DVB Common Scrambling Algorithm</flag>
 		<flag name="dvben50221">Enable support for hardware CAM</flag>
 		<flag name="hdhomerun">Enable support for the HDHomeRun device</flag>
diff --git a/media-tv/tvheadend/tvheadend-9999.ebuild b/media-tv/tvheadend/tvheadend-9999.ebuild
index 55773cf0ac91..04ecda4fb1b5 100644
--- a/media-tv/tvheadend/tvheadend-9999.ebuild
+++ b/media-tv/tvheadend/tvheadend-9999.ebuild
@@ -13,13 +13,12 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
 
-IUSE="+capmt +constcw +cwc dbus debug dvbcsa dvben50221 +dvb +ffmpeg hdhomerun +imagecache +inotify iptv libressl opus satip systemd +timeshift uriparser vpx x264 x265 xmltv zeroconf zlib"
+IUSE="+capmt +constcw +cwc dbus debug +ddci dvbcsa +dvb +ffmpeg hdhomerun +imagecache +inotify iptv libressl opus satip systemd +timeshift uriparser vpx x264 x265 xmltv zeroconf zlib"
 
 RDEPEND="
 	virtual/libiconv
 	dbus? ( sys-apps/dbus )
 	dvbcsa? ( media-libs/libdvbcsa )
-	dvben50221? ( media-tv/linuxtv-dvb-apps )
 	ffmpeg? ( media-video/ffmpeg:0/55.57.57[opus?,vpx?,x264?,x265?] )
 	hdhomerun? ( media-libs/libhdhomerun )
 	!libressl? ( dev-libs/openssl:= )
@@ -47,7 +46,10 @@ RDEPEND+="
 	dvb? ( media-tv/dtv-scan-tables )
 	xmltv? ( media-tv/xmltv )"
 
-REQUIRED_USE="dvbcsa? ( || ( capmt constcw cwc dvben50221 ) )"
+REQUIRED_USE="
+	dvbcsa? ( || ( capmt constcw cwc ) )
+	ddci? ( dvb )
+"
 
 # Some patches from:
 # https://github.com/rpmfusion/tvheadend
@@ -92,9 +94,9 @@ src_configure() {
 		$(use_enable cwc) \
 		$(use_enable dbus dbus_1) \
 		$(use_enable debug trace) \
+		$(use_enable ddci) \
 		$(use_enable dvb linuxdvb) \
 		$(use_enable dvbcsa) \
-		$(use_enable dvben50221) \
 		$(use_enable ffmpeg libav) \
 		$(use_enable hdhomerun hdhomerun_client) \
 		$(use_enable imagecache) \
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 71b73eb66669..b89753bb67d6 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 05d301ac96eb..a02b3acb2d66 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -15,8 +15,8 @@ AUX vlc-9999-libva-1.2.1-compat.patch 291 BLAKE2B ed2e146e43ab65474d8e20f87f79b9
 DIST vlc-2.2.6.tar.xz 22198720 BLAKE2B a3d5d75551908a92c894ca18b36fd165ea0d6a99d1729c311f2051dfe1dd5eb7bf5045b08652e7a1d335212416a3e2d077f37157c7ae4773a5ecc2c49e39f5a6 SHA512 9aff5922eb8b3c6a24e6153c367b0170dbc67602ae3e9304f52d2da00c9081d66cc98abd722b7c95b6c7d2e6cc7c86f21f9cba42c7d4bf29ca97d0f2d3553f8d
 DIST vlc-2.2.8.tar.xz 22137276 BLAKE2B 10780f79a5c45c44b8fb76f229512da3932883da4a1b292745cabc8544ed251a080813ef233c9438766f3e635bee40ef64b929f3d43e0d457907093be1edd2f9 SHA512 adde16f4b4bd2d94f104bb3b99995df6bf4603bc67333c7615cb8d1d31ca63440b6b0aa93de9ccf0dba717cf905577c7d0bca7baba63caf401790b82eac3e04a
 EBUILD vlc-2.2.6.ebuild 15519 BLAKE2B cbc55f76288176d91b8e53b188778aa1f50b42942a60aafe9c9fc0278a6da13a04b8acaa0d7dcd76b0f1b54ad23b7048c76f07cca0ccd478659fb94492a6257a SHA512 ba381af8546d8d55b4394dd0db2859146f3fc0c015ac50767f945a38c3abb3034d1ff98b5a0793d4a201e694477ac8d1fd3d092b8274e09170a200a49ff13e94
-EBUILD vlc-2.2.8.ebuild 14352 BLAKE2B a1bc94e0c65cb87716a84163d06dd6f498954c131b312eff183b251292636bb0cf97b6b59263f36852c62eec9315a21d0060918bf103e896188852a137b93a90 SHA512 5883867833eda6e1a5c5c424c94120861f27f87959303d381bc125106007bb67d5ad835d34ca744d61de94f0b2330bd33edb4dfa564e25a778327581f6cc4db8
-EBUILD vlc-2.2.9999.ebuild 14359 BLAKE2B 5c345a996df8637de04388ed69979c20851ded661216b62615fa8e95b43e43d8c8693233d0f65f9ac0d79c9deb5f3ce7d4a745273e17668fd489b63ec5e8617a SHA512 f66d44da93f8026eebecb64351021c366fb8a5e279e806722896be8119699a35812daf186372841c835c61fdef8f0f3d2f2d754caf55a146e9fe619a21cfe7a7
-EBUILD vlc-3.0.9999.ebuild 13315 BLAKE2B 270a5bffdd953c471d87c8cab04b8b4298a3707e1eeac0c9776d8d3ee118bea5783d44e60bcbda7997caeeda6c045dc5a09857da1e38bf08c762ea21a884f545 SHA512 0d9a2337529c07000cb1d400eb46215ab742ed6d5e6ddc9f4b14fa013799940c1e9ed533952361d93ceeeb07fa765ea71239f8a01b7e810e6908c3f7b6d33687
-EBUILD vlc-9999.ebuild 13315 BLAKE2B 270a5bffdd953c471d87c8cab04b8b4298a3707e1eeac0c9776d8d3ee118bea5783d44e60bcbda7997caeeda6c045dc5a09857da1e38bf08c762ea21a884f545 SHA512 0d9a2337529c07000cb1d400eb46215ab742ed6d5e6ddc9f4b14fa013799940c1e9ed533952361d93ceeeb07fa765ea71239f8a01b7e810e6908c3f7b6d33687
+EBUILD vlc-2.2.8.ebuild 14353 BLAKE2B 04a631bc628a8f73d5b9893955adcb3e4995e527ea340bf493c31fe1d21221419f095bfa188e9a4f2502143c4dd704f64e702f181cde4c011858d3f20fee2463 SHA512 81a45d40cc043bc8f3417f899b25b02064e6d0f53c214853016a76a83bb0f90446e79121d651a761004d0c0c6fca424bd745236c95ccc80c589a1ea61ac319af
+EBUILD vlc-2.2.9999.ebuild 14360 BLAKE2B 536e1dd6d54e0bf690e3d68f0849bff0fb2a90f50ea564ae45a1e4845da04f937fea937bbf005f9c7bd68fdd99dd7a035957a89fb1947052e031e680963d2d00 SHA512 c379839f3da42e5cdd2633c1b353a8d6a9404104cf304b36ad973bf91ad3277cd7c53e1d7500f04ba291ae062ced93e2762a88703ce8f85d258c79b878dc5271
+EBUILD vlc-3.0.9999.ebuild 13316 BLAKE2B c9d87194e4453e7c23de7db48f8bb517c3c9ae4c4cfa7e84135d0dd747843121464b58d6d510013697228c0368cda9162b34ae8a42970f65661f7afe4a24ea58 SHA512 d04877f2c750470daafa84c73926ac30b648694b42b9e86f698655a2a33cad332d5435d41e4ec23f18efd908bc54e3c49483a06c17892660e71fb0358f987c43
+EBUILD vlc-9999.ebuild 13316 BLAKE2B c9d87194e4453e7c23de7db48f8bb517c3c9ae4c4cfa7e84135d0dd747843121464b58d6d510013697228c0368cda9162b34ae8a42970f65661f7afe4a24ea58 SHA512 d04877f2c750470daafa84c73926ac30b648694b42b9e86f698655a2a33cad332d5435d41e4ec23f18efd908bc54e3c49483a06c17892660e71fb0358f987c43
 MISC metadata.xml 6560 BLAKE2B 7a079c7b3d008646d49c8669834fccb7e78cf2ab88e0eb2671c571f91f012ab8b33989ef2035e35b55c585c1bdc930e9a5fd7d26c7f1a2fc7cab819fca54f21f SHA512 ed19d0f4e3349e13ef9967911c16a4b6569cefa97169ad79d7a9510ca88965c9e8fefcd593ceb2e5b0c31e82ad92e9513ff36460eddf3605d2250d285b19530f
diff --git a/media-video/vlc/vlc-2.2.8.ebuild b/media-video/vlc/vlc-2.2.8.ebuild
index 4ce203a79994..9b0a223172cb 100644
--- a/media-video/vlc/vlc-2.2.8.ebuild
+++ b/media-video/vlc/vlc-2.2.8.ebuild
@@ -158,7 +158,7 @@ RDEPEND="
 	upnp? ( net-libs/libupnp:= )
 	v4l? ( media-libs/libv4l:0 )
 	vaapi? (
-		x11-libs/libva:0[X,drm]
+		x11-libs/libva:0=[X,drm]
 		!libav? ( media-video/ffmpeg:0=[vaapi] )
 		libav? ( media-video/libav:0=[vaapi] )
 	)
diff --git a/media-video/vlc/vlc-2.2.9999.ebuild b/media-video/vlc/vlc-2.2.9999.ebuild
index 443d35b4c454..23aabcb4911d 100644
--- a/media-video/vlc/vlc-2.2.9999.ebuild
+++ b/media-video/vlc/vlc-2.2.9999.ebuild
@@ -158,7 +158,7 @@ RDEPEND="
 	upnp? ( net-libs/libupnp:= )
 	v4l? ( media-libs/libv4l:0 )
 	vaapi? (
-		x11-libs/libva:0[X,drm]
+		x11-libs/libva:0=[X,drm]
 		!libav? ( media-video/ffmpeg:0=[vaapi] )
 		libav? ( media-video/libav:0=[vaapi] )
 	)
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
index 69d4f900c985..308edb2ec4ab 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -202,7 +202,7 @@ RDEPEND="
 	upnp? ( net-libs/libupnp:= )
 	v4l? ( media-libs/libv4l:0 )
 	vaapi? (
-		x11-libs/libva:0[X,drm]
+		x11-libs/libva:0=[X,drm]
 		!libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi] )
 		libav? ( media-video/libav:0=[vaapi] )
 	)
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 69d4f900c985..308edb2ec4ab 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -202,7 +202,7 @@ RDEPEND="
 	upnp? ( net-libs/libupnp:= )
 	v4l? ( media-libs/libv4l:0 )
 	vaapi? (
-		x11-libs/libva:0[X,drm]
+		x11-libs/libva:0=[X,drm]
 		!libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi] )
 		libav? ( media-video/libav:0=[vaapi] )
 	)
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 0cc5fa921b88..8c457322c85f 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 7ec07c2c0116..92bb2b00ee6a 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sun, 17 Dec 2017 08:08:56 +0000
+Mon, 18 Dec 2017 14:09:01 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 2847405a71be..1f0d75fb5f19 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 2017-12-17T08:09:00Z
+TIMESTAMP 2017-12-18T14:09:05Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlo2JhxfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlo3zAFfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCf8hAAprdTrg7ntWrpCLJP/MFK6LqWlxO7ty8LYaZ79xHgQPFZ5+Sxt+lYD/a0
-qupm4XRZ/jkJgZkWyB4cOxrxATViegD3XeT+W6WZiOzpQ/f0I6N6jMchb6E81cEk
-kUF+/orHfV2b6oVCc4LX329dhIe7EftHLunU8nCZiMQkGKxNheRmNo0+ChEPImb/
-FbMJP59UY/u/Nb8QutTU3LHwoZ8ew3dIZdNyf/OR0Qp+PsEPAGYQx/fEZ8Ft1+0W
-Q6ew9BlTjtdCeGQsgEhLDkcKEN28ONf2FH91euK9sxsgGVg49uweuC3eI/5FUhju
-qQWKE1f4uxah52AbmVFj1Vz2J0rwOFZn7JYU3cQDubLidZdIqOX459GpCiKxEpxG
-7X8bZjElCxXIHwp9HY4ZpFccjpwTfaqZpMiZiLKqPywaPPSh2bzJZVB5wliV5syb
-jtkAOzN/6wT2P47+ZvGe7kFASTR8hS/V9pO73Wd0NntHXaaPE+wDzuQ1hLFBhZ1B
-IpwsFwY4MB/jkOQXg7grkPKUTPGQli7JK6eqx6sDkSY9nyZWdNZ4AKG3VbYJx3dV
-KkRZXYi5PuoJ2rZw1AXy4fNE7ldr2JWath8pkMTsdqdRb/m+an2Or7KDz3kMovbr
-/GYVlmHjJFIQ5/VWkbaG9l1UJbXwntcFrig0a11GHqQreG96PM8=
-=+3hY
+klDFAA/+I7CvYijh3nSsO8wDMRKK6tJ9wcErFCEVv7eDEHoVqxzMSxc8DnTlEYhJ
+6QmjtzLE+tJFf49z+Uro25n+hBZSjJVN3QHMJjTfHBGufMkx7DfstnTYnwJxlhen
+guDCOI9ed7lj6OLXj0L/kMmFx1eAut7IWEqiMTkE+VTxdfNpsCf7RDyu6OOqXchW
+3Y7vqEgtLZIFFhJ53za1Pm1gJliVE5pNIFr3BxlKxJEOy4yExaoWFrdoYBUeTTKR
+MmDdzMTmeDYoRJuoSTPI+/WpXPGrRty/wfvCMmJjn2RcOdyjq+IBkH8EkzU0e7LN
+LF7kdUJof3ip16lMFSO4BGnLVHzYogHwKnpvHbuSVnnUYVxbJKD1OyMPfG7ViBSB
+jMehPUFSpD7RII2YwhzvN3X1OvdLCs+KPbVufg1sd1ahTS3ZZIm6k0ZupynKy+PX
+QvuGY0Sg4U60LfqaCMH1ddVm9pZO/pq7u4Gcwl4S583fXx5aWyXJwan2nLBv8i4v
+GZBIrtv49HewUbBI4v5RvgnkbxIAdX62oXV6Ok2xtKUbAvTPwOZrOf5VQs+9wVYT
+kLgDdR1Gppv0SQwDWsvBhGIxpPrXGkZvwsFPtVfIB8DAsUgQqrPsb3vEC6EFa/MY
+JOhOT3n3noftFDR2wwtWA0SDK4UJukOZxQP1yv59wwgMkaOWOOw=
+=l1oB
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 7ec07c2c0116..3d7ab973d08a 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sun, 17 Dec 2017 08:08:56 +0000
+Mon, 18 Dec 2017 14:09:02 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 6abf5e7ec700..ef4e92b94de3 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 1ee280de0a73..9a66c272afd4 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/cancd-0.1.0-r3 b/metadata/md5-cache/app-admin/cancd-0.1.0-r3
deleted file mode 100644
index 4c09e056a61c..000000000000
--- a/metadata/md5-cache/app-admin/cancd-0.1.0-r3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=the CA NetConsole Daemon receives output from the Linux netconsole driver
-EAPI=5
-HOMEPAGE=http://oss.oracle.com/projects/cancd/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://oss.oracle.com/projects/cancd/dist/files/source/cancd-0.1.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=55ce97c3576ed4372a1e1224f200c7c1
diff --git a/metadata/md5-cache/app-admin/cancd-0.1.0-r4 b/metadata/md5-cache/app-admin/cancd-0.1.0-r4
new file mode 100644
index 000000000000..acfb4c89ca9d
--- /dev/null
+++ b/metadata/md5-cache/app-admin/cancd-0.1.0-r4
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install preinst prepare
+DESCRIPTION=CA NetConsole Daemon receives output from the Linux netconsole driver
+EAPI=6
+HOMEPAGE=http://oss.oracle.com/projects/cancd/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=http://oss.oracle.com/projects/cancd/dist/files/source/cancd-0.1.0.tar.gz
+_eclasses_=user	8bc2845510e2109af75e3eeac607ec81
+_md5_=e8f1186123503650eb470a9bf7fb68ce
diff --git a/metadata/md5-cache/app-admin/metalog-3-r1 b/metadata/md5-cache/app-admin/metalog-3-r1
deleted file mode 100644
index 739fe30a499f..000000000000
--- a/metadata/md5-cache/app-admin/metalog-3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst preinst prepare
-DEPEND=>=dev-libs/libpcre-3.4 virtual/pkgconfig app-arch/xz-utils virtual/pkgconfig
-DESCRIPTION=A highly configurable replacement for syslogd/klogd
-EAPI=3
-HOMEPAGE=http://metalog.sourceforge.net/
-IUSE=unicode
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/libpcre-3.4
-SLOT=0
-SRC_URI=mirror://sourceforge/metalog/metalog-3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=bb85e74cb1c6e0d80b23489c01194d46
diff --git a/metadata/md5-cache/app-admin/metalog-3-r2 b/metadata/md5-cache/app-admin/metalog-3-r2
index b5a8d7b8160b..ed554291cf4a 100644
--- a/metadata/md5-cache/app-admin/metalog-3-r2
+++ b/metadata/md5-cache/app-admin/metalog-3-r2
@@ -4,10 +4,10 @@ DESCRIPTION=A highly configurable replacement for syslogd/klogd
 EAPI=6
 HOMEPAGE=http://metalog.sourceforge.net/
 IUSE=unicode
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/libpcre-3.4
 SLOT=0
 SRC_URI=mirror://sourceforge/metalog/metalog-3.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=61486d33536fd87b4f9f79792a6c3811
+_md5_=e72de6db076c404b5616a40bfb327fcb
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 40f426c3510f..9728abe61154 100644
--- a/metadata/md5-cache/app-arch/Manifest.gz
+++ b/metadata/md5-cache/app-arch/Manifest.gz
diff --git a/metadata/md5-cache/app-arch/tar-1.29-r2 b/metadata/md5-cache/app-arch/tar-1.30
index e2b93b1111d0..18fb7118983b 100644
--- a/metadata/md5-cache/app-arch/tar-1.29-r2
+++ b/metadata/md5-cache/app-arch/tar-1.30
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install prepare
 DEPEND=acl? ( virtual/acl ) selinux? ( sys-libs/libselinux ) nls? ( >=sys-devel/gettext-0.10.35 ) xattr? ( elibc_glibc? ( sys-apps/attr ) )
 DESCRIPTION=Use this to make tarballs :)
-EAPI=5
+EAPI=6
 HOMEPAGE=https://www.gnu.org/software/tar/
 IUSE=acl elibc_glibc minimal nls selinux static userland_GNU xattr
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3+
 RDEPEND=acl? ( virtual/acl ) selinux? ( sys-libs/libselinux )
 SLOT=0
-SRC_URI=mirror://gnu/tar/tar-1.29.tar.bz2 mirror://gnu-alpha/tar/tar-1.29.tar.bz2
+SRC_URI=mirror://gnu/tar/tar-1.30.tar.bz2 mirror://gnu-alpha/tar/tar-1.30.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=54e2d641813d4116a545aa9c9d6ebc4b
+_md5_=2d2010b7e562e98140174aed135af112
diff --git a/metadata/md5-cache/app-arch/unrar-5.5.8 b/metadata/md5-cache/app-arch/unrar-5.5.8
index 8e056025ca10..ffd0fbfdaf85 100644
--- a/metadata/md5-cache/app-arch/unrar-5.5.8
+++ b/metadata/md5-cache/app-arch/unrar-5.5.8
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile configure install prepare
 DESCRIPTION=Uncompress rar files
 EAPI=6
 HOMEPAGE=http://www.rarlab.com/rar_add.htm
-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
+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=unRAR
 RDEPEND=!<=app-arch/unrar-gpl-0.0.1_p20080417
 SLOT=0/5
 SRC_URI=http://www.rarlab.com/rar/unrarsrc-5.5.8.tar.gz -> unrar-5.5.8.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=a87fe37d029786ee0b7ef18757822944
+_md5_=6a97705b29032e73ed00a2f5027d43e0
diff --git a/metadata/md5-cache/app-arch/xz-utils-5.2.2 b/metadata/md5-cache/app-arch/xz-utils-5.2.2
index a0ddbd062c69..05202255980f 100644
--- a/metadata/md5-cache/app-arch/xz-utils-5.2.2
+++ b/metadata/md5-cache/app-arch/xz-utils-5.2.2
@@ -8,6 +8,6 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 LICENSE=public-domain LGPL-2.1+ GPL-2+
 RDEPEND=!<app-arch/lzma-4.63 !app-arch/lzma-utils !<app-arch/p7zip-4.57
 SLOT=0
-SRC_URI=http://tukaani.org/xz/xz-5.2.2.tar.gz
+SRC_URI=https://tukaani.org/xz/xz-5.2.2.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=6cce033a2c05e7a0d0ca91284f4777c8
+_md5_=938d16ae0dc13c2aa69ef0f50532d4d4
diff --git a/metadata/md5-cache/app-arch/xz-utils-5.2.3 b/metadata/md5-cache/app-arch/xz-utils-5.2.3
index ba4f25f57af9..7e7a2c0395d0 100644
--- a/metadata/md5-cache/app-arch/xz-utils-5.2.3
+++ b/metadata/md5-cache/app-arch/xz-utils-5.2.3
@@ -3,11 +3,12 @@ DEPEND=!<app-arch/lzma-4.63 !app-arch/lzma-utils !<app-arch/p7zip-4.57 >=app-por
 DESCRIPTION=utils for managing LZMA compressed files
 EAPI=5
 HOMEPAGE=http://tukaani.org/xz/
-IUSE=elibc_FreeBSD nls static-libs +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+IUSE=elibc_FreeBSD +extra-filters nls static-libs +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 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=public-domain LGPL-2.1+ GPL-2+
 RDEPEND=!<app-arch/lzma-4.63 !app-arch/lzma-utils !<app-arch/p7zip-4.57
+RESTRICT=!extra-filters? ( test )
 SLOT=0
-SRC_URI=http://tukaani.org/xz/xz-5.2.3.tar.gz
+SRC_URI=https://tukaani.org/xz/xz-5.2.3.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=b2175a94945175b98aed749f1c449aca
+_md5_=c43bd879e600cf01dbdbdd8833d27327
diff --git a/metadata/md5-cache/app-arch/xz-utils-9999 b/metadata/md5-cache/app-arch/xz-utils-9999
index 2dec23fecc5e..2f7da034b4e3 100644
--- a/metadata/md5-cache/app-arch/xz-utils-9999
+++ b/metadata/md5-cache/app-arch/xz-utils-9999
@@ -3,9 +3,10 @@ DEPEND=!<app-arch/lzma-4.63 !app-arch/lzma-utils !<app-arch/p7zip-4.57 sys-devel
 DESCRIPTION=utils for managing LZMA compressed files
 EAPI=5
 HOMEPAGE=http://tukaani.org/xz/
-IUSE=elibc_FreeBSD nls static-libs +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+IUSE=elibc_FreeBSD +extra-filters nls static-libs +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 LICENSE=public-domain LGPL-2.1+ GPL-2+
 RDEPEND=!<app-arch/lzma-4.63 !app-arch/lzma-utils !<app-arch/p7zip-4.57
+RESTRICT=!extra-filters? ( test )
 SLOT=0
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	git-2	195a672bfaf52d868442171c9469bbb6	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=bd1e06e5e8afecd8acb566bc8102abcf
+_md5_=97b71d0d4def2ce72c56ade36e16a8e2
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index fa0412e2111d..26a2aff78fe3 100644
--- a/metadata/md5-cache/app-backup/Manifest.gz
+++ b/metadata/md5-cache/app-backup/Manifest.gz
diff --git a/metadata/md5-cache/app-backup/bacula-7.0.5-r1 b/metadata/md5-cache/app-backup/bacula-7.0.5-r1
deleted file mode 100644
index a0d2abfd56ed..000000000000
--- a/metadata/md5-cache/app-backup/bacula-7.0.5-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup unpack
-DEPEND=dev-libs/gmp:0 !bacula-clientonly? ( postgres? ( dev-db/postgresql:*[threads] ) mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) !bacula-nodir? ( virtual/mta ) ) qt4? ( dev-qt/qtsvg:4 x11-libs/qwt:5 ) logwatch? ( sys-apps/logwatch ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) sys-libs/zlib[static-libs] dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] ssl? ( dev-libs/openssl:0[static-libs] ) ) !static? ( acl? ( virtual/acl ) sys-libs/zlib dev-libs/lzo sys-libs/ncurses:= ssl? ( dev-libs/openssl:0 ) ) virtual/pkgconfig >=app-portage/elt-patches-20170422
-DESCRIPTION=Featureful client/server network backup suite
-EAPI=5
-HOMEPAGE=http://www.bacula.org/
-IUSE=acl bacula-clientonly bacula-nodir bacula-nosd examples ipv6 logwatch mysql postgres qt4 readline +sqlite ssl static tcpd vim-syntax X
-KEYWORDS=amd64 ppc sparc x86
-LICENSE=AGPL-3
-RDEPEND=dev-libs/gmp:0 !bacula-clientonly? ( postgres? ( dev-db/postgresql:*[threads] ) mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) !bacula-nodir? ( virtual/mta ) ) qt4? ( dev-qt/qtsvg:4 x11-libs/qwt:5 ) logwatch? ( sys-apps/logwatch ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) sys-libs/zlib[static-libs] dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] ssl? ( dev-libs/openssl:0[static-libs] ) ) !static? ( acl? ( virtual/acl ) sys-libs/zlib dev-libs/lzo sys-libs/ncurses:= ssl? ( dev-libs/openssl:0 ) ) !bacula-clientonly? ( !bacula-nosd? ( sys-block/mtx app-arch/mt-st ) ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-REQUIRED_USE=!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) ) static? ( bacula-clientonly )
-SLOT=0
-SRC_URI=mirror://sourceforge/bacula/bacula-7.0.5.tar.gz
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	qt4-r2	b7985a3197fbc3a22d059f19904e735b	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=1f0f2461b263ab85f98ba98f59c63f70
diff --git a/metadata/md5-cache/app-backup/bacula-7.0.5-r2 b/metadata/md5-cache/app-backup/bacula-9.0.6
index d583ea3b01bd..3d21ae150009 100644
--- a/metadata/md5-cache/app-backup/bacula-7.0.5-r2
+++ b/metadata/md5-cache/app-backup/bacula-9.0.6
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare setup unpack
-DEPEND=dev-libs/gmp:0 !bacula-clientonly? ( postgres? ( dev-db/postgresql:*[threads] ) mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) !bacula-nodir? ( virtual/mta ) ) qt4? ( dev-qt/qtsvg:4 x11-libs/qwt:5 ) logwatch? ( sys-apps/logwatch ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) sys-libs/zlib[static-libs] dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] ssl? ( dev-libs/openssl:0[static-libs] ) ) !static? ( acl? ( virtual/acl ) sys-libs/zlib dev-libs/lzo sys-libs/ncurses:= ssl? ( dev-libs/openssl:0 ) ) virtual/pkgconfig >=app-portage/elt-patches-20170422
+DEPEND=dev-libs/gmp:0 !bacula-clientonly? ( postgres? ( dev-db/postgresql:=[threads] ) mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) !bacula-nodir? ( virtual/mta ) ) qt4? ( dev-qt/qtsvg:4 x11-libs/qwt:5 ) logwatch? ( sys-apps/logwatch ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) sys-libs/zlib[static-libs] dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] ssl? ( !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) ) ) !static? ( acl? ( virtual/acl ) sys-libs/zlib dev-libs/lzo sys-libs/ncurses:= ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) virtual/pkgconfig >=app-portage/elt-patches-20170422
 DESCRIPTION=Featureful client/server network backup suite
 EAPI=5
 HOMEPAGE=http://www.bacula.org/
-IUSE=acl bacula-clientonly bacula-nodir bacula-nosd examples ipv6 logwatch mysql postgres qt4 readline +sqlite ssl static tcpd vim-syntax X
+IUSE=acl bacula-clientonly bacula-nodir bacula-nosd examples ipv6 libressl logwatch mysql postgres qt4 readline +sqlite ssl static tcpd vim-syntax X
 KEYWORDS=~amd64 ~ppc ~sparc ~x86
 LICENSE=AGPL-3
-RDEPEND=dev-libs/gmp:0 !bacula-clientonly? ( postgres? ( dev-db/postgresql:*[threads] ) mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) !bacula-nodir? ( virtual/mta ) ) qt4? ( dev-qt/qtsvg:4 x11-libs/qwt:5 ) logwatch? ( sys-apps/logwatch ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) sys-libs/zlib[static-libs] dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] ssl? ( dev-libs/openssl:0[static-libs] ) ) !static? ( acl? ( virtual/acl ) sys-libs/zlib dev-libs/lzo sys-libs/ncurses:= ssl? ( dev-libs/openssl:0 ) ) !bacula-clientonly? ( !bacula-nosd? ( sys-block/mtx app-arch/mt-st ) ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+RDEPEND=dev-libs/gmp:0 !bacula-clientonly? ( postgres? ( dev-db/postgresql:=[threads] ) mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) !bacula-nodir? ( virtual/mta ) ) qt4? ( dev-qt/qtsvg:4 x11-libs/qwt:5 ) logwatch? ( sys-apps/logwatch ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) sys-libs/zlib[static-libs] dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] ssl? ( !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) ) ) !static? ( acl? ( virtual/acl ) sys-libs/zlib dev-libs/lzo sys-libs/ncurses:= ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) !bacula-clientonly? ( !bacula-nosd? ( sys-block/mtx app-arch/mt-st ) ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 REQUIRED_USE=!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) ) static? ( bacula-clientonly )
 SLOT=0
-SRC_URI=mirror://sourceforge/bacula/bacula-7.0.5.tar.gz
+SRC_URI=mirror://sourceforge/bacula/bacula-9.0.6.tar.gz
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	qt4-r2	b7985a3197fbc3a22d059f19904e735b	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=d53912ac97ecd5e60cec381a4711d219
+_md5_=01f27665a2ac84b9cfb6b10894d3a55e
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 8dad7921ba8d..82cce9354cfb 100644
--- a/metadata/md5-cache/app-crypt/Manifest.gz
+++ b/metadata/md5-cache/app-crypt/Manifest.gz
diff --git a/metadata/md5-cache/app-crypt/acme-tiny-20170917 b/metadata/md5-cache/app-crypt/acme-tiny-20170917
index f736989a05fc..5559d7f1c0e6 100644
--- a/metadata/md5-cache/app-crypt/acme-tiny-20170917
+++ b/metadata/md5-cache/app-crypt/acme-tiny-20170917
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 SLOT=0
 SRC_URI=https://github.com/diafygi/acme-tiny/archive/4ed13950c0a9cf61f1ca81ff1874cde1cf48ab32.tar.gz -> acme-tiny-20170917.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fd108cbbd98e968ffe71a9b21a0a0392
+_md5_=9b5cd20f6f1e8756b6e7fe2c5af8a72f
diff --git a/metadata/md5-cache/app-crypt/acme-tiny-99999999 b/metadata/md5-cache/app-crypt/acme-tiny-99999999
index d89a8f3df6f4..4b6c74eb640b 100644
--- a/metadata/md5-cache/app-crypt/acme-tiny-99999999
+++ b/metadata/md5-cache/app-crypt/acme-tiny-99999999
@@ -9,4 +9,4 @@ RDEPEND=dev-libs/openssl:0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fd108cbbd98e968ffe71a9b21a0a0392
+_md5_=9b5cd20f6f1e8756b6e7fe2c5af8a72f
diff --git a/metadata/md5-cache/app-dicts/Manifest.gz b/metadata/md5-cache/app-dicts/Manifest.gz
index 0e3888bbe509..e14fe2d58d0d 100644
--- a/metadata/md5-cache/app-dicts/Manifest.gz
+++ b/metadata/md5-cache/app-dicts/Manifest.gz
diff --git a/metadata/md5-cache/app-dicts/gnome-dictionary-3.24.1 b/metadata/md5-cache/app-dicts/gnome-dictionary-3.24.1
new file mode 100644
index 000000000000..4d9b2567ca77
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/gnome-dictionary-3.24.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.42:2[dbus] x11-libs/cairo:= >=x11-libs/gtk+-3.21.1:3 x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-1.42:= ) >=dev-util/gtk-doc-am-1.15 >=dev-util/intltool-0.40 dev-util/itstool >=sys-devel/gettext-0.17 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Dictionary utility for GNOME
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Dictionary
+IUSE=debug +introspection ipv6
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=GPL-2+ LGPL-2.1+ FDL-1.1+
+RDEPEND=>=dev-libs/glib-2.42:2[dbus] x11-libs/cairo:= >=x11-libs/gtk+-3.21.1:3 x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-1.42:= ) gnome-base/gsettings-desktop-schemas !<gnome-extra/gnome-utils-3.4
+SLOT=0/10
+SRC_URI=mirror://gnome/sources/gnome-dictionary/3.24/gnome-dictionary-3.24.1.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0e3c1df71ebc690150f021435ddff9f2
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 5b3bca6f6235..d189ec488678 100644
--- a/metadata/md5-cache/app-emulation/Manifest.gz
+++ b/metadata/md5-cache/app-emulation/Manifest.gz
diff --git a/metadata/md5-cache/app-emulation/e-uae-0.8.29_rc4-r2 b/metadata/md5-cache/app-emulation/e-uae-0.8.29_rc4-r2
deleted file mode 100644
index 46bd62462f73..000000000000
--- a/metadata/md5-cache/app-emulation/e-uae-0.8.29_rc4-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=X? ( x11-libs/libXt x11-libs/libxkbfile x11-libs/libXext x11-misc/xkeyboard-config dga? ( x11-libs/libXxf86dga x11-libs/libXxf86vm ) ) !X? ( sdl? ( media-libs/libsdl ) !sdl? ( sys-libs/ncurses ) ) alsa? ( media-libs/alsa-lib ) !alsa? ( sdl-sound? ( media-libs/sdl-sound ) ) capslib? ( >=games-emulation/caps-20060612 ) sys-libs/zlib virtual/cdrtools X? ( dga? ( x11-proto/xf86vidmodeproto x11-proto/xf86dgaproto ) )
-DESCRIPTION=The Ubiquitous Amiga Emulator with an emulation core largely based on WinUAE
-EAPI=3
-HOMEPAGE=http://www.rcdrummond.net/uae/
-IUSE=X dga ncurses sdl alsa oss sdl-sound capslib
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=X? ( x11-libs/libXt x11-libs/libxkbfile x11-libs/libXext x11-misc/xkeyboard-config dga? ( x11-libs/libXxf86dga x11-libs/libXxf86vm ) ) !X? ( sdl? ( media-libs/libsdl ) !sdl? ( sys-libs/ncurses ) ) alsa? ( media-libs/alsa-lib ) !alsa? ( sdl-sound? ( media-libs/sdl-sound ) ) capslib? ( >=games-emulation/caps-20060612 ) sys-libs/zlib virtual/cdrtools
-SLOT=0
-SRC_URI=http://www.rcdrummond.net/uae/e-uae-0.8.29-WIP4/e-uae-0.8.29-WIP4.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=88176067bfe66bf37205d95eff0ca49d
diff --git a/metadata/md5-cache/app-emulation/spim-8.0-r1 b/metadata/md5-cache/app-emulation/spim-8.0-r1
deleted file mode 100644
index fff268dd1ffc..000000000000
--- a/metadata/md5-cache/app-emulation/spim-8.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=X? ( media-fonts/font-adobe-100dpi x11-libs/libXaw x11-libs/libXp ) X? ( x11-misc/imake x11-proto/xproto ) >=sys-apps/sed-4 sys-devel/bison
-DESCRIPTION=MIPS Simulator
-EAPI=3
-HOMEPAGE=http://spimsimulator.sourceforge.net/
-IUSE=doc X
-KEYWORDS=amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=X? ( media-fonts/font-adobe-100dpi x11-libs/libXaw x11-libs/libXp )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.cs.wisc.edu/~larus/SPIM/spim-8.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=8a6b364f3d51f2e628e1dd1ec5d8826e
diff --git a/metadata/md5-cache/app-eselect/Manifest.gz b/metadata/md5-cache/app-eselect/Manifest.gz
index 290dc2f04919..47c9e0b9d6e7 100644
--- a/metadata/md5-cache/app-eselect/Manifest.gz
+++ b/metadata/md5-cache/app-eselect/Manifest.gz
diff --git a/metadata/md5-cache/app-eselect/eselect-miniaudicle-1.0.1-r1 b/metadata/md5-cache/app-eselect/eselect-miniaudicle-1.0.1-r1
deleted file mode 100644
index 555c9d540018..000000000000
--- a/metadata/md5-cache/app-eselect/eselect-miniaudicle-1.0.1-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Manages the /usr/bin/miniAudicle symlink
-EAPI=3
-HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=app-admin/eselect-1.2.3
-SLOT=0
-SRC_URI=mirror://gentoo/miniaudicle.eselect-1.0.1.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=2c0e845222f518d1660ead78308a48ca
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 640bfbd0e990..e7d4b0163e0a 100644
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
diff --git a/metadata/md5-cache/app-misc/anki-2.1.0_beta25 b/metadata/md5-cache/app-misc/anki-2.1.0_beta25
index 45b0d604b53f..9dca29141f74 100644
--- a/metadata/md5-cache/app-misc/anki-2.1.0_beta25
+++ b/metadata/md5-cache/app-misc/anki-2.1.0_beta25
@@ -1,12 +1,13 @@
-DEFINED_PHASES=compile configure install prepare setup
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python3_6(+)] dev-python/PyQt5[gui,svg,webkit,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python3_6(+)] >=dev-python/httplib2-0.7.4[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python3_6(+)] dev-python/beautifulsoup:4[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python3_6(+)] dev-python/decorator[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python3_6(+)] dev-python/markdown[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python3_6(+)] dev-python/requests[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python3_6(+)] dev-python/send2trash[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(+)] recording? ( media-sound/lame >=dev-python/pyaudio-0.2.4[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(+)] ) sound? ( media-video/mplayer ) latex? ( app-text/texlive app-text/dvipng ) test? ( dev-python/nose[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python3_6(+)] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A spaced-repetition memory training program (flash cards)
-EAPI=5
+EAPI=6
 HOMEPAGE=https://apps.ankiweb.net
-IUSE=latex +recording +sound 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
+IUSE=latex +recording +sound test python_targets_python3_6
 LICENSE=GPL-3
-RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4[sqlite] ) python_single_target_python3_5? ( dev-lang/python:3.5[sqlite] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/PyQt5[gui,svg,webkit,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/httplib2-0.7.4[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/beautifulsoup[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/send2trash[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(+)?] recording? ( media-sound/lame >=dev-python/pyaudio-0.2.4[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(+)?] ) sound? ( media-video/mplayer ) latex? ( app-text/texlive app-text/dvipng )
-REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python3_6(+)] dev-python/PyQt5[gui,svg,webkit,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python3_6(+)] >=dev-python/httplib2-0.7.4[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python3_6(+)] dev-python/beautifulsoup:4[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python3_6(+)] dev-python/decorator[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python3_6(+)] dev-python/markdown[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python3_6(+)] dev-python/requests[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python3_6(+)] dev-python/send2trash[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(+)] recording? ( media-sound/lame >=dev-python/pyaudio-0.2.4[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(+)] ) sound? ( media-video/mplayer ) latex? ( app-text/texlive app-text/dvipng )
+REQUIRED_USE=python_targets_python3_6
 SLOT=0
 SRC_URI=https://apps.ankiweb.net/downloads/beta/anki-2.1.0beta25-source.tgz -> anki-2.1.0_beta25.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=0d25052e1a49df0125ee9eda4410b643
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f065a4d27f75db9e0c5f3509c6b2db56
diff --git a/metadata/md5-cache/app-misc/anki-2.1.0_beta27 b/metadata/md5-cache/app-misc/anki-2.1.0_beta27
new file mode 100644
index 000000000000..47a9d5efc0bf
--- /dev/null
+++ b/metadata/md5-cache/app-misc/anki-2.1.0_beta27
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python3_6(+)] dev-python/PyQt5[gui,svg,webkit,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python3_6(+)] >=dev-python/httplib2-0.7.4[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python3_6(+)] dev-python/beautifulsoup:4[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python3_6(+)] dev-python/decorator[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python3_6(+)] dev-python/markdown[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python3_6(+)] dev-python/requests[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python3_6(+)] dev-python/send2trash[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(+)] recording? ( media-sound/lame >=dev-python/pyaudio-0.2.4[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(+)] ) sound? ( media-video/mplayer ) latex? ( app-text/texlive app-text/dvipng ) test? ( dev-python/nose[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python3_6(+)] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A spaced-repetition memory training program (flash cards)
+EAPI=6
+HOMEPAGE=https://apps.ankiweb.net
+IUSE=latex +recording +sound test python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python3_6(+)] dev-python/PyQt5[gui,svg,webkit,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python3_6(+)] >=dev-python/httplib2-0.7.4[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python3_6(+)] dev-python/beautifulsoup:4[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python3_6(+)] dev-python/decorator[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python3_6(+)] dev-python/markdown[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python3_6(+)] dev-python/requests[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python3_6(+)] dev-python/send2trash[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(+)] recording? ( media-sound/lame >=dev-python/pyaudio-0.2.4[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(+)] ) sound? ( media-video/mplayer ) latex? ( app-text/texlive app-text/dvipng )
+REQUIRED_USE=python_targets_python3_6
+SLOT=0
+SRC_URI=https://apps.ankiweb.net/downloads/beta/anki-2.1.0beta27-source.tgz -> anki-2.1.0_beta27.tgz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=68f565354cb56b56a88040dc30f2a5aa
diff --git a/metadata/md5-cache/app-misc/color-1.2-r1 b/metadata/md5-cache/app-misc/color-1.2-r1
deleted file mode 100644
index 7d881bb72e31..000000000000
--- a/metadata/md5-cache/app-misc/color-1.2-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst prepare
-DESCRIPTION=Easily add ANSI colouring to shell scripts
-EAPI=3
-HOMEPAGE=http://www.runslinux.net/?page_id=10
-KEYWORDS=alpha amd64 hppa ~ia64 ~mips ppc ppc64 sparc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://runslinux.net/projects/color/color-1.2.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=e1aa38dd0732ba07aca2aa18184adcf4
diff --git a/metadata/md5-cache/app-misc/color-1.2-r2 b/metadata/md5-cache/app-misc/color-1.2-r2
index 70631f2e9174..2ec481fa7205 100644
--- a/metadata/md5-cache/app-misc/color-1.2-r2
+++ b/metadata/md5-cache/app-misc/color-1.2-r2
@@ -2,9 +2,9 @@ DEFINED_PHASES=install postinst prepare
 DESCRIPTION=Easily add ANSI colouring to shell scripts
 EAPI=6
 HOMEPAGE=http://www.runslinux.net/?page_id=10
-KEYWORDS=alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86
+KEYWORDS=alpha amd64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://runslinux.net/projects/color/color-1.2.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=9d31f8365e046e720df5d7e9ee9bcf36
+_md5_=90cbbd34e1ef39d941749946c0b2febe
diff --git a/metadata/md5-cache/app-misc/countrycodes-1.0.5-r3 b/metadata/md5-cache/app-misc/countrycodes-1.0.5-r3
index a7b9ad8be1fa..e113ddcfbefd 100644
--- a/metadata/md5-cache/app-misc/countrycodes-1.0.5-r3
+++ b/metadata/md5-cache/app-misc/countrycodes-1.0.5-r3
@@ -2,9 +2,9 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=An ISO 3166 country code finder
 EAPI=6
 HOMEPAGE=http://www.grigna.com/diego/linux/countrycodes/
-KEYWORDS=~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.grigna.com/diego/linux/countrycodes/countrycodes-1.0.5.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=c3a9d99ed3c6ef9ba7f548735ad4caee
+_md5_=52bc41b1b0aba6a455f1ada614bbe46e
diff --git a/metadata/md5-cache/app-misc/khard-0.11.4 b/metadata/md5-cache/app-misc/khard-0.11.4
new file mode 100644
index 000000000000..1421f68f4e12
--- /dev/null
+++ b/metadata/md5-cache/app-misc/khard-0.11.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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=Console CardDAV client
+EAPI=6
+HOMEPAGE=https://github.com/scheibler/khard
+IUSE=zsh-completion python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=dev-python/atomicwrites[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/configobj[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/pyyaml[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/vdirsyncer[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/vobject-0.9.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(-)] 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://pypi/k/khard/khard-0.11.4.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8de42b2ed63ab8dafc52ba4d80e2b3e7
diff --git a/metadata/md5-cache/app-misc/leave-20100918 b/metadata/md5-cache/app-misc/leave-20100918
deleted file mode 100644
index 96c21b0b2651..000000000000
--- a/metadata/md5-cache/app-misc/leave-20100918
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Command-line tool from FreeBSD that reminds you when its time to leave
-EAPI=3
-HOMEPAGE=http://www.freebsd.org/cgi/cvsweb.cgi/src/usr.bin/leave/
-KEYWORDS=amd64 ppc x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=mirror://gentoo/leave-20100918.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=dc3ac54b09d586ef41ee20a2f4658731
diff --git a/metadata/md5-cache/app-misc/leave-20100918-r1 b/metadata/md5-cache/app-misc/leave-20100918-r1
index b50957234c93..c8db4379a879 100644
--- a/metadata/md5-cache/app-misc/leave-20100918-r1
+++ b/metadata/md5-cache/app-misc/leave-20100918-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install
 DESCRIPTION=FreeBSD command-line tool that reminds you when its time to leave
 EAPI=6
 HOMEPAGE=http://www.freebsd.org/cgi/cvsweb.cgi/src/usr.bin/leave/
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://gentoo/leave-20100918.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=9d1c55579c9c3f7d729249a49dee2078
+_md5_=cf14d8db8d94ce774995b0658e3f99e9
diff --git a/metadata/md5-cache/app-misc/qlcplus-4.10.5b-r1 b/metadata/md5-cache/app-misc/qlcplus-4.10.5b-r1
deleted file mode 100644
index 0960749e56c3..000000000000
--- a/metadata/md5-cache/app-misc/qlcplus-4.10.5b-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare test unpack
-DEPEND=|| ( dev-embedded/libftdi:1 dev-embedded/libftdi:0 ) dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 media-libs/alsa-lib media-libs/libmad media-libs/libsndfile sci-libs/fftw:3.0 virtual/libusb:0 virtual/libusb:1 virtual/udev virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=QLC+ - Q Light Controller Plus to control DMX interfaces
-EAPI=6
-HOMEPAGE=http://www.qlcplus.org/
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=|| ( dev-embedded/libftdi:1 dev-embedded/libftdi:0 ) dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 media-libs/alsa-lib media-libs/libmad media-libs/libsndfile sci-libs/fftw:3.0 virtual/libusb:0 virtual/libusb:1 virtual/udev
-SLOT=0
-SRC_URI=https://github.com/mcallegari/qlcplus/archive/QLC+_4.10.5b.tar.gz -> qlcplus-4.10.5b.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af	udev	d91cac2c73b94629cad2daea66e0d182	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	virtualx	171580f737f5aaf18fcb456548588066
-_md5_=ba2dd1725198376fe03db0b61fba2e27
diff --git a/metadata/md5-cache/app-misc/qlcplus-4.10.5b-r2 b/metadata/md5-cache/app-misc/qlcplus-4.10.5b-r2
deleted file mode 100644
index 7aa3ee8620fa..000000000000
--- a/metadata/md5-cache/app-misc/qlcplus-4.10.5b-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure postinst postrm preinst prepare test unpack
-DEPEND=|| ( dev-embedded/libftdi:1 dev-embedded/libftdi:0 ) dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 media-libs/alsa-lib media-libs/libmad media-libs/libsndfile sci-libs/fftw:3.0 virtual/libusb:0 virtual/libusb:1 virtual/udev virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=QLC+ - Q Light Controller Plus to control DMX interfaces
-EAPI=6
-HOMEPAGE=http://www.qlcplus.org/
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=|| ( dev-embedded/libftdi:1 dev-embedded/libftdi:0 ) dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 media-libs/alsa-lib media-libs/libmad media-libs/libsndfile sci-libs/fftw:3.0 virtual/libusb:0 virtual/libusb:1 virtual/udev
-SLOT=0
-SRC_URI=https://github.com/mcallegari/qlcplus/archive/QLC+_4.10.5b.tar.gz -> qlcplus-4.10.5b.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af	udev	d91cac2c73b94629cad2daea66e0d182	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=929048cbff9dc44d7030b1f54c0fc649
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 7862c3123c57..769a5cfbf6fc 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/crf++-0.54 b/metadata/md5-cache/app-text/crf++-0.54
deleted file mode 100644
index 2fc95a1b88f7..000000000000
--- a/metadata/md5-cache/app-text/crf++-0.54
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Yet Another CRF toolkit for segmenting/labelling sequential data
-EAPI=3
-HOMEPAGE=http://crfpp.sourceforge.net/
-IUSE=examples static-libs
-KEYWORDS=amd64 x86 ~x86-fbsd
-LICENSE=|| ( BSD LGPL-2.1 )
-SLOT=0
-SRC_URI=mirror://sourceforge/crfpp/CRF++-0.54.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=362774e550ab52dc448c3465f9858b08
diff --git a/metadata/md5-cache/app-text/crf++-0.58 b/metadata/md5-cache/app-text/crf++-0.58
index 6ee6de9c8ee6..8058c4f78e15 100644
--- a/metadata/md5-cache/app-text/crf++-0.58
+++ b/metadata/md5-cache/app-text/crf++-0.58
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install prepare test
 DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Yet Another CRF toolkit for segmenting/labelling sequential data
-EAPI=3
-HOMEPAGE=https://crfpp.googlecode.com/svn/trunk/doc/index.html
+EAPI=6
+HOMEPAGE=https://taku910.github.io/crfpp/
 IUSE=examples static-libs
-KEYWORDS=~amd64 ~x86 ~x86-fbsd
+KEYWORDS=amd64 x86 ~x86-fbsd
 LICENSE=|| ( BSD LGPL-2.1 )
 SLOT=0
-SRC_URI=https://crfpp.googlecode.com/files/CRF++-0.58.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=e0cb980bc2d19cff5d23bd9f60aa4eee
+SRC_URI=mirror://gentoo/CRF++-0.58.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=af032af4456f27d93c161298e6ee3054
diff --git a/metadata/md5-cache/app-text/dos2unix-7.3.4 b/metadata/md5-cache/app-text/dos2unix-7.3.4
deleted file mode 100644
index 887c3da22b6c..000000000000
--- a/metadata/md5-cache/app-text/dos2unix-7.3.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=!app-text/hd2u virtual/libintl nls? ( sys-devel/gettext ) test? ( virtual/perl-Test-Simple ) dev-lang/perl
-DESCRIPTION=Convert DOS or MAC text files to UNIX format or vice versa
-EAPI=6
-HOMEPAGE=http://www.xs4all.nl/~waterlan/dos2unix.html https://sourceforge.net/projects/dos2unix/
-IUSE=debug nls test linguas_da linguas_de linguas_eo linguas_es linguas_fr linguas_hu linguas_ja linguas_nb linguas_nl linguas_pl linguas_pt_BR linguas_ru linguas_sr linguas_sv linguas_uk linguas_vi linguas_zh_CN linguas_zh_TW
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
-LICENSE=BSD-2
-RDEPEND=!app-text/hd2u virtual/libintl
-SLOT=0
-SRC_URI=http://www.xs4all.nl/~waterlan/dos2unix/dos2unix-7.3.4.tar.gz mirror://sourceforge/dos2unix/dos2unix-7.3.4.tar.gz
-_eclasses_=l10n	2c2e15383ba891d642f51896a7f0ecfe	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=6cdac6128e3a51fccb78d152e357e977
diff --git a/metadata/md5-cache/app-text/psutils-1.17-r2 b/metadata/md5-cache/app-text/psutils-1.17-r2
deleted file mode 100644
index 807a286652ec..000000000000
--- a/metadata/md5-cache/app-text/psutils-1.17-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=dev-lang/perl
-DESCRIPTION=PostScript Utilities
-EAPI=3
-HOMEPAGE=http://web.archive.org/web/20110722005140/http://www.tardis.ed.ac.uk/~ajcd/psutils/
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=psutils
-SLOT=0
-SRC_URI=mirror://debian/pool/main/p/psutils/psutils_1.17.dfsg.orig.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=d9ac0f4c84c2e51600f85292ec31c168
diff --git a/metadata/md5-cache/app-text/psutils-1.17-r3 b/metadata/md5-cache/app-text/psutils-1.17-r3
index aced87468ea6..dc5ca016c26a 100644
--- a/metadata/md5-cache/app-text/psutils-1.17-r3
+++ b/metadata/md5-cache/app-text/psutils-1.17-r3
@@ -3,9 +3,9 @@ DEPEND=dev-lang/perl
 DESCRIPTION=PostScript Utilities
 EAPI=6
 HOMEPAGE=http://web.archive.org/web/20110722005140/http://www.tardis.ed.ac.uk/~ajcd/psutils/
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=psutils
 SLOT=0
 SRC_URI=mirror://debian/pool/main/p/psutils/psutils_1.17.dfsg.orig.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=8eb3259d7e52a6a1cb8ba0a4565f2180
+_md5_=576ca65d9a1d6d3c0c21adbdec04eba0
diff --git a/metadata/md5-cache/app-text/sablotron-1.0.3 b/metadata/md5-cache/app-text/sablotron-1.0.3
deleted file mode 100644
index 58edafb19cb2..000000000000
--- a/metadata/md5-cache/app-text/sablotron-1.0.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=>=dev-libs/expat-1.95.6-r1 >=dev-perl/XML-Parser-2.3 >=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=An XSLT Parser in C++
-EAPI=3
-HOMEPAGE=http://www.gingerall.org/sablotron.html
-IUSE=perl
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=MPL-1.1
-RDEPEND=>=dev-libs/expat-1.95.6-r1
-SLOT=0
-SRC_URI=http://download-1.gingerall.cz/download/sablot/Sablot-1.0.3.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=30fed99fb7639f9495aeea24b3b5c76e
diff --git a/metadata/md5-cache/app-text/sablotron-1.0.3-r1 b/metadata/md5-cache/app-text/sablotron-1.0.3-r1
index d63d64da43b9..625f6ab3fa7d 100644
--- a/metadata/md5-cache/app-text/sablotron-1.0.3-r1
+++ b/metadata/md5-cache/app-text/sablotron-1.0.3-r1
@@ -4,10 +4,10 @@ DESCRIPTION=An XSLT Parser in C++
 EAPI=6
 HOMEPAGE=http://www.gingerall.org/sablotron.html
 IUSE=perl
-KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=MPL-1.1
 RDEPEND=>=dev-libs/expat-1.95.6-r1
 SLOT=0
 SRC_URI=http://download-1.gingerall.cz/download/sablot/Sablot-1.0.3.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=356d2ea38d69c67780b83364666daeb1
+_md5_=d1e08ef1a88de4c51aecb885eed451dd
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index f356921d3ef4..d1ec4d0f4f45 100644
--- a/metadata/md5-cache/dev-cpp/Manifest.gz
+++ b/metadata/md5-cache/dev-cpp/Manifest.gz
diff --git a/metadata/md5-cache/dev-cpp/glibmm-2.52.1 b/metadata/md5-cache/dev-cpp/glibmm-2.52.1
new file mode 100644
index 000000000000..7f42f0eb16e4
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/glibmm-2.52.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/libsigc++-2.9.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.50.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=C++ interface for glib2
+EAPI=6
+HOMEPAGE=https://www.gtkmm.org
+IUSE=doc debug 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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=LGPL-2.1+ GPL-2+
+RDEPEND=>=dev-libs/libsigc++-2.9.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.50.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+SLOT=2
+SRC_URI=mirror://gnome/sources/glibmm/2.52/glibmm-2.52.1.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	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0e72159a7f45ec6f12eb14ef3ec38062
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index a5f4a38c3553..d4d2413d88de 100644
--- a/metadata/md5-cache/dev-db/Manifest.gz
+++ b/metadata/md5-cache/dev-db/Manifest.gz
diff --git a/metadata/md5-cache/dev-db/sqlitebrowser-3.10.1 b/metadata/md5-cache/dev-db/sqlitebrowser-3.10.1
index e9548f95ff1a..00646c176a68 100644
--- a/metadata/md5-cache/dev-db/sqlitebrowser-3.10.1
+++ b/metadata/md5-cache/dev-db/sqlitebrowser-3.10.1
@@ -10,4 +10,4 @@ RDEPEND=dev-cpp/antlr-cpp:2 dev-db/sqlite:3 >=dev-libs/qcustomplot-2.0.0[qt5(+)]
 SLOT=0
 SRC_URI=https://github.com/sqlitebrowser/sqlitebrowser/archive/v3.10.1.tar.gz -> sqlitebrowser-3.10.1.tar.gz
 _eclasses_=cmake-utils	77a5a8d3308359caadcdd91688f20093	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1edcce4730ef4f335834a3df86525a2c
+_md5_=a2db3669171527f882f212f00d5df21b
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index dd8a7bb15538..3c025b4f5af8 100644
--- a/metadata/md5-cache/dev-java/Manifest.gz
+++ b/metadata/md5-cache/dev-java/Manifest.gz
diff --git a/metadata/md5-cache/dev-java/oracle-jdk-bin-9.0.1 b/metadata/md5-cache/dev-java/oracle-jdk-bin-9.0.1
new file mode 100644
index 000000000000..b2cb1a3f4a88
--- /dev/null
+++ b/metadata/md5-cache/dev-java/oracle-jdk-bin-9.0.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=install nofetch postinst postrm preinst prerm setup unpack
+DEPEND=>=sys-apps/sed-4 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.2.0
+DESCRIPTION=Oracle's Java SE Development Kit
+EAPI=6
+HOMEPAGE=http://www.oracle.com/technetwork/java/javase/
+IUSE=alsa commercial cups doc +fontconfig +gentoo-vm gtk2 gtk3 headless-awt javafx nsplugin selinux source
+KEYWORDS=-* ~amd64 ~x64-macos ~sparc64-solaris
+LICENSE=Oracle-BCLA-JavaSE
+RDEPEND=!x64-macos? ( !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) javafx? ( dev-libs/atk dev-libs/glib:2 dev-libs/libxml2:2 dev-libs/libxslt media-libs/freetype:2 x11-libs/gdk-pixbuf x11-libs/libX11 x11-libs/libXtst x11-libs/libXxf86vm x11-libs/pango virtual/opengl gtk2? ( x11-libs/cairo x11-libs/gtk+:2 ) gtk3? ( x11-libs/cairo[glib] x11-libs/gtk+:3 ) ) ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) doc? ( dev-java/java-sdk-docs:9 ) fontconfig? ( media-libs/fontconfig:1.0 ) !prefix? ( sys-libs/glibc:* ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.2.0
+REQUIRED_USE=javafx? ( alsa fontconfig ^^ ( gtk2 gtk3 ) )
+RESTRICT=fetch preserve-libs strip
+SLOT=9
+SRC_URI=amd64? ( jdk-9.0.1_linux-x64_bin.tar.gz ) x64-macos? ( jdk-9.0.1_osx-x64_bin.dmg ) sparc64-solaris? ( jdk-9.0.1_solaris-sparcv9_bin.tar.gz )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	java-vm-2	477ca23a49dfcd57017ee7f3bed47564	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=160eff78715510662b3eb071cdca72f8
diff --git a/metadata/md5-cache/dev-java/oracle-jre-bin-9.0.1 b/metadata/md5-cache/dev-java/oracle-jre-bin-9.0.1
new file mode 100644
index 000000000000..e3b5fa1a3b84
--- /dev/null
+++ b/metadata/md5-cache/dev-java/oracle-jre-bin-9.0.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=install nofetch postinst postrm preinst prerm setup unpack
+DEPEND=>=sys-apps/sed-4 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.2.0
+DESCRIPTION=Oracle's Java SE Runtime Environment
+EAPI=6
+HOMEPAGE=http://www.oracle.com/technetwork/java/javase/
+IUSE=alsa commercial cups +fontconfig +gentoo-vm gtk2 gtk3 headless-awt javafx nsplugin selinux
+KEYWORDS=-* ~amd64 ~x64-macos ~sparc64-solaris
+LICENSE=Oracle-BCLA-JavaSE
+RDEPEND=!x64-macos? ( !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) javafx? ( dev-libs/atk dev-libs/glib:2 dev-libs/libxml2:2 dev-libs/libxslt media-libs/freetype:2 x11-libs/gdk-pixbuf x11-libs/libX11 x11-libs/libXtst x11-libs/libXxf86vm x11-libs/pango virtual/opengl gtk2? ( x11-libs/cairo x11-libs/gtk+:2 ) gtk3? ( x11-libs/cairo[glib] x11-libs/gtk+:3 ) ) ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) fontconfig? ( media-libs/fontconfig:1.0 ) !prefix? ( sys-libs/glibc:* ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.2.0
+REQUIRED_USE=javafx? ( alsa fontconfig ^^ ( gtk2 gtk3 ) )
+RESTRICT=fetch preserve-libs strip
+SLOT=9
+SRC_URI=amd64? ( jre-9.0.1_linux-x64_bin.tar.gz ) x64-macos? ( jre-9.0.1_osx-x64_bin.tar.gz ) sparc64-solaris? ( jre-9.0.1_solaris-sparcv9_bin.tar.gz )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	java-vm-2	477ca23a49dfcd57017ee7f3bed47564	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=00c0006e87269dcd68ff59d86d98d108
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 8a2ec18473dd..53d26f9f8a82 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/ruby-2.2.9 b/metadata/md5-cache/dev-lang/ruby-2.2.9
index 5d419db931e4..78049a6489be 100644
--- a/metadata/md5-cache/dev-lang/ruby-2.2.9
+++ b/metadata/md5-cache/dev-lang/ruby-2.2.9
@@ -4,11 +4,11 @@ DESCRIPTION=An object-oriented scripting language
 EAPI=5
 HOMEPAGE=http://www.ruby-lang.org/
 IUSE=berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl tk xemacs ncurses +readline
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=|| ( Ruby-BSD BSD-2 )
 PDEPEND=>=dev-ruby/minitest-5.4.3[ruby_targets_ruby22] >=dev-ruby/power_assert-0.2.2[ruby_targets_ruby22] >=dev-ruby/test-unit-3.0.8[ruby_targets_ruby22] virtual/rubygems[ruby_targets_ruby22] >=dev-ruby/json-1.8.1[ruby_targets_ruby22] >=dev-ruby/rake-0.9.6[ruby_targets_ruby22] rdoc? ( >=dev-ruby/rdoc-4.0.1[ruby_targets_ruby22] ) xemacs? ( app-xemacs/ruby-modes )
 RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm ) jemalloc? ( dev-libs/jemalloc ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) ncurses? ( sys-libs/ncurses:0= ) readline? ( sys-libs/readline:0= ) dev-libs/libyaml virtual/libffi sys-libs/zlib >=app-eselect/eselect-ruby-20141227 !<dev-ruby/rdoc-3.9.4 !<dev-ruby/rubygems-1.8.10-r1
 SLOT=2.2
 SRC_URI=mirror://ruby/2.2/ruby-2.2.9.tar.xz https://dev.gentoo.org/~flameeyes/ruby-team/ruby-patches-2.2.9.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	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=004a385b3b14fc6062157d0bb40aab95
+_md5_=182c9dec2737844f502540fd7452adf7
diff --git a/metadata/md5-cache/dev-lang/vala-0.36.7 b/metadata/md5-cache/dev-lang/vala-0.36.7
new file mode 100644
index 000000000000..e93c71cc193c
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/vala-0.36.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.32:2 >=dev-libs/vala-common-0.36.7 !dev-lang/vala:0 dev-libs/libxslt sys-devel/flex virtual/pkgconfig virtual/yacc test? ( dev-libs/dbus-glib >=dev-libs/glib-2.26:2 dev-libs/gobject-introspection ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Compiler for the GObject type system
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/Vala
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-libs/glib-2.32:2 >=dev-libs/vala-common-0.36.7
+SLOT=0.36
+SRC_URI=mirror://gnome/sources/vala/0.36/vala-0.36.7.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5b0376700dd221d0d4db7650e6d3cb48
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index a23764348d8f..60c8f9a33d6a 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/gmime-3.0.3 b/metadata/md5-cache/dev-libs/gmime-3.0.3
new file mode 100644
index 000000000000..910479d84d3b
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/gmime-3.0.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.32.0:2 sys-libs/zlib crypt? ( >=app-crypt/gpgme-1.8.0:1= ) idn? ( net-dns/libidn ) vala? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) >=dev-libs/gobject-introspection-1.30.0:= ) >=dev-util/gtk-doc-am-1.8 virtual/libiconv virtual/pkgconfig doc? ( app-text/docbook-sgml-utils ) test? ( app-crypt/gnupg ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Utilities for creating and parsing messages using MIME
+EAPI=6
+HOMEPAGE=http://spruce.sourceforge.net/gmime/ https://developer.gnome.org/gmime/stable/
+IUSE=crypt doc idn static-libs test vala
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-libs/glib-2.32.0:2 sys-libs/zlib crypt? ( >=app-crypt/gpgme-1.8.0:1= ) idn? ( net-dns/libidn ) vala? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) >=dev-libs/gobject-introspection-1.30.0:= )
+SLOT=3.0
+SRC_URI=mirror://gnome/sources/gmime/3.0/gmime-3.0.3.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	vala	103e6885c83965507391cdc5b6fa0e67	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=920da965e8eeebe8d6b9524df7e45386
diff --git a/metadata/md5-cache/dev-libs/libgudev-230-r1 b/metadata/md5-cache/dev-libs/libgudev-230-r1
deleted file mode 100644
index f9e5fdc891ef..000000000000
--- a/metadata/md5-cache/dev-libs/libgudev-230-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.22.0:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=virtual/libudev-199:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) >=dev-util/gtk-doc-am-1.18 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 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=GObject bindings for libudev
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Projects/libgudev
-IUSE=introspection static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/glib-2.22.0:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=virtual/libudev-199:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) !sys-fs/eudev[gudev(-)] !sys-fs/udev[gudev(-)] !sys-apps/systemd[gudev(-)]
-SLOT=0/0
-SRC_URI=mirror://gnome/sources/libgudev/230/libgudev-230.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	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1016027e4835bc44b235c2f1062cd6ef
diff --git a/metadata/md5-cache/dev-libs/libxml2-2.9.5 b/metadata/md5-cache/dev-libs/libxml2-2.9.5
deleted file mode 100644
index 9e4e390f9b2b..000000000000
--- a/metadata/md5-cache/dev-libs/libxml2-2.9.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=>=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(-)?] icu? ( >=dev-libs/icu-51.2-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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) readline? ( sys-libs/readline:= ) dev-util/gtk-doc-am virtual/pkgconfig hppa? ( >=sys-devel/binutils-2.15.92.0.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
-DESCRIPTION=Version 2 of the library to manipulate XML files
-EAPI=6
-HOMEPAGE=http://www.xmlsoft.org/
-IUSE=debug examples icu ipv6 lzma python readline static-libs test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~x86-winnt
-LICENSE=MIT
-RDEPEND=>=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(-)?] icu? ( >=dev-libs/icu-51.2-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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) readline? ( sys-libs/readline:= )
-REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
-SLOT=2
-SRC_URI=ftp://xmlsoft.org/libxml2/libxml2-2.9.5.tar.gz test? ( http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz http://www.w3.org/XML/Test/xmlts20080827.tar.gz )
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=e6b60ac57b7cb77be70a02f10a0c162f
diff --git a/metadata/md5-cache/dev-libs/libxml2-2.9.4-r2 b/metadata/md5-cache/dev-libs/libxml2-2.9.7
index d4b77e343cb2..2f741aae73fc 100644
--- a/metadata/md5-cache/dev-libs/libxml2-2.9.4-r2
+++ b/metadata/md5-cache/dev-libs/libxml2-2.9.7
@@ -4,11 +4,11 @@ DESCRIPTION=Version 2 of the library to manipulate XML files
 EAPI=6
 HOMEPAGE=http://www.xmlsoft.org/
 IUSE=debug examples icu ipv6 lzma python readline static-libs test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~x86-winnt
+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=MIT
 RDEPEND=>=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(-)?] icu? ( >=dev-libs/icu-51.2-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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) readline? ( sys-libs/readline:= )
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=2
-SRC_URI=ftp://xmlsoft.org/libxml2/libxml2-2.9.4.tar.gz test? ( http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz http://www.w3.org/XML/Test/xmlts20080827.tar.gz )
+SRC_URI=ftp://xmlsoft.org/libxml2/libxml2-2.9.7.tar.gz test? ( http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz http://www.w3.org/XML/Test/xmlts20080827.tar.gz )
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=7e332363ad0884f56252a97f3ecb1dbd
+_md5_=c30b4cdf80f17c29d7374a4b43dd46fc
diff --git a/metadata/md5-cache/dev-libs/vala-common-0.36.7 b/metadata/md5-cache/dev-libs/vala-common-0.36.7
new file mode 100644
index 000000000000..6f22a9d01d09
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/vala-common-0.36.7
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst
+DEPEND=app-arch/xz-utils
+DESCRIPTION=Build infrastructure for packages that use Vala
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/Vala
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x64-solaris
+LICENSE=LGPL-2.1
+RDEPEND=!<dev-lang/vala-0.10.4-r2 !<dev-lang/vala-0.12.1-r1:0.12 !<dev-lang/vala-0.14.2-r2:0.14 !<dev-lang/vala-0.16.1-r2:0.16 !<dev-lang/vala-0.17.5:0.18
+SLOT=0
+SRC_URI=mirror://gnome/sources/vala/0.36/vala-0.36.7.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=bce72484c589d3975846abcd8a56bebf
diff --git a/metadata/md5-cache/dev-libs/wayland-protocols-1.10 b/metadata/md5-cache/dev-libs/wayland-protocols-1.10
deleted file mode 100644
index 69d651dbf813..000000000000
--- a/metadata/md5-cache/dev-libs/wayland-protocols-1.10
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/wayland virtual/pkgconfig >=app-portage/elt-patches-20170422
-DESCRIPTION=Wayland protocol files
-EAPI=5
-HOMEPAGE=https://wayland.freedesktop.org/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=MIT
-RDEPEND=dev-libs/wayland
-SLOT=0
-SRC_URI=https://wayland.freedesktop.org/releases/wayland-protocols-1.10.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=c1372c89f58003a4ca7123110d75ccf2
diff --git a/metadata/md5-cache/dev-libs/wayland-protocols-1.8 b/metadata/md5-cache/dev-libs/wayland-protocols-1.8
deleted file mode 100644
index 9a08d261b304..000000000000
--- a/metadata/md5-cache/dev-libs/wayland-protocols-1.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/wayland virtual/pkgconfig >=app-portage/elt-patches-20170422
-DESCRIPTION=Wayland protocol files
-EAPI=5
-HOMEPAGE=https://wayland.freedesktop.org/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=MIT
-RDEPEND=dev-libs/wayland
-SLOT=0
-SRC_URI=https://wayland.freedesktop.org/releases/wayland-protocols-1.8.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=dc94b7a5445846e4d22da44541cfce65
diff --git a/metadata/md5-cache/dev-libs/wayland-protocols-1.9 b/metadata/md5-cache/dev-libs/wayland-protocols-1.9
deleted file mode 100644
index 787a34f6028d..000000000000
--- a/metadata/md5-cache/dev-libs/wayland-protocols-1.9
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/wayland virtual/pkgconfig >=app-portage/elt-patches-20170422
-DESCRIPTION=Wayland protocol files
-EAPI=5
-HOMEPAGE=https://wayland.freedesktop.org/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=MIT
-RDEPEND=dev-libs/wayland
-SLOT=0
-SRC_URI=https://wayland.freedesktop.org/releases/wayland-protocols-1.9.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=dc94b7a5445846e4d22da44541cfce65
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index 5f3da2b26d9c..54de48283878 100644
--- a/metadata/md5-cache/dev-perl/Manifest.gz
+++ b/metadata/md5-cache/dev-perl/Manifest.gz
diff --git a/metadata/md5-cache/dev-perl/Net-Subnet-1.30.0-r1 b/metadata/md5-cache/dev-perl/Net-Subnet-1.30.0-r1
new file mode 100644
index 000000000000..e063934a432e
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Net-Subnet-1.30.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-perl/Socket6-0.250.0 dev-lang/perl:=
+DESCRIPTION=Fast IP-in-subnet matcher for IPv4 and IPv6, CIDR or mask
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Net-Subnet/
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/Socket6-0.250.0 dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/J/JU/JUERD/Net-Subnet-1.03.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=74678faf80703593321a58e1874c0353
diff --git a/metadata/md5-cache/dev-perl/Net-Trackback-1.10.0-r1 b/metadata/md5-cache/dev-perl/Net-Trackback-1.10.0-r1
new file mode 100644
index 000000000000..911546138e44
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Net-Trackback-1.10.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl:=
+DESCRIPTION=Object-oriented interface for developing Trackback clients and servers
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Net-Trackback/
+KEYWORDS=~amd64
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/libwww-perl-5.831.0 >=dev-perl/Class-ErrorHandler-0.10.0 dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/T/TI/TIMA/Net-Trackback-1.01.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=266f6e6bda72ef9a0ed41462a3b93348
diff --git a/metadata/md5-cache/dev-perl/Net-Whois-IP-1.190.0-r1 b/metadata/md5-cache/dev-perl/Net-Whois-IP-1.190.0-r1
new file mode 100644
index 000000000000..eec86862d2db
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Net-Whois-IP-1.190.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-perl/Regexp-IPv6 virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=
+DESCRIPTION=Perl extension for looking up the whois information for ip addresses
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Net-Whois-IP/
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/Regexp-IPv6 dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/B/BS/BSCHMITZ/Net-Whois-IP-1.19.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=0935044393f34c9439ec4bd9c578a1a2
diff --git a/metadata/md5-cache/dev-perl/Net-Z3950-ZOOM-1.280.0-r2 b/metadata/md5-cache/dev-perl/Net-Z3950-ZOOM-1.280.0-r2
new file mode 100644
index 000000000000..ed07ccd878b1
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Net-Z3950-ZOOM-1.280.0-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/yaz-2.1.50 dev-perl/MARC-Record dev-lang/perl:=
+DESCRIPTION=Perl extension for invoking the ZOOM-C API
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Net-Z3950-ZOOM/
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-libs/yaz-2.1.50 dev-perl/MARC-Record dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/M/MI/MIRK/Net-Z3950-ZOOM-1.28.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=f352b017503a907812a58e6ecc614c2a
diff --git a/metadata/md5-cache/dev-perl/NetxAP-0.20.0-r2 b/metadata/md5-cache/dev-perl/NetxAP-0.20.0-r2
new file mode 100644
index 000000000000..95ed9cefe58c
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/NetxAP-0.20.0-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-MIME-Base64 dev-perl/MD5 dev-perl/Digest-HMAC virtual/perl-Digest-MD5 test? ( net-mail/uw-imap ) dev-lang/perl:=
+DESCRIPTION=A base class for protocols such as IMAP, ACAP, IMSP, and ICAP
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/NetxAP/
+IUSE=test examples
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-MIME-Base64 dev-perl/MD5 dev-perl/Digest-HMAC virtual/perl-Digest-MD5 dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/K/KJ/KJOHNSON/NetxAP-0.02.tar.gz mirror://gentoo/NetxAP-0.02-patches-1.tar.xz https://dev.gentoo.org/~kentnl/distfiles/NetxAP-0.02-patches-1.tar.xz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=d6ef1b304b511c62435bd387b5d15132
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 5a40b0e54db3..0e3032f4857c 100644
--- a/metadata/md5-cache/dev-python/Manifest.gz
+++ b/metadata/md5-cache/dev-python/Manifest.gz
diff --git a/metadata/md5-cache/dev-python/backports-unittest-mock-1.3 b/metadata/md5-cache/dev-python/backports-unittest-mock-1.3
index 96f61e0d20f6..caf4bc3f4e35 100644
--- a/metadata/md5-cache/dev-python/backports-unittest-mock-1.3
+++ b/metadata/md5-cache/dev-python/backports-unittest-mock-1.3
@@ -4,11 +4,11 @@ DESCRIPTION=Backport of unittest.mock
 EAPI=6
 HOMEPAGE=https://github.com/jaraco/backports.unittest_mock
 IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/backports[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 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/b/backports.unittest_mock/backports.unittest_mock-1.3.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2c621c45c24fc2aab2e793094c5ed48f
+_md5_=21535b5a2434ea1533bc98e2715a8389
diff --git a/metadata/md5-cache/dev-python/dbusmock-0.16.9 b/metadata/md5-cache/dev-python/dbusmock-0.16.9
index 1d29b3cda037..e0a802e326b9 100644
--- a/metadata/md5-cache/dev-python/dbusmock-0.16.9
+++ b/metadata/md5-cache/dev-python/dbusmock-0.16.9
@@ -4,11 +4,11 @@ DESCRIPTION=Easily create mock objects on D-Bus for software testing
 EAPI=6
 HOMEPAGE=https://github.com/martinpitt/python-dbusmock
 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=LGPL-3+
 RDEPEND=dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject: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(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/python-dbusmock/python-dbusmock-0.16.9.tar.gz -> dbusmock-0.16.9.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a3940183b1d3ce0802fd1d49dd13762e
+_md5_=99bd4ae7ec94ac218d469ea4f91141b5
diff --git a/metadata/md5-cache/dev-python/jaraco-packaging-4.1 b/metadata/md5-cache/dev-python/jaraco-packaging-4.1
index c3265f1c6d31..59517be8e414 100644
--- a/metadata/md5-cache/dev-python/jaraco-packaging-4.1
+++ b/metadata/md5-cache/dev-python/jaraco-packaging-4.1
@@ -4,11 +4,11 @@ DESCRIPTION=Tools to supplement packaging Python releases
 EAPI=6
 HOMEPAGE=https://github.com/jaraco/jaraco.packaging
 IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-python/six-1.4[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/j/jaraco.packaging/jaraco.packaging-4.1.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ad8f318a5c766c886f8042c50fb76517
+_md5_=cd91d34a8cef59772a4b58b97e306925
diff --git a/metadata/md5-cache/dev-python/keyring-10.5.1 b/metadata/md5-cache/dev-python/keyring-10.5.1
new file mode 100644
index 000000000000..e47a18da64d8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/keyring-10.5.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_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_scm-1.15.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/secretstorage[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest-runner[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_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-2.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/collective-checkdocs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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=Provides access to the system keyring service
+EAPI=6
+HOMEPAGE=https://github.com/jaraco/keyring
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~arm ~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=PSF-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/k/keyring/keyring-10.5.1.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=106637801c95db73164ee64c6fe635f6
diff --git a/metadata/md5-cache/dev-python/pexpect-4.2.1 b/metadata/md5-cache/dev-python/pexpect-4.2.1
index 4ae0954000b6..330ab6892f2e 100644
--- a/metadata/md5-cache/dev-python/pexpect-4.2.1
+++ b/metadata/md5-cache/dev-python/pexpect-4.2.1
@@ -4,11 +4,11 @@ DESCRIPTION=Python module for spawning child applications and responding to expe
 EAPI=6
 HOMEPAGE=https://pexpect.readthedocs.io/ https://pypi.python.org/pypi/pexpect/ https://github.com/pexpect/pexpect/
 IUSE=doc examples test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=MIT
 RDEPEND=>=dev-python/ptyprocess-0.5[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pexpect/pexpect-4.2.1.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ffb8a450af05165cbd2a85887d2be3b3
+_md5_=5e8b11961bbbe89de61c4c6cac2cc4c2
diff --git a/metadata/md5-cache/dev-python/pycairo-1.15.3 b/metadata/md5-cache/dev-python/pycairo-1.15.3
index 93a6dd80d9c3..595940484503 100644
--- a/metadata/md5-cache/dev-python/pycairo-1.15.3
+++ b/metadata/md5-cache/dev-python/pycairo-1.15.3
@@ -4,11 +4,11 @@ DESCRIPTION=Python bindings for the cairo library
 EAPI=6
 HOMEPAGE=https://www.cairographics.org/pycairo/ https://github.com/pygobject/pycairo
 IUSE=doc examples test xcb python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+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
 LICENSE=|| ( LGPL-2.1 MPL-1.1 )
 RDEPEND=>=x11-libs/cairo-1.13.1[svg,xcb?] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/pygobject/pycairo/releases/download/v1.15.3/pycairo-1.15.3.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3d9004bb96231c91b987238b2c3da8ad
+_md5_=4b0eef1b7a2fb338904b5e51d3412372
diff --git a/metadata/md5-cache/dev-python/python-nbxmpp-0.6.1 b/metadata/md5-cache/dev-python/python-nbxmpp-0.6.1
new file mode 100644
index 000000000000..71174f503cf0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-nbxmpp-0.6.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Python library to use Jabber/XMPP networks in a non-blocking way
+EAPI=6
+HOMEPAGE=http://python-nbxmpp.gajim.org/
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://dev.gajim.org/gajim/python-nbxmpp/repository/archive.tar.gz?ref=nbxmpp-0.6.1 -> python-nbxmpp-0.6.1.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=bacb4dd2cdb244badad56a846b4c95df
diff --git a/metadata/md5-cache/dev-python/stripe-1.71.1 b/metadata/md5-cache/dev-python/stripe-1.75.3
index 9f8cd8a85b38..a16460476a8f 100644
--- a/metadata/md5-cache/dev-python/stripe-1.71.1
+++ b/metadata/md5-cache/dev-python/stripe-1.75.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/requests-0.8.8 test? ( dev-python/unittest2 dev-python/mock dev-python/pycurl ) 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=>=dev-python/requests-0.8.8 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=Stripe python bindings
 EAPI=6
 HOMEPAGE=https://github.com/stripe/stripe-python
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/requests-0.8.8 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/s/stripe/stripe-1.71.1.tar.gz
+SRC_URI=mirror://pypi/s/stripe/stripe-1.75.3.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4f3cda62e9bea5d3b844561572f725dd
+_md5_=0557c7cafd0bdb6a5b0e4ffaa1261535
diff --git a/metadata/md5-cache/dev-python/vobject-0.9.5 b/metadata/md5-cache/dev-python/vobject-0.9.5
new file mode 100644
index 000000000000..9b4ead3d51a0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/vobject-0.9.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/python-dateutil-2.4.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Python package for parsing and generating vCard and vCalendar files
+EAPI=6
+HOMEPAGE=http://eventable.github.io/vobject/ https://pypi.python.org/pypi/vobject https://github.com/eventable/vobject
+IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/python-dateutil-2.4.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/eventable/vobject/archive/0.9.5.tar.gz -> vobject-0.9.5.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ec668fb7218e98b09afd418e4d16c89f
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 44e983ef69f3..fc8e6f6824d0 100644
--- a/metadata/md5-cache/dev-ruby/Manifest.gz
+++ b/metadata/md5-cache/dev-ruby/Manifest.gz
diff --git a/metadata/md5-cache/dev-ruby/minitest-4.7.5-r2 b/metadata/md5-cache/dev-ruby/minitest-4.7.5-r2
index 559ed1704604..0be5994bd515 100644
--- a/metadata/md5-cache/dev-ruby/minitest-4.7.5-r2
+++ b/metadata/md5-cache/dev-ruby/minitest-4.7.5-r2
@@ -4,11 +4,11 @@ DESCRIPTION=minitest/unit is a small and fast replacement for ruby's huge and sl
 EAPI=5
 HOMEPAGE=https://github.com/seattlerb/minitest
 IUSE=doc test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( dev-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/minitest-4.7.5.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	1a95cd8be181598c8171cf918aa225d9	ruby-utils	f8a0644cb27ba724df27b2a20a739b53	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=8f33250e3910b111bb954614ef1c5d9e
+_md5_=3c6dacddb1d60c0337caf2bd1c6d06fc
diff --git a/metadata/md5-cache/dev-ruby/mustermann-1.0.1 b/metadata/md5-cache/dev-ruby/mustermann-1.0.1
new file mode 100644
index 000000000000..a09ae5be9579
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/mustermann-1.0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=A library implementing patterns that behave like regular expressions
+EAPI=6
+HOMEPAGE=https://github.com/sinatra/mustermann
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=1
+SRC_URI=mirror://rubygems/mustermann-1.0.1.gem
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	1a95cd8be181598c8171cf918aa225d9	ruby-utils	f8a0644cb27ba724df27b2a20a739b53	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=23b8415973eb9576559d47563d14d3b8
diff --git a/metadata/md5-cache/dev-ruby/rubygems-2.7.3 b/metadata/md5-cache/dev-ruby/rubygems-2.7.3
new file mode 100644
index 000000000000..0a265014333d
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rubygems-2.7.3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/minitest-4:0[ruby_targets_ruby22] dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-4:0[ruby_targets_ruby23] dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/minitest-4:0[ruby_targets_ruby24] dev-ruby/rdoc[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 )
+DESCRIPTION=Centralized Ruby extension management system
+EAPI=6
+HOMEPAGE=https://rubygems.org/
+IUSE=server test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Ruby MIT )
+PDEPEND=server? ( >=dev-ruby/builder-2.1 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=0
+SRC_URI=https://rubygems.org/rubygems/rubygems-2.7.3.tgz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	ruby-ng	1a95cd8be181598c8171cf918aa225d9	ruby-utils	f8a0644cb27ba724df27b2a20a739b53	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=f40fd65eb12347c571df5f3c04875877
diff --git a/metadata/md5-cache/dev-ruby/uuidtools-2.1.5-r1 b/metadata/md5-cache/dev-ruby/uuidtools-2.1.5-r1
index e17e643ac032..ca34ffdcbecd 100644
--- a/metadata/md5-cache/dev-ruby/uuidtools-2.1.5-r1
+++ b/metadata/md5-cache/dev-ruby/uuidtools-2.1.5-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=Simple library to generate UUIDs
 EAPI=5
 HOMEPAGE=https://github.com/sporkmonger/uuidtools
-IUSE=doc elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=doc elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
 KEYWORDS=amd64 x86 ~x86-macos
 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 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/uuidtools-2.1.5.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	1a95cd8be181598c8171cf918aa225d9	ruby-utils	f8a0644cb27ba724df27b2a20a739b53	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=12476790942cedd4126cbd1d3b3ec743
+_md5_=ce390ec24678312832782cc1aea69c30
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index e593ab175904..845074e5c2ea 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/glade-3.20.2 b/metadata/md5-cache/dev-util/glade-3.20.2
new file mode 100644
index 000000000000..dc51e688a409
--- /dev/null
+++ b/metadata/md5-cache/dev-util/glade-3.20.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=dev-libs/atk[introspection?] >=dev-libs/glib-2.32:2 >=dev-libs/libxml2-2.4.0:2 x11-libs/cairo:= x11-libs/gdk-pixbuf:2[introspection?] >=x11-libs/gtk+-3.20.0:3[introspection?] x11-libs/pango[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.32:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pygobject-3.8:3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) app-text/docbook-xml-dtd:4.1.2 app-text/yelp-tools dev-libs/libxslt >=dev-util/gtk-doc-am-1.13 >=dev-util/intltool-0.41.0 dev-util/itstool virtual/pkgconfig dev-libs/gobject-introspection-common gnome-base/gnome-common >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=A user interface designer for GTK+ and GNOME
+EAPI=6
+HOMEPAGE=https://glade.gnome.org/
+IUSE=debug +introspection python python_targets_python2_7 test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2+ FDL-1.1+
+RDEPEND=dev-libs/atk[introspection?] >=dev-libs/glib-2.32:2 >=dev-libs/libxml2-2.4.0:2 x11-libs/cairo:= x11-libs/gdk-pixbuf:2[introspection?] >=x11-libs/gtk+-3.20.0:3[introspection?] x11-libs/pango[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.32:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pygobject-3.8:3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] )
+REQUIRED_USE=python? ( python_targets_python2_7 )
+SLOT=3.10/6
+SRC_URI=mirror://gnome/sources/glade/3.20/glade-3.20.2.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4da4c1666f63a73a203202282e9796ff
diff --git a/metadata/md5-cache/dev-util/tmake-2.12 b/metadata/md5-cache/dev-util/tmake-2.12
deleted file mode 100644
index 46633d833fb3..000000000000
--- a/metadata/md5-cache/dev-util/tmake-2.12
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=A Cross platform Makefile tool
-EAPI=3
-HOMEPAGE=http://tmake.sourceforge.net
-KEYWORDS=~amd64 ppc x86 ~x86-linux ~ppc-macos
-LICENSE=HPND
-RDEPEND=>=dev-lang/perl-5
-SLOT=0
-SRC_URI=mirror://sourceforge/tmake/tmake-2.12.tar.bz2
-_md5_=86991d7afe845f44fab22b33a8bc3e0c
diff --git a/metadata/md5-cache/dev-util/tmake-2.12-r1 b/metadata/md5-cache/dev-util/tmake-2.12-r1
index ddc577c71873..49113908b79e 100644
--- a/metadata/md5-cache/dev-util/tmake-2.12-r1
+++ b/metadata/md5-cache/dev-util/tmake-2.12-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=A Cross platform Makefile tool
 EAPI=6
 HOMEPAGE=http://tmake.sourceforge.net
-KEYWORDS=amd64 ~ppc x86 ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ppc x86 ~x86-linux ~ppc-macos
 LICENSE=HPND
 RDEPEND=>=dev-lang/perl-5
 SLOT=0
 SRC_URI=mirror://sourceforge/tmake/tmake-2.12.tar.bz2
-_md5_=598b6b9db93e62707a5f96e5672ca44e
+_md5_=57d54c5820459193f42ea2be7668b958
diff --git a/metadata/md5-cache/dev-util/valkyrie-2.0.0 b/metadata/md5-cache/dev-util/valkyrie-2.0.0
deleted file mode 100644
index fc77851c1ec2..000000000000
--- a/metadata/md5-cache/dev-util/valkyrie-2.0.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=>=dev-util/valgrind-3.6.0 dev-qt/qtgui:4 dev-qt/qtcore:4
-DESCRIPTION=Graphical front-end to the Valgrind suite of tools
-EAPI=3
-HOMEPAGE=http://www.valgrind.org/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-util/valgrind-3.6.0 dev-qt/qtgui:4 dev-qt/qtcore:4
-SLOT=0
-SRC_URI=http://www.valgrind.org/downloads/valkyrie-2.0.0.tar.bz2
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	qt4-r2	b7985a3197fbc3a22d059f19904e735b	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=751dfb339810d26879eb3777fd2faacf
diff --git a/metadata/md5-cache/dev-util/valkyrie-2.0.0-r1 b/metadata/md5-cache/dev-util/valkyrie-2.0.0-r1
index 532b34ea4347..f9a3860a340d 100644
--- a/metadata/md5-cache/dev-util/valkyrie-2.0.0-r1
+++ b/metadata/md5-cache/dev-util/valkyrie-2.0.0-r1
@@ -3,10 +3,10 @@ DEPEND=>=dev-util/valgrind-3.6.0 dev-qt/qtgui:4 dev-qt/qtcore:4
 DESCRIPTION=Graphical front-end to the Valgrind suite of tools
 EAPI=5
 HOMEPAGE=http://www.valgrind.org/
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-util/valgrind-3.6.0 dev-qt/qtgui:4 dev-qt/qtcore:4
 SLOT=0
 SRC_URI=http://www.valgrind.org/downloads/valkyrie-2.0.0.tar.bz2
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	qt4-r2	b7985a3197fbc3a22d059f19904e735b	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=a45ea6bbd32cbf96150b01434cfce48e
+_md5_=db81bc33a002adf18f798b6b88e7a98e
diff --git a/metadata/md5-cache/games-fps/Manifest.gz b/metadata/md5-cache/games-fps/Manifest.gz
index cd570b34d80c..c4967e989a77 100644
--- a/metadata/md5-cache/games-fps/Manifest.gz
+++ b/metadata/md5-cache/games-fps/Manifest.gz
diff --git a/metadata/md5-cache/games-fps/openarena-0.8.8 b/metadata/md5-cache/games-fps/openarena-0.8.8
index 7f416346c4fe..db695443c84c 100644
--- a/metadata/md5-cache/games-fps/openarena-0.8.8
+++ b/metadata/md5-cache/games-fps/openarena-0.8.8
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=virtual/opengl media-libs/libsdl[joystick,opengl,video] media-libs/speex virtual/jpeg:0 x11-libs/libXext x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp curl? ( net-misc/curl ) openal? ( media-libs/openal ) vorbis? ( media-libs/libvorbis ) app-arch/unzip
+DEPEND=media-libs/libsdl[joystick,opengl,video] media-libs/speex media-libs/speexdsp virtual/jpeg:0 virtual/opengl x11-libs/libXext x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp curl? ( net-misc/curl ) openal? ( media-libs/openal ) vorbis? ( media-libs/libvorbis ) app-arch/unzip
 DESCRIPTION=Open-source replacement for Quake 3 Arena
 EAPI=5
 HOMEPAGE=http://openarena.ws/
 IUSE=+curl +openal +vorbis
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=virtual/opengl media-libs/libsdl[joystick,opengl,video] media-libs/speex virtual/jpeg:0 x11-libs/libXext x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp curl? ( net-misc/curl ) openal? ( media-libs/openal ) vorbis? ( media-libs/libvorbis ) games-misc/games-envd
+RDEPEND=media-libs/libsdl[joystick,opengl,video] media-libs/speex media-libs/speexdsp virtual/jpeg:0 virtual/opengl x11-libs/libXext x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp curl? ( net-misc/curl ) openal? ( media-libs/openal ) vorbis? ( media-libs/libvorbis ) games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/oarena/openarena-0.8.8.zip mirror://sourceforge/oarena/src/openarena-engine-source-0.8.8.tar.bz2
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=c23c17198e10ed4a53cd79edcd9925c4
+_md5_=3ca5786f89497077b6530e99c45d0d5a
diff --git a/metadata/md5-cache/gnome-base/Manifest.gz b/metadata/md5-cache/gnome-base/Manifest.gz
index 85163d5b3974..0cddfcd6df68 100644
--- a/metadata/md5-cache/gnome-base/Manifest.gz
+++ b/metadata/md5-cache/gnome-base/Manifest.gz
diff --git a/metadata/md5-cache/gnome-base/dconf-editor-3.24.3 b/metadata/md5-cache/gnome-base/dconf-editor-3.24.3
new file mode 100644
index 000000000000..956ece862ca6
--- /dev/null
+++ b/metadata/md5-cache/gnome-base/dconf-editor-3.24.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=dev-libs/appstream-glib >=dev-libs/glib-2.46.0:2 >=gnome-base/dconf-0.25.1 >=x11-libs/gtk+-3.22.0:3 >=sys-devel/gettext-0.19.7 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Graphical tool for editing the dconf configuration database
+EAPI=6
+HOMEPAGE=https://git.gnome.org/browse/dconf-editor
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~arm-linux ~x86-linux
+LICENSE=LGPL-2.1+
+RDEPEND=dev-libs/appstream-glib >=dev-libs/glib-2.46.0:2 >=gnome-base/dconf-0.25.1 >=x11-libs/gtk+-3.22.0:3 !<gnome-base/dconf-0.22[X]
+SLOT=0
+SRC_URI=mirror://gnome/sources/dconf-editor/3.24/dconf-editor-3.24.3.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f5f920dd61eb68dd6b7904daafab6436
diff --git a/metadata/md5-cache/gnome-base/libgnome-keyring-3.12.0 b/metadata/md5-cache/gnome-base/libgnome-keyring-3.12.0
deleted file mode 100644
index 1730e6486dc7..000000000000
--- a/metadata/md5-cache/gnome-base/libgnome-keyring-3.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/glib-2.16.0:2 >=dev-libs/libgcrypt-1.2.2:0= >=sys-apps/dbus-1 >=gnome-base/gnome-keyring-3.1.92 introspection? ( >=dev-libs/gobject-introspection-1.30.0 ) dev-util/gtk-doc-am >=dev-util/intltool-0.35 sys-devel/gettext virtual/pkgconfig test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) 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=Compatibility library for accessing secrets
-EAPI=5
-HOMEPAGE=https://wiki.gnome.org/Projects/GnomeKeyring
-IUSE=debug +introspection test vala debug
-KEYWORDS=alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris
-LICENSE=LGPL-2+ GPL-2+
-RDEPEND=>=dev-libs/glib-2.16.0:2 >=dev-libs/libgcrypt-1.2.2:0= >=sys-apps/dbus-1 >=gnome-base/gnome-keyring-3.1.92 introspection? ( >=dev-libs/gobject-introspection-1.30.0 )
-REQUIRED_USE=vala? ( introspection )
-SLOT=0
-SRC_URI=mirror://gnome/sources/libgnome-keyring/3.12/libgnome-keyring-3.12.0.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	vala	103e6885c83965507391cdc5b6fa0e67	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=764b2fb4d3b167c25609aabca5874cab
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index 0eb53f3ceeac..a2269e3cb878 100644
--- a/metadata/md5-cache/gnome-extra/Manifest.gz
+++ b/metadata/md5-cache/gnome-extra/Manifest.gz
diff --git a/metadata/md5-cache/gnome-extra/gucharmap-10.0.3 b/metadata/md5-cache/gnome-extra/gucharmap-10.0.3
new file mode 100644
index 000000000000..4d153a43b926
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gucharmap-10.0.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND==app-i18n/unicode-data-10.0* >=dev-libs/glib-2.32:2 >=x11-libs/pango-1.2.1[introspection?] >=x11-libs/gtk+-3.16:3[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.9.0:= ) !<gnome-extra/gucharmap-3:0 app-text/yelp-tools dev-util/desktop-file-utils >=dev-util/gtk-doc-am-1 >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig test? ( app-text/docbook-xml-dtd:4.1.2 ) 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=Unicode character map viewer and library
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Gucharmap
+IUSE=debug +introspection test vala
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+LICENSE=GPL-3
+RDEPEND==app-i18n/unicode-data-10.0* >=dev-libs/glib-2.32:2 >=x11-libs/pango-1.2.1[introspection?] >=x11-libs/gtk+-3.16:3[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.9.0:= ) !<gnome-extra/gucharmap-3:0
+REQUIRED_USE=vala? ( introspection )
+SLOT=2.90
+SRC_URI=mirror://gnome/sources/gucharmap/10.0/gucharmap-10.0.3.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	vala	103e6885c83965507391cdc5b6fa0e67	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b1c6c12a2343c1e490e40f457e85f242
diff --git a/metadata/md5-cache/gnustep-apps/Manifest.gz b/metadata/md5-cache/gnustep-apps/Manifest.gz
index dc28a7cb5c39..b3f12dfd9457 100644
--- a/metadata/md5-cache/gnustep-apps/Manifest.gz
+++ b/metadata/md5-cache/gnustep-apps/Manifest.gz
diff --git a/metadata/md5-cache/gnustep-apps/textedit-0.95_pre20100427 b/metadata/md5-cache/gnustep-apps/textedit-0.95_pre20100427
deleted file mode 100644
index 027b4486016a..000000000000
--- a/metadata/md5-cache/gnustep-apps/textedit-0.95_pre20100427
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
-DESCRIPTION=A text editor with font, color, and style capabilities for GNUstep
-EAPI=3
-HOMEPAGE=http://www.nongnu.org/backbone/
-IUSE=debug doc
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
-SLOT=0
-SRC_URI=mirror://gentoo/textedit-0.95_pre20100427.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=826ca9ccf4b25102fe4f401214c4ca0b
diff --git a/metadata/md5-cache/gnustep-apps/textedit-0.95_pre20100427-r1 b/metadata/md5-cache/gnustep-apps/textedit-0.95_pre20100427-r1
index 9c6178a03dd5..54efbb7c51fd 100644
--- a/metadata/md5-cache/gnustep-apps/textedit-0.95_pre20100427-r1
+++ b/metadata/md5-cache/gnustep-apps/textedit-0.95_pre20100427-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A text editor with font, color, and style capabilities for GNUstep
 EAPI=5
 HOMEPAGE=http://www.nongnu.org/backbone/
 IUSE=debug doc
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
 SRC_URI=mirror://gentoo/textedit-0.95_pre20100427.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=43e610b632765273cfdc3dd42d0a811f
+_md5_=f3bbe13ac0d97a889c096ed7f9e3bbeb
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index d6251052db86..589dde0a85a4 100644
--- a/metadata/md5-cache/mail-client/Manifest.gz
+++ b/metadata/md5-cache/mail-client/Manifest.gz
diff --git a/metadata/md5-cache/mail-client/claws-mail-3.13.2 b/metadata/md5-cache/mail-client/claws-mail-3.13.2
deleted file mode 100644
index 918e9e23262d..000000000000
--- a/metadata/md5-cache/mail-client/claws-mail-3.13.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=sys-devel/gettext-0.12.1 gdata? ( >=dev-libs/libgdata-0.17.1 ) gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( >=x11-libs/gtk+-2.20:2 ) pda? ( >=app-pda/jpilot-0.99 ) gnutls? ( >=net-libs/gnutls-2.2.0 ) ldap? ( >=net-nds/openldap-2.0.7 ) pgp? ( >=app-crypt/gpgme-0.4.5 ) valgrind? ( dev-util/valgrind ) dbus? ( >=dev-libs/dbus-glib-0.60 ) spell? ( >=app-text/enchant-1.0.0 ) imap? ( >=net-libs/libetpan-0.57 ) nntp? ( >=net-libs/libetpan-0.57 ) startup-notification? ( x11-libs/startup-notification ) session? ( x11-libs/libSM x11-libs/libICE ) archive? ( app-arch/libarchive >=net-misc/curl-7.9.7 ) bogofilter? ( mail-filter/bogofilter ) notification? ( libnotify? ( x11-libs/libnotify ) libcanberra? ( media-libs/libcanberra[gtk] ) libindicate? ( dev-libs/libindicate:3[gtk] ) dev-libs/glib:2 ) smime? ( >=app-crypt/gpgme-0.4.5 ) calendar? ( >=net-misc/curl-7.9.7 ) pdf? ( app-text/poppler[cairo] ) spam-report? ( >=net-misc/curl-7.9.7 ) webkit? ( >=net-libs/webkit-gtk-1.0:2 ) app-arch/xz-utils xface? ( >=media-libs/compface-1.4 ) 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 >=sys-apps/sed-4
-DESCRIPTION=An email client (and news reader) based on GTK+
-EAPI=5
-HOMEPAGE=http://www.claws-mail.org/
-IUSE=archive bogofilter calendar clamav dbus debug doc gdata gtk3 +imap ipv6 ldap +libcanberra +libindicate +libnotify networkmanager nntp +notification pda pdf perl +pgp python rss session sieve smime spamassassin spam-report spell +gnutls startup-notification valgrind webkit xface python_targets_python2_7
-KEYWORDS=alpha amd64 ~arm hppa ~mips ~ppc ~ppc64 sparc x86 ~x86-fbsd
-LICENSE=GPL-3
-RDEPEND=>=sys-devel/gettext-0.12.1 gdata? ( >=dev-libs/libgdata-0.17.1 ) gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( >=x11-libs/gtk+-2.20:2 ) pda? ( >=app-pda/jpilot-0.99 ) gnutls? ( >=net-libs/gnutls-2.2.0 ) ldap? ( >=net-nds/openldap-2.0.7 ) pgp? ( >=app-crypt/gpgme-0.4.5 ) valgrind? ( dev-util/valgrind ) dbus? ( >=dev-libs/dbus-glib-0.60 ) spell? ( >=app-text/enchant-1.0.0 ) imap? ( >=net-libs/libetpan-0.57 ) nntp? ( >=net-libs/libetpan-0.57 ) startup-notification? ( x11-libs/startup-notification ) session? ( x11-libs/libSM x11-libs/libICE ) archive? ( app-arch/libarchive >=net-misc/curl-7.9.7 ) bogofilter? ( mail-filter/bogofilter ) notification? ( libnotify? ( x11-libs/libnotify ) libcanberra? ( media-libs/libcanberra[gtk] ) libindicate? ( dev-libs/libindicate:3[gtk] ) dev-libs/glib:2 ) smime? ( >=app-crypt/gpgme-0.4.5 ) calendar? ( >=net-misc/curl-7.9.7 ) pdf? ( app-text/poppler[cairo] ) spam-report? ( >=net-misc/curl-7.9.7 ) webkit? ( >=net-libs/webkit-gtk-1.0:2 ) pdf? ( app-text/ghostscript-gpl ) clamav? ( app-antivirus/clamav ) networkmanager? ( net-misc/networkmanager ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.10.3 ) rss? ( net-misc/curl dev-libs/libxml2 ) app-misc/mime-types x11-misc/shared-mime-info
-REQUIRED_USE=libcanberra? ( notification ) libindicate? ( notification ) libnotify? ( notification ) networkmanager? ( dbus ) python? ( python_targets_python2_7 ) smime? ( pgp )
-SLOT=0
-SRC_URI=http://www.claws-mail.org/download.php?file=releases/claws-mail-3.13.2.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a1aaad3baa90d093e6bc234d55eb7131
diff --git a/metadata/md5-cache/mail-client/claws-mail-3.14.1-r1 b/metadata/md5-cache/mail-client/claws-mail-3.14.1-r1
deleted file mode 100644
index 4fb7a8eb989e..000000000000
--- a/metadata/md5-cache/mail-client/claws-mail-3.14.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=archive? ( app-arch/libarchive >=net-misc/curl-7.9.7 ) bogofilter? ( mail-filter/bogofilter ) calendar? ( >=net-misc/curl-7.9.7 ) dbus? ( >=dev-libs/dbus-glib-0.60 ) gdata? ( >=dev-libs/libgdata-0.17.1 ) gnutls? ( >=net-libs/gnutls-3.0 ) gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( >=x11-libs/gtk+-2.20:2 ) imap? ( >=net-libs/libetpan-0.57 ) ldap? ( >=net-nds/openldap-2.0.7 ) nls? ( >=sys-devel/gettext-0.18 ) nntp? ( >=net-libs/libetpan-0.57 ) notification? ( dev-libs/glib:2 libcanberra? ( media-libs/libcanberra[gtk] ) libindicate? ( dev-libs/libindicate:3[gtk] ) libnotify? ( x11-libs/libnotify ) ) pda? ( >=app-pda/jpilot-0.99 ) pdf? ( app-text/poppler[cairo] ) pgp? ( >=app-crypt/gpgme-1.0.0 ) session? ( x11-libs/libICE x11-libs/libSM ) smime? ( >=app-crypt/gpgme-1.0.0 ) spam-report? ( >=net-misc/curl-7.9.7 ) spell? ( >=app-text/enchant-1.0.0 ) startup-notification? ( x11-libs/startup-notification ) valgrind? ( dev-util/valgrind ) app-arch/xz-utils virtual/pkgconfig xface? ( >=media-libs/compface-1.4 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
-DESCRIPTION=An email client (and news reader) based on GTK+
-EAPI=6
-HOMEPAGE=http://www.claws-mail.org/
-IUSE=archive bogofilter calendar clamav dbus debug doc gdata +gnutls gtk3 +imap ipv6 ldap +libcanberra +libindicate +libnotify networkmanager nls nntp +notification pda pdf perl +pgp python rss session sieve smime spamassassin spam-report spell startup-notification valgrind xface python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
-LICENSE=GPL-3
-RDEPEND=archive? ( app-arch/libarchive >=net-misc/curl-7.9.7 ) bogofilter? ( mail-filter/bogofilter ) calendar? ( >=net-misc/curl-7.9.7 ) dbus? ( >=dev-libs/dbus-glib-0.60 ) gdata? ( >=dev-libs/libgdata-0.17.1 ) gnutls? ( >=net-libs/gnutls-3.0 ) gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( >=x11-libs/gtk+-2.20:2 ) imap? ( >=net-libs/libetpan-0.57 ) ldap? ( >=net-nds/openldap-2.0.7 ) nls? ( >=sys-devel/gettext-0.18 ) nntp? ( >=net-libs/libetpan-0.57 ) notification? ( dev-libs/glib:2 libcanberra? ( media-libs/libcanberra[gtk] ) libindicate? ( dev-libs/libindicate:3[gtk] ) libnotify? ( x11-libs/libnotify ) ) pda? ( >=app-pda/jpilot-0.99 ) pdf? ( app-text/poppler[cairo] ) pgp? ( >=app-crypt/gpgme-1.0.0 ) session? ( x11-libs/libICE x11-libs/libSM ) smime? ( >=app-crypt/gpgme-1.0.0 ) spam-report? ( >=net-misc/curl-7.9.7 ) spell? ( >=app-text/enchant-1.0.0 ) startup-notification? ( x11-libs/startup-notification ) valgrind? ( dev-util/valgrind ) app-misc/mime-types x11-misc/shared-mime-info clamav? ( app-antivirus/clamav ) networkmanager? ( net-misc/networkmanager ) pdf? ( app-text/ghostscript-gpl ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.10.3 ) rss? ( dev-libs/libxml2 net-misc/curl )
-REQUIRED_USE=libcanberra? ( notification ) libindicate? ( notification ) libnotify? ( notification ) networkmanager? ( dbus ) python? ( python_targets_python2_7 ) smime? ( pgp )
-SLOT=0
-SRC_URI=http://www.claws-mail.org/download.php?file=releases/claws-mail-3.14.1.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ff0d992c835efb7326f05d5a3b3c4657
diff --git a/metadata/md5-cache/mail-client/claws-mail-3.16.0 b/metadata/md5-cache/mail-client/claws-mail-3.16.0
new file mode 100644
index 000000000000..cf82f6dcc1f5
--- /dev/null
+++ b/metadata/md5-cache/mail-client/claws-mail-3.16.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare setup
+DEPEND=net-mail/ytnef archive? ( app-arch/libarchive >=net-misc/curl-7.9.7 ) bogofilter? ( mail-filter/bogofilter ) calendar? ( >=dev-libs/libical-2.0.0 >=net-misc/curl-7.9.7 ) dbus? ( >=dev-libs/dbus-glib-0.60 ) gdata? ( >=dev-libs/libgdata-0.17.2 ) gnutls? ( >=net-libs/gnutls-3.0 ) gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( >=x11-libs/gtk+-2.20:2 ) imap? ( >=net-libs/libetpan-0.57 ) ldap? ( >=net-nds/openldap-2.0.7 ) nls? ( >=sys-devel/gettext-0.18 ) nntp? ( >=net-libs/libetpan-0.57 ) notification? ( dev-libs/glib:2 libcanberra? ( media-libs/libcanberra[gtk] ) libindicate? ( dev-libs/libindicate:3[gtk] ) libnotify? ( x11-libs/libnotify ) ) pda? ( >=app-pda/jpilot-0.99 ) pdf? ( app-text/poppler[cairo] ) pgp? ( >=app-crypt/gpgme-1.0.0 ) session? ( x11-libs/libICE x11-libs/libSM ) smime? ( >=app-crypt/gpgme-1.0.0 ) spam-report? ( >=net-misc/curl-7.9.7 ) spell? ( >=app-text/enchant-1.0.0 ) startup-notification? ( x11-libs/startup-notification ) svg? ( >=gnome-base/librsvg-2.40.5 ) valgrind? ( dev-util/valgrind ) app-arch/xz-utils virtual/pkgconfig xface? ( >=media-libs/compface-1.4 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
+DESCRIPTION=An email client (and news reader) based on GTK+
+EAPI=6
+HOMEPAGE=http://www.claws-mail.org/
+IUSE=archive bogofilter calendar clamav dbus debug doc gdata +gnutls gtk3 +imap ipv6 ldap +libcanberra +libindicate +libnotify networkmanager nls nntp +notification pda pdf perl +pgp python rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind xface python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=GPL-3
+RDEPEND=net-mail/ytnef archive? ( app-arch/libarchive >=net-misc/curl-7.9.7 ) bogofilter? ( mail-filter/bogofilter ) calendar? ( >=dev-libs/libical-2.0.0 >=net-misc/curl-7.9.7 ) dbus? ( >=dev-libs/dbus-glib-0.60 ) gdata? ( >=dev-libs/libgdata-0.17.2 ) gnutls? ( >=net-libs/gnutls-3.0 ) gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( >=x11-libs/gtk+-2.20:2 ) imap? ( >=net-libs/libetpan-0.57 ) ldap? ( >=net-nds/openldap-2.0.7 ) nls? ( >=sys-devel/gettext-0.18 ) nntp? ( >=net-libs/libetpan-0.57 ) notification? ( dev-libs/glib:2 libcanberra? ( media-libs/libcanberra[gtk] ) libindicate? ( dev-libs/libindicate:3[gtk] ) libnotify? ( x11-libs/libnotify ) ) pda? ( >=app-pda/jpilot-0.99 ) pdf? ( app-text/poppler[cairo] ) pgp? ( >=app-crypt/gpgme-1.0.0 ) session? ( x11-libs/libICE x11-libs/libSM ) smime? ( >=app-crypt/gpgme-1.0.0 ) spam-report? ( >=net-misc/curl-7.9.7 ) spell? ( >=app-text/enchant-1.0.0 ) startup-notification? ( x11-libs/startup-notification ) svg? ( >=gnome-base/librsvg-2.40.5 ) valgrind? ( dev-util/valgrind ) app-misc/mime-types x11-misc/shared-mime-info clamav? ( app-antivirus/clamav ) networkmanager? ( net-misc/networkmanager ) pdf? ( app-text/ghostscript-gpl ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.10.3 ) rss? ( dev-libs/libxml2 net-misc/curl )
+REQUIRED_USE=libcanberra? ( notification ) libindicate? ( notification ) libnotify? ( notification ) networkmanager? ( dbus ) python? ( python_targets_python2_7 ) smime? ( pgp )
+SLOT=0
+SRC_URI=http://www.claws-mail.org/download.php?file=releases/claws-mail-3.16.0.tar.xz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=231235645c27ffb4e04a3b10d8076b82
diff --git a/metadata/md5-cache/mail-client/nail-12.4 b/metadata/md5-cache/mail-client/nail-12.4
deleted file mode 100644
index f6d79235663e..000000000000
--- a/metadata/md5-cache/mail-client/nail-12.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=ssl? ( dev-libs/openssl ) kerberos? ( virtual/krb5 ) !mail-client/mailx !net-mail/mailutils
-DESCRIPTION=an enhanced mailx-compatible mail client
-EAPI=3
-HOMEPAGE=http://heirloom.sourceforge.net/
-IUSE=ssl net kerberos
-KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=BSD
-RDEPEND=ssl? ( dev-libs/openssl ) kerberos? ( virtual/krb5 ) !mail-client/mailx !net-mail/mailutils
-SLOT=0
-SRC_URI=mirror://sourceforge/project/heirloom/heirloom-mailx/12.4/mailx-12.4.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=df368cef45ab93e4175e3fee13c5fe2b
diff --git a/metadata/md5-cache/mail-client/nail-12.4-r2 b/metadata/md5-cache/mail-client/nail-12.4-r2
deleted file mode 100644
index 5244f9e4d02b..000000000000
--- a/metadata/md5-cache/mail-client/nail-12.4-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=net? ( ssl? ( dev-libs/openssl ) kerberos? ( virtual/krb5 ) ) !mail-client/mailx !net-mail/mailutils
-DESCRIPTION=an enhanced mailx-compatible mail client
-EAPI=3
-HOMEPAGE=http://heirloom.sourceforge.net/
-IUSE=ssl net kerberos
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=BSD
-RDEPEND=net? ( ssl? ( dev-libs/openssl ) kerberos? ( virtual/krb5 ) ) !mail-client/mailx !net-mail/mailutils
-SLOT=0
-SRC_URI=mirror://sourceforge/project/heirloom/heirloom-mailx/12.4/mailx-12.4.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=b105384bd1c82551815f5e4a6964982a
diff --git a/metadata/md5-cache/mail-client/nail-12.4-r3 b/metadata/md5-cache/mail-client/nail-12.4-r3
index 503bc3b4a441..e398483c4ace 100644
--- a/metadata/md5-cache/mail-client/nail-12.4-r3
+++ b/metadata/md5-cache/mail-client/nail-12.4-r3
@@ -4,10 +4,10 @@ DESCRIPTION=an enhanced mailx-compatible mail client
 EAPI=5
 HOMEPAGE=http://heirloom.sourceforge.net/
 IUSE=libressl ssl net kerberos
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD
 RDEPEND=net? ( ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) kerberos? ( virtual/krb5 ) ) !mail-client/mailx !net-mail/mailutils
 SLOT=0
 SRC_URI=mirror://sourceforge/project/heirloom/heirloom-mailx/12.4/mailx-12.4.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=48ab6a9d74f6922634d4bb7c92f38484
+_md5_=3cf5671425951d71773096284e34de63
diff --git a/metadata/md5-cache/mail-mta/Manifest.gz b/metadata/md5-cache/mail-mta/Manifest.gz
index 2fef0c671ae9..1135950c3348 100644
--- a/metadata/md5-cache/mail-mta/Manifest.gz
+++ b/metadata/md5-cache/mail-mta/Manifest.gz
diff --git a/metadata/md5-cache/mail-mta/exim-4.89-r1 b/metadata/md5-cache/mail-mta/exim-4.89-r1
index ad11e8b0a999..556ff13e5297 100644
--- a/metadata/md5-cache/mail-mta/exim-4.89-r1
+++ b/metadata/md5-cache/mail-mta/exim-4.89-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=>=sys-apps/sed-4.0.5 >=sys-libs/db-3.2:= dev-libs/libpcre perl? ( dev-lang/perl:= ) pam? ( virtual/pam ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) gnutls? ( net-libs/gnutls[pkcs11?] dev-libs/libtasn1 ) ldap? ( >=net-nds/openldap-2.0.7 ) nis? ( elibc_glibc? ( || ( <sys-libs/glibc-2.23 >=sys-libs/glibc-2.23[rpc] ) ) ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:= ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 ) redis? ( dev-libs/hiredis ) spf? ( >=mail-filter/libspf2-1.2.5-r1 ) dmarc? ( mail-filter/opendmarc ) srs? ( mail-filter/libsrs_alt ) X? ( x11-proto/xproto x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw ) sqlite? ( dev-db/sqlite ) radius? ( net-dialup/freeradius-client ) virtual/libiconv virtual/pkgconfig virtual/pkgconfig
+DEPEND=>=sys-apps/sed-4.0.5 >=sys-libs/db-3.2:= dev-libs/libpcre perl? ( dev-lang/perl:= ) pam? ( virtual/pam ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) gnutls? ( net-libs/gnutls[pkcs11?] dev-libs/libtasn1 ) ldap? ( >=net-nds/openldap-2.0.7 ) nis? ( elibc_glibc? ( || ( <sys-libs/glibc-2.23 >=sys-libs/glibc-2.23[rpc] ) ) ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:= ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 ) redis? ( dev-libs/hiredis ) spf? ( >=mail-filter/libspf2-1.2.5-r1 ) dmarc? ( mail-filter/opendmarc ) srs? ( mail-filter/libsrs_alt ) X? ( x11-proto/xproto x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw ) sqlite? ( dev-db/sqlite ) radius? ( net-dialup/freeradius-client ) virtual/libiconv elibc_glibc? ( net-libs/libnsl ) virtual/pkgconfig virtual/pkgconfig
 DESCRIPTION=A highly configurable, drop-in replacement for sendmail
 EAPI=6
 HOMEPAGE=http://www.exim.org/
 IUSE=dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn exiscan-acl gnutls ipv6 ldap libressl lmtp maildir mbx mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux spf sqlite srs ssl syslog tcpd tpda X elibc_glibc
 KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=>=sys-apps/sed-4.0.5 >=sys-libs/db-3.2:= dev-libs/libpcre perl? ( dev-lang/perl:= ) pam? ( virtual/pam ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) gnutls? ( net-libs/gnutls[pkcs11?] dev-libs/libtasn1 ) ldap? ( >=net-nds/openldap-2.0.7 ) nis? ( elibc_glibc? ( || ( <sys-libs/glibc-2.23 >=sys-libs/glibc-2.23[rpc] ) ) ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:= ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 ) redis? ( dev-libs/hiredis ) spf? ( >=mail-filter/libspf2-1.2.5-r1 ) dmarc? ( mail-filter/opendmarc ) srs? ( mail-filter/libsrs_alt ) X? ( x11-proto/xproto x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw ) sqlite? ( dev-db/sqlite ) radius? ( net-dialup/freeradius-client ) virtual/libiconv !mail-mta/courier !mail-mta/esmtp !mail-mta/mini-qmail !<mail-mta/msmtp-1.4.19-r1 !>=mail-mta/msmtp-1.4.19-r1[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] !net-mail/mailwrapper >=net-mail/mailbase-0.00-r5 virtual/logger dcc? ( mail-filter/dcc ) selinux? ( sec-policy/selinux-exim )
+RDEPEND=>=sys-apps/sed-4.0.5 >=sys-libs/db-3.2:= dev-libs/libpcre perl? ( dev-lang/perl:= ) pam? ( virtual/pam ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) gnutls? ( net-libs/gnutls[pkcs11?] dev-libs/libtasn1 ) ldap? ( >=net-nds/openldap-2.0.7 ) nis? ( elibc_glibc? ( || ( <sys-libs/glibc-2.23 >=sys-libs/glibc-2.23[rpc] ) ) ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:= ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 ) redis? ( dev-libs/hiredis ) spf? ( >=mail-filter/libspf2-1.2.5-r1 ) dmarc? ( mail-filter/opendmarc ) srs? ( mail-filter/libsrs_alt ) X? ( x11-proto/xproto x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw ) sqlite? ( dev-db/sqlite ) radius? ( net-dialup/freeradius-client ) virtual/libiconv elibc_glibc? ( net-libs/libnsl ) !mail-mta/courier !mail-mta/esmtp !mail-mta/mini-qmail !<mail-mta/msmtp-1.4.19-r1 !>=mail-mta/msmtp-1.4.19-r1[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] !net-mail/mailwrapper >=net-mail/mailbase-0.00-r5 virtual/logger dcc? ( mail-filter/dcc ) selinux? ( sec-policy/selinux-exim )
 REQUIRED_USE=dane? ( !gnutls ) dmarc? ( spf dkim ) pkcs11? ( gnutls ) spf? ( exiscan-acl ) srs? ( exiscan-acl )
 SLOT=0
 SRC_URI=ftp://ftp.exim.org/pub/exim/exim4/exim-4.89.tar.bz2 mirror://gentoo/system_filter.exim.gz doc? ( ftp://ftp.exim.org/pub/exim/exim4/exim-pdf-4.89.tar.bz2 )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=50b0671b302415816b3f101605fc9c0f
+_md5_=31719537c5e3ad5335dde345e15773a2
diff --git a/metadata/md5-cache/mail-mta/exim-4.89-r3 b/metadata/md5-cache/mail-mta/exim-4.89-r3
index 4e280c4af835..6d2ea717bafa 100644
--- a/metadata/md5-cache/mail-mta/exim-4.89-r3
+++ b/metadata/md5-cache/mail-mta/exim-4.89-r3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=>=sys-apps/sed-4.0.5 >=sys-libs/db-3.2:= dev-libs/libpcre perl? ( dev-lang/perl:= ) pam? ( virtual/pam ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) gnutls? ( net-libs/gnutls[pkcs11?] dev-libs/libtasn1 ) ldap? ( >=net-nds/openldap-2.0.7 ) nis? ( elibc_glibc? ( || ( <sys-libs/glibc-2.23 >=sys-libs/glibc-2.23[rpc] ) ) ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:= ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 ) redis? ( dev-libs/hiredis ) spf? ( >=mail-filter/libspf2-1.2.5-r1 ) dmarc? ( mail-filter/opendmarc ) srs? ( mail-filter/libsrs_alt ) X? ( x11-proto/xproto x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw ) sqlite? ( dev-db/sqlite ) radius? ( net-dialup/freeradius-client ) virtual/libiconv virtual/pkgconfig virtual/pkgconfig
+DEPEND=>=sys-apps/sed-4.0.5 >=sys-libs/db-3.2:= dev-libs/libpcre perl? ( dev-lang/perl:= ) pam? ( virtual/pam ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) gnutls? ( net-libs/gnutls[pkcs11?] dev-libs/libtasn1 ) ldap? ( >=net-nds/openldap-2.0.7 ) nis? ( elibc_glibc? ( || ( <sys-libs/glibc-2.23 >=sys-libs/glibc-2.23[rpc] ) ) ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:= ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 ) redis? ( dev-libs/hiredis ) spf? ( >=mail-filter/libspf2-1.2.5-r1 ) dmarc? ( mail-filter/opendmarc ) srs? ( mail-filter/libsrs_alt ) X? ( x11-proto/xproto x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw ) sqlite? ( dev-db/sqlite ) radius? ( net-dialup/freeradius-client ) virtual/libiconv elibc_glibc? ( net-libs/libnsl ) virtual/pkgconfig virtual/pkgconfig
 DESCRIPTION=A highly configurable, drop-in replacement for sendmail
 EAPI=6
 HOMEPAGE=http://www.exim.org/
 IUSE=dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn exiscan-acl gnutls ipv6 ldap libressl lmtp maildir mbx mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux spf sqlite srs ssl syslog tcpd tpda X elibc_glibc
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=>=sys-apps/sed-4.0.5 >=sys-libs/db-3.2:= dev-libs/libpcre perl? ( dev-lang/perl:= ) pam? ( virtual/pam ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) gnutls? ( net-libs/gnutls[pkcs11?] dev-libs/libtasn1 ) ldap? ( >=net-nds/openldap-2.0.7 ) nis? ( elibc_glibc? ( || ( <sys-libs/glibc-2.23 >=sys-libs/glibc-2.23[rpc] ) ) ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:= ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 ) redis? ( dev-libs/hiredis ) spf? ( >=mail-filter/libspf2-1.2.5-r1 ) dmarc? ( mail-filter/opendmarc ) srs? ( mail-filter/libsrs_alt ) X? ( x11-proto/xproto x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw ) sqlite? ( dev-db/sqlite ) radius? ( net-dialup/freeradius-client ) virtual/libiconv !mail-mta/courier !mail-mta/esmtp !mail-mta/mini-qmail !<mail-mta/msmtp-1.4.19-r1 !>=mail-mta/msmtp-1.4.19-r1[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] !net-mail/mailwrapper >=net-mail/mailbase-0.00-r5 virtual/logger dcc? ( mail-filter/dcc ) selinux? ( sec-policy/selinux-exim )
+RDEPEND=>=sys-apps/sed-4.0.5 >=sys-libs/db-3.2:= dev-libs/libpcre perl? ( dev-lang/perl:= ) pam? ( virtual/pam ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) gnutls? ( net-libs/gnutls[pkcs11?] dev-libs/libtasn1 ) ldap? ( >=net-nds/openldap-2.0.7 ) nis? ( elibc_glibc? ( || ( <sys-libs/glibc-2.23 >=sys-libs/glibc-2.23[rpc] ) ) ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:= ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 ) redis? ( dev-libs/hiredis ) spf? ( >=mail-filter/libspf2-1.2.5-r1 ) dmarc? ( mail-filter/opendmarc ) srs? ( mail-filter/libsrs_alt ) X? ( x11-proto/xproto x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw ) sqlite? ( dev-db/sqlite ) radius? ( net-dialup/freeradius-client ) virtual/libiconv elibc_glibc? ( net-libs/libnsl ) !mail-mta/courier !mail-mta/esmtp !mail-mta/mini-qmail !<mail-mta/msmtp-1.4.19-r1 !>=mail-mta/msmtp-1.4.19-r1[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] !net-mail/mailwrapper >=net-mail/mailbase-0.00-r5 virtual/logger dcc? ( mail-filter/dcc ) selinux? ( sec-policy/selinux-exim )
 REQUIRED_USE=dane? ( !gnutls ) dmarc? ( spf dkim ) pkcs11? ( gnutls ) spf? ( exiscan-acl ) srs? ( exiscan-acl )
 SLOT=0
 SRC_URI=ftp://ftp.exim.org/pub/exim/exim4/exim-4.89.tar.bz2 mirror://gentoo/system_filter.exim.gz doc? ( ftp://ftp.exim.org/pub/exim/exim4/exim-pdf-4.89.tar.bz2 )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=436f18e08e2a631b9ccc015e2040f136
+_md5_=8d2ded607d4f770010bcda9d44019c10
diff --git a/metadata/md5-cache/mail-mta/exim-4.89-r5 b/metadata/md5-cache/mail-mta/exim-4.89-r5
index 0db85a72a680..0d13a1a89b43 100644
--- a/metadata/md5-cache/mail-mta/exim-4.89-r5
+++ b/metadata/md5-cache/mail-mta/exim-4.89-r5
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=>=sys-apps/sed-4.0.5 >=sys-libs/db-3.2:= dev-libs/libpcre perl? ( dev-lang/perl:= ) pam? ( virtual/pam ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) gnutls? ( net-libs/gnutls[pkcs11?] dev-libs/libtasn1 ) ldap? ( >=net-nds/openldap-2.0.7 ) nis? ( elibc_glibc? ( || ( <sys-libs/glibc-2.23 >=sys-libs/glibc-2.23[rpc] ) ) ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:= ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 ) redis? ( dev-libs/hiredis ) spf? ( >=mail-filter/libspf2-1.2.5-r1 ) dmarc? ( mail-filter/opendmarc ) srs? ( mail-filter/libsrs_alt ) X? ( x11-proto/xproto x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw ) sqlite? ( dev-db/sqlite ) radius? ( net-dialup/freeradius-client ) virtual/libiconv virtual/pkgconfig virtual/pkgconfig
+DEPEND=>=sys-apps/sed-4.0.5 >=sys-libs/db-3.2:= dev-libs/libpcre perl? ( dev-lang/perl:= ) pam? ( virtual/pam ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) gnutls? ( net-libs/gnutls[pkcs11?] dev-libs/libtasn1 ) ldap? ( >=net-nds/openldap-2.0.7 ) nis? ( elibc_glibc? ( || ( <sys-libs/glibc-2.23 >=sys-libs/glibc-2.23[rpc] ) ) ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:= ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 ) redis? ( dev-libs/hiredis ) spf? ( >=mail-filter/libspf2-1.2.5-r1 ) dmarc? ( mail-filter/opendmarc ) srs? ( mail-filter/libsrs_alt ) X? ( x11-proto/xproto x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw ) sqlite? ( dev-db/sqlite ) radius? ( net-dialup/freeradius-client ) virtual/libiconv elibc_glibc? ( net-libs/libnsl ) virtual/pkgconfig virtual/pkgconfig
 DESCRIPTION=A highly configurable, drop-in replacement for sendmail
 EAPI=6
 HOMEPAGE=http://www.exim.org/
 IUSE=dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn exiscan-acl gnutls ipv6 ldap libressl lmtp maildir mbx mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux spf sqlite srs ssl syslog tcpd tpda X elibc_glibc
 KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=>=sys-apps/sed-4.0.5 >=sys-libs/db-3.2:= dev-libs/libpcre perl? ( dev-lang/perl:= ) pam? ( virtual/pam ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) gnutls? ( net-libs/gnutls[pkcs11?] dev-libs/libtasn1 ) ldap? ( >=net-nds/openldap-2.0.7 ) nis? ( elibc_glibc? ( || ( <sys-libs/glibc-2.23 >=sys-libs/glibc-2.23[rpc] ) ) ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:= ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 ) redis? ( dev-libs/hiredis ) spf? ( >=mail-filter/libspf2-1.2.5-r1 ) dmarc? ( mail-filter/opendmarc ) srs? ( mail-filter/libsrs_alt ) X? ( x11-proto/xproto x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw ) sqlite? ( dev-db/sqlite ) radius? ( net-dialup/freeradius-client ) virtual/libiconv !mail-mta/courier !mail-mta/esmtp !mail-mta/mini-qmail !<mail-mta/msmtp-1.4.19-r1 !>=mail-mta/msmtp-1.4.19-r1[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] !net-mail/mailwrapper >=net-mail/mailbase-0.00-r5 virtual/logger dcc? ( mail-filter/dcc ) selinux? ( sec-policy/selinux-exim )
+RDEPEND=>=sys-apps/sed-4.0.5 >=sys-libs/db-3.2:= dev-libs/libpcre perl? ( dev-lang/perl:= ) pam? ( virtual/pam ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) gnutls? ( net-libs/gnutls[pkcs11?] dev-libs/libtasn1 ) ldap? ( >=net-nds/openldap-2.0.7 ) nis? ( elibc_glibc? ( || ( <sys-libs/glibc-2.23 >=sys-libs/glibc-2.23[rpc] ) ) ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:= ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 ) redis? ( dev-libs/hiredis ) spf? ( >=mail-filter/libspf2-1.2.5-r1 ) dmarc? ( mail-filter/opendmarc ) srs? ( mail-filter/libsrs_alt ) X? ( x11-proto/xproto x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw ) sqlite? ( dev-db/sqlite ) radius? ( net-dialup/freeradius-client ) virtual/libiconv elibc_glibc? ( net-libs/libnsl ) !mail-mta/courier !mail-mta/esmtp !mail-mta/mini-qmail !<mail-mta/msmtp-1.4.19-r1 !>=mail-mta/msmtp-1.4.19-r1[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] !net-mail/mailwrapper >=net-mail/mailbase-0.00-r5 virtual/logger dcc? ( mail-filter/dcc ) selinux? ( sec-policy/selinux-exim )
 REQUIRED_USE=dane? ( !gnutls ) dmarc? ( spf dkim ) pkcs11? ( gnutls ) spf? ( exiscan-acl ) srs? ( exiscan-acl )
 SLOT=0
 SRC_URI=ftp://ftp.exim.org/pub/exim/exim4/exim-4.89.tar.bz2 mirror://gentoo/system_filter.exim.gz doc? ( ftp://ftp.exim.org/pub/exim/exim4/exim-pdf-4.89.tar.bz2 )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=0f25dec73c26a24e3b5401508ad0a87c
+_md5_=2140ac08c85f62c4eb5490fcb3d545d7
diff --git a/metadata/md5-cache/mail-mta/exim-4.89.1 b/metadata/md5-cache/mail-mta/exim-4.89.1
index d30b510cee7a..a3f93555fff8 100644
--- a/metadata/md5-cache/mail-mta/exim-4.89.1
+++ b/metadata/md5-cache/mail-mta/exim-4.89.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=>=sys-apps/sed-4.0.5 >=sys-libs/db-3.2:= dev-libs/libpcre perl? ( dev-lang/perl:= ) pam? ( virtual/pam ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) gnutls? ( net-libs/gnutls[pkcs11?] dev-libs/libtasn1 ) ldap? ( >=net-nds/openldap-2.0.7 ) nis? ( elibc_glibc? ( || ( <sys-libs/glibc-2.23 >=sys-libs/glibc-2.23[rpc] ) ) ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:= ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 ) redis? ( dev-libs/hiredis ) spf? ( >=mail-filter/libspf2-1.2.5-r1 ) dmarc? ( mail-filter/opendmarc ) srs? ( mail-filter/libsrs_alt ) X? ( x11-proto/xproto x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw ) sqlite? ( dev-db/sqlite ) radius? ( net-dialup/freeradius-client ) virtual/libiconv virtual/pkgconfig virtual/pkgconfig
+DEPEND=>=sys-apps/sed-4.0.5 >=sys-libs/db-3.2:= dev-libs/libpcre perl? ( dev-lang/perl:= ) pam? ( virtual/pam ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) gnutls? ( net-libs/gnutls[pkcs11?] dev-libs/libtasn1 ) ldap? ( >=net-nds/openldap-2.0.7 ) nis? ( elibc_glibc? ( || ( <sys-libs/glibc-2.23 >=sys-libs/glibc-2.23[rpc] ) ) ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:= ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 ) redis? ( dev-libs/hiredis ) spf? ( >=mail-filter/libspf2-1.2.5-r1 ) dmarc? ( mail-filter/opendmarc ) srs? ( mail-filter/libsrs_alt ) X? ( x11-proto/xproto x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw ) sqlite? ( dev-db/sqlite ) radius? ( net-dialup/freeradius-client ) virtual/libiconv elibc_glibc? ( net-libs/libnsl ) virtual/pkgconfig virtual/pkgconfig
 DESCRIPTION=A highly configurable, drop-in replacement for sendmail
 EAPI=6
 HOMEPAGE=http://www.exim.org/
 IUSE=dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn exiscan-acl gnutls ipv6 ldap libressl lmtp maildir mbx mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux spf sqlite srs ssl syslog tcpd tpda X elibc_glibc
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=>=sys-apps/sed-4.0.5 >=sys-libs/db-3.2:= dev-libs/libpcre perl? ( dev-lang/perl:= ) pam? ( virtual/pam ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) gnutls? ( net-libs/gnutls[pkcs11?] dev-libs/libtasn1 ) ldap? ( >=net-nds/openldap-2.0.7 ) nis? ( elibc_glibc? ( || ( <sys-libs/glibc-2.23 >=sys-libs/glibc-2.23[rpc] ) ) ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:= ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 ) redis? ( dev-libs/hiredis ) spf? ( >=mail-filter/libspf2-1.2.5-r1 ) dmarc? ( mail-filter/opendmarc ) srs? ( mail-filter/libsrs_alt ) X? ( x11-proto/xproto x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw ) sqlite? ( dev-db/sqlite ) radius? ( net-dialup/freeradius-client ) virtual/libiconv !mail-mta/courier !mail-mta/esmtp !mail-mta/mini-qmail !<mail-mta/msmtp-1.4.19-r1 !>=mail-mta/msmtp-1.4.19-r1[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] !net-mail/mailwrapper >=net-mail/mailbase-0.00-r5 virtual/logger dcc? ( mail-filter/dcc ) selinux? ( sec-policy/selinux-exim )
+RDEPEND=>=sys-apps/sed-4.0.5 >=sys-libs/db-3.2:= dev-libs/libpcre perl? ( dev-lang/perl:= ) pam? ( virtual/pam ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) gnutls? ( net-libs/gnutls[pkcs11?] dev-libs/libtasn1 ) ldap? ( >=net-nds/openldap-2.0.7 ) nis? ( elibc_glibc? ( || ( <sys-libs/glibc-2.23 >=sys-libs/glibc-2.23[rpc] ) ) ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:= ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 ) redis? ( dev-libs/hiredis ) spf? ( >=mail-filter/libspf2-1.2.5-r1 ) dmarc? ( mail-filter/opendmarc ) srs? ( mail-filter/libsrs_alt ) X? ( x11-proto/xproto x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw ) sqlite? ( dev-db/sqlite ) radius? ( net-dialup/freeradius-client ) virtual/libiconv elibc_glibc? ( net-libs/libnsl ) !mail-mta/courier !mail-mta/esmtp !mail-mta/mini-qmail !<mail-mta/msmtp-1.4.19-r1 !>=mail-mta/msmtp-1.4.19-r1[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] !net-mail/mailwrapper >=net-mail/mailbase-0.00-r5 virtual/logger dcc? ( mail-filter/dcc ) selinux? ( sec-policy/selinux-exim )
 REQUIRED_USE=dane? ( !gnutls ) dmarc? ( spf dkim ) pkcs11? ( gnutls ) spf? ( exiscan-acl ) srs? ( exiscan-acl )
 SLOT=0
 SRC_URI=ftp://ftp.exim.org/pub/exim/exim4/exim-4.89.1.tar.bz2 mirror://gentoo/system_filter.exim.gz doc? ( ftp://ftp.exim.org/pub/exim/exim4/exim-pdf-4.89.1.tar.bz2 )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=c2270a1edff3afaecf3c94f7d564d157
+_md5_=4aa8d29cbb99945d722253854957986d
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index d8983daac2d4..201d106f3cf2 100644
--- a/metadata/md5-cache/media-gfx/Manifest.gz
+++ b/metadata/md5-cache/media-gfx/Manifest.gz
diff --git a/metadata/md5-cache/media-gfx/zbar-0.10_p20121015-r2 b/metadata/md5-cache/media-gfx/zbar-0.10_p20121015-r2
index 66bd678916fd..38674e427288 100644
--- a/metadata/md5-cache/media-gfx/zbar-0.10_p20121015-r2
+++ b/metadata/md5-cache/media-gfx/zbar-0.10_p20121015-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install preinst prepare setup test unpack
-DEPEND=gtk? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) imagemagick? ( virtual/imagemagick-tools ) jpeg? ( virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] gtk? ( >=dev-python/pygtk-2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) ) qt4? ( dev-qt/qtcore:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-qt/qtgui:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xv? ( x11-libs/libXv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) java? ( >=virtual/jdk-1.4 ) test? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) app-arch/unzip sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=gtk? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) imagemagick? ( virtual/imagemagick-tools ) jpeg? ( virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] gtk? ( >=dev-python/pygtk-2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) ) qt4? ( dev-qt/qtcore:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-qt/qtgui:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xv? ( x11-libs/libXv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) java? ( >=virtual/jdk-1.4 test? ( dev-java/junit:4 dev-java/hamcrest-core:1.3 ) ) test? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) app-arch/unzip sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Library and tools for reading barcodes from images or video
 EAPI=6
 HOMEPAGE=http://zbar.sourceforge.net/
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( python_targets_python2_7 ) test? ( X python_targets_pytho
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~xmw/zbar-0.10_p20121015.zip
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
-_md5_=68dfa6c2de3bb6d08887d13c8929b5db
+_md5_=6cea36c80639595a08279fc641b47983
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 2f0b7c09c9f5..a90c272d62e0 100644
--- a/metadata/md5-cache/media-libs/Manifest.gz
+++ b/metadata/md5-cache/media-libs/Manifest.gz
diff --git a/metadata/md5-cache/media-libs/harfbuzz-1.4.8 b/metadata/md5-cache/media-libs/harfbuzz-1.4.8
deleted file mode 100644
index b778e881cebd..000000000000
--- a/metadata/md5-cache/media-libs/harfbuzz-1.4.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=cairo? ( x11-libs/cairo:= ) fontconfig? ( media-libs/fontconfig:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-51.2-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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-util/gtk-doc-am virtual/pkgconfig test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) >=app-portage/elt-patches-20170422
-DESCRIPTION=An OpenType text shaping engine
-EAPI=6
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/HarfBuzz
-IUSE=+cairo debug fontconfig +glib +graphite icu +introspection static-libs test +truetype abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris
-LICENSE=Old-MIT ISC icu
-RDEPEND=cairo? ( x11-libs/cairo:= ) fontconfig? ( media-libs/fontconfig:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-51.2-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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=introspection? ( glib )
-SLOT=0/0.9.18
-SRC_URI=https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-1.4.8.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5cc780beff71e41ce61a0069dffea159
diff --git a/metadata/md5-cache/media-libs/harfbuzz-1.5.1 b/metadata/md5-cache/media-libs/harfbuzz-1.5.1
deleted file mode 100644
index 8b100d1e3fb7..000000000000
--- a/metadata/md5-cache/media-libs/harfbuzz-1.5.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=cairo? ( x11-libs/cairo:= ) fontconfig? ( media-libs/fontconfig:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-51.2-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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-util/gtk-doc-am virtual/pkgconfig test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) >=app-portage/elt-patches-20170422
-DESCRIPTION=An OpenType text shaping engine
-EAPI=6
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/HarfBuzz
-IUSE=+cairo debug fontconfig +glib +graphite icu +introspection static-libs test +truetype abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris
-LICENSE=Old-MIT ISC icu
-RDEPEND=cairo? ( x11-libs/cairo:= ) fontconfig? ( media-libs/fontconfig:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-51.2-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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=introspection? ( glib )
-SLOT=0/0.9.18
-SRC_URI=https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-1.5.1.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5cc780beff71e41ce61a0069dffea159
diff --git a/metadata/md5-cache/media-libs/harfbuzz-1.6.3 b/metadata/md5-cache/media-libs/harfbuzz-1.6.3
deleted file mode 100644
index c9d1e5ca7f6e..000000000000
--- a/metadata/md5-cache/media-libs/harfbuzz-1.6.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=cairo? ( x11-libs/cairo:= ) fontconfig? ( media-libs/fontconfig:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-51.2-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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-util/gtk-doc-am virtual/pkgconfig test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) >=app-portage/elt-patches-20170422
-DESCRIPTION=An OpenType text shaping engine
-EAPI=6
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/HarfBuzz
-IUSE=+cairo debug fontconfig +glib +graphite icu +introspection static-libs test +truetype abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris
-LICENSE=Old-MIT ISC icu
-RDEPEND=cairo? ( x11-libs/cairo:= ) fontconfig? ( media-libs/fontconfig:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-51.2-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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=introspection? ( glib )
-SLOT=0/0.9.18
-SRC_URI=https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-1.6.3.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5cc780beff71e41ce61a0069dffea159
diff --git a/metadata/md5-cache/media-libs/harfbuzz-1.7.1 b/metadata/md5-cache/media-libs/harfbuzz-1.7.1
deleted file mode 100644
index 31a6421cf29d..000000000000
--- a/metadata/md5-cache/media-libs/harfbuzz-1.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=cairo? ( x11-libs/cairo:= ) fontconfig? ( media-libs/fontconfig:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-51.2-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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-util/gtk-doc-am virtual/pkgconfig test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) >=app-portage/elt-patches-20170422
-DESCRIPTION=An OpenType text shaping engine
-EAPI=6
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/HarfBuzz
-IUSE=+cairo debug fontconfig +glib +graphite icu +introspection static-libs test +truetype abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris
-LICENSE=Old-MIT ISC icu
-RDEPEND=cairo? ( x11-libs/cairo:= ) fontconfig? ( media-libs/fontconfig:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-51.2-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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=introspection? ( glib )
-SLOT=0/0.9.18
-SRC_URI=https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-1.7.1.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5cc780beff71e41ce61a0069dffea159
diff --git a/metadata/md5-cache/media-libs/libbdplus-9999 b/metadata/md5-cache/media-libs/libbdplus-9999
index 3490e2a6960c..156c6c36209e 100644
--- a/metadata/md5-cache/media-libs/libbdplus-9999
+++ b/metadata/md5-cache/media-libs/libbdplus-9999
@@ -8,4 +8,4 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/libgcrypt:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libgpg-error[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] aacs? ( >=media-libs/libaacs-0.7.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-multilib	f4848d9634439c7203cb7dd3b9650fff	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=28f6cb33aa7df89327be196e12cdf38a
+_md5_=55f10ccf13120c117010c9e02e679a09
diff --git a/metadata/md5-cache/media-libs/speex-1.2.0-r1 b/metadata/md5-cache/media-libs/speex-1.2.0-r1
index 84f237632343..3b6d6d7319ee 100644
--- a/metadata/md5-cache/media-libs/speex-1.2.0-r1
+++ b/metadata/md5-cache/media-libs/speex-1.2.0-r1
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=utils? ( media-libs/libogg:= media-libs/speexdsp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) virtual/pkgconfig >=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=Audio compression format designed for speech
 EAPI=6
-HOMEPAGE=http://www.speex.org/
+HOMEPAGE=https://www.speex.org/
 IUSE=cpu_flags_arm_v4 cpu_flags_arm_v5 cpu_flags_arm_v6 cpu_flags_x86_sse static-libs utils +vbr abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=utils? ( media-libs/libogg:= media-libs/speexdsp[abi_x86_32(-)?,abi_x86_64(-)?,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://downloads.xiph.org/releases/speex/speex-1.2.0.tar.gz
+SRC_URI=https://downloads.xiph.org/releases/speex/speex-1.2.0.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=59c3e9bad4a7283b27aaf242daaf4f33
+_md5_=24b8bb43e620619e9402c38a219d152f
diff --git a/metadata/md5-cache/media-libs/speexdsp-1.2_rc3-r1 b/metadata/md5-cache/media-libs/speexdsp-1.2_rc3-r1
new file mode 100644
index 000000000000..4c67de1a1b2f
--- /dev/null
+++ b/metadata/md5-cache/media-libs/speexdsp-1.2_rc3-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!<media-libs/speex-1.2.0 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=Audio compression format designed for speech -- DSP
+EAPI=6
+HOMEPAGE=https://www.speex.org/
+IUSE=cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_arm_neon static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=BSD
+RDEPEND=!<media-libs/speex-1.2.0
+SLOT=0
+SRC_URI=https://downloads.xiph.org/releases/speex/speexdsp-1.2rc3.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=943f5943da7f6c12673003c6be7b83f0
diff --git a/metadata/md5-cache/media-libs/speexdsp-1.2_rc3-r2 b/metadata/md5-cache/media-libs/speexdsp-1.2_rc3-r2
new file mode 100644
index 000000000000..119bf6afa47b
--- /dev/null
+++ b/metadata/md5-cache/media-libs/speexdsp-1.2_rc3-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!<media-libs/speex-1.2.0 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=Audio compression format designed for speech -- DSP
+EAPI=6
+HOMEPAGE=https://www.speex.org/
+IUSE=cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_arm_neon static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=BSD
+RDEPEND=!<media-libs/speex-1.2.0
+SLOT=0
+SRC_URI=https://downloads.xiph.org/releases/speex/speexdsp-1.2rc3.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=8fbb736dbfec8da95e194d90088e668d
diff --git a/metadata/md5-cache/media-libs/x264-9999 b/metadata/md5-cache/media-libs/x264-9999
index 5ae7b11d2b93..94f41e8f516e 100644
--- a/metadata/md5-cache/media-libs/x264-9999
+++ b/metadata/md5-cache/media-libs/x264-9999
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 RDEPEND=opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r7 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 SLOT=0/152
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-2	195a672bfaf52d868442171c9469bbb6	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=c6e6e8091404b2cfa52204e5d8b45d86
+_md5_=d02203f5b82a874724ced8cc27054e70
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index 88d705938d09..d6c41b84ae4a 100644
--- a/metadata/md5-cache/media-plugins/Manifest.gz
+++ b/metadata/md5-cache/media-plugins/Manifest.gz
diff --git a/metadata/md5-cache/media-plugins/amb-plugins-0.8.1 b/metadata/md5-cache/media-plugins/amb-plugins-0.8.1
deleted file mode 100644
index 55e3f331e610..000000000000
--- a/metadata/md5-cache/media-plugins/amb-plugins-0.8.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=media-libs/ladspa-sdk
-DESCRIPTION=AMB-plugins ladspa plugin package. Filters by Fons Adriaensen
-EAPI=3
-HOMEPAGE=http://www.kokkinizita.net/linuxaudio/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=media-libs/ladspa-sdk
-SLOT=0
-SRC_URI=http://www.kokkinizita.net/linuxaudio/downloads/AMB-plugins-0.8.1.tar.bz2
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=61f40f343ebff3193e1dc8faeaea9039
diff --git a/metadata/md5-cache/media-plugins/amb-plugins-0.8.1-r1 b/metadata/md5-cache/media-plugins/amb-plugins-0.8.1-r1
index 7209d04be88f..247586824942 100644
--- a/metadata/md5-cache/media-plugins/amb-plugins-0.8.1-r1
+++ b/metadata/md5-cache/media-plugins/amb-plugins-0.8.1-r1
@@ -3,10 +3,10 @@ DEPEND=media-libs/ladspa-sdk
 DESCRIPTION=AMB-plugins ladspa plugin package. Filters by Fons Adriaensen
 EAPI=5
 HOMEPAGE=http://kokkinizita.linuxaudio.org/linuxaudio/
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=media-libs/ladspa-sdk
 SLOT=0
 SRC_URI=http://kokkinizita.linuxaudio.org/linuxaudio/downloads/AMB-plugins-0.8.1.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=34b5dd6303a35425391a7eec3b59be75
+_md5_=7dd874b7ec87fd70c245057d8312dff6
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 98124de2ed6f..852466a96486 100644
--- a/metadata/md5-cache/media-sound/Manifest.gz
+++ b/metadata/md5-cache/media-sound/Manifest.gz
diff --git a/metadata/md5-cache/media-sound/mpd-0.20.12 b/metadata/md5-cache/media-sound/mpd-0.20.12
index 532f6ab13071..5bee591750d5 100644
--- a/metadata/md5-cache/media-sound/mpd-0.20.12
+++ b/metadata/md5-cache/media-sound/mpd-0.20.12
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=adplug? ( media-libs/adplug ) alsa? ( media-libs/alsa-lib media-sound/alsa-utils ) ao? ( media-libs/libao[alsa?,pulseaudio?] ) audiofile? ( media-libs/audiofile ) bzip2? ( app-arch/bzip2 ) cdio? ( dev-libs/libcdio-paranoia ) curl? ( net-misc/curl ) expat? ( dev-libs/expat ) faad? ( media-libs/faad2 ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) flac? ( media-libs/flac[ogg?] ) fluidsynth? ( media-sound/fluidsynth ) gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 ) icu? ( dev-libs/icu:= ) id3tag? ( media-libs/libid3tag ) jack? ( virtual/jack ) lame? ( network? ( media-sound/lame ) ) libmpdclient? ( media-libs/libmpdclient ) libsamplerate? ( media-libs/libsamplerate ) libsoxr? ( media-libs/soxr ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod:0 ) mms? ( media-libs/libmms ) modplug? ( media-libs/libmodplug ) mpg123? ( >=media-sound/mpg123-1.12.2 ) musepack? ( media-sound/musepack-tools ) network? ( >=media-libs/libshout-2 !lame? ( !vorbis? ( media-libs/libvorbis ) ) ) nfs? ( net-fs/libnfs ) ogg? ( media-libs/libogg ) openal? ( media-libs/openal ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-4.0.25 ) sid? ( || ( media-libs/libsidplay:2 media-libs/libsidplayfp ) ) sndfile? ( media-libs/libsndfile ) soundcloud? ( >=dev-libs/yajl-2:= ) sqlite? ( dev-db/sqlite:3 ) systemd? ( sys-apps/systemd ) tcpd? ( sys-apps/tcp-wrappers ) twolame? ( media-sound/twolame ) upnp? ( net-libs/libupnp:= ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib ) zlib? ( sys-libs/zlib ) dev-libs/boost virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEPEND=adplug? ( media-libs/adplug ) alsa? ( media-libs/alsa-lib media-sound/alsa-utils ) ao? ( media-libs/libao[alsa?,pulseaudio?] ) audiofile? ( media-libs/audiofile ) bzip2? ( app-arch/bzip2 ) cdio? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia ) curl? ( net-misc/curl ) expat? ( dev-libs/expat ) faad? ( media-libs/faad2 ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) flac? ( media-libs/flac[ogg?] ) fluidsynth? ( media-sound/fluidsynth ) gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 ) icu? ( dev-libs/icu:= ) id3tag? ( media-libs/libid3tag ) jack? ( virtual/jack ) lame? ( network? ( media-sound/lame ) ) libmpdclient? ( media-libs/libmpdclient ) libsamplerate? ( media-libs/libsamplerate ) libsoxr? ( media-libs/soxr ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod:0 ) mms? ( media-libs/libmms ) modplug? ( media-libs/libmodplug ) mpg123? ( >=media-sound/mpg123-1.12.2 ) musepack? ( media-sound/musepack-tools ) network? ( >=media-libs/libshout-2 !lame? ( !vorbis? ( media-libs/libvorbis ) ) ) nfs? ( net-fs/libnfs ) ogg? ( media-libs/libogg ) openal? ( media-libs/openal ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-4.0.25 ) sid? ( || ( media-libs/libsidplay:2 media-libs/libsidplayfp ) ) sndfile? ( media-libs/libsndfile ) soundcloud? ( >=dev-libs/yajl-2:= ) sqlite? ( dev-db/sqlite:3 ) systemd? ( sys-apps/systemd ) tcpd? ( sys-apps/tcp-wrappers ) twolame? ( media-sound/twolame ) upnp? ( net-libs/libupnp:= ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib ) zlib? ( sys-libs/zlib ) dev-libs/boost virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DESCRIPTION=The Music Player Daemon (mpd)
 EAPI=6
 HOMEPAGE=https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD
 IUSE=adplug +alsa ao audiofile bzip2 cdio +curl debug +eventfd expat faad +fifo +ffmpeg flac fluidsynth gme +icu +id3tag +inotify +ipv6 jack lame mms libav libmpdclient libsamplerate libsoxr +mad mikmod modplug mpg123 musepack +network nfs ogg openal opus oss pipe pulseaudio recorder samba selinux sid +signalfd sndfile soundcloud sqlite systemd tcpd twolame unicode upnp vorbis wavpack wildmidi zeroconf zip zlib webdav
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~x64-macos
 LICENSE=GPL-2
-RDEPEND=adplug? ( media-libs/adplug ) alsa? ( media-libs/alsa-lib media-sound/alsa-utils ) ao? ( media-libs/libao[alsa?,pulseaudio?] ) audiofile? ( media-libs/audiofile ) bzip2? ( app-arch/bzip2 ) cdio? ( dev-libs/libcdio-paranoia ) curl? ( net-misc/curl ) expat? ( dev-libs/expat ) faad? ( media-libs/faad2 ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) flac? ( media-libs/flac[ogg?] ) fluidsynth? ( media-sound/fluidsynth ) gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 ) icu? ( dev-libs/icu:= ) id3tag? ( media-libs/libid3tag ) jack? ( virtual/jack ) lame? ( network? ( media-sound/lame ) ) libmpdclient? ( media-libs/libmpdclient ) libsamplerate? ( media-libs/libsamplerate ) libsoxr? ( media-libs/soxr ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod:0 ) mms? ( media-libs/libmms ) modplug? ( media-libs/libmodplug ) mpg123? ( >=media-sound/mpg123-1.12.2 ) musepack? ( media-sound/musepack-tools ) network? ( >=media-libs/libshout-2 !lame? ( !vorbis? ( media-libs/libvorbis ) ) ) nfs? ( net-fs/libnfs ) ogg? ( media-libs/libogg ) openal? ( media-libs/openal ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-4.0.25 ) sid? ( || ( media-libs/libsidplay:2 media-libs/libsidplayfp ) ) sndfile? ( media-libs/libsndfile ) soundcloud? ( >=dev-libs/yajl-2:= ) sqlite? ( dev-db/sqlite:3 ) systemd? ( sys-apps/systemd ) tcpd? ( sys-apps/tcp-wrappers ) twolame? ( media-sound/twolame ) upnp? ( net-libs/libupnp:= ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib ) zlib? ( sys-libs/zlib ) !<sys-cluster/mpich2-1.4_rc2 selinux? ( sec-policy/selinux-mpd )
+RDEPEND=adplug? ( media-libs/adplug ) alsa? ( media-libs/alsa-lib media-sound/alsa-utils ) ao? ( media-libs/libao[alsa?,pulseaudio?] ) audiofile? ( media-libs/audiofile ) bzip2? ( app-arch/bzip2 ) cdio? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia ) curl? ( net-misc/curl ) expat? ( dev-libs/expat ) faad? ( media-libs/faad2 ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) flac? ( media-libs/flac[ogg?] ) fluidsynth? ( media-sound/fluidsynth ) gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 ) icu? ( dev-libs/icu:= ) id3tag? ( media-libs/libid3tag ) jack? ( virtual/jack ) lame? ( network? ( media-sound/lame ) ) libmpdclient? ( media-libs/libmpdclient ) libsamplerate? ( media-libs/libsamplerate ) libsoxr? ( media-libs/soxr ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod:0 ) mms? ( media-libs/libmms ) modplug? ( media-libs/libmodplug ) mpg123? ( >=media-sound/mpg123-1.12.2 ) musepack? ( media-sound/musepack-tools ) network? ( >=media-libs/libshout-2 !lame? ( !vorbis? ( media-libs/libvorbis ) ) ) nfs? ( net-fs/libnfs ) ogg? ( media-libs/libogg ) openal? ( media-libs/openal ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-4.0.25 ) sid? ( || ( media-libs/libsidplay:2 media-libs/libsidplayfp ) ) sndfile? ( media-libs/libsndfile ) soundcloud? ( >=dev-libs/yajl-2:= ) sqlite? ( dev-db/sqlite:3 ) systemd? ( sys-apps/systemd ) tcpd? ( sys-apps/tcp-wrappers ) twolame? ( media-sound/twolame ) upnp? ( net-libs/libupnp:= ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib ) zlib? ( sys-libs/zlib ) !<sys-cluster/mpich2-1.4_rc2 selinux? ( sec-policy/selinux-mpd )
 REQUIRED_USE=|| ( alsa ao fifo jack network openal oss pipe pulseaudio recorder ) || ( adplug audiofile faad ffmpeg flac fluidsynth mad mikmod modplug mpg123 musepack ogg flac sid vorbis wavpack wildmidi ) network? ( || ( audiofile flac lame twolame vorbis ) ) recorder? ( || ( audiofile flac lame twolame vorbis ) ) opus? ( ogg ) upnp? ( expat ) webdav? ( curl expat )
 SLOT=0
 SRC_URI=https://www.musicpd.org/download/mpd/0.20/mpd-0.20.12.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=2b3fbd1344666a485dda249dc58b8585
+_md5_=b897e47160d01c41269c4147307d7757
diff --git a/metadata/md5-cache/media-tv/Manifest.gz b/metadata/md5-cache/media-tv/Manifest.gz
index 745784568bd6..d9e36ac4ec7c 100644
--- a/metadata/md5-cache/media-tv/Manifest.gz
+++ b/metadata/md5-cache/media-tv/Manifest.gz
diff --git a/metadata/md5-cache/media-tv/tvheadend-9999 b/metadata/md5-cache/media-tv/tvheadend-9999
index bfd0592f6a94..638e368249a8 100644
--- a/metadata/md5-cache/media-tv/tvheadend-9999
+++ b/metadata/md5-cache/media-tv/tvheadend-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst setup unpack
-DEPEND=virtual/libiconv dbus? ( sys-apps/dbus ) dvbcsa? ( media-libs/libdvbcsa ) dvben50221? ( media-tv/linuxtv-dvb-apps ) ffmpeg? ( media-video/ffmpeg:0/55.57.57[opus?,vpx?,x264?,x265?] ) hdhomerun? ( media-libs/libhdhomerun ) !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) uriparser? ( dev-libs/uriparser ) zeroconf? ( net-dns/avahi ) zlib? ( sys-libs/zlib ) sys-devel/gettext virtual/pkgconfig dvb? ( virtual/linuxtv-dvb-headers ) ffmpeg? ( opus? ( media-libs/opus ) vpx? ( media-libs/libvpx ) x264? ( media-libs/x264 ) x265? ( media-libs/x265 ) ) >=dev-vcs/git-1.8.2.1 virtual/pkgconfig
+DEPEND=virtual/libiconv dbus? ( sys-apps/dbus ) dvbcsa? ( media-libs/libdvbcsa ) ffmpeg? ( media-video/ffmpeg:0/55.57.57[opus?,vpx?,x264?,x265?] ) hdhomerun? ( media-libs/libhdhomerun ) !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) uriparser? ( dev-libs/uriparser ) zeroconf? ( net-dns/avahi ) zlib? ( sys-libs/zlib ) sys-devel/gettext virtual/pkgconfig dvb? ( virtual/linuxtv-dvb-headers ) ffmpeg? ( opus? ( media-libs/opus ) vpx? ( media-libs/libvpx ) x264? ( media-libs/x264 ) x265? ( media-libs/x265 ) ) >=dev-vcs/git-1.8.2.1 virtual/pkgconfig
 DESCRIPTION=Tvheadend is a TV streaming server and digital video recorder
 EAPI=6
 HOMEPAGE=https://tvheadend.org/
-IUSE=+capmt +constcw +cwc dbus debug dvbcsa dvben50221 +dvb +ffmpeg hdhomerun +imagecache +inotify iptv libressl opus satip systemd +timeshift uriparser vpx x264 x265 xmltv zeroconf zlib
+IUSE=+capmt +constcw +cwc dbus debug +ddci dvbcsa +dvb +ffmpeg hdhomerun +imagecache +inotify iptv libressl opus satip systemd +timeshift uriparser vpx x264 x265 xmltv zeroconf zlib
 LICENSE=GPL-3
-RDEPEND=virtual/libiconv dbus? ( sys-apps/dbus ) dvbcsa? ( media-libs/libdvbcsa ) dvben50221? ( media-tv/linuxtv-dvb-apps ) ffmpeg? ( media-video/ffmpeg:0/55.57.57[opus?,vpx?,x264?,x265?] ) hdhomerun? ( media-libs/libhdhomerun ) !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) uriparser? ( dev-libs/uriparser ) zeroconf? ( net-dns/avahi ) zlib? ( sys-libs/zlib ) dvb? ( media-tv/dtv-scan-tables ) xmltv? ( media-tv/xmltv )
-REQUIRED_USE=dvbcsa? ( || ( capmt constcw cwc dvben50221 ) )
+RDEPEND=virtual/libiconv dbus? ( sys-apps/dbus ) dvbcsa? ( media-libs/libdvbcsa ) ffmpeg? ( media-video/ffmpeg:0/55.57.57[opus?,vpx?,x264?,x265?] ) hdhomerun? ( media-libs/libhdhomerun ) !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) uriparser? ( dev-libs/uriparser ) zeroconf? ( net-dns/avahi ) zlib? ( sys-libs/zlib ) dvb? ( media-tv/dtv-scan-tables ) xmltv? ( media-tv/xmltv )
+REQUIRED_USE=dvbcsa? ( || ( capmt constcw cwc ) ) ddci? ( dvb )
 SLOT=0
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=5f6e63d46dccd3927f6c058862a9b474
+_md5_=88a30c1227af309240af544a8d749a8f
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 52b5976457c1..0008a707b595 100644
--- a/metadata/md5-cache/media-video/Manifest.gz
+++ b/metadata/md5-cache/media-video/Manifest.gz
diff --git a/metadata/md5-cache/media-video/vlc-2.2.8 b/metadata/md5-cache/media-video/vlc-2.2.8
index 6b4405fb8dfb..e617d2aa0cf0 100644
--- a/metadata/md5-cache/media-video/vlc-2.2.8
+++ b/metadata/md5-cache/media-video/vlc-2.2.8
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install postinst postrm prepare test
-DEPEND=dev-libs/libgpg-error:0 net-dns/libidn:0 sys-libs/zlib:0[minizip] virtual/libintl:0 a52? ( >=media-libs/a52dec-0.7.4-r3:0 ) aalib? ( media-libs/aalib:0 ) alsa? ( >=media-libs/alsa-lib-1.0.24:0 ) avcodec? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) avformat? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) bidi? ( dev-libs/fribidi:0 ) bluray? ( >=media-libs/libbluray-0.3:0= ) cddb? ( >=media-libs/libcddb-1.2:0 ) chromaprint? ( >=media-libs/chromaprint-0.6:0 ) dbus? ( >=sys-apps/dbus-1.6:0 ) dc1394? ( >=sys-libs/libraw1394-2.0.1:0 >=media-libs/libdc1394-2.1:2 ) directfb? ( dev-libs/DirectFB:0 ) dts? ( >=media-libs/libdca-0.0.5:0 ) dvbpsi? ( >=media-libs/libdvbpsi-1.0.0:0= ) dvd? ( >=media-libs/libdvdread-4.9:0 >=media-libs/libdvdnav-4.9:0 ) elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 ) faad? ( >=media-libs/faad2-2.6.1:0 ) fdk? ( media-libs/fdk-aac:0 ) flac? ( >=media-libs/libogg-1:0 >=media-libs/flac-1.1.2:0 ) fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0:0= ) gme? ( media-libs/game-music-emu:0 ) gnome? ( gnome-base/gnome-vfs:2 dev-libs/glib:2 ) gnutls? ( >=net-libs/gnutls-3.0.20:0 ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1:0 >=sys-libs/libavc1394-0.5.3:0 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( >=media-libs/libkate-0.3:0 ) libass? ( >=media-libs/libass-0.9.8:0= media-libs/fontconfig:1.0 ) libcaca? ( >=media-libs/libcaca-0.99_beta14:0 ) libnotify? ( x11-libs/libnotify:0 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 dev-libs/glib:2 ) libsamplerate? ( media-libs/libsamplerate:0 ) libtar? ( >=dev-libs/libtar-1.2.11-r3:0 ) libtiger? ( >=media-libs/libtiger-0.3.1:0 ) linsys? ( >=media-libs/zvbi-0.2.28:0 ) lirc? ( app-misc/lirc:0 ) live? ( >=media-plugins/live-2011.12.23:0 ) lua? ( >=dev-lang/lua-5.1:0 ) matroska? ( >=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= ) modplug? ( >=media-libs/libmodplug-0.8.4:0 !~media-libs/libmodplug-0.8.8 ) mp3? ( media-libs/libmad:0 ) mpeg? ( >=media-libs/libmpeg2-0.3.2:0 ) mtp? ( >=media-libs/libmtp-1:0 ) musepack? ( >=media-sound/musepack-tools-444:0 ) ncurses? ( sys-libs/ncurses:0=[unicode] ) ogg? ( >=media-libs/libogg-1:0 ) opencv? ( >media-libs/opencv-2:0= ) opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 ) opus? ( >=media-libs/opus-1.0.3:0 ) png? ( media-libs/libpng:0= ) postproc? ( !libav? ( >=media-video/ffmpeg-2.2:0= ) libav? ( media-libs/libpostproc:0= ) ) projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 ) pulseaudio? ( >=media-sound/pulseaudio-1:0 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ) rdp? ( =net-misc/freerdp-1*:0=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) schroedinger? ( >=media-libs/schroedinger-1.0.10:0 ) sdl? ( >=media-libs/libsdl-1.2.10:0 sdl-image? ( >=media-libs/sdl-image-1.2.10:0 ) ) sftp? ( net-libs/libssh2:0 ) shout? ( >=media-libs/libshout-2.1:0 ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext:0 x11-libs/libXpm:0 x11-libs/libXinerama:0 ) speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 ) svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 ) swscale? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) taglib? ( >=media-libs/taglib-1.9:0 ) theora? ( >=media-libs/libtheora-1.0_beta3:0 ) tremor? ( media-libs/tremor:0 ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0 !fontconfig? ( media-fonts/dejavu:0 ) ) twolame? ( media-sound/twolame:0 ) udev? ( >=virtual/udev-142:0 ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:0 ) vaapi? ( x11-libs/libva:0[X,drm] !libav? ( media-video/ffmpeg:0=[vaapi] ) libav? ( media-video/libav:0=[vaapi] ) ) vcdx? ( >=dev-libs/libcdio-0.78.2:0 >=media-video/vcdimager-0.7.22:0 ) vdpau? ( x11-libs/libvdpau:0 !libav? ( media-video/ffmpeg:0= ) libav? ( >=media-video/libav-10:0= ) ) vnc? ( >=net-libs/libvncserver-0.9.9:0 ) vorbis? ( media-libs/libvorbis:0 ) vpx? ( media-libs/libvpx:0= ) X? ( x11-libs/libX11:0 ) x264? ( media-libs/x264:0= ) x265? ( media-libs/x265:0= ) xcb? ( x11-libs/libxcb:0 x11-libs/xcb-util:0 x11-libs/xcb-util-keysyms:0 ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( >=net-dns/avahi-0.6:0[dbus] ) zvbi? ( media-libs/zvbi:0 ) app-arch/xz-utils:0 >=sys-devel/gettext-0.18.3:* virtual/pkgconfig:* amd64? ( dev-lang/yasm:* ) x86? ( dev-lang/yasm:* ) xcb? ( x11-proto/xproto:0 ) >=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 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=dev-libs/libgpg-error:0 net-dns/libidn:0 sys-libs/zlib:0[minizip] virtual/libintl:0 a52? ( >=media-libs/a52dec-0.7.4-r3:0 ) aalib? ( media-libs/aalib:0 ) alsa? ( >=media-libs/alsa-lib-1.0.24:0 ) avcodec? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) avformat? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) bidi? ( dev-libs/fribidi:0 ) bluray? ( >=media-libs/libbluray-0.3:0= ) cddb? ( >=media-libs/libcddb-1.2:0 ) chromaprint? ( >=media-libs/chromaprint-0.6:0 ) dbus? ( >=sys-apps/dbus-1.6:0 ) dc1394? ( >=sys-libs/libraw1394-2.0.1:0 >=media-libs/libdc1394-2.1:2 ) directfb? ( dev-libs/DirectFB:0 ) dts? ( >=media-libs/libdca-0.0.5:0 ) dvbpsi? ( >=media-libs/libdvbpsi-1.0.0:0= ) dvd? ( >=media-libs/libdvdread-4.9:0 >=media-libs/libdvdnav-4.9:0 ) elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 ) faad? ( >=media-libs/faad2-2.6.1:0 ) fdk? ( media-libs/fdk-aac:0 ) flac? ( >=media-libs/libogg-1:0 >=media-libs/flac-1.1.2:0 ) fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0:0= ) gme? ( media-libs/game-music-emu:0 ) gnome? ( gnome-base/gnome-vfs:2 dev-libs/glib:2 ) gnutls? ( >=net-libs/gnutls-3.0.20:0 ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1:0 >=sys-libs/libavc1394-0.5.3:0 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( >=media-libs/libkate-0.3:0 ) libass? ( >=media-libs/libass-0.9.8:0= media-libs/fontconfig:1.0 ) libcaca? ( >=media-libs/libcaca-0.99_beta14:0 ) libnotify? ( x11-libs/libnotify:0 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 dev-libs/glib:2 ) libsamplerate? ( media-libs/libsamplerate:0 ) libtar? ( >=dev-libs/libtar-1.2.11-r3:0 ) libtiger? ( >=media-libs/libtiger-0.3.1:0 ) linsys? ( >=media-libs/zvbi-0.2.28:0 ) lirc? ( app-misc/lirc:0 ) live? ( >=media-plugins/live-2011.12.23:0 ) lua? ( >=dev-lang/lua-5.1:0 ) matroska? ( >=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= ) modplug? ( >=media-libs/libmodplug-0.8.4:0 !~media-libs/libmodplug-0.8.8 ) mp3? ( media-libs/libmad:0 ) mpeg? ( >=media-libs/libmpeg2-0.3.2:0 ) mtp? ( >=media-libs/libmtp-1:0 ) musepack? ( >=media-sound/musepack-tools-444:0 ) ncurses? ( sys-libs/ncurses:0=[unicode] ) ogg? ( >=media-libs/libogg-1:0 ) opencv? ( >media-libs/opencv-2:0= ) opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 ) opus? ( >=media-libs/opus-1.0.3:0 ) png? ( media-libs/libpng:0= ) postproc? ( !libav? ( >=media-video/ffmpeg-2.2:0= ) libav? ( media-libs/libpostproc:0= ) ) projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 ) pulseaudio? ( >=media-sound/pulseaudio-1:0 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ) rdp? ( =net-misc/freerdp-1*:0=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) schroedinger? ( >=media-libs/schroedinger-1.0.10:0 ) sdl? ( >=media-libs/libsdl-1.2.10:0 sdl-image? ( >=media-libs/sdl-image-1.2.10:0 ) ) sftp? ( net-libs/libssh2:0 ) shout? ( >=media-libs/libshout-2.1:0 ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext:0 x11-libs/libXpm:0 x11-libs/libXinerama:0 ) speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 ) svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 ) swscale? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) taglib? ( >=media-libs/taglib-1.9:0 ) theora? ( >=media-libs/libtheora-1.0_beta3:0 ) tremor? ( media-libs/tremor:0 ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0 !fontconfig? ( media-fonts/dejavu:0 ) ) twolame? ( media-sound/twolame:0 ) udev? ( >=virtual/udev-142:0 ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:0 ) vaapi? ( x11-libs/libva:0=[X,drm] !libav? ( media-video/ffmpeg:0=[vaapi] ) libav? ( media-video/libav:0=[vaapi] ) ) vcdx? ( >=dev-libs/libcdio-0.78.2:0 >=media-video/vcdimager-0.7.22:0 ) vdpau? ( x11-libs/libvdpau:0 !libav? ( media-video/ffmpeg:0= ) libav? ( >=media-video/libav-10:0= ) ) vnc? ( >=net-libs/libvncserver-0.9.9:0 ) vorbis? ( media-libs/libvorbis:0 ) vpx? ( media-libs/libvpx:0= ) X? ( x11-libs/libX11:0 ) x264? ( media-libs/x264:0= ) x265? ( media-libs/x265:0= ) xcb? ( x11-libs/libxcb:0 x11-libs/xcb-util:0 x11-libs/xcb-util-keysyms:0 ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( >=net-dns/avahi-0.6:0[dbus] ) zvbi? ( media-libs/zvbi:0 ) app-arch/xz-utils:0 >=sys-devel/gettext-0.18.3:* virtual/pkgconfig:* amd64? ( dev-lang/yasm:* ) x86? ( dev-lang/yasm:* ) xcb? ( x11-proto/xproto:0 ) >=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 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=VLC media player - Video player and streamer
 EAPI=6
 HOMEPAGE=https://www.videolan.org/vlc/
 IUSE=a52 aalib alsa altivec atmo +audioqueue +avcodec +avformat bidi bluray cdda cddb chromaprint dbus dc1394 debug directfb directx dts dvb +dvbpsi dvd dxva2 elibc_glibc +encode faad fdk fluidsynth +ffmpeg flac fontconfig +gcrypt gme gnome gnutls growl gstreamer httpd ieee1394 jack jpeg kate libass libav libcaca libnotify +libsamplerate libtiger linsys libtar lirc live lua macosx-dialog-provider macosx-eyetv macosx-quartztext macosx-qtkit matroska cpu_flags_x86_mmx modplug mp3 mpeg mtp musepack ncurses neon ogg omxil opencv opengl optimisememory opus png postproc projectm pulseaudio +qt5 rdp rtsp run-as-root samba schroedinger sdl sdl-image sftp shout sid skins speex cpu_flags_x86_sse svg +swscale taglib theora tremor truetype twolame udev upnp vaapi v4l vcdx vdpau vlm vnc vorbis vpx wma-fixed +X x264 x265 +xcb xml xv zeroconf zvbi test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd
 LICENSE=LGPL-2.1 GPL-2
-RDEPEND=dev-libs/libgpg-error:0 net-dns/libidn:0 sys-libs/zlib:0[minizip] virtual/libintl:0 a52? ( >=media-libs/a52dec-0.7.4-r3:0 ) aalib? ( media-libs/aalib:0 ) alsa? ( >=media-libs/alsa-lib-1.0.24:0 ) avcodec? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) avformat? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) bidi? ( dev-libs/fribidi:0 ) bluray? ( >=media-libs/libbluray-0.3:0= ) cddb? ( >=media-libs/libcddb-1.2:0 ) chromaprint? ( >=media-libs/chromaprint-0.6:0 ) dbus? ( >=sys-apps/dbus-1.6:0 ) dc1394? ( >=sys-libs/libraw1394-2.0.1:0 >=media-libs/libdc1394-2.1:2 ) directfb? ( dev-libs/DirectFB:0 ) dts? ( >=media-libs/libdca-0.0.5:0 ) dvbpsi? ( >=media-libs/libdvbpsi-1.0.0:0= ) dvd? ( >=media-libs/libdvdread-4.9:0 >=media-libs/libdvdnav-4.9:0 ) elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 ) faad? ( >=media-libs/faad2-2.6.1:0 ) fdk? ( media-libs/fdk-aac:0 ) flac? ( >=media-libs/libogg-1:0 >=media-libs/flac-1.1.2:0 ) fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0:0= ) gme? ( media-libs/game-music-emu:0 ) gnome? ( gnome-base/gnome-vfs:2 dev-libs/glib:2 ) gnutls? ( >=net-libs/gnutls-3.0.20:0 ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1:0 >=sys-libs/libavc1394-0.5.3:0 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( >=media-libs/libkate-0.3:0 ) libass? ( >=media-libs/libass-0.9.8:0= media-libs/fontconfig:1.0 ) libcaca? ( >=media-libs/libcaca-0.99_beta14:0 ) libnotify? ( x11-libs/libnotify:0 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 dev-libs/glib:2 ) libsamplerate? ( media-libs/libsamplerate:0 ) libtar? ( >=dev-libs/libtar-1.2.11-r3:0 ) libtiger? ( >=media-libs/libtiger-0.3.1:0 ) linsys? ( >=media-libs/zvbi-0.2.28:0 ) lirc? ( app-misc/lirc:0 ) live? ( >=media-plugins/live-2011.12.23:0 ) lua? ( >=dev-lang/lua-5.1:0 ) matroska? ( >=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= ) modplug? ( >=media-libs/libmodplug-0.8.4:0 !~media-libs/libmodplug-0.8.8 ) mp3? ( media-libs/libmad:0 ) mpeg? ( >=media-libs/libmpeg2-0.3.2:0 ) mtp? ( >=media-libs/libmtp-1:0 ) musepack? ( >=media-sound/musepack-tools-444:0 ) ncurses? ( sys-libs/ncurses:0=[unicode] ) ogg? ( >=media-libs/libogg-1:0 ) opencv? ( >media-libs/opencv-2:0= ) opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 ) opus? ( >=media-libs/opus-1.0.3:0 ) png? ( media-libs/libpng:0= ) postproc? ( !libav? ( >=media-video/ffmpeg-2.2:0= ) libav? ( media-libs/libpostproc:0= ) ) projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 ) pulseaudio? ( >=media-sound/pulseaudio-1:0 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ) rdp? ( =net-misc/freerdp-1*:0=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) schroedinger? ( >=media-libs/schroedinger-1.0.10:0 ) sdl? ( >=media-libs/libsdl-1.2.10:0 sdl-image? ( >=media-libs/sdl-image-1.2.10:0 ) ) sftp? ( net-libs/libssh2:0 ) shout? ( >=media-libs/libshout-2.1:0 ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext:0 x11-libs/libXpm:0 x11-libs/libXinerama:0 ) speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 ) svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 ) swscale? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) taglib? ( >=media-libs/taglib-1.9:0 ) theora? ( >=media-libs/libtheora-1.0_beta3:0 ) tremor? ( media-libs/tremor:0 ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0 !fontconfig? ( media-fonts/dejavu:0 ) ) twolame? ( media-sound/twolame:0 ) udev? ( >=virtual/udev-142:0 ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:0 ) vaapi? ( x11-libs/libva:0[X,drm] !libav? ( media-video/ffmpeg:0=[vaapi] ) libav? ( media-video/libav:0=[vaapi] ) ) vcdx? ( >=dev-libs/libcdio-0.78.2:0 >=media-video/vcdimager-0.7.22:0 ) vdpau? ( x11-libs/libvdpau:0 !libav? ( media-video/ffmpeg:0= ) libav? ( >=media-video/libav-10:0= ) ) vnc? ( >=net-libs/libvncserver-0.9.9:0 ) vorbis? ( media-libs/libvorbis:0 ) vpx? ( media-libs/libvpx:0= ) X? ( x11-libs/libX11:0 ) x264? ( media-libs/x264:0= ) x265? ( media-libs/x265:0= ) xcb? ( x11-libs/libxcb:0 x11-libs/xcb-util:0 x11-libs/xcb-util-keysyms:0 ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( >=net-dns/avahi-0.6:0[dbus] ) zvbi? ( media-libs/zvbi:0 )
+RDEPEND=dev-libs/libgpg-error:0 net-dns/libidn:0 sys-libs/zlib:0[minizip] virtual/libintl:0 a52? ( >=media-libs/a52dec-0.7.4-r3:0 ) aalib? ( media-libs/aalib:0 ) alsa? ( >=media-libs/alsa-lib-1.0.24:0 ) avcodec? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) avformat? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) bidi? ( dev-libs/fribidi:0 ) bluray? ( >=media-libs/libbluray-0.3:0= ) cddb? ( >=media-libs/libcddb-1.2:0 ) chromaprint? ( >=media-libs/chromaprint-0.6:0 ) dbus? ( >=sys-apps/dbus-1.6:0 ) dc1394? ( >=sys-libs/libraw1394-2.0.1:0 >=media-libs/libdc1394-2.1:2 ) directfb? ( dev-libs/DirectFB:0 ) dts? ( >=media-libs/libdca-0.0.5:0 ) dvbpsi? ( >=media-libs/libdvbpsi-1.0.0:0= ) dvd? ( >=media-libs/libdvdread-4.9:0 >=media-libs/libdvdnav-4.9:0 ) elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 ) faad? ( >=media-libs/faad2-2.6.1:0 ) fdk? ( media-libs/fdk-aac:0 ) flac? ( >=media-libs/libogg-1:0 >=media-libs/flac-1.1.2:0 ) fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0:0= ) gme? ( media-libs/game-music-emu:0 ) gnome? ( gnome-base/gnome-vfs:2 dev-libs/glib:2 ) gnutls? ( >=net-libs/gnutls-3.0.20:0 ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1:0 >=sys-libs/libavc1394-0.5.3:0 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( >=media-libs/libkate-0.3:0 ) libass? ( >=media-libs/libass-0.9.8:0= media-libs/fontconfig:1.0 ) libcaca? ( >=media-libs/libcaca-0.99_beta14:0 ) libnotify? ( x11-libs/libnotify:0 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 dev-libs/glib:2 ) libsamplerate? ( media-libs/libsamplerate:0 ) libtar? ( >=dev-libs/libtar-1.2.11-r3:0 ) libtiger? ( >=media-libs/libtiger-0.3.1:0 ) linsys? ( >=media-libs/zvbi-0.2.28:0 ) lirc? ( app-misc/lirc:0 ) live? ( >=media-plugins/live-2011.12.23:0 ) lua? ( >=dev-lang/lua-5.1:0 ) matroska? ( >=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= ) modplug? ( >=media-libs/libmodplug-0.8.4:0 !~media-libs/libmodplug-0.8.8 ) mp3? ( media-libs/libmad:0 ) mpeg? ( >=media-libs/libmpeg2-0.3.2:0 ) mtp? ( >=media-libs/libmtp-1:0 ) musepack? ( >=media-sound/musepack-tools-444:0 ) ncurses? ( sys-libs/ncurses:0=[unicode] ) ogg? ( >=media-libs/libogg-1:0 ) opencv? ( >media-libs/opencv-2:0= ) opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 ) opus? ( >=media-libs/opus-1.0.3:0 ) png? ( media-libs/libpng:0= ) postproc? ( !libav? ( >=media-video/ffmpeg-2.2:0= ) libav? ( media-libs/libpostproc:0= ) ) projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 ) pulseaudio? ( >=media-sound/pulseaudio-1:0 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ) rdp? ( =net-misc/freerdp-1*:0=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) schroedinger? ( >=media-libs/schroedinger-1.0.10:0 ) sdl? ( >=media-libs/libsdl-1.2.10:0 sdl-image? ( >=media-libs/sdl-image-1.2.10:0 ) ) sftp? ( net-libs/libssh2:0 ) shout? ( >=media-libs/libshout-2.1:0 ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext:0 x11-libs/libXpm:0 x11-libs/libXinerama:0 ) speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 ) svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 ) swscale? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) taglib? ( >=media-libs/taglib-1.9:0 ) theora? ( >=media-libs/libtheora-1.0_beta3:0 ) tremor? ( media-libs/tremor:0 ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0 !fontconfig? ( media-fonts/dejavu:0 ) ) twolame? ( media-sound/twolame:0 ) udev? ( >=virtual/udev-142:0 ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:0 ) vaapi? ( x11-libs/libva:0=[X,drm] !libav? ( media-video/ffmpeg:0=[vaapi] ) libav? ( media-video/libav:0=[vaapi] ) ) vcdx? ( >=dev-libs/libcdio-0.78.2:0 >=media-video/vcdimager-0.7.22:0 ) vdpau? ( x11-libs/libvdpau:0 !libav? ( media-video/ffmpeg:0= ) libav? ( >=media-video/libav-10:0= ) ) vnc? ( >=net-libs/libvncserver-0.9.9:0 ) vorbis? ( media-libs/libvorbis:0 ) vpx? ( media-libs/libvpx:0= ) X? ( x11-libs/libX11:0 ) x264? ( media-libs/x264:0= ) x265? ( media-libs/x265:0= ) xcb? ( x11-libs/libxcb:0 x11-libs/xcb-util:0 x11-libs/xcb-util-keysyms:0 ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( >=net-dns/avahi-0.6:0[dbus] ) zvbi? ( media-libs/zvbi:0 )
 REQUIRED_USE=aalib? ( X ) bidi? ( truetype ) cddb? ( cdda ) dvb? ( dvbpsi ) dxva2? ( avcodec ) ffmpeg? ( avcodec avformat swscale ) fontconfig? ( truetype ) gnutls? ( gcrypt ) httpd? ( lua ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) qt5? ( X ) sdl? ( X ) skins? ( qt5 truetype X xml ) vaapi? ( avcodec X ) vdpau? ( X ) vlm? ( encode ) xv? ( xcb )
 SLOT=0/5-8
 SRC_URI=https://download.videolan.org/pub/videolan/vlc/2.2.8/vlc-2.2.8.tar.xz
 _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	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ff6caa6f7d98959fad30dfd838d76e78
+_md5_=b669331e21f8923b6fee5b20e140586c
diff --git a/metadata/md5-cache/media-video/vlc-2.2.9999 b/metadata/md5-cache/media-video/vlc-2.2.9999
index 1ddbc46c15cf..616c8d747bff 100644
--- a/metadata/md5-cache/media-video/vlc-2.2.9999
+++ b/metadata/md5-cache/media-video/vlc-2.2.9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install postinst postrm prepare test unpack
-DEPEND=dev-libs/libgpg-error:0 net-dns/libidn:0 sys-libs/zlib:0[minizip] virtual/libintl:0 a52? ( >=media-libs/a52dec-0.7.4-r3:0 ) aalib? ( media-libs/aalib:0 ) alsa? ( >=media-libs/alsa-lib-1.0.24:0 ) avcodec? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) avformat? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) bidi? ( dev-libs/fribidi:0 ) bluray? ( >=media-libs/libbluray-0.3:0= ) cddb? ( >=media-libs/libcddb-1.2:0 ) chromaprint? ( >=media-libs/chromaprint-0.6:0 ) dbus? ( >=sys-apps/dbus-1.6:0 ) dc1394? ( >=sys-libs/libraw1394-2.0.1:0 >=media-libs/libdc1394-2.1:2 ) directfb? ( dev-libs/DirectFB:0 ) dts? ( >=media-libs/libdca-0.0.5:0 ) dvbpsi? ( >=media-libs/libdvbpsi-1.0.0:0= ) dvd? ( >=media-libs/libdvdread-4.9:0 >=media-libs/libdvdnav-4.9:0 ) elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 ) faad? ( >=media-libs/faad2-2.6.1:0 ) fdk? ( media-libs/fdk-aac:0 ) flac? ( >=media-libs/libogg-1:0 >=media-libs/flac-1.1.2:0 ) fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0:0= ) gme? ( media-libs/game-music-emu:0 ) gnome? ( gnome-base/gnome-vfs:2 dev-libs/glib:2 ) gnutls? ( >=net-libs/gnutls-3.0.20:0 ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1:0 >=sys-libs/libavc1394-0.5.3:0 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( >=media-libs/libkate-0.3:0 ) libass? ( >=media-libs/libass-0.9.8:0= media-libs/fontconfig:1.0 ) libcaca? ( >=media-libs/libcaca-0.99_beta14:0 ) libnotify? ( x11-libs/libnotify:0 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 dev-libs/glib:2 ) libsamplerate? ( media-libs/libsamplerate:0 ) libtar? ( >=dev-libs/libtar-1.2.11-r3:0 ) libtiger? ( >=media-libs/libtiger-0.3.1:0 ) linsys? ( >=media-libs/zvbi-0.2.28:0 ) lirc? ( app-misc/lirc:0 ) live? ( >=media-plugins/live-2011.12.23:0 ) lua? ( >=dev-lang/lua-5.1:0 ) matroska? ( >=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= ) modplug? ( >=media-libs/libmodplug-0.8.4:0 !~media-libs/libmodplug-0.8.8 ) mp3? ( media-libs/libmad:0 ) mpeg? ( >=media-libs/libmpeg2-0.3.2:0 ) mtp? ( >=media-libs/libmtp-1:0 ) musepack? ( >=media-sound/musepack-tools-444:0 ) ncurses? ( sys-libs/ncurses:0=[unicode] ) ogg? ( >=media-libs/libogg-1:0 ) opencv? ( >media-libs/opencv-2:0= ) opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 ) opus? ( >=media-libs/opus-1.0.3:0 ) png? ( media-libs/libpng:0= ) postproc? ( !libav? ( >=media-video/ffmpeg-2.2:0= ) libav? ( media-libs/libpostproc:0= ) ) projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 ) pulseaudio? ( >=media-sound/pulseaudio-1:0 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ) rdp? ( =net-misc/freerdp-1*:0=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) schroedinger? ( >=media-libs/schroedinger-1.0.10:0 ) sdl? ( >=media-libs/libsdl-1.2.10:0 sdl-image? ( >=media-libs/sdl-image-1.2.10:0 ) ) sftp? ( net-libs/libssh2:0 ) shout? ( >=media-libs/libshout-2.1:0 ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext:0 x11-libs/libXpm:0 x11-libs/libXinerama:0 ) speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 ) svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 ) swscale? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) taglib? ( >=media-libs/taglib-1.9:0 ) theora? ( >=media-libs/libtheora-1.0_beta3:0 ) tremor? ( media-libs/tremor:0 ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0 !fontconfig? ( media-fonts/dejavu:0 ) ) twolame? ( media-sound/twolame:0 ) udev? ( >=virtual/udev-142:0 ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:0 ) vaapi? ( x11-libs/libva:0[X,drm] !libav? ( media-video/ffmpeg:0=[vaapi] ) libav? ( media-video/libav:0=[vaapi] ) ) vcdx? ( >=dev-libs/libcdio-0.78.2:0 >=media-video/vcdimager-0.7.22:0 ) vdpau? ( x11-libs/libvdpau:0 !libav? ( media-video/ffmpeg:0= ) libav? ( >=media-video/libav-10:0= ) ) vnc? ( >=net-libs/libvncserver-0.9.9:0 ) vorbis? ( media-libs/libvorbis:0 ) vpx? ( media-libs/libvpx:0= ) X? ( x11-libs/libX11:0 ) x264? ( media-libs/x264:0= ) x265? ( media-libs/x265:0= ) xcb? ( x11-libs/libxcb:0 x11-libs/xcb-util:0 x11-libs/xcb-util-keysyms:0 ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( >=net-dns/avahi-0.6:0[dbus] ) zvbi? ( media-libs/zvbi:0 ) app-arch/xz-utils:0 >=sys-devel/gettext-0.18.3:* virtual/pkgconfig:* amd64? ( dev-lang/yasm:* ) x86? ( dev-lang/yasm:* ) xcb? ( x11-proto/xproto:0 ) >=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 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=dev-vcs/git-1.8.2.1
+DEPEND=dev-libs/libgpg-error:0 net-dns/libidn:0 sys-libs/zlib:0[minizip] virtual/libintl:0 a52? ( >=media-libs/a52dec-0.7.4-r3:0 ) aalib? ( media-libs/aalib:0 ) alsa? ( >=media-libs/alsa-lib-1.0.24:0 ) avcodec? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) avformat? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) bidi? ( dev-libs/fribidi:0 ) bluray? ( >=media-libs/libbluray-0.3:0= ) cddb? ( >=media-libs/libcddb-1.2:0 ) chromaprint? ( >=media-libs/chromaprint-0.6:0 ) dbus? ( >=sys-apps/dbus-1.6:0 ) dc1394? ( >=sys-libs/libraw1394-2.0.1:0 >=media-libs/libdc1394-2.1:2 ) directfb? ( dev-libs/DirectFB:0 ) dts? ( >=media-libs/libdca-0.0.5:0 ) dvbpsi? ( >=media-libs/libdvbpsi-1.0.0:0= ) dvd? ( >=media-libs/libdvdread-4.9:0 >=media-libs/libdvdnav-4.9:0 ) elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 ) faad? ( >=media-libs/faad2-2.6.1:0 ) fdk? ( media-libs/fdk-aac:0 ) flac? ( >=media-libs/libogg-1:0 >=media-libs/flac-1.1.2:0 ) fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0:0= ) gme? ( media-libs/game-music-emu:0 ) gnome? ( gnome-base/gnome-vfs:2 dev-libs/glib:2 ) gnutls? ( >=net-libs/gnutls-3.0.20:0 ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1:0 >=sys-libs/libavc1394-0.5.3:0 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( >=media-libs/libkate-0.3:0 ) libass? ( >=media-libs/libass-0.9.8:0= media-libs/fontconfig:1.0 ) libcaca? ( >=media-libs/libcaca-0.99_beta14:0 ) libnotify? ( x11-libs/libnotify:0 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 dev-libs/glib:2 ) libsamplerate? ( media-libs/libsamplerate:0 ) libtar? ( >=dev-libs/libtar-1.2.11-r3:0 ) libtiger? ( >=media-libs/libtiger-0.3.1:0 ) linsys? ( >=media-libs/zvbi-0.2.28:0 ) lirc? ( app-misc/lirc:0 ) live? ( >=media-plugins/live-2011.12.23:0 ) lua? ( >=dev-lang/lua-5.1:0 ) matroska? ( >=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= ) modplug? ( >=media-libs/libmodplug-0.8.4:0 !~media-libs/libmodplug-0.8.8 ) mp3? ( media-libs/libmad:0 ) mpeg? ( >=media-libs/libmpeg2-0.3.2:0 ) mtp? ( >=media-libs/libmtp-1:0 ) musepack? ( >=media-sound/musepack-tools-444:0 ) ncurses? ( sys-libs/ncurses:0=[unicode] ) ogg? ( >=media-libs/libogg-1:0 ) opencv? ( >media-libs/opencv-2:0= ) opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 ) opus? ( >=media-libs/opus-1.0.3:0 ) png? ( media-libs/libpng:0= ) postproc? ( !libav? ( >=media-video/ffmpeg-2.2:0= ) libav? ( media-libs/libpostproc:0= ) ) projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 ) pulseaudio? ( >=media-sound/pulseaudio-1:0 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ) rdp? ( =net-misc/freerdp-1*:0=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) schroedinger? ( >=media-libs/schroedinger-1.0.10:0 ) sdl? ( >=media-libs/libsdl-1.2.10:0 sdl-image? ( >=media-libs/sdl-image-1.2.10:0 ) ) sftp? ( net-libs/libssh2:0 ) shout? ( >=media-libs/libshout-2.1:0 ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext:0 x11-libs/libXpm:0 x11-libs/libXinerama:0 ) speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 ) svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 ) swscale? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) taglib? ( >=media-libs/taglib-1.9:0 ) theora? ( >=media-libs/libtheora-1.0_beta3:0 ) tremor? ( media-libs/tremor:0 ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0 !fontconfig? ( media-fonts/dejavu:0 ) ) twolame? ( media-sound/twolame:0 ) udev? ( >=virtual/udev-142:0 ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:0 ) vaapi? ( x11-libs/libva:0=[X,drm] !libav? ( media-video/ffmpeg:0=[vaapi] ) libav? ( media-video/libav:0=[vaapi] ) ) vcdx? ( >=dev-libs/libcdio-0.78.2:0 >=media-video/vcdimager-0.7.22:0 ) vdpau? ( x11-libs/libvdpau:0 !libav? ( media-video/ffmpeg:0= ) libav? ( >=media-video/libav-10:0= ) ) vnc? ( >=net-libs/libvncserver-0.9.9:0 ) vorbis? ( media-libs/libvorbis:0 ) vpx? ( media-libs/libvpx:0= ) X? ( x11-libs/libX11:0 ) x264? ( media-libs/x264:0= ) x265? ( media-libs/x265:0= ) xcb? ( x11-libs/libxcb:0 x11-libs/xcb-util:0 x11-libs/xcb-util-keysyms:0 ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( >=net-dns/avahi-0.6:0[dbus] ) zvbi? ( media-libs/zvbi:0 ) app-arch/xz-utils:0 >=sys-devel/gettext-0.18.3:* virtual/pkgconfig:* amd64? ( dev-lang/yasm:* ) x86? ( dev-lang/yasm:* ) xcb? ( x11-proto/xproto:0 ) >=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 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=dev-vcs/git-1.8.2.1
 DESCRIPTION=VLC media player - Video player and streamer
 EAPI=6
 HOMEPAGE=https://www.videolan.org/vlc/
 IUSE=a52 aalib alsa altivec atmo +audioqueue +avcodec +avformat bidi bluray cdda cddb chromaprint dbus dc1394 debug directfb directx dts dvb +dvbpsi dvd dxva2 elibc_glibc +encode faad fdk fluidsynth +ffmpeg flac fontconfig +gcrypt gme gnome gnutls growl gstreamer httpd ieee1394 jack jpeg kate libass libav libcaca libnotify +libsamplerate libtiger linsys libtar lirc live lua macosx-dialog-provider macosx-eyetv macosx-quartztext macosx-qtkit matroska cpu_flags_x86_mmx modplug mp3 mpeg mtp musepack ncurses neon ogg omxil opencv opengl optimisememory opus png postproc projectm pulseaudio +qt5 rdp rtsp run-as-root samba schroedinger sdl sdl-image sftp shout sid skins speex cpu_flags_x86_sse svg +swscale taglib theora tremor truetype twolame udev upnp vaapi v4l vcdx vdpau vlm vnc vorbis vpx wma-fixed +X x264 x265 +xcb xml xv zeroconf zvbi test
 LICENSE=LGPL-2.1 GPL-2
-RDEPEND=dev-libs/libgpg-error:0 net-dns/libidn:0 sys-libs/zlib:0[minizip] virtual/libintl:0 a52? ( >=media-libs/a52dec-0.7.4-r3:0 ) aalib? ( media-libs/aalib:0 ) alsa? ( >=media-libs/alsa-lib-1.0.24:0 ) avcodec? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) avformat? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) bidi? ( dev-libs/fribidi:0 ) bluray? ( >=media-libs/libbluray-0.3:0= ) cddb? ( >=media-libs/libcddb-1.2:0 ) chromaprint? ( >=media-libs/chromaprint-0.6:0 ) dbus? ( >=sys-apps/dbus-1.6:0 ) dc1394? ( >=sys-libs/libraw1394-2.0.1:0 >=media-libs/libdc1394-2.1:2 ) directfb? ( dev-libs/DirectFB:0 ) dts? ( >=media-libs/libdca-0.0.5:0 ) dvbpsi? ( >=media-libs/libdvbpsi-1.0.0:0= ) dvd? ( >=media-libs/libdvdread-4.9:0 >=media-libs/libdvdnav-4.9:0 ) elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 ) faad? ( >=media-libs/faad2-2.6.1:0 ) fdk? ( media-libs/fdk-aac:0 ) flac? ( >=media-libs/libogg-1:0 >=media-libs/flac-1.1.2:0 ) fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0:0= ) gme? ( media-libs/game-music-emu:0 ) gnome? ( gnome-base/gnome-vfs:2 dev-libs/glib:2 ) gnutls? ( >=net-libs/gnutls-3.0.20:0 ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1:0 >=sys-libs/libavc1394-0.5.3:0 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( >=media-libs/libkate-0.3:0 ) libass? ( >=media-libs/libass-0.9.8:0= media-libs/fontconfig:1.0 ) libcaca? ( >=media-libs/libcaca-0.99_beta14:0 ) libnotify? ( x11-libs/libnotify:0 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 dev-libs/glib:2 ) libsamplerate? ( media-libs/libsamplerate:0 ) libtar? ( >=dev-libs/libtar-1.2.11-r3:0 ) libtiger? ( >=media-libs/libtiger-0.3.1:0 ) linsys? ( >=media-libs/zvbi-0.2.28:0 ) lirc? ( app-misc/lirc:0 ) live? ( >=media-plugins/live-2011.12.23:0 ) lua? ( >=dev-lang/lua-5.1:0 ) matroska? ( >=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= ) modplug? ( >=media-libs/libmodplug-0.8.4:0 !~media-libs/libmodplug-0.8.8 ) mp3? ( media-libs/libmad:0 ) mpeg? ( >=media-libs/libmpeg2-0.3.2:0 ) mtp? ( >=media-libs/libmtp-1:0 ) musepack? ( >=media-sound/musepack-tools-444:0 ) ncurses? ( sys-libs/ncurses:0=[unicode] ) ogg? ( >=media-libs/libogg-1:0 ) opencv? ( >media-libs/opencv-2:0= ) opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 ) opus? ( >=media-libs/opus-1.0.3:0 ) png? ( media-libs/libpng:0= ) postproc? ( !libav? ( >=media-video/ffmpeg-2.2:0= ) libav? ( media-libs/libpostproc:0= ) ) projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 ) pulseaudio? ( >=media-sound/pulseaudio-1:0 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ) rdp? ( =net-misc/freerdp-1*:0=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) schroedinger? ( >=media-libs/schroedinger-1.0.10:0 ) sdl? ( >=media-libs/libsdl-1.2.10:0 sdl-image? ( >=media-libs/sdl-image-1.2.10:0 ) ) sftp? ( net-libs/libssh2:0 ) shout? ( >=media-libs/libshout-2.1:0 ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext:0 x11-libs/libXpm:0 x11-libs/libXinerama:0 ) speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 ) svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 ) swscale? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) taglib? ( >=media-libs/taglib-1.9:0 ) theora? ( >=media-libs/libtheora-1.0_beta3:0 ) tremor? ( media-libs/tremor:0 ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0 !fontconfig? ( media-fonts/dejavu:0 ) ) twolame? ( media-sound/twolame:0 ) udev? ( >=virtual/udev-142:0 ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:0 ) vaapi? ( x11-libs/libva:0[X,drm] !libav? ( media-video/ffmpeg:0=[vaapi] ) libav? ( media-video/libav:0=[vaapi] ) ) vcdx? ( >=dev-libs/libcdio-0.78.2:0 >=media-video/vcdimager-0.7.22:0 ) vdpau? ( x11-libs/libvdpau:0 !libav? ( media-video/ffmpeg:0= ) libav? ( >=media-video/libav-10:0= ) ) vnc? ( >=net-libs/libvncserver-0.9.9:0 ) vorbis? ( media-libs/libvorbis:0 ) vpx? ( media-libs/libvpx:0= ) X? ( x11-libs/libX11:0 ) x264? ( media-libs/x264:0= ) x265? ( media-libs/x265:0= ) xcb? ( x11-libs/libxcb:0 x11-libs/xcb-util:0 x11-libs/xcb-util-keysyms:0 ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( >=net-dns/avahi-0.6:0[dbus] ) zvbi? ( media-libs/zvbi:0 )
+RDEPEND=dev-libs/libgpg-error:0 net-dns/libidn:0 sys-libs/zlib:0[minizip] virtual/libintl:0 a52? ( >=media-libs/a52dec-0.7.4-r3:0 ) aalib? ( media-libs/aalib:0 ) alsa? ( >=media-libs/alsa-lib-1.0.24:0 ) avcodec? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) avformat? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) bidi? ( dev-libs/fribidi:0 ) bluray? ( >=media-libs/libbluray-0.3:0= ) cddb? ( >=media-libs/libcddb-1.2:0 ) chromaprint? ( >=media-libs/chromaprint-0.6:0 ) dbus? ( >=sys-apps/dbus-1.6:0 ) dc1394? ( >=sys-libs/libraw1394-2.0.1:0 >=media-libs/libdc1394-2.1:2 ) directfb? ( dev-libs/DirectFB:0 ) dts? ( >=media-libs/libdca-0.0.5:0 ) dvbpsi? ( >=media-libs/libdvbpsi-1.0.0:0= ) dvd? ( >=media-libs/libdvdread-4.9:0 >=media-libs/libdvdnav-4.9:0 ) elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 ) faad? ( >=media-libs/faad2-2.6.1:0 ) fdk? ( media-libs/fdk-aac:0 ) flac? ( >=media-libs/libogg-1:0 >=media-libs/flac-1.1.2:0 ) fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0:0= ) gme? ( media-libs/game-music-emu:0 ) gnome? ( gnome-base/gnome-vfs:2 dev-libs/glib:2 ) gnutls? ( >=net-libs/gnutls-3.0.20:0 ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1:0 >=sys-libs/libavc1394-0.5.3:0 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( >=media-libs/libkate-0.3:0 ) libass? ( >=media-libs/libass-0.9.8:0= media-libs/fontconfig:1.0 ) libcaca? ( >=media-libs/libcaca-0.99_beta14:0 ) libnotify? ( x11-libs/libnotify:0 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 dev-libs/glib:2 ) libsamplerate? ( media-libs/libsamplerate:0 ) libtar? ( >=dev-libs/libtar-1.2.11-r3:0 ) libtiger? ( >=media-libs/libtiger-0.3.1:0 ) linsys? ( >=media-libs/zvbi-0.2.28:0 ) lirc? ( app-misc/lirc:0 ) live? ( >=media-plugins/live-2011.12.23:0 ) lua? ( >=dev-lang/lua-5.1:0 ) matroska? ( >=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= ) modplug? ( >=media-libs/libmodplug-0.8.4:0 !~media-libs/libmodplug-0.8.8 ) mp3? ( media-libs/libmad:0 ) mpeg? ( >=media-libs/libmpeg2-0.3.2:0 ) mtp? ( >=media-libs/libmtp-1:0 ) musepack? ( >=media-sound/musepack-tools-444:0 ) ncurses? ( sys-libs/ncurses:0=[unicode] ) ogg? ( >=media-libs/libogg-1:0 ) opencv? ( >media-libs/opencv-2:0= ) opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 ) opus? ( >=media-libs/opus-1.0.3:0 ) png? ( media-libs/libpng:0= ) postproc? ( !libav? ( >=media-video/ffmpeg-2.2:0= ) libav? ( media-libs/libpostproc:0= ) ) projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 ) pulseaudio? ( >=media-sound/pulseaudio-1:0 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ) rdp? ( =net-misc/freerdp-1*:0=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) schroedinger? ( >=media-libs/schroedinger-1.0.10:0 ) sdl? ( >=media-libs/libsdl-1.2.10:0 sdl-image? ( >=media-libs/sdl-image-1.2.10:0 ) ) sftp? ( net-libs/libssh2:0 ) shout? ( >=media-libs/libshout-2.1:0 ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext:0 x11-libs/libXpm:0 x11-libs/libXinerama:0 ) speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 ) svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 ) swscale? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) taglib? ( >=media-libs/taglib-1.9:0 ) theora? ( >=media-libs/libtheora-1.0_beta3:0 ) tremor? ( media-libs/tremor:0 ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0 !fontconfig? ( media-fonts/dejavu:0 ) ) twolame? ( media-sound/twolame:0 ) udev? ( >=virtual/udev-142:0 ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:0 ) vaapi? ( x11-libs/libva:0=[X,drm] !libav? ( media-video/ffmpeg:0=[vaapi] ) libav? ( media-video/libav:0=[vaapi] ) ) vcdx? ( >=dev-libs/libcdio-0.78.2:0 >=media-video/vcdimager-0.7.22:0 ) vdpau? ( x11-libs/libvdpau:0 !libav? ( media-video/ffmpeg:0= ) libav? ( >=media-video/libav-10:0= ) ) vnc? ( >=net-libs/libvncserver-0.9.9:0 ) vorbis? ( media-libs/libvorbis:0 ) vpx? ( media-libs/libvpx:0= ) X? ( x11-libs/libX11:0 ) x264? ( media-libs/x264:0= ) x265? ( media-libs/x265:0= ) xcb? ( x11-libs/libxcb:0 x11-libs/xcb-util:0 x11-libs/xcb-util-keysyms:0 ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( >=net-dns/avahi-0.6:0[dbus] ) zvbi? ( media-libs/zvbi:0 )
 REQUIRED_USE=aalib? ( X ) bidi? ( truetype ) cddb? ( cdda ) dvb? ( dvbpsi ) dxva2? ( avcodec ) ffmpeg? ( avcodec avformat swscale ) fontconfig? ( truetype ) gnutls? ( gcrypt ) httpd? ( lua ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) qt5? ( X ) sdl? ( X ) skins? ( qt5 truetype X xml ) vaapi? ( avcodec X ) vdpau? ( X ) vlm? ( encode ) xv? ( xcb )
 SLOT=0/5-8
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8daf025e70a7bcb2a79543fa47708bbd
+_md5_=d7335a149579b817be01a1560d094096
diff --git a/metadata/md5-cache/media-video/vlc-3.0.9999 b/metadata/md5-cache/media-video/vlc-3.0.9999
index 830dd5e3e080..3ee0d0e24280 100644
--- a/metadata/md5-cache/media-video/vlc-3.0.9999
+++ b/metadata/md5-cache/media-video/vlc-3.0.9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install postinst postrm prepare test unpack
-DEPEND=dev-libs/libgpg-error:0 net-dns/libidn:0 sys-libs/zlib:0[minizip] virtual/libintl:0 a52? ( >=media-libs/a52dec-0.7.4-r3:0 ) aalib? ( media-libs/aalib:0 ) alsa? ( >=media-libs/alsa-lib-1.0.24:0 ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) avcodec? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) avformat? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) bidi? ( dev-libs/fribidi:0 ) bluray? ( >=media-libs/libbluray-0.6.2:0= ) cddb? ( >=media-libs/libcddb-1.2:0 ) chromaprint? ( >=media-libs/chromaprint-0.6:0 ) chromecast? ( >=dev-libs/protobuf-2.5.0 ) dbus? ( >=sys-apps/dbus-1.6:0 ) dc1394? ( >=media-libs/libdc1394-2.1:2 >=sys-libs/libraw1394-2.0.1:0 ) dts? ( >=media-libs/libdca-0.0.5:0 ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:0= ) dvd? ( >=media-libs/libdvdnav-4.9:0 >=media-libs/libdvdread-4.9:0 ) elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 ) faad? ( >=media-libs/faad2-2.6.1:0 ) fdk? ( media-libs/fdk-aac:0 ) flac? ( >=media-libs/flac-1.1.2:0 >=media-libs/libogg-1:0 ) fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.6.0:0= ) gme? ( media-libs/game-music-emu:0 ) gnutls? ( net-libs/gnutls:0 ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( >=sys-libs/libavc1394-0.5.3:0 >=sys-libs/libraw1394-2.0.1:0 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( >=media-libs/libkate-0.3:0 ) libass? ( media-libs/fontconfig:1.0 >=media-libs/libass-0.9.8:0= ) libcaca? ( >=media-libs/libcaca-0.99_beta14:0 ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libnotify:0 ) libsamplerate? ( media-libs/libsamplerate:0 ) libtar? ( >=dev-libs/libtar-1.2.11-r3:0 ) libtiger? ( >=media-libs/libtiger-0.3.1:0 ) linsys? ( >=media-libs/zvbi-0.2.28:0 ) lirc? ( app-misc/lirc:0 ) live? ( >=media-plugins/live-2011.12.23:0 ) lua? ( >=dev-lang/lua-5.1:0 ) matroska? ( >=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= ) modplug? ( media-libs/libmodplug:0 ) mp3? ( media-libs/libmad:0 ) mpeg? ( >=media-libs/libmpeg2-0.3.2:0 ) mtp? ( >=media-libs/libmtp-1:0 ) musepack? ( >=media-sound/musepack-tools-444:0 ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( >=media-libs/libogg-1:0 ) opencv? ( >media-libs/opencv-2:0= ) opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 ) opus? ( >=media-libs/opus-1.0.3:0 ) png? ( media-libs/libpng:0= ) postproc? ( !libav? ( >=media-video/ffmpeg-3.1.3:0= ) libav? ( media-libs/libpostproc:0= ) ) projectm? ( media-fonts/dejavu:0 media-libs/libprojectm:0 ) pulseaudio? ( >=media-sound/pulseaudio-1:0 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 ) ) rdp? ( =net-misc/freerdp-1*:0=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) schroedinger? ( >=media-libs/schroedinger-1.0.10:0 ) sdl-image? ( >=media-libs/sdl-image-1.2.10:0 ) sftp? ( net-libs/libssh2:0 ) shout? ( >=media-libs/libshout-2.1:0 ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext:0 x11-libs/libXinerama:0 x11-libs/libXpm:0 ) speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 ) svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 ) swscale? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) taglib? ( >=media-libs/taglib-1.9:0 ) theora? ( media-libs/libtheora:0 ) tremor? ( media-libs/tremor:0 ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0 !fontconfig? ( media-fonts/dejavu:0 ) ) twolame? ( media-sound/twolame:0 ) udev? ( virtual/udev:0 ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:0 ) vaapi? ( x11-libs/libva:0[X,drm] !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi] ) libav? ( media-video/libav:0=[vaapi] ) ) vcd? ( >=dev-libs/libcdio-0.78.2:0 ) vdpau? ( x11-libs/libvdpau:0 !libav? ( media-video/ffmpeg:0= ) libav? ( >=media-video/libav-10:0= ) ) vnc? ( >=net-libs/libvncserver-0.9.9:0 ) vorbis? ( media-libs/libvorbis:0 ) vpx? ( media-libs/libvpx:0= ) X? ( x11-libs/libX11:0 ) x264? ( media-libs/x264:0= ) x265? ( media-libs/x265:0= ) xcb? ( x11-libs/libxcb:0 x11-libs/xcb-util:0 x11-libs/xcb-util-keysyms:0 ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( >=net-dns/avahi-0.6:0[dbus] ) zvbi? ( media-libs/zvbi:0 ) app-arch/xz-utils:0 >=sys-devel/gettext-0.19.8:* virtual/pkgconfig:* amd64? ( dev-lang/yasm:* ) x86? ( dev-lang/yasm:* ) xcb? ( x11-proto/xproto:0 ) >=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 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=dev-vcs/git-1.8.2.1
+DEPEND=dev-libs/libgpg-error:0 net-dns/libidn:0 sys-libs/zlib:0[minizip] virtual/libintl:0 a52? ( >=media-libs/a52dec-0.7.4-r3:0 ) aalib? ( media-libs/aalib:0 ) alsa? ( >=media-libs/alsa-lib-1.0.24:0 ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) avcodec? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) avformat? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) bidi? ( dev-libs/fribidi:0 ) bluray? ( >=media-libs/libbluray-0.6.2:0= ) cddb? ( >=media-libs/libcddb-1.2:0 ) chromaprint? ( >=media-libs/chromaprint-0.6:0 ) chromecast? ( >=dev-libs/protobuf-2.5.0 ) dbus? ( >=sys-apps/dbus-1.6:0 ) dc1394? ( >=media-libs/libdc1394-2.1:2 >=sys-libs/libraw1394-2.0.1:0 ) dts? ( >=media-libs/libdca-0.0.5:0 ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:0= ) dvd? ( >=media-libs/libdvdnav-4.9:0 >=media-libs/libdvdread-4.9:0 ) elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 ) faad? ( >=media-libs/faad2-2.6.1:0 ) fdk? ( media-libs/fdk-aac:0 ) flac? ( >=media-libs/flac-1.1.2:0 >=media-libs/libogg-1:0 ) fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.6.0:0= ) gme? ( media-libs/game-music-emu:0 ) gnutls? ( net-libs/gnutls:0 ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( >=sys-libs/libavc1394-0.5.3:0 >=sys-libs/libraw1394-2.0.1:0 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( >=media-libs/libkate-0.3:0 ) libass? ( media-libs/fontconfig:1.0 >=media-libs/libass-0.9.8:0= ) libcaca? ( >=media-libs/libcaca-0.99_beta14:0 ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libnotify:0 ) libsamplerate? ( media-libs/libsamplerate:0 ) libtar? ( >=dev-libs/libtar-1.2.11-r3:0 ) libtiger? ( >=media-libs/libtiger-0.3.1:0 ) linsys? ( >=media-libs/zvbi-0.2.28:0 ) lirc? ( app-misc/lirc:0 ) live? ( >=media-plugins/live-2011.12.23:0 ) lua? ( >=dev-lang/lua-5.1:0 ) matroska? ( >=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= ) modplug? ( media-libs/libmodplug:0 ) mp3? ( media-libs/libmad:0 ) mpeg? ( >=media-libs/libmpeg2-0.3.2:0 ) mtp? ( >=media-libs/libmtp-1:0 ) musepack? ( >=media-sound/musepack-tools-444:0 ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( >=media-libs/libogg-1:0 ) opencv? ( >media-libs/opencv-2:0= ) opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 ) opus? ( >=media-libs/opus-1.0.3:0 ) png? ( media-libs/libpng:0= ) postproc? ( !libav? ( >=media-video/ffmpeg-3.1.3:0= ) libav? ( media-libs/libpostproc:0= ) ) projectm? ( media-fonts/dejavu:0 media-libs/libprojectm:0 ) pulseaudio? ( >=media-sound/pulseaudio-1:0 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 ) ) rdp? ( =net-misc/freerdp-1*:0=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) schroedinger? ( >=media-libs/schroedinger-1.0.10:0 ) sdl-image? ( >=media-libs/sdl-image-1.2.10:0 ) sftp? ( net-libs/libssh2:0 ) shout? ( >=media-libs/libshout-2.1:0 ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext:0 x11-libs/libXinerama:0 x11-libs/libXpm:0 ) speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 ) svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 ) swscale? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) taglib? ( >=media-libs/taglib-1.9:0 ) theora? ( media-libs/libtheora:0 ) tremor? ( media-libs/tremor:0 ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0 !fontconfig? ( media-fonts/dejavu:0 ) ) twolame? ( media-sound/twolame:0 ) udev? ( virtual/udev:0 ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:0 ) vaapi? ( x11-libs/libva:0=[X,drm] !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi] ) libav? ( media-video/libav:0=[vaapi] ) ) vcd? ( >=dev-libs/libcdio-0.78.2:0 ) vdpau? ( x11-libs/libvdpau:0 !libav? ( media-video/ffmpeg:0= ) libav? ( >=media-video/libav-10:0= ) ) vnc? ( >=net-libs/libvncserver-0.9.9:0 ) vorbis? ( media-libs/libvorbis:0 ) vpx? ( media-libs/libvpx:0= ) X? ( x11-libs/libX11:0 ) x264? ( media-libs/x264:0= ) x265? ( media-libs/x265:0= ) xcb? ( x11-libs/libxcb:0 x11-libs/xcb-util:0 x11-libs/xcb-util-keysyms:0 ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( >=net-dns/avahi-0.6:0[dbus] ) zvbi? ( media-libs/zvbi:0 ) app-arch/xz-utils:0 >=sys-devel/gettext-0.19.8:* virtual/pkgconfig:* amd64? ( dev-lang/yasm:* ) x86? ( dev-lang/yasm:* ) xcb? ( x11-proto/xproto:0 ) >=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 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=dev-vcs/git-1.8.2.1
 DESCRIPTION=VLC media player - Video player and streamer
 EAPI=6
 HOMEPAGE=https://www.videolan.org/vlc/
 IUSE=a52 aalib alsa altivec aom archive +avcodec +avformat bidi bluray cddb chromaprint chromecast dbus dc1394 debug directx dts dvb +dvbpsi dvd dxva2 elibc_glibc +encode faad fdk fluidsynth +ffmpeg flac fontconfig +gcrypt gme gnutls gstreamer ieee1394 jack jpeg kate libass libav libcaca libnotify +libsamplerate libtiger linsys libtar lirc live lua macosx-notifications macosx-qtkit matroska cpu_flags_x86_mmx modplug mp3 mpeg mtp musepack ncurses neon nfs ogg omxil opencv opengl optimisememory opus png postproc projectm pulseaudio +qt5 rdp rtsp run-as-root samba schroedinger sdl-image sftp shout sid skins speex cpu_flags_x86_sse svg +swscale taglib theora tremor truetype twolame udev upnp vaapi v4l vcd vdpau vlm vnc vorbis vpx wma-fixed +X x264 x265 +xcb xml xv zeroconf zvbi test
 LICENSE=LGPL-2.1 GPL-2
-RDEPEND=dev-libs/libgpg-error:0 net-dns/libidn:0 sys-libs/zlib:0[minizip] virtual/libintl:0 a52? ( >=media-libs/a52dec-0.7.4-r3:0 ) aalib? ( media-libs/aalib:0 ) alsa? ( >=media-libs/alsa-lib-1.0.24:0 ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) avcodec? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) avformat? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) bidi? ( dev-libs/fribidi:0 ) bluray? ( >=media-libs/libbluray-0.6.2:0= ) cddb? ( >=media-libs/libcddb-1.2:0 ) chromaprint? ( >=media-libs/chromaprint-0.6:0 ) chromecast? ( >=dev-libs/protobuf-2.5.0 ) dbus? ( >=sys-apps/dbus-1.6:0 ) dc1394? ( >=media-libs/libdc1394-2.1:2 >=sys-libs/libraw1394-2.0.1:0 ) dts? ( >=media-libs/libdca-0.0.5:0 ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:0= ) dvd? ( >=media-libs/libdvdnav-4.9:0 >=media-libs/libdvdread-4.9:0 ) elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 ) faad? ( >=media-libs/faad2-2.6.1:0 ) fdk? ( media-libs/fdk-aac:0 ) flac? ( >=media-libs/flac-1.1.2:0 >=media-libs/libogg-1:0 ) fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.6.0:0= ) gme? ( media-libs/game-music-emu:0 ) gnutls? ( net-libs/gnutls:0 ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( >=sys-libs/libavc1394-0.5.3:0 >=sys-libs/libraw1394-2.0.1:0 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( >=media-libs/libkate-0.3:0 ) libass? ( media-libs/fontconfig:1.0 >=media-libs/libass-0.9.8:0= ) libcaca? ( >=media-libs/libcaca-0.99_beta14:0 ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libnotify:0 ) libsamplerate? ( media-libs/libsamplerate:0 ) libtar? ( >=dev-libs/libtar-1.2.11-r3:0 ) libtiger? ( >=media-libs/libtiger-0.3.1:0 ) linsys? ( >=media-libs/zvbi-0.2.28:0 ) lirc? ( app-misc/lirc:0 ) live? ( >=media-plugins/live-2011.12.23:0 ) lua? ( >=dev-lang/lua-5.1:0 ) matroska? ( >=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= ) modplug? ( media-libs/libmodplug:0 ) mp3? ( media-libs/libmad:0 ) mpeg? ( >=media-libs/libmpeg2-0.3.2:0 ) mtp? ( >=media-libs/libmtp-1:0 ) musepack? ( >=media-sound/musepack-tools-444:0 ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( >=media-libs/libogg-1:0 ) opencv? ( >media-libs/opencv-2:0= ) opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 ) opus? ( >=media-libs/opus-1.0.3:0 ) png? ( media-libs/libpng:0= ) postproc? ( !libav? ( >=media-video/ffmpeg-3.1.3:0= ) libav? ( media-libs/libpostproc:0= ) ) projectm? ( media-fonts/dejavu:0 media-libs/libprojectm:0 ) pulseaudio? ( >=media-sound/pulseaudio-1:0 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 ) ) rdp? ( =net-misc/freerdp-1*:0=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) schroedinger? ( >=media-libs/schroedinger-1.0.10:0 ) sdl-image? ( >=media-libs/sdl-image-1.2.10:0 ) sftp? ( net-libs/libssh2:0 ) shout? ( >=media-libs/libshout-2.1:0 ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext:0 x11-libs/libXinerama:0 x11-libs/libXpm:0 ) speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 ) svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 ) swscale? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) taglib? ( >=media-libs/taglib-1.9:0 ) theora? ( media-libs/libtheora:0 ) tremor? ( media-libs/tremor:0 ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0 !fontconfig? ( media-fonts/dejavu:0 ) ) twolame? ( media-sound/twolame:0 ) udev? ( virtual/udev:0 ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:0 ) vaapi? ( x11-libs/libva:0[X,drm] !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi] ) libav? ( media-video/libav:0=[vaapi] ) ) vcd? ( >=dev-libs/libcdio-0.78.2:0 ) vdpau? ( x11-libs/libvdpau:0 !libav? ( media-video/ffmpeg:0= ) libav? ( >=media-video/libav-10:0= ) ) vnc? ( >=net-libs/libvncserver-0.9.9:0 ) vorbis? ( media-libs/libvorbis:0 ) vpx? ( media-libs/libvpx:0= ) X? ( x11-libs/libX11:0 ) x264? ( media-libs/x264:0= ) x265? ( media-libs/x265:0= ) xcb? ( x11-libs/libxcb:0 x11-libs/xcb-util:0 x11-libs/xcb-util-keysyms:0 ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( >=net-dns/avahi-0.6:0[dbus] ) zvbi? ( media-libs/zvbi:0 )
+RDEPEND=dev-libs/libgpg-error:0 net-dns/libidn:0 sys-libs/zlib:0[minizip] virtual/libintl:0 a52? ( >=media-libs/a52dec-0.7.4-r3:0 ) aalib? ( media-libs/aalib:0 ) alsa? ( >=media-libs/alsa-lib-1.0.24:0 ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) avcodec? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) avformat? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) bidi? ( dev-libs/fribidi:0 ) bluray? ( >=media-libs/libbluray-0.6.2:0= ) cddb? ( >=media-libs/libcddb-1.2:0 ) chromaprint? ( >=media-libs/chromaprint-0.6:0 ) chromecast? ( >=dev-libs/protobuf-2.5.0 ) dbus? ( >=sys-apps/dbus-1.6:0 ) dc1394? ( >=media-libs/libdc1394-2.1:2 >=sys-libs/libraw1394-2.0.1:0 ) dts? ( >=media-libs/libdca-0.0.5:0 ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:0= ) dvd? ( >=media-libs/libdvdnav-4.9:0 >=media-libs/libdvdread-4.9:0 ) elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 ) faad? ( >=media-libs/faad2-2.6.1:0 ) fdk? ( media-libs/fdk-aac:0 ) flac? ( >=media-libs/flac-1.1.2:0 >=media-libs/libogg-1:0 ) fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.6.0:0= ) gme? ( media-libs/game-music-emu:0 ) gnutls? ( net-libs/gnutls:0 ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( >=sys-libs/libavc1394-0.5.3:0 >=sys-libs/libraw1394-2.0.1:0 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( >=media-libs/libkate-0.3:0 ) libass? ( media-libs/fontconfig:1.0 >=media-libs/libass-0.9.8:0= ) libcaca? ( >=media-libs/libcaca-0.99_beta14:0 ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libnotify:0 ) libsamplerate? ( media-libs/libsamplerate:0 ) libtar? ( >=dev-libs/libtar-1.2.11-r3:0 ) libtiger? ( >=media-libs/libtiger-0.3.1:0 ) linsys? ( >=media-libs/zvbi-0.2.28:0 ) lirc? ( app-misc/lirc:0 ) live? ( >=media-plugins/live-2011.12.23:0 ) lua? ( >=dev-lang/lua-5.1:0 ) matroska? ( >=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= ) modplug? ( media-libs/libmodplug:0 ) mp3? ( media-libs/libmad:0 ) mpeg? ( >=media-libs/libmpeg2-0.3.2:0 ) mtp? ( >=media-libs/libmtp-1:0 ) musepack? ( >=media-sound/musepack-tools-444:0 ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( >=media-libs/libogg-1:0 ) opencv? ( >media-libs/opencv-2:0= ) opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 ) opus? ( >=media-libs/opus-1.0.3:0 ) png? ( media-libs/libpng:0= ) postproc? ( !libav? ( >=media-video/ffmpeg-3.1.3:0= ) libav? ( media-libs/libpostproc:0= ) ) projectm? ( media-fonts/dejavu:0 media-libs/libprojectm:0 ) pulseaudio? ( >=media-sound/pulseaudio-1:0 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 ) ) rdp? ( =net-misc/freerdp-1*:0=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) schroedinger? ( >=media-libs/schroedinger-1.0.10:0 ) sdl-image? ( >=media-libs/sdl-image-1.2.10:0 ) sftp? ( net-libs/libssh2:0 ) shout? ( >=media-libs/libshout-2.1:0 ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext:0 x11-libs/libXinerama:0 x11-libs/libXpm:0 ) speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 ) svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 ) swscale? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) taglib? ( >=media-libs/taglib-1.9:0 ) theora? ( media-libs/libtheora:0 ) tremor? ( media-libs/tremor:0 ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0 !fontconfig? ( media-fonts/dejavu:0 ) ) twolame? ( media-sound/twolame:0 ) udev? ( virtual/udev:0 ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:0 ) vaapi? ( x11-libs/libva:0=[X,drm] !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi] ) libav? ( media-video/libav:0=[vaapi] ) ) vcd? ( >=dev-libs/libcdio-0.78.2:0 ) vdpau? ( x11-libs/libvdpau:0 !libav? ( media-video/ffmpeg:0= ) libav? ( >=media-video/libav-10:0= ) ) vnc? ( >=net-libs/libvncserver-0.9.9:0 ) vorbis? ( media-libs/libvorbis:0 ) vpx? ( media-libs/libvpx:0= ) X? ( x11-libs/libX11:0 ) x264? ( media-libs/x264:0= ) x265? ( media-libs/x265:0= ) xcb? ( x11-libs/libxcb:0 x11-libs/xcb-util:0 x11-libs/xcb-util-keysyms:0 ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( >=net-dns/avahi-0.6:0[dbus] ) zvbi? ( media-libs/zvbi:0 )
 REQUIRED_USE=aalib? ( X ) bidi? ( truetype ) dvb? ( dvbpsi ) dxva2? ( avcodec ) ffmpeg? ( avcodec avformat swscale ) fontconfig? ( truetype ) gnutls? ( gcrypt ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) skins? ( qt5 truetype X xml ) vaapi? ( avcodec X ) vdpau? ( X ) vlm? ( encode ) xv? ( xcb )
 SLOT=0/5-8
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1c90e425538ca20f4ae873da4d40ad38
+_md5_=f2abb21476ea7202079721e54a265bf0
diff --git a/metadata/md5-cache/media-video/vlc-9999 b/metadata/md5-cache/media-video/vlc-9999
index 830dd5e3e080..3ee0d0e24280 100644
--- a/metadata/md5-cache/media-video/vlc-9999
+++ b/metadata/md5-cache/media-video/vlc-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install postinst postrm prepare test unpack
-DEPEND=dev-libs/libgpg-error:0 net-dns/libidn:0 sys-libs/zlib:0[minizip] virtual/libintl:0 a52? ( >=media-libs/a52dec-0.7.4-r3:0 ) aalib? ( media-libs/aalib:0 ) alsa? ( >=media-libs/alsa-lib-1.0.24:0 ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) avcodec? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) avformat? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) bidi? ( dev-libs/fribidi:0 ) bluray? ( >=media-libs/libbluray-0.6.2:0= ) cddb? ( >=media-libs/libcddb-1.2:0 ) chromaprint? ( >=media-libs/chromaprint-0.6:0 ) chromecast? ( >=dev-libs/protobuf-2.5.0 ) dbus? ( >=sys-apps/dbus-1.6:0 ) dc1394? ( >=media-libs/libdc1394-2.1:2 >=sys-libs/libraw1394-2.0.1:0 ) dts? ( >=media-libs/libdca-0.0.5:0 ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:0= ) dvd? ( >=media-libs/libdvdnav-4.9:0 >=media-libs/libdvdread-4.9:0 ) elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 ) faad? ( >=media-libs/faad2-2.6.1:0 ) fdk? ( media-libs/fdk-aac:0 ) flac? ( >=media-libs/flac-1.1.2:0 >=media-libs/libogg-1:0 ) fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.6.0:0= ) gme? ( media-libs/game-music-emu:0 ) gnutls? ( net-libs/gnutls:0 ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( >=sys-libs/libavc1394-0.5.3:0 >=sys-libs/libraw1394-2.0.1:0 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( >=media-libs/libkate-0.3:0 ) libass? ( media-libs/fontconfig:1.0 >=media-libs/libass-0.9.8:0= ) libcaca? ( >=media-libs/libcaca-0.99_beta14:0 ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libnotify:0 ) libsamplerate? ( media-libs/libsamplerate:0 ) libtar? ( >=dev-libs/libtar-1.2.11-r3:0 ) libtiger? ( >=media-libs/libtiger-0.3.1:0 ) linsys? ( >=media-libs/zvbi-0.2.28:0 ) lirc? ( app-misc/lirc:0 ) live? ( >=media-plugins/live-2011.12.23:0 ) lua? ( >=dev-lang/lua-5.1:0 ) matroska? ( >=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= ) modplug? ( media-libs/libmodplug:0 ) mp3? ( media-libs/libmad:0 ) mpeg? ( >=media-libs/libmpeg2-0.3.2:0 ) mtp? ( >=media-libs/libmtp-1:0 ) musepack? ( >=media-sound/musepack-tools-444:0 ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( >=media-libs/libogg-1:0 ) opencv? ( >media-libs/opencv-2:0= ) opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 ) opus? ( >=media-libs/opus-1.0.3:0 ) png? ( media-libs/libpng:0= ) postproc? ( !libav? ( >=media-video/ffmpeg-3.1.3:0= ) libav? ( media-libs/libpostproc:0= ) ) projectm? ( media-fonts/dejavu:0 media-libs/libprojectm:0 ) pulseaudio? ( >=media-sound/pulseaudio-1:0 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 ) ) rdp? ( =net-misc/freerdp-1*:0=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) schroedinger? ( >=media-libs/schroedinger-1.0.10:0 ) sdl-image? ( >=media-libs/sdl-image-1.2.10:0 ) sftp? ( net-libs/libssh2:0 ) shout? ( >=media-libs/libshout-2.1:0 ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext:0 x11-libs/libXinerama:0 x11-libs/libXpm:0 ) speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 ) svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 ) swscale? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) taglib? ( >=media-libs/taglib-1.9:0 ) theora? ( media-libs/libtheora:0 ) tremor? ( media-libs/tremor:0 ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0 !fontconfig? ( media-fonts/dejavu:0 ) ) twolame? ( media-sound/twolame:0 ) udev? ( virtual/udev:0 ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:0 ) vaapi? ( x11-libs/libva:0[X,drm] !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi] ) libav? ( media-video/libav:0=[vaapi] ) ) vcd? ( >=dev-libs/libcdio-0.78.2:0 ) vdpau? ( x11-libs/libvdpau:0 !libav? ( media-video/ffmpeg:0= ) libav? ( >=media-video/libav-10:0= ) ) vnc? ( >=net-libs/libvncserver-0.9.9:0 ) vorbis? ( media-libs/libvorbis:0 ) vpx? ( media-libs/libvpx:0= ) X? ( x11-libs/libX11:0 ) x264? ( media-libs/x264:0= ) x265? ( media-libs/x265:0= ) xcb? ( x11-libs/libxcb:0 x11-libs/xcb-util:0 x11-libs/xcb-util-keysyms:0 ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( >=net-dns/avahi-0.6:0[dbus] ) zvbi? ( media-libs/zvbi:0 ) app-arch/xz-utils:0 >=sys-devel/gettext-0.19.8:* virtual/pkgconfig:* amd64? ( dev-lang/yasm:* ) x86? ( dev-lang/yasm:* ) xcb? ( x11-proto/xproto:0 ) >=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 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=dev-vcs/git-1.8.2.1
+DEPEND=dev-libs/libgpg-error:0 net-dns/libidn:0 sys-libs/zlib:0[minizip] virtual/libintl:0 a52? ( >=media-libs/a52dec-0.7.4-r3:0 ) aalib? ( media-libs/aalib:0 ) alsa? ( >=media-libs/alsa-lib-1.0.24:0 ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) avcodec? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) avformat? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) bidi? ( dev-libs/fribidi:0 ) bluray? ( >=media-libs/libbluray-0.6.2:0= ) cddb? ( >=media-libs/libcddb-1.2:0 ) chromaprint? ( >=media-libs/chromaprint-0.6:0 ) chromecast? ( >=dev-libs/protobuf-2.5.0 ) dbus? ( >=sys-apps/dbus-1.6:0 ) dc1394? ( >=media-libs/libdc1394-2.1:2 >=sys-libs/libraw1394-2.0.1:0 ) dts? ( >=media-libs/libdca-0.0.5:0 ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:0= ) dvd? ( >=media-libs/libdvdnav-4.9:0 >=media-libs/libdvdread-4.9:0 ) elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 ) faad? ( >=media-libs/faad2-2.6.1:0 ) fdk? ( media-libs/fdk-aac:0 ) flac? ( >=media-libs/flac-1.1.2:0 >=media-libs/libogg-1:0 ) fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.6.0:0= ) gme? ( media-libs/game-music-emu:0 ) gnutls? ( net-libs/gnutls:0 ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( >=sys-libs/libavc1394-0.5.3:0 >=sys-libs/libraw1394-2.0.1:0 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( >=media-libs/libkate-0.3:0 ) libass? ( media-libs/fontconfig:1.0 >=media-libs/libass-0.9.8:0= ) libcaca? ( >=media-libs/libcaca-0.99_beta14:0 ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libnotify:0 ) libsamplerate? ( media-libs/libsamplerate:0 ) libtar? ( >=dev-libs/libtar-1.2.11-r3:0 ) libtiger? ( >=media-libs/libtiger-0.3.1:0 ) linsys? ( >=media-libs/zvbi-0.2.28:0 ) lirc? ( app-misc/lirc:0 ) live? ( >=media-plugins/live-2011.12.23:0 ) lua? ( >=dev-lang/lua-5.1:0 ) matroska? ( >=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= ) modplug? ( media-libs/libmodplug:0 ) mp3? ( media-libs/libmad:0 ) mpeg? ( >=media-libs/libmpeg2-0.3.2:0 ) mtp? ( >=media-libs/libmtp-1:0 ) musepack? ( >=media-sound/musepack-tools-444:0 ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( >=media-libs/libogg-1:0 ) opencv? ( >media-libs/opencv-2:0= ) opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 ) opus? ( >=media-libs/opus-1.0.3:0 ) png? ( media-libs/libpng:0= ) postproc? ( !libav? ( >=media-video/ffmpeg-3.1.3:0= ) libav? ( media-libs/libpostproc:0= ) ) projectm? ( media-fonts/dejavu:0 media-libs/libprojectm:0 ) pulseaudio? ( >=media-sound/pulseaudio-1:0 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 ) ) rdp? ( =net-misc/freerdp-1*:0=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) schroedinger? ( >=media-libs/schroedinger-1.0.10:0 ) sdl-image? ( >=media-libs/sdl-image-1.2.10:0 ) sftp? ( net-libs/libssh2:0 ) shout? ( >=media-libs/libshout-2.1:0 ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext:0 x11-libs/libXinerama:0 x11-libs/libXpm:0 ) speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 ) svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 ) swscale? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) taglib? ( >=media-libs/taglib-1.9:0 ) theora? ( media-libs/libtheora:0 ) tremor? ( media-libs/tremor:0 ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0 !fontconfig? ( media-fonts/dejavu:0 ) ) twolame? ( media-sound/twolame:0 ) udev? ( virtual/udev:0 ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:0 ) vaapi? ( x11-libs/libva:0=[X,drm] !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi] ) libav? ( media-video/libav:0=[vaapi] ) ) vcd? ( >=dev-libs/libcdio-0.78.2:0 ) vdpau? ( x11-libs/libvdpau:0 !libav? ( media-video/ffmpeg:0= ) libav? ( >=media-video/libav-10:0= ) ) vnc? ( >=net-libs/libvncserver-0.9.9:0 ) vorbis? ( media-libs/libvorbis:0 ) vpx? ( media-libs/libvpx:0= ) X? ( x11-libs/libX11:0 ) x264? ( media-libs/x264:0= ) x265? ( media-libs/x265:0= ) xcb? ( x11-libs/libxcb:0 x11-libs/xcb-util:0 x11-libs/xcb-util-keysyms:0 ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( >=net-dns/avahi-0.6:0[dbus] ) zvbi? ( media-libs/zvbi:0 ) app-arch/xz-utils:0 >=sys-devel/gettext-0.19.8:* virtual/pkgconfig:* amd64? ( dev-lang/yasm:* ) x86? ( dev-lang/yasm:* ) xcb? ( x11-proto/xproto:0 ) >=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 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=dev-vcs/git-1.8.2.1
 DESCRIPTION=VLC media player - Video player and streamer
 EAPI=6
 HOMEPAGE=https://www.videolan.org/vlc/
 IUSE=a52 aalib alsa altivec aom archive +avcodec +avformat bidi bluray cddb chromaprint chromecast dbus dc1394 debug directx dts dvb +dvbpsi dvd dxva2 elibc_glibc +encode faad fdk fluidsynth +ffmpeg flac fontconfig +gcrypt gme gnutls gstreamer ieee1394 jack jpeg kate libass libav libcaca libnotify +libsamplerate libtiger linsys libtar lirc live lua macosx-notifications macosx-qtkit matroska cpu_flags_x86_mmx modplug mp3 mpeg mtp musepack ncurses neon nfs ogg omxil opencv opengl optimisememory opus png postproc projectm pulseaudio +qt5 rdp rtsp run-as-root samba schroedinger sdl-image sftp shout sid skins speex cpu_flags_x86_sse svg +swscale taglib theora tremor truetype twolame udev upnp vaapi v4l vcd vdpau vlm vnc vorbis vpx wma-fixed +X x264 x265 +xcb xml xv zeroconf zvbi test
 LICENSE=LGPL-2.1 GPL-2
-RDEPEND=dev-libs/libgpg-error:0 net-dns/libidn:0 sys-libs/zlib:0[minizip] virtual/libintl:0 a52? ( >=media-libs/a52dec-0.7.4-r3:0 ) aalib? ( media-libs/aalib:0 ) alsa? ( >=media-libs/alsa-lib-1.0.24:0 ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) avcodec? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) avformat? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) bidi? ( dev-libs/fribidi:0 ) bluray? ( >=media-libs/libbluray-0.6.2:0= ) cddb? ( >=media-libs/libcddb-1.2:0 ) chromaprint? ( >=media-libs/chromaprint-0.6:0 ) chromecast? ( >=dev-libs/protobuf-2.5.0 ) dbus? ( >=sys-apps/dbus-1.6:0 ) dc1394? ( >=media-libs/libdc1394-2.1:2 >=sys-libs/libraw1394-2.0.1:0 ) dts? ( >=media-libs/libdca-0.0.5:0 ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:0= ) dvd? ( >=media-libs/libdvdnav-4.9:0 >=media-libs/libdvdread-4.9:0 ) elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 ) faad? ( >=media-libs/faad2-2.6.1:0 ) fdk? ( media-libs/fdk-aac:0 ) flac? ( >=media-libs/flac-1.1.2:0 >=media-libs/libogg-1:0 ) fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.6.0:0= ) gme? ( media-libs/game-music-emu:0 ) gnutls? ( net-libs/gnutls:0 ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( >=sys-libs/libavc1394-0.5.3:0 >=sys-libs/libraw1394-2.0.1:0 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( >=media-libs/libkate-0.3:0 ) libass? ( media-libs/fontconfig:1.0 >=media-libs/libass-0.9.8:0= ) libcaca? ( >=media-libs/libcaca-0.99_beta14:0 ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libnotify:0 ) libsamplerate? ( media-libs/libsamplerate:0 ) libtar? ( >=dev-libs/libtar-1.2.11-r3:0 ) libtiger? ( >=media-libs/libtiger-0.3.1:0 ) linsys? ( >=media-libs/zvbi-0.2.28:0 ) lirc? ( app-misc/lirc:0 ) live? ( >=media-plugins/live-2011.12.23:0 ) lua? ( >=dev-lang/lua-5.1:0 ) matroska? ( >=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= ) modplug? ( media-libs/libmodplug:0 ) mp3? ( media-libs/libmad:0 ) mpeg? ( >=media-libs/libmpeg2-0.3.2:0 ) mtp? ( >=media-libs/libmtp-1:0 ) musepack? ( >=media-sound/musepack-tools-444:0 ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( >=media-libs/libogg-1:0 ) opencv? ( >media-libs/opencv-2:0= ) opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 ) opus? ( >=media-libs/opus-1.0.3:0 ) png? ( media-libs/libpng:0= ) postproc? ( !libav? ( >=media-video/ffmpeg-3.1.3:0= ) libav? ( media-libs/libpostproc:0= ) ) projectm? ( media-fonts/dejavu:0 media-libs/libprojectm:0 ) pulseaudio? ( >=media-sound/pulseaudio-1:0 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 ) ) rdp? ( =net-misc/freerdp-1*:0=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) schroedinger? ( >=media-libs/schroedinger-1.0.10:0 ) sdl-image? ( >=media-libs/sdl-image-1.2.10:0 ) sftp? ( net-libs/libssh2:0 ) shout? ( >=media-libs/libshout-2.1:0 ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext:0 x11-libs/libXinerama:0 x11-libs/libXpm:0 ) speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 ) svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 ) swscale? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) taglib? ( >=media-libs/taglib-1.9:0 ) theora? ( media-libs/libtheora:0 ) tremor? ( media-libs/tremor:0 ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0 !fontconfig? ( media-fonts/dejavu:0 ) ) twolame? ( media-sound/twolame:0 ) udev? ( virtual/udev:0 ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:0 ) vaapi? ( x11-libs/libva:0[X,drm] !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi] ) libav? ( media-video/libav:0=[vaapi] ) ) vcd? ( >=dev-libs/libcdio-0.78.2:0 ) vdpau? ( x11-libs/libvdpau:0 !libav? ( media-video/ffmpeg:0= ) libav? ( >=media-video/libav-10:0= ) ) vnc? ( >=net-libs/libvncserver-0.9.9:0 ) vorbis? ( media-libs/libvorbis:0 ) vpx? ( media-libs/libvpx:0= ) X? ( x11-libs/libX11:0 ) x264? ( media-libs/x264:0= ) x265? ( media-libs/x265:0= ) xcb? ( x11-libs/libxcb:0 x11-libs/xcb-util:0 x11-libs/xcb-util-keysyms:0 ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( >=net-dns/avahi-0.6:0[dbus] ) zvbi? ( media-libs/zvbi:0 )
+RDEPEND=dev-libs/libgpg-error:0 net-dns/libidn:0 sys-libs/zlib:0[minizip] virtual/libintl:0 a52? ( >=media-libs/a52dec-0.7.4-r3:0 ) aalib? ( media-libs/aalib:0 ) alsa? ( >=media-libs/alsa-lib-1.0.24:0 ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) avcodec? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) avformat? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) bidi? ( dev-libs/fribidi:0 ) bluray? ( >=media-libs/libbluray-0.6.2:0= ) cddb? ( >=media-libs/libcddb-1.2:0 ) chromaprint? ( >=media-libs/chromaprint-0.6:0 ) chromecast? ( >=dev-libs/protobuf-2.5.0 ) dbus? ( >=sys-apps/dbus-1.6:0 ) dc1394? ( >=media-libs/libdc1394-2.1:2 >=sys-libs/libraw1394-2.0.1:0 ) dts? ( >=media-libs/libdca-0.0.5:0 ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:0= ) dvd? ( >=media-libs/libdvdnav-4.9:0 >=media-libs/libdvdread-4.9:0 ) elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 ) faad? ( >=media-libs/faad2-2.6.1:0 ) fdk? ( media-libs/fdk-aac:0 ) flac? ( >=media-libs/flac-1.1.2:0 >=media-libs/libogg-1:0 ) fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.6.0:0= ) gme? ( media-libs/game-music-emu:0 ) gnutls? ( net-libs/gnutls:0 ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( >=sys-libs/libavc1394-0.5.3:0 >=sys-libs/libraw1394-2.0.1:0 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( >=media-libs/libkate-0.3:0 ) libass? ( media-libs/fontconfig:1.0 >=media-libs/libass-0.9.8:0= ) libcaca? ( >=media-libs/libcaca-0.99_beta14:0 ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libnotify:0 ) libsamplerate? ( media-libs/libsamplerate:0 ) libtar? ( >=dev-libs/libtar-1.2.11-r3:0 ) libtiger? ( >=media-libs/libtiger-0.3.1:0 ) linsys? ( >=media-libs/zvbi-0.2.28:0 ) lirc? ( app-misc/lirc:0 ) live? ( >=media-plugins/live-2011.12.23:0 ) lua? ( >=dev-lang/lua-5.1:0 ) matroska? ( >=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= ) modplug? ( media-libs/libmodplug:0 ) mp3? ( media-libs/libmad:0 ) mpeg? ( >=media-libs/libmpeg2-0.3.2:0 ) mtp? ( >=media-libs/libmtp-1:0 ) musepack? ( >=media-sound/musepack-tools-444:0 ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( >=media-libs/libogg-1:0 ) opencv? ( >media-libs/opencv-2:0= ) opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 ) opus? ( >=media-libs/opus-1.0.3:0 ) png? ( media-libs/libpng:0= ) postproc? ( !libav? ( >=media-video/ffmpeg-3.1.3:0= ) libav? ( media-libs/libpostproc:0= ) ) projectm? ( media-fonts/dejavu:0 media-libs/libprojectm:0 ) pulseaudio? ( >=media-sound/pulseaudio-1:0 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 ) ) rdp? ( =net-misc/freerdp-1*:0=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) schroedinger? ( >=media-libs/schroedinger-1.0.10:0 ) sdl-image? ( >=media-libs/sdl-image-1.2.10:0 ) sftp? ( net-libs/libssh2:0 ) shout? ( >=media-libs/libshout-2.1:0 ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext:0 x11-libs/libXinerama:0 x11-libs/libXpm:0 ) speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 ) svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 ) swscale? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) taglib? ( >=media-libs/taglib-1.9:0 ) theora? ( media-libs/libtheora:0 ) tremor? ( media-libs/tremor:0 ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0 !fontconfig? ( media-fonts/dejavu:0 ) ) twolame? ( media-sound/twolame:0 ) udev? ( virtual/udev:0 ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:0 ) vaapi? ( x11-libs/libva:0=[X,drm] !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi] ) libav? ( media-video/libav:0=[vaapi] ) ) vcd? ( >=dev-libs/libcdio-0.78.2:0 ) vdpau? ( x11-libs/libvdpau:0 !libav? ( media-video/ffmpeg:0= ) libav? ( >=media-video/libav-10:0= ) ) vnc? ( >=net-libs/libvncserver-0.9.9:0 ) vorbis? ( media-libs/libvorbis:0 ) vpx? ( media-libs/libvpx:0= ) X? ( x11-libs/libX11:0 ) x264? ( media-libs/x264:0= ) x265? ( media-libs/x265:0= ) xcb? ( x11-libs/libxcb:0 x11-libs/xcb-util:0 x11-libs/xcb-util-keysyms:0 ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( >=net-dns/avahi-0.6:0[dbus] ) zvbi? ( media-libs/zvbi:0 )
 REQUIRED_USE=aalib? ( X ) bidi? ( truetype ) dvb? ( dvbpsi ) dxva2? ( avcodec ) ffmpeg? ( avcodec avformat swscale ) fontconfig? ( truetype ) gnutls? ( gcrypt ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) skins? ( qt5 truetype X xml ) vaapi? ( avcodec X ) vdpau? ( X ) vlm? ( encode ) xv? ( xcb )
 SLOT=0/5-8
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1c90e425538ca20f4ae873da4d40ad38
+_md5_=f2abb21476ea7202079721e54a265bf0
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 6c3fd5809e17..ef2699a22018 100644
--- a/metadata/md5-cache/net-analyzer/Manifest.gz
+++ b/metadata/md5-cache/net-analyzer/Manifest.gz
diff --git a/metadata/md5-cache/net-analyzer/sarg-2.3.10-r1 b/metadata/md5-cache/net-analyzer/sarg-2.3.10-r1
new file mode 100644
index 000000000000..93d0f0a315ae
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/sarg-2.3.10-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=gd? ( media-libs/gd[png,truetype] ) ldap? ( net-nds/openldap ) pcre? ( dev-libs/libpcre ) >=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=Squid Analysis Report Generator
+EAPI=6
+HOMEPAGE=http://sarg.sourceforge.net/
+IUSE=+gd ldap pcre
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=gd? ( media-libs/gd[png,truetype] ) ldap? ( net-nds/openldap ) pcre? ( dev-libs/libpcre )
+SLOT=0
+SRC_URI=mirror://sourceforge/sarg/sarg-2.3.10.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=b34bd49d2b97dcae6ddc7e37e63f5884
diff --git a/metadata/md5-cache/net-analyzer/thc-ipv6-2.3 b/metadata/md5-cache/net-analyzer/thc-ipv6-2.3
deleted file mode 100644
index a0deb2f7903d..000000000000
--- a/metadata/md5-cache/net-analyzer/thc-ipv6-2.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=net-libs/libpcap ssl? ( dev-libs/openssl )
-DESCRIPTION=complete tool set to attack the inherent protocol weaknesses of IPV6 and ICMP6
-EAPI=4
-HOMEPAGE=http://freeworld.thc.org/thc-ipv6/
-IUSE=ssl
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3 openssl
-RDEPEND=net-libs/libpcap ssl? ( dev-libs/openssl )
-SLOT=0
-SRC_URI=http://freeworld.thc.org/releases/thc-ipv6-2.3.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=41f8c024c6a17428777a928497857ea5
diff --git a/metadata/md5-cache/net-analyzer/thc-ipv6-2.7 b/metadata/md5-cache/net-analyzer/thc-ipv6-2.7
deleted file mode 100644
index 857cf3b9e33b..000000000000
--- a/metadata/md5-cache/net-analyzer/thc-ipv6-2.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=net-libs/libpcap ssl? ( dev-libs/openssl )
-DESCRIPTION=complete tool set to attack the inherent protocol weaknesses of IPV6 and ICMP6
-EAPI=4
-HOMEPAGE=http://freeworld.thc.org/thc-ipv6/
-IUSE=ssl
-KEYWORDS=~amd64 ~x86
-LICENSE=AGPL-3 openssl
-RDEPEND=net-libs/libpcap ssl? ( dev-libs/openssl )
-SLOT=0
-SRC_URI=http://freeworld.thc.org/releases/thc-ipv6-2.7.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=3278e79d0dda449ac2e2afbf4094dec0
diff --git a/metadata/md5-cache/net-analyzer/thc-ipv6-3.0 b/metadata/md5-cache/net-analyzer/thc-ipv6-3.0
index ca8d24fc83cd..b127b27eaaf7 100644
--- a/metadata/md5-cache/net-analyzer/thc-ipv6-3.0
+++ b/metadata/md5-cache/net-analyzer/thc-ipv6-3.0
@@ -10,4 +10,4 @@ RDEPEND=net-libs/libpcap net-libs/libnetfilter_queue ssl? ( dev-libs/openssl:* )
 SLOT=0
 SRC_URI=http://www.thc.org/releases/thc-ipv6-3.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=007bf1353f70024ee0d7e3d6d955b5e7
+_md5_=71cd341f3f699996a8aab748aa821cf5
diff --git a/metadata/md5-cache/net-analyzer/thc-ipv6-2.5 b/metadata/md5-cache/net-analyzer/thc-ipv6-3.2
index 6f065702d04b..b13d28d9e43d 100644
--- a/metadata/md5-cache/net-analyzer/thc-ipv6-2.5
+++ b/metadata/md5-cache/net-analyzer/thc-ipv6-3.2
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=net-libs/libpcap ssl? ( dev-libs/openssl )
+DEFINED_PHASES=compile install prepare unpack
+DEPEND=net-libs/libpcap net-libs/libnetfilter_queue ssl? ( dev-libs/openssl:* )
 DESCRIPTION=complete tool set to attack the inherent protocol weaknesses of IPV6 and ICMP6
-EAPI=4
-HOMEPAGE=http://freeworld.thc.org/thc-ipv6/
+EAPI=6
+HOMEPAGE=https://www.thc.org/thc-ipv6/
 IUSE=ssl
 KEYWORDS=~amd64 ~x86
 LICENSE=AGPL-3 openssl
-RDEPEND=net-libs/libpcap ssl? ( dev-libs/openssl )
+RDEPEND=net-libs/libpcap net-libs/libnetfilter_queue ssl? ( dev-libs/openssl:* )
 SLOT=0
-SRC_URI=http://freeworld.thc.org/releases/thc-ipv6-2.5.tar.gz
+SRC_URI=https://github.com/vanhauser-thc/thc-ipv6/archive/3.2.tar.gz -> thc-ipv6-3.2.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=3278e79d0dda449ac2e2afbf4094dec0
+_md5_=0383f8fa0af411431b7f6dbbdd676a7c
diff --git a/metadata/md5-cache/net-analyzer/thc-ipv6-9999 b/metadata/md5-cache/net-analyzer/thc-ipv6-9999
index cb0506cd2a0c..007a58c6db0f 100644
--- a/metadata/md5-cache/net-analyzer/thc-ipv6-9999
+++ b/metadata/md5-cache/net-analyzer/thc-ipv6-9999
@@ -8,4 +8,4 @@ LICENSE=AGPL-3 openssl
 RDEPEND=net-libs/libpcap net-libs/libnetfilter_queue ssl? ( dev-libs/openssl:* )
 SLOT=0
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=007bf1353f70024ee0d7e3d6d955b5e7
+_md5_=0383f8fa0af411431b7f6dbbdd676a7c
diff --git a/metadata/md5-cache/net-analyzer/wireshark-2.2.7 b/metadata/md5-cache/net-analyzer/wireshark-2.2.7
index 92c6bc8e76e3..222a2ff3817c 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-2.2.7
+++ b/metadata/md5-cache/net-analyzer/wireshark-2.2.7
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=>=dev-libs/glib-2.14:2 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) crypt? ( dev-libs/libgcrypt:0 ) caps? ( sys-libs/libcap ) geoip? ( dev-libs/geoip ) gtk? ( x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango x11-misc/xdg-utils ) kerberos? ( virtual/krb5 ) libssh? ( >=net-libs/libssh-0.6 ) lua? ( >=dev-lang/lua-5.1:* ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 media-libs/speex x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) smi? ( net-libs/libsmi ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) dev-lang/perl !<virtual/perl-Pod-Simple-3.170 !<perl-core/Pod-Simple-3.170 doc? ( app-doc/doxygen app-text/asciidoc dev-libs/libxml2 dev-libs/libxslt doc-pdf? ( dev-java/fop ) www-client/lynx ) qt5? ( dev-qt/linguist-tools:5 ) sys-devel/bison sys-devel/flex 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 filecaps? ( sys-libs/libcap )
+DEPEND=>=dev-libs/glib-2.14:2 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) crypt? ( dev-libs/libgcrypt:0 ) caps? ( sys-libs/libcap ) geoip? ( dev-libs/geoip ) gtk? ( x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango x11-misc/xdg-utils ) kerberos? ( virtual/krb5 ) libssh? ( >=net-libs/libssh-0.6 ) lua? ( >=dev-lang/lua-5.1:* ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 || ( media-libs/speexdsp <media-libs/speex-1.2.0 ) x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) smi? ( net-libs/libsmi ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) dev-lang/perl !<virtual/perl-Pod-Simple-3.170 !<perl-core/Pod-Simple-3.170 doc? ( app-doc/doxygen app-text/asciidoc dev-libs/libxml2 dev-libs/libxslt doc-pdf? ( dev-java/fop ) www-client/lynx ) qt5? ( dev-qt/linguist-tools:5 ) sys-devel/bison sys-devel/flex 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 filecaps? ( sys-libs/libcap )
 DESCRIPTION=A network protocol analyzer formerly known as ethereal
 EAPI=6
 HOMEPAGE=https://www.wireshark.org/
 IUSE=adns androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf geoip +gtk kerberos lua +netlink +pcap portaudio +qt5 sbc selinux smi libssh randpkt randpktdump sshdump ssl tfshark zlib +filecaps
 KEYWORDS=alpha
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.14:2 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) crypt? ( dev-libs/libgcrypt:0 ) caps? ( sys-libs/libcap ) geoip? ( dev-libs/geoip ) gtk? ( x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango x11-misc/xdg-utils ) kerberos? ( virtual/krb5 ) libssh? ( >=net-libs/libssh-0.6 ) lua? ( >=dev-lang/lua-5.1:* ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 media-libs/speex x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) smi? ( net-libs/libsmi ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) gtk? ( virtual/freedesktop-icon-theme ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark )
+RDEPEND=>=dev-libs/glib-2.14:2 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) crypt? ( dev-libs/libgcrypt:0 ) caps? ( sys-libs/libcap ) geoip? ( dev-libs/geoip ) gtk? ( x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango x11-misc/xdg-utils ) kerberos? ( virtual/krb5 ) libssh? ( >=net-libs/libssh-0.6 ) lua? ( >=dev-lang/lua-5.1:* ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 || ( media-libs/speexdsp <media-libs/speex-1.2.0 ) x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) smi? ( net-libs/libsmi ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) gtk? ( virtual/freedesktop-icon-theme ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark )
 REQUIRED_USE=ciscodump? ( libssh ) sshdump? ( libssh ) ssl? ( crypt )
 SLOT=0/2.2.7
 SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-2.2.7.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	fcaps	e80204189039ecc03f24151c518375f0	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=4784bf09514f09cc10682a9956e3288f
+_md5_=156116d66190753f724123e639d38b36
diff --git a/metadata/md5-cache/net-analyzer/wireshark-2.4.2 b/metadata/md5-cache/net-analyzer/wireshark-2.4.2
index ba0ece701d21..6e0a9095696c 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-2.4.2
+++ b/metadata/md5-cache/net-analyzer/wireshark-2.4.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=>=dev-libs/glib-2.14:2 dev-libs/libgcrypt:0 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) caps? ( sys-libs/libcap ) geoip? ( dev-libs/geoip ) gtk? ( x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango x11-misc/xdg-utils ) kerberos? ( virtual/krb5 ) libssh? ( >=net-libs/libssh-0.6 ) libxml2? ( dev-libs/libxml2 ) lua? ( >=dev-lang/lua-5.1:* ) nghttp2? ( net-libs/nghttp2 ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 media-libs/speex x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) dev-lang/perl !<virtual/perl-Pod-Simple-3.170 !<perl-core/Pod-Simple-3.170 doc? ( app-doc/doxygen app-text/asciidoc dev-libs/libxml2 dev-libs/libxslt doc-pdf? ( dev-java/fop ) www-client/lynx ) qt5? ( dev-qt/linguist-tools:5 ) sys-devel/bison sys-devel/flex 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 filecaps? ( sys-libs/libcap ) >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.14:2 dev-libs/libgcrypt:0 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) caps? ( sys-libs/libcap ) geoip? ( dev-libs/geoip ) gtk? ( x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango x11-misc/xdg-utils ) kerberos? ( virtual/krb5 ) libssh? ( >=net-libs/libssh-0.6 ) libxml2? ( dev-libs/libxml2 ) lua? ( >=dev-lang/lua-5.1:* ) nghttp2? ( net-libs/nghttp2 ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 || ( media-libs/speexdsp <media-libs/speex-1.2.0 ) x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) dev-lang/perl !<virtual/perl-Pod-Simple-3.170 !<perl-core/Pod-Simple-3.170 doc? ( app-doc/doxygen app-text/asciidoc dev-libs/libxml2 dev-libs/libxslt doc-pdf? ( dev-java/fop ) www-client/lynx ) qt5? ( dev-qt/linguist-tools:5 ) sys-devel/bison sys-devel/flex 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 filecaps? ( sys-libs/libcap ) >=sys-apps/sed-4
 DESCRIPTION=A network protocol analyzer formerly known as ethereal
 EAPI=6
 HOMEPAGE=https://www.wireshark.org/
 IUSE=adns androiddump +capinfos +caps +captype ciscodump cpu_flags_x86_sse4_2 +dftest doc doc-pdf +dumpcap +editcap geoip gtk kerberos libssh libxml2 lua +mergecap +netlink nghttp2 +pcap portaudio +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl +text2pcap tfshark +tshark +udpdump zlib +filecaps
 KEYWORDS=amd64 arm ~arm64 hppa ia64 ppc ppc64 x86 ~x86-fbsd
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.14:2 dev-libs/libgcrypt:0 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) caps? ( sys-libs/libcap ) geoip? ( dev-libs/geoip ) gtk? ( x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango x11-misc/xdg-utils ) kerberos? ( virtual/krb5 ) libssh? ( >=net-libs/libssh-0.6 ) libxml2? ( dev-libs/libxml2 ) lua? ( >=dev-lang/lua-5.1:* ) nghttp2? ( net-libs/nghttp2 ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 media-libs/speex x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) gtk? ( virtual/freedesktop-icon-theme ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark )
+RDEPEND=>=dev-libs/glib-2.14:2 dev-libs/libgcrypt:0 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) caps? ( sys-libs/libcap ) geoip? ( dev-libs/geoip ) gtk? ( x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango x11-misc/xdg-utils ) kerberos? ( virtual/krb5 ) libssh? ( >=net-libs/libssh-0.6 ) libxml2? ( dev-libs/libxml2 ) lua? ( >=dev-lang/lua-5.1:* ) nghttp2? ( net-libs/nghttp2 ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 || ( media-libs/speexdsp <media-libs/speex-1.2.0 ) x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) gtk? ( virtual/freedesktop-icon-theme ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark )
 REQUIRED_USE=ciscodump? ( libssh ) sshdump? ( libssh )
 SLOT=0/2.4.2
 SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-2.4.2.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	fcaps	e80204189039ecc03f24151c518375f0	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=41ad000a4ebad0f23c284b5e8f853e82
+_md5_=af20cd31e318be8caa0123fc8d43c79d
diff --git a/metadata/md5-cache/net-analyzer/wireshark-2.4.3 b/metadata/md5-cache/net-analyzer/wireshark-2.4.3
index 0f28c7e264fc..284052899758 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-2.4.3
+++ b/metadata/md5-cache/net-analyzer/wireshark-2.4.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=>=dev-libs/glib-2.14:2 dev-libs/libgcrypt:0 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) caps? ( sys-libs/libcap ) geoip? ( dev-libs/geoip ) gtk? ( x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango x11-misc/xdg-utils ) kerberos? ( virtual/krb5 ) libssh? ( >=net-libs/libssh-0.6 ) libxml2? ( dev-libs/libxml2 ) lua? ( >=dev-lang/lua-5.1:* ) lz4? ( app-arch/lz4 ) nghttp2? ( net-libs/nghttp2 ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 media-libs/speex x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) dev-lang/perl !<virtual/perl-Pod-Simple-3.170 !<perl-core/Pod-Simple-3.170 doc? ( app-doc/doxygen app-text/asciidoc dev-libs/libxml2 dev-libs/libxslt doc-pdf? ( dev-java/fop ) www-client/lynx ) qt5? ( dev-qt/linguist-tools:5 ) sys-devel/bison sys-devel/flex 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 filecaps? ( sys-libs/libcap ) >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.14:2 dev-libs/libgcrypt:0 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) caps? ( sys-libs/libcap ) geoip? ( dev-libs/geoip ) gtk? ( x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango x11-misc/xdg-utils ) kerberos? ( virtual/krb5 ) libssh? ( >=net-libs/libssh-0.6 ) libxml2? ( dev-libs/libxml2 ) lua? ( >=dev-lang/lua-5.1:* ) lz4? ( app-arch/lz4 ) nghttp2? ( net-libs/nghttp2 ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 || ( media-libs/speexdsp <media-libs/speex-1.2.0 ) x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) dev-lang/perl !<virtual/perl-Pod-Simple-3.170 !<perl-core/Pod-Simple-3.170 doc? ( app-doc/doxygen app-text/asciidoc dev-libs/libxml2 dev-libs/libxslt doc-pdf? ( dev-java/fop ) www-client/lynx ) qt5? ( dev-qt/linguist-tools:5 ) sys-devel/bison sys-devel/flex 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 filecaps? ( sys-libs/libcap ) >=sys-apps/sed-4
 DESCRIPTION=A network protocol analyzer formerly known as ethereal
 EAPI=6
 HOMEPAGE=https://www.wireshark.org/
 IUSE=adns androiddump +capinfos +caps +captype ciscodump cpu_flags_x86_sse4_2 +dftest doc doc-pdf +dumpcap +editcap geoip gtk kerberos libssh libxml2 lua lz4 +mergecap +netlink nghttp2 +pcap portaudio +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl +text2pcap tfshark +tshark +udpdump zlib +filecaps
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.14:2 dev-libs/libgcrypt:0 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) caps? ( sys-libs/libcap ) geoip? ( dev-libs/geoip ) gtk? ( x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango x11-misc/xdg-utils ) kerberos? ( virtual/krb5 ) libssh? ( >=net-libs/libssh-0.6 ) libxml2? ( dev-libs/libxml2 ) lua? ( >=dev-lang/lua-5.1:* ) lz4? ( app-arch/lz4 ) nghttp2? ( net-libs/nghttp2 ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 media-libs/speex x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) gtk? ( virtual/freedesktop-icon-theme ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark )
+RDEPEND=>=dev-libs/glib-2.14:2 dev-libs/libgcrypt:0 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) caps? ( sys-libs/libcap ) geoip? ( dev-libs/geoip ) gtk? ( x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango x11-misc/xdg-utils ) kerberos? ( virtual/krb5 ) libssh? ( >=net-libs/libssh-0.6 ) libxml2? ( dev-libs/libxml2 ) lua? ( >=dev-lang/lua-5.1:* ) lz4? ( app-arch/lz4 ) nghttp2? ( net-libs/nghttp2 ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 || ( media-libs/speexdsp <media-libs/speex-1.2.0 ) x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) gtk? ( virtual/freedesktop-icon-theme ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark )
 REQUIRED_USE=ciscodump? ( libssh ) sshdump? ( libssh )
 SLOT=0/2.4.3
 SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-2.4.3.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	fcaps	e80204189039ecc03f24151c518375f0	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b00399cbb8b692f53e57cc1438375251
+_md5_=e487dbe49228a9b422b7653fdf5044b5
diff --git a/metadata/md5-cache/net-analyzer/wireshark-99999999 b/metadata/md5-cache/net-analyzer/wireshark-99999999
index cf2781c8fdfb..88e2d7e40ff1 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-99999999
+++ b/metadata/md5-cache/net-analyzer/wireshark-99999999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=dev-libs/glib-2.14:2 dev-libs/libgcrypt:0 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) caps? ( sys-libs/libcap ) geoip? ( dev-libs/geoip ) gtk? ( x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango x11-misc/xdg-utils ) kerberos? ( virtual/krb5 ) libssh? ( >=net-libs/libssh-0.6 ) libxml2? ( dev-libs/libxml2 ) lua? ( >=dev-lang/lua-5.1:* ) lz4? ( app-arch/lz4 ) nghttp2? ( net-libs/nghttp2 ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 media-libs/speex x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) dev-lang/perl !<virtual/perl-Pod-Simple-3.170 !<perl-core/Pod-Simple-3.170 doc? ( app-doc/doxygen app-text/asciidoc dev-libs/libxml2 dev-libs/libxslt doc-pdf? ( dev-java/fop ) www-client/lynx ) qt5? ( dev-qt/linguist-tools:5 ) sys-devel/bison sys-devel/flex 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 filecaps? ( sys-libs/libcap ) >=dev-vcs/git-1.8.2.1 >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.14:2 dev-libs/libgcrypt:0 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) caps? ( sys-libs/libcap ) geoip? ( dev-libs/geoip ) gtk? ( x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango x11-misc/xdg-utils ) kerberos? ( virtual/krb5 ) libssh? ( >=net-libs/libssh-0.6 ) libxml2? ( dev-libs/libxml2 ) lua? ( >=dev-lang/lua-5.1:* ) lz4? ( app-arch/lz4 ) nghttp2? ( net-libs/nghttp2 ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 || ( media-libs/speexdsp <media-libs/speex-1.2.0 ) x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) dev-lang/perl !<virtual/perl-Pod-Simple-3.170 !<perl-core/Pod-Simple-3.170 doc? ( app-doc/doxygen app-text/asciidoc dev-libs/libxml2 dev-libs/libxslt doc-pdf? ( dev-java/fop ) www-client/lynx ) qt5? ( dev-qt/linguist-tools:5 ) sys-devel/bison sys-devel/flex 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 filecaps? ( sys-libs/libcap ) >=dev-vcs/git-1.8.2.1 >=sys-apps/sed-4
 DESCRIPTION=A network protocol analyzer formerly known as ethereal
 EAPI=6
 HOMEPAGE=https://www.wireshark.org/
 IUSE=adns androiddump +capinfos +caps +captype ciscodump cpu_flags_x86_sse4_2 +dftest doc doc-pdf +dumpcap +editcap geoip gtk kerberos libssh libxml2 lua lz4 +mergecap +netlink nghttp2 +pcap portaudio +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl +text2pcap tfshark +tshark +udpdump zlib +filecaps
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.14:2 dev-libs/libgcrypt:0 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) caps? ( sys-libs/libcap ) geoip? ( dev-libs/geoip ) gtk? ( x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango x11-misc/xdg-utils ) kerberos? ( virtual/krb5 ) libssh? ( >=net-libs/libssh-0.6 ) libxml2? ( dev-libs/libxml2 ) lua? ( >=dev-lang/lua-5.1:* ) lz4? ( app-arch/lz4 ) nghttp2? ( net-libs/nghttp2 ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 media-libs/speex x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) gtk? ( virtual/freedesktop-icon-theme ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark )
+RDEPEND=>=dev-libs/glib-2.14:2 dev-libs/libgcrypt:0 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) caps? ( sys-libs/libcap ) geoip? ( dev-libs/geoip ) gtk? ( x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango x11-misc/xdg-utils ) kerberos? ( virtual/krb5 ) libssh? ( >=net-libs/libssh-0.6 ) libxml2? ( dev-libs/libxml2 ) lua? ( >=dev-lang/lua-5.1:* ) lz4? ( app-arch/lz4 ) nghttp2? ( net-libs/nghttp2 ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 || ( media-libs/speexdsp <media-libs/speex-1.2.0 ) x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) gtk? ( virtual/freedesktop-icon-theme ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark )
 REQUIRED_USE=ciscodump? ( libssh ) sshdump? ( libssh )
 SLOT=0/99999999
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	fcaps	e80204189039ecc03f24151c518375f0	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2bbf5998412f1329e3d5b65ef4165e14
+_md5_=a404403ad5d0a127a58714a897ec4e3d
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index a2e4f5d3d7f7..4c6f58ba4928 100644
--- a/metadata/md5-cache/net-dns/Manifest.gz
+++ b/metadata/md5-cache/net-dns/Manifest.gz
diff --git a/metadata/md5-cache/net-dns/dnssec-lookup-2.1 b/metadata/md5-cache/net-dns/dnssec-lookup-2.1
deleted file mode 100644
index d2bfc697a5e9..000000000000
--- a/metadata/md5-cache/net-dns/dnssec-lookup-2.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND==net-dns/dnssec-validator-2.1[threads] dev-qt/qtgui:4
-DESCRIPTION=DNS lookup utility that supports DNSSEC validation
-EAPI=4
-HOMEPAGE=http://www.dnssec-tools.org
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND==net-dns/dnssec-validator-2.1[threads] dev-qt/qtgui:4
-SLOT=0
-SRC_URI=http://www.dnssec-tools.org/download/lookup-2.1.tar.gz -> dnssec-lookup-2.1.tar.gz
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	qt4-r2	b7985a3197fbc3a22d059f19904e735b	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=8cf1eb1b8298c807669fb6bdba12fea0
diff --git a/metadata/md5-cache/net-dns/dnssec-lookup-2.2 b/metadata/md5-cache/net-dns/dnssec-lookup-2.2
index 3bd1f0bec4f2..85b2481bfb0e 100644
--- a/metadata/md5-cache/net-dns/dnssec-lookup-2.2
+++ b/metadata/md5-cache/net-dns/dnssec-lookup-2.2
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND==net-dns/dnssec-validator-2.2[threads] dev-qt/qtgui:4
+DEPEND==net-dns/dnssec-validator-2.2-r1[threads] dev-qt/qtgui:4
 DESCRIPTION=DNS lookup utility that supports DNSSEC validation
 EAPI=5
 HOMEPAGE=http://www.dnssec-tools.org
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND==net-dns/dnssec-validator-2.2[threads] dev-qt/qtgui:4
+RDEPEND==net-dns/dnssec-validator-2.2-r1[threads] dev-qt/qtgui:4
 SLOT=0
 SRC_URI=http://www.dnssec-tools.org/download/lookup-2.2.tar.gz -> dnssec-lookup-2.2.tar.gz
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	qt4-r2	b7985a3197fbc3a22d059f19904e735b	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=07276fb6cb44d35025cccba5ecc792c2
+_md5_=14182b265dcd7aa5f3dd000463e27cc9
diff --git a/metadata/md5-cache/net-dns/dnssec-nodes-2.1 b/metadata/md5-cache/net-dns/dnssec-nodes-2.1
deleted file mode 100644
index fdcc1d7b490a..000000000000
--- a/metadata/md5-cache/net-dns/dnssec-nodes-2.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND==net-dns/dnssec-validator-2.1[threads] dev-qt/qtcore:4
-DESCRIPTION=graphically depicts the DNSSEC results from a lookup via logfiles
-EAPI=4
-HOMEPAGE=http://www.dnssec-tools.org
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==net-dns/dnssec-validator-2.1[threads] dev-qt/qtcore:4
-SLOT=0
-SRC_URI=http://www.dnssec-tools.org/download/dnssec-nodes-2.1.tar.gz
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	qt4-r2	b7985a3197fbc3a22d059f19904e735b	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=63c51e8b4fdcea072c6e0bd1a0503df7
diff --git a/metadata/md5-cache/net-dns/dnssec-nodes-2.2 b/metadata/md5-cache/net-dns/dnssec-nodes-2.2
index ed2ddeb4db9d..2a6fb0e14f6c 100644
--- a/metadata/md5-cache/net-dns/dnssec-nodes-2.2
+++ b/metadata/md5-cache/net-dns/dnssec-nodes-2.2
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND==net-dns/dnssec-validator-2.2[threads] dev-qt/qtcore:4
+DEPEND==net-dns/dnssec-validator-2.2-r1[threads] dev-qt/qtcore:4
 DESCRIPTION=graphically depicts the DNSSEC results from a lookup via logfiles
-EAPI=4
+EAPI=5
 HOMEPAGE=http://www.dnssec-tools.org
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND==net-dns/dnssec-validator-2.2[threads] dev-qt/qtcore:4
+RDEPEND==net-dns/dnssec-validator-2.2-r1[threads] dev-qt/qtcore:4
 SLOT=0
 SRC_URI=http://www.dnssec-tools.org/download/dnssec-nodes-2.2.tar.gz
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	qt4-r2	b7985a3197fbc3a22d059f19904e735b	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=63c51e8b4fdcea072c6e0bd1a0503df7
+_md5_=b7feacd1678c850516e58e1cee2104f7
diff --git a/metadata/md5-cache/net-dns/dnssec-validator-2.1 b/metadata/md5-cache/net-dns/dnssec-validator-2.1
deleted file mode 100644
index d04d42d34a7a..000000000000
--- a/metadata/md5-cache/net-dns/dnssec-validator-2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/openssl !<net-dns/dnssec-tools-1.13
-DESCRIPTION=DNSSEC validator (dnsval)
-EAPI=4
-HOMEPAGE=http://www.dnssec-tools.org/
-IUSE=ipv6 static-libs +threads
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-libs/openssl !<net-dns/dnssec-tools-1.13
-SLOT=0
-SRC_URI=http://www.dnssec-tools.org/download/dnsval-2.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=c5e89990062f28136b5dc3934e437d1f
diff --git a/metadata/md5-cache/net-dns/dnssec-validator-2.2 b/metadata/md5-cache/net-dns/dnssec-validator-2.2-r1
index ca5be892e2a2..f414ac6cedef 100644
--- a/metadata/md5-cache/net-dns/dnssec-validator-2.2
+++ b/metadata/md5-cache/net-dns/dnssec-validator-2.2-r1
@@ -1,13 +1,13 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/openssl !<net-dns/dnssec-tools-1.13
+DEFINED_PHASES=configure install
+DEPEND=dev-libs/openssl:0 ecdsa-check? ( dev-libs/openssl:0[-bindist] ) !<net-dns/dnssec-tools-1.13
 DESCRIPTION=DNSSEC validator (dnsval)
-EAPI=4
+EAPI=6
 HOMEPAGE=http://www.dnssec-tools.org/
-IUSE=ipv6 static-libs +threads
-KEYWORDS=~amd64 ~x86
+IUSE=ipv6 static-libs +threads +ecdsa-check
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-RDEPEND=dev-libs/openssl !<net-dns/dnssec-tools-1.13
+RDEPEND=dev-libs/openssl:0 ecdsa-check? ( dev-libs/openssl:0[-bindist] ) !<net-dns/dnssec-tools-1.13
 SLOT=0
 SRC_URI=http://www.dnssec-tools.org/download/dnsval-2.2.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=dfa7ac8b0f9c1d861360932b4d13d163
+_md5_=65bfc5805a52bfca378a5b4a019e6fd9
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 701e9f36bfe0..37d959755767 100644
--- a/metadata/md5-cache/net-im/Manifest.gz
+++ b/metadata/md5-cache/net-im/Manifest.gz
diff --git a/metadata/md5-cache/net-im/gajim-0.16.6-r1 b/metadata/md5-cache/net-im/gajim-0.16.6-r1
index 46c0d9d31999..cc0dc69cc7e4 100644
--- a/metadata/md5-cache/net-im/gajim-0.16.6-r1
+++ b/metadata/md5-cache/net-im/gajim-0.16.6-r1
@@ -6,10 +6,10 @@ HOMEPAGE=https://www.gajim.org/
 IUSE=crypt dbus gnome gnome-keyring kde idle jingle libnotify networkmanager nls spell +srv test X xhtml zeroconf python_targets_python2_7
 KEYWORDS=amd64 arm ppc ppc64 x86 ~x86-fbsd
 LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-libs/gtk+:2 dev-python/pyasn1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyopenssl-0.14[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-nbxmpp-0.5.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] crypt? ( app-crypt/gnupg dev-python/pycrypto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dbus? ( dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/dbus-glib libnotify? ( dev-python/notify-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) zeroconf? ( net-dns/avahi[dbus,gtk,python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) gnome? ( dev-python/libgnome-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/egg-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnome-keyring? ( dev-python/gnome-keyring-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) idle? ( x11-libs/libXScrnSaver ) jingle? ( net-libs/farstream:0.1[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) kde? ( kde-apps/kwalletmanager ) networkmanager? ( dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-misc/networkmanager ) spell? ( app-text/gtkspell:2 ) srv? ( || ( dev-python/libasyncns-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-dns/bind-tools ) ) xhtml? ( dev-python/docutils[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-libs/gtk+:2 dev-python/pyasn1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyopenssl-0.14[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !>=dev-python/pyopenssl-17.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-nbxmpp-0.5.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] crypt? ( app-crypt/gnupg dev-python/pycrypto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dbus? ( dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/dbus-glib libnotify? ( dev-python/notify-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) zeroconf? ( net-dns/avahi[dbus,gtk,python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) gnome? ( dev-python/libgnome-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/egg-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnome-keyring? ( dev-python/gnome-keyring-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) idle? ( x11-libs/libXScrnSaver ) jingle? ( net-libs/farstream:0.1[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) kde? ( kde-apps/kwalletmanager ) networkmanager? ( dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-misc/networkmanager ) spell? ( app-text/gtkspell:2 ) srv? ( || ( dev-python/libasyncns-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-dns/bind-tools ) ) xhtml? ( dev-python/docutils[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=|| ( python_targets_python2_7 ) libnotify? ( dbus ) gnome? ( gnome-keyring ) zeroconf? ( dbus )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.gajim.org/downloads/0.16/gajim-0.16.6.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=8a499d5f63321a3d7535798f8498cbd2
+_md5_=1fad3e7eb8d73f4930a3eb421b0a2af4
diff --git a/metadata/md5-cache/net-im/gajim-0.16.8 b/metadata/md5-cache/net-im/gajim-0.16.8
deleted file mode 100644
index 43ae62e397cc..000000000000
--- a/metadata/md5-cache/net-im/gajim-0.16.8
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-libs/gtk+:2 >=dev-util/intltool-0.40.1 virtual/pkgconfig >=sys-devel/gettext-0.17-r1 >=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=Jabber client written in PyGTK
-EAPI=5
-HOMEPAGE=https://www.gajim.org/
-IUSE=crypt dbus gnome gnome-keyring kde idle jingle libnotify networkmanager nls spell +srv test X xhtml zeroconf python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd
-LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-libs/gtk+:2 dev-python/pyasn1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyopenssl-0.14[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-nbxmpp-0.5.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] crypt? ( app-crypt/gnupg dev-python/pycrypto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dbus? ( dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/dbus-glib libnotify? ( dev-python/notify-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) zeroconf? ( net-dns/avahi[dbus,gtk,python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) gnome? ( dev-python/libgnome-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/egg-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnome-keyring? ( dev-python/gnome-keyring-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) idle? ( x11-libs/libXScrnSaver ) jingle? ( net-libs/farstream:0.1[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) kde? ( kde-apps/kwalletmanager ) networkmanager? ( dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-misc/networkmanager ) spell? ( app-text/gtkspell:2 ) srv? ( || ( dev-python/libasyncns-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-dns/bind-tools ) ) xhtml? ( dev-python/docutils[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-REQUIRED_USE=|| ( python_targets_python2_7 ) libnotify? ( dbus ) gnome? ( gnome-keyring ) zeroconf? ( dbus )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://www.gajim.org/downloads/0.16/gajim-0.16.8.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=1ecb2f6f428bbf561b676d78133805cd
diff --git a/metadata/md5-cache/net-im/gajim-0.16.8-r1 b/metadata/md5-cache/net-im/gajim-0.16.8-r1
index 6755ac219ff2..81146d19eedb 100644
--- a/metadata/md5-cache/net-im/gajim-0.16.8-r1
+++ b/metadata/md5-cache/net-im/gajim-0.16.8-r1
@@ -6,10 +6,10 @@ HOMEPAGE=https://www.gajim.org/
 IUSE=crypt dbus gnome gnome-keyring idle jingle libnotify networkmanager nls spell +srv test X xhtml zeroconf python_targets_python2_7
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd
 LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-libs/gtk+:2 dev-python/pyasn1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyopenssl-0.14[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-nbxmpp-0.5.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] crypt? ( >=dev-python/python-gnupg-0.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dbus? ( dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/dbus-glib libnotify? ( dev-python/notify-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) zeroconf? ( net-dns/avahi[dbus,gtk,python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) gnome? ( dev-python/libgnome-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/egg-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnome-keyring? ( dev-python/gnome-keyring-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) idle? ( x11-libs/libXScrnSaver ) jingle? ( net-libs/farstream:0.1[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) networkmanager? ( dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-misc/networkmanager ) spell? ( app-text/gtkspell:2 ) srv? ( || ( dev-python/libasyncns-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-dns/bind-tools ) ) xhtml? ( dev-python/docutils[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-libs/gtk+:2 dev-python/pyasn1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyopenssl-0.14[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !>=dev-python/pyopenssl-17.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-nbxmpp-0.5.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] crypt? ( >=dev-python/python-gnupg-0.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dbus? ( dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/dbus-glib libnotify? ( dev-python/notify-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) zeroconf? ( net-dns/avahi[dbus,gtk,python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) gnome? ( dev-python/libgnome-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/egg-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnome-keyring? ( dev-python/gnome-keyring-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) idle? ( x11-libs/libXScrnSaver ) jingle? ( net-libs/farstream:0.1[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) networkmanager? ( dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-misc/networkmanager ) spell? ( app-text/gtkspell:2 ) srv? ( || ( dev-python/libasyncns-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-dns/bind-tools ) ) xhtml? ( dev-python/docutils[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=|| ( python_targets_python2_7 ) libnotify? ( dbus ) gnome? ( gnome-keyring ) zeroconf? ( dbus )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.gajim.org/downloads/0.16/gajim-0.16.8.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=63da51946d8f73ff29dab9610b736819
+_md5_=f9e47f6fb72775924e95f6c33d6d6846
diff --git a/metadata/md5-cache/net-im/gajim-0.16.9 b/metadata/md5-cache/net-im/gajim-0.16.9
new file mode 100644
index 000000000000..006ebfff5da9
--- /dev/null
+++ b/metadata/md5-cache/net-im/gajim-0.16.9
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-libs/gtk+:2 >=dev-util/intltool-0.40.1 virtual/pkgconfig >=sys-devel/gettext-0.17-r1 >=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=Jabber client written in PyGTK
+EAPI=5
+HOMEPAGE=https://www.gajim.org/
+IUSE=crypt dbus gnome gnome-keyring idle jingle libnotify networkmanager nls spell +srv test X xhtml zeroconf python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd
+LICENSE=GPL-3
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-libs/gtk+:2 dev-python/pyasn1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyopenssl-0.14[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-nbxmpp-0.6.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] crypt? ( >=dev-python/python-gnupg-0.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dbus? ( dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/dbus-glib libnotify? ( dev-python/notify-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) zeroconf? ( net-dns/avahi[dbus,gtk,python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) gnome? ( dev-python/libgnome-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/egg-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnome-keyring? ( dev-python/gnome-keyring-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) idle? ( x11-libs/libXScrnSaver ) jingle? ( net-libs/farstream:0.1[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) networkmanager? ( dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-misc/networkmanager ) spell? ( app-text/gtkspell:2 ) srv? ( || ( dev-python/libasyncns-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-dns/bind-tools ) ) xhtml? ( dev-python/docutils[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+REQUIRED_USE=|| ( python_targets_python2_7 ) libnotify? ( dbus ) gnome? ( gnome-keyring ) zeroconf? ( dbus )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://www.gajim.org/downloads/0.16/gajim-0.16.9.tar.bz2
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e443716afd6f63992c6d7e539cfcfcff
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index 85c961622b82..b2b0c33c7d90 100644
--- a/metadata/md5-cache/net-irc/Manifest.gz
+++ b/metadata/md5-cache/net-irc/Manifest.gz
diff --git a/metadata/md5-cache/net-irc/znc-9999 b/metadata/md5-cache/net-irc/znc-9999
index 6cad97d0c015..2024e5a51f5e 100644
--- a/metadata/md5-cache/net-irc/znc-9999
+++ b/metadata/md5-cache/net-irc/znc-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
-DEPEND=icu? ( dev-libs/icu:= ) nls? ( dev-libs/boost:=[nls] ) perl? ( >=dev-lang/perl-5.10:= ) python? ( python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tcl? ( dev-lang/tcl:0= ) zlib? ( sys-libs/zlib ) nls? ( sys-devel/gettext ) virtual/pkgconfig perl? ( >=dev-lang/swig-3.0.0 ) python? ( >=dev-lang/swig-3.0.0 ) sys-devel/make >=dev-util/cmake-3.7.2 virtual/pkgconfig >=dev-vcs/git-1.8.2.1
+DEPEND=icu? ( dev-libs/icu:= ) nls? ( dev-libs/boost:=[nls] ) perl? ( >=dev-lang/perl-5.10:= ) python? ( python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tcl? ( dev-lang/tcl:0= ) zlib? ( sys-libs/zlib:0= ) nls? ( sys-devel/gettext ) virtual/pkgconfig perl? ( >=dev-lang/swig-3.0.0 ) python? ( >=dev-lang/swig-3.0.0 ) sys-devel/make >=dev-util/cmake-3.7.2 virtual/pkgconfig >=dev-vcs/git-1.8.2.1
 DESCRIPTION=An advanced IRC Bouncer
 EAPI=6
 HOMEPAGE=http://znc.in
-IUSE=+ipv6 +icu libressl nls perl python +ssl sasl tcl test +zlib linguas_ru python_targets_python3_4 python_targets_python3_5 python_single_target_python3_4 python_single_target_python3_5
+IUSE=+ipv6 +icu libressl nls perl python +ssl sasl tcl test +zlib linguas_de linguas_ru python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
 LICENSE=Apache-2.0
-RDEPEND=icu? ( dev-libs/icu:= ) nls? ( dev-libs/boost:=[nls] ) perl? ( >=dev-lang/perl-5.10:= ) python? ( python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tcl? ( dev-lang/tcl:0= ) zlib? ( sys-libs/zlib )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) icu )
+RDEPEND=icu? ( dev-libs/icu:= ) nls? ( dev-libs/boost:=[nls] ) perl? ( >=dev-lang/perl-5.10:= ) python? ( python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tcl? ( dev-lang/tcl:0= ) zlib? ( sys-libs/zlib:0= )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) icu )
 SLOT=0
 _eclasses_=cmake-utils	77a5a8d3308359caadcdd91688f20093	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	l10n	2c2e15383ba891d642f51896a7f0ecfe	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5e09622fa5b3b26468e368950461e64d
+_md5_=e427f676ab3b91790d3c699403d05a51
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index 20d8d27d8dd7..7e9d466a39b9 100644
--- a/metadata/md5-cache/net-mail/Manifest.gz
+++ b/metadata/md5-cache/net-mail/Manifest.gz
diff --git a/metadata/md5-cache/net-mail/eps-1.7 b/metadata/md5-cache/net-mail/eps-1.7
deleted file mode 100644
index a830e9365288..000000000000
--- a/metadata/md5-cache/net-mail/eps-1.7
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=sys-apps/sed
-DESCRIPTION=Inter7 Email Processing and mht System library
-EAPI=3
-HOMEPAGE=http://www.inter7.com/eps
-KEYWORDS=~amd64 ppc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www.inter7.com/eps/eps-1.7.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=7b418e8d088bb326303d678505958d98
diff --git a/metadata/md5-cache/net-mail/eps-1.7-r1 b/metadata/md5-cache/net-mail/eps-1.7-r1
index 014c69366727..c2d0a148dd3e 100644
--- a/metadata/md5-cache/net-mail/eps-1.7-r1
+++ b/metadata/md5-cache/net-mail/eps-1.7-r1
@@ -3,9 +3,9 @@ DEPEND=sys-apps/sed
 DESCRIPTION=Inter7 Email Processing and mht System library
 EAPI=6
 HOMEPAGE=http://www.inter7.com/eps
-KEYWORDS=~amd64 ~ppc x86
+KEYWORDS=~amd64 ppc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.inter7.com/eps/eps-1.7.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=3902a49ac8906daa2a3310f4de3eea24
+_md5_=055ee98f2dcc2db46d8da30b20afe338
diff --git a/metadata/md5-cache/net-mail/mpack-1.6-r3 b/metadata/md5-cache/net-mail/mpack-1.6-r3
deleted file mode 100644
index c21e97c2043a..000000000000
--- a/metadata/md5-cache/net-mail/mpack-1.6-r3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Command-line MIME encoding and decoding utilities
-EAPI=3
-HOMEPAGE=ftp://ftp.andrew.cmu.edu/pub/mpack/
-KEYWORDS=amd64 x86 ~ppc-macos ~sparc-solaris ~x86-solaris
-LICENSE=HPND
-SLOT=0
-SRC_URI=ftp://ftp.andrew.cmu.edu/pub/mpack/mpack-1.6.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=26e44e3b056b99d8598e0959c53c2647
diff --git a/metadata/md5-cache/net-mail/mpack-1.6-r4 b/metadata/md5-cache/net-mail/mpack-1.6-r4
index 1ad11755f8d3..76080ce0b5db 100644
--- a/metadata/md5-cache/net-mail/mpack-1.6-r4
+++ b/metadata/md5-cache/net-mail/mpack-1.6-r4
@@ -3,9 +3,9 @@ DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >
 DESCRIPTION=Command-line MIME encoding and decoding utilities
 EAPI=6
 HOMEPAGE=ftp://ftp.andrew.cmu.edu/pub/mpack/
-KEYWORDS=~amd64 x86 ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=amd64 x86 ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=HPND
 SLOT=0
 SRC_URI=ftp://ftp.andrew.cmu.edu/pub/mpack/mpack-1.6.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=36b23a51164417f3c859ac50947d1ada
+_md5_=4cc1bbe6911306625cb9dab7e1827647
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 421a4e4f4ad8..b800cab6e7bc 100644
--- a/metadata/md5-cache/net-misc/Manifest.gz
+++ b/metadata/md5-cache/net-misc/Manifest.gz
diff --git a/metadata/md5-cache/net-misc/connect-1.100 b/metadata/md5-cache/net-misc/connect-1.100
deleted file mode 100644
index 63b9935b8a50..000000000000
--- a/metadata/md5-cache/net-misc/connect-1.100
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install postinst
-DESCRIPTION=network connection relaying command (proxy)
-EAPI=3
-HOMEPAGE=https://bitbucket.org/gotoh/connect
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://bitbucket.org/gotoh/connect/get/7c036cbffb61.tar.bz2 -> connect-1.100.tar.bz2
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=09630814cbf036a0e11186a0727e7ca8
diff --git a/metadata/md5-cache/net-misc/connect-1.103 b/metadata/md5-cache/net-misc/connect-1.103
index 93b359f81055..75bbfd1e2a09 100644
--- a/metadata/md5-cache/net-misc/connect-1.103
+++ b/metadata/md5-cache/net-misc/connect-1.103
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install postinst
 DESCRIPTION=network connection relaying command (proxy)
 EAPI=5
 HOMEPAGE=https://bitbucket.org/gotoh/connect
-KEYWORDS=~amd64 ~ppc64 x86
+KEYWORDS=amd64 ~ppc64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://bitbucket.org/gotoh/connect/get/ee1fbc21da4b.tar.bz2 -> connect-1.103.tar.bz2
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=21925d62f6c27980723f3f3f5035d547
+_md5_=b20c5ee79d3e440f5da01f29faf04b3c
diff --git a/metadata/md5-cache/net-misc/teamviewer-13.0.5693 b/metadata/md5-cache/net-misc/teamviewer-13.0.5693
new file mode 100644
index 000000000000..47caaa05415c
--- /dev/null
+++ b/metadata/md5-cache/net-misc/teamviewer-13.0.5693
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=sys-apps/sed >=sys-apps/sed-4 virtual/pkgconfig
+DESCRIPTION=All-In-One Solution for Remote Access and Support over the Internet
+EAPI=6
+HOMEPAGE=https://www.teamviewer.com
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=TeamViewer MIT
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 sys-apps/dbus
+RESTRICT=bindist mirror
+SLOT=13
+SRC_URI=amd64? ( https://dl.tvcdn.de/download/linux/version_13x/teamviewer_13.0.5693_amd64.tar.xz ) x86? ( https://dl.tvcdn.de/download/linux/version_13x/teamviewer_13.0.5693_i386.tar.xz )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a527c78ce65af53404c201f9443a85c8
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2017.11.26-r1 b/metadata/md5-cache/net-misc/youtube-dl-2017.12.14
index 940ffc4bc3cf..afd7de2ce4c3 100644
--- a/metadata/md5-cache/net-misc/youtube-dl-2017.11.26-r1
+++ b/metadata/md5-cache/net-misc/youtube-dl-2017.12.14
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile configure install prepare test
+DEFINED_PHASES=compile configure install postinst prepare test
 DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[coverage(+)] ) 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=Download videos from YouTube.com (and more sites...)
 EAPI=6
@@ -9,6 +9,6 @@ LICENSE=public-domain
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
-SRC_URI=http://youtube-dl.org/downloads/2017.11.26/youtube-dl-2017.11.26.tar.gz
+SRC_URI=http://youtube-dl.org/downloads/2017.12.14/youtube-dl-2017.12.14.tar.gz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c83ae0657fc77df55aa1a9dc579472cd
+_md5_=dc65130309857818b981580dd61fc4e3
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index b8d1ff681533..8bdbadf53970 100644
--- a/metadata/md5-cache/net-vpn/Manifest.gz
+++ b/metadata/md5-cache/net-vpn/Manifest.gz
diff --git a/metadata/md5-cache/net-vpn/tor-0.3.1.8 b/metadata/md5-cache/net-vpn/tor-0.3.1.8
deleted file mode 100644
index ea15fc309a6e..000000000000
--- a/metadata/md5-cache/net-vpn/tor-0.3.1.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install setup
-DEPEND=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 ) virtual/pkgconfig
-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
-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.8.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.3.1.8.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	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=87f370554a19f1412f49b2259494d303
diff --git a/metadata/md5-cache/net-vpn/tor-0.3.1.9 b/metadata/md5-cache/net-vpn/tor-0.3.1.9-r1
index bc7853dfe854..6a74fc86114b 100644
--- a/metadata/md5-cache/net-vpn/tor-0.3.1.9
+++ b/metadata/md5-cache/net-vpn/tor-0.3.1.9-r1
@@ -10,4 +10,4 @@ RDEPEND=app-text/asciidoc dev-libs/libevent[ssl] sys-libs/zlib !libressl? ( dev-
 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	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=87f370554a19f1412f49b2259494d303
+_md5_=490f3ee7acba41adb0e03638a85f8c75
diff --git a/metadata/md5-cache/net-vpn/tor-0.3.2.7_rc b/metadata/md5-cache/net-vpn/tor-0.3.2.7_rc-r1
index 1a2605b5caba..88c27503c434 100644
--- a/metadata/md5-cache/net-vpn/tor-0.3.2.7_rc
+++ b/metadata/md5-cache/net-vpn/tor-0.3.2.7_rc-r1
@@ -10,4 +10,4 @@ RDEPEND=app-text/asciidoc dev-libs/libevent[ssl] sys-libs/zlib !libressl? ( dev-
 SLOT=0
 SRC_URI=https://www.torproject.org/dist/tor-0.3.2.7-rc.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.3.2.7-rc.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	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=87f370554a19f1412f49b2259494d303
+_md5_=490f3ee7acba41adb0e03638a85f8c75
diff --git a/metadata/md5-cache/sci-chemistry/Manifest.gz b/metadata/md5-cache/sci-chemistry/Manifest.gz
index 0381f14b7bb1..d2ace3858a5f 100644
--- a/metadata/md5-cache/sci-chemistry/Manifest.gz
+++ b/metadata/md5-cache/sci-chemistry/Manifest.gz
diff --git a/metadata/md5-cache/sci-chemistry/namd-2.10 b/metadata/md5-cache/sci-chemistry/namd-2.10
index b8255bc550dc..fc103673374b 100644
--- a/metadata/md5-cache/sci-chemistry/namd-2.10
+++ b/metadata/md5-cache/sci-chemistry/namd-2.10
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install nofetch postinst prepare
-DEPEND=>=sys-cluster/charm-6.5.1-r2 sci-libs/fftw:3.0 dev-lang/tcl:0= app-shells/tcsh
+DEPEND=>=sys-cluster/charm-6.5.1-r2 sci-libs/fftw:3.0 dev-lang/tcl:0= virtual/pkgconfig app-shells/tcsh
 DESCRIPTION=A powerful and highly parallelized molecular dynamics code
-EAPI=5
+EAPI=6
 HOMEPAGE=http://www.ks.uiuc.edu/Research/namd/
 KEYWORDS=~amd64
 LICENSE=namd
 RDEPEND=>=sys-cluster/charm-6.5.1-r2 sci-libs/fftw:3.0 dev-lang/tcl:0=
 RESTRICT=fetch
 SLOT=0
-SRC_URI=NAMD_2.10_Source.tar.gz
+SRC_URI=NAMD_2.10_Source.tar
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=1e1c9277696a47a8356482167a1c6d08
+_md5_=c0a6bd40eda6f0ef0a0c9110ad0e4b7b
diff --git a/metadata/md5-cache/sci-chemistry/namd-2.9-r1 b/metadata/md5-cache/sci-chemistry/namd-2.9-r1
deleted file mode 100644
index afffd6246232..000000000000
--- a/metadata/md5-cache/sci-chemistry/namd-2.9-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst prepare
-DEPEND=>=sys-cluster/charm-6.5.1-r2 sci-libs/fftw:3.0 dev-lang/tcl:0= app-shells/tcsh
-DESCRIPTION=A powerful and highly parallelized molecular dynamics code
-EAPI=5
-HOMEPAGE=http://www.ks.uiuc.edu/Research/namd/
-KEYWORDS=~amd64
-LICENSE=namd
-RDEPEND=>=sys-cluster/charm-6.5.1-r2 sci-libs/fftw:3.0 dev-lang/tcl:0=
-RESTRICT=fetch
-SLOT=0
-SRC_URI=NAMD_2.9_Source.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=0244e38e527e9f8fb4d418543c985848
diff --git a/metadata/md5-cache/sci-chemistry/tinker-7.1.2 b/metadata/md5-cache/sci-chemistry/tinker-8.2.1
index 1334f0153b5d..ec544b4f837a 100644
--- a/metadata/md5-cache/sci-chemistry/tinker-7.1.2
+++ b/metadata/md5-cache/sci-chemistry/tinker-8.2.1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile install preinst prepare setup test
 DEPEND=>=virtual/jdk-1.6 virtual/fortran java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=Molecular modeling package that includes force fields, such as AMBER and CHARMM
-EAPI=5
+EAPI=6
 HOMEPAGE=http://dasher.wustl.edu/tinker/
 IUSE=examples elibc_FreeBSD java
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
@@ -9,6 +9,6 @@ LICENSE=Tinker
 RDEPEND=>=sci-libs/fftw-3.2.2-r1[fortran,threads] dev-libs/maloc !sys-apps/bar !dev-util/diffuse >=virtual/jre-1.6 virtual/fortran java? ( >=dev-java/java-config-2.2.0-r3 )
 RESTRICT=mirror
 SLOT=0
-SRC_URI=http://dasher.wustl.edu/tinker/downloads/tinker-7.1.2.tar.gz
+SRC_URI=http://dasher.wustl.edu/tinker/downloads/tinker-8.2.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=827bba5138af9b4f31f808e8fbc15c77
+_md5_=f5c8e4b651fff9dc3a4d051350f5c72f
diff --git a/metadata/md5-cache/sci-chemistry/xdsstat-bin-140225 b/metadata/md5-cache/sci-chemistry/xdsstat-bin-171217
index 95612d4ebd7e..0fec9bc12f35 100644
--- a/metadata/md5-cache/sci-chemistry/xdsstat-bin-140225
+++ b/metadata/md5-cache/sci-chemistry/xdsstat-bin-171217
@@ -1,6 +1,6 @@
 DEFINED_PHASES=install
 DESCRIPTION=Prints various statistics (that are not available from XDS itself)
-EAPI=5
+EAPI=6
 HOMEPAGE=http://strucbio.biologie.uni-konstanz.de/xdswiki/index.php/XDSSTAT
 KEYWORDS=~amd64 ~amd64-linux
 LICENSE=all-rights-reserved
@@ -8,4 +8,4 @@ RDEPEND=sci-chemistry/xds-bin
 RESTRICT=mirror
 SLOT=0
 SRC_URI=amd64? ( ftp://turn5.biologie.uni-konstanz.de/pub/xdsstat-linux64.bz2 ) x86? ( ftp://turn5.biologie.uni-konstanz.de/pub/xdsstat-linux32.bz2 )
-_md5_=507e7c579a71eb03960a08847ac16f6e
+_md5_=58b628a2a44a7ac9d9aefa0a3a8affcf
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 47c7d79587ee..79074c3772cd 100644
--- a/metadata/md5-cache/sci-libs/Manifest.gz
+++ b/metadata/md5-cache/sci-libs/Manifest.gz
diff --git a/metadata/md5-cache/sci-libs/gsl-1.16 b/metadata/md5-cache/sci-libs/gsl-1.16
index ae670ea346e3..b05431223219 100644
--- a/metadata/md5-cache/sci-libs/gsl-1.16
+++ b/metadata/md5-cache/sci-libs/gsl-1.16
@@ -8,6 +8,6 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd
 LICENSE=GPL-3
 RDEPEND=cblas-external? ( virtual/cblas )
 SLOT=0
-SRC_URI=mirror://gnu/gsl/gsl-1.16.tar.gz
+SRC_URI=mirror://gnu/gsl/gsl-1.16.tar.gz https://dev.gentoo.org/~mgorny/dist/gsl-1.16-cblas.patch.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=fb9db9a816429ae603c99e53b0db6402
+_md5_=5d377e856c6f64bfc0ec45883ac4d7ce
diff --git a/metadata/md5-cache/sci-libs/gsl-2.1 b/metadata/md5-cache/sci-libs/gsl-2.1
deleted file mode 100644
index fcf81df24524..000000000000
--- a/metadata/md5-cache/sci-libs/gsl-2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare pretend test
-DEPEND=cblas-external? ( virtual/cblas ) app-eselect/eselect-cblas 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=The GNU Scientific Library
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/gsl/
-IUSE=cblas-external static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=GPL-3
-RDEPEND=cblas-external? ( virtual/cblas )
-SLOT=0/19
-SRC_URI=mirror://gnu/gsl/gsl-2.1.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=07726c4192b065e182a9259fe1d2a13e
diff --git a/metadata/md5-cache/sci-libs/gsl-2.3 b/metadata/md5-cache/sci-libs/gsl-2.3
deleted file mode 100644
index 92e3474b5d14..000000000000
--- a/metadata/md5-cache/sci-libs/gsl-2.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare pretend test
-DEPEND=cblas-external? ( virtual/cblas ) app-eselect/eselect-cblas 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=The GNU Scientific Library
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/gsl/
-IUSE=cblas-external +deprecated static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=GPL-3
-RDEPEND=cblas-external? ( virtual/cblas )
-SLOT=0/19.3
-SRC_URI=mirror://gnu/gsl/gsl-2.3.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=d6bdac0e2cc56e0184d139cdb332c56c
diff --git a/metadata/md5-cache/sci-libs/gsl-2.4 b/metadata/md5-cache/sci-libs/gsl-2.4
index c1740da627e8..ada17656f7d6 100644
--- a/metadata/md5-cache/sci-libs/gsl-2.4
+++ b/metadata/md5-cache/sci-libs/gsl-2.4
@@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spar
 LICENSE=GPL-3
 RDEPEND=cblas-external? ( virtual/cblas:= )
 SLOT=0/23
-SRC_URI=mirror://gnu/gsl/gsl-2.4.tar.gz
+SRC_URI=mirror://gnu/gsl/gsl-2.4.tar.gz https://dev.gentoo.org/~mgorny/dist/gsl-2.3-cblas.patch.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=db28012f02e0c22cdfd8bb6303012127
+_md5_=59709a3583c9f004b12ab9b12f6a5513
diff --git a/metadata/md5-cache/sci-libs/mmdb-1.25.6.1 b/metadata/md5-cache/sci-libs/mmdb-1.25.6.1
new file mode 100644
index 000000000000..53a2daf69784
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/mmdb-1.25.6.1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=The Coordinate Library for working with CCP4 coordinate files
+EAPI=6
+HOMEPAGE=https://launchpad.net/mmdb/
+IUSE=static-libs
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+LICENSE=GPL-2 LGPL-3
+SLOT=0
+SRC_URI=https://launchpad.net/mmdb/1.25/1.25.6.1/+download/mmdb-1.25.6.1.tar.gz
+_md5_=2ce7b211455698d23881932cdd4e773e
diff --git a/metadata/md5-cache/sci-libs/mmdb-2.0.5 b/metadata/md5-cache/sci-libs/mmdb-2.0.5
new file mode 100644
index 000000000000..59e05e7b1e01
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/mmdb-2.0.5
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=The Coordinate Library for working with CCP4 coordinate files
+EAPI=6
+HOMEPAGE=https://launchpad.net/mmdb/
+IUSE=static-libs
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+LICENSE=GPL-2 LGPL-3
+SLOT=2
+SRC_URI=ftp://ftp.ccp4.ac.uk/opensource/mmdb2-2.0.5.tar.gz
+_md5_=0b2d3c8201a67dd71571a893c04312d6
diff --git a/metadata/md5-cache/sci-physics/Manifest.gz b/metadata/md5-cache/sci-physics/Manifest.gz
index 5f865e9ed6c4..29d32b69fe75 100644
--- a/metadata/md5-cache/sci-physics/Manifest.gz
+++ b/metadata/md5-cache/sci-physics/Manifest.gz
diff --git a/metadata/md5-cache/sci-physics/root-6.12.04 b/metadata/md5-cache/sci-physics/root-6.12.04-r1
index 978ae54934ac..86ecd569628b 100644
--- a/metadata/md5-cache/sci-physics/root-6.12.04
+++ b/metadata/md5-cache/sci-physics/root-6.12.04-r1
@@ -7,8 +7,8 @@ IUSE=+X avahi aqua +asimage davix emacs +examples fits fftw fortran +gdml graphv
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA
 RDEPEND=app-arch/lz4 app-arch/xz-utils fortran? ( dev-lang/cfortran ) dev-libs/libpcre:3= media-fonts/dejavu media-libs/freetype:2= media-libs/libpng:0= sys-libs/ncurses:= sys-libs/zlib:0= X? ( x11-libs/libX11:0= x11-libs/libXext:0= x11-libs/libXft:0= x11-libs/libXpm:0= opengl? ( media-libs/ftgl:0= media-libs/glew:0= virtual/opengl virtual/glu x11-libs/gl2ps:0= ) qt4? ( dev-qt/qtcore:4= dev-qt/qtgui:4= opengl? ( dev-qt/qtopengl:4= ) ) ) asimage? ( || ( media-libs/libafterimage[gif,jpeg,png,tiff?] >=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff?] ) ) avahi? ( net-dns/avahi[mdnsresponder-compat] ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:0= ) graphviz? ( media-gfx/graphviz:0= ) gsl? ( sci-libs/gsl ) http? ( dev-libs/fcgi:0= ) jemalloc? ( dev-libs/jemalloc ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:0= ) libcxx? ( sys-libs/libcxx ) unuran? ( sci-mathematics/unuran:0= ) minuit? ( !sci-libs/minuit ) mysql? ( virtual/mysql ) odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:= ) pythia6? ( sci-physics/pythia:6= ) pythia8? ( sci-physics/pythia:8= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) 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(+)?] ) R? ( dev-lang/R ) shadow? ( virtual/shadow ) sqlite? ( dev-db/sqlite:3= ) ssl? ( dev-libs/openssl:0= ) tbb? ( dev-cpp/tbb ) vc? ( dev-libs/vc ) xml? ( dev-libs/libxml2:2= ) xrootd? ( net-libs/xrootd:0= ) xinetd? ( sys-apps/xinetd ) fortran? ( virtual/fortran )
-REQUIRED_USE=!X? ( !asimage !opengl !qt4 !tiff ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) ) pythia6? ( !pythia8 ) pythia8? ( !pythia6 ) tmva? ( math gsl ) davix? ( ssl )
+REQUIRED_USE=!X? ( !asimage !opengl !qt4 !tiff ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) ) tmva? ( math gsl ) davix? ( ssl )
 SLOT=6.12/04
 SRC_URI=https://root.cern/download/root_v6.12.04.source.tar.gz
 _eclasses_=cmake-utils	77a5a8d3308359caadcdd91688f20093	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=20acde5e489a9da2bdbb8b217da0d9fd
+_md5_=d8b9f30d6360821e64397685f8265d28
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 5c7b914bad5b..1196de7e4e21 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/dbus-broker-9999 b/metadata/md5-cache/sys-apps/dbus-broker-9999
index 58260f3e7e4b..cf9c38e85360 100644
--- a/metadata/md5-cache/sys-apps/dbus-broker-9999
+++ b/metadata/md5-cache/sys-apps/dbus-broker-9999
@@ -8,4 +8,4 @@ LICENSE=Apache-2.0
 RDEPEND=audit? ( sys-process/audit ) launcher? ( >=dev-libs/expat-2.2 >=dev-libs/glib-2.50:2 >=sys-apps/systemd-230 ) selinux? ( sys-libs/libselinux )
 SLOT=0
 _eclasses_=git-r3	fec09a83ae965b041b47f5ff7c8ba29a	meson	0946ddca90e9c2d3e4687bb097dd9ed3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=50798d8458c4ca23bad7120339d34102
+_md5_=b172dcc4dd55c7cb88ecd0398efecadf
diff --git a/metadata/md5-cache/sys-apps/mtree-1.0.1 b/metadata/md5-cache/sys-apps/mtree-1.0.4
index f494cf56ec1c..b48d3104ea02 100644
--- a/metadata/md5-cache/sys-apps/mtree-1.0.1
+++ b/metadata/md5-cache/sys-apps/mtree-1.0.4
@@ -1,11 +1,11 @@
 DEFINED_PHASES=install prepare
 DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Directory hierarchy mapping tool from FreeBSD
-EAPI=5
+EAPI=6
 HOMEPAGE=https://github.com/archiecobbs/mtree-port
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 SLOT=0
-SRC_URI=https://mtree-port.googlecode.com/files/mtree-1.0.1.tar.gz
+SRC_URI=https://github.com/archiecobbs/mtree-port/archive/1.0.4.tar.gz -> mtree-1.0.4.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=a03fc55e2c53b05efaa5ce677cfd3ba7
+_md5_=cac58a1e11495a950307411b1f0d489f
diff --git a/metadata/md5-cache/sys-apps/paxctld-1.1 b/metadata/md5-cache/sys-apps/paxctld-1.1
deleted file mode 100644
index 29aa1551dc41..000000000000
--- a/metadata/md5-cache/sys-apps/paxctld-1.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=virtual/pkgconfig
-DESCRIPTION=PaX flags maintenance daemon
-EAPI=5
-HOMEPAGE=http://www.grsecurity.net/
-IUSE=pam
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://www.grsecurity.net/paxctld/paxctld_1.1.orig.tar.gz https://dev.gentoo.org/~blueness/hardened-sources/paxctld/paxctld_1.1.orig.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=f1d5527c9183a1e9acb8676cbfcfbfe9
diff --git a/metadata/md5-cache/sys-apps/paxctld-1.2 b/metadata/md5-cache/sys-apps/paxctld-1.2
deleted file mode 100644
index c58f1ae1c4b9..000000000000
--- a/metadata/md5-cache/sys-apps/paxctld-1.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=virtual/pkgconfig
-DESCRIPTION=PaX flags maintenance daemon
-EAPI=5
-HOMEPAGE=http://www.grsecurity.net/
-IUSE=pam
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://www.grsecurity.net/paxctld/paxctld_1.2.orig.tar.gz https://dev.gentoo.org/~blueness/hardened-sources/paxctld/paxctld_1.2.orig.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=f1d5527c9183a1e9acb8676cbfcfbfe9
diff --git a/metadata/md5-cache/sys-apps/paxctld-1.2.1 b/metadata/md5-cache/sys-apps/paxctld-1.2.2
index 6c56d4ab8bae..575d3de5e004 100644
--- a/metadata/md5-cache/sys-apps/paxctld-1.2.1
+++ b/metadata/md5-cache/sys-apps/paxctld-1.2.2
@@ -1,12 +1,12 @@
 DEFINED_PHASES=install prepare
 DEPEND=virtual/pkgconfig
 DESCRIPTION=PaX flags maintenance daemon
-EAPI=5
+EAPI=6
 HOMEPAGE=http://www.grsecurity.net/
 IUSE=pam
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 SLOT=0
-SRC_URI=https://www.grsecurity.net/paxctld/paxctld_1.2.1.orig.tar.gz https://dev.gentoo.org/~blueness/hardened-sources/paxctld/paxctld_1.2.1.orig.tar.gz
+SRC_URI=https://www.grsecurity.net/paxctld/paxctld_1.2.2.orig.tar.gz https://dev.gentoo.org/~blueness/hardened-sources/paxctld/paxctld_1.2.2.orig.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=f1d5527c9183a1e9acb8676cbfcfbfe9
+_md5_=ab097708c93a0a5333a3c1d36de6f5bd
diff --git a/metadata/md5-cache/sys-apps/systemd-233-r4 b/metadata/md5-cache/sys-apps/systemd-233-r4
deleted file mode 100644
index 728cfc1b4176..000000000000
--- a/metadata/md5-cache/sys-apps/systemd-233-r4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare prerm pretend setup test unpack
-DEPEND=>=sys-apps/util-linux-2.27.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap: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.16 acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5: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(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0= ssl? ( >=net-libs/gnutls-3.1.4:0= ) ) idn? ( net-dns/libidn:0= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( virtual/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.1:0= ) selinux? ( sys-libs/libselinux:0= ) sysv-utils? ( !sys-apps/systemd-sysv-utils !sys-apps/sysvinit ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) app-arch/xz-utils:0 dev-util/gperf >=dev-util/intltool-0.50 >=sys-apps/coreutils-8.16 >=sys-kernel/linux-headers-3.11 virtual/pkgconfig gnuefi? ( >=sys-boot/gnu-efi-3.0.2 ) test? ( sys-apps/dbus ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 doc? ( || ( ( dev-lang/python:3.6 dev-python/lxml[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/lxml[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( dev-lang/python:3.4 dev-python/lxml[python_targets_python3_4(-),python_single_target_python3_4(+)] ) ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=System and service manager for Linux
-EAPI=6
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
-IUSE=acl apparmor audit build cryptsetup curl doc elfutils +gcrypt gnuefi http idn importd +kmod +lz4 lzma nat pam policykit qrcode +seccomp selinux ssl sysv-utils test vanilla xkb abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sparc x86
-LICENSE=GPL-2 LGPL-2.1 MIT public-domain
-PDEPEND=>=sys-apps/dbus-1.9.8[systemd] >=sys-apps/hwids-20150417[udev] >=sys-fs/udev-init-scripts-25 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
-RDEPEND=>=sys-apps/util-linux-2.27.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap: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.16 acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5: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(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0= ssl? ( >=net-libs/gnutls-3.1.4:0= ) ) idn? ( net-dns/libidn:0= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( virtual/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.1:0= ) selinux? ( sys-libs/libselinux:0= ) sysv-utils? ( !sys-apps/systemd-sysv-utils !sys-apps/sysvinit ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) >=sys-apps/baselayout-2.2 selinux? ( sec-policy/selinux-base-policy[systemd] ) !build? ( || ( sys-apps/util-linux[kill(-)] sys-process/procps[kill(+)] sys-apps/coreutils[kill(-)] ) ) !sys-auth/nss-myhostname !<sys-kernel/dracut-044 !sys-fs/eudev !sys-fs/udev
-REQUIRED_USE=importd? ( curl gcrypt lzma )
-SLOT=0/2
-SRC_URI=https://github.com/systemd/systemd/archive/v233.tar.gz -> systemd-233.tar.gz !doc? ( https://dev.gentoo.org/~floppym/dist/systemd-233-man.tar.gz )
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pam	3e788d86170dfcd5b06824d898315e18	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	185a06792159ca143528e7010368e8af	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=0eae581f45b851c18c1bee8f40327802
diff --git a/metadata/md5-cache/sys-apps/systemd-233-r5 b/metadata/md5-cache/sys-apps/systemd-233-r5
deleted file mode 100644
index 8b177e5aa2c6..000000000000
--- a/metadata/md5-cache/sys-apps/systemd-233-r5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare prerm pretend setup test unpack
-DEPEND=>=sys-apps/util-linux-2.27.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap: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.16 acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5: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(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0= ssl? ( >=net-libs/gnutls-3.1.4:0= ) ) idn? ( net-dns/libidn:0= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( virtual/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.1:0= ) selinux? ( sys-libs/libselinux:0= ) sysv-utils? ( !sys-apps/systemd-sysv-utils !sys-apps/sysvinit ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) app-arch/xz-utils:0 dev-util/gperf >=dev-util/intltool-0.50 >=sys-apps/coreutils-8.16 >=sys-kernel/linux-headers-3.11 virtual/pkgconfig gnuefi? ( >=sys-boot/gnu-efi-3.0.2 ) test? ( sys-apps/dbus ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 doc? ( || ( ( dev-lang/python:3.6 dev-python/lxml[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/lxml[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( dev-lang/python:3.4 dev-python/lxml[python_targets_python3_4(-),python_single_target_python3_4(+)] ) ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=System and service manager for Linux
-EAPI=6
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
-IUSE=acl apparmor audit build cryptsetup curl doc elfutils +gcrypt gnuefi http idn importd +kmod +lz4 lzma nat pam policykit qrcode +seccomp selinux ssl sysv-utils test vanilla xkb abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
-LICENSE=GPL-2 LGPL-2.1 MIT public-domain
-PDEPEND=>=sys-apps/dbus-1.9.8[systemd] >=sys-apps/hwids-20150417[udev] >=sys-fs/udev-init-scripts-25 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
-RDEPEND=>=sys-apps/util-linux-2.27.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap: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.16 acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5: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(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0= ssl? ( >=net-libs/gnutls-3.1.4:0= ) ) idn? ( net-dns/libidn:0= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( virtual/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.1:0= ) selinux? ( sys-libs/libselinux:0= ) sysv-utils? ( !sys-apps/systemd-sysv-utils !sys-apps/sysvinit ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) >=sys-apps/baselayout-2.2 selinux? ( sec-policy/selinux-base-policy[systemd] ) !build? ( || ( sys-apps/util-linux[kill(-)] sys-process/procps[kill(+)] sys-apps/coreutils[kill(-)] ) ) !sys-auth/nss-myhostname !<sys-kernel/dracut-044 !sys-fs/eudev !sys-fs/udev
-REQUIRED_USE=importd? ( curl gcrypt lzma )
-SLOT=0/2
-SRC_URI=https://github.com/systemd/systemd/archive/v233.tar.gz -> systemd-233.tar.gz !doc? ( https://dev.gentoo.org/~floppym/dist/systemd-233-man.tar.gz )
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pam	3e788d86170dfcd5b06824d898315e18	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	185a06792159ca143528e7010368e8af	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=6c2aa75a13795f6a8fe8095b5019a75e
diff --git a/metadata/md5-cache/sys-apps/systemd-233-r6 b/metadata/md5-cache/sys-apps/systemd-233-r6
index e654f5abf736..e911215a5a58 100644
--- a/metadata/md5-cache/sys-apps/systemd-233-r6
+++ b/metadata/md5-cache/sys-apps/systemd-233-r6
@@ -10,6 +10,6 @@ PDEPEND=>=sys-apps/dbus-1.9.8[systemd] >=sys-apps/hwids-20150417[udev] >=sys-fs/
 RDEPEND=>=sys-apps/util-linux-2.27.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap: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.16 acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5: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(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0= ssl? ( >=net-libs/gnutls-3.1.4:0= ) ) idn? ( net-dns/libidn:0= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( virtual/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.1:0= ) selinux? ( sys-libs/libselinux:0= ) sysv-utils? ( !sys-apps/systemd-sysv-utils !sys-apps/sysvinit ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) >=sys-apps/baselayout-2.2 selinux? ( sec-policy/selinux-base-policy[systemd] ) !build? ( || ( sys-apps/util-linux[kill(-)] sys-process/procps[kill(+)] sys-apps/coreutils[kill(-)] ) ) !sys-auth/nss-myhostname !<sys-kernel/dracut-044 !sys-fs/eudev !sys-fs/udev
 REQUIRED_USE=importd? ( curl gcrypt lzma )
 SLOT=0/2
-SRC_URI=https://github.com/systemd/systemd/archive/v233.tar.gz -> systemd-233.tar.gz !doc? ( https://dev.gentoo.org/~floppym/dist/systemd-233-man.tar.gz )
+SRC_URI=https://github.com/systemd/systemd/archive/v233.tar.gz -> systemd-233.tar.gz https://dev.gentoo.org/~floppym/dist/systemd-233-patches.tar.gz !doc? ( https://dev.gentoo.org/~floppym/dist/systemd-233-man.tar.gz )
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pam	3e788d86170dfcd5b06824d898315e18	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	185a06792159ca143528e7010368e8af	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=1562bb957351aecaacbc14fed2c07f06
+_md5_=695ff94741eea0e9e0bb77878b2dcf98
diff --git a/metadata/md5-cache/sys-apps/systemd-236 b/metadata/md5-cache/sys-apps/systemd-236
index f7345be87c3e..6a8a296e164d 100644
--- a/metadata/md5-cache/sys-apps/systemd-236
+++ b/metadata/md5-cache/sys-apps/systemd-236
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/systemd/systemd/archive/v236.tar.gz -> systemd-236.tar.gz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	meson	0946ddca90e9c2d3e4687bb097dd9ed3	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pam	3e788d86170dfcd5b06824d898315e18	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	185a06792159ca143528e7010368e8af	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=0869c59235bf8d3da27eba4b0c45bc81
+_md5_=0adcc41fabaf9c2b777fc887538b9595
diff --git a/metadata/md5-cache/sys-apps/systemd-9999 b/metadata/md5-cache/sys-apps/systemd-9999
index 2eba0c53cce0..54eab782a2cd 100644
--- a/metadata/md5-cache/sys-apps/systemd-9999
+++ b/metadata/md5-cache/sys-apps/systemd-9999
@@ -11,4 +11,4 @@ REQUIRED_USE=importd? ( curl gcrypt lzma )
 RESTRICT=!test? ( test )
 SLOT=0/2
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	meson	0946ddca90e9c2d3e4687bb097dd9ed3	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pam	3e788d86170dfcd5b06824d898315e18	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	185a06792159ca143528e7010368e8af	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=0869c59235bf8d3da27eba4b0c45bc81
+_md5_=0adcc41fabaf9c2b777fc887538b9595
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.28.2 b/metadata/md5-cache/sys-apps/util-linux-2.28.2
deleted file mode 100644
index d8b501ff9014..000000000000
--- a/metadata/md5-cache/sys-apps/util-linux-2.28.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib ) ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) pam? ( sys-libs/pam ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) 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(+)?] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( sys-devel/bc ) virtual/os-headers >=app-portage/elt-patches-20170422 virtual/pkgconfig
-DESCRIPTION=Various useful Linux utilities
-EAPI=5
-HOMEPAGE=https://www.kernel.org/pub/linux/utils/util-linux/
-IUSE=build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 abi_x86_32 abi_x86_64 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 ~arm-linux ~x86-linux
-LICENSE=GPL-2 LGPL-2.1 BSD-4 MIT public-domain
-RDEPEND=caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib ) ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) pam? ( sys-libs/pam ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) 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(+)?] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) kill? ( !sys-apps/coreutils[kill] !sys-process/procps[kill] ) !sys-process/schedutils !sys-apps/setarch !<sys-apps/sysvinit-2.88-r7 !sys-block/eject !<sys-libs/e2fsprogs-libs-1.41.8 !<sys-fs/e2fsprogs-1.41.8 !<app-shells/bash-completion-2.3-r2
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
-SLOT=0
-SRC_URI=mirror://kernel/linux/utils/util-linux/v2.28/util-linux-2.28.2.tar.xz
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=b85c31b5619261c72fcbd861d7e90f4f
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.29.2-r1 b/metadata/md5-cache/sys-apps/util-linux-2.29.2-r1
deleted file mode 100644
index 782fa8f0ac16..000000000000
--- a/metadata/md5-cache/sys-apps/util-linux-2.29.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib ) ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) pam? ( sys-libs/pam ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) 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(+)?] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( sys-devel/bc ) virtual/os-headers >=app-portage/elt-patches-20170422 virtual/pkgconfig
-DESCRIPTION=Various useful Linux utilities
-EAPI=5
-HOMEPAGE=https://www.kernel.org/pub/linux/utils/util-linux/
-IUSE=build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 abi_x86_32 abi_x86_64 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 ~arm-linux ~x86-linux
-LICENSE=GPL-2 LGPL-2.1 BSD-4 MIT public-domain
-RDEPEND=caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib ) ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) pam? ( sys-libs/pam ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) 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(+)?] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) kill? ( !sys-apps/coreutils[kill] !sys-process/procps[kill] ) !sys-process/schedutils !sys-apps/setarch !<sys-apps/sysvinit-2.88-r7 !sys-block/eject !<sys-libs/e2fsprogs-libs-1.41.8 !<sys-fs/e2fsprogs-1.41.8 !<app-shells/bash-completion-2.3-r2
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
-SLOT=0
-SRC_URI=mirror://kernel/linux/utils/util-linux/v2.29/util-linux-2.29.2.tar.xz
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pam	3e788d86170dfcd5b06824d898315e18	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=dad20a80e37bfea7f17cbdac282eed02
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.30.1 b/metadata/md5-cache/sys-apps/util-linux-2.31-r1
index 5753323c0340..80dccd328b65 100644
--- a/metadata/md5-cache/sys-apps/util-linux-2.30.1
+++ b/metadata/md5-cache/sys-apps/util-linux-2.31-r1
@@ -6,9 +6,9 @@ HOMEPAGE=https://www.kernel.org/pub/linux/utils/util-linux/
 IUSE=build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 abi_x86_32 abi_x86_64 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 ~arm-linux ~x86-linux
 LICENSE=GPL-2 LGPL-2.1 BSD-4 MIT public-domain
-RDEPEND=caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib ) ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) pam? ( sys-libs/pam ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) 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(+)?] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) kill? ( !sys-apps/coreutils[kill] !sys-process/procps[kill] ) !sys-process/schedutils !sys-apps/setarch !<sys-apps/sysvinit-2.88-r7 !sys-block/eject !<sys-libs/e2fsprogs-libs-1.41.8 !<sys-fs/e2fsprogs-1.41.8 !<app-shells/bash-completion-2.3-r2
+RDEPEND=caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib ) ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) pam? ( sys-libs/pam ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) 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(+)?] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) kill? ( !sys-apps/coreutils[kill] !sys-process/procps[kill] ) !net-wireless/rfkill !sys-process/schedutils !sys-apps/setarch !<sys-apps/sysvinit-2.88-r7 !sys-block/eject !<sys-libs/e2fsprogs-libs-1.41.8 !<sys-fs/e2fsprogs-1.41.8 !<app-shells/bash-completion-2.7-r1
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=0
-SRC_URI=mirror://kernel/linux/utils/util-linux/v2.30/util-linux-2.30.1.tar.xz
+SRC_URI=mirror://kernel/linux/utils/util-linux/v2.31/util-linux-2.31.tar.xz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pam	3e788d86170dfcd5b06824d898315e18	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=65b77ffba913d374cde636ef9648103c
+_md5_=e3a8995b3a8401de23a97ae259ad2561
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index f27ad4baceee..b45dab2a2d3e 100644
--- a/metadata/md5-cache/sys-auth/Manifest.gz
+++ b/metadata/md5-cache/sys-auth/Manifest.gz
diff --git a/metadata/md5-cache/sys-auth/nss_ldap-258 b/metadata/md5-cache/sys-auth/nss_ldap-258
deleted file mode 100644
index 738b5cbb6188..000000000000
--- a/metadata/md5-cache/sys-auth/nss_ldap-258
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst unpack
-DEPEND=>=net-nds/openldap-2.1.30-r5 sasl? ( dev-libs/cyrus-sasl ) kerberos? ( virtual/krb5 ) >=sys-apps/sed-4 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=NSS LDAP Module
-EAPI=0
-HOMEPAGE=http://www.padl.com/OSS/nss_ldap.html
-IUSE=debug sasl kerberos
-KEYWORDS=alpha amd64 hppa ~ia64 ~mips ppc ppc64 sparc x86
-LICENSE=LGPL-2
-RDEPEND=>=net-nds/openldap-2.1.30-r5 sasl? ( dev-libs/cyrus-sasl ) kerberos? ( virtual/krb5 ) !<net-fs/autofs-4.1.3
-SLOT=0
-SRC_URI=http://www.padl.com/download/nss_ldap-258.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=3d1bca5f05fca5a4b4fe356837090930
diff --git a/metadata/md5-cache/sys-auth/nss_ldap-259 b/metadata/md5-cache/sys-auth/nss_ldap-259
deleted file mode 100644
index 68299470273a..000000000000
--- a/metadata/md5-cache/sys-auth/nss_ldap-259
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst unpack
-DEPEND=>=net-nds/openldap-2.1.30-r5 sasl? ( dev-libs/cyrus-sasl ) kerberos? ( virtual/krb5 ) >=sys-apps/sed-4 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=NSS LDAP Module
-EAPI=0
-HOMEPAGE=http://www.padl.com/OSS/nss_ldap.html
-IUSE=debug sasl kerberos
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=LGPL-2
-RDEPEND=>=net-nds/openldap-2.1.30-r5 sasl? ( dev-libs/cyrus-sasl ) kerberos? ( virtual/krb5 ) !<net-fs/autofs-4.1.3
-SLOT=0
-SRC_URI=http://www.padl.com/download/nss_ldap-259.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=b32b0cd2e80095d98a816857fb72850e
diff --git a/metadata/md5-cache/sys-auth/nss_ldap-261 b/metadata/md5-cache/sys-auth/nss_ldap-261
deleted file mode 100644
index 3ea621bb1c5a..000000000000
--- a/metadata/md5-cache/sys-auth/nss_ldap-261
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst unpack
-DEPEND=>=net-nds/openldap-2.1.30-r5 sasl? ( dev-libs/cyrus-sasl ) kerberos? ( virtual/krb5 ) >=sys-apps/sed-4 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=NSS LDAP Module
-EAPI=0
-HOMEPAGE=http://www.padl.com/OSS/nss_ldap.html
-IUSE=debug sasl kerberos
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=LGPL-2
-RDEPEND=>=net-nds/openldap-2.1.30-r5 sasl? ( dev-libs/cyrus-sasl ) kerberos? ( virtual/krb5 ) !<net-fs/autofs-4.1.3
-SLOT=0
-SRC_URI=http://www.padl.com/download/nss_ldap-261.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=1220a0091a29d330268a2cab72934565
diff --git a/metadata/md5-cache/sys-auth/nss_ldap-262 b/metadata/md5-cache/sys-auth/nss_ldap-262
deleted file mode 100644
index aac0bca27779..000000000000
--- a/metadata/md5-cache/sys-auth/nss_ldap-262
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst unpack
-DEPEND=>=net-nds/openldap-2.1.30-r5 sasl? ( dev-libs/cyrus-sasl ) kerberos? ( virtual/krb5 ) >=sys-apps/sed-4 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=NSS LDAP Module
-EAPI=0
-HOMEPAGE=http://www.padl.com/OSS/nss_ldap.html
-IUSE=debug sasl kerberos
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=LGPL-2
-RDEPEND=>=net-nds/openldap-2.1.30-r5 sasl? ( dev-libs/cyrus-sasl ) kerberos? ( virtual/krb5 ) !<net-fs/autofs-4.1.3
-SLOT=0
-SRC_URI=http://www.padl.com/download/nss_ldap-262.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=1220a0091a29d330268a2cab72934565
diff --git a/metadata/md5-cache/sys-auth/nss_ldap-264 b/metadata/md5-cache/sys-auth/nss_ldap-264
deleted file mode 100644
index 915d7aebfb80..000000000000
--- a/metadata/md5-cache/sys-auth/nss_ldap-264
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=net-nds/openldap-2.1.30-r5 sasl? ( dev-libs/cyrus-sasl ) kerberos? ( virtual/krb5 ) ssl? ( dev-libs/openssl ) >=sys-apps/sed-4 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=NSS LDAP Module
-EAPI=2
-HOMEPAGE=http://www.padl.com/OSS/nss_ldap.html
-IUSE=debug ssl sasl kerberos
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=LGPL-2
-RDEPEND=>=net-nds/openldap-2.1.30-r5 sasl? ( dev-libs/cyrus-sasl ) kerberos? ( virtual/krb5 ) ssl? ( dev-libs/openssl ) !<net-fs/autofs-4.1.3
-SLOT=0
-SRC_URI=http://www.padl.com/download/nss_ldap-264.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=5e2c8e96f71102a618f4f81402958b4c
diff --git a/metadata/md5-cache/sys-auth/nss_ldap-264-r1 b/metadata/md5-cache/sys-auth/nss_ldap-264-r1
deleted file mode 100644
index 320fbbe63581..000000000000
--- a/metadata/md5-cache/sys-auth/nss_ldap-264-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=net-nds/openldap-2.1.30-r5 sasl? ( dev-libs/cyrus-sasl ) kerberos? ( virtual/krb5 ) ssl? ( dev-libs/openssl ) >=sys-apps/sed-4 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=NSS LDAP Module
-EAPI=2
-HOMEPAGE=http://www.padl.com/OSS/nss_ldap.html
-IUSE=debug ssl sasl kerberos
-KEYWORDS=alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86
-LICENSE=LGPL-2
-RDEPEND=>=net-nds/openldap-2.1.30-r5 sasl? ( dev-libs/cyrus-sasl ) kerberos? ( virtual/krb5 ) ssl? ( dev-libs/openssl ) !<net-fs/autofs-4.1.3
-SLOT=0
-SRC_URI=http://www.padl.com/download/nss_ldap-264.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=560547c6976121d65e567ff38bce6425
diff --git a/metadata/md5-cache/sys-auth/nss_ldap-265 b/metadata/md5-cache/sys-auth/nss_ldap-265
deleted file mode 100644
index 57cfecdd413c..000000000000
--- a/metadata/md5-cache/sys-auth/nss_ldap-265
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=net-nds/openldap-2.1.30-r5 sasl? ( dev-libs/cyrus-sasl ) kerberos? ( virtual/krb5 ) ssl? ( dev-libs/openssl ) >=sys-apps/sed-4 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=NSS LDAP Module
-EAPI=2
-HOMEPAGE=http://www.padl.com/OSS/nss_ldap.html
-IUSE=debug ssl sasl kerberos
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=LGPL-2
-RDEPEND=>=net-nds/openldap-2.1.30-r5 sasl? ( dev-libs/cyrus-sasl ) kerberos? ( virtual/krb5 ) ssl? ( dev-libs/openssl ) !<net-fs/autofs-4.1.3
-SLOT=0
-SRC_URI=http://www.padl.com/download/nss_ldap-265.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=7b9e8e2a0e87508159a4717d0a4a8619
diff --git a/metadata/md5-cache/sys-auth/nss_ldap-265-r1 b/metadata/md5-cache/sys-auth/nss_ldap-265-r1
deleted file mode 100644
index ff807befc9f5..000000000000
--- a/metadata/md5-cache/sys-auth/nss_ldap-265-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=net-nds/openldap-2.1.30-r5 sasl? ( dev-libs/cyrus-sasl ) kerberos? ( virtual/krb5 ) ssl? ( dev-libs/openssl ) >=sys-apps/sed-4 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=NSS LDAP Module
-EAPI=2
-HOMEPAGE=http://www.padl.com/OSS/nss_ldap.html
-IUSE=debug ssl sasl kerberos
-KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86
-LICENSE=LGPL-2
-RDEPEND=>=net-nds/openldap-2.1.30-r5 sasl? ( dev-libs/cyrus-sasl ) kerberos? ( virtual/krb5 ) ssl? ( dev-libs/openssl ) !<net-fs/autofs-4.1.3
-SLOT=0
-SRC_URI=http://www.padl.com/download/nss_ldap-265.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=3107be3e6c480fd48e3d008e9c4fba57
diff --git a/metadata/md5-cache/sys-auth/nss_ldap-265-r2 b/metadata/md5-cache/sys-auth/nss_ldap-265-r2
deleted file mode 100644
index 91cbddb240a8..000000000000
--- a/metadata/md5-cache/sys-auth/nss_ldap-265-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=net-nds/openldap-2.1.30-r5 sasl? ( dev-libs/cyrus-sasl ) kerberos? ( virtual/krb5 ) ssl? ( dev-libs/openssl:0 ) >=sys-apps/sed-4 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=NSS LDAP Module
-EAPI=5
-HOMEPAGE=http://www.padl.com/OSS/nss_ldap.html
-IUSE=debug ssl sasl kerberos
-KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux
-LICENSE=LGPL-2
-RDEPEND=>=net-nds/openldap-2.1.30-r5 sasl? ( dev-libs/cyrus-sasl ) kerberos? ( virtual/krb5 ) ssl? ( dev-libs/openssl:0 ) !<net-fs/autofs-4.1.3
-SLOT=0
-SRC_URI=http://www.padl.com/download/nss_ldap-265.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=36211781a5bd67aa80ceecc598c138e9
diff --git a/metadata/md5-cache/sys-auth/nss_ldap-265-r4 b/metadata/md5-cache/sys-auth/nss_ldap-265-r4
deleted file mode 100644
index f7f8432ba5e1..000000000000
--- a/metadata/md5-cache/sys-auth/nss_ldap-265-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=net-nds/openldap-2.1.30-r5 sasl? ( dev-libs/cyrus-sasl ) kerberos? ( virtual/krb5 ) ssl? ( dev-libs/openssl:0 ) >=sys-apps/sed-4 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=NSS LDAP Module
-EAPI=5
-HOMEPAGE=http://www.padl.com/OSS/nss_ldap.html
-IUSE=debug ssl sasl kerberos
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
-LICENSE=LGPL-2
-RDEPEND=>=net-nds/openldap-2.1.30-r5 sasl? ( dev-libs/cyrus-sasl ) kerberos? ( virtual/krb5 ) ssl? ( dev-libs/openssl:0 ) !<net-fs/autofs-4.1.3
-SLOT=0
-SRC_URI=http://www.padl.com/download/nss_ldap-265.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=b98f7ec01a67b870834f961a3eb0c1ae
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index 4aed877299e4..8351b962c67d 100644
--- a/metadata/md5-cache/sys-cluster/Manifest.gz
+++ b/metadata/md5-cache/sys-cluster/Manifest.gz
diff --git a/metadata/md5-cache/sys-cluster/charm-6.7.1 b/metadata/md5-cache/sys-cluster/charm-6.7.1
index 70b9acc544e2..64d8064a661e 100644
--- a/metadata/md5-cache/sys-cluster/charm-6.7.1
+++ b/metadata/md5-cache/sys-cluster/charm-6.7.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst prepare setup test
-DEPEND=mpi? ( virtual/mpi ) doc? ( >=app-text/poppler-0.12.3-r3[utils] dev-tex/latex2html virtual/tex-base || ( ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-python/beautifulsoup-4[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/lxml[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) media-libs/netpbm || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) virtual/fortran
+DEPEND=mpi? ( virtual/mpi ) doc? ( >=app-text/poppler-0.12.3-r3[utils] dev-tex/latex2html virtual/tex-base || ( ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-python/beautifulsoup-4[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/lxml[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) media-libs/netpbm || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) net-libs/libtirpc virtual/fortran
 DESCRIPTION=Message-passing parallel language and runtime system
 EAPI=5
 HOMEPAGE=http://charm.cs.uiuc.edu/
@@ -11,4 +11,4 @@ REQUIRED_USE=cmkopt? ( !charmdebug !charmtracing ) charmproduction? ( !charmdebu
 SLOT=0
 SRC_URI=http://charm.cs.uiuc.edu/distrib/charm-6.7.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=69d83c32b7dd0b8bffd6c04fccd894e9
+_md5_=2cc02533e174b68ab61f7d862654824d
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 8c0900d9bb3b..bfe6d7fc5a8f 100644
--- a/metadata/md5-cache/sys-fs/Manifest.gz
+++ b/metadata/md5-cache/sys-fs/Manifest.gz
diff --git a/metadata/md5-cache/sys-fs/cryptsetup-2.0.0-r1 b/metadata/md5-cache/sys-fs/cryptsetup-2.0.0-r1
index 2722bae440f3..cbcbef088bdc 100644
--- a/metadata/md5-cache/sys-fs/cryptsetup-2.0.0-r1
+++ b/metadata/md5-cache/sys-fs/cryptsetup-2.0.0-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install prepare setup test
-DEPEND=static-libs? ( dev-libs/json-c[static-libs(+)] dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[static-libs(+)] sys-apps/util-linux[static-libs(+)] argon2? ( app-crypt/argon2[static-libs(+)] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:=[static-libs(+)] ) ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] udev? ( virtual/libudev[static-libs(+)] ) ) dev-libs/json-c dev-libs/libgpg-error dev-libs/popt sys-apps/util-linux argon2? ( app-crypt/argon2 ) gcrypt? ( dev-libs/libgcrypt:0= ) nettle? ( >=dev-libs/nettle-2.4 ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) pwquality? ( dev-libs/libpwquality ) sys-fs/lvm2 udev? ( virtual/libudev ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) 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(+)?] ) virtual/pkgconfig static? ( dev-libs/json-c[static-libs(+)] dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[static-libs(+)] sys-apps/util-linux[static-libs(+)] argon2? ( app-crypt/argon2[static-libs(+)] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:=[static-libs(+)] ) ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] udev? ( virtual/libudev[static-libs(+)] ) ) >=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=static-libs? ( dev-libs/json-c[static-libs(+)] dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[static-libs(+)] >=sys-apps/util-linux-2.31-r1[static-libs(+)] argon2? ( app-crypt/argon2[static-libs(+)] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:=[static-libs(+)] ) ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] udev? ( virtual/libudev[static-libs(+)] ) ) dev-libs/json-c dev-libs/libgpg-error dev-libs/popt >=sys-apps/util-linux-2.31-r1 argon2? ( app-crypt/argon2 ) gcrypt? ( dev-libs/libgcrypt:0= ) nettle? ( >=dev-libs/nettle-2.4 ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) pwquality? ( dev-libs/libpwquality ) sys-fs/lvm2 udev? ( virtual/libudev ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) 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(+)?] ) virtual/pkgconfig static? ( dev-libs/json-c[static-libs(+)] dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[static-libs(+)] >=sys-apps/util-linux-2.31-r1[static-libs(+)] argon2? ( app-crypt/argon2[static-libs(+)] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:=[static-libs(+)] ) ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] udev? ( virtual/libudev[static-libs(+)] ) ) >=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=Tool to setup encrypted devices with dm-crypt
 EAPI=6
 HOMEPAGE=https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md
 IUSE=+gcrypt kernel nettle openssl +argon2 libressl nls pwquality python reencrypt static static-libs udev urandom python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 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 ~arm64 ~mips ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2+
-RDEPEND=static-libs? ( dev-libs/json-c[static-libs(+)] dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[static-libs(+)] sys-apps/util-linux[static-libs(+)] argon2? ( app-crypt/argon2[static-libs(+)] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:=[static-libs(+)] ) ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] udev? ( virtual/libudev[static-libs(+)] ) ) dev-libs/json-c dev-libs/libgpg-error dev-libs/popt sys-apps/util-linux argon2? ( app-crypt/argon2 ) gcrypt? ( dev-libs/libgcrypt:0= ) nettle? ( >=dev-libs/nettle-2.4 ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) pwquality? ( dev-libs/libpwquality ) sys-fs/lvm2 udev? ( virtual/libudev ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) 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(+)?] )
+RDEPEND=static-libs? ( dev-libs/json-c[static-libs(+)] dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[static-libs(+)] >=sys-apps/util-linux-2.31-r1[static-libs(+)] argon2? ( app-crypt/argon2[static-libs(+)] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:=[static-libs(+)] ) ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] udev? ( virtual/libudev[static-libs(+)] ) ) dev-libs/json-c dev-libs/libgpg-error dev-libs/popt >=sys-apps/util-linux-2.31-r1 argon2? ( app-crypt/argon2 ) gcrypt? ( dev-libs/libgcrypt:0= ) nettle? ( >=dev-libs/nettle-2.4 ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) pwquality? ( dev-libs/libpwquality ) sys-fs/lvm2 udev? ( virtual/libudev ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) 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=^^ ( gcrypt kernel nettle openssl ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) ) static? ( !gcrypt )
 SLOT=0/12
 SRC_URI=mirror://kernel/linux/utils/cryptsetup/v2.0/cryptsetup-2.0.0.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=d276f80fc93382416ed10369903fb504
+_md5_=2525f39e6d11029f2f5aa992e8dd142c
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index f1050ecf2865..b2b67b69a347 100644
--- a/metadata/md5-cache/sys-kernel/Manifest.gz
+++ b/metadata/md5-cache/sys-kernel/Manifest.gz
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.13.10 b/metadata/md5-cache/sys-kernel/aufs-sources-4.13.10
deleted file mode 100644
index 1270cb8470dc..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.13.10
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 freedist
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.13.10
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.13.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.13_p20171002.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.13-12.base.tar.xz mirror://gentoo/genpatches-4.13-12.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.13-12.experimental.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	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=3494cda771b5ee7c604560a4088ce23e
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.13.11 b/metadata/md5-cache/sys-kernel/aufs-sources-4.13.11
deleted file mode 100644
index a067445dc5d7..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.13.11
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 freedist
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.13.11
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.13.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.13_p20171030.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.13-13.base.tar.xz mirror://gentoo/genpatches-4.13-13.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.13-13.experimental.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	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=5b07ec8f0d1c88c44eb7e7e499ae51d0
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.13.12 b/metadata/md5-cache/sys-kernel/aufs-sources-4.13.12
deleted file mode 100644
index 3759d764e2c9..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.13.12
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 freedist
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.13.12
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.13.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.13_p20171106.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.13-14.base.tar.xz mirror://gentoo/genpatches-4.13-14.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.13-14.experimental.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	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=d044c6343f3c0b21d83624a1e006abb4
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.13.13 b/metadata/md5-cache/sys-kernel/aufs-sources-4.13.13
deleted file mode 100644
index 9c74c25b3a85..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.13.13
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 freedist
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.13.13
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.13.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.13_p20171106.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.13-15.base.tar.xz mirror://gentoo/genpatches-4.13-15.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.13-15.experimental.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	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=d7015e78026315b000a8a5827031216f
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.13.14 b/metadata/md5-cache/sys-kernel/aufs-sources-4.13.14
deleted file mode 100644
index 13a4159dbbaa..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.13.14
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 freedist
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.13.14
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.13.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.13_p20171120.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.13-17.base.tar.xz mirror://gentoo/genpatches-4.13-17.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.13-17.experimental.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	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=fc67655101b341aab0142e9514223f6f
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.2 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.2
deleted file mode 100644
index e03303a419ec..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 freedist
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.14.2
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14_p20171120.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.14-3.base.tar.xz mirror://gentoo/genpatches-4.14-3.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-3.experimental.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	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=08e672a72f1c43b63b1c9958fbee86e3
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.3 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.3
deleted file mode 100644
index 52a750f0814f..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 freedist
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.14.3
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14_p20171120.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.14-4.base.tar.xz mirror://gentoo/genpatches-4.14-4.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-4.experimental.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	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=98dbaed2bbe514d15f5a72678124e305
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.1 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.6
index 4e330fc0c447..f0cde343281f 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.1
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.6
@@ -9,7 +9,7 @@ LICENSE=GPL-2 freedist
 PDEPEND==sys-fs/aufs-util-4*
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=4.14.1
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14_p20171120.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.14-2.base.tar.xz mirror://gentoo/genpatches-4.14-2.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-2.experimental.tar.xz ) )
+SLOT=4.14.6
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14_p20171127.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.14-7.base.tar.xz mirror://gentoo/genpatches-4.14-7.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-7.experimental.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	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=0d94a12594ece078934dc5e82be05813
+_md5_=49dc6e2d6abc39c00bc74f51b0824637
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.100 b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.100
deleted file mode 100644
index ad2c4ec22c8c..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.100
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 freedist
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.4.100
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20171120.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-104.base.tar.xz mirror://gentoo/genpatches-4.4-104.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-104.experimental.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	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=0de05f3854e953b8a1453e3d5f120803
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.103 b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.103
deleted file mode 100644
index 3ea090499739..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.103
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 freedist
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.4.103
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20171120.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-106.base.tar.xz mirror://gentoo/genpatches-4.4-106.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-106.experimental.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	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=cf1a7c79d1132650a4e09305448bf079
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.102 b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.106
index 76e7da647785..442824f582b9 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.102
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.106
@@ -9,7 +9,7 @@ LICENSE=GPL-2 freedist
 PDEPEND==sys-fs/aufs-util-4*
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=4.4.102
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20171120.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-105.base.tar.xz mirror://gentoo/genpatches-4.4-105.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-105.experimental.tar.xz ) )
+SLOT=4.4.106
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20171127.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-109.base.tar.xz mirror://gentoo/genpatches-4.4-109.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-109.experimental.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	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=40df1e924202d7ce954ceb41036bc912
+_md5_=91894117a01f6cce45f4295ad2e3019d
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.95 b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.95
deleted file mode 100644
index 6dc59734a4f9..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.95
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 freedist
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.4.95
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20171002.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-99.base.tar.xz mirror://gentoo/genpatches-4.4-99.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-99.experimental.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	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=10709f7bbdb599d933709ac06f5fea8c
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.96 b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.96
deleted file mode 100644
index a9c4ffbcce51..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.96
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 freedist
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.4.96
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20171002.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-100.base.tar.xz mirror://gentoo/genpatches-4.4-100.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-100.experimental.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	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=787663aed6af624c4f49d59aacec4ac5
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.97 b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.97
deleted file mode 100644
index 83612e23ecd1..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.97
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 freedist
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.4.97
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20171106.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-101.base.tar.xz mirror://gentoo/genpatches-4.4-101.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-101.experimental.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	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=f4a10d0253a37311927deef089a3d619
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.98 b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.98
deleted file mode 100644
index 641669074406..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.98
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 freedist
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.4.98
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20171106.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-102.base.tar.xz mirror://gentoo/genpatches-4.4-102.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-102.experimental.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	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=591ef7c4ea273b3cba31cd9402fcc53f
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.99 b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.99
deleted file mode 100644
index f73208648f5c..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.99
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 freedist
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.4.99
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20171120.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-103.base.tar.xz mirror://gentoo/genpatches-4.4-103.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-103.experimental.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	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=0514612f28cfb82989c8e3a8a617ebb4
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.61 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.61
deleted file mode 100644
index 60b9b6b088b0..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.61
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 freedist
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.9.61
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20171106.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-63.base.tar.xz mirror://gentoo/genpatches-4.9-63.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-63.experimental.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	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=0cf4455511956256382189c88b725fd6
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.62 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.62
deleted file mode 100644
index 224a2a208b18..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.62
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 freedist
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.9.62
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20171106.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-64.base.tar.xz mirror://gentoo/genpatches-4.9-64.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-64.experimental.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	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=46d68f7f0c2ea5088bd1cc846b2f7d9a
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.63 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.63
deleted file mode 100644
index d448828f1d18..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.63
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 freedist
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.9.63
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20171120.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-65.base.tar.xz mirror://gentoo/genpatches-4.9-65.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-65.experimental.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	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=3a14818b85ae08935cbd1c5cea8aa7a7
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.64 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.64
deleted file mode 100644
index 18da812cd062..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.64
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 freedist
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.9.64
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20171120.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-66.base.tar.xz mirror://gentoo/genpatches-4.9-66.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-66.experimental.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	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=9461551c2e515d487230f45cf9b574a9
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.65 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.65
deleted file mode 100644
index 79a2bd5fc21a..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.65
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 freedist
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.9.65
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20171120.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-67.base.tar.xz mirror://gentoo/genpatches-4.9-67.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-67.experimental.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	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=86a4c05c926792989c4b557a52999d73
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.66 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.66
deleted file mode 100644
index 5f7a5254395e..000000000000
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.66
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
-EAPI=6
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=experimental module vanilla symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 freedist
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.9.66
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20171120.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-68.base.tar.xz mirror://gentoo/genpatches-4.9-68.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-68.experimental.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	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=bc292603d0125e4514d33562e41e520b
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.59 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.69
index f8ef05d87a2a..2a11b64d7753 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.59
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.69
@@ -9,7 +9,7 @@ LICENSE=GPL-2 freedist
 PDEPEND==sys-fs/aufs-util-4*
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=4.9.59
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20171002.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-61.base.tar.xz mirror://gentoo/genpatches-4.9-61.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-61.experimental.tar.xz ) )
+SLOT=4.9.69
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20171127.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-71.base.tar.xz mirror://gentoo/genpatches-4.9-71.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-71.experimental.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	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=d819032a440fb6bbcd055519fa13ecf1
+_md5_=7c9d2d45eb6c8efe51c9b9105ec359c9
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.60 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.70
index 2187c8b3f0aa..abaf35fccd58 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.60
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.70
@@ -9,7 +9,7 @@ LICENSE=GPL-2 freedist
 PDEPEND==sys-fs/aufs-util-4*
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=4.9.60
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20171030.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-62.base.tar.xz mirror://gentoo/genpatches-4.9-62.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-62.experimental.tar.xz ) )
+SLOT=4.9.70
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20171127.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-72.base.tar.xz mirror://gentoo/genpatches-4.9-72.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-72.experimental.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	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=f9fc5718d8aba606cbf4330a7c4b4c4c
+_md5_=72913873d3f76dde981b9fa6d9e37038
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.7 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.7
new file mode 100644
index 000000000000..7f9707ce6e72
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.14 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 freedist
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.14.7
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz mirror://gentoo/genpatches-4.14-8.base.tar.xz mirror://gentoo/genpatches-4.14-8.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-8.experimental.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	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=a4d926a8441fa85a4b5ffda4281cf0bd
diff --git a/metadata/md5-cache/sys-kernel/git-sources-4.15_rc4 b/metadata/md5-cache/sys-kernel/git-sources-4.15_rc4
new file mode 100644
index 000000000000..9dab10d23862
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/git-sources-4.15_rc4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=>=sys-devel/patch-2.7.5 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=The very latest -git version of the Linux kernel
+EAPI=5
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 freedist
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.15_rc4
+SRC_URI=https://git.kernel.org/torvalds/p/v4.15-rc4/v4.14 -> patch-4.15-rc4.patch mirror://kernel/linux/kernel/v4.x/linux-4.14.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	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=4d61b1c207ae9c2b0f6de60fc1485bad
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.1.46_p52 b/metadata/md5-cache/sys-kernel/rt-sources-4.1.46_p52
new file mode 100644
index 000000000000..998a6124d13d
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.1.46_p52
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=Full Linux 4.1 kernel sources with the CONFIG_PREEMPT_RT patch
+EAPI=6
+HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://www.kernel.org/pub/linux/kernel/projects/rt/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
+IUSE=symlink build deblob
+KEYWORDS=~amd64
+LICENSE=GPL-2 !deblob? ( freedist )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.1.46_p52
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.1.46.xz mirror://kernel/linux/kernel/v4.x/linux-4.1.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.1-gnu/deblob-4.1 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.1-gnu/deblob-check -> deblob-check-4.1 ) mirror://kernel/linux/kernel/projects/rt/4.1/patch-4.1.46-rt52.patch.xz mirror://kernel/linux/kernel/projects/rt/4.1/older/patch-4.1.46-rt52.patch.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	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=003f54fe0756b0ba387ee77c54b5ea27
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.13.7_p1 b/metadata/md5-cache/sys-kernel/rt-sources-4.14.6_p7
index 90f9c3d22fbf..b0d0308b527f 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.13.7_p1
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.14.6_p7
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
 DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Full Linux 4.13 kernel sources with the CONFIG_PREEMPT_RT patch
+DESCRIPTION=Full Linux 4.14 kernel sources with the CONFIG_PREEMPT_RT patch
 EAPI=6
 HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://www.kernel.org/pub/linux/kernel/projects/rt/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
 IUSE=symlink build deblob
@@ -8,7 +8,7 @@ KEYWORDS=~amd64
 LICENSE=GPL-2 !deblob? ( freedist )
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=4.13.7_p1
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.13.7.xz mirror://kernel/linux/kernel/v4.x/linux-4.13.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.13-gnu/deblob-4.13 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.13-gnu/deblob-check -> deblob-check-4.13 ) mirror://kernel/linux/kernel/projects/rt/4.13/patch-4.13.7-rt1.patch.xz mirror://kernel/linux/kernel/projects/rt/4.13/older/patch-4.13.7-rt1.patch.xz
+SLOT=4.14.6_p7
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.6.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.14-gnu/deblob-4.14 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.14-gnu/deblob-check -> deblob-check-4.14 ) mirror://kernel/linux/kernel/projects/rt/4.14/patch-4.14.6-rt7.patch.xz mirror://kernel/linux/kernel/projects/rt/4.14/older/patch-4.14.6-rt7.patch.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	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=003f54fe0756b0ba387ee77c54b5ea27
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.4.105_p120 b/metadata/md5-cache/sys-kernel/rt-sources-4.4.105_p120
new file mode 100644
index 000000000000..05fe893c36f4
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.4.105_p120
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=Full Linux 4.4 kernel sources with the CONFIG_PREEMPT_RT patch
+EAPI=6
+HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://www.kernel.org/pub/linux/kernel/projects/rt/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
+IUSE=symlink build deblob
+KEYWORDS=~amd64
+LICENSE=GPL-2 !deblob? ( freedist )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.4.105_p120
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.4.105.xz mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.4-gnu/deblob-4.4 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.4-gnu/deblob-check -> deblob-check-4.4 ) mirror://kernel/linux/kernel/projects/rt/4.4/patch-4.4.105-rt120.patch.xz mirror://kernel/linux/kernel/projects/rt/4.4/older/patch-4.4.105-rt120.patch.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	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=003f54fe0756b0ba387ee77c54b5ea27
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.9.68_p60 b/metadata/md5-cache/sys-kernel/rt-sources-4.9.68_p60
new file mode 100644
index 000000000000..a81a4592f951
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.9.68_p60
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=Full Linux 4.9 kernel sources with the CONFIG_PREEMPT_RT patch
+EAPI=6
+HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://www.kernel.org/pub/linux/kernel/projects/rt/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
+IUSE=symlink build deblob
+KEYWORDS=~amd64
+LICENSE=GPL-2 !deblob? ( freedist )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.9.68_p60
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.9.68.xz mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.9-gnu/deblob-4.9 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.9-gnu/deblob-check -> deblob-check-4.9 ) mirror://kernel/linux/kernel/projects/rt/4.9/patch-4.9.68-rt60.patch.xz mirror://kernel/linux/kernel/projects/rt/4.9/older/patch-4.9.68-rt60.patch.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	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=003f54fe0756b0ba387ee77c54b5ea27
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.6 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.7
index b67aa9951c16..ab7db661e70b 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.6
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.7
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2 freedist
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=4.14.6
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.6.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz
+SLOT=4.14.7
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.7.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.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	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=7df30779922bb2272dc09a0172b257c0
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index b6f44c226ae7..5ec39bdfbe00 100644
--- a/metadata/md5-cache/sys-libs/Manifest.gz
+++ b/metadata/md5-cache/sys-libs/Manifest.gz
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-4.0.1 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-4.0.1
index d4255d89f0d7..00923fc9c122 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-4.0.1
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-4.0.1
@@ -8,6 +8,6 @@ KEYWORDS=amd64 ~arm64 x86
 LICENSE=|| ( UoI-NCSA MIT )
 RDEPEND=!=sys-libs/compiler-rt-sanitizers-4.0.1*:0
 SLOT=4.0.1
-SRC_URI=https://releases.llvm.org/4.0.1/compiler-rt-4.0.1.src.tar.xz test? ( https://releases.llvm.org/4.0.1/llvm-4.0.1.src.tar.xz )
+SRC_URI=https://releases.llvm.org/4.0.1/compiler-rt-4.0.1.src.tar.xz https://dev.gentoo.org/~mgorny/dist/llvm/compiler-rt-sanitizers-4.0.1-patchset.tar.xz test? ( https://releases.llvm.org/4.0.1/llvm-4.0.1.src.tar.xz )
 _eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	cmake-utils	77a5a8d3308359caadcdd91688f20093	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	llvm	fe231a791db197943447fdeadafa7e08	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9b13818382fa0a4ba69dfefd18e49e43
+_md5_=af7579072f8fab1040d8c34e9c54c64f
diff --git a/metadata/md5-cache/sys-libs/glibc-2.26-r3 b/metadata/md5-cache/sys-libs/glibc-2.26-r3
index e65a205d0daa..003bbcdb2d41 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.26-r3
+++ b/metadata/md5-cache/sys-libs/glibc-2.26-r3
@@ -1,9 +1,9 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare pretend test unpack
-DEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) >=app-misc/pax-utils-0.1.10 !<sys-apps/sandbox-1.6 !<sys-apps/portage-2.1.2 >=sys-devel/binutils-2.24 >=sys-devel/gcc-4.9 virtual/os-headers sys-devel/gnuconfig virtual/pkgconfig
+DEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) >=app-misc/pax-utils-0.1.10 !<sys-apps/sandbox-1.6 !<sys-apps/portage-2.1.2 doc? ( sys-apps/texinfo ) >=sys-devel/binutils-2.24 >=sys-devel/gcc-4.9 virtual/os-headers sys-devel/gnuconfig virtual/pkgconfig
 DESCRIPTION=GNU libc C library
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/libc/
-IUSE=audit caps debug gd hardened multilib nscd selinux systemtap profile suid vanilla crosscompile_opts_headers-only
+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 )
@@ -12,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-4.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	185a06792159ca143528e7010368e8af	toolchain-glibc	43a8c61758c6c7e50d9105b1900412e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=7e3bfc55cca92e1d5c872877675bc86a
+_md5_=109b97f4f4819941bd367c1ee657fbe6
diff --git a/metadata/md5-cache/sys-libs/glibc-9999 b/metadata/md5-cache/sys-libs/glibc-9999
index a72c1970a4eb..0d3ab1f6e621 100644
--- a/metadata/md5-cache/sys-libs/glibc-9999
+++ b/metadata/md5-cache/sys-libs/glibc-9999
@@ -1,9 +1,9 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare pretend test unpack
-DEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) >=app-misc/pax-utils-0.1.10 !<sys-apps/sandbox-1.6 !<sys-apps/portage-2.1.2 >=sys-devel/binutils-2.24 >=sys-devel/gcc-4.9 virtual/os-headers sys-devel/gnuconfig virtual/pkgconfig >=dev-vcs/git-1.8.2.1
+DEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) >=app-misc/pax-utils-0.1.10 !<sys-apps/sandbox-1.6 !<sys-apps/portage-2.1.2 doc? ( sys-apps/texinfo ) >=sys-devel/binutils-2.24 >=sys-devel/gcc-4.9 virtual/os-headers sys-devel/gnuconfig virtual/pkgconfig >=dev-vcs/git-1.8.2.1
 DESCRIPTION=GNU libc C library
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/libc/
-IUSE=audit caps compile-locales debug gd hardened multilib nscd selinux systemtap profile suid vanilla crosscompile_opts_headers-only
+IUSE=audit caps compile-locales debug doc gd hardened multilib nscd selinux systemtap profile suid vanilla crosscompile_opts_headers-only
 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 +11,4 @@ RESTRICT=strip
 SLOT=2.2
 SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/glibc-9999-patches-3.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	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	prefix	e51c7882b7b721e54e684f7eb143cbfe	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	185a06792159ca143528e7010368e8af	toolchain-glibc	43a8c61758c6c7e50d9105b1900412e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=9281f543e6abda5a5196b6ad18fd451b
+_md5_=8908b56837957e74877440bf3934ce7b
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index 1f2116da030e..0f1d43386ef7 100644
--- a/metadata/md5-cache/virtual/Manifest.gz
+++ b/metadata/md5-cache/virtual/Manifest.gz
diff --git a/metadata/md5-cache/virtual/jdk-9 b/metadata/md5-cache/virtual/jdk-9
new file mode 100644
index 000000000000..01063009d794
--- /dev/null
+++ b/metadata/md5-cache/virtual/jdk-9
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for Java Development Kit (JDK)
+EAPI=6
+KEYWORDS=~amd64 ~x64-macos ~sparc64-solaris
+RDEPEND=dev-java/oracle-jdk-bin:9[gentoo-vm(+)]
+SLOT=9
+_md5_=5bd5fdf2ad1d6f0203efb9f5882a02f3
diff --git a/metadata/md5-cache/virtual/jre-9 b/metadata/md5-cache/virtual/jre-9
new file mode 100644
index 000000000000..d273a1020494
--- /dev/null
+++ b/metadata/md5-cache/virtual/jre-9
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for Java Runtime Environment (JRE)
+EAPI=6
+KEYWORDS=~amd64 ~x64-macos ~sparc64-solaris
+RDEPEND=|| ( virtual/jdk:9 dev-java/oracle-jre-bin:9[gentoo-vm(+)] )
+SLOT=9
+_md5_=e2f387b438431df84238f1a42a0b0d6b
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 6cdc7b255d76..157f28e1c88d 100644
--- a/metadata/md5-cache/www-client/Manifest.gz
+++ b/metadata/md5-cache/www-client/Manifest.gz
diff --git a/metadata/md5-cache/www-client/chromium-63.0.3239.108 b/metadata/md5-cache/www-client/chromium-63.0.3239.108
index 9de784d22ed0..dbf5147a1694 100644
--- a/metadata/md5-cache/www-client/chromium-63.0.3239.108
+++ b/metadata/md5-cache/www-client/chromium-63.0.3239.108
@@ -11,4 +11,4 @@ RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
 SLOT=0
 SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-63.0.3239.108.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	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b6e576104bc10abe6a66749f0d2056a3
+_md5_=4a3e6a8cd4d31132008ce0bc98ee6292
diff --git a/metadata/md5-cache/www-client/chromium-64.0.3282.24 b/metadata/md5-cache/www-client/chromium-64.0.3282.24
index 79c9bdb18465..33a8da0ad35b 100644
--- a/metadata/md5-cache/www-client/chromium-64.0.3282.24
+++ b/metadata/md5-cache/www-client/chromium-64.0.3282.24
@@ -11,4 +11,4 @@ RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
 SLOT=0
 SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-64.0.3282.24.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	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5b684a668094f477bf2e5b75fdb91f26
+_md5_=8175b896ca09ab216fddcd631fd82d42
diff --git a/metadata/md5-cache/www-client/chromium-65.0.3294.5 b/metadata/md5-cache/www-client/chromium-65.0.3294.5
index 1ca769cc9cf1..aaa13625da36 100644
--- a/metadata/md5-cache/www-client/chromium-65.0.3294.5
+++ b/metadata/md5-cache/www-client/chromium-65.0.3294.5
@@ -11,4 +11,4 @@ RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
 SLOT=0
 SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-65.0.3294.5.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	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=312aaaf92424e0a39ace812cffbac3a9
+_md5_=03398c4dbe1039d8e6b3183af80310fd
diff --git a/metadata/md5-cache/www-client/google-chrome-63.0.3239.108 b/metadata/md5-cache/www-client/google-chrome-63.0.3239.108
index 63d5fadfd1a2..79450f0c64a8 100644
--- a/metadata/md5-cache/www-client/google-chrome-63.0.3239.108
+++ b/metadata/md5-cache/www-client/google-chrome-63.0.3239.108
@@ -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/pango x11-misc/xdg-utils
+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
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_63.0.3239.108-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	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=566f41fcc29dce056b7a044300805704
+_md5_=b88c6f4a7403160b2636bb74268d7314
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-64.0.3282.24 b/metadata/md5-cache/www-client/google-chrome-beta-64.0.3282.24
index 79b9f2d0dedc..8c88acc2bc7f 100644
--- a/metadata/md5-cache/www-client/google-chrome-beta-64.0.3282.24
+++ b/metadata/md5-cache/www-client/google-chrome-beta-64.0.3282.24
@@ -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/pango x11-misc/xdg-utils
+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
 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.24-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	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0ea202001aa12bac9902485920eda5d1
+_md5_=0b462c02b1c3418f2928553e9d51a362
diff --git a/metadata/md5-cache/www-client/google-chrome-unstable-65.0.3294.5 b/metadata/md5-cache/www-client/google-chrome-unstable-65.0.3294.5
index bd9c5b7cb8b3..a54050b4ab88 100644
--- a/metadata/md5-cache/www-client/google-chrome-unstable-65.0.3294.5
+++ b/metadata/md5-cache/www-client/google-chrome-unstable-65.0.3294.5
@@ -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/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-unstable/google-chrome-unstable_65.0.3294.5-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	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3fe6649936aab5affca451e134f10469
+_md5_=7a589e7096d013b6f66e44816957df6e
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-1.14.1036.3_p1 b/metadata/md5-cache/www-client/vivaldi-snapshot-1.14.1042.3_p1
index 30db55b64623..dc0f16d9c32a 100644
--- a/metadata/md5-cache/www-client/vivaldi-snapshot-1.14.1036.3_p1
+++ b/metadata/md5-cache/www-client/vivaldi-snapshot-1.14.1042.3_p1
@@ -9,6 +9,6 @@ LICENSE=Vivaldi
 RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss >=dev-libs/openssl-1.0.1:0 gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X]
 RESTRICT=bindist mirror
 SLOT=0
-SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_1.14.1036.3-1_amd64.deb -> vivaldi-snapshot-1.14.1036.3_p1-amd64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_1.14.1036.3-1_armhf.deb -> vivaldi-snapshot-1.14.1036.3_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_1.14.1036.3-1_i386.deb -> vivaldi-snapshot-1.14.1036.3_p1-i386.deb )
+SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_1.14.1042.3-1_amd64.deb -> vivaldi-snapshot-1.14.1042.3_p1-amd64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_1.14.1042.3-1_armhf.deb -> vivaldi-snapshot-1.14.1042.3_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_1.14.1042.3-1_i386.deb -> vivaldi-snapshot-1.14.1042.3_p1-i386.deb )
 _eclasses_=chromium-2	fcd0e1c5eaae64392927ca67cdb13e0c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a1489af0cf7a98049bce86e08b9613a9
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index b9ef153bd715..643edc12f824 100644
--- a/metadata/md5-cache/x11-libs/Manifest.gz
+++ b/metadata/md5-cache/x11-libs/Manifest.gz
diff --git a/metadata/md5-cache/x11-libs/gdk-pixbuf-2.36.10 b/metadata/md5-cache/x11-libs/gdk-pixbuf-2.36.11
index 66deb4a25163..bddfb74ec6cc 100644
--- a/metadata/md5-cache/x11-libs/gdk-pixbuf-2.36.10
+++ b/metadata/md5-cache/x11-libs/gdk-pixbuf-2.36.11
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.48.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libpng-1.4: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(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( media-libs/jasper:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( >=media-libs/tiff-3.9.2: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(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-util/gtk-doc-am-1.20 >=sys-devel/gettext-0.19 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/glib-2.48.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libpng-1.4: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(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( media-libs/jasper:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( >=media-libs/tiff-3.9.2: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(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-util/gtk-doc-am-1.20 >=sys-devel/gettext-0.19 virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Image loading library for GTK+
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/gdk-pixbuf
@@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spar
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.48.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libpng-1.4: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(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( media-libs/jasper:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( >=media-libs/tiff-3.9.2: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(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<gnome-base/gail-1000 !<gnome-base/librsvg-2.31.0 !<x11-libs/gtk+-2.21.3:2 !<x11-libs/gtk+-2.90.4:3
 SLOT=2
-SRC_URI=mirror://gnome/sources/gdk-pixbuf/2.36/gdk-pixbuf-2.36.10.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=90b48bd64b28df7f4bd4aa78990baf02
+SRC_URI=mirror://gnome/sources/gdk-pixbuf/2.36/gdk-pixbuf-2.36.11.tar.xz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=404b63e3e811968c16b9fb3c464ff854
diff --git a/metadata/md5-cache/x11-libs/gtk+-3.22.15 b/metadata/md5-cache/x11-libs/gtk+-3.22.15
deleted file mode 100644
index 3ca8f1717d5c..000000000000
--- a/metadata/md5-cache/x11-libs/gtk+-3.22.15
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/atk-2.15[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.49.4:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libepoxy-1.0[X(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.14[aqua?,glib,svg,X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.30:2[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.37.3[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-misc/shared-mime-info cloudprint? ( >=net-libs/rest-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/json-glib-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) colord? ( >=x11-misc/colord-0.1.9: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(-)?] ) cups? ( >=net-print/cups-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.39:= ) wayland? ( >=dev-libs/wayland-1.9.91[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.7 media-libs/mesa[wayland,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxkbcommon-0.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=app-accessibility/at-spi2-atk-2.5.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXdamage[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,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-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.1.2 dev-libs/libxslt dev-libs/gobject-introspection-common >=dev-util/gdbus-codegen-2.48 >=dev-util/gtk-doc-am-1.20 >=sys-devel/gettext-0.19.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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(-)?] X? ( x11-proto/xextproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-proto/xproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-proto/inputproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-proto/damageproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xinerama? ( x11-proto/xineramaproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) test? ( media-fonts/font-misc-misc media-fonts/font-cursor-misc ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Gimp ToolKit +
-EAPI=6
-HOMEPAGE=https://www.gtk.org/
-IUSE=aqua broadway cloudprint colord cups examples +introspection test vim-syntax wayland +X xinerama test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2+
-PDEPEND=gnome-base/librsvg[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] vim-syntax? ( app-vim/gtk-syntax )
-RDEPEND=>=dev-libs/atk-2.15[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.49.4:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libepoxy-1.0[X(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.14[aqua?,glib,svg,X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.30:2[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.37.3[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-misc/shared-mime-info cloudprint? ( >=net-libs/rest-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/json-glib-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) colord? ( >=x11-misc/colord-0.1.9: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(-)?] ) cups? ( >=net-print/cups-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.39:= ) wayland? ( >=dev-libs/wayland-1.9.91[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.7 media-libs/mesa[wayland,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxkbcommon-0.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=app-accessibility/at-spi2-atk-2.5.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXdamage[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) >=dev-util/gtk-update-icon-cache-3 !<gnome-base/gail-1000 !<x11-libs/vte-0.31.0:2.90 >=x11-themes/adwaita-icon-theme-3.14 X? ( !<x11-base/xorg-server-1.11.4 )
-REQUIRED_USE=|| ( aqua wayland X ) xinerama? ( X )
-RESTRICT=test
-SLOT=3
-SRC_URI=mirror://gnome/sources/gtk+/3.22/gtk+-3.22.15.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ab174bc74990fb1f665f921a07357bf3
diff --git a/metadata/md5-cache/x11-libs/gtk+-3.22.17 b/metadata/md5-cache/x11-libs/gtk+-3.22.17
deleted file mode 100644
index 0ca5c4a348b1..000000000000
--- a/metadata/md5-cache/x11-libs/gtk+-3.22.17
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/atk-2.15[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.49.4:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libepoxy-1.0[X(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.14[aqua?,glib,svg,X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.30:2[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.37.3[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-misc/shared-mime-info cloudprint? ( >=net-libs/rest-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/json-glib-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) colord? ( >=x11-misc/colord-0.1.9: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(-)?] ) cups? ( >=net-print/cups-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.39:= ) wayland? ( >=dev-libs/wayland-1.9.91[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.7 media-libs/mesa[wayland,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxkbcommon-0.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=app-accessibility/at-spi2-atk-2.5.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXdamage[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,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-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.1.2 dev-libs/libxslt dev-libs/gobject-introspection-common >=dev-util/gdbus-codegen-2.48 >=dev-util/gtk-doc-am-1.20 >=sys-devel/gettext-0.19.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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(-)?] X? ( x11-proto/xextproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-proto/xproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-proto/inputproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-proto/damageproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xinerama? ( x11-proto/xineramaproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) test? ( media-fonts/font-misc-misc media-fonts/font-cursor-misc ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Gimp ToolKit +
-EAPI=6
-HOMEPAGE=https://www.gtk.org/
-IUSE=aqua broadway cloudprint colord cups examples +introspection test vim-syntax wayland +X xinerama test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2+
-PDEPEND=>=x11-themes/adwaita-icon-theme-3.14 gnome-base/librsvg[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] vim-syntax? ( app-vim/gtk-syntax )
-RDEPEND=>=dev-libs/atk-2.15[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.49.4:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libepoxy-1.0[X(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.14[aqua?,glib,svg,X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.30:2[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.37.3[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-misc/shared-mime-info cloudprint? ( >=net-libs/rest-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/json-glib-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) colord? ( >=x11-misc/colord-0.1.9: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(-)?] ) cups? ( >=net-print/cups-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.39:= ) wayland? ( >=dev-libs/wayland-1.9.91[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.7 media-libs/mesa[wayland,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxkbcommon-0.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=app-accessibility/at-spi2-atk-2.5.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXdamage[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) >=dev-util/gtk-update-icon-cache-3 !<gnome-base/gail-1000 !<x11-libs/vte-0.31.0:2.90
-REQUIRED_USE=|| ( aqua wayland X ) xinerama? ( X )
-RESTRICT=test
-SLOT=3
-SRC_URI=mirror://gnome/sources/gtk+/3.22/gtk+-3.22.17.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fb640fa54fa3967c4359b2853719a09b
diff --git a/metadata/md5-cache/x11-libs/gtksourceview-3.24.6 b/metadata/md5-cache/x11-libs/gtksourceview-3.24.6
new file mode 100644
index 000000000000..6203ee95012e
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/gtksourceview-3.24.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.48:2 >=dev-libs/libxml2-2.6:2 >=x11-libs/gtk+-3.20:3[introspection?] glade? ( >=dev-util/glade-3.9:3.10 ) introspection? ( >=dev-libs/gobject-introspection-1.42:= ) >=dev-util/gtk-doc-am-1.25 >=sys-devel/gettext-0.19.4 dev-util/itstool 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 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=A text widget implementing syntax highlighting and other features
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/GtkSourceView
+IUSE=glade +introspection vala test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.48:2 >=dev-libs/libxml2-2.6:2 >=x11-libs/gtk+-3.20:3[introspection?] glade? ( >=dev-util/glade-3.9:3.10 ) introspection? ( >=dev-libs/gobject-introspection-1.42:= )
+REQUIRED_USE=vala? ( introspection )
+SLOT=3.0/3
+SRC_URI=mirror://gnome/sources/gtksourceview/3.24/gtksourceview-3.24.6.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	vala	103e6885c83965507391cdc5b6fa0e67	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=72698221e197cc27652a9ed39838d5bc
diff --git a/metadata/md5-cache/x11-libs/pango-1.40.5 b/metadata/md5-cache/x11-libs/pango-1.40.5
deleted file mode 100644
index 7b89ccb03483..000000000000
--- a/metadata/md5-cache/x11-libs/pango-1.40.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=media-libs/harfbuzz-0.9.30:=[glib(+),truetype(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/fontconfig-2.10.92:1.0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.12.14-r4:=[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) X? ( >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXft-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-util/gtk-doc-am-1.20 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(-)?] test? ( media-fonts/cantarell ) X? ( >=x11-proto/xproto-7.0.24[abi_x86_32(-)?,abi_x86_64(-)?,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/autoconf-2.63:2.5 >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Internationalized text layout and rendering library
-EAPI=6
-HOMEPAGE=http://www.pango.org/
-IUSE=X +introspection test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2+ FTL
-RDEPEND=>=media-libs/harfbuzz-0.9.30:=[glib(+),truetype(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/fontconfig-2.10.92:1.0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.12.14-r4:=[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) X? ( >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXft-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0
-SRC_URI=mirror://gnome/sources/pango/1.40/pango-1.40.5.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	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=82692583ecbef0eb086a29aa67600235
diff --git a/metadata/md5-cache/x11-plugins/Manifest.gz b/metadata/md5-cache/x11-plugins/Manifest.gz
index d0af5bc6853b..7a898ce4cfaa 100644
--- a/metadata/md5-cache/x11-plugins/Manifest.gz
+++ b/metadata/md5-cache/x11-plugins/Manifest.gz
diff --git a/metadata/md5-cache/x11-plugins/pidgin-sipe-1.23.0 b/metadata/md5-cache/x11-plugins/pidgin-sipe-1.23.0
new file mode 100644
index 000000000000..c1383bed208a
--- /dev/null
+++ b/metadata/md5-cache/x11-plugins/pidgin-sipe-1.23.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-util/intltool virtual/pkgconfig dev-libs/gmime:2.6 dev-libs/libxml2 openssl? ( dev-libs/openssl:= ) !openssl? ( dev-libs/nss ) kerberos? ( virtual/krb5 ) voice? ( >=dev-libs/glib-2.28.0 >=net-libs/libnice-0.1.0 media-libs/gstreamer:1.0 net-libs/farstream:0.2 ) !voice? ( >=dev-libs/glib-2.12.0:2 ) net-im/pidgin[dbus?] telepathy? ( >=sys-apps/dbus-1.1.0 >=dev-libs/dbus-glib-0.61 >=dev-libs/glib-2.28:2 >=net-libs/telepathy-glib-0.18.0 ) >=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=Pidgin Plug-in SIPE (Sip Exchange Protocol)
+EAPI=6
+HOMEPAGE=http://sipe.sourceforge.net/
+IUSE=dbus debug kerberos ocs2005-message-hack openssl telepathy voice
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/gmime:2.6 dev-libs/libxml2 openssl? ( dev-libs/openssl:= ) !openssl? ( dev-libs/nss ) kerberos? ( virtual/krb5 ) voice? ( >=dev-libs/glib-2.28.0 >=net-libs/libnice-0.1.0 media-libs/gstreamer:1.0 net-libs/farstream:0.2 ) !voice? ( >=dev-libs/glib-2.12.0:2 ) net-im/pidgin[dbus?] telepathy? ( >=sys-apps/dbus-1.1.0 >=dev-libs/dbus-glib-0.61 >=dev-libs/glib-2.28:2 >=net-libs/telepathy-glib-0.18.0 )
+SLOT=0
+SRC_URI=mirror://sourceforge/sipe/pidgin-sipe-1.23.0.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=d096c47118b0acf8e6073fb3ad4115c3
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index b7908c2badca..3568a2d6d03e 100644
--- a/metadata/md5-cache/x11-terms/Manifest.gz
+++ b/metadata/md5-cache/x11-terms/Manifest.gz
diff --git a/metadata/md5-cache/x11-terms/aterm-1.0.1-r2 b/metadata/md5-cache/x11-terms/aterm-1.0.1-r2
deleted file mode 100644
index fca9d5481b64..000000000000
--- a/metadata/md5-cache/x11-terms/aterm-1.0.1-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=virtual/jpeg media-libs/libpng background? ( x11-wm/afterstep ) x11-libs/libX11 x11-libs/libXext x11-libs/libICE x11-libs/libXt x11-proto/xproto
-DESCRIPTION=rxvt compatible terminal emulator with transparency support
-EAPI=3
-HOMEPAGE=http://aterm.sourceforge.net
-IUSE=background cjk xgetdefault
-KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
-LICENSE=GPL-2
-RDEPEND=virtual/jpeg media-libs/libpng background? ( x11-wm/afterstep ) x11-libs/libX11 x11-libs/libXext x11-libs/libICE
-SLOT=0
-SRC_URI=ftp://ftp.afterstep.org/apps/aterm/aterm-1.0.1.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=4e8ec791fd9298a27194f8ebe527d76c
diff --git a/metadata/md5-cache/x11-terms/aterm-1.0.1-r3 b/metadata/md5-cache/x11-terms/aterm-1.0.1-r3
index 8793066daa0f..02eee458e362 100644
--- a/metadata/md5-cache/x11-terms/aterm-1.0.1-r3
+++ b/metadata/md5-cache/x11-terms/aterm-1.0.1-r3
@@ -4,10 +4,10 @@ DESCRIPTION=rxvt compatible terminal emulator with transparency support
 EAPI=6
 HOMEPAGE=http://aterm.sourceforge.net
 IUSE=background cjk xgetdefault
-KEYWORDS=alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
 LICENSE=GPL-2
 RDEPEND=virtual/jpeg:0 media-libs/libpng:0= background? ( x11-wm/afterstep ) x11-libs/libX11 x11-libs/libXext x11-libs/libICE
 SLOT=0
 SRC_URI=ftp://ftp.afterstep.org/apps/aterm/aterm-1.0.1.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=a6fcb5a0b5460c21e17e12eadc53ee0f
+_md5_=8cc607e7cad762f908a5707229ca6dfb
diff --git a/metadata/md5-cache/x11-terms/terminology-9999 b/metadata/md5-cache/x11-terms/terminology-9999
index 1596570c759f..39ae212ba19f 100644
--- a/metadata/md5-cache/x11-terms/terminology-9999
+++ b/metadata/md5-cache/x11-terms/terminology-9999
@@ -1,11 +1,10 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=>=dev-libs/efl-1.18 virtual/pkgconfig >=app-portage/elt-patches-20170317 >=app-portage/elt-patches-20170422 dev-vcs/git !<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 doc? ( app-doc/doxygen )
+DEFINED_PHASES=compile configure install test unpack
+DEPEND=>=dev-libs/efl-1.18[X] virtual/pkgconfig >=dev-vcs/git-1.8.2.1 >=dev-util/meson-0.40.0 >=dev-util/ninja-1.7.2
 DESCRIPTION=Feature rich terminal emulator using the Enlightenment Foundation Libraries
-EAPI=5
+EAPI=6
 HOMEPAGE=https://www.enlightenment.org/p.php?p=about/terminology
-IUSE=nls doc
-LICENSE=BSD
-RDEPEND=>=dev-libs/efl-1.18 nls? ( sys-devel/gettext )
+LICENSE=BSD-2
+RDEPEND=>=dev-libs/efl-1.18[X]
 SLOT=0
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	enlightenment	ac1fc335a7f44c04309a9f4aae403165	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	git-2	195a672bfaf52d868442171c9469bbb6	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=4b88f351ea3aec9269362d3f3446edb9
+_eclasses_=git-r3	fec09a83ae965b041b47f5ff7c8ba29a	meson	0946ddca90e9c2d3e4687bb097dd9ed3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=150071e98905454b5196ce51df99304a
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index bbff73586899..4d72d9d48630 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 18491 BLAKE2B 61c0c02e0f200c1d8f738f2b893e1e05ac8fe4443df79abfcd326d78c4751a818003f28510fc0909981c0731a4fa3be607b6f3bf2907fc14fb4d4f1415efa08a SHA512 530cb3221a343b61850e6fdde4fdc1727735d45d05fb346eb786ec2b4e453f288d701c37cfd52d07b8057ce9bec5a71a844002f193138aae310dff06e06d8ce8
-TIMESTAMP 2017-12-17T08:09:00Z
+TIMESTAMP 2017-12-18T14:09:05Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlo2JhxfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlo3zAFfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klADPw/8CI1og1+Kswl59j0caFLfGxVIzFNscaIgC5BNAk0w0mxety2iAifgk0du
-Jyc9NkkemycFOgqvgeMWYNna9+iwbR70+/7LbSg1AvEakj/PPjPiH7qA51Q/LONv
-J1RFXBvdyy3J4prAj8IJN5K+ajaqOcD2535Tdnxzv2gOVfQXgsvSj/2NJ970Hd0p
-LT1WqnQPZsFpedWHGCvPfw4UPt/VrZ69qZZPxQlURqPdDoT0PfnGqkS5qp0eh+0J
-FoolUp7MhmC1AVfEVzuAjkFtFi9Ev39JCrQxA+OCw+8VM2cjYEMp6F2hy7IhRuu6
-RF3uSxjqcsnWvwm34+LhYQ08xBQUDQvBTd812UXbb5UYKPTAAsFA54PD59KyY0FN
-FcWn94rLIoS3mZeDQoWTXkSarzt0xzHXO9ggLESarMCVLxU4myWEe6/ZKGcCo/56
-rVfl9Wkb17GGVy/FM0Jr/Jgs2jFlcd9LPgV/mni/PjQ4oJ+NbpnCvF0Wf0b5HZv2
-D3q2S6WPUAO5IfngDscxO/baw2BE9yt0gw/q+9+JeiLqVVq3PEYluWTQjNEOOOL2
-4c2z18Nl/m2tLsC3E9rDZ08n2EgJ0oS9XLJmli3ZUYpIZEf//U9rA7k4BXjTOk2/
-oVm+8VKV/wM7AtiICgAWgtWmnOjaSNaRuvnfBh7EusvROVhOU6Q=
-=J4Sm
+klBHgw//dn/TYH0cWcIXdHt7MdbpjFrKnCCNlGcm45jT+bXXCMFB9GGtSaJhdjYq
+XJJQFo6gPyoN6rzmaUeXlbN7SRH5huiYINVSaaB2tscP0htLcXzAwjxqGrKA3BOD
+sPR6YEn6VuEz8zwEwMGgIYYbg8Ha0Da9dKWtF1FXr5L3OMAaxytBHive2MZx8g++
+VW+0XuA+7sDEwv8TLFxGhAi7xbIIPOZgk1CfK+APQkblr2UCPyGk4KChFsLpzvaB
+p4yKFCvct+M/EkE5xdlDw/QwDxP8bVmbmzaMV+6BkbkoFum0/nPbWXOopDRIvf/m
+icQA2AA51kYWoJOg0NlwNfUzFzX6Au9xg5l9ynmJHx3YZ9G4ItmlzeITJFbrDLxf
+GNklpdLSXnkwHZ2v+6EAQyTeRjNHnAAV8wJpK5T9XQDsqahi2MWQZeusL/s90g7e
+vaU5y6rONfpaFyEcD1AfqMJuLO6qfA2yuMl+uNo1K6njg7FrFXv3venZgX6jNwEG
+KG6qDs6o0QzgS8cEPHl+Cs2iw2QQcyRsOkrzfwoA1EEdmw8e87wvoc0p3GT710zC
+mkXx52vyi7fcxlcW3pRYtSYNqjQFn1E45HP0oE6w13czpYwvZLVH3jfXfRxEAuER
+8UHsp2tNYZImD+3qqkA+yBczWyqEoTt8fVEtWpFK9imMxwuxEuI=
+=8cYc
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 7ec07c2c0116..3d7ab973d08a 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sun, 17 Dec 2017 08:08:56 +0000
+Mon, 18 Dec 2017 14:09:02 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index d78e5f9a2bb6..332c9e0a476b 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sun Dec 17 08:08:56 UTC 2017
+Mon Dec 18 14:09:01 UTC 2017
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 4058845095a2..e9c95b972d34 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sun, 17 Dec 2017 08:15:01 +0000
+Mon, 18 Dec 2017 14:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 4d88d6c6f23f..3943b7a35d66 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-c8e8f7a32483d356984120d0ed3b593a84c5c341 1513495195 2017-12-17T07:19:55+00:00
+2e59bc6e7adb5b0787af9b844d3077a18329bf27 1513605913 2017-12-18T14:05:13+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 031a63fd388b..877e784d19d9 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1513497901 Sun 17 Dec 2017 08:05:01 AM UTC
+1513605901 Mon 18 Dec 2017 02:05:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 7ec07c2c0116..92bb2b00ee6a 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sun, 17 Dec 2017 08:08:56 +0000
+Mon, 18 Dec 2017 14:09:01 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index c9bf9b6bcd42..47237a418853 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/sarg/Manifest b/net-analyzer/sarg/Manifest
index d6fa1dd697d1..57031c4aeee1 100644
--- a/net-analyzer/sarg/Manifest
+++ b/net-analyzer/sarg/Manifest
@@ -1,5 +1,9 @@
+AUX sarg-2.3.10-bool.patch 228 BLAKE2B 38c1ca6c03c316afab832c2680afc433d499a9f0218c004996b4f74ef24395c57bd3e2355d1af0244b31d1a50f017faf96ca8e75e142884a3b2ab5ac66bbb7e6 SHA512 f5f5aa42a16e01fe84c4f62715215ed960323b1c2525281c1433e20bde08c1ed4c0a460b635905d2fd7a0269cff232446b557c30dc49b4652988f660b832f618
+AUX sarg-2.3.10-config.patch 2612 BLAKE2B 8d0d6bdab60784dd9c289e974dba087b11234b3f961c951bd96ce76a59bdc36f8da5fe5f3c4268f238b5c25f34baa69f97c1e05fbd161abaecb2eb7949d9591d SHA512 e04a971a0838bef3e777708c3328ff940cce84d934de72014eafbcc5123cb8ff2075c30aafdb4ae4541778c6c0fcce38ac32b6dde57ed1a52fc03f1b1f980cda
+AUX sarg-2.3.10-format.patch 1541 BLAKE2B cfa03a3dad67f3ca8ec3b47db8755f5760b3780bedcb29549e04cecc955212003930e2a467749e964ab8073a404d55359826132e43ff6d1a01228a1a6fe79229 SHA512 d3c25d94da93dd1308b9c035fff3ddf6a241327596c182d85d79f183b659fa20ea8e806e5b1e3e8675dae843744b7329d03e572260c6932466694103180c8bd6
 AUX sarg-2.3.9-configure-bash.patch 4033 BLAKE2B 7f98a2fda63c4abe93ec80f5a068bdd99a647f811cb95c05f0a716167ca73b6ae4476b344cfe7f1d7d7b5e43e491790cbc8cb8aefc36bb0e0696cadb69a65350 SHA512 42f40db8b2d378888ce73aab0ab03e05f3bbad516d4db025fe6ce1377e1b1d97db2a857b99fb350c8e92a80de75a4c2c4012403546c3f4e5261972060be60b68
 AUX sarg-2.3.9-configure.patch 641 BLAKE2B dc4162b7180bc40692e779ddf1d1a1b48442e9814c4d043593f695062f132041102ec70807aad07119b9415a9e04776d5728cd2e73a646e4c2dcb4351d4bf9a5 SHA512 0da589199b6ea13589bc8cdc8504f6b4260a03bf1d8ab48093ada01e3be3a82961a2fad6f0abe301ed004bd9c642f0789ebb745d52044214e98211124c66f6ae
 DIST sarg-2.3.10.tar.gz 1278071 BLAKE2B a9412069826328a7828cc3759858160a8e9121fee30697b8c54bc2e6ca948255f297147ff8692e3a62fe6c0a2b596a1a73e1090d03ef1fdacdd692866e6ef27d SHA512 d0a61ac6d455feb8fff024c21f1b7547471ef8cf847fd54d9042881cac3ee14a41fe2a8ea9e0fc2bd2ea0448714ba457e9070282c31e4f3c879e4d83d00ecb2d
+EBUILD sarg-2.3.10-r1.ebuild 936 BLAKE2B f5e330e0c9b7e0a906c04c69e00676bce19a84d021186f3e99208a4bd2fd67895bc837191d0f774fd9488d547813b43e07a0ca8ff72eaadd46284e88bd92082f SHA512 c989ef3e90ae8d1e8852e50d08825efa7596e8c688332e38f648b716bda4cce1d6b35cf1cd249a84c0565284c0aafd9e57d1bfc7d4272219e33dea1156bb16a2
 EBUILD sarg-2.3.10.ebuild 1757 BLAKE2B 1e5d9122b9f9dc647971485eafc762155ed7cda0bcd24739a9b1d780d1c9e7f0880136e9ba0b88dc6e628dd2e2341414fa61f08aa92266b73530c5a3e40c391d SHA512 ceef1daa6e382ffa0095733f6747ad7480aab5dd39edbeef15812aa64ce44c87e56a475c5a29dc4878b0581ac1414b569361349e1446684f8aa7533a6405c182
 MISC metadata.xml 856 BLAKE2B 0640133457b9035a7a30e4ec481ff092254902a21cb8f8cc9a91d0a0b13f99a484982787646e2367f7bcde5f3d2436371f588729acc35b638c289c09cddb2ff9 SHA512 3571bb6b4562fa58e9736ce48c4b3930bb33a3b38dec15b79b22b3cbd457ea7751819a2b45a7e728b02e641c187c085e813eb29d8644dc57e40b682f061b115a
diff --git a/net-analyzer/sarg/files/sarg-2.3.10-bool.patch b/net-analyzer/sarg/files/sarg-2.3.10-bool.patch
new file mode 100644
index 000000000000..188b6dd3732b
--- /dev/null
+++ b/net-analyzer/sarg/files/sarg-2.3.10-bool.patch
@@ -0,0 +1,11 @@
+--- a/util.c
++++ b/util.c
+@@ -2088,7 +2088,7 @@
+ 	int pad_len;
+ 	bool bracket=false;
+ 	bool port=false;
+-	bool port_num=0;
++	int port_num=0;
+ 
+ 	// skip leading spaces and tabs
+ 	while (*buf && (*buf==' ' || *buf=='\t')) buf++;
diff --git a/net-analyzer/sarg/files/sarg-2.3.10-config.patch b/net-analyzer/sarg/files/sarg-2.3.10-config.patch
new file mode 100644
index 000000000000..cfbf103d5b2a
--- /dev/null
+++ b/net-analyzer/sarg/files/sarg-2.3.10-config.patch
@@ -0,0 +1,94 @@
+--- a/log.c
++++ b/log.c
+@@ -241,7 +241,7 @@
+ 	strcpy(LogoTextColor,"#006699");
+ 	strcpy(FontSize,"9px");
+ 	strcpy(TempDir,"/tmp");
+-	strcpy(OutputDir,"/var/www/html/squid-reports");
++	strcpy(OutputDir,"/var/www/localhost/htdocs/squid-reports");
+ 	AnonymousOutputFiles=false;
+ 	Ip2Name=false;
+ 	strcpy(DateFormat,"u");
+--- a/sarg-php/sarg-squidguard-block.php
++++ b/sarg-php/sarg-squidguard-block.php
+@@ -26,8 +26,8 @@
+  */
+ 
+ // Change to squidGuard and sarg config file paths
+-$SargConf = "/usr/local/sarg/sarg.conf";
+-$squidGuardConf = "/usr/local/squidGuard/squidGuard.conf";
++$SargConf = "/etc/sarg/sarg.conf";
++$squidGuardConf = "/etc/squidGuard/squidGuard.conf";
+ 
+ global $SargConf;
+ global $dbhome;
+@@ -37,7 +37,7 @@
+ include_once("style.php");
+ 
+ $url = $_GET['url'];
+-$squidGuard_conf = '/usr/local/squidGuard/squidGuard.conf';
++$squidGuard_conf = '/etc/squidGuard/squidGuard.conf';
+ 
+ function parse_config($line,$clave) {
+    if (preg_match("/dbhome/i", $line)) {
+--- a/sarg-php/sarg-block-it.php
++++ b/sarg-php/sarg-block-it.php
+@@ -25,7 +25,7 @@
+  *
+  */
+ 
+-$filename = "/usr/local/squid/etc/block.txt";
++$filename = "/etc/squid/etc/block.txt";
+ 
+ $url = $_GET['url'];
+ $url = $url."\n";
+--- a/htaccess
++++ b/htaccess
+@@ -1,4 +1,4 @@
+-AuthUserFile /usr/local/sarg/passwd
++AuthUserFile /etc/sarg/passwd
+ AuthName "SARG, Squid Analysis Report Generator"
+ AuthType Basic
+ <Limit GET POST>
+--- a/sarg.conf
++++ b/sarg.conf
+@@ -4,7 +4,7 @@
+ #       Where is the access.log file
+ #       sarg -l file
+ #
+-#access_log /usr/local/squid/var/logs/access.log
++#access_log /var/log/squid/access.log
+ 
+ # TAG: graphs yes|no
+ #	Use graphics where is possible.
+@@ -117,7 +117,7 @@
+ #       The reports will be saved in that directory
+ #       sarg -o dir
+ #
+-#output_dir /var/www/html/squid-reports
++#output_dir /var/www/localhost/htdocs/squid-reports
+ 
+ # TAG:  anonymous_output_files yes/no
+ #       Use anonymous file and directory names in the report. If it is set to
+@@ -545,7 +545,7 @@
+ #      Generate reports from SquidGuard logs.
+ #      Use 'none' to disable.
+ #      You can use sarg -L filename to use an alternate squidGuard log.
+-#      squidguard_conf /usr/local/squidGuard/squidGuard.conf
++#      squidguard_conf /etc/squidGuard/squidGuard.conf
+ #
+ #squidguard_conf none
+ 
+--- a/user_limit_block
++++ b/user_limit_block
+@@ -24,8 +24,8 @@
+ #
+ #
+ 
+-conf="/usr/local/sarg/sarg.conf"
+-squid_password_file="/usr/local/squid/etc/passwd"
++conf="/etc/sarg/sarg.conf"
++squid_password_file="/etc/squid/passwd"
+ tmp="/tmp/sarg_limit.$$"
+ 
+ limit_file=`grep "per_user_limit" $conf|grep -v "#"|awk '{print $2}'`
diff --git a/net-analyzer/sarg/files/sarg-2.3.10-format.patch b/net-analyzer/sarg/files/sarg-2.3.10-format.patch
new file mode 100644
index 000000000000..926fdc8c6725
--- /dev/null
+++ b/net-analyzer/sarg/files/sarg-2.3.10-format.patch
@@ -0,0 +1,77 @@
+--- a/report.c
++++ b/report.c
+@@ -54,7 +54,7 @@
+ 	char accsmart[MAXLEN];
+ 	char crc2[MAXLEN/2 -1];
+ 	char siteind[MAX_TRUNCATED_URL];
+-	char arqtt[256];
++	char arqtt[MAX_USER_FNAME_LEN * 2 + MAXLEN + 10];
+ 	char *oldurltt=NULL;
+ 	char oldaccdiatt[11],oldacchoratt[9];
+ 	char tmp3[MAXLEN];
+--- a/util.c
++++ b/util.c
+@@ -671,10 +671,10 @@
+ char *buildtime(long long int elap)
+ {
+ 	int num = elap / 1000;
+-	int hor = 0;
+-	int min = 0;
+-	int sec = 0;
+-	static char buf[12];
++	short int hor = 0;
++	short int min = 0;
++	short int sec = 0;
++	static char buf[15];
+ 
+ 	buf[0]='\0';
+ 
+@@ -1236,10 +1236,10 @@
+ char *fixtime(long long int elap)
+ {
+ 	int num = elap / 1000;
+-	int hor = 0;
+-	int min = 0;
+-	int sec = 0;
+-	static char buf[12];
++	short int hor = 0;
++	short int min = 0;
++	short int sec = 0;
++	static char buf[15];
+ 
+ 	hor=num / 3600;
+ 	min=(num % 3600) / 60;
+@@ -1248,7 +1248,7 @@
+ 	if(hor==0 && min==0 && sec==0)
+ 		strcpy(buf,"0");
+ 	else
+-		sprintf(buf,"%d:%02d:%02d",hor,min,sec);
++		sprintf(buf,"%02d:%02d:%02d",hor,min,sec);
+ 
+ 	return buf;
+ }
+--- a/index.c
++++ b/index.c
+@@ -89,9 +89,9 @@
+ 	char monthdir[MAXLEN];
+ 	char monthname1[9], monthname2[9];
+ 	char nmonth[30];
+-	char monthnum[10];
++	char monthnum[15];
+ 	char dayindex[MAXLEN];
+-	char daynum[10];
++	char daynum[15];
+ 	char title[80];
+ 	int yearsort[150];
+ 	int nyears;
+--- a/userinfo.c
++++ b/userinfo.c
+@@ -67,7 +67,7 @@
+ 	int skip;
+ 	int flen;
+ 	int count, clen;
+-	char cstr[9];
++	char cstr[10];
+ 
+ 	last=NULL;
+ 	for (group=first_user_group ; group ; group=group->next) {
diff --git a/net-analyzer/sarg/sarg-2.3.10-r1.ebuild b/net-analyzer/sarg/sarg-2.3.10-r1.ebuild
new file mode 100644
index 000000000000..72e6e4dbb97f
--- /dev/null
+++ b/net-analyzer/sarg/sarg-2.3.10-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools
+
+DESCRIPTION="Squid Analysis Report Generator"
+HOMEPAGE="http://sarg.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+SLOT="0"
+IUSE="+gd ldap pcre"
+
+DEPEND="
+	gd? ( media-libs/gd[png,truetype] )
+	ldap? ( net-nds/openldap )
+	pcre? ( dev-libs/libpcre )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( BETA-TESTERS CONTRIBUTORS DONATIONS README ChangeLog htaccess )
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3.9-configure.patch
+	"${FILESDIR}"/${PN}-2.3.9-configure-bash.patch
+	"${FILESDIR}"/${PN}-2.3.10-format.patch
+	"${FILESDIR}"/${PN}-2.3.10-bool.patch
+	"${FILESDIR}"/${PN}-2.3.10-config.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with gd) \
+		$(use_with ldap) \
+		$(use_with pcre) \
+		--sysconfdir="${EPREFIX}/etc/sarg/"
+}
diff --git a/net-analyzer/thc-ipv6/Manifest b/net-analyzer/thc-ipv6/Manifest
index a22fc7343293..266bcc8cda60 100644
--- a/net-analyzer/thc-ipv6/Manifest
+++ b/net-analyzer/thc-ipv6/Manifest
@@ -1,12 +1,8 @@
-AUX thc-ipv6-2.1-Makefile.patch 1233 BLAKE2B b9b9b19476e030b0ad87ca6a85715e7cf64fb67203aa3f67f7d354728c875b2c43890be877fb424a0b4507dd458106a4bfb72053d9aceabbd94534a6adb76a95 SHA512 14880d1982e935eba874c87fb7bab7859246d4ba1539e3cbfc06fe5850c3076f99d4bdd59cd968e7d5c1386062c4a081f3a0a11d61e9f66ea90177e78c22e307
 AUX thc-ipv6-3.0-Makefile.patch 465 BLAKE2B 42194c35ace6760ed17c454bbf4ae01a70618297efed865d93ec645514ef34734668fde6df1139727ca317769bc2e221af88b8084811529c3372aab6db908c0b SHA512 2a0a0d21ad3147a772df5a52ea425edbf2681256240e3570976268b5d9cf19f315a014b304932161219813c65dff95a2644070383121595ec3f2adabbb116093
-DIST thc-ipv6-2.3.tar.gz 176918 BLAKE2B fc3c06324b25b8b2ff70a569955d584e0a4c2691b92b21691a2c9098e5c1bf2e3354c101fe48b2174fd803e3f051af32b5c3293745cbe2ee83f23a84c5379c19 SHA512 d4eff19a0a87ca828d7cf06e9ef9c1e542c0a527949681d08730445e40e90608aaebf778b8ab1cd8d3adeb44fb8cac79607e27704baddf703355a0058ebce4a8
-DIST thc-ipv6-2.5.tar.gz 262015 BLAKE2B 91dac7cfa86c3afb59fc34c2fad648a1ef2402b0fdb1cf80aa94bfc6affd90533c7d96b72e0c9f7551f125b0f8cdeda87232fbc3fa408346c64f099ca31adea1 SHA512 7fc2dda9d83d25c61b3dc8576679e06866fd1144ca39d5e0b43bbd3c4da2583ec37ca901a43a817bdeec19226d3e252624d684f31bc7e94e08bdd811d5fb5466
-DIST thc-ipv6-2.7.tar.gz 661592 BLAKE2B 64b5b8779f25c111bb132e30242da8563dde687f4a88f902d8d72239efc5982613a148a38bfb3adc1a770bdbac20554832c5c3b95a57e5a9512629a225a97257 SHA512 0863ff36109e048a45ec220b98f0e2cf62b7214edcab4afa27a89fc5c0e41469f7e5733efeb56ed0d00cffcf57ceed3d7d32d813e8081d39f1a21e2646e0a0f3
+AUX thc-ipv6-3.2-stdint.patch 208 BLAKE2B 639a1ceec32ab48b886d721b7ea197dd39efe4ab5f62f8f1fffe04e68560336269e9b3b021c90ef635948bfbbbc0c60e0cb2c56e60e7bca3dfdc7c0d823dfdd9 SHA512 635438ba4a64eb63d51130643afd73e87e83313532f351e1f124cd0f34d719a67d77e592595707e65c8fd5b69a00cf04942688668e5a9c921807934ca602fd8e
 DIST thc-ipv6-3.0.tar.gz 667859 BLAKE2B 6fa4f697bf316c3b9730b58e35c3d8ac6910c0e063751037a0900aa459c128c5de9a07e4912025dd6eebb92061a7cc48a6e2e2a0b5d7d53b339e4d5416e4fdf7 SHA512 969ebbf4da4514cb83e3abcff637f7ba301c4f072f1f983b3cd3cfd3b0643b55af6eacca3c76e39e11ea9ef6e465be03dfa7ce1d6c988cabbd42cdd95d1e2552
-EBUILD thc-ipv6-2.3.ebuild 776 BLAKE2B 3a418e01562d970b7bf7326230fa7662867c02d04d9ad8190540732f7da762497c11c7915ab8dab7522d40b71ce9beacc62f665c01ff226cd2cb0657836b0349 SHA512 9f5c13cc7553c95652e6171ea32924a073af5949a616179c1571e35d9f6224728ab39df431a8ea7e9140babcfc94cc00a4025109debc501897cb03d5e47d3911
-EBUILD thc-ipv6-2.5.ebuild 777 BLAKE2B a620af86d8e84e37afac0ece467a2c60afdeb1d054a699ab9e92b33197eb1843ae95a63a0a3a53163f55c12b01df096cd1bb720ecfeb0f9428d7d2c4333708bb SHA512 67af189268fe5e6fbb99cd6dc31d54706890ecba5ee8ba33dd5010a1fe7fd152c7fd9315725b2f0ac713ad683bac846cfb36f46ed98331b4f5e40156928cc3f5
-EBUILD thc-ipv6-2.7.ebuild 777 BLAKE2B a620af86d8e84e37afac0ece467a2c60afdeb1d054a699ab9e92b33197eb1843ae95a63a0a3a53163f55c12b01df096cd1bb720ecfeb0f9428d7d2c4333708bb SHA512 67af189268fe5e6fbb99cd6dc31d54706890ecba5ee8ba33dd5010a1fe7fd152c7fd9315725b2f0ac713ad683bac846cfb36f46ed98331b4f5e40156928cc3f5
-EBUILD thc-ipv6-3.0.ebuild 1130 BLAKE2B 3f8d3b7abb54405d3b9755c300d27f1ad098109bf264d1480fbeb2b6188b88179dda12cbfb9e44e361a3acc4347765a5abec8c925b85d44c04d41850952039d2 SHA512 ef2f809e3348f222fe2f01d81202f26a4d119209256ab6d27148c98f04bd896740b54397ff64d60b4af7eee36d20a906ceef831d14a0d567e951cf9f2e78fe1a
-EBUILD thc-ipv6-9999.ebuild 1130 BLAKE2B 3f8d3b7abb54405d3b9755c300d27f1ad098109bf264d1480fbeb2b6188b88179dda12cbfb9e44e361a3acc4347765a5abec8c925b85d44c04d41850952039d2 SHA512 ef2f809e3348f222fe2f01d81202f26a4d119209256ab6d27148c98f04bd896740b54397ff64d60b4af7eee36d20a906ceef831d14a0d567e951cf9f2e78fe1a
+DIST thc-ipv6-3.2.tar.gz 1595453 BLAKE2B f1bb1cdc31f4cf4d067b39997ca3cc2d6d8c15e7a8c585c7c494f03e229fccbcd65677e382a65f0e650d79278f5ede89173db1cdf313ade7c48dff1566856afa SHA512 648db4618ebb83572e2e318cdbb284fe96a86adf335f7dd9b26fd010c76d12e9137ed7367207c66c93c1961c868d3917d706db9f597289ac47ea3f9b83c03441
+EBUILD thc-ipv6-3.0.ebuild 1172 BLAKE2B 24e8c7bc51f3abefdd752003f9bc32da61a83e2af7863afd2ee711a4a52ead7f27ecdf7855ccfa5d9803b763bd233d54bc2f5786f75cfd0ba2dfbd5b88c4f648 SHA512 f8d0288bbfc765ff2f838bb7a402e4c7d15384bc23b34d4a43bb20071b6e2f6f8410e8803d3006ae978235002ee536c6e1551e808d9e31cbce94c85e8970c616
+EBUILD thc-ipv6-3.2.ebuild 1167 BLAKE2B ccc13cadfe360838172cb55255226715c2b8698822e1db045ce32dc001e610224a8a7516d17ad3e562586c3d71dbbcd66acf842b8ee5c181c9d8d86bc0fccace SHA512 01c36f2a68a61c1172e2d346a0f684bec784dc6dd580e4d6fcbbb584819ba073e03d92a472b3fde9fee30498dbf552e002295680c01c92cf2070a19b174f9ce0
+EBUILD thc-ipv6-9999.ebuild 1167 BLAKE2B ccc13cadfe360838172cb55255226715c2b8698822e1db045ce32dc001e610224a8a7516d17ad3e562586c3d71dbbcd66acf842b8ee5c181c9d8d86bc0fccace SHA512 01c36f2a68a61c1172e2d346a0f684bec784dc6dd580e4d6fcbbb584819ba073e03d92a472b3fde9fee30498dbf552e002295680c01c92cf2070a19b174f9ce0
 MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
diff --git a/net-analyzer/thc-ipv6/files/thc-ipv6-2.1-Makefile.patch b/net-analyzer/thc-ipv6/files/thc-ipv6-2.1-Makefile.patch
deleted file mode 100644
index d7b42147ae1e..000000000000
--- a/net-analyzer/thc-ipv6/files/thc-ipv6-2.1-Makefile.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- thc-ipv6-2.1/Makefile
-+++ thc-ipv6-2.1/Makefile
-@@ -4,7 +4,7 @@
- 
- CC=gcc
- #CFLAGS=-g
--CFLAGS=-O2
-+CFLAGS?=-O2
- CFLAGS+=$(if $(HAVE_SSL),-D_HAVE_SSL,)
- LDFLAGS+=-lpcap $(if $(HAVE_SSL),-lssl -lcrypto,)
- PROGRAMS=parasite6 dos-new-ip6 detect-new-ip6 fake_router6 fake_advertise6 fake_solicitate6 fake_mld6 fake_mld26 fake_mldrouter6 flood_mldrouter6 fake_mipv6 redir6 smurf6 alive6 toobig6 rsmurf6 implementation6 implementation6d sendpees6 sendpeesmp6 randicmp6 fuzz_ip6 flood_mld6 flood_mld26 flood_router6 flood_advertise6 flood_solicitate6 trace6 exploit6 denial6 fake_dhcps6 flood_dhcpc6 fake_dns6d fragmentation6 kill_router6 fake_dnsupdate6 ndpexhaust6 detect_sniffer6 dump_router6 fake_router26 flood_router26 passive_discovery6 dnsrevenum6 inverse_lookup6 node_query6 address6 covert_send6 covert_send6d inject_alive6 firewall6 ndpexhaust26 fake_pim6
-@@ -17,10 +17,10 @@
- all:	$(LIBS) $(PROGRAMS) dnssecwalk dnsdict6 thcping6
- 
- dnssecwalk:	dnssecwalk.c
--	$(CC) $(CFLAGS) -o $@ $^
-+	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
- 
- dnsdict6:	dnsdict6.c
--	$(CC) $(CFLAGS) -o $@ $^ -lpthread -lresolv
-+	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) -lpthread -lresolv
- 
- thcping6:	thcping6.c $(LIBS)
- 	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) -lrt
diff --git a/net-analyzer/thc-ipv6/files/thc-ipv6-3.2-stdint.patch b/net-analyzer/thc-ipv6/files/thc-ipv6-3.2-stdint.patch
new file mode 100644
index 000000000000..7873563b2377
--- /dev/null
+++ b/net-analyzer/thc-ipv6/files/thc-ipv6-3.2-stdint.patch
@@ -0,0 +1,10 @@
+--- thc-ipv6-3.2/dnsrevenum6.c
++++ thc-ipv6-3.2/dnsrevenum6.c
+@@ -17,6 +17,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <stdint.h>
+ #include <string.h>
+ #include <strings.h>
+ #include <string.h>
diff --git a/net-analyzer/thc-ipv6/thc-ipv6-2.3.ebuild b/net-analyzer/thc-ipv6/thc-ipv6-2.3.ebuild
deleted file mode 100644
index 0cf3cf3241d1..000000000000
--- a/net-analyzer/thc-ipv6/thc-ipv6-2.3.ebuild
+++ /dev/null
@@ -1,36 +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="complete tool set to attack the inherent protocol weaknesses of IPV6 and ICMP6"
-HOMEPAGE="http://freeworld.thc.org/thc-ipv6/"
-SRC_URI="http://freeworld.thc.org/releases/${P}.tar.gz"
-
-LICENSE="GPL-3 openssl"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ssl"
-
-DEPEND="net-libs/libpcap
-	ssl? ( dev-libs/openssl )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.1-Makefile.patch
-	if ! use ssl ; then
-		sed -e '/^HAVE_SSL/s:^:#:' \
-			-i Makefile
-	fi
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" STRIP="true" install
-	dodoc CHANGES HOWTO-INJECT README
-}
diff --git a/net-analyzer/thc-ipv6/thc-ipv6-2.5.ebuild b/net-analyzer/thc-ipv6/thc-ipv6-2.5.ebuild
deleted file mode 100644
index 4b3cd8777b52..000000000000
--- a/net-analyzer/thc-ipv6/thc-ipv6-2.5.ebuild
+++ /dev/null
@@ -1,36 +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="complete tool set to attack the inherent protocol weaknesses of IPV6 and ICMP6"
-HOMEPAGE="http://freeworld.thc.org/thc-ipv6/"
-SRC_URI="http://freeworld.thc.org/releases/${P}.tar.gz"
-
-LICENSE="AGPL-3 openssl"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ssl"
-
-DEPEND="net-libs/libpcap
-	ssl? ( dev-libs/openssl )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.1-Makefile.patch
-	if ! use ssl ; then
-		sed -e '/^HAVE_SSL/s:^:#:' \
-			-i Makefile
-	fi
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" STRIP="true" install
-	dodoc CHANGES HOWTO-INJECT README
-}
diff --git a/net-analyzer/thc-ipv6/thc-ipv6-2.7.ebuild b/net-analyzer/thc-ipv6/thc-ipv6-2.7.ebuild
deleted file mode 100644
index 4b3cd8777b52..000000000000
--- a/net-analyzer/thc-ipv6/thc-ipv6-2.7.ebuild
+++ /dev/null
@@ -1,36 +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="complete tool set to attack the inherent protocol weaknesses of IPV6 and ICMP6"
-HOMEPAGE="http://freeworld.thc.org/thc-ipv6/"
-SRC_URI="http://freeworld.thc.org/releases/${P}.tar.gz"
-
-LICENSE="AGPL-3 openssl"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ssl"
-
-DEPEND="net-libs/libpcap
-	ssl? ( dev-libs/openssl )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.1-Makefile.patch
-	if ! use ssl ; then
-		sed -e '/^HAVE_SSL/s:^:#:' \
-			-i Makefile
-	fi
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" STRIP="true" install
-	dodoc CHANGES HOWTO-INJECT README
-}
diff --git a/net-analyzer/thc-ipv6/thc-ipv6-3.0.ebuild b/net-analyzer/thc-ipv6/thc-ipv6-3.0.ebuild
index 5151e3d3ceca..d4aee56ff488 100644
--- a/net-analyzer/thc-ipv6/thc-ipv6-3.0.ebuild
+++ b/net-analyzer/thc-ipv6/thc-ipv6-3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,6 +24,9 @@ DEPEND="net-libs/libpcap
 	ssl? ( dev-libs/openssl:* )"
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${PN}-3.2-stdint.patch"
+	"${FILESDIR}"/${PN}-3.0-Makefile.patch )
+
 src_unpack() {
 	if [[ ${PV} != *9999 ]]; then
 		default_src_unpack
@@ -33,15 +36,13 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.0-Makefile.patch
-	sed -i \
-		-e '/^CFLAGS=/s,CFLAGS=,CFLAGS?=,' \
-		Makefile
+	sed -e '/^CFLAGS=/s,CFLAGS=,CFLAGS?=,' \
+		-i Makefile || die
 	if ! use ssl ; then
 		sed -e '/^HAVE_SSL/s:^:#:' \
 			-i Makefile
 	fi
-	eapply_user
+	default
 }
 
 src_compile() {
diff --git a/net-analyzer/thc-ipv6/thc-ipv6-3.2.ebuild b/net-analyzer/thc-ipv6/thc-ipv6-3.2.ebuild
new file mode 100644
index 000000000000..a0934cf80b9a
--- /dev/null
+++ b/net-analyzer/thc-ipv6/thc-ipv6-3.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+[[ ${PV} == *9999 ]] && SCM="git-r3"
+EGIT_REPO_URI="https://github.com/vanhauser-thc/thc-ipv6.git"
+EGIT_BRANCH=master
+
+inherit eutils toolchain-funcs ${SCM}
+
+DESCRIPTION="complete tool set to attack the inherent protocol weaknesses of IPV6 and ICMP6"
+HOMEPAGE="https://www.thc.org/thc-ipv6/"
+LICENSE="AGPL-3 openssl"
+SLOT="0"
+IUSE="ssl"
+
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="https://github.com/vanhauser-thc/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DEPEND="net-libs/libpcap
+	net-libs/libnetfilter_queue
+	ssl? ( dev-libs/openssl:* )"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-3.2-stdint.patch" )
+
+src_unpack() {
+	if [[ ${PV} != *9999 ]]; then
+		default_src_unpack
+	else
+		git-r3_src_unpack
+	fi
+}
+
+src_prepare() {
+	sed -e '/^CFLAGS=/s,CFLAGS=,CFLAGS?=,' \
+		-i Makefile || die
+	if ! use ssl ; then
+		sed -e '/^HAVE_SSL/s:^:#:' \
+			-i Makefile
+	fi
+	default
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="/usr" STRIP="true" install
+	dodoc CHANGES HOWTO-INJECT README
+}
diff --git a/net-analyzer/thc-ipv6/thc-ipv6-9999.ebuild b/net-analyzer/thc-ipv6/thc-ipv6-9999.ebuild
index 5151e3d3ceca..a0934cf80b9a 100644
--- a/net-analyzer/thc-ipv6/thc-ipv6-9999.ebuild
+++ b/net-analyzer/thc-ipv6/thc-ipv6-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SLOT="0"
 IUSE="ssl"
 
 if [[ ${PV} != *9999 ]]; then
-	SRC_URI="http://www.thc.org/releases/${P}.tar.gz"
+	SRC_URI="https://github.com/vanhauser-thc/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
@@ -24,6 +24,8 @@ DEPEND="net-libs/libpcap
 	ssl? ( dev-libs/openssl:* )"
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${PN}-3.2-stdint.patch" )
+
 src_unpack() {
 	if [[ ${PV} != *9999 ]]; then
 		default_src_unpack
@@ -33,15 +35,13 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.0-Makefile.patch
-	sed -i \
-		-e '/^CFLAGS=/s,CFLAGS=,CFLAGS?=,' \
-		Makefile
+	sed -e '/^CFLAGS=/s,CFLAGS=,CFLAGS?=,' \
+		-i Makefile || die
 	if ! use ssl ; then
 		sed -e '/^HAVE_SSL/s:^:#:' \
 			-i Makefile
 	fi
-	eapply_user
+	default
 }
 
 src_compile() {
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 1607bef35e89..8fe15369ca0b 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -5,8 +5,8 @@ AUX wireshark-99999999-androiddump.patch 202 BLAKE2B 31548a778c4a3b799bad8f92022
 DIST wireshark-2.2.7.tar.bz2 32309420 BLAKE2B a4ec32fab15235c5bde9f03ceafc5760055a769dd40d96526a18ad16d5642e957f620fc58f42c3323745bd679d6ef7b006283e7b9ddc52ddadc2680789d957ea SHA512 417836810eb895b3f2a6ac1cfd138fb0275382ea2edc60fc5f5e5f8ce433b56b8120aa8b58b4f77296986630fdf49e4c5c3859b2c2c5e26b1ce0651393b7d716
 DIST wireshark-2.4.2.tar.xz 28791712 BLAKE2B 64a965f522478e2e5690a4439554764bd341c0b8017003af4b0d328094cf56a72462df9dfdb9c9318e4bfc1fe57e4caedc43e0d0c18c704c8342dbb3baa36d91 SHA512 212964482a1e45af490ef78b3f2465384f84c007a76c3a99e8de0e2c37d933fb34b0da5631f4a36ca12d2fa7cc4376d3d405cbe7f7113791ea09dba7e5915417
 DIST wireshark-2.4.3.tar.xz 28807920 BLAKE2B 831691d084fc9ed6198b23c0347efa487398df37ca0cf5972db64b0724fad04b3104a5faed104b5d4b560254b19a2e41118c8d7b71cce785f38ede077215e80f SHA512 4344b9efeda3afba4b13bb468f7a12c4565da96c6182a8203cc5815baa11e7d84f3f11003b4289c6c11391cfb590b8c0319268196cc646a8f0226c432e9bb433
-EBUILD wireshark-2.2.7.ebuild 6439 BLAKE2B 86d89c85ae317328c1ab3fdead659c4a70ee10ca1ddef1d821752ba0a89c3d8cfcea65ceff744e3deb32dcd9b2a6126992bb0664cd6e56a969baa42e37cdae9a SHA512 19547b52dd4f3571a17c954e2d3158511e0abde89632b4b370b2d5ced306b42bf08d9eeae8747651738bc2ebe38f81c0c7193e7992a8660ac61b0c7e205c830a
-EBUILD wireshark-2.4.2.ebuild 7337 BLAKE2B 64d920110b5c8b15591d3b13f49b9580f737fec9d3e6debd40635b1fe318719a2a26f34f4a52537f12d4e3cf78126909187e66e263364410c84af74f3809037f SHA512 8e77633581947acc961ff073d9f117326497ff6cab113a26fccd3d8931b231ddcd62b6b8a704e175d2546b6af15d0fa831407c99fdf17d96de24afc470c35439
-EBUILD wireshark-2.4.3.ebuild 7302 BLAKE2B a5d5c0260b17d1a443980170a095c989a583dd37a89cae29184823acee3c8588486245a0d6c364452a99f32437d18d739377d0c13a0a5cf109af70f42498e042 SHA512 c59b60ad2c4b7d1a3978d9117cd82203ee5e81638a1d2bfbfa2e97661958926dacb3b9234fbc6dfbb2c062116e31ef1dd08409270dd035fa1900b0b39fc46156
-EBUILD wireshark-99999999.ebuild 7217 BLAKE2B ad176fcc18764982eacd5442529f646522c94321d3d5940de551dc20ef324f0714028839aa5cff633572bfdc526bbe6f61605e1930266c2c47eb52729e900b42 SHA512 6ce954d8e03a0a76a17bf9560477126d5b61f5eef49c078a3383ff6ab7da375e0e1770ac440458c4a8b6e28fc325ee9d3ab21894ba31cf8b02bdd5a2e22c5396
+EBUILD wireshark-2.2.7.ebuild 6481 BLAKE2B 167c80ea9d3f41234ec9324d37ed3886776fac88863fd47e264eebc35014cc1c8da5c191da741d2fa2d8d7239eb8de649819c544deed346102627bc723e5ae29 SHA512 f7c45d28f9b5dd2a10b1575e4f9d071e435dcd34d6b7638ea2d8fc0ec3ca7c8ac4e8d73d23b2bc093c623b87e32b25ac36d80ca0d309daa32a18ebe5813529bb
+EBUILD wireshark-2.4.2.ebuild 7379 BLAKE2B 6b2e91ce48323c78b8182774e87140e8f1b6db3187074d11d671ee3597aae4e6ba1a487458e144ece58a69bb89e2d254a73f4809714c0b5038bd488ca0a982f1 SHA512 219ada160e01d499ff48ec40e161a64ffc0e709169fafccf41d6b428ee10eb00e34c0d2db8198f151c893a425c9781583eb56f6216f3162c2e87dec63d0d8fcb
+EBUILD wireshark-2.4.3.ebuild 7344 BLAKE2B 640d8fdc278d1a7a0b8012872c8ffa92089074a2dd78908c51eae118d012a537567d0d2b0f66f392e29f89947ee01960819b0472694820ef06a0d569ea32ecc2 SHA512 7ca6ff0d6dcc439894d004e99a4c8975e9b36cd0fda5e8af17b45ec5cc5f1721ddae52bea9953335d02875cb6c7f6532acff78edfa13134d871f930a915cdfe2
+EBUILD wireshark-99999999.ebuild 7259 BLAKE2B e6cd9d0222161c4280dbd722bf159e91b4659ab52eb9b3e0c549715734a1dcc610cebe9e22c4e5a3bd170457655160c88d5dcf4f8aac67a076d1c6b9f17f3a21 SHA512 edbf3a090c9af2531e9f0a4735ed38ed8e56b5fa2eb727a4866cfe3b6573846c24fa2ef8c67c087d4a768d3d38b8085f80d35c0981b75e9cb363ca1ca37bb718
 MISC metadata.xml 4780 BLAKE2B 57512cc79565297a5357767a663a93a49655de7d7ec8adbe7d0da21e0617c69255ca3a52153f7f2e2a21a3b96f378ab0c691666f5336896af422fc88ee5fada3 SHA512 60941d415e0733be68ab15af456f842e5793eeef6cf4459449cc919ff5255d1ab2b194ece2c4b4d90bdebc5f1601fd98952fe22bafff8918e25613180233dec5
diff --git a/net-analyzer/wireshark/wireshark-2.2.7.ebuild b/net-analyzer/wireshark/wireshark-2.2.7.ebuild
index e28e46471220..dcdf77d1de68 100644
--- a/net-analyzer/wireshark/wireshark-2.2.7.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.2.7.ebuild
@@ -48,7 +48,10 @@ CDEPEND="
 		dev-qt/qtmultimedia:5
 		dev-qt/qtprintsupport:5
 		dev-qt/qtwidgets:5
-		media-libs/speex
+		|| (
+			media-libs/speexdsp
+			<media-libs/speex-1.2.0
+		)
 		x11-misc/xdg-utils
 	)
 	sbc? ( media-libs/sbc )
diff --git a/net-analyzer/wireshark/wireshark-2.4.2.ebuild b/net-analyzer/wireshark/wireshark-2.4.2.ebuild
index 77aa34a9b99e..e886059b19aa 100644
--- a/net-analyzer/wireshark/wireshark-2.4.2.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.4.2.ebuild
@@ -51,7 +51,10 @@ CDEPEND="
 		dev-qt/qtmultimedia:5
 		dev-qt/qtprintsupport:5
 		dev-qt/qtwidgets:5
-		media-libs/speex
+		|| (
+			media-libs/speexdsp
+			<media-libs/speex-1.2.0
+		)
 		x11-misc/xdg-utils
 	)
 	sbc? ( media-libs/sbc )
diff --git a/net-analyzer/wireshark/wireshark-2.4.3.ebuild b/net-analyzer/wireshark/wireshark-2.4.3.ebuild
index 5fbf5cfe70b6..f006ba339014 100644
--- a/net-analyzer/wireshark/wireshark-2.4.3.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.4.3.ebuild
@@ -52,7 +52,10 @@ CDEPEND="
 		dev-qt/qtmultimedia:5
 		dev-qt/qtprintsupport:5
 		dev-qt/qtwidgets:5
-		media-libs/speex
+		|| (
+			media-libs/speexdsp
+			<media-libs/speex-1.2.0
+		)
 		x11-misc/xdg-utils
 	)
 	sbc? ( media-libs/sbc )
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index 32ecbd608dd8..9d9fca8d8a03 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -52,7 +52,10 @@ CDEPEND="
 		dev-qt/qtmultimedia:5
 		dev-qt/qtprintsupport:5
 		dev-qt/qtwidgets:5
-		media-libs/speex
+		|| (
+			media-libs/speexdsp
+			<media-libs/speex-1.2.0
+		)
 		x11-misc/xdg-utils
 	)
 	sbc? ( media-libs/sbc )
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 3a6d60917b75..f9063b11c2eb 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/dnssec-lookup/Manifest b/net-dns/dnssec-lookup/Manifest
index 5b6a9484fcd3..341290806698 100644
--- a/net-dns/dnssec-lookup/Manifest
+++ b/net-dns/dnssec-lookup/Manifest
@@ -1,5 +1,4 @@
-DIST dnssec-lookup-2.1.tar.gz 36243 BLAKE2B bb37bd0e4f6b61ddfa1f18ab1757104f63afe1a38f1960e24942d9dca8a37685dc0c9e9db4e9661e5fe8481989f86519098e62ed241fcb1e172056843698eea1 SHA512 c1a90a354411904f5905cd343c30cccca215b60584fcd5ba0cf9643555b56bfb948a8f55a48dc7bc45bf14c1cc945694d308a684d71cc6b5ba8deae8716b7068
+AUX dnssec-lookup-2.2-unused-libs.patch 491 BLAKE2B 8518f18aec8f228e4643d37259fd696b47913b4b47112083e015963dabf6bb4d8dafa690c562bd7d4e8caf32024ead8a419b782b5e711b62eb859f4dfcf361fa SHA512 7e6e23766498f518792702723205ccb67bb51b86f59138d807bb099ca45389c15baebc02dbb3dce6801c238c800b5d54198a5e84c985b2db14f8c90214998b82
 DIST dnssec-lookup-2.2.tar.gz 36181 BLAKE2B 761624b695b895fe9eb72108623631e9f9a21693a3d386052e43a1ee0686ec808346ca5e162df15c99ac067cf0518bddc8280842650aeeb7e5a03a72897c75c4 SHA512 195af13b69681394b6de6ae77b7401f81e6c4005e81e3d95bb97d6821ccdefbd3a119f2c331e7016728fda5b45ce364c9240fffd7623276042c666e5c5d05cba
-EBUILD dnssec-lookup-2.1.ebuild 766 BLAKE2B 84c168ca8d5ba2c4839f2cd58e7f48561c7d7d8cf39b82dfe51c8287fcbd5cdbb7b2fd2feb6104943d6307f958c97ecfefb916d891d19767e3df6794e38a2ef1 SHA512 f67ad7b87af5202cde00303d4c312159b6a8e862448c2b9f1f091a5130b681dc5943488eb2d00edb7a612e589a1b78579c1544cbd6908d053c688774b1275fc5
-EBUILD dnssec-lookup-2.2.ebuild 766 BLAKE2B da38b2a6fa15830834e552f743aae9a1ec9a5c539cdd558c600370a86fe67e6dd95d6bf73fe37f256b5e50061643b14d5c08bcd32d23333c1293a77b153e2501 SHA512 3c09776154f010a4f0915b063d5bb5eb045a8cd324d41f14285a62f218d725fbd34ac7e6a0f4fe28294c65072cf7623bf637a7f869b3c81c94e1cbb141dfb0a7
+EBUILD dnssec-lookup-2.2.ebuild 819 BLAKE2B ab15f22a35db1244cf07356aa0ff9789d4467d9e7ac2b25da41ddc11c7d3c26e1ce06ec49aba3c18423536c9b5e19734a41c73e8ed02e9c02ee0a4553d992c69 SHA512 a248043b178b2e1c3a9c8a4b9a864178d63f1be20f132a37a2ced5ebc071868106c848cd65bc51d573903c3d46f5faf15d22fea2209559b8d46c9d247640680f
 MISC metadata.xml 594 BLAKE2B 3ad1d9cd548ba0849f607819f11de99a029ffa49d92659a0a00f4fe071cbf94409a1e761fee183872ac78d748594d6c98c23f99d19858e5850cf2c3ff93f5dfb SHA512 04df4471ca57b3e9200d8cf46820dca6932db7e1087084add9e2faa5726fa6e4bede034f685d5b0853761be0d441a00823276e82baa8d36b50189da4f81a7c00
diff --git a/net-dns/dnssec-lookup/dnssec-lookup-2.1.ebuild b/net-dns/dnssec-lookup/dnssec-lookup-2.1.ebuild
deleted file mode 100644
index 152849fa8280..000000000000
--- a/net-dns/dnssec-lookup/dnssec-lookup-2.1.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 qt4-r2
-
-MY_PN=${PN/dnssec-/}
-MY_P=${MY_PN}-${PV}
-DESCRIPTION="DNS lookup utility that supports DNSSEC validation"
-HOMEPAGE="http://www.dnssec-tools.org"
-SRC_URI="http://www.dnssec-tools.org/download/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="=net-dns/dnssec-validator-${PV}[threads]
-	dev-qt/qtgui:4"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	eqmake4 ${MY_PN}.pro PREFIX=/usr
-}
-
-src_install() {
-	newbin src/build/${MY_PN} ${PN}
-
-	newicon data/64x64/${MY_PN}.png ${PN}.png
-	newicon data/maemo/${MY_PN}.xpm ${PN}.xpm
-	make_desktop_entry ${PN}
-
-	newman man/${MY_PN}.1 ${PN}.1
-}
diff --git a/net-dns/dnssec-lookup/dnssec-lookup-2.2.ebuild b/net-dns/dnssec-lookup/dnssec-lookup-2.2.ebuild
index 0dc819c75f32..c79848fe5e59 100644
--- a/net-dns/dnssec-lookup/dnssec-lookup-2.2.ebuild
+++ b/net-dns/dnssec-lookup/dnssec-lookup-2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,12 +16,14 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
-RDEPEND="=net-dns/dnssec-validator-${PV}[threads]
+RDEPEND="=net-dns/dnssec-validator-${PV}-r1[threads]
 	dev-qt/qtgui:4"
 DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${MY_P}
 
+PATCHES=( "${FILESDIR}"/${P}-unused-libs.patch )
+
 src_configure() {
 	eqmake4 ${MY_PN}.pro PREFIX=/usr
 }
diff --git a/net-dns/dnssec-lookup/files/dnssec-lookup-2.2-unused-libs.patch b/net-dns/dnssec-lookup/files/dnssec-lookup-2.2-unused-libs.patch
new file mode 100644
index 000000000000..bcefe0f20364
--- /dev/null
+++ b/net-dns/dnssec-lookup/files/dnssec-lookup-2.2-unused-libs.patch
@@ -0,0 +1,11 @@
+--- lookup-2.2/src/src.pro
++++ lookup-2.2/src/src.pro
+@@ -11,7 +11,7 @@
+ INCLUDEPATH += /home/hardaker/src/dnssec/dnssec-tools.git/dnssec-tools/validator/include
+ 
+ isEmpty(ANDROID_PLATFORM) {
+-    LIBS        += -lval-threads -lsres -lnsl -lssl -lcrypto -lpthread
++    LIBS        += -lval-threads -lsres -lssl -lcrypto -lpthread
+ } else {
+     LIBS        += -L/opt/android-external-openssl/lib/
+     LIBS        += -L/root/necessitas/android-ndk-r5c/platforms/android-4/arch-arm/usr/lib/
diff --git a/net-dns/dnssec-nodes/Manifest b/net-dns/dnssec-nodes/Manifest
index eb9f2bbb1231..9c68ea4f7e81 100644
--- a/net-dns/dnssec-nodes/Manifest
+++ b/net-dns/dnssec-nodes/Manifest
@@ -1,5 +1,3 @@
-DIST dnssec-nodes-2.1.tar.gz 98582 BLAKE2B 4c15699c6fe92cc696575b7a82e53afe46b37dc6655ade8abef945e5e33d9763bae743f21b780f0902a0cecfa36b1878f3fcdb5755c4cb83778c10a099884066 SHA512 2c532eccdfaedc2994e0edd529dfb6d550c40721053732e3e64d094c18ba3fd67f803151804996ece978f55dcfd443de08e0577d501074e57543dd630dc33d2c
 DIST dnssec-nodes-2.2.tar.gz 98151 BLAKE2B 03f001b21006334e4080eb8caa897f2cb3a4fadd02aec7d0357b1563d62a7ef9b8a1824e1393940bbd3105b1d44c2573b329346c4ed9cbdb693e76bdc82990d7 SHA512 14f5ae628ceb59a85820c3d578bd1c36e620a17c1bb0a4f8fe440134ec8449adf181b053ea54a1bb321f4aff72014fa6a55a3a5a4d2542c407a3d35cfe4b9554
-EBUILD dnssec-nodes-2.1.ebuild 630 BLAKE2B c3f4f7e1ae707624991a7e8e1bae6fe7bba11c9ccb70f75beeb458408355d4a7eb7e003d73b42d63bb4fc90946521324bc8fe2070efc110560e812c1db7135db SHA512 77955882a14387a29317b752aeae35adc3d95dc8833a65ec1d5d400cc187b0c00d17950642aa800026b39a076a71fbe42aa2ae918c80eda3a38dfa33c3dc8a6f
-EBUILD dnssec-nodes-2.2.ebuild 630 BLAKE2B c3f4f7e1ae707624991a7e8e1bae6fe7bba11c9ccb70f75beeb458408355d4a7eb7e003d73b42d63bb4fc90946521324bc8fe2070efc110560e812c1db7135db SHA512 77955882a14387a29317b752aeae35adc3d95dc8833a65ec1d5d400cc187b0c00d17950642aa800026b39a076a71fbe42aa2ae918c80eda3a38dfa33c3dc8a6f
+EBUILD dnssec-nodes-2.2.ebuild 633 BLAKE2B cd2d9ca7ceb5c62c4c44261f69ad4154bfe7e5aee09ab311effe57f686fc47c727fa11507156263a3a946f1ae85f4ccd54a903588fd9cc91d2c93bfa7d3f4abf SHA512 e93af18c76a9cc6d3ceb2705f64b4c83799fa56a7d3ba3f949c75fe3d5f2532446dde090aee02dc9a4e9f112a5747036e01d698b6cc9c45a31f8edfcac4551e3
 MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
diff --git a/net-dns/dnssec-nodes/dnssec-nodes-2.1.ebuild b/net-dns/dnssec-nodes/dnssec-nodes-2.1.ebuild
deleted file mode 100644
index 881be6825646..000000000000
--- a/net-dns/dnssec-nodes/dnssec-nodes-2.1.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 eutils qt4-r2
-
-DESCRIPTION="graphically depicts the DNSSEC results from a lookup via logfiles"
-HOMEPAGE="http://www.dnssec-tools.org"
-SRC_URI="http://www.dnssec-tools.org/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="=net-dns/dnssec-validator-${PV}[threads]
-	dev-qt/qtcore:4"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	eqmake4 ${PN}.pro PREFIX=/usr
-}
-
-src_install() {
-	qt4-r2_src_install
-
-	doicon icons/dnssec-nodes.*
-	make_desktop_entry ${PN}
-
-	doman man/${PN}.1
-}
diff --git a/net-dns/dnssec-nodes/dnssec-nodes-2.2.ebuild b/net-dns/dnssec-nodes/dnssec-nodes-2.2.ebuild
index 881be6825646..97e5dd1920d4 100644
--- a/net-dns/dnssec-nodes/dnssec-nodes-2.2.ebuild
+++ b/net-dns/dnssec-nodes/dnssec-nodes-2.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=5
 
 inherit eutils qt4-r2
 
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="=net-dns/dnssec-validator-${PV}[threads]
+RDEPEND="=net-dns/dnssec-validator-${PV}-r1[threads]
 	dev-qt/qtcore:4"
 DEPEND="${RDEPEND}"
 
diff --git a/net-dns/dnssec-validator/Manifest b/net-dns/dnssec-validator/Manifest
index 0068c414f5eb..8eb14c04915d 100644
--- a/net-dns/dnssec-validator/Manifest
+++ b/net-dns/dnssec-validator/Manifest
@@ -1,6 +1,5 @@
 AUX dnssec-validator-2.1-respect-LDFLAGS.patch 529 BLAKE2B b4e3199c1263973e93b744077025b11a1ab9d525d28129744b5c3dc5b9e4e4fc5461dbe4a2d7c36e8dee6f3b743cf73ae328cc5b044f8c1887d6601b33fe8ac1 SHA512 c6ff47eee87ff5b1add81b80136f58369c3b782d2ebae7328152374e7e6ed565bd116a75d69f5fb8ec8273800c4ebd47707aa4560e7bff8007651e13a8590eb6
-DIST dnsval-2.1.tar.gz 1059451 BLAKE2B cf72deaeeacb12549cbf3bf2c1c6aa0527a9b7fc73fc6bd0c4211290fb854d19f66b176c18f56a3d1fc79f368d1bc7b9232c8fd5cca2ac97d7a48c813079643a SHA512 14de6fa86ff30aabcd77d14cbd3e058507f5963f91deadc39dc1a7022f27239010d509f46d392dc7086b6444e068ce66e576f579342ca87a04d7fc776962cd6d
+AUX dnssec-validator-2.2-glib-2.25.patch 5308 BLAKE2B 169c0163926388243d22f3ee5e73a30966525975c9dea800170dc82f61113902cb2d5d5e61bd4edab28ab41b9f0fd1cb2978f1433a1e75cc710cc481786bbc62 SHA512 17aa048f52c7fafc0074c83a725a6b487e88c4a55e3f3f082fa876b2d7ad95cbc3506401991de64546dd97f1ab75421dc3079a0b2d9dd02a26f90658830bf6af
 DIST dnsval-2.2.tar.gz 1060434 BLAKE2B 3a19d5f4128e32f81ae824a128c65b5c5b6f21cef2786d1050631db10084a479614241d869bb33d054d96e7a1e286c472296edf8c4c7e45abd84aaa4df599f28 SHA512 1a01911b08e447d992f4843db8e10bc91041f9e3eaa8a3c050f71f0d7028292145379d1b769e69a837a157443abfa8b0b8ecc289c1b2fa4d33a9234282e9ae05
-EBUILD dnssec-validator-2.1.ebuild 971 BLAKE2B 52046e6c71cb09999a7101cf318cb2558e1250c3e0d57131ba3046530c053948d3ba5f85ca1fa2c3fd361fbc72006a25b7fcc203a089f5d083041866b63894f4 SHA512 7adbfcb7b3953d763d70017e7f79455e4e8fdb3d9e4794e6f78c12559e218b61da2bcf436260e5e454c1b14012e318598d6247dfaf6ffdd260d88d86a1833027
-EBUILD dnssec-validator-2.2.ebuild 976 BLAKE2B edf2f269f2f5bd301f98b846b09af69c24888c7518bf40beb5e723e66413d4c0a47dba07fc291e017c74705a36a99e345afe530e784e0d7f883cadf2b07bed37 SHA512 02affd8004878fccdf629f8c006f06f56776dc42ce0122a2a2ba294d7f5f12936cce5d3b455f5f04a398e659a472fe97f7d4269758b42652496f5341c0601883
-MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
+EBUILD dnssec-validator-2.2-r1.ebuild 1095 BLAKE2B 64479b256fd6c680b146b72a3bf8da23c0af0a9313ab1405867697f29260b74b47dd162b8bbf6958bcad5505e8e29ed22d3fe39e06d85a81c817e97beebb6781 SHA512 e6e006f353fafd640b0b01b19daff0095e138989c07b36253bf45c03811fd2f2bee5d1f9f8f7a06ee3ab901324eb2afeec544a6566394a3c8aec96954d062c0c
+MISC metadata.xml 310 BLAKE2B 16857a33a25e737e90d9ddb904f807971bba345a8372f15c927447c54571982136277175a315b62132c683b9645d959ff79fc5b192595b68bf5f3d3c95747b0b SHA512 0b345a842da8774a69de31efa6be5c693c8bef93d1a045541702b607c167787dd7edb6ceb30dbf05fd9fbb4ed0a3f5ac8ec87d33f98decd4b5ed9928c97bdec1
diff --git a/net-dns/dnssec-validator/dnssec-validator-2.1.ebuild b/net-dns/dnssec-validator/dnssec-validator-2.1.ebuild
deleted file mode 100644
index 463f68b8f707..000000000000
--- a/net-dns/dnssec-validator/dnssec-validator-2.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION="DNSSEC validator (dnsval)"
-HOMEPAGE="http://www.dnssec-tools.org/"
-SRC_URI="http://www.dnssec-tools.org/download/dnsval-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ipv6 static-libs +threads"
-
-RDEPEND="dev-libs/openssl
-	!<net-dns/dnssec-tools-1.13"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/dnsval-${PV}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-respect-LDFLAGS.patch
-}
-
-src_configure() {
-	econf \
-		--with-nsec3 \
-		--with-dlv \
-		$(use_with ipv6) \
-		$(use_with threads)
-}
-
-src_install() {
-	dodir /usr/bin /usr/include/validator
-	default
-
-	insinto /etc/dnssec-tools
-	doins etc/{dnsval.conf,root.hints}
-	elog "Creating /etc/dnssec-tools/resolv.conf as symlink to /etc/resolv.conf"
-	dosym ../resolv.conf /etc/dnssec-tools/resolv.conf
-
-	use static-libs || find "${D}" -name "*.a" -delete
-	prune_libtool_files
-}
diff --git a/net-dns/dnssec-validator/dnssec-validator-2.2.ebuild b/net-dns/dnssec-validator/dnssec-validator-2.2-r1.ebuild
index c170b3fb200a..7830c98a5d5b 100644
--- a/net-dns/dnssec-validator/dnssec-validator-2.2.ebuild
+++ b/net-dns/dnssec-validator/dnssec-validator-2.2-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=6
 
 inherit eutils
 
@@ -11,25 +11,26 @@ SRC_URI="http://www.dnssec-tools.org/download/dnsval-${PV}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ipv6 static-libs +threads"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="ipv6 static-libs +threads +ecdsa-check"
 
-RDEPEND="dev-libs/openssl
+RDEPEND="dev-libs/openssl:0
+	ecdsa-check? ( dev-libs/openssl:0[-bindist] )
 	!<net-dns/dnssec-tools-1.13"
 DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/dnsval-${PV}
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.1-respect-LDFLAGS.patch
-}
+PATCHES=( "${FILESDIR}"/${PN}-2.1-respect-LDFLAGS.patch
+	"${FILESDIR}"/${P}-glib-2.25.patch )
 
 src_configure() {
 	econf \
 		--with-nsec3 \
 		--with-dlv \
 		$(use_with ipv6) \
-		$(use_with threads)
+		$(use_with threads) \
+		$(use_enable ecdsa-check)
 }
 
 src_install() {
diff --git a/net-dns/dnssec-validator/files/dnssec-validator-2.2-glib-2.25.patch b/net-dns/dnssec-validator/files/dnssec-validator-2.2-glib-2.25.patch
new file mode 100644
index 000000000000..8d2a5560b981
--- /dev/null
+++ b/net-dns/dnssec-validator/files/dnssec-validator-2.2-glib-2.25.patch
@@ -0,0 +1,126 @@
+--- validator/include/validator/validator-compat.h
++++ validator/include/validator/validator-compat.h
+@@ -678,6 +678,11 @@ typedef enum __ns_rcode {
+ #define ns_t_zxfr    256 /* BIND-specific, nonstandard. */
+ #endif /* HAVE_NS_T_KX */
+
++/* glibc 2.25 is missing ns_t_zxfr */
++#if !defined(ns_t_zxfr)
++#define ns_t_zxfr    256 /* BIND-specific, nonstandard. */
++#endif /* glibc 2.25 */
++
+ #if !HAVE_DECL_NS_T_DS
+ #define ns_t_ds       43
+ #endif
+@@ -818,53 +823,6 @@ typedef enum __ns_flag {
+         ns_f_max
+ } ns_flag;
+
+-/* The Algorithm field of the KEY and SIG RR's is an integer, {1..254} */
+-#define NS_ALG_MD5RSA           1       /* MD5 with RSA */
+-#define NS_ALG_DH               2       /* Diffie Hellman KEY */
+-#define NS_ALG_DSA              3       /* DSA KEY */
+-#define NS_ALG_DSS              NS_ALG_DSA
+-#define NS_ALG_EXPIRE_ONLY      253     /* No alg, no security */
+-#define NS_ALG_PRIVATE_OID      254     /* Key begins with OID giving alg */
+-
+-/* Protocol values  */
+-/* value 0 is reserved */
+-#define NS_KEY_PROT_TLS         1
+-#define NS_KEY_PROT_EMAIL       2
+-#define NS_KEY_PROT_DNSSEC      3
+-#define NS_KEY_PROT_IPSEC       4
+-#define NS_KEY_PROT_ANY         255
+-
+-/* Signatures */
+-#define NS_MD5RSA_MIN_BITS       512    /* Size of a mod or exp in bits */
+-#define NS_MD5RSA_MAX_BITS      2552
+-        /* Total of binary mod and exp */
+-#define NS_MD5RSA_MAX_BYTES     ((NS_MD5RSA_MAX_BITS+7/8)*2+3)
+-        /* Max length of text sig block */
+-#define NS_MD5RSA_MAX_BASE64    (((NS_MD5RSA_MAX_BYTES+2)/3)*4)
+-#define NS_MD5RSA_MIN_SIZE      ((NS_MD5RSA_MIN_BITS+7)/8)
+-#define NS_MD5RSA_MAX_SIZE      ((NS_MD5RSA_MAX_BITS+7)/8)
+-
+-#define NS_DSA_SIG_SIZE         41
+-#define NS_DSA_MIN_SIZE         213
+-#define NS_DSA_MAX_BYTES        405
+-
+-/* Offsets into SIG record rdata to find various values */
+-#define NS_SIG_TYPE     0       /* Type flags */
+-#define NS_SIG_ALG      2       /* Algorithm */
+-#define NS_SIG_LABELS   3       /* How many labels in name */
+-#define NS_SIG_OTTL     4       /* Original TTL */
+-#define NS_SIG_EXPIR    8       /* Expiration time */
+-#define NS_SIG_SIGNED   12      /* Signature time */
+-#define NS_SIG_FOOT     16      /* Key footprint */
+-#define NS_SIG_SIGNER   18      /* Domain name of who signed it */
+-
+-/* How RR types are represented as bit-flags in NXT records */
+-#define NS_NXT_BITS 8
+-#define NS_NXT_BIT_SET(  n,p) (p[(n)/NS_NXT_BITS] |=  (0x80>>((n)%NS_NXT_BITS)))
+-#define NS_NXT_BIT_CLEAR(n,p) (p[(n)/NS_NXT_BITS] &= ~(0x80>>((n)%NS_NXT_BITS)))
+-#define NS_NXT_BIT_ISSET(n,p) (p[(n)/NS_NXT_BITS] &   (0x80>>((n)%NS_NXT_BITS)))
+-#define NS_NXT_MAX 127
+-
+ /*
+  * Inline versions of get/put short/long.  Pointer is advanced.
+  */
+@@ -931,6 +889,57 @@ int	ns_parse_ttl(const char *, u_long *);
+
+ #endif /* HAVE_ARPA_NAMESER_H */
+
++/* glibc 2.25 passes HAVE_ARPA_NAMESER_H, but doesn't have NS_ALG_MD5RSA and more defines. */
++#if !defined(HAVE_ARPA_NAMESER_H) || defined(eabi) || defined(ANDROID) ||defined(__OpenBSD__) || !defined(NS_ALG_MD5RSA)
++/* The Algorithm field of the KEY and SIG RR's is an integer, {1..254} */
++#define NS_ALG_MD5RSA           1       /* MD5 with RSA */
++#define NS_ALG_DH               2       /* Diffie Hellman KEY */
++#define NS_ALG_DSA              3       /* DSA KEY */
++#define NS_ALG_DSS              NS_ALG_DSA
++#define NS_ALG_EXPIRE_ONLY      253     /* No alg, no security */
++#define NS_ALG_PRIVATE_OID      254     /* Key begins with OID giving alg */
++
++/* Protocol values  */
++/* value 0 is reserved */
++#define NS_KEY_PROT_TLS         1
++#define NS_KEY_PROT_EMAIL       2
++#define NS_KEY_PROT_DNSSEC      3
++#define NS_KEY_PROT_IPSEC       4
++#define NS_KEY_PROT_ANY         255
++
++/* Signatures */
++#define NS_MD5RSA_MIN_BITS       512    /* Size of a mod or exp in bits */
++#define NS_MD5RSA_MAX_BITS      2552
++        /* Total of binary mod and exp */
++#define NS_MD5RSA_MAX_BYTES     ((NS_MD5RSA_MAX_BITS+7/8)*2+3)
++        /* Max length of text sig block */
++#define NS_MD5RSA_MAX_BASE64    (((NS_MD5RSA_MAX_BYTES+2)/3)*4)
++#define NS_MD5RSA_MIN_SIZE      ((NS_MD5RSA_MIN_BITS+7)/8)
++#define NS_MD5RSA_MAX_SIZE      ((NS_MD5RSA_MAX_BITS+7)/8)
++
++#define NS_DSA_SIG_SIZE         41
++#define NS_DSA_MIN_SIZE         213
++#define NS_DSA_MAX_BYTES        405
++
++/* Offsets into SIG record rdata to find various values */
++#define NS_SIG_TYPE     0       /* Type flags */
++#define NS_SIG_ALG      2       /* Algorithm */
++#define NS_SIG_LABELS   3       /* How many labels in name */
++#define NS_SIG_OTTL     4       /* Original TTL */
++#define NS_SIG_EXPIR    8       /* Expiration time */
++#define NS_SIG_SIGNED   12      /* Signature time */
++#define NS_SIG_FOOT     16      /* Key footprint */
++#define NS_SIG_SIGNER   18      /* Domain name of who signed it */
++
++/* How RR types are represented as bit-flags in NXT records */
++#define NS_NXT_BITS 8
++#define NS_NXT_BIT_SET(  n,p) (p[(n)/NS_NXT_BITS] |=  (0x80>>((n)%NS_NXT_BITS)))
++#define NS_NXT_BIT_CLEAR(n,p) (p[(n)/NS_NXT_BITS] &= ~(0x80>>((n)%NS_NXT_BITS)))
++#define NS_NXT_BIT_ISSET(n,p) (p[(n)/NS_NXT_BITS] &   (0x80>>((n)%NS_NXT_BITS)))
++#define NS_NXT_MAX 127
++#endif
++/* glibc 2.25 */
++
+ int libsres_msg_getflag(ns_msg han, int flag);
+ /*
+  * at one open ns_msg_getflag was a macro on Linux, but now it is a
diff --git a/net-dns/dnssec-validator/metadata.xml b/net-dns/dnssec-validator/metadata.xml
index a535b8852829..6f3178436bbc 100644
--- a/net-dns/dnssec-validator/metadata.xml
+++ b/net-dns/dnssec-validator/metadata.xml
@@ -5,4 +5,7 @@
 <email>xmw@gentoo.org</email>
 <name>Michael Weber</name>
 </maintainer>
+<use>
+	<flag name="ecdsa-check">Requires openssl[-bindist]</flag>
+</use>
 </pkgmetadata>
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 7406c44437b1..ccd9e87a658a 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index c623893f72f0..d304d45a439c 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -1,7 +1,8 @@
 AUX 0.16.6-0001-Add-config-option-to-activate-XEP-0146.patch 2104 BLAKE2B 5108a1d471b78b5d5ca66d2979d286013457c014adb37e58514c2997dd1d5a3f131c9dee46a9dce3011701e802c23d40d0e0ccac0d2a473e10b5b321b504b681 SHA512 a9b8c351633aafcc881a4949e72e0ecd89314a93a3a011dad643ff0a64f208654961218e7d7e69af4ae76824d7de88dec3a572cc08aa6338bafa672ef07e4434
 DIST gajim-0.16.6.tar.bz2 4564505 BLAKE2B 0446d826afc782ceba4fe67d6c7173d60264ec1b5a227f0da62285ea1d083143b4895e4472c2df499de419f9a34c59d9afa1ac2348052defb100438782a3df46 SHA512 6c8c2a38429468a1e6f02aae730ff947c649960e8cc672457c1e1733ab2dad6534b1e5ac2e1c0c385e331a6ba817c6e67c1a27443632b9fd43e7ab76ad66c935
 DIST gajim-0.16.8.tar.bz2 4465521 BLAKE2B f3612465ab139c8e8e6101ca6fbaefce93fe2fac0929cb15ae5174b10b195319181cff3c65f3dbe39d09ea79d1c222cf82434ffea946dabd9fc2645a8b889aa9 SHA512 702917f5b81a5009177ad305a65398c3f8fc95e4666dbfb33ef569a7c2a494a8ea7c48133a1f8000337381b29fc63b917103e05f64686affaaedb8aa155ac0e0
-EBUILD gajim-0.16.6-r1.ebuild 2973 BLAKE2B a9e98b90780e1b6899cab9cc9312d2f2a5972a2dbbc884280aac60cee4973cb70853df6c2226af63fc4f5f065a679aa931ce54a9b80b8180ca44f8e33ac0f668 SHA512 b69079d0e8ea27b3bb604d5d68c45863aefe5a8a10378a12faa0bcb9156c98a957755c77cbcd2db97b08f55c3184aa843c484fe9e4b1e170bbf4dc256f7a116b
-EBUILD gajim-0.16.8-r1.ebuild 2945 BLAKE2B 83ebb4d44f03304bbb82d401bd1b61d525b01468e691004cbfda02d78e1dff488fd2d2ef74e644078de4f7fa8c42240df31c38d5d5518a9a4fd653a0c741def1 SHA512 e944d639f5c8aad11febb9d4b55c1ea88b10bcbd4fd19c1ae2db62dbf3fc063242de44c4c21b1b94f9aad218483497be5eff57ce81127d75f4e1938d58e33324
-EBUILD gajim-0.16.8.ebuild 2822 BLAKE2B 3c1532c38db565e267c617f367bafc40cc77c85b7bf887ff5b10fc76248abaa1fca0458c04b5af3bc1238f14ffa26d7dac74ef2826e30931faccd1a91bbf6388 SHA512 75f17adbfb158bae17fb6a1ca8ca032018274dd338ae77fc273cc1fb65c41ae5d7ff5a01c2895387b88bf77567af61659d5d13af12aa8b7134f47c159814c2f7
+DIST gajim-0.16.9.tar.bz2 4469275 BLAKE2B 451f09cde9d177932429b9ece900e09c58ac43b5f97cd64cf70e75d13f2261ab52ee35e02e8680c83a5d81d7574bca561532dd1327f1109b0cc872956b1a05f7 SHA512 d8ddae3826bbcd4458b016b3cf6b0472b41db4b9026b300b058d9cef403195e38423ff950fcbf6fed0cdbbb485a274905a9a5945028c4cbb24d1a38c72bf4cbb
+EBUILD gajim-0.16.6-r1.ebuild 3023 BLAKE2B b4060e49dc3bc7d1fd7354c01028023509209bc6112efebb3add0e1919b85263ede3d42c22c607419f8371bf7fdb03d36c3f15d281806bdb5bfe5606a3fc7316 SHA512 fd8a2095ab8a2b1691a2434e6b56713f4a960adb61cda2ec5bc437eb1a55e6abebcc685eb004f92fe1c3e23dd9527b6a76ce1ddf9db53eddb03b0793818e96f4
+EBUILD gajim-0.16.8-r1.ebuild 2995 BLAKE2B cda6c9bc9156a86ffc1d677c575d4851f381268e158acdf9edfcf7d656c1b06cf8ff88c2117b44439bf9eb7ce37db94fe6f913278b34c9c4ecc1a834f3bedb00 SHA512 bb8d868ed200a5ae66b076909e7e0eab5c383e81dd5bf499945842b3981ef5db2d7e1d4d4172e190f3d4b9d41e32ab5c479e3be2442dfdb8be658b7c24cb0d0a
+EBUILD gajim-0.16.9.ebuild 2945 BLAKE2B c5f8b1a7fbdfb518b1ebdf4912729a5ad9e02ac1bcbf79580729b7d3dd30daf5caba3865e9c94f2c6412ae7801785c5278741d394a0f286aa78a5c09586bed2d SHA512 91549ec50d10b92aaf6e5b0ddc8de496042c20d4669482df3c9a3d8680aa27b9952f001656b5953a8213ef1e6a17572ecbdc674bc08bb092fb4692411571cff9
 MISC metadata.xml 498 BLAKE2B c86a12d54b4eaed630cc03515a7574c3c311cf6e9420c9e0e20b11777e0f0f23246b52832fc882c700f9311cf1502b8ddc1187828a32e2fba334da686a932607 SHA512 f275f9e7d3f4661dd2272a4e2664598f93bf68f008705168a191dacbceca64f0d3c357234a325dbbbc8d8f851ef642f3e5619c30671c71ff9b8b939ed7e6231c
diff --git a/net-im/gajim/gajim-0.16.6-r1.ebuild b/net-im/gajim/gajim-0.16.6-r1.ebuild
index 6b89f29de4a7..3659853fb462 100644
--- a/net-im/gajim/gajim-0.16.6-r1.ebuild
+++ b/net-im/gajim/gajim-0.16.6-r1.ebuild
@@ -41,6 +41,7 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	dev-python/pyasn1[${PYTHON_USEDEP}]
 	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
+	!>=dev-python/pyopenssl-17.4.0[${PYTHON_USEDEP}]
 	>=dev-python/python-nbxmpp-0.5.3[${PYTHON_USEDEP}]
 	crypt? (
 		app-crypt/gnupg
diff --git a/net-im/gajim/gajim-0.16.8-r1.ebuild b/net-im/gajim/gajim-0.16.8-r1.ebuild
index f9965310b5b1..41717a20041c 100644
--- a/net-im/gajim/gajim-0.16.8-r1.ebuild
+++ b/net-im/gajim/gajim-0.16.8-r1.ebuild
@@ -41,6 +41,7 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	dev-python/pyasn1[${PYTHON_USEDEP}]
 	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
+	!>=dev-python/pyopenssl-17.4.0[${PYTHON_USEDEP}]
 	>=dev-python/python-nbxmpp-0.5.6[${PYTHON_USEDEP}]
 	crypt? ( >=dev-python/python-gnupg-0.4.0[${PYTHON_USEDEP}] )
 	dbus? (
diff --git a/net-im/gajim/gajim-0.16.8.ebuild b/net-im/gajim/gajim-0.16.9.ebuild
index d23fd2187375..462c6802b3d5 100644
--- a/net-im/gajim/gajim-0.16.8.ebuild
+++ b/net-im/gajim/gajim-0.16.9.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="sqlite,xml"
 
 AUTOTOOLS_AUTORECONF=true
 
-inherit autotools-utils python-r1 versionator
+inherit autotools-utils gnome2-utils python-r1 versionator xdg-utils
 
 MY_PV=${PV/_/-}
 MY_P="${PN}-${MY_PV}"
@@ -22,7 +22,7 @@ SRC_URI="
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="crypt dbus gnome gnome-keyring kde idle jingle libnotify networkmanager nls spell +srv test X xhtml zeroconf"
+IUSE="crypt dbus gnome gnome-keyring idle jingle libnotify networkmanager nls spell +srv test X xhtml zeroconf"
 
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
@@ -41,11 +41,8 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	dev-python/pyasn1[${PYTHON_USEDEP}]
 	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-	>=dev-python/python-nbxmpp-0.5.6[${PYTHON_USEDEP}]
-	crypt? (
-		app-crypt/gnupg
-		dev-python/pycrypto[${PYTHON_USEDEP}]
-		)
+	>=dev-python/python-nbxmpp-0.6.1[${PYTHON_USEDEP}]
+	crypt? ( >=dev-python/python-gnupg-0.4.0[${PYTHON_USEDEP}] )
 	dbus? (
 		dev-python/dbus-python[${PYTHON_USEDEP}]
 		dev-libs/dbus-glib
@@ -59,7 +56,6 @@ RDEPEND="${COMMON_DEPEND}
 	gnome-keyring? ( dev-python/gnome-keyring-python[${PYTHON_USEDEP}] )
 	idle? ( x11-libs/libXScrnSaver )
 	jingle? ( net-libs/farstream:0.1[python,${PYTHON_USEDEP}] )
-	kde? ( kde-apps/kwalletmanager )
 	networkmanager? (
 			dev-python/dbus-python[${PYTHON_USEDEP}]
 			net-misc/networkmanager
@@ -117,3 +113,13 @@ src_install() {
 	}
 	python_foreach_impl installation
 }
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index f9dd53934586..02f33c612050 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index 9d01b0e1279f..9067f29672f8 100644
--- a/net-irc/znc/Manifest
+++ b/net-irc/znc/Manifest
@@ -13,5 +13,5 @@ DIST znc-1.6.3.tar.gz 1464200 BLAKE2B 7ea0aeea29133308772df91f5a43748acbfa5998a6
 DIST znc-1.6.5.tar.gz 1470681 BLAKE2B 9de0b211280489423bc2894d0e76d7276aa42428d07d64516372a9ca6d1616db1f27c0142b54160c61cbee89d65ceadf941d001319254dbff9eb5b016988482e SHA512 d78603ac86d1fb92cdf591b1eb6d32fa19b0e39414bd69e1300c537051612ae590c43d3b8e4dd598cdff605bf3aa1d3d5d806edd428d15d50f733e1670f3e626
 EBUILD znc-1.6.3-r1.ebuild 3385 BLAKE2B 41a388617dd5a8a00028491cec893631c57a027e192032f632ba9f8523ba8c54904abc6b9b63c48345457dbf62d0b1a2206f348b116e351daccb28b27a9f86ba SHA512 e5e74f8903c17f83c7d1380a8e8abb94e62ded858c01b8ad47a464f4273688bb26f8f5a38e428e9c8e984492fa1b6cd7f6281de99c0690ea0d96fb3a1ddbc2da
 EBUILD znc-1.6.5.ebuild 3473 BLAKE2B 621f5dee4eddcd369a6d99bbd8d26398e6464b2c377a7b9fe2d89db41e5fbf2fbd640c13a1292bc1e12b4119736ac6933643ea6d7be03cdb4dc32db4a4594997 SHA512 5360728c9eed15ecf686128fc9553627615dbb8b5db1662a39fc0d7da4587cb4980b617de2660efa5b0bdfe7cdbcd7e0defccc7359c4f27b4be0dd82d8cf3672
-EBUILD znc-9999.ebuild 4483 BLAKE2B 1bdaee8923763825a742fd2b56cd7982bd4cd370351ccc5d0ec0e8424221babc0ab7359314d7108d21b1ced85dca2893fe35d4de47e86b9d8a6f968fac52728a SHA512 25f27e37e99f48ace063cf9bba92ebeb60562dd1e0782756320f7294b1773bc7235f22dc8ed0deb31be0f5e9c3012bfa65a61f2cf072400f52741d3bf7269a5e
+EBUILD znc-9999.ebuild 4489 BLAKE2B 7711be7dd0309ffcde715252b00e39aa58c20fe03845bd53a10ababdce87b6ff0fbf0c2a6f4024dd2832ce029e0ef4223925ce1e19caef25825afc99acd88cd2 SHA512 e547df881db641029a2763020ee9a58c78ffd7f2608fd7d45f98787de058c7742f3889ebd4e2a62e1d89cd811e70e4516418237c8db43a03cb2f71e357db4797
 MISC metadata.xml 757 BLAKE2B bbc8339f0d871c55ce85cee29b4217ec41dc56c835d1d332feecb98ff08f9297a9290ee9f217715832454a041bd372277ee6b7659d43d2ada9f778a29c32737d SHA512 fd055b958ea544d901a15bdf9f8af9ab437896f97d7fa76f84cb6eebfdf7b1de2e8f13d85757d8d4c7098fd6f2102b505084a8beb58156258aaa73367c479eaf
diff --git a/net-irc/znc/znc-9999.ebuild b/net-irc/znc/znc-9999.ebuild
index a0794296fcc8..bfe3e235cf9a 100644
--- a/net-irc/znc/znc-9999.ebuild
+++ b/net-irc/znc/znc-9999.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{3_4,3_5} )
-PLOCALES="ru"
+PYTHON_COMPAT=( python3_{4,5,6} )
+PLOCALES="de ru"
 
 inherit cmake-utils l10n python-single-r1 readme.gentoo-r1 systemd user
 
@@ -42,7 +42,7 @@ RDEPEND="
 		libressl? ( dev-libs/libressl:0= )
 	)
 	tcl? ( dev-lang/tcl:0= )
-	zlib? ( sys-libs/zlib )
+	zlib? ( sys-libs/zlib:0= )
 "
 DEPEND="
 	${RDEPEND}
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index adef1aaa637f..ae759ac9b70e 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/eps/Manifest b/net-mail/eps/Manifest
index 6d3385e4d2d7..6ac41c8ca813 100644
--- a/net-mail/eps/Manifest
+++ b/net-mail/eps/Manifest
@@ -1,4 +1,3 @@
 DIST eps-1.7.tar.gz 29913 BLAKE2B 83205ed03cd4d28538c356b3d905437179c961e8a3d60059a59cd32b16548a4cb9bd73382bd4a948fe4a985a5cc39a85ec84126df1a61799a6dcba3a6227ff66 SHA512 be7df0d5bce5798afda0573b5d943da7e69e6b99817f4ed6d87e2858e75d7c2408d7fa9942dfc6277db0bedb73cf1f5ca64542d070075dda544cbc695134b1a0
-EBUILD eps-1.7-r1.ebuild 810 BLAKE2B 47775395870c2eb2b72a65470fe0c9072dec39ee0ef284182b5fb795dda2a9f454a99bd6acaf6328d36e1bd2c0dd109994cad88b0703765ab4cc4dba296df3e7 SHA512 f1ac84f7fc4f411a8dd1155573c4c20c5cfe7772595b72b7753bfc6cba30254b5d71a92768a7d4dc7072d069c5b8edaa153958253ea7934c2fa3e58b4eccbc9d
-EBUILD eps-1.7.ebuild 858 BLAKE2B 85c7f24f6f99f607d6ac9bbe664eab653d294433163fd9db8776aa200488c967c04b2c5f0f39a3ddef999eab45381b2adc8100c4368f0f29836cb6bfeb6210a4 SHA512 2faabd69b0a6a53101201d1e20d83027b7550e19d968cb9a28407f8a1555a1f5692a8a4f5a3df72dea1fa0b4c84181b21e6f239ddefe952be243702be9aa56f8
+EBUILD eps-1.7-r1.ebuild 809 BLAKE2B 0b09b965c8d853375db7e6bfe9113665dd831db65fa4928ca045774577b2cb16ec0f6a3227097936e746af05ea3c94c032a9c50fcb870488720461ca0b42c7b3 SHA512 aa69fdadf60a454d7ddecb68cd8a290842e87d8f8bb5b1f5f9a821abab5b262e9e1afe80cffab5a75ea3cbcb7b223e371768c976b2897aef372e705243a582e9
 MISC metadata.xml 524 BLAKE2B 559a2dc92cb88aa4b3224bfff8ef871f20ae2c323da8a736f57c5f2de4dc7fb506b8d57f6419562120921573d9bbc9abbe3b8b9dd209e42a0d1c95aa6850e99f SHA512 a1432bfc8582f30d2a012452dbc686b10524abff01dba3aaef5a591eff74e3b3b0eddbe10a6c897dfd7e116fcd73c925bda598d81f7c37affc0444d0c9754ae8
diff --git a/net-mail/eps/eps-1.7-r1.ebuild b/net-mail/eps/eps-1.7-r1.ebuild
index 74a62e1dc09d..92434d568c07 100644
--- a/net-mail/eps/eps-1.7-r1.ebuild
+++ b/net-mail/eps/eps-1.7-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.inter7.com/eps/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="~amd64 ppc x86"
 IUSE=""
 
 DEPEND="sys-apps/sed"
diff --git a/net-mail/eps/eps-1.7.ebuild b/net-mail/eps/eps-1.7.ebuild
deleted file mode 100644
index c938746bdb4e..000000000000
--- a/net-mail/eps/eps-1.7.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=3
-
-inherit toolchain-funcs multilib
-
-DESCRIPTION="Inter7 Email Processing and mht System library"
-HOMEPAGE="http://www.inter7.com/eps"
-SRC_URI="http://www.inter7.com/eps/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE=""
-
-DEPEND="sys-apps/sed"
-RDEPEND=""
-
-src_prepare() {
-	sed -i -e 's:/usr:$(DESTDIR)$(prefix):g' \
-		-e 's:\(DEFS.*\):\1 $(CFLAGS):' \
-		-e 's:$(DEFS):$(DEFS) -fPIC:' \
-		-e 's:-shared:-shared -Wl,-soname,libeps.so $(LDFLAGS):' \
-		-e 's:cp -pf:cp -f:g' \
-		Makefile
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" AR="$(tc-getAR)" || die "emake failed"
-}
-
-src_install() {
-	emake prefix=/usr DESTDIR="${D}" LIBDIR="${D}/usr/$(get_libdir)" install \
-		|| die "emake install failed"
-	dodoc ChangeLog TODO doc/*
-}
diff --git a/net-mail/mpack/Manifest b/net-mail/mpack/Manifest
index 8b7a8b33fb5a..22aeab862a07 100644
--- a/net-mail/mpack/Manifest
+++ b/net-mail/mpack/Manifest
@@ -7,6 +7,5 @@ AUX mpack-1.6-munpack.patch 1341 BLAKE2B 9c1a41f1d1e6db8b80369818effc56556d1c2b7
 AUX mpack-1.6-paths.patch 2729 BLAKE2B aa0cf351e69b2b041ea14c84c651275cf6e2cc8953d18363e7e9fe58c1d8a54aef0ff028ddfe47452dafb2c2c9c4af37d104f5f8a58f6fef106197bfaa1500ca SHA512 918a1f25e5f224d34f2e1b44aae7683b5d31b384d6e124de88c1fe661e42ef5d88810d7380bc4e298a2d7efe152f0da5cfc3b3028c65a3f2a337511d3384fcf7
 AUX mpack-1.6-usage.patch 721 BLAKE2B 9631aed898a8f95fb3e70f29c82994d0f1abcb935c106074c014a56f59f39df46fe6aea5b9eef0e58bfb25d5c9d4084126b88eb1117d8ca124746058b334bc52 SHA512 e07f72e6a0d037f788829904050bbee9f1c8c722a6b363b8a95ab012dda99b952e36bd7a9772a63d22ff4da34fdd44ead8d42db510e8c340f3410b3cd0d52b1a
 DIST mpack-1.6.tar.gz 179850 BLAKE2B d6b79e8514633fd0bfd1c04b167ba1d1a030cf5407dae30ba2a45e3d30157b66955808aed40a5163737c0242349d05f53c27ada920676cf3d7b81a00e7bd5059 SHA512 9bff0d2753d78288e428a20c8cbb4596bd9862de4da7f42176731ce5fd459b15883d758f9b1ec7d4e1281cc1aeaaa046cec54aeb0997a7ffed74de07edd84714
-EBUILD mpack-1.6-r3.ebuild 891 BLAKE2B 42c358a123a01551adec605843e710ac1400b5155e5a34ceae3d870b214401020f943725297740b13479321d6648f9beb1083b0a09403f32b3f1bff15e9372fc SHA512 30e892df7523284b1b800b36608b404a41e0aeff496dbd2fbdb7a638de0be52214a00e9be1a0256e877527fd3ba63d296f4968a7033445136abbaf647f310970
-EBUILD mpack-1.6-r4.ebuild 846 BLAKE2B 0cfb9102e5aa94508873eef7a14732719397cbf7c4cb595d5c157fb50cf96e57be1a059420f4389c07d2735cd05f5cbded62809d6919f48cf26fb64d3564d1ed SHA512 e0d38eaf8a94dd8dcb2b49c643f7ccedbad39e6360af325db8bb5536ac735e27f823e645d88fd5c1bd6e7ed41cd6f709d7970a80582c0191d4ee84d066e2f84f
+EBUILD mpack-1.6-r4.ebuild 845 BLAKE2B 0e9f569170bfd111bc961e4b355ff26a16fbf0e2b854ea20e3f2910b79e5646e9afdfe6209fc258b9f159b59548c91dc6a8fcccd2d4f4cc88b86bf63f3128b60 SHA512 9d5ee1be67c280dd97ef38e8b48686b3a633c4dd740d8a64995708bc4e971dd428ea29034209d00bb47ae91faaa7add14128769021b3bab6b19bc6a0d447590d
 MISC metadata.xml 240 BLAKE2B eeb6099e7ebc29b81588528b970830d2461fa16783bda673672d405615e46d240dcd806b3d18b6207ef8e5365f8860aa20c304394c3f5b267c5ea4dc739cb94b SHA512 97824dbce22630efb21e647b55212b7a8a19d8e38b5bf05cb0b8078530bbbaaf4dc91284e2a11beab7dfcfb779df82b87b49d11a746c7a4f6dc71f2fda8942db
diff --git a/net-mail/mpack/mpack-1.6-r3.ebuild b/net-mail/mpack/mpack-1.6-r3.ebuild
deleted file mode 100644
index 5016cc6747d0..000000000000
--- a/net-mail/mpack/mpack-1.6-r3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-
-AT_M4DIR=cmulocal
-
-inherit eutils autotools
-
-DESCRIPTION="Command-line MIME encoding and decoding utilities"
-HOMEPAGE="ftp://ftp.andrew.cmu.edu/pub/mpack/"
-SRC_URI="ftp://ftp.andrew.cmu.edu/pub/mpack/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="HPND"
-KEYWORDS="amd64 x86 ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-filenames.patch
-	epatch "${FILESDIR}"/${P}-usage.patch
-	epatch "${FILESDIR}"/${P}-munpack.patch
-
-	# NOTE: These three patches replace <mpack-1.6-gentoo.patch>
-	epatch "${FILESDIR}"/${P}-compile.patch
-	epatch "${FILESDIR}"/${P}-paths.patch
-	epatch "${FILESDIR}"/${P}-cve-2011-4919.patch
-
-	epatch "${FILESDIR}"/${P}-clang.patch
-
-	eautoreconf
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die
-	dodoc README.* Changes
-}
diff --git a/net-mail/mpack/mpack-1.6-r4.ebuild b/net-mail/mpack/mpack-1.6-r4.ebuild
index 8137988a7aa2..d3411787bb6c 100644
--- a/net-mail/mpack/mpack-1.6-r4.ebuild
+++ b/net-mail/mpack/mpack-1.6-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.andrew.cmu.edu/pub/mpack/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="HPND"
-KEYWORDS="~amd64 x86 ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 x86 ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 PATCHES=( "${FILESDIR}"/${P}-filenames.patch
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 732ed422c664..51c7054b3123 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/connect/Manifest b/net-misc/connect/Manifest
index be6fb05f5b24..5c92443ea2d7 100644
--- a/net-misc/connect/Manifest
+++ b/net-misc/connect/Manifest
@@ -1,5 +1,3 @@
-DIST connect-1.100.tar.bz2 21588 BLAKE2B 9923f8a80a6b374a68a1f6c187e5be2dfe847207a41d44884c4999adf421a487341e0f6b35a9ed2b7f3a0f40e6287e010d1a64d7c5f722dc1d77cc052fa7504d SHA512 e0bb106ae7270ff0352c2c5167fd47d6d9ac787f08b3019fd9dabe0636606709bc1caf696f6c87699e146eee0cb81db229f9202654f006c12321208c22832108
 DIST connect-1.103.tar.bz2 37980 BLAKE2B 5f7639c06bf1486e541003ced967c486debfacacde9701ae079fba4c41fd9c77e25c3140e6b0d52782f22912cfdbcfe59e882959b30910de55d0752ed5abb365 SHA512 6de32aa48171b1528abe12c1044e1d498cd10c3ef7b4652318402b7bc12bbb50ce0f9eab10408dc3cc26c1c0d56804bd088fbedae688f921c84c40d1aa0ae4d9
-EBUILD connect-1.100.ebuild 864 BLAKE2B f6ee0eefaba28452dd7adf010a0f1b6b3dc9a8e35cb513dc4840d444608784a88a1c9a867ee733e9ef75d0f76be130ec246b158ce001ec6c7c3eb38f86b367a6 SHA512 c7e995e746d6ddfef831f6b98595e51f44c6f17eb309898fe58467391a8908d143546c7292861f0882cf5bbe1addaeba9d7af5880ecf88b03d1253d09e8390b8
-EBUILD connect-1.103.ebuild 872 BLAKE2B 0f0f3bf602dc468c36d9633073acf32ecca832404a52b5ef19476a7a81d2b2dfdbd153f82fdaaf820cb7a8d1d7e9c589f3fb826c69ff4780880292357dd6dc31 SHA512 0e3b7f35cdda56adb063ab7b6896871627e0db643536329ec2de4477602d469fba98f5e81f7aa908f679c5c1ee21e12b6348eb764807a05412e444f21f04be0d
+EBUILD connect-1.103.ebuild 871 BLAKE2B ceeb5875db5cb34ca4c22e6cf3855f74bda7e4befd5af0e5215375d1e565ef83f86abec9e7dc2585bee7b34adfce5723c419e35bc07ee83096bfb7a0dd7eb830 SHA512 ced575df5881d3bf018fe8d46dfebd44cc7c26fc7292befe2f3d4946bf53cf1b1bcadf9ee86d1659eabf2c006bf5ef3edfc87349c4875da90a65dbfdb1b89ef0
 MISC metadata.xml 848 BLAKE2B 634c0cb672f5c7fca5fc313ec238160d1f04e3235b51db70a388765131b11b8049ec5b06624ba5a7c7fdd438f4551762711092bb4035e080c563497cf0a2b619 SHA512 2a444387c110c5850d73dbb8b7b94c52ba93225cdfe7a569d0f17f300c11c589d211cf795d895c022fe9e6e939c2fdfe19edbcc84b87193692caa726f6c3b969
diff --git a/net-misc/connect/connect-1.100.ebuild b/net-misc/connect/connect-1.100.ebuild
deleted file mode 100644
index 9179d07d4678..000000000000
--- a/net-misc/connect/connect-1.100.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=3
-
-inherit toolchain-funcs
-
-IUSE=""
-DESCRIPTION="network connection relaying command (proxy)"
-HOMEPAGE="https://bitbucket.org/gotoh/connect"
-HG_COMMIT_ID="7c036cbffb61" # bitbucket commit id
-#SRC_URI="https://www.bitbucket.org/gotoh/connect/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
-SRC_URI="https://bitbucket.org/gotoh/connect/get/${HG_COMMIT_ID}.tar.bz2 -> ${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-DEPEND=""
-RDEPEND=""
-S="${WORKDIR}/gotoh-connect-${HG_COMMIT_ID}"
-
-src_compile() {
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o ${PN} ${PN}.c || die "compilation failed"
-}
-
-src_install() {
-	dobin ${PN}
-}
-
-pkg_postinst() {
-	einfo
-	einfo "There is no manpage."
-	einfo "Please see https://bitbucket.org/gotoh/connect/wiki/Home for details."
-	einfo
-}
diff --git a/net-misc/connect/connect-1.103.ebuild b/net-misc/connect/connect-1.103.ebuild
index bbad309d3055..9db0c05615c1 100644
--- a/net-misc/connect/connect-1.103.ebuild
+++ b/net-misc/connect/connect-1.103.ebuild
@@ -13,7 +13,7 @@ HG_COMMIT_ID="ee1fbc21da4b" # bitbucket commit id
 SRC_URI="https://bitbucket.org/gotoh/connect/get/${HG_COMMIT_ID}.tar.bz2 -> ${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
 DEPEND=""
 RDEPEND=""
 S="${WORKDIR}/gotoh-connect-${HG_COMMIT_ID}"
diff --git a/net-misc/teamviewer/Manifest b/net-misc/teamviewer/Manifest
index aa59f095ba3c..35428abbe77c 100644
--- a/net-misc/teamviewer/Manifest
+++ b/net-misc/teamviewer/Manifest
@@ -2,13 +2,17 @@ AUX teamviewer-9.0.32150-gentoo.patch 3876 BLAKE2B 3989e1b27851217910ca76e834d7d
 AUX teamviewer.sh 1329 BLAKE2B 4f2c25dd47a5b9d73f335d04e62095d2031854156db9cbbde477619ac12a160958908ba3d3099e1391718b85a2d572fc5cd56044d2189dc77243764c97d05857 SHA512 44e9e519ed3056438952c448b40a0c231238379fc1a5737f0f4ae28860fb3cfa2d9abffbb7e2b9682dbd62a67ad672f4406c2696359ace8fc42d6d0171b0bab0
 AUX teamviewerd.conf 230 BLAKE2B 721573965b2dca1559140284b1a61c5e0a5aa7ca08e6e39e7e825f640a7a18f7e1842008191c28effcfcb5cc0befeb4301dda8b71bb4ef44c37c2f93be9121da SHA512 31d412278f61fc943f474a02db6de802f53da8b2b424adb5c8a1720bff4316ccb36d5bfbb505c056ef031dcfd52fef5ea28da96b348a76ddf9c624ca1c3cf78f
 AUX teamviewerd.init 785 BLAKE2B 760a0abf4b8a517d88e19e9e27eb4df0efde9b4e35aaabf67081435e388c0849806c7b46c5d1c4ec140ba501759d0d5ec2555d37e40c6349efd0590e09911fe0 SHA512 79f0f5a274e53e6d058e6f0d24f9f9964992391e36a06264aaaba8e219238be9f24ebf64bb3b0aac91dc9e8625835b243e51fb6325d1b0e42242d7b7186ff20d
+AUX teamviewerd13.init 285 BLAKE2B 7e81248f94f173569a76ec0a87926302b621c2086eb61796313d2fb4ea6decb26561398f6b435a7b55f93b22f7b9b64a6f996f7c3964af4de8e4271bff283c59 SHA512 2dc110140dc89b649cfd6ebc4312f23406a911b19b6aa59e877d8206f242c6ec8143cdbe63317909001becf253be216e081f31bcc667dc6a8b176cc31b79517d
 AUX teamviewerd9.init 482 BLAKE2B 841a1d6894aec1ed1249195613c01df526abb4833f7a81d266d708d39a0324197db46b433aa4cd937f1b5579ff7e66beee7272463429d9c99e99d9eadb1a2d0c SHA512 a229cf976e5ce7142dbb57989bb0e802a5b8cdf222f52ad768dfaaacb3ba160ab05d3e1ff1ca7770daf37d9c06e391c6a3c1843ec2be78a86450bcf2a3e4fca9
 DIST teamviewer-9.0.32150.deb 22898922 BLAKE2B 799aa6f48b69247a2695ca745e85d02ffa73df1375203dfc9da339673e6c18d861c4146ddbdc509bdc1114d5a2a7e5fdd4acf3c6e5da61fbba5aaa02fa4e3cfd SHA512 3e72ed5cab7a754a0aa75e533da92292ad004f66c55ac4c386b6f4a65cc41b14a8d9d7a5410dccdb90c1172cd33e52383289339ab44f0847a061655498ab8e4d
 DIST teamviewer_10.0.46203_i386.deb 43326592 BLAKE2B 874bad1cf2efdb7f4c1da69a625549b2c46e6a710ca3cf871dd21fd804b1b1b8294981d8f6e27c58231e51e41fb0dcd8f42f08adcefc4e2ded61c15fdc068425 SHA512 2133194b180648685a9e179df1a2888277f3038d9098d0d12b72de92026bdb969d90262514996df60dfcf6986e291ecb756fde9e0781fca5c872b5c82e5494ea
 DIST teamviewer_11.0.67687_i386.deb 47341822 BLAKE2B 3aa7d9af2c0c39fad22cec8391921d1034e2dc4bab70f9fb04c7dd7a9a8c23ae484717b3cf71856734bec08a26b4f409c205dde2b9b511b6d0fe78dc6182dc75 SHA512 3fbb0a2fc1bccd41ba9798305fada7e8266e1c9ed8509492ccb75e6f85995538ddc05ad72648e9f6c31cd5f17ad34f1ed3a300eeb38a4a703d3414c113d3e5a9
 DIST teamviewer_12.0.85001_i386.deb 46549564 BLAKE2B d3b821376c9385a1090e12708e17b8ad76f29f27c9d76ae140654eed7eca44d115275cd587462e52845260bd6616c88260c767350944730c30eac7c14467ae39 SHA512 4db490568936ec58a37157019071cf61ed5dde8b5951f6e524d1f64aa23f46dd40c8eda1e96a9d47c756c1427d82ccb9c58773b53dfa0ae60bbb94e03b4522a0
+DIST teamviewer_13.0.5693_amd64.tar.xz 9694952 BLAKE2B 650814c3c63897e1024836528c6eaa4cc81064ffa16bece7f8d2fe633457e2795e2cef847175a88dbb389ba61d2597a02292e6bf610da25c92f97152560ea355 SHA512 75886b6d00991968ae0b0d3c55b4c07c6f1b1b24488b2d5ae866e35c26ee6e673e500c87845ba6850ffdc80e4612feff0fc5bbe9e39f2d0a94582e1800471dcc
+DIST teamviewer_13.0.5693_i386.tar.xz 9583892 BLAKE2B 8e477978825431a01b37b61c28b903b36cd81365c7ec5df4ca8d4aec1ce8d24b49af60ed6c99c863acd26405254ae78c4ae4dfef1f8b7a5fb882e281c3c4f125 SHA512 be5e8e00755a38f2c70ceba88d9fb87c2cc8e9e284c86e22f95dddf919a37ee1f24ef1e02f042a339eaf863dbf255c873e3edcb038c04202b4ab0460e50b2503
 EBUILD teamviewer-10.0.46203.ebuild 3520 BLAKE2B 3e38979fb0b258e669c8997187a14c1b64440323b2d536da9102eebafc525e0b4f1d280870f9170eb5b62e5900dce9b3869e82c4e71c352ceb533fb6d613b8e2 SHA512 a2b9587b4c9fafaab23d67ca0dce7c99b8769f9663e865762fb95269e825c2ab269cf1b54d69949566c1cb04d5fd9df93e0fec4c4d5e455268f24752a11dfebe
 EBUILD teamviewer-11.0.67687.ebuild 3610 BLAKE2B 580a0593e67cbe750669cba76762a5577ea6ae77b245a047aea66996be4e84c493521b3f5afbc3d751e3fe1e87ef0d378248e860d6dfa5978f8ac92bb95815f1 SHA512 df84cf8082d6626e5e2e212c7b9910bd953ac4346d06a74181813a4b0bcafcb2691912064d5a0cba6facca253f2782bbb99ad9103ed68a4ed3e8429561229f67
 EBUILD teamviewer-12.0.85001.ebuild 3610 BLAKE2B cb5c04a0cd3afdb3d37342d682703ee164e78e2640c9ec46c3ea91a354b317aa7125695b278eabc29ef14df03d9dfdc29c1fe8282a4b58ed5256b89ce1bf200a SHA512 2a6876746bb249e6e1e7ea6d215a74eb98cd4d323dd9a40cbd1a8eff4784568dda16521a163fa4c511479d95188b8fe649da55f92520579bcffe1c61299921e7
+EBUILD teamviewer-13.0.5693.ebuild 3549 BLAKE2B 8c72a12ce76a77bda683a0c48f29f174100d12f6de595ded438b4f4fd4279310407e5260a88e764787c4423537bba11ecea7c422bfee86e455108b2cd9c2b49c SHA512 7a6698156b57f3077049724c7a1ae7eb149882b59274d45310acae4ddfc1bf07df25fce17893177d379dad6131873927244812d2c8ee5060ce408b6cb9d9f315
 EBUILD teamviewer-9.0.32150.ebuild 3260 BLAKE2B c81782a09b0512cce296c3774f300b870a1631ab395d55eb023543ac54338fd5218e9a2de33fecfefdc81281136ee692b1c82e61db8e676e2e769895ed2de917 SHA512 29b18f606daf48400ad770603ad735a917ad7aa50ce86b280f21ae6e36f978c5baa5ed34749a26206563f0d37c67a144365134d5ee61d8b8e21f61a996223c3c
-MISC metadata.xml 567 BLAKE2B ed4a16437b2678360b07b381b92b1a483a1a92b694d608b794d30873d515ee12bafbe874099364134dda7ac840c9115b3877af64c0f671ffcf9e9e6f23b872fa SHA512 e1b42cde0a8bff1b512960667fc428f3188609e30ad787b8c5bde1e1c8520d3810bd33f8f11d59ec314a3b0812a9aa4552ada29b465c34f8c0276d85176392f6
+MISC metadata.xml 360 BLAKE2B 8262ba7d586d5c333960c11f37fb8fc74099c73d05da6f99e33d3f7ede2eb8daf02e06fda33006124f0bbb1c2b9721da5b82e2a4ca4a5fd72944fbd4a5eadac8 SHA512 b4c800d41aef54f33463e7c4351f3484c4be4806c3a5d0ba6687f5fbf68d17d428fd87eb9929aefaf997e76b5b8a25cfa83a695e03c9dd727c1f3da121da4836
diff --git a/net-misc/teamviewer/files/teamviewerd13.init b/net-misc/teamviewer/files/teamviewerd13.init
new file mode 100644
index 000000000000..79dbc29e2aa8
--- /dev/null
+++ b/net-misc/teamviewer/files/teamviewerd13.init
@@ -0,0 +1,8 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+command="/opt/teamviewer13/tv_bin/teamviewerd"
+command_args="-d"
+description="Starts the TeamViewer remote control daemon"
+pidfile="/var/run/teamviewerd.pid"
diff --git a/net-misc/teamviewer/metadata.xml b/net-misc/teamviewer/metadata.xml
index 35e3a8613fbb..ca6a58ab894a 100644
--- a/net-misc/teamviewer/metadata.xml
+++ b/net-misc/teamviewer/metadata.xml
@@ -5,14 +5,6 @@
 		<email>wschlich@gentoo.org</email>
 		<name>Wolfram Schlich</name>		
 	</maintainer>
-	<maintainer type="person">
-		<email>NP-Hardass@gentoo.org</email>
-		<name>NP-Hardass</name>		
-	</maintainer>
-	<maintainer type="project">
-		<email>wine@gentoo.org</email>
-		<name>Wine</name>
-	</maintainer>
 	<use>
 		<flag name="system-wine">Use <pkg>app-emulation/wine</pkg> instead of bundled wine.</flag>
 	</use>
diff --git a/net-misc/teamviewer/teamviewer-13.0.5693.ebuild b/net-misc/teamviewer/teamviewer-13.0.5693.ebuild
new file mode 100644
index 000000000000..01d79a30903e
--- /dev/null
+++ b/net-misc/teamviewer/teamviewer-13.0.5693.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN=${PN}${PV/\.*}
+inherit eutils gnome2-utils systemd
+
+DESCRIPTION="All-In-One Solution for Remote Access and Support over the Internet"
+HOMEPAGE="https://www.teamviewer.com"
+SRC_URI="amd64? ( https://dl.tvcdn.de/download/linux/version_${PV/\.*}x/${PN}_${PV}_amd64.tar.xz )
+		x86? ( https://dl.tvcdn.de/download/linux/version_${PV/\.*}x/${PN}_${PV}_i386.tar.xz )"
+
+LICENSE="TeamViewer MIT"
+SLOT="${PV/\.*}"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+DEPEND="sys-apps/sed"
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtquickcontrols:5
+	dev-qt/qtwebkit:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	sys-apps/dbus
+"
+
+RESTRICT="bindist mirror"
+
+# Silence QA messages
+QA_PREBUILT="opt/${MY_PN}/*"
+
+S="${WORKDIR}"/teamviewer
+
+src_prepare() {
+	default
+
+	# Switch operation mode from 'portable' to 'installed'
+	sed -e "s/TAR_NI/TAR_IN/g" -i tv_bin/script/tvw_config || die
+
+	sed -e "/^ExecStart/s/${PN}/${MY_PN}/" \
+		-i tv_bin/script/teamviewerd.service || die
+}
+
+src_install() {
+	local dst="/opt/${MY_PN}" # install destination
+
+	# Quirk:
+	# Remove Intel 80386 32-bit ELF binary 'libdepend' present in all
+	# archives. It will trip the 'emerge @preserved-libs' logic on amd64
+	# when changing the ABI of one of its dependencies. According to the
+	# TeamViewer devs, this binary is an unused remnant of previous Wine-
+	# based builds and will be removed in future releases anyway
+	rm tv_bin/script/libdepend
+
+	insinto ${dst}
+	doins -r tv_bin
+
+	# Set permissions for executables and libraries
+	for exe in $(find tv_bin -type f -executable -or -name '*.so'); do
+		fperms 755 ${dst}/${exe}
+	done
+
+	newinitd "${FILESDIR}"/teamviewerd13.init teamviewerd${SLOT}
+	systemd_newunit tv_bin/script/${PN}d.service ${PN}d${SLOT}.service
+
+	insinto /usr/share/dbus-1/services
+	doins tv_bin/script/com.teamviewer.TeamViewer.service
+	doins tv_bin/script/com.teamviewer.TeamViewer.Desktop.service
+
+	insinto /usr/share/polkit-1/actions
+	doins tv_bin/script/com.teamviewer.TeamViewer.policy
+
+	for size in 16 24 32 48 256; do
+		newicon -s ${size} tv_bin/desktop/teamviewer_${size}.png ${MY_PN}.png
+	done
+
+	# Install documents (NOTE: using 'dodoc -r doc' instead of loop will
+	# have the undesired result of installing subdirectory 'doc' in /usr/
+	# share/doc/teamviewer-<version>)
+	for doc in $(find doc -type f); do
+		dodoc ${doc}
+	done
+
+	keepdir /etc/${MY_PN}
+	dosym ../../etc/${MY_PN} ${dst}/config
+
+	# Create directory and symlink for log files (NOTE: according to Team-
+	# Viewer devs, all paths are hard-coded in the binaries; therefore
+	# using the same path as the DEB/RPM archives, i.e. '/var/log/teamviewer
+	# <major-version>')
+	keepdir /var/log/${MY_PN}
+	dosym ../../var/log/${MY_PN} ${dst}/logfiles
+
+	dodir /opt/bin
+	dosym ${dst}/tv_bin/teamviewerd /opt/bin/teamviewerd${SLOT}
+	dosym ${dst}/tv_bin/script/teamviewer /opt/bin/${MY_PN}
+
+	make_desktop_entry ${MY_PN} "TeamViewer ${SLOT}" ${MY_PN}
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+
+	elog "Before using TeamViewer, you need to start its daemon:"
+	elog "OpenRC:"
+	elog "# /etc/init.d/teamviewerd${SLOT} start"
+	elog "# rc-update add teamviewerd${SLOT} default"
+	elog
+	elog "Systemd:"
+	elog "# systemctl start teamviewerd${SLOT}.service"
+	elog "# systemctl enable teamviewerd${SLOT}.service"
+	elog
+	elog "To display additional command line options simply run:"
+	elog "$ ${MY_PN} help"
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 455be246476e..675a3c4cebb9 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,10 +1,10 @@
 DIST youtube-dl-2017.03.16.tar.gz 2631620 BLAKE2B 2aff8710a296140a4329b0f8e7f57526684ca114ba39a7397eef81b1b79b4b5dfae685c1f0011cddf8569d8df1e50111bbce7f12647c067972c79ea3b116b2ff SHA512 f3b8942f6b2be3b1cfd4bddfb74c17bad48c8ef4bea34114970ecb9d65b5a3dcbe71beba6d7c2dbda168371bbb2e8bbaddce58039bd9d158bf23950a2a88123c
 DIST youtube-dl-2017.11.15.tar.gz 2834012 BLAKE2B fd93e3923f99874be58681a886c09e31ac10063975ab636badf27e59b44743c72cddf05e3a431c49ffd0f7b40f9b005f4d90feff85d4ca889dee80833300b076 SHA512 e10c0d53db7fdfb02610b53f54046c0a9354b305ba05c5d00a43649a283a6449263f66ff56171d52cf18f906c6aeccc25dc48ea708b4b1bb2b8323b937abca96
-DIST youtube-dl-2017.11.26.tar.gz 2839867 BLAKE2B c4f1b9739283fb4016ff0892bdcb0db86f1ddc88842553d76159fe4312e70e7145085f3b6a1bfc157d7f5811f28eb1ab79661db701a3366be12be2357b464f19 SHA512 ecf1eb88b37e271505a50709a468afcc6048f00bc6531e8df1eb064dcea62ad6fa2a5a9016d1d106e56b9d3b9904325e133491ca124e06ec64e6f4a5902a2368
 DIST youtube-dl-2017.12.02.tar.gz 2845664 BLAKE2B b7b3479b32d9a4d9ee73d1a06337789e080c464ff63eb4c604eb976a5e9f4822a456207de99f2c77b012c722d1cadfe52ac08f2c4a78c5defab797b3f813bc87 SHA512 46a103f8659166ebb79f5055cc435008fcd98b00cff4bfe0680cb4eebc34598edc6a05e73bf6a22647edce007afbcfd61bef6064adc8c2e0eab3fb2b9ee748a3
+DIST youtube-dl-2017.12.14.tar.gz 2850664 BLAKE2B 29a3f4fcefaa970e9bc291ab47c5faa28252086aa284e9461f6c061d0e230680fa09ab654520c0cb4080279dba2c96b06412b6e5f4129fe44bcf972967eb57f6 SHA512 b23ffe0e30ba32c80de627305409d5aab73c6337ac6b253fa1c116a4aadf7ddd6853cd612941d9ae0d9ca3bfa5fc982e43cf2cdec3ebb90d2919f3faa47b58c5
 EBUILD youtube-dl-2017.03.16.ebuild 2381 BLAKE2B bbf217461544a08786e3ba044e9b704354133dde4197d05ad92a8cdfd2e402dd0c013964da8b7971475a31ced7db734c89ef3ea33991b0227980d4025490c0fa SHA512 b47b7f8c00e04879aaac6bc70621d28f9e6e153b618bd246f95a2b11f8f09bf77cfefc5f0869b379759edf68a8f5d4afded6425032a9efdb8a1cbf44a23e9862
 EBUILD youtube-dl-2017.11.15.ebuild 2379 BLAKE2B 34ee4dfda07511e1f1e27576b967341bba6329312751cf5bc49fd54fe1bd6c2a5444ca0b82a25c15a40901b7a2edf743cfbb08e3bfcfca72e9dc5afe420605ed SHA512 f3996f3fe5ff5d92025a1adf594db099114e1a9a2e831d26fa8472c1cea1e3792a81996407b0349f244aeba1489f6ea1b757aaab827d5af55a6cad5a18a8eddf
-EBUILD youtube-dl-2017.11.26-r1.ebuild 3267 BLAKE2B 3227b519ffc0d8ee64afb3d67c2d4cdbae5a0a89af64f6a0fcb714e73f81031ba94c1af601e4d5ec9c3a0f01e6bac8a6e0c07b4d4a0596af985f72a96a1d884d SHA512 7eccbe2a3f18ee560043684aa0ff1868923adb79b6b2e35ab0da782920cfdf5e8b67b154c703918c23e23954b29c040438d60d9dfccbcbfa660c2d58885db96c
 EBUILD youtube-dl-2017.12.02.ebuild 3286 BLAKE2B 27dc317b224b7be4752e59ada595412101e6b5d5efa8baf703a61d690b92cc128a6c18e67a741cbced16a7be017555d038e54cebe832cc8980e0314ef3657c78 SHA512 0d49a470d4be463db904d18b3d37adbd5445900f2e0be45912c86a951942c158e3bba9fe4faa8976432d76e6438f199915583c6fb7cec9e5323680363a442d34
+EBUILD youtube-dl-2017.12.14.ebuild 3286 BLAKE2B 27dc317b224b7be4752e59ada595412101e6b5d5efa8baf703a61d690b92cc128a6c18e67a741cbced16a7be017555d038e54cebe832cc8980e0314ef3657c78 SHA512 0d49a470d4be463db904d18b3d37adbd5445900f2e0be45912c86a951942c158e3bba9fe4faa8976432d76e6438f199915583c6fb7cec9e5323680363a442d34
 EBUILD youtube-dl-99999999.ebuild 2089 BLAKE2B df876c715ffaa403d175515951e751611df0cb89e815515b045bebb29add327aa0df50f25303864e1ff0abe8f19a53718e9d20c64dd9d3ead549ad57125376d0 SHA512 a390ee79a77aa98603ca01a702df6621ac4630e62e7afd089e065bd4468fc38bfd13bba365e28916024f0eb9e92627133281985f57692432522aeb4671a0cf11
 MISC metadata.xml 218 BLAKE2B 717fcfd86a1f75e0ad21845c9b496cf01d7bc7c80b6be8c08143ea304a08fbb75352e82e8fc883398e96da9c037f8912c4a9612b5cf85ffb25b3a5f041b02fe2 SHA512 d36d668a636222ce6394eca2598850e68139819543fd3cf0e76301e2a61c9b9303026b49536d1ed1b52f44d5703dc5e4247df786e0b4a704b28872e0a4a71b27
diff --git a/net-misc/youtube-dl/youtube-dl-2017.11.26-r1.ebuild b/net-misc/youtube-dl/youtube-dl-2017.12.14.ebuild
index 1ca94c2424ec..b94326c98c67 100644
--- a/net-misc/youtube-dl/youtube-dl-2017.11.26-r1.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2017.12.14.ebuild
@@ -95,7 +95,9 @@ python_install_all() {
 
 	rm -r "${ED}"/usr/etc || die
 	rm -r "${ED}"/usr/share/doc/youtube_dl || die
+}
 
+pkg_postinst() {
 	elog "youtube-dl(1) / https://bugs.gentoo.org/355661 /"
 	elog "https://github.com/rg3/youtube-dl/blob/master/README.md#faq :"
 	elog
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 08f926ae28b7..a33d13d32a04 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index d840702efd23..4114ca503aba 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -1,16 +1,12 @@
 AUX README.gentoo 316 BLAKE2B 9c962395e49a2eff8411e7fb3996d99e504b0023712151acdd6bee43755be89d52c970cbf7e5aae62c0adfb33ff7ad072578b88a40857bffb359a3d2c8571947 SHA512 6ca305c710562c0f9a3f0cba07760adf300ea166c8baa47e8872719190d779fb63d4dd6c9193fb60ddb51015138790aaa93935668423e0f861f05496d22ce660
 AUX tor-0.2.7.4-torrc.sample.patch 1345 BLAKE2B 4540ae1b32a83a80a844a5e4dce32cb3fc0b196a685eb0232a0eaef259e2019687541a435cd9d6433759e8ef98197eb1a0757a8388011fbda336c25fa71c9c76 SHA512 7b49338ec86ed30d69b0d3b77bf45507139267a4e12c9810277a253287510d388a6d4026601552396ad76712c5d2970aa9f47d3ede9d16d82d5b68db8e0fff6a
-AUX tor.conf 62 BLAKE2B 69f354106007187060174073d84f42c0ccb246f792d0969644ff971322a79f374ea377d25c78a66c34a926f93225b5ff41701d8bab87f606bf2d321326eafa96 SHA512 e81517218bc036b42559f2dee5b09ff8873d7944bdf8375b6721a842990a29a21da1a524fb6b8e912da57f3cc6d3330663d78be3458833fc77692ce30386fbbc
 AUX tor.confd 44 BLAKE2B 70df86a361c7b735283c5699e4d8d8a054a84629c749adb4dc57c196d49df4492471cb8b21dde43d668b31171ee2dfae81562a70367c72801ae60046908b022e SHA512 9028ac41e3acdf4405095addb69537e87edecafaec840296ac27a5a8992fe132dc822e4e4abb8826f76460c438da2719dea17859690d03e17198a82086a3d660
 AUX tor.initd-r8 953 BLAKE2B 7af04f23c95b7edd90bfb6989741973cb63a846ad8a34be9a07e347308523caad1a1e0255e5597bdfb818257ab6db03da0f07622707ff60c62926f91d9d7d6e8 SHA512 4b690a721311a310131041ab962c571f1898f884f55fedf91b842e5190ce58399cccf59d34b4716d5dc15df4183f994d84c7c39f8458cb5f5da870ddc2db1730
-AUX tor.service 479 BLAKE2B 95ebb618b7f4d2b7b4923ddb1a9687ada82afa552b880085e0367193e0b7b882a39ad8ec9da0c951b1ece19d8cd4c1dcf930c9052722e7ace4afdfdc329ba511 SHA512 5eab6d99bc9210546b750596e6b660904a098868a07d4df41e14e39586a12965cbed94e7bda2bf315472fd40b4df4f68f1a8393c12e085524b80e02e26de9c14
 AUX torrc-r1 140 BLAKE2B 4b7e0795c09e737c5dda014c2b87811757bb8d68d581ece49f5002a2c42ee29c64899c635daf27b3465194a73ca5fd21a3a7ca655682fa5f5ffc7f4b2360b125 SHA512 6e3c481b34f2cb6f48bf87fe10565daded00415cc233332d43e18206d46eb7b32f92c55035584b5992e7a056e79e862124a573a9724f7762f76d4c4f0824de82
 DIST tor-0.3.1.7.tar.gz 6058284 BLAKE2B f2d825c82342cf1ca9354f051d532ef31e1d183be28f0f5b49f14c0d88176910292b6727b8cf0f066bae276e3a431851714cdb385219516d0a7519c5ed02b203 SHA512 a835526984187fad88cffc39ea8f6a4b61d5f8d2579b5a66425612607a22ff82e0f9da96e029e134e04d25ae0f59a1b4f771e9e8c19ebb563e1a0f5b3a3849e4
-DIST tor-0.3.1.8.tar.gz 6073611 BLAKE2B 1f6dcbe1beff2179ea21d39d05200a9a241739a58f7f38a0e4fa24b9a73d29bb49c539d07db1cf5186cab63217370c40a142cf995f9695916f5112fa0d2fba51 SHA512 0c2d5f6e444815f0812b0f8bb2102f2013c890375cf20b62025d0704e8ee7742bbf7173764795e3e63606a47d0695a5a982c318c55a30ca50600eb6de5b94b16
 DIST tor-0.3.1.9.tar.gz 6092702 BLAKE2B c009567b5866ff50159fbcbab05462a860c3e66c15599d11d40495d8a1a18fbad610f8ea94492519f2c8b6adfce7f4a54ad3bd2aee2b902ffae7215f35a3d4d5 SHA512 c22557251272595c65b2fade485020d76de16f5bb826d4a47d7bd093b7336dad42e8e2b8a3e0c56d9a10e62f0a5b1596c4b10cd578bf6da17f058f3d4e356f66
 DIST tor-0.3.2.7-rc.tar.gz 6313975 BLAKE2B ecfe6832b2e9c81f04218f7ec82a63f23913c1dc0a9ec29113e6432eac69b8cc89a9fc6b7c4147cf26e6de141b22574d3118608194641126d961b5f452179e1b SHA512 989bdd4311521528444f4165455365d3c1f1ef5f6a8846bf08db7f84ab8e986cba47f9dfbd3a03ccb6e3f8d813d69289768170a8fd68916e9d6a21fe0484cf87
 EBUILD tor-0.3.1.7.ebuild 2037 BLAKE2B 013b5168cebd2c35948c68e75811ac543b6f156ce4ed5c8fd7cb55231e40b575ee987419a8242095c90ce3f56ded0017e99bc01fd4568c1eb67da6a73e418db2 SHA512 efcb53f76c91cf9cd2403025a3290b170f58f0f03cb62fb2dc82a0e0ec55d263d9757b4cf80a825690b6276a01223091d7f6bc2f4d358ad778a82dac987ac56c
-EBUILD tor-0.3.1.8.ebuild 2042 BLAKE2B fbd140855ebf99eb0a9d6f44aa0e1b6fa760a1f4098b83986f04a837d9523ab87cde13d9f48f2c7cce672be949bd556da4a5d7e0928233af3ec7500acaef295e SHA512 74e764c2eba7080ce341ed83a662b01d0cfc36f8966e37fb3e3b424f8c44b736db7f359386251ca8167d2958318f67d2eda2e1e4065a365f8723a3cf8752a1cf
-EBUILD tor-0.3.1.9.ebuild 2042 BLAKE2B fbd140855ebf99eb0a9d6f44aa0e1b6fa760a1f4098b83986f04a837d9523ab87cde13d9f48f2c7cce672be949bd556da4a5d7e0928233af3ec7500acaef295e SHA512 74e764c2eba7080ce341ed83a662b01d0cfc36f8966e37fb3e3b424f8c44b736db7f359386251ca8167d2958318f67d2eda2e1e4065a365f8723a3cf8752a1cf
-EBUILD tor-0.3.2.7_rc.ebuild 2042 BLAKE2B fbd140855ebf99eb0a9d6f44aa0e1b6fa760a1f4098b83986f04a837d9523ab87cde13d9f48f2c7cce672be949bd556da4a5d7e0928233af3ec7500acaef295e SHA512 74e764c2eba7080ce341ed83a662b01d0cfc36f8966e37fb3e3b424f8c44b736db7f359386251ca8167d2958318f67d2eda2e1e4065a365f8723a3cf8752a1cf
+EBUILD tor-0.3.1.9-r1.ebuild 2088 BLAKE2B 01576aa9f7560cf87ad2a5ccf5940d96e5b41cff9bfa2b7136b383e533203384016221ad99fc054776674143599310efd24b98e13f652407937f7882c2fddd84 SHA512 2dce831cc54a5346d9aa5cd8cb885033c350aac39003d2b78a24fa0a363d49be9a8e4b6f5256daf002ac1476aac13fdfd3f5f765ad809e9638226b72a0960fbd
+EBUILD tor-0.3.2.7_rc-r1.ebuild 2088 BLAKE2B 01576aa9f7560cf87ad2a5ccf5940d96e5b41cff9bfa2b7136b383e533203384016221ad99fc054776674143599310efd24b98e13f652407937f7882c2fddd84 SHA512 2dce831cc54a5346d9aa5cd8cb885033c350aac39003d2b78a24fa0a363d49be9a8e4b6f5256daf002ac1476aac13fdfd3f5f765ad809e9638226b72a0960fbd
 MISC metadata.xml 594 BLAKE2B 006e1ebc9876f83cb7cc3dcb7cea9ff0dfc763e9eb47c025e38b7588e1e4fef7c26ab130c61cdd3200b8d3d9be886b3aab377585972be178c93b758aff48c4c3 SHA512 011f77654a507d13c0542e6983df8ec86c5f2cff7cd1408f99c9d4da9d00ffb4b432317b2fd21500e62131e6f7c9bc60235cf55f2b8082391b9fe3bcf924ab2b
diff --git a/net-vpn/tor/files/tor.conf b/net-vpn/tor/files/tor.conf
deleted file mode 100644
index 188c041e5442..000000000000
--- a/net-vpn/tor/files/tor.conf
+++ /dev/null
@@ -1 +0,0 @@
-d       /var/run/tor        0775    tor     tor     -       -
diff --git a/net-vpn/tor/files/tor.service b/net-vpn/tor/files/tor.service
deleted file mode 100644
index 8fcc6740ed91..000000000000
--- a/net-vpn/tor/files/tor.service
+++ /dev/null
@@ -1,21 +0,0 @@
-[Unit]
-Description=The Onion Router
-
-[Service]
-ExecStartPre=/usr/bin/tor --verify-config -f /etc/tor/torrc
-ExecStart=/usr/bin/tor --RunAsDaemon 0 -f /etc/tor/torrc
-ExecReload=/bin/kill -HUP $MAINPID
-KillSignal=SIGINT
-TimeoutStopSec=32
-LimitNOFILE=30000
-
-# Hardening options:
-CapabilityBoundingSet = CAP_SETUID CAP_SETGID CAP_NET_BIND_SERVICE
-PrivateTmp = yes
-PrivateDevices = yes
-ProtectHome = yes
-ProtectSystem = full
-NoNewPrivileges = yes
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-vpn/tor/tor-0.3.1.8.ebuild b/net-vpn/tor/tor-0.3.1.8.ebuild
deleted file mode 100644
index 2e54066d6ba5..000000000000
--- a/net-vpn/tor/tor-0.3.1.8.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit flag-o-matic readme.gentoo-r1 systemd versionator user
-
-MY_PV="$(replace_version_separator 4 -)"
-MY_PF="${PN}-${MY_PV}"
-DESCRIPTION="Anonymizing overlay network for TCP"
-HOMEPAGE="http://www.torproject.org/"
-SRC_URI="https://www.torproject.org/dist/${MY_PF}.tar.gz
-	https://archive.torproject.org/tor-package-archive/${MY_PF}.tar.gz"
-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"
-IUSE="libressl lzma scrypt seccomp selinux systemd tor-hardening test web zstd"
-
-DEPEND="
-	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 )"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-tor )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.2.7.4-torrc.sample.patch
-)
-
-DOCS=( README ChangeLog ReleaseNotes doc/HACKING )
-
-pkg_setup() {
-	enewgroup tor
-	enewuser tor -1 -1 /var/lib/tor tor
-}
-
-src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}/var" \
-		--enable-system-torrc \
-		--enable-asciidoc \
-		--disable-libfuzzer \
-		--disable-rust \
-		$(use_enable scrypt libscrypt) \
-		$(use_enable seccomp) \
-		$(use_enable systemd) \
-		$(use_enable tor-hardening gcc-hardening) \
-		$(use_enable tor-hardening linker-hardening) \
-		$(use_enable web tor2web-mode) \
-		$(use_enable test unittests) \
-		$(use_enable test coverage)
-}
-
-src_install() {
-	default
-	readme.gentoo_create_doc
-
-	newconfd "${FILESDIR}"/tor.confd tor
-	newinitd "${FILESDIR}"/tor.initd-r8 tor
-	systemd_dounit contrib/dist/tor.service
-
-	keepdir /var/lib/tor
-
-	fperms 750 /var/lib/tor
-	fowners tor:tor /var/lib/tor
-
-	insinto /etc/tor/
-	newins "${FILESDIR}"/torrc-r1 torrc
-}
diff --git a/net-vpn/tor/tor-0.3.1.9.ebuild b/net-vpn/tor/tor-0.3.1.9-r1.ebuild
index 2e54066d6ba5..23286b3b6daa 100644
--- a/net-vpn/tor/tor-0.3.1.9.ebuild
+++ b/net-vpn/tor/tor-0.3.1.9-r1.ebuild
@@ -52,6 +52,7 @@ src_configure() {
 		--enable-asciidoc \
 		--disable-libfuzzer \
 		--disable-rust \
+		$(use_enable lzma) \
 		$(use_enable scrypt libscrypt) \
 		$(use_enable seccomp) \
 		$(use_enable systemd) \
@@ -59,7 +60,8 @@ src_configure() {
 		$(use_enable tor-hardening linker-hardening) \
 		$(use_enable web tor2web-mode) \
 		$(use_enable test unittests) \
-		$(use_enable test coverage)
+		$(use_enable test coverage) \
+		$(use_enable zstd)
 }
 
 src_install() {
diff --git a/net-vpn/tor/tor-0.3.2.7_rc.ebuild b/net-vpn/tor/tor-0.3.2.7_rc-r1.ebuild
index 2e54066d6ba5..23286b3b6daa 100644
--- a/net-vpn/tor/tor-0.3.2.7_rc.ebuild
+++ b/net-vpn/tor/tor-0.3.2.7_rc-r1.ebuild
@@ -52,6 +52,7 @@ src_configure() {
 		--enable-asciidoc \
 		--disable-libfuzzer \
 		--disable-rust \
+		$(use_enable lzma) \
 		$(use_enable scrypt libscrypt) \
 		$(use_enable seccomp) \
 		$(use_enable systemd) \
@@ -59,7 +60,8 @@ src_configure() {
 		$(use_enable tor-hardening linker-hardening) \
 		$(use_enable web tor2web-mode) \
 		$(use_enable test unittests) \
-		$(use_enable test coverage)
+		$(use_enable test coverage) \
+		$(use_enable zstd)
 }
 
 src_install() {
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 8b69fa4a312f..a11ce33fd375 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/gr-doa/Manifest b/net-wireless/gr-doa/Manifest
index 403800a4bd6a..34e3b11876d1 100644
--- a/net-wireless/gr-doa/Manifest
+++ b/net-wireless/gr-doa/Manifest
@@ -1,2 +1,2 @@
 EBUILD gr-doa-9999.ebuild 936 BLAKE2B 4966c0c015b9bc67bb7a38ca3dfcfd8fd53081b0335bcd1cd7d387e2b5f45b0149f74e9740f4236502c8b4d284eccdebb8b96185213dfbc3bd085a33ece87495 SHA512 c82840a52c1b7ecd42761f51a597b904cddb4d3f4b838c47f615c262c05246168a6a132fafbf7673ddabfa1a4f6784891fe3c848e5f039b5cc02d092fcf20c6a
-MISC metadata.xml 351 BLAKE2B bf3cb05f3b03af09c0dd61a868fa09a3f9e60a0469c7476155d968a0d62253b888cfb069fb20a703ccea0713f6b522c828c14cbde05c9d7dafd7ecccfe756757 SHA512 a4e3a22930b7fe0624ab5384f16105d7c6648df05785dfe303c492a6bc03f580ca6b5ad196a84ea56136fc1d13f35521e8ffeb55bb94681b612e6ff39cfd5412
+MISC metadata.xml 338 BLAKE2B d8dd443fa026ba6b7343fe067de88b467663e1e5a77904a32df6ee64bc3128341fcd48c52a99103229180005cc9a007dd7c7ec33e3c136835185ec68a03bc0ce SHA512 de41f6b74153a345fca1448cb9dcbd391acfcfbdc784d3359a96c6c099897aa65ecc58f84e09e872772274afd74a0ba15ef06be8a4492e7e89f43f70f6ba090f
diff --git a/net-wireless/gr-doa/metadata.xml b/net-wireless/gr-doa/metadata.xml
index 2c918e4cda7e..8a3f94073560 100644
--- a/net-wireless/gr-doa/metadata.xml
+++ b/net-wireless/gr-doa/metadata.xml
@@ -9,6 +9,4 @@
 	<email>radio@gentoo.org</email>
 	<name>Radio</name>
 </maintainer>
-<use>
-</use>
 </pkgmetadata>
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index b26019982f70..d0e17b36c07f 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index f8a06952e643..2444dc59df1f 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -7,6 +7,14 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# James Le Cuirot <chewi@gentoo.org> (17 Dec 2017)
+# Java 9 is not yet fully supported on Gentoo. Having a masked
+# gentoo-vm flag allows us to provide it without it breaking Gentoo
+# packages. Those who wish to experiment with it as a fully recognised
+# Gentoo JVM can unmask the flag.
+dev-java/oracle-jdk-bin:9 gentoo-vm
+dev-java/oracle-jre-bin:9 gentoo-vm
+
 # Andreas K. Hüttel <dilfridge@gentoo.org> (04 Nov 2017)
 # Requires audacious, which is masked. Bug 632513
 =media-libs/freeverb3-3.1.2_pre20151102-r1 jack
diff --git a/profiles/license_groups b/profiles/license_groups
index ec45948807f6..c714cf24e397 100644
--- a/profiles/license_groups
+++ b/profiles/license_groups
@@ -71,7 +71,7 @@ BINARY-REDISTRIBUTABLE @FREE bh-luxi Broadcom Dina intel-ucode ipw2100-fw ipw220
 
 # License agreements that try to take away your rights. These are more
 # restrictive than "all-rights-reserved" or require explicit approval.
-EULA Adaptec-EULA AdobeFlash-11.x ArxFatalis-EULA-JoWooD baudline BCS bf1942-lnxded CAPYBARA-EULA Coherent-Graphics CROSSOVER-2 CYANA DOOM3 dotnet-eula ETQW FAH-EULA-2014 FraunhoferFDK GameFront Gameplay-Group-EULA genymotion GIMPS GOG-EULA google-chrome Google-TOS Intel-SDP Introversion LastPass LOKI-EULA LRCTF MakeMKV-EULA MARBLEBLAST Mendeley-terms MSjdbcEULA40 MTA-0.5 NVIDIA-CODEC-SDK NVIDIA-CUDA Nero-AAC-EULA Nero-EULA-US OPERA-12 OPERA-2014 Oracle-BCLA-JavaSE PAPERS-PLEASE POMPOM postal2 Primate-Plunge PUEL Q3AEULA Q3AEULA-20000111 QUAKE4 Quartus-prime-megacore RAR RTCW RTCW-ETEULA RuneScape-EULA SJ-Labs spin-commercial spin-educational StarUML-EULA TeamViewer THINKTANKS UPEK-SDK-EULA ut2003 ut2003-demo Vivaldi worklog-assistant Xerox yangcli-pro zi-labone
+EULA Adaptec-EULA AdobeFlash-11.x ArxFatalis-EULA-JoWooD baudline BCS bf1942-lnxded CAPYBARA-EULA Coherent-Graphics CROSSOVER-2 CYANA DOOM3 dotnet-eula ETQW FAH-EULA-2014 FraunhoferFDK GameFront Gameplay-Group-EULA genymotion GIMPS GOG-EULA google-chrome Google-TOS Intel-SDP Introversion LastPass LOKI-EULA LRCTF MakeMKV-EULA MARBLEBLAST Mendeley-terms MTA-0.5 NVIDIA-CODEC-SDK NVIDIA-CUDA Nero-AAC-EULA Nero-EULA-US OPERA-12 OPERA-2014 Oracle-BCLA-JavaSE PAPERS-PLEASE POMPOM postal2 Primate-Plunge PUEL Q3AEULA Q3AEULA-20000111 QUAKE4 Quartus-prime-megacore RAR RTCW RTCW-ETEULA RuneScape-EULA SJ-Labs spin-commercial spin-educational StarUML-EULA TeamViewer THINKTANKS UPEK-SDK-EULA ut2003 ut2003-demo Vivaldi worklog-assistant Xerox yangcli-pro zi-labone
 
 # Local Variables:
 # mode: conf-space
diff --git a/profiles/package.mask b/profiles/package.mask
index e36d1966e96e..76a1f3b609cf 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,17 @@
 
 #--- END OF EXAMPLES ---
 
+# Andreas Sturmlechner <asturm@gentoo.org> (18 Dec 2017)
+# Masked for testing. Bug 621818
+=net-misc/teamviewer-13.0.5693
+
+# James Le Cuirot <chewi@gentoo.org> (17 Dec 2017)
+# Java 9 is not yet fully supported on Gentoo. Packages cannot depend
+# on it so these virtuals are not yet required. If you wish to use
+# Java 9 now then install oracle-(jdk|jre)-bin:9 directly.
+virtual/jdk:9
+virtual/jre:9
+
 # Mike Gilbert <floppym@gentoo.org> (16 Dec 2017)
 # Dev channel releases are only for people who are developers or want more
 # experimental features and accept a more unstable release.
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index e6f22521acaa..2a8fbe9fff4a 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -221,6 +221,7 @@ app-arch/pigz:symlink - Install symlinks which override app-arch/gzip implementa
 app-arch/rar:all_sfx - Install all SFX (Self-Extracting) files rather than just the native format (allows creation of Windows EXEs on Linux ELF systems)
 app-arch/tar:minimal - just install `tar`
 app-arch/unzip:natspec - Use dev-libs/libnatspec to correctly decode non-ascii file names archived in Windows.
+app-arch/xz-utils:extra-filters - Build additional filters that are not used in any of the default xz presets. This includes delta and BCJ coders, additional match finders and SHA256 checks.
 app-arch/zip:natspec - Use dev-libs/libnatspec to correctly decode non-ascii file names archived in Windows.
 app-backup/amanda:ndmp - Support for the NDMP protocol
 app-backup/amanda:s3 - Support for backing up to the Amazon S3 system
@@ -1826,12 +1827,18 @@ dev-java/lucene:contrib - Include extra functionality from contrib/
 dev-java/miglayout:swt - Add support for the SWT toolkit.
 dev-java/oracle-jdk-bin:commercial - Install features requiring a commercial license for production use
 dev-java/oracle-jdk-bin:derby - Install bundled Derby (Java database)
+dev-java/oracle-jdk-bin:gentoo-vm - Allow this JDK to be recognised by Gentoo (package manager, eselect, java-config, EXPERIMENTAL!)
+dev-java/oracle-jdk-bin:gtk2 - Enable GTK+ 2 support in JavaFX
+dev-java/oracle-jdk-bin:gtk3 - Enable GTK+ 3 support in JavaFX
 dev-java/oracle-jdk-bin:headless-awt - Don't install the X backend for AWT, needed by some GUIs (used to be X flag)
 dev-java/oracle-jdk-bin:javafx - Install JavaFX libraries
 dev-java/oracle-jdk-bin:jce - Install Java Cryptographic Extension Unlimited Strength Jurisdiction Policy Files
 dev-java/oracle-jdk-bin:source - Install JVM (and optionally JavaFX) sources
 dev-java/oracle-jdk-bin:visualvm - Install VisualVM debugging tool
 dev-java/oracle-jre-bin:commercial - Install features requiring a commercial license for production use
+dev-java/oracle-jre-bin:gentoo-vm - Allow this JRE to be recognised by Gentoo (package manager, eselect, java-config, EXPERIMENTAL!)
+dev-java/oracle-jre-bin:gtk2 - Enable GTK+ 2 support in JavaFX
+dev-java/oracle-jre-bin:gtk3 - Enable GTK+ 3 support in JavaFX
 dev-java/oracle-jre-bin:headless-awt - Don't install the X backend for AWT, needed by some GUIs (used to be X flag)
 dev-java/oracle-jre-bin:javafx - Install JavaFX libraries
 dev-java/oracle-jre-bin:jce - Install Java Cryptographic Extension Unlimited Strength Jurisdiction Policy Files
@@ -3653,7 +3660,6 @@ mail-client/claws-mail:smime - Build plugin for S/MIME support
 mail-client/claws-mail:spam-report - Enable plugin for spam reporting to various services
 mail-client/claws-mail:spamassassin - Build mail-filter/spamassassin plugin
 mail-client/claws-mail:valgrind - Add support for memory debugging using valgrind
-mail-client/claws-mail:webkit - Enables HTML e-mail rendering by using the net-libs/webkit-gtk library.
 mail-client/evolution:archive - Enable archives support in attachments via app-arch/gnome-autoar
 mail-client/evolution:bogofilter - Build mail-filter/bogofilter plugin
 mail-client/evolution:crypt - Enable GPG encryption support using app-crypt/gnupg and app-crypt/pinentry
@@ -4805,6 +4811,7 @@ media-tv/tvbrowser:themes - Install extra theme packs
 media-tv/tvheadend:capmt - Enable support for capmt (dvbapi) protocol
 media-tv/tvheadend:constcw - Enable support for the constcw protocol
 media-tv/tvheadend:cwc - Enable support for the cwc (newcamd) protocol
+media-tv/tvheadend:ddci - Enable support for DDCI hardware
 media-tv/tvheadend:dvbcsa - Enable decryption of the DVB Common Scrambling Algorithm
 media-tv/tvheadend:dvben50221 - Enable support for hardware CAM
 media-tv/tvheadend:hdhomerun - Enable support for the HDHomeRun device
@@ -5493,6 +5500,7 @@ net-dns/dnsmasq:id - Whether report *.bind CHAOS info to clients, otherwise forw
 net-dns/dnsmasq:libidn2 - Enable support for Internationalized Domain Names, via net-dns/libidn2 rather than net-dns/libidn
 net-dns/dnsmasq:script - Enable support for calling scripts when leases change.
 net-dns/dnsmasq:tftp - Enables built in TFTP server for netbooting.
+net-dns/dnssec-validator:ecdsa-check - Requires openssl[-bindist]
 net-dns/hash-slinger:ipsec - Enable support for IPSECKEY records (ipseckey)
 net-dns/hash-slinger:openpgp - Enable support for OPENPGPKEY records (openpgpkey)
 net-dns/hash-slinger:ssh - Enable support for SSHFP records (sshfp)
diff --git a/sci-chemistry/Manifest.gz b/sci-chemistry/Manifest.gz
index a0893f316c7f..1bde0748b00c 100644
--- a/sci-chemistry/Manifest.gz
+++ b/sci-chemistry/Manifest.gz
diff --git a/sci-chemistry/aria/Manifest b/sci-chemistry/aria/Manifest
index 24bc93d05d67..8e0e9a87437b 100644
--- a/sci-chemistry/aria/Manifest
+++ b/sci-chemistry/aria/Manifest
@@ -1,3 +1,3 @@
-DIST aria2.3.2_08.26.2013.tar.gz 1878602 SHA256 b9b892de2070a77812733faf4b6a1dbec4bba6dec80e5630088cab8b11cbfaf0 SHA512 a6d8c45218f5d494174587a5f8f1feec940ac8cc4cd7b707dac65b2378219ecf27967e70807e6cb7ae22a7d4aec7239af763f077ad7183c078b1991cac71bc3e WHIRLPOOL 59c0b79fab40201d903c484bf63e8339c235207306efc848965d260c02b00c9a408297df0f211cf45f30d13ec35175bf7d566bb5c6d59b944eb22d9aacf0384d
+DIST aria2.3.2_08.26.2013.tar.gz 1878602 BLAKE2B 3044192853c0ed0653d20fea959d3b01321f559845c555289658f93b65e9148f8cd0f59619e8690887b2811d613e6cc2f67b67af7d84ade4b8fc18403367086c SHA512 a6d8c45218f5d494174587a5f8f1feec940ac8cc4cd7b707dac65b2378219ecf27967e70807e6cb7ae22a7d4aec7239af763f077ad7183c078b1991cac71bc3e
 EBUILD aria-2.3.2_p20130826.ebuild 1918 BLAKE2B 12b418e5949ee99892a5cff811e3d8dfe08b1f99cf425df8f0dde976fbae39cb31f5767b2173f8f3756cb428f18ef917e5f2d02546d4edbd28801c693eaca61d SHA512 97f30da0e83cee0e9ed20c0d81b020fa55d3b62c60f25014b4b83888e3004f01b94216ba13257b8fe2fb92156391f3c08845d6f1cf5684739a1fc6d412ecd712
 MISC metadata.xml 271 BLAKE2B a446884cbe7a6789e0bcd82759f57bf1ab7b29c5ab714057ffa821c90f799d1fa9f9310c187ee4c3a8ae2476f6ea9d15f368045779f1581e68d02802c61c884c SHA512 3e6e6047a29e07123b81279cae1de17bc4bd4c3d7d8a8d26560114a18185f473d038fc220fa81c7213fa203ce197bad8b1c272d9b7e41cd770a953fa6308ff92
diff --git a/sci-chemistry/cns/Manifest b/sci-chemistry/cns/Manifest
index 2cf6e91fa191..6bd6b5ca2dea 100644
--- a/sci-chemistry/cns/Manifest
+++ b/sci-chemistry/cns/Manifest
@@ -7,10 +7,10 @@ AUX 1.3_p7-delete.patch 448 BLAKE2B 1b678ecb54ed31c73805b9665c441b1bc5fbd965ce3a
 AUX 1.3_p7-gentoo.patch 2581 BLAKE2B 7a65fdf4c787b5adbf1730ecbbf74950ca29cdefa62f7a6dab085f0e85e773e117746559e6ec9f97cca36a8e0464b71ed92b33d18ab0babf2dd2566fc0a1b35e SHA512 235b5890c9c0aa9bfac0034e35c3641968b5b1f600bbbfa81240fe405f28910a00184b6fa2ec7a993883ba6db95f1fa9e44cb4b7b9e61ab3d9dcfa26869e1a4c
 AUX cns_solve_env_sh 7070 BLAKE2B 733dc170c5bb009e4774486b95aeb18811cbf339ffda3ff1ee3e8b6b703c782996b291ed0a1aaee6fd314a86b429183fc5a632136bbe3e13524176325828801e SHA512 b012e46706f39d934ff27e4b381907ddd25ca1fbc0112c320b117d68cca3e81f571bfd1821b49477dc16bfd8a0a943c43469fe847cf99e6ab2d08ef238bada31
 AUX cns_solve_env_sh-1.3_p7 7332 BLAKE2B cc4a96591f5bb7716d981525a923413f5f723774cc6253e7483b0ef849a6c57e0fd31e27d4848fd2656e50d83935416a6de62016f9a054bc48313454df9c5548 SHA512 afe2f24c85eff265659e5b2ba2edab519c3193d30b2dcd815bc91a929fd4f4a9167148f8248237569f809d627a8fa623a46fe82d3e0a2cb1827bed910ce565cb
-DIST aria2.3.1.tar.gz 1833973 SHA256 cc45ed2d66182cf0ee197a7cf3bc7edd8d5043d95cdcd19e1cec9aeb82c2fdbc SHA512 79a2cd89e2120acecb04f286a153dbf52c16500e8956c9dad49b1e1ed94a7b2449c7b044bae6f87e0d2b452a1467a2c02de74f0fa85b0eae66042386e2f5e2d5 WHIRLPOOL 2ff003322601b42bec0d2431e2f1f85819b3982f8da612ff778bb404e51f0fcbca3faa6998e9c0635f9e73899609bb1e273420cac182952aa744364c20299723
-DIST aria2.3.2.tar.gz 1836270 SHA256 30727ea8bdc2e3b44e5970545008fcfa07fa59aa28b76824956a2aa71daa9615 SHA512 009a1d0079f5cc162dc732749ddd2b33297268f0d988b2f37bda4ed50c7764ceef7ae5b56b322c7ac79427a4a2a92d1239199891445cb5e2b3d0908ed670e2aa WHIRLPOOL f18af5b751e79c92e04f4dc12b6b806a1c505b269559a2342bdd6280b790f9f0df9bb4afe366af03beaf09af0128c6b68c39bc66603d51ad24914c78b2579cf3
-DIST cns_solve_1.21_all-mp.tar.gz 32748040 SHA256 7ab464e20932eb024ba6378738da77a4a03642d63b0ca9772b612a7cf27baec1 SHA512 383324d771570b501e388fba9bf20789f483a3a4044eb3334c7a7e7835e0c345b784e0d344b22d20a10fe1c33ed21c9013adb1af5912808af480b96abe275857 WHIRLPOOL fecd0b2dfba43e5525a9fcc8543a55867602b376744848ddafd4c132bcdfc32225780f543742fa225b5e0f0ce658c1029a9ca8b80d5ee3f2491b6d63e8ad91b0
-DIST cns_solve_1.3_all.tar.gz 64167735 SHA256 2ee368022c5ecabf66ce7d32059d93cd7d885ad2d684a094b87c64f6b3dfea0d SHA512 4fe73820e96999bb33a59ff6da979794628552f49bc03cdebcb9439b57e6042b92190e04bb7e4079157adf06a6facc5c16b8ae91621bd24a4b35ee382e53ae37 WHIRLPOOL b3cd14ab7a8a29a44f6e6c3cbc22ee2c665eb8c8565969337b24deffb2a1fd007fae11c5eb73ac38ddf9a38e850948e3b2df2548931722a2a383d5e8c72607a1
+DIST aria2.3.1.tar.gz 1833973 BLAKE2B 4bf51626a4283452e75a834d0160a4204efd5a35ee8b07329f2a4f933ceea23e53177e6ed19bc9cc158b2a00491d20c75d443bdc04e7feb2d7eda3dc006818e1 SHA512 79a2cd89e2120acecb04f286a153dbf52c16500e8956c9dad49b1e1ed94a7b2449c7b044bae6f87e0d2b452a1467a2c02de74f0fa85b0eae66042386e2f5e2d5
+DIST aria2.3.2.tar.gz 1836270 BLAKE2B 725b0db2b5de36d1b132c5073b8a91f26fa19b48549f4c899041a2b140127524f660c4faeb8c35e94d3d19c24b0252f379de0e85c8fb08b86fc7834252239fb9 SHA512 009a1d0079f5cc162dc732749ddd2b33297268f0d988b2f37bda4ed50c7764ceef7ae5b56b322c7ac79427a4a2a92d1239199891445cb5e2b3d0908ed670e2aa
+DIST cns_solve_1.21_all-mp.tar.gz 32748040 BLAKE2B 7c82fd9cddc56a00d791d6d5525491b91525962f000c2fdfb02a3ab81305c0c026c115c2328dac99ac7b30146ca591620f4f42019938fb49e7ce52235b281121 SHA512 383324d771570b501e388fba9bf20789f483a3a4044eb3334c7a7e7835e0c345b784e0d344b22d20a10fe1c33ed21c9013adb1af5912808af480b96abe275857
+DIST cns_solve_1.3_all.tar.gz 64167735 BLAKE2B 3901a597eb0deac7f2fad173e15d78bfcd753c4019739e22c8851194c9446305cd92bcff73f7f06dc21b6d055852863993412296e1e555ef0b3b730052934cbd SHA512 4fe73820e96999bb33a59ff6da979794628552f49bc03cdebcb9439b57e6042b92190e04bb7e4079157adf06a6facc5c16b8ae91621bd24a4b35ee382e53ae37
 EBUILD cns-1.2.1-r8.ebuild 6584 BLAKE2B 83117af05029b6fc0d35f93e3b4a83e95c6f1b7ea9993da5ca79ef9adbe54eb0686384039501b260e065f13b7839730389b5179c458ea99dbe2a4d9e83c2ff46 SHA512 1b998dae6f3228bf56d66af3bdaa5fcfbb167de571506d7f1c5037cc73d1eff23f31f49fe89ed1defd05e2289f63f7a718b3b39a63bf06bd68a37fd91bfda832
 EBUILD cns-1.3_p7-r1.ebuild 5810 BLAKE2B 3a73528b624e62e89151864dd16ea9cfeffb8c8ff89ee248d7e3b5620f2f75680b004f09f530f4c5a0c99c63355a3646db76ca27732404397de6ede54edc230c SHA512 cb0537ba0dd690864019641369dad0b62399a6beed2f60b97b4e46cb83d1451fbf7ceb965db17fc793958c5865de50edb5ca20b34dcd5762c5417a805bfbbb81
 MISC metadata.xml 954 BLAKE2B 69065a98205d1c37abcc868279491caf3fa82fc209f25b8570385302a7efb14f1e13e23eedaae5db86fecdd56c9cf3d5bfeb0e425dd824c3f1fa5150a9641aad SHA512 af24c501f427f9473a9ef8ec90dfd14b2abb0856e8bde8bb1c664fe49a23032895c4d28d06112791b78880be1ef9b781efe60c26bee5d8e9a40a40b41713159b
diff --git a/sci-chemistry/cyana/Manifest b/sci-chemistry/cyana/Manifest
index 996a495c8a47..24c2aa5dc858 100644
--- a/sci-chemistry/cyana/Manifest
+++ b/sci-chemistry/cyana/Manifest
@@ -2,6 +2,6 @@ AUX 2.1-exec.patch 1959 BLAKE2B 6bd6b04db4b1d88c830602cca301e1efc5e98fa863c454f2
 AUX 2.1-expire.patch 578 BLAKE2B 5626fcc6153b9bd8492a6233126b1b5d8f79c67b9a64676318f4453ad578579af4d34852e5e8dc4f6fe61d4895324eb0f36315ee3b857f094dbabb78573a04e3 SHA512 7816f284a7af23c5d87a5a464ea36e7a1b09e73516852b85fac0d71bb8376639788f3f9395f8a6fd9365906d2aaadbd060f2194c7af3b68a24927adefcd56c40
 AUX 2.1-typo.patch 484 BLAKE2B 1f27f74ab6909575d38285fac1ae39d889be3fa8b7ffc6dfa586da3c58fb8e73c9ca196622e0a014584208c8450b8a70c6baf438235b353d83b9c8ac27ad70a3 SHA512 298e5053e4261477a11f0dff2339f198e50e92a96b98c5aea82e3a432b806b1ea0baa3638ef6e65dee315be3223510a804e2c849a82fdda0a1cf296de9d89db4
 AUX 2.1-xiar.patch 385 BLAKE2B 0038dda5697290df2d853848edd06ec74e4bb3efe38d159265468992525e52098bdaf97bd12cba814c2d790306f52f800d6e696d73aefa4b2a1c10349ea6c40f SHA512 ce4c27b70d0c432b33f76b4ff76d004f525243269064f1af439bf42ab9783edd9dc19712b277d8e08bb692a28c40db7007040da1635cbd3c432029e4fe6c680f
-DIST cyana-2.1.tar.gz 2203650 SHA256 4b49d23eda3a327074fa337c7ee13262e93fb2b92cc6feb9139dfb7695bdeded SHA512 20f5369e47198000927ee9a60beda34d265fddcd6be59f0d5d81ac23691b7e870ca674bdd7215a13bc849586411a007ebb1ff46072b55f255a6d796359067be8 WHIRLPOOL dfc60a456c166d98bbdb60227a2dae63d12ea9fb7375dede3d372a6dbf0785bfd0c8b1069d985a6ee775ab136405b553ff9336a2603d139d81d853f0681f5167
+DIST cyana-2.1.tar.gz 2203650 BLAKE2B 0af9049b24674a43cfea44129c57a1dbf7c5b457f2f02272d89f60b21a7c6571884d36575cdb6f98b84a1490c318f6bb6b41fe66e417cd0bb371895479d9d372 SHA512 20f5369e47198000927ee9a60beda34d265fddcd6be59f0d5d81ac23691b7e870ca674bdd7215a13bc849586411a007ebb1ff46072b55f255a6d796359067be8
 EBUILD cyana-2.1.ebuild 1439 BLAKE2B b865b24efff5f51d90a1566ef775db539dcaec919c821b5de192acf2d763ac04ebe90446fc69b03040a9ed22fe0acce8770bc86138191a2b8159c4080dcba867 SHA512 47108af1f37d2adb2fd111da3db51f60feedc4d4f7c4da5327b3217626e8d6826b45993e900ca43d252c98d42216e6a878ada5039be7385bd18d2dac67c3891f
 MISC metadata.xml 271 BLAKE2B a446884cbe7a6789e0bcd82759f57bf1ab7b29c5ab714057ffa821c90f799d1fa9f9310c187ee4c3a8ae2476f6ea9d15f368045779f1581e68d02802c61c884c SHA512 3e6e6047a29e07123b81279cae1de17bc4bd4c3d7d8a8d26560114a18185f473d038fc220fa81c7213fa203ce197bad8b1c272d9b7e41cd770a953fa6308ff92
diff --git a/sci-chemistry/namd/Manifest b/sci-chemistry/namd/Manifest
index cef3b7a38707..eed29c1248f3 100644
--- a/sci-chemistry/namd/Manifest
+++ b/sci-chemistry/namd/Manifest
@@ -1,8 +1,5 @@
-AUX namd-2.10-gentoo.patch 4636 BLAKE2B ea896b918e38d099a0d9f1268a4b28eccf378e187a6067aa7ac872a3c6d51403d783ba8ff03169d7745f952fe4e259aaf60ee50e9f381f577709740891fd34a1 SHA512 28ffbedb05d24a74e05a4f65424a25a4598e2172b7b4ab07fe84570e3162373e4e018f66077636bb097c6e0687666ac81dbb8b925a195f23c269829ebb9234c8
+AUX namd-2.10-gentoo.patch 4637 BLAKE2B 0439e424f3d2a73378c68052f9d9dd69dc9590b9f83fa4062d4abc156b3b682f0e8a2cffd8a1e1f751f8dfd71d067c0234ba56946773ca9139e73c57e775c631 SHA512 35afda71ad7567d1b2c4c1f4073792d5977edc997ba7a43cf71c8ed32308062edc5cb4923202d599d59ade2f98602a0fac21138ba205a3bf6b681c86a61411f8
 AUX namd-2.7-iml-dec.patch 520 BLAKE2B c16430d1161b9d7e3faf22257d84ff1090eccf906a296f91d4ec0731fa89d23334d5c39c7988f8ac6d5f5020d403d4491dadbe34b1e9800ada81ad18b2448b7d SHA512 50ddf91bcb0e370a98d6fe5329f00ec9a8016f0178e342b086f4b9d4130a41e525ed9d960e92dc83b4372f135ce9d454bef836d3e215fb6ac7933999278efa37
-AUX namd-2.9-gentoo.patch 5480 BLAKE2B 30b337c893984842e26f010fe084aa5398e217e6fd4098af87fe181cab735350730f27c07c1f8c401874b792a50a296662dba6856d30253024467e712cac1223 SHA512 e59a01fe0b65fe9df6b47e962f776eea650b55071081210d0e1269dd76e4da4bca8faef11398bd0cb1f8acc883c8ebf6b37d7fdab066602fd251aae82cb87264
-DIST NAMD_2.10_Source.tar.gz 9200234 SHA256 a5282c172524c2fbe6b9ba56f2de8c84f1093405c914ffbc70442dd0dd4e4289 SHA512 3712a03841fad76c502ac4e41469162ff78e6152560d0f6855d61d2b5583241a661e2a3e7446029b56a6f6f1100f25cb51b2c3df6571542397961d3bb625bc92 WHIRLPOOL b97e47c1d73d505620c26a2eca2e2e91807ebeff19e8820d9be7ea6ddd84c59cd5839846a18a2615ae993a1a6fc22b90e5080cf9d8a72aa412f6b81354e0f284
-DIST NAMD_2.9_Source.tar.gz 8814042 SHA256 9ba6a1f87d4600a62847728d7c223295be214f9a72b5bb62552f74d644108424 SHA512 0644814a2799b560d9dcf807ba0047325bc9f0a26e3831b0465d95180784f038d69595e036daac85d59cd919c92d11a0343031975d99deb1fa3052c8a649bdd6 WHIRLPOOL 5494ccb2ee2f2792fe52ad7dcfe6da9d11453f0a9b0859d30698dea56b00d92fae73465967f82bd708abee5cd4ff50b0a6ffde86451e859e2f515af203e09286
-EBUILD namd-2.10.ebuild 2532 BLAKE2B a0fdc3922a5930ae0ace9c62bdd822f8ae286fa65dec2b5bc28be430a03ca46f91b7991dc91957cfd219198d6913516fdc392aa88cf5230275e7853e854fc650 SHA512 24bcf70033603527cbf3369358cad093bc3a7cc3336a8ccd2363d0caa801dd9d57da39e8cf184c12183d1b93916af758dd980cbfe59569ec7f499b78719304f3
-EBUILD namd-2.9-r1.ebuild 2523 BLAKE2B 94a739af09d0a0dcbb112d6c477a1769e83b6c2d8f7ba6496574e6557fc0a6114e1de6c221ddb0da50c53aeb41c5d79f746368fb7aeab8b538d24836f88e076f SHA512 1c53db643c5cd3224f434d6c1867d986d2242bc461f6cf32061188663f07e611ef04f149657256b308fff69b72e7b636a571357fd8afc0e3d0704dc336220bee
-MISC metadata.xml 375 BLAKE2B 0970cbb58c880e8bfefdbda68c046b45adc4325d1fe3bb51aa975f38d06a4e028ce8dc41691eff8e3298f23f2c9b73b83f7c9b26b0d3055437b3d4c0618f5596 SHA512 da64c8ba453ccf6ba5997af7c60bb4873f6f5e0379fc0c3787e77dd46fef945d3c4bd5d06d62a071526324ed6b3e1b7287d9f2e68f141042d12a469ef4e46757
+DIST NAMD_2.10_Source.tar 35287040 BLAKE2B cc48198cd5f0490709899dd1e3c819c2caaf6f160bc5b5d7b77a18fdb63a4b9e365c99169ce8b19eb5ad139d4adb10e350985bc31f43b0abf965cb0d494fd84f SHA512 86ac830446436ad695ae61c2fb5857385f9aee01ee38be648a08d00834fd037f7da0ac4b442fcb81ca9e4ebd328344c296d0d810b8cc26ced8408be488c90b5a
+EBUILD namd-2.10.ebuild 2638 BLAKE2B a208ad09f8d8c79311551ad2515eb19fc97cb8987c469f902719178f15c38dc2853d58b0f7469ec45cda864a3af1c2f9d6f160edd1af05def46428179db4834b SHA512 78c1148e6f4e6f161121fbc1942c16e69db4ee6aec849034a72cede783138a0cee536e14b41713146fd6fc586f4e02df41e38abd5565d5071ad5066860b2636e
+MISC metadata.xml 376 BLAKE2B 04d5215096c154f2414dc0475c6510a66b6978bd85169311d4b17303bafea893f8e3c2afb83080d72492c5dc82a62b2522ca079e300c917c00e439da932fee68 SHA512 578a3221496eb1470d9fcac9e784f62bb39591448a35a24e1881b5be69473689770bbc928c5779b76bed8c657b1e44d929093e6a39812d135199e37a0e8938e2
diff --git a/sci-chemistry/namd/files/namd-2.10-gentoo.patch b/sci-chemistry/namd/files/namd-2.10-gentoo.patch
index e578c131c36d..ffef6dc3ad68 100644
--- a/sci-chemistry/namd/files/namd-2.10-gentoo.patch
+++ b/sci-chemistry/namd/files/namd-2.10-gentoo.patch
@@ -22,7 +22,7 @@ diff -Naur NAMD_2.10_Source.orig/arch/Linux-x86_64.tcl NAMD_2.10_Source/arch/Lin
  TCLINCL=-I$(TCLDIR)/include
  #TCLLIB=-L$(TCLDIR)/lib -ltcl8.5 -ldl
 -TCLLIB=-L$(TCLDIR)/lib -ltcl8.5 -ldl -lpthread
-+TCLLIB=-L$(TCLDIR)/gentoo-libdir -ltcl8.5 -ldl -lpthread
++#TCLLIB=-L$(TCLDIR)/gentoo-libdir -ltcl8.5 -ldl -lpthread
  TCLFLAGS=-DNAMD_TCL
  TCL=$(TCLINCL) $(TCLFLAGS)
  
diff --git a/sci-chemistry/namd/files/namd-2.9-gentoo.patch b/sci-chemistry/namd/files/namd-2.9-gentoo.patch
deleted file mode 100644
index 583cc52645df..000000000000
--- a/sci-chemistry/namd/files/namd-2.9-gentoo.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-diff -Naur NAMD_2.9_Source.original/Make.charm NAMD_2.9_Source/Make.charm
---- NAMD_2.9_Source.original/Make.charm	2012-02-29 19:12:11.000000000 -0700
-+++ NAMD_2.9_Source/Make.charm	2013-09-13 21:23:26.000000000 -0600
-@@ -2,5 +2,5 @@
- # The config script will override this setting if there is a directory
- # called charm-6.4.0 or charm in the NAMD base directory.
- 
--CHARMBASE = /Projects/namd2/charm-6.4.0
-+CHARMBASE = /usr/include/charm-6.4.0
- 
-diff -Naur NAMD_2.9_Source.original/Makefile NAMD_2.9_Source/Makefile
---- NAMD_2.9_Source.original/Makefile	2012-04-27 09:53:24.000000000 -0600
-+++ NAMD_2.9_Source/Makefile	2013-09-13 21:30:15.000000000 -0600
-@@ -344,10 +344,10 @@
- 	$(DSTDIR)/stringhash.o
- 
- # definitions for Charm routines
--CHARMC = $(CHARM)/bin/charmc
--CHARMXI = $(CHARM)/bin/charmc
--CHARMINC = $(CHARM)/include $(COPTD)CMK_OPTIMIZE=1
--CHARMLIB = $(CHARM)/lib
-+CHARMC = /usr/bin/charmc
-+CHARMXI = /usr/bin/charmc
-+CHARMINC = /usr/include/gentoo-charm $(COPTD)CMK_OPTIMIZE=1
-+CHARMLIB = /usr/gentoo-libdir
- CHARM_MODULES = -module NeighborLB -module HybridLB -module RefineLB -module GreedyLB
- #CHARM_MODULES = -module msa -module NeighborLB -module HybridLB -module RefineLB -module GreedyLB
- #MSA = -DCHARM_HAS_MSA
-@@ -370,7 +370,7 @@
- 
- # Add new executables here.
- 
--BINARIES = namd2 psfgen sortreplicas charmrun flipdcd flipbinpdb
-+BINARIES = namd2 psfgen sortreplicas flipdcd flipbinpdb
- 
- # This should be rebuilt at every compile, but not on Win32.
- BUILDINFO = $(DSTDIR)/buildinfo
-@@ -386,7 +386,7 @@
- 
- namd2:	$(MKINCDIR) $(MKDSTDIR) $(OBJS) $(LIBS)
- 	$(MAKEBUILDINFO)
--	$(CHARMC) -verbose -ld++-option \
-+	$(CHARMC) $(LDFLAGS) -verbose -ld++-option \
- 	"$(COPTI)$(CHARMINC) $(COPTI)$(INCDIR) $(COPTI)$(SRCDIR) $(CXXOPTS)" \
- 	"$(CHARM_MODULES)" -language charm++ \
- 	$(BUILDINFO).o \
-@@ -402,16 +402,9 @@
- 	$(EXTRALINKLIBS) \
- 	-lm -o namd2
- 
--charmrun: $(CHARM)/bin/charmrun # XXX
--	$(COPY) $(CHARM)/bin/charmrun $@
--
- $(LIBCUDARTSO):
- 	$(COPY) $(CUDASODIR)/$(LIBCUDARTSO) $@;
- 
--WINDOWSBINARIES = namd2.exe psfgen.exe sortreplicas.exe
--# WINDOWSBINARIES = namd2.exe psfgen.exe charmd.exe charmd_faceless.exe charmrun.exe
--windowsbinaries: $(WINDOWSBINARIES)
--
- namd2.exe:  $(MKINCDIR) $(MKDSTDIR) $(OBJS) $(LIBS) $(TCLDLL)
- 	$(MAKEBUILDINFO)
- 	$(CHARMC) -verbose \
-@@ -434,11 +427,8 @@
- charmd_faceless.exe:
- 	$(COPY) $(CHARM)/bin/charmd_faceless.exe charmd_faceless.exe
- 
--charmrun.exe:
--	$(COPY) $(CHARM)/bin/charmrun.exe charmrun.exe
--
- psfgen:	$(MKDSTDIR) $(SBOBJS) $(PLUGINOBJS)
--	$(CC) $(SBCFLAGS) -o psfgen $(SBOBJS) $(PLUGINOBJS) $(TCLLIB) $(TCLAPPLIB) -lm
-+	$(CC) $(SBCFLAGS) $(LDFLAGS) -o psfgen $(SBOBJS) $(PLUGINOBJS) $(TCLLIB) $(TCLAPPLIB) -lm
- 
- psfgen.exe:	$(MKDSTDIR) $(SBOBJS) $(PLUGINOBJS) $(TCLDLL)
- 	$(CC) $(SBCFLAGS) -o psfgen $(SBOBJS) $(PLUGINOBJS) $(TCLLIB) $(TCLAPPLIB) -lm
-@@ -456,7 +446,7 @@
- 	$(CC) $(CFLAGS) -o diffbinpdb $(SRCDIR)/diffbinpdb.c -lm
- 
- flipdcd:	$(SRCDIR)/flipdcd.c
--	$(CC) $(CFLAGS) -o $@ $(SRCDIR)/flipdcd.c || \
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(SRCDIR)/flipdcd.c || \
- 	echo "#!/bin/sh\necho unavailable on this platform" > $@; \
- 	chmod +x $@
- 
-@@ -466,7 +456,7 @@
- 	chmod +x $@
- 
- fixdcd:	$(SRCDIR)/fixdcd.c
--	$(CC) $(CFLAGS) -o fixdcd $(SRCDIR)/fixdcd.c
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o fixdcd $(SRCDIR)/fixdcd.c
- 
- dumpdcd:	$(SRCDIR)/dumpdcd.c
- 	$(CC) $(CFLAGS) -o dumpdcd $(SRCDIR)/dumpdcd.c
-@@ -665,9 +655,7 @@
- 
- DOC_FILES = README.txt announce.txt license.txt notes.txt
- 
--RELEASE_FILES = $(LIBCUDARTSO) flipdcd flipbinpdb sortreplicas psfgen charmrun namd2
--
--WINDOWS_RELEASE_FILES = $(LIBCUDARTSO) $(WINDOWSBINARIES) $(TCLDLL)
-+RELEASE_FILES = $(LIBCUDARTSO) flipdcd flipbinpdb sortreplicas psfgen namd2
- 
- release: all
- 	$(ECHO) Creating release $(RELEASE_DIR_NAME)
-@@ -678,17 +666,9 @@
- 	for f in `find $(RELEASE_DIR_NAME)/lib -name CVS`; do \
- 	  /bin/rm -rf $$f; \
- 	done
--	if [ -r $(CHARM)/bin/charmd ]; then \
--	  $(COPY) $(CHARM)/bin/charmd $(RELEASE_DIR_NAME); \
--	fi
--	if [ -r $(CHARM)/bin/charmd_faceless ]; then \
--	  $(COPY) $(CHARM)/bin/charmd_faceless $(RELEASE_DIR_NAME); \
--	fi
- 	chmod -R a+rX $(RELEASE_DIR_NAME)
- 	tar cf $(RELEASE_DIR_NAME).tar $(RELEASE_DIR_NAME)
- 	gzip $(RELEASE_DIR_NAME).tar
--	echo $(CHARM)
--	ls -l $(CHARM)/lib
- 	-for f in $(RELEASE_FILES); do echo $$f; $(LDD) $(RELEASE_DIR_NAME)/$$f; done
- 
- winrelease: winall
-diff -Naur NAMD_2.9_Source.original/arch/Linux-x86_64.fftw NAMD_2.9_Source/arch/Linux-x86_64.fftw
---- NAMD_2.9_Source.original/arch/Linux-x86_64.fftw	2009-02-21 21:16:04.000000000 -0700
-+++ NAMD_2.9_Source/arch/Linux-x86_64.fftw	2013-09-13 20:55:02.000000000 -0600
-@@ -1,7 +1,7 @@
- 
--FFTDIR=/Projects/namd2/fftw/linux-x86_64
-+FFTDIR=/usr
- FFTINCL=-I$(FFTDIR)/include
--FFTLIB=-L$(FFTDIR)/lib -lsrfftw -lsfftw
-+FFTLIB=-L$(FFTDIR)/gentoo-libdir -lsrfftw -lsfftw
- FFTFLAGS=-DNAMD_FFTW
- FFT=$(FFTINCL) $(FFTFLAGS)
- 
-diff -Naur NAMD_2.9_Source.original/arch/Linux-x86_64.tcl NAMD_2.9_Source/arch/Linux-x86_64.tcl
---- NAMD_2.9_Source.original/arch/Linux-x86_64.tcl	2011-06-17 14:38:43.000000000 -0600
-+++ NAMD_2.9_Source/arch/Linux-x86_64.tcl	2013-09-13 20:56:30.000000000 -0600
-@@ -1,9 +1,9 @@
- 
- #TCLDIR=/Projects/namd2/tcl/tcl8.5.9-linux-x86_64
--TCLDIR=/Projects/namd2/tcl/tcl8.5.9-linux-x86_64-threaded
-+TCLDIR=/usr
- TCLINCL=-I$(TCLDIR)/include
- #TCLLIB=-L$(TCLDIR)/lib -ltcl8.5 -ldl
--TCLLIB=-L$(TCLDIR)/lib -ltcl8.5 -ldl -lpthread
-+TCLLIB=-L$(TCLDIR)/gentoo-libdir -ltcl8.5 -ldl -lpthread
- TCLFLAGS=-DNAMD_TCL
- TCL=$(TCLINCL) $(TCLFLAGS)
- 
diff --git a/sci-chemistry/namd/metadata.xml b/sci-chemistry/namd/metadata.xml
index dc42d24f9afb..2fe5325ae7fa 100644
--- a/sci-chemistry/namd/metadata.xml
+++ b/sci-chemistry/namd/metadata.xml
@@ -5,7 +5,7 @@
 		<email>nicolasbock@gentoo.org</email>
 		<name>Nicolas Bock</name>
 	</maintainer>
-<maintainer type="project">
+	<maintainer type="project">
 		<email>sci-chemistry@gentoo.org</email>
 		<name>Gentoo Chemistry Project</name>
 	</maintainer>
diff --git a/sci-chemistry/namd/namd-2.10.ebuild b/sci-chemistry/namd/namd-2.10.ebuild
index d67280b8d0f1..624d3292621d 100644
--- a/sci-chemistry/namd/namd-2.10.ebuild
+++ b/sci-chemistry/namd/namd-2.10.ebuild
@@ -1,18 +1,17 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
+
+MY_PN="NAMD"
 
 inherit eutils multilib toolchain-funcs flag-o-matic
 
 DESCRIPTION="A powerful and highly parallelized molecular dynamics code"
-LICENSE="namd"
 HOMEPAGE="http://www.ks.uiuc.edu/Research/namd/"
+SRC_URI="${MY_PN}_${PV}_Source.tar"
 
-MY_PN="NAMD"
-
-SRC_URI="${MY_PN}_${PV}_Source.tar.gz"
-
+LICENSE="namd"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
@@ -25,6 +24,7 @@ RDEPEND="
 	dev-lang/tcl:0="
 
 DEPEND="${RDEPEND}
+	virtual/pkgconfig
 	app-shells/tcsh"
 
 NAMD_ARCH="Linux-x86_64-g++"
@@ -33,6 +33,13 @@ NAMD_DOWNLOAD="http://www.ks.uiuc.edu/Development/Download/download.cgi?PackageN
 
 S="${WORKDIR}/${MY_PN}_${PV}_Source"
 
+PATCHES=(
+	# apply a few small fixes to make NAMD compile and
+	# link to the proper libraries
+	"${FILESDIR}"/namd-2.10-gentoo.patch
+	"${FILESDIR}"/namd-2.7-iml-dec.patch
+)
+
 pkg_nofetch() {
 	echo
 	einfo "Please download ${MY_PN}_${PV}_Source.tar.gz from"
@@ -46,16 +53,14 @@ pkg_nofetch() {
 src_prepare() {
 	CHARM_VERSION=$(best_version sys-cluster/charm | cut -d- -f3)
 
-	# apply a few small fixes to make NAMD compile and
-	# link to the proper libraries
-	epatch "${FILESDIR}"/namd-2.10-gentoo.patch
-	epatch "${FILESDIR}"/namd-2.7-iml-dec.patch
+	default
+
 	sed \
 		-e "/CHARMBASE =/s:= .*:= /usr/bin/charm-${CHARM_VERSION}:" \
 		-i Make.charm || die
 
 	# Remove charm distribution. We don't need it.
-	rm -f charm-*.tar
+	rm -f charm-*.tar || die
 
 	# proper compiler and cflags
 	sed \
@@ -80,13 +85,14 @@ src_configure() {
 
 src_compile() {
 	# build namd
-	cd "${S}/${NAMD_ARCH}"
-	emake
+	cd "${S}/${NAMD_ARCH}" || die
+	TCLLIB="$($(tc-getPKG_CONFIG) --libs tcl) -ldl -pthread" \
+		emake
 }
 
 src_install() {
 	dodoc announce.txt license.txt notes.txt
-	cd "${S}/${NAMD_ARCH}"
+	cd "${S}/${NAMD_ARCH}" || die
 
 	# the binaries
 	dobin ${PN}2 psfgen flipbinpdb flipdcd
diff --git a/sci-chemistry/namd/namd-2.9-r1.ebuild b/sci-chemistry/namd/namd-2.9-r1.ebuild
deleted file mode 100644
index 869c1ec2f182..000000000000
--- a/sci-chemistry/namd/namd-2.9-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs flag-o-matic
-
-DESCRIPTION="A powerful and highly parallelized molecular dynamics code"
-LICENSE="namd"
-HOMEPAGE="http://www.ks.uiuc.edu/Research/namd/"
-
-MY_PN="NAMD"
-
-SRC_URI="${MY_PN}_${PV}_Source.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RESTRICT="fetch"
-
-RDEPEND="
-	>=sys-cluster/charm-6.5.1-r2
-	sci-libs/fftw:3.0
-	dev-lang/tcl:0="
-
-DEPEND="${RDEPEND}
-	app-shells/tcsh"
-
-NAMD_ARCH="Linux-x86_64-g++"
-
-NAMD_DOWNLOAD="http://www.ks.uiuc.edu/Development/Download/download.cgi?PackageName=NAMD"
-
-S="${WORKDIR}/${MY_PN}_${PV}_Source"
-
-pkg_nofetch() {
-	echo
-	einfo "Please download ${MY_PN}_${PV}_Source.tar.gz from"
-	einfo "${NAMD_DOWNLOAD}"
-	einfo "after agreeing to the license and then move it to"
-	einfo "${DISTDIR}"
-	einfo "Be sure to select the ${PV} version!"
-	echo
-}
-
-src_prepare() {
-	CHARM_VERSION=$(best_version sys-cluster/charm | cut -d- -f3)
-
-	# apply a few small fixes to make NAMD compile and
-	# link to the proper libraries
-	epatch "${FILESDIR}"/namd-2.9-gentoo.patch
-	epatch "${FILESDIR}"/namd-2.7-iml-dec.patch
-	sed \
-		-e "s:charm-.\+:charm-${CHARM_VERSION}:" \
-		-i Make.charm || die
-
-	# Remove charm distribution. We don't need it.
-	rm -f charm-6.4.0.tar || die
-
-	# proper compiler and cflags
-	sed \
-		-e "s/g++.*/$(tc-getCXX)/" \
-		-e "s/gcc.*/$(tc-getCC)/" \
-		-e "s/CXXOPTS = .*/CXXOPTS = ${CXXFLAGS} ${LDFLAGS}/" \
-		-e "s/COPTS = .*/COPTS = ${CFLAGS} ${LDFLAGS}/" \
-		-i arch/${NAMD_ARCH}.arch || die
-
-	sed \
-		-e "s/gentoo-libdir/$(get_libdir)/g" \
-		-e "s/gentoo-charm/charm-${CHARM_VERSION}/g" \
-		-i Makefile || die "Failed gentooizing Makefile."
-	sed -e "s@/lib@/$(get_libdir)@g" -e '/FFTDIR=/s@=.*@=/usr@' -i arch/Linux-x86_64.fftw3 || die
-	sed -e "s/gentoo-libdir/$(get_libdir)/g" -i arch/Linux-x86_64.tcl || die
-}
-
-src_configure() {
-	# configure
-	./config ${NAMD_ARCH} --with-fftw3 --charm-arch . || die
-}
-
-src_compile() {
-	# build namd
-	cd "${S}/${NAMD_ARCH}"
-	emake
-}
-
-src_install() {
-	dodoc announce.txt license.txt notes.txt
-	cd "${S}/${NAMD_ARCH}"
-
-	# the binaries
-	dobin ${PN}2 psfgen flipbinpdb flipdcd
-}
-
-pkg_postinst() {
-	echo
-	einfo "For detailed instructions on how to run and configure"
-	einfo "NAMD please consults the extensive documentation at"
-	einfo "http://www.ks.uiuc.edu/Research/namd/"
-	einfo "and the NAMD tutorials available at"
-	einfo "http://www.ks.uiuc.edu/Training/Tutorials/"
-	einfo "Have fun :)"
-	echo
-}
diff --git a/sci-chemistry/parassign/Manifest b/sci-chemistry/parassign/Manifest
index 28f90f4b6207..7f53bcc9a2a9 100644
--- a/sci-chemistry/parassign/Manifest
+++ b/sci-chemistry/parassign/Manifest
@@ -1,3 +1,3 @@
-DIST PARAssign_Linux_x64_86.tgz 76693208 SHA256 56a322a8825c13cd3e7d90998471c47fb6062e79e2d20108b4fb6ed24664c89d SHA512 63018b0f1e3ce7821cebb90cd59ef5fdfa44b7ce6776956184b55a6247009f5e9df435332772dfa0db7294308c4d930ff0104daf45a46df709fb132dac10bd79 WHIRLPOOL 87ae85974f2a84c3814d261390e011f7ef2a012881df15f0f8ba4a7b5e88992e7932f12566847eaa38958394f7a243a4f0d536375e4640377d6f183e793bccc5
+DIST PARAssign_Linux_x64_86.tgz 76693208 BLAKE2B 9141b7f3e6b50efd84cfc2af13c170946220b3f02f90422c4759a6aab8073a0d28cf44e045f305f392055816e50052826dd403f1d71ff7edb04950bf5dfc5f2b SHA512 63018b0f1e3ce7821cebb90cd59ef5fdfa44b7ce6776956184b55a6247009f5e9df435332772dfa0db7294308c4d930ff0104daf45a46df709fb132dac10bd79
 EBUILD parassign-20130522.ebuild 1375 BLAKE2B cc8f36979dab81d6f1d19112631e37365ed4408943fc5173aabd3c9e4db53e5c155123d1874438d5caabbd9dae6328b6f2e494ed6285d6b66b516cb6f95d93cb SHA512 7634d41463024be7606e63cd6fda1a9645c5fea48922232e1b404fe486416e89a454ea63220772ba75a327cf4c03140beef332f857c3a283063cd4687abadd46
 MISC metadata.xml 1646 BLAKE2B 91f42dd65912632e8f19f6a2dfd6a5e4ea7e2be8c270516db4c5477841a78263352ec9f52c971e6a70e3ee32e86d952505068167cce62ec80e40b3b5d6566173 SHA512 73b07789bffc4fb45c5c3ca5c6b3e7fc75e358fc8a73b2cc2d76e8faf5bc1f2765fb1dcbdb2dcc34a21123d3f99bd8fc61ec3ca4a10e6887f26863b93fc1db1f
diff --git a/sci-chemistry/platon/Manifest b/sci-chemistry/platon/Manifest
index 1558eaba5892..71f76fe2b799 100644
--- a/sci-chemistry/platon/Manifest
+++ b/sci-chemistry/platon/Manifest
@@ -1,3 +1,3 @@
-DIST platon-20151001.tar.gz 12076455 SHA256 0f693de9b8ef601bc502d56a203c851ee350185e0816ede4b1b4d154917fa5b2 SHA512 fc93e4c425c25ddc9ae634c82b63e95c5ce99bcbada43976478a58783e3b369f082e08e2ee24ff7d9ebe2d9d2d730cd42f6361276a53bed9edd0c0476cfb5148 WHIRLPOOL 458e6a263958473bf39d460524fb98963e701d96050db5c622a6cb934796271bb45313526614b3bd28ce372e7bd6a60d76cb6aaa8e80d1e18d7fdc436a03b702
+DIST platon-20151001.tar.gz 12076455 BLAKE2B fbf814f849da46ebb19eef9c2ed18be964df06986c04fc42bd1b582023bc6115332e30f7c172f0d2e9e5e0fd473eaac2c996c0dd494e8e5b6d99c66295cf1ea9 SHA512 fc93e4c425c25ddc9ae634c82b63e95c5ce99bcbada43976478a58783e3b369f082e08e2ee24ff7d9ebe2d9d2d730cd42f6361276a53bed9edd0c0476cfb5148
 EBUILD platon-20151001.ebuild 1746 BLAKE2B bda6585f3ce9dc264ee28df298055574e37b623498d21979ca43bb0ede90f71e652496a1f27fa71369aa99a7b24e1d97519776dea515d69eca8c1cc94e427de9 SHA512 7f9eba83b8287737f0a0552948917ab0469bca08b99425aebbb6475e547cdbaf682269c867001cc9b081af7c4d4a0eab2b6a77ef4ff60cbbcd63b82958e58c4c
 MISC metadata.xml 265 BLAKE2B d5a98b9309829a0486c4b8a4336c2d24a0fe34e926d52afd0cc87e16fcc887ca4c18851e58afb33866823121fa8f221a90e0d726dbd85552a4caf66cf03b7b4a SHA512 470f6c178e88c4e83afa46d5e901a45fc2427a779ae832df7fa2d6e25e9e8b4ce77cd3a8fe191e6242d6df3b673f0de6b4f90f1e147aa8b8dd566f18163cc73a
diff --git a/sci-chemistry/procheck/Manifest b/sci-chemistry/procheck/Manifest
index 7ed52be3b47f..a9fa95fbab46 100644
--- a/sci-chemistry/procheck/Manifest
+++ b/sci-chemistry/procheck/Manifest
@@ -1,7 +1,7 @@
 AUX procheck-3.5.4-close.patch 1073 BLAKE2B 54e9857e3d3ee920becebfc50da34145384046be019a2fcd01d47afc4f9242a5311aac166dcde7dc79de584c2ea08bd8e766ae58310700bff45f6bb1a2829abf SHA512 3d18df23858acc46a12f884d4904ca3f60e05e663746e768f5f08d0370b2e335cfde09c08566c4869adfa0f9c0d75ae527fe0ed2666f603818b11f91a3349307
 AUX procheck-3.5.4-ldflags.patch 1649 BLAKE2B 64506db2dbe1eba43dfc07bca233d573646ac553862e8d6eecce7970362047cfd8fdcd18f7c83bb74a0476fde78222ea92e0c2a56b24fba2d71d9c97c563fbb1 SHA512 f7f2e06a77058f7e743a1c1367d40c2683a2aefbf2910a807d1b0a77d19024446f978ec34a8e5187338a7e98b6651592a37c024e8a2ea955d9bd736d47bfeb4f
-DIST procheck-3.5.4-README 6585 SHA256 202d5b4d9ffaebdad19c368e6e6fd8ab54744c511609b1c609ef46c21fa0ffa0 SHA512 c6eff94cef9b67fd61884e88fa77ec381553d4dba53f477023738e1e44a6191c4241b14543ee7ecb93b049f16f262db2a09cf5d1a63248057633aab290f1f82a WHIRLPOOL 53a618978a9285e8a8f09c7ebd3e34951a8c1056c0894c1f4e4c11f73ad3127829322c9c7597fc6dea98f1fa4c40552e6caf383eed15aaeef0594cf93887d196
-DIST procheck-3.5.4-manual.tar.gz 517840 SHA256 3c2faa505be05102ccbe23473abdddc1cd4dc87c6b5e74222b7ea5c27b18db5a SHA512 0fa9c7d50b7ca43c626d5261c524166938d3a92be1d02221721bc7ce7e91ac4919e7200b946ce563f9bb696d7dab9588c1d1b31a4d551cafa2f2bce4931a212c WHIRLPOOL 591afad0a534762d654779722b229e3dcb9cc1ed0f9216c443d4872dd7379257638e5cf3ee5844adf15b2ec55d5c5b15ab585ae52ae993678311985642aa8eaf
-DIST procheck-3.5.4.tar.gz 522013 SHA256 4923fe5a7b86d5369fd639d0c77cfb866e574f076ec8c52424d746e843a404f4 SHA512 1dd78b53070484fbcdca51001fd147ab13fd5e51b3d1da54fd529531917c31012393751ee514f0c79d579b17a1701dde04f81b1c9ac27b2b835a43fa96785ecc WHIRLPOOL 2732981bdbb5269567019a645b401009bd48d782ab20b4f68bd213a90f7248a9fa3f46ab3a026aa0515a677a99826040d4c3f5464816ed4390b5091a6a98b375
+DIST procheck-3.5.4-README 6585 BLAKE2B c61606848f30728b67d2ab51e0beadec1c30aaa0ca65a68834bff3ed3e3f466e34a0e4b64323e80cce9cee83854650ebe0805abf0509c0a9154bf08e3e0a2d6b SHA512 c6eff94cef9b67fd61884e88fa77ec381553d4dba53f477023738e1e44a6191c4241b14543ee7ecb93b049f16f262db2a09cf5d1a63248057633aab290f1f82a
+DIST procheck-3.5.4-manual.tar.gz 517840 BLAKE2B 33c5da5888bcd263e900cf2839f9287373e032fdde234e0375af061ec1c588d1ea5d2718da2a050da8060ba4003748a8fef3ff35b22f424c1cf6a1892aec0fe6 SHA512 0fa9c7d50b7ca43c626d5261c524166938d3a92be1d02221721bc7ce7e91ac4919e7200b946ce563f9bb696d7dab9588c1d1b31a4d551cafa2f2bce4931a212c
+DIST procheck-3.5.4.tar.gz 522013 BLAKE2B be6764bc741ec3f868aee349fc7e23608c612758029d0b745c421f40b47c896dd48de84ee7df6d09a64a20695bd5a1ed0a96464e6dcaf44de03da1ae231787f8 SHA512 1dd78b53070484fbcdca51001fd147ab13fd5e51b3d1da54fd529531917c31012393751ee514f0c79d579b17a1701dde04f81b1c9ac27b2b835a43fa96785ecc
 EBUILD procheck-3.5.4-r3.ebuild 1687 BLAKE2B 3df4bc2e08ae6847995258c2640ecd044ec5bea0bf7817744f28d4a35aa9d8e80de36ded759ef7552f3bf679072883deb395fbf882de64d48ad05bedd1e7abe5 SHA512 abc659dbe5947b16259e05128c5e0607fdbe3c251595b7c5589502c8d6465264bfec243820abec345980d66cfe0b3eaa8183a41aeb2e2a8a81a929b0128364e7
 MISC metadata.xml 271 BLAKE2B a446884cbe7a6789e0bcd82759f57bf1ab7b29c5ab714057ffa821c90f799d1fa9f9310c187ee4c3a8ae2476f6ea9d15f368045779f1581e68d02802c61c884c SHA512 3e6e6047a29e07123b81279cae1de17bc4bd4c3d7d8a8d26560114a18185f473d038fc220fa81c7213fa203ce197bad8b1c272d9b7e41cd770a953fa6308ff92
diff --git a/sci-chemistry/pymol-plugins-caver/Manifest b/sci-chemistry/pymol-plugins-caver/Manifest
index 2d16fc100f73..5388ae4253d2 100644
--- a/sci-chemistry/pymol-plugins-caver/Manifest
+++ b/sci-chemistry/pymol-plugins-caver/Manifest
@@ -1,3 +1,3 @@
-DIST Caver2_1_2_pymol_plugin.zip 5698331 SHA256 1dcc61ba13247c05710c4cd68491d0c867ce1d0c11c824be85a516250b2874e3 SHA512 9d28e059bb20f30cf6a0d25ed2eb080dcf9dbb753e9d4578d95e293b31c5cf5fe23d5177dccdb79c192ab3e65bb484b6eb22b26c267637b125404f871e01a52c WHIRLPOOL 33e6893d2114b5ce197fc098d09dfc67ce88f38741e30f1fa574873836c636b5e0c180301849fd98f1f93de5ce51554d2245d0bd615b938d39a802e91e68ebb9
+DIST Caver2_1_2_pymol_plugin.zip 5698331 BLAKE2B e1accfaea6faf1e8c545b88c965228ccb62710d4015ff681506971feba6bd18a4a8b0b6e6caf621c99830ba529a6ec17873cdd3d5e52ad6dc6f67d9457e4eb87 SHA512 9d28e059bb20f30cf6a0d25ed2eb080dcf9dbb753e9d4578d95e293b31c5cf5fe23d5177dccdb79c192ab3e65bb484b6eb22b26c267637b125404f871e01a52c
 EBUILD pymol-plugins-caver-2.1.2.ebuild 1288 BLAKE2B ce2e6c424bee9349df90469712a966233287dd6c982a1adb00c659eead5d1f00f03a1a95bac7c49b22acd4cae49289e335a41fcc9d525bb4979547a0ec064a9a SHA512 7afa7038ef1fdbdc04120f15ac85a58152429d8f3cd03408c67355ffc6c825e4accc6f503b2522c7702851db421f46f3a28f7d8ce070c02848ba01e24c871d79
 MISC metadata.xml 271 BLAKE2B a446884cbe7a6789e0bcd82759f57bf1ab7b29c5ab714057ffa821c90f799d1fa9f9310c187ee4c3a8ae2476f6ea9d15f368045779f1581e68d02802c61c884c SHA512 3e6e6047a29e07123b81279cae1de17bc4bd4c3d7d8a8d26560114a18185f473d038fc220fa81c7213fa203ce197bad8b1c272d9b7e41cd770a953fa6308ff92
diff --git a/sci-chemistry/shelx/Manifest b/sci-chemistry/shelx/Manifest
index 6c981e7abb5f..257bf462dbf7 100644
--- a/sci-chemistry/shelx/Manifest
+++ b/sci-chemistry/shelx/Manifest
@@ -1,20 +1,20 @@
-DIST anode_amd64.bz2 8758937 SHA256 01568fd23b0abe280de7a286b9885182f10f06829f139e46bac75846276f60c7 SHA512 6d9f0e506531e14956a95ed23c4c5ccfabaf79b92feba237923db2731e9f3861163f6039e556a6976d910075558fae120088c4805f09880ff33955eff86cc2e1 WHIRLPOOL af181735822c8d04187f98d06f3be2d563cb3e81571fb81139e384a38b54ca7cc83d10a10564456fffb6eead5ab52833f9002882632634fd5a2f8f450d99ca8c
-DIST anode_x86.bz2 4310241 SHA256 520f96803bb0ae7d2e7411187968bb38edadad42f06c22af4f89ee2fd4c95886 SHA512 344e25564d4e0d94764c536625c9be3f4a4b8be74153f17f07254f798e9ebbfe416d069a082906187ba0ec7ab958adf8c7c1ec0afab7a6b146fe02a0b5b88505 WHIRLPOOL 3f349040d1ac9af4323cb091e1b2eb37aff6fe5a1202e65adc9119d1ed141406b5a6792852050061e06253411cb409aebc07c3eb50a26bfa5064ed897ba8da9f
-DIST ciftab_amd64.bz2 1409694 SHA256 47c4b4349b2534e5d98d499fb92322bfc0ded5c893a7f6c58c58dbcfb84d1b86 SHA512 7f2439cf5d7afefaf9df0a2e0ab970076ea3f65d1e394aa0a81340e4cae0cbcbd25169a5e490c8269cfdc92fe9d1240d9d0a2949322b48c339f7556173e83428 WHIRLPOOL 68dc54ee8c1f8ab5b84f0857fd1e21afd6e5417c949bcae74e9b76e3e13aeae0318c200f5716f02759a8a9b45089d6810d6bba658f43e7f300a28c7f010c224f
-DIST ciftab_x86.bz2 510941 SHA256 d27dd5b21e85f77508f01da71c7f8e2cdadc75169eed362324a697938c02e992 SHA512 185628c888e74e7f7ae69eccb3195d841eab83616449c3358dd3fb49605f6bb9e86e97959cf6d20b424037746b67332ad98b9a41ca2a7fae7e3cbe503bf71127 WHIRLPOOL c121e9350b8bbfcb8cf87c4404e9485b678603943702eebfd07627441c47af95a00d457a49440c8fd65ac8fe625e09e35bd1ce8ead6c12af900dc5fbc56188a7
-DIST shelxc_amd64.bz2 1512555 SHA256 e4da94ecc95a8636b28e50254497a7e519313628106f4fe92869e238f659019f SHA512 11b382c6a8440052ffaf136f5c4695d7f6d10e184334810d0f9b7ff25a782c424ae3509a0bbacabddb152b56e6fdfea7266f9c395d0a39994a8c02bd650625ca WHIRLPOOL f6a7f92278741f19e4a19d4a278588770d50d1d9eac30ba96a285ba10add72613532b1cd5f3ffa28e270e654f252e4cf12939abb1458c70d166569e1dd36fbd4
-DIST shelxc_x86.bz2 614564 SHA256 0e8a4fd16a73f28b77e53225d3d6f1038aae1971dca5910043fa04a5818c6e61 SHA512 5be05948e5b79a44e4ead25deba9b1b08857a4636e4c2f8cdc832f6bb2c2407122adff393035f91ce24b48b025191582b919771052f56ebd7a06aaf66dc82115 WHIRLPOOL 6292394d47017524ecd8d3b809ff87793f718e8e3303e6b221c6b27ae4c7da562cff9945d23dd4112509f34f7c3e83cd4d73728c6ee26ffb7efc7b85a3f19aa0
-DIST shelxd_amd64.bz2 8773698 SHA256 fa7c103c0156ad060e7b66b6f39de8982d660a715a07584d2c1a1853d171d3c0 SHA512 6cb881a937e461edf9c9e7736bfab164e6dc16c4df4291b8dce69b3abf98ce27fadb8079cc5142d2b77eb94ac42c0bb375f3ac21b45f590d535839cc7f8cd762 WHIRLPOOL c4b3b8b7f9d78e15153b4f3678ef8766cdc97cc3c03686b528a40b98d45233612c0104aaa3ec491cd20e787d834965056b10bfa3fc247fc1a4aaee4c0739162d
-DIST shelxd_x86.bz2 4406371 SHA256 0b0da50c0907f97e93b46bbd01e63737c007b1b93aa3a79d471621d39557e74f SHA512 68d11983f98984bfaca089b839d38cc9607857d2bb6d2cff306d9efa2f34ea8d741220eb01a99d2ecdd832dde1794b4bb228ceae3fc0e87e3210dfa491e6a402 WHIRLPOOL 6cb3343aa878a5703a65b93f6dd1255ebc668afad92117441a785a91dd39d1736a10411655b08da7ff714bed7ed423e30555b8436c9a7df9f49f8ea3351f651e
-DIST shelxe_amd64.bz2 8302570 SHA256 fac87ba983a454cb32f76076318dabbf6ae2f98415cf2428a0154765b3401915 SHA512 cbafde59ba1d9943f74e8c66cc012168f1f8062e978d2f9103adb4d130c9a024e3e8b170af5b5207168f23db4742b4a99ce3b550e897c59e1dfd3631d7d6c6ab WHIRLPOOL 0007c53e4a9bb8e546b625a2565a9e5d01d60b35c8565e34ab753033c16f1c1b61cdfbe2129ff4981cb595cf637f08342b0d77c22ea8836e08df6b671ac6d2e4
-DIST shelxe_x86.bz2 4177233 SHA256 b2bff78b9b51b72e545d23ce76f6b93e016c2cd583aee9d7236b99fd1722d280 SHA512 67d56beef36918ec6b5d86109d2e61a0dc5a34ed73174ba5cdf96e0db8d8d41cdf20bffdee138f6f177e30a9df32aa1494c18221139538e5c778d61d5f558c51 WHIRLPOOL d8e4be4f7b7a313f5586c23a3d5c94dc2b177b36b47025219c5d54985fd41d7ffb902db4d2a1060ae0ce0448d59032782309029096449af76b5df6253db52e81
-DIST shelxl_amd64.bz2 2985452 SHA256 7e7bf32d5dcfa0e8bb0390add8dcc1d0e722012188dd3d124f255ed9e9c13208 SHA512 0c5b5e4bf6041399221a2f321a3e8f3def952a6eb9af26652a8af04c4bedf5cb98aa529c11e84da20c061028701a49af960135ac697ae157609ca8ae8acde219 WHIRLPOOL a5f7a2e118d5582cafa76c1abea86b614e48e1e8ed217e1280b770124eb16f247ef668112031b5a7660af098b51be94b2f53d0fb506dc090e1615ec7204ce712
-DIST shelxl_x86.bz2 1610822 SHA256 b7a28fb6318cb16948c06e7aed8ee7a7c6a5d3a8863c57f657fbbd2007b25955 SHA512 deaeed15676f294088ce07dc3760e2eecca503f87a537e3e9598d1de6102e82f25b2bd46c080e5140a35046847c345845a88adf159197be640ba52b1a790cfec WHIRLPOOL 5998b3909232016e4cfb99a112090e07a926e36442d47e6c7aa09d50d830eeeb21d2732cd962d01672b76b120cca51df400532805e971ee6b2a6c9d13692582d
-DIST shelxs_amd64.bz2 1606403 SHA256 9b180574ee2b828123f622d42e307778d8d4a1f4c32d5741ba065ad2b7751e60 SHA512 3d26e8bc10f0004ee52a564be567db0cdf41f7d05d457e66c12e117bb82550066bf7333830f8dcd56ea987de677f365db25a51f4c22efda9c911fda03d49086e WHIRLPOOL 7e02ede8528e752f1a01d3109064914d42d6c83e4d8c0e901e13e9e1345160d087f35568d1f7ff7f61f54fdbf838a6e8b2d8ab9482df27fd561cc7f4dad610d7
-DIST shelxs_x86.bz2 746352 SHA256 3eea6b363f7e2ff90965a01b65f3aa5d4ac5642a1528a7824c3ea8398c272d2b SHA512 9ecf1e8da8df2280a1982c210dea5418004492047fdd3ab004eade39d247199f3c757d00a56d179eadc7a1ce434c8019c39af865b641ae3c370a8461a950140c WHIRLPOOL 5120481aefcaa3871e61dc2f9230095506386de83741e3e5fc7cdf29f2835509ae369276b55252b981907a76b59f3829e0c4ab1738605e5c6f72ff58401157d2
-DIST shelxt_amd64.bz2 8862210 SHA256 519c695b8f6c0425f2635dc021be8138ef029761a43d64133a5d736cccc031b8 SHA512 49cb7b5e9f3a1cab153dd04ce4ab424f3331790df2e4acf0584263edcd28e20f6225a6f48161469e1569ae0d6eeed5389db0c9a66d7853ea34b798364a346e27 WHIRLPOOL 11a821502863cddedb14377f8881b7a7931970f8ce9da668106a5dee6e7113fa6f41f69c9381e7ea4c93aa21a6c3498ba4c836df9289db7295c54e6267faa92c
-DIST shelxt_x86.bz2 4441488 SHA256 ca64d86718d306d8d5269f0d7ca92fc2921f1a199afa1bc181b5f6cc339a012c SHA512 83027d24d58863030a284e5e573df27db760ce61f7c8d7da5741471bd814256ae5ade1316aa3e262a54c4c4fb6ad231dacfcef043c3279d381d2969e0b73dd14 WHIRLPOOL ec91f0e6d192507854cbcc2baa751c17185df70f2220eab8f487a1db082bc055aefe2b5f437e144fbbf60c01f1d735057c07ff2f71ab77c88c13a1a19ffe7a65
-DIST shredcif_amd64.bz2 1371002 SHA256 eddf6237b70114bab99845c228d5ba6240a2a9e019bf59678f2222e2ddc52cfe SHA512 5846f7a14936ae4c710ead752a83dd8d73bbcd6037c38f2c566156f87678a84c1db3fd5d0a6e3c6dfb04a2ed7c96c8497c36faaf2bf2ca99ace74f98152ba3be WHIRLPOOL 11b82847cd4f3529c7708de7d0ae7da4e741a58da58ac01954e7136ca2f02c599a81485c70ff36916cdce97e86ab67efe61ec544231db9d7ad903edfd68e232b
-DIST shredcif_x86.bz2 461442 SHA256 aa06e0b3f2b7face7f486029d4c83e9fd591c46b2a41db6ce8e3014f6a713d78 SHA512 8097b6285d3e9269989663e52a4d903b279f9cdd0a5650c91d605dd324c62361de619c0873968a3178d3c125f59a9b448465a09542e2582779fbb8cca1f9ebf7 WHIRLPOOL 37f9410d1fcf2881b3e83b752d5170859ebab2063da8124715d5f627a83b9ef2ba4694a2a77a213e8c1b92d474304a7aea83b1f03111fd2abbb3fcd13d054052
+DIST anode_amd64.bz2 8758937 BLAKE2B a5ef69be49149d7dddaa99a51f435a22df6820a8a8c9b641335bc5fa4b969e470454523b6cc34fe64d03f447af946cdbdad22ef6784a49dbb2261650c221c9b5 SHA512 6d9f0e506531e14956a95ed23c4c5ccfabaf79b92feba237923db2731e9f3861163f6039e556a6976d910075558fae120088c4805f09880ff33955eff86cc2e1
+DIST anode_x86.bz2 4310241 BLAKE2B 5220c6b0438a08af27cc0094178f0dfecd3b528c324f79f3dedffda40facd502cbe8d65c8bd2338f9246c8eb215d22e2cfddbe2117bc8e6320573a8fa39db82d SHA512 344e25564d4e0d94764c536625c9be3f4a4b8be74153f17f07254f798e9ebbfe416d069a082906187ba0ec7ab958adf8c7c1ec0afab7a6b146fe02a0b5b88505
+DIST ciftab_amd64.bz2 1409694 BLAKE2B bfc56d37954f3571eb0419e525c79576023b54fee40db9d29fa9e1b7d1145c13dc73de362e16cffdb6cba1cb28960c0fd0d5fca5abeeb8bd6f953d5ad17d803f SHA512 7f2439cf5d7afefaf9df0a2e0ab970076ea3f65d1e394aa0a81340e4cae0cbcbd25169a5e490c8269cfdc92fe9d1240d9d0a2949322b48c339f7556173e83428
+DIST ciftab_x86.bz2 510941 BLAKE2B eaf458bb7123ca2e8d6c7525f5796f1062b4b94974754e4e340caf5c580ca4ca6b714090c21a7371bbe15d777e48853e9a6b96da8e5155f11ecbeba81593f9f0 SHA512 185628c888e74e7f7ae69eccb3195d841eab83616449c3358dd3fb49605f6bb9e86e97959cf6d20b424037746b67332ad98b9a41ca2a7fae7e3cbe503bf71127
+DIST shelxc_amd64.bz2 1512555 BLAKE2B 6bdddb74b719f73d1225ca2956e3ef86ac38fcdeebf3b56899d4c73213295d60efb5526a8fb2b9db7c2891ff36a83d596d9416d6e2f4be2e86cc031637666100 SHA512 11b382c6a8440052ffaf136f5c4695d7f6d10e184334810d0f9b7ff25a782c424ae3509a0bbacabddb152b56e6fdfea7266f9c395d0a39994a8c02bd650625ca
+DIST shelxc_x86.bz2 614564 BLAKE2B 8b45373bf8392cea08c816acda7af0ba4a3ad776d88cafe8ca1cd4ba3c6a241493b5f403e48c5526458a7eb93de808c6bdeb04da8eed801f149eb19f6c95adae SHA512 5be05948e5b79a44e4ead25deba9b1b08857a4636e4c2f8cdc832f6bb2c2407122adff393035f91ce24b48b025191582b919771052f56ebd7a06aaf66dc82115
+DIST shelxd_amd64.bz2 8773698 BLAKE2B 4cdd16ab39c2be996f282d70b247abd391de59814c3330d46ce446bcf8a9dee5464d95c74ee87b087d3ebb2227c5b7c8b4f852a5f09db8a55460a4656ffa4d0e SHA512 6cb881a937e461edf9c9e7736bfab164e6dc16c4df4291b8dce69b3abf98ce27fadb8079cc5142d2b77eb94ac42c0bb375f3ac21b45f590d535839cc7f8cd762
+DIST shelxd_x86.bz2 4406371 BLAKE2B 78f083b86c05b2081d80310d1a10ad24a2c1ad581423fc32cb7e83dba482076143d3bf23edd2a109d70d3ae5b615563a10fd8f6fbdf7e85bfafee5d123eaae94 SHA512 68d11983f98984bfaca089b839d38cc9607857d2bb6d2cff306d9efa2f34ea8d741220eb01a99d2ecdd832dde1794b4bb228ceae3fc0e87e3210dfa491e6a402
+DIST shelxe_amd64.bz2 8302570 BLAKE2B 7a662c9d1ac3ab73d6266b763b5bab2ce9d865d4dfc742485032406711e4ecbf5e3b733cdaf0726111d30b39d2390ae976fcc69187a721cdba5987d82b4e213c SHA512 cbafde59ba1d9943f74e8c66cc012168f1f8062e978d2f9103adb4d130c9a024e3e8b170af5b5207168f23db4742b4a99ce3b550e897c59e1dfd3631d7d6c6ab
+DIST shelxe_x86.bz2 4177233 BLAKE2B 48ad55d206c9e6ff40c136bce798b6b0ef2d3b17468911b0ecaa5a2e668972c7b46ea6a4f5408b016d298fd17ef7122e3b32238feb095dc7e2e251e7bb6cdcec SHA512 67d56beef36918ec6b5d86109d2e61a0dc5a34ed73174ba5cdf96e0db8d8d41cdf20bffdee138f6f177e30a9df32aa1494c18221139538e5c778d61d5f558c51
+DIST shelxl_amd64.bz2 2985452 BLAKE2B cd5e64c07a302735c771a7fa29612d75134bedf9af443be6218632bcd11f33ba355e67a0b690b2d66bf4014d629d4928146d28d536f672630d7f7286dbee0577 SHA512 0c5b5e4bf6041399221a2f321a3e8f3def952a6eb9af26652a8af04c4bedf5cb98aa529c11e84da20c061028701a49af960135ac697ae157609ca8ae8acde219
+DIST shelxl_x86.bz2 1610822 BLAKE2B 027c1f52175446a6952695df2c9869cb4d38813e92e782920d75e40299f1883f562d465bfe52b8eeab6de9aa2e516d3651ff8fbe716e4646a8250c33ae4d7cc8 SHA512 deaeed15676f294088ce07dc3760e2eecca503f87a537e3e9598d1de6102e82f25b2bd46c080e5140a35046847c345845a88adf159197be640ba52b1a790cfec
+DIST shelxs_amd64.bz2 1606403 BLAKE2B adaf69454a60832daa27f73801f7fe43e704231c9a6a0af9eea45b4a04a0dc239a5962f9fc1fd686cde6ec9797241c8172fde5233b731cee2829ba1bfdcc16de SHA512 3d26e8bc10f0004ee52a564be567db0cdf41f7d05d457e66c12e117bb82550066bf7333830f8dcd56ea987de677f365db25a51f4c22efda9c911fda03d49086e
+DIST shelxs_x86.bz2 746352 BLAKE2B d391c82a284321e23c150ebeeb2d8b6ce26c18b2ba208431cba72d5369e932fc712eee21169c95fd3bf28296c235cf7193cef28861237efc4d58d18614a23258 SHA512 9ecf1e8da8df2280a1982c210dea5418004492047fdd3ab004eade39d247199f3c757d00a56d179eadc7a1ce434c8019c39af865b641ae3c370a8461a950140c
+DIST shelxt_amd64.bz2 8862210 BLAKE2B 9ed422923af05a21933ebc53fd15223291e6672a8c0b56757201d20c555eec60f98c4d94d7230e588083bf00a1775d447d9de24be13a99221b045109239efd17 SHA512 49cb7b5e9f3a1cab153dd04ce4ab424f3331790df2e4acf0584263edcd28e20f6225a6f48161469e1569ae0d6eeed5389db0c9a66d7853ea34b798364a346e27
+DIST shelxt_x86.bz2 4441488 BLAKE2B 5b51964c24a24af6c96acca547efad75b95a7896550bf3e8de6a6811f6879a28ff4f5cb1f08a01fd022774a6ea1f4e13c98529eeebfc6548de4879faafff2f3a SHA512 83027d24d58863030a284e5e573df27db760ce61f7c8d7da5741471bd814256ae5ade1316aa3e262a54c4c4fb6ad231dacfcef043c3279d381d2969e0b73dd14
+DIST shredcif_amd64.bz2 461442 BLAKE2B 547335d13a57a22693f361183bac8d8f9564202bb219b8a419949ce2d9487f940fa5d5b840c2b2fe50adce0b0ff79a780e660757373d27d888b1bb545f9bf900 SHA512 8097b6285d3e9269989663e52a4d903b279f9cdd0a5650c91d605dd324c62361de619c0873968a3178d3c125f59a9b448465a09542e2582779fbb8cca1f9ebf7
+DIST shredcif_x86.bz2 461442 BLAKE2B 547335d13a57a22693f361183bac8d8f9564202bb219b8a419949ce2d9487f940fa5d5b840c2b2fe50adce0b0ff79a780e660757373d27d888b1bb545f9bf900 SHA512 8097b6285d3e9269989663e52a4d903b279f9cdd0a5650c91d605dd324c62361de619c0873968a3178d3c125f59a9b448465a09542e2582779fbb8cca1f9ebf7
 EBUILD shelx-20141228.ebuild 1093 BLAKE2B fef0b656bffa33a4be13e34d101b1e55f4eec5d6ae790971a6919e0a753f3c28783e0b6480641d9815204fd84d1b4d2495dd0538746a021189dec6d4503918e3 SHA512 4e35de5c607eebb0484e8144cb34e03040efe733e7fbeace80d99efca1aecca1a13a1bfe1a01c6ad20d7f7c0e14a318603dc839ef5172752920c759325119919
 MISC metadata.xml 271 BLAKE2B a446884cbe7a6789e0bcd82759f57bf1ab7b29c5ab714057ffa821c90f799d1fa9f9310c187ee4c3a8ae2476f6ea9d15f368045779f1581e68d02802c61c884c SHA512 3e6e6047a29e07123b81279cae1de17bc4bd4c3d7d8a8d26560114a18185f473d038fc220fa81c7213fa203ce197bad8b1c272d9b7e41cd770a953fa6308ff92
diff --git a/sci-chemistry/tinker/Manifest b/sci-chemistry/tinker/Manifest
index 35f7a27e12aa..cf7d425fd094 100644
--- a/sci-chemistry/tinker/Manifest
+++ b/sci-chemistry/tinker/Manifest
@@ -1,5 +1,4 @@
-AUX 7.1.2-openmp.patch 400 BLAKE2B e5baaa263b5312b18fcaf22f911b80012ee61b85024db009b71cee79912249a31bf5734ab6904a576f2c67c38f60624743b6b47c5ef5f0eb33c6c49c7f5c981e SHA512 1af405acc753d602501589725374e88964a55e5954cb77eb1f3c0156fa73936552be9ce5fc4f36c855dfbd4043f12749dfc95aa9b946d80d0e5e6e8100e84ad4
-AUX tinker-7.1.2-build.patch 360 BLAKE2B 89fb7ec8c8d02ce43b9882afe7b33fef86118e381be44395fc60d36ecbda69fc39eb9390efedb5ed010774a471be81e2eae9e4322f71a7d24f4b14d7840e4410 SHA512 b20a4d8e75a781cd9c769dd0b5ae4e1039ea54d7ac61fc3605543b796afa2f4f3957be439f338fd47090a17e9153a466c2f76b364f4d9b7a2705b746f6cefbd3
-DIST tinker-7.1.2.tar.gz 28468683 SHA256 fdee18915cff9044fd083bb2271083c221db6d05de2cb98fc111b136e23e6899 SHA512 4524259754b0f11d7e2e8997ebd85eae7d28f8dbb1edb2d9818aa0a96640de0049aa4937236694f1a11743dee187d612f775b233a73cc96c2708d620457a7dc2 WHIRLPOOL f3e29eaf67d25ae6d4f3c4e3546798e66bd626929fddd45b9d1ff9f2143cd57dcc5079226f3ceaa142f4c6a168c4a150a51be1336a5ca13384338795ef3a6d46
-EBUILD tinker-7.1.2.ebuild 2275 BLAKE2B a1dc5de1493731ba73d38f5f66c7318985bb1be56e09f52de1d3242b95e1dbde7242faa8427762999881371057aac64930f8f01a9a7a6c9f61ae723d418b7a5e SHA512 d617f08cf03f35e78f0561214dcc0c7c4af0fedce69214a302ca8dee2c2a3577ba002671f4cce8a86cb3ca76084ce99eff6a2e90ecfc940c7aa56fd588edda2c
+AUX 8.2.1-openmp.patch 559 BLAKE2B 254a7b5d5d40bec938420527ad77e4ec96b9cee50392137eab3370df35a00a00b9488b5cd95c4e3c52d4904a6093216a782f52c82c2141cd913c6cf10f2fbcc7 SHA512 799b488ddba95ec75c2f5f97bdba10e297cad12d23239354b7d66af47b4e9ef1496e8f6b8a7446f85827a8303105af7552616bc865a4e8114b89d3e6e3302ed6
+DIST tinker-8.2.1.tar.gz 33015410 BLAKE2B 0b7c94662248761459cf9d681056f5cf9c4d669a790a522f23f800bf355235f6a9f392e008b13d14cf1e17d9725abb6512077c24ff7772108d69c9cf35b43e6e SHA512 5039078781d1ce226456882dd95ad15715f1e91829d26efcdb29ceedc213973883699eb6710b0a162a74208809305b7fee734b175139e6df63d0460fe5751ae7
+EBUILD tinker-8.2.1.ebuild 2247 BLAKE2B ae2b50605eb32edd748884e731dffad61b56c3c4e620cb6db071b032045591cf40ac9ce086e5be8c275f26f863760505edd4cf095233d944a3abb5963aa55e6c SHA512 276d8152b83db1709590fc7be373da5732c81413945f61cccff8135025ff367985f238ae4569a561556a91b748826a3b910ca47cc2d011863bcd5002de514a79
 MISC metadata.xml 265 BLAKE2B d5a98b9309829a0486c4b8a4336c2d24a0fe34e926d52afd0cc87e16fcc887ca4c18851e58afb33866823121fa8f221a90e0d726dbd85552a4caf66cf03b7b4a SHA512 470f6c178e88c4e83afa46d5e901a45fc2427a779ae832df7fa2d6e25e9e8b4ce77cd3a8fe191e6242d6df3b673f0de6b4f90f1e147aa8b8dd566f18163cc73a
diff --git a/sci-chemistry/tinker/files/7.1.2-openmp.patch b/sci-chemistry/tinker/files/7.1.2-openmp.patch
deleted file mode 100644
index f3e8e2932b4a..000000000000
--- a/sci-chemistry/tinker/files/7.1.2-openmp.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/source/initial.f b/source/initial.f
-index 835f228..4099c74 100644
---- a/source/initial.f
-+++ b/source/initial.f
-@@ -73,8 +73,8 @@ c
- c
- c     Intel compiler extensions to OpenMP standard
- c
--!$    call kmp_set_stacksize_s (2**28)
--!$    call kmp_set_blocktime (0)
-+!    call kmp_set_stacksize_s (2**28)
-+!    call kmp_set_blocktime (0)
- c
- c     values of machine precision constants
- c
diff --git a/sci-chemistry/tinker/files/8.2.1-openmp.patch b/sci-chemistry/tinker/files/8.2.1-openmp.patch
new file mode 100644
index 000000000000..17199f9d4cfa
--- /dev/null
+++ b/sci-chemistry/tinker/files/8.2.1-openmp.patch
@@ -0,0 +1,18 @@
+ source/initial.f | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/source/initial.f b/source/initial.f
+index ff6ed54..9769a81 100644
+--- a/initial.f
++++ b/initial.f
+@@ -85,8 +85,8 @@ c
+ c     Intel compiler extensions to OpenMP standard, 268435456 bytes is
+ c     2**28 bytes, or 256 MB; comment these lines for other compilers
+ c
+-c!$   call kmp_set_stacksize_s (268435456)
+-c!$   call kmp_set_blocktime (0)
++!$   call kmp_set_stacksize_s (268435456)
++!$   call kmp_set_blocktime (0)
+ c
+ c     values of machine precision constants
+ c
diff --git a/sci-chemistry/tinker/files/tinker-7.1.2-build.patch b/sci-chemistry/tinker/files/tinker-7.1.2-build.patch
deleted file mode 100644
index d6ef484b19a4..000000000000
--- a/sci-chemistry/tinker/files/tinker-7.1.2-build.patch
+++ /dev/null
@@ -1,17 +0,0 @@
- make/Makefile | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/make/Makefile b/make/Makefile
-index 61d5037..9be384a 100644
---- a/make/Makefile
-+++ b/make/Makefile
-@@ -719,8 +719,7 @@ EXEFILES = alchemy.x \
- %.x: %.o libtinker.a
- 	${F77} ${LINKFLAGS} -o $@ $^ ${LIBS}; strip $@
- 
--all:
--	${EXEFILES}
-+all: ${EXEFILES}
- 
- install:
- 	rename
diff --git a/sci-chemistry/tinker/tinker-7.1.2.ebuild b/sci-chemistry/tinker/tinker-8.2.1.ebuild
index 46a8d2feb0f2..5dfafe90e1f4 100644
--- a/sci-chemistry/tinker/tinker-7.1.2.ebuild
+++ b/sci-chemistry/tinker/tinker-8.2.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit eutils flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs
 
@@ -35,9 +35,9 @@ pkg_setup() {
 }
 
 src_prepare() {
-	sed 's:strip:true:g' -i ../make/Makefile
-	[[ $(tc-getFC) =~ "ifort" ]] || epatch "${FILESDIR}"/${PV}-openmp.patch
-	cd .. && epatch "${FILESDIR}"/${P}-build.patch
+	sed 's:strip:true:g' -i ../make/Makefile || die
+	[[ $(tc-getFC) =~ "ifort" ]] && eapply "${FILESDIR}"/${PV}-openmp.patch
+	default
 }
 
 src_compile() {
@@ -75,7 +75,7 @@ src_compile() {
 	emake \
 		-f ../make/Makefile \
 		BINDIR="${S}"/../bin \
-		rename
+		rename_bin
 }
 
 src_test() {
diff --git a/sci-chemistry/xdsstat-bin/Manifest b/sci-chemistry/xdsstat-bin/Manifest
index 1ff1ff810bde..72ba3ccee7cb 100644
--- a/sci-chemistry/xdsstat-bin/Manifest
+++ b/sci-chemistry/xdsstat-bin/Manifest
@@ -1,4 +1,4 @@
 DIST xdsstat-linux32.bz2 235255 SHA256 366b9565a172b9ab756e1669a353003c74b9e0341bba5b1822fef775a35e1290 SHA512 233c25b60501f794887a09960e2e8377c0443bce661c769624d8afcde288b58968b3406cc7e1bb02f0de010f4e6555ef0641fd5ebcfdd5f6396ec21a22c32985 WHIRLPOOL a304fd23eaf3d8292f3bc414e6bc1c1b5895590b4235e637d357a4a462c91939195fd99764b4233775f1dd6d65601391d4c6328fe578734dae498e6f382e96f7
 DIST xdsstat-linux64.bz2 256555 SHA256 45408d09cb13ec664e863863ec66a1cece204308e074f29f54f922d804f042f9 SHA512 d5b3043bec30a17f6960308d642a3721f7a73bc851a71ec28a813b5a98f2de4f215d3603e8da4a9bcb949cfa15030c3eac108bc5549ebdef6737885e60dbd626 WHIRLPOOL 5d81ba5998e6c527978f10e0aa2ded7c8ada53beb6340ba592d74b34a64a81e17c0184d101dc7698d4771458d0e27559fb857fd329be8eb95a4f75136f549790
-EBUILD xdsstat-bin-140225.ebuild 699 BLAKE2B 4914accd4c94e3204d9010f3c713a6e3212a116094963f94b26b991c436a0514facde9b4954eb82967a23fcdcdea5897ce3f585c7c7dc07544604bc0d5b1178c SHA512 2bf1fff52d13808c572730a81b07bc8ee60d83acdd1b51e86ef30e9ba0a8a20694ca50a724d3d765aec7fc2e46cbb306ec926564f2821601bc95991b4a169a6a
+EBUILD xdsstat-bin-171217.ebuild 699 BLAKE2B 4c07388295f1ff2eee05a315ded1aa65c5b6e15702d18a89110d45f67a637dce498ff13d6b1217b19045d2cddd537012a47726ae7a378322fae1e08a510faff9 SHA512 3ddf37bb9d00fc624c43a5294bd38ce4adeb245e88152b1522134d0fe6fc8300372290d0935b65504a5784ea9d35bcc510626a5e6d280349121dcaa55086dfee
 MISC metadata.xml 271 BLAKE2B a446884cbe7a6789e0bcd82759f57bf1ab7b29c5ab714057ffa821c90f799d1fa9f9310c187ee4c3a8ae2476f6ea9d15f368045779f1581e68d02802c61c884c SHA512 3e6e6047a29e07123b81279cae1de17bc4bd4c3d7d8a8d26560114a18185f473d038fc220fa81c7213fa203ce197bad8b1c272d9b7e41cd770a953fa6308ff92
diff --git a/sci-chemistry/xdsstat-bin/xdsstat-bin-140225.ebuild b/sci-chemistry/xdsstat-bin/xdsstat-bin-171217.ebuild
index 57619af5341b..e21153211331 100644
--- a/sci-chemistry/xdsstat-bin/xdsstat-bin-140225.ebuild
+++ b/sci-chemistry/xdsstat-bin/xdsstat-bin-171217.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 MY_PN="${PN/-bin}"
 
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index 26018bb82b6c..e54b4079a202 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
diff --git a/sci-electronics/quartus-prime-lite/Manifest b/sci-electronics/quartus-prime-lite/Manifest
index e4c85ab4b8ee..5017b91b1a01 100644
--- a/sci-electronics/quartus-prime-lite/Manifest
+++ b/sci-electronics/quartus-prime-lite/Manifest
@@ -1,7 +1,7 @@
 AUX quartus-prime-lite-15.1.0.185-qenv-lib32.patch 483 BLAKE2B e08066d40ccec48e11a25e702a21360de691c680963d4b582074656d86ea5074676e8fb8e18f9b939664479f444e6eed2c5577b613ad91c9f8630c5972201d53 SHA512 8f2e5d7115a021ab370d74743206f333410a7f35f9bd8f7a468271f2df80facb23d6c2337fc6b425e880354197238571f9a9d9f35a33e2b9bb536c19c98a33c7
 AUX quartus-prime-lite-15.1.0.185-vso-launcher.patch 647 BLAKE2B 5e86aad1d455f4b02dc303ccbd29bd5c22054538c7f1ae78c049ab94ba9dbb8249eb836aa828e3280243066f3cff0e82aea0bfdb55555f33d09ee8aa042e7923 SHA512 19669bf8fd963eab8ab51188e867ed85ea5f0fb151fc82b158a2ab307c6b0ef56b0cd11441fb252b7f70b06d0f7bf8792e6857a62e7ffcd796b1d9d1a156c6e7
-DIST Quartus-lite-15.1.0.185-linux.tar 5969776640 SHA256 fd670ee4caee69e9533b7a826af1040bc0e35ef68ca1b43e73d8b69cbf14c7f4 SHA512 7996bc9e0561b650c0318d608b4f59560dd631e3a38c403105f797049c395ce25a0ff5d4346cf6e91338fa297d7e8752ef5a3f83f496d4431ad3591de4335045 WHIRLPOOL 1549939fc9e7ce94b9b2c3032db78ff66ca1f4542831fe15fadb83ba0efab4305430924ed0ac3d47288f7ae85c4b75818c87a5399a6868adcee606e20388d894
-DIST libfreetype.so.6 785880 SHA256 42685704d5c8bb5f1f5fdb3eaeab68a9229c43f18e7e66cbffebc60808161425 SHA512 4b0ae581df3ecc0117d8b12405d7e5203d1ec40e965c39dade16c4b5495e95c71c2c5d739ccfec7c4c90dd2f48c004f4ae49497c46927adc81c98ead52978be1 WHIRLPOOL 1a4281ca8385d5be8376d2d1b3e6c35f2eebf15265d144255aecd90beb8eac1be778e58f8dc8db65f2a8bf57cead849dc552854bc4d0a07a0e3cf6183e3b28c1
+DIST Quartus-lite-15.1.0.185-linux.tar 5969776640 BLAKE2B 622060e053a9d7a91fe9b4b61f6ebf1289f3849e666b20bca801f0bd752dac0f551c7aa2b8d16b6238b6df2b174f8d352bbc2e3a2a9e270735c5581dd81420f5 SHA512 7996bc9e0561b650c0318d608b4f59560dd631e3a38c403105f797049c395ce25a0ff5d4346cf6e91338fa297d7e8752ef5a3f83f496d4431ad3591de4335045
+DIST libfreetype.so.6 785880 BLAKE2B a9c724a213d6211e954c20ea203feeacd384768bf34929719326d2a98e166c91114f4a60b223efd770ccf356662c8664c91d4bf4722325c01d310a10e3026f30 SHA512 4b0ae581df3ecc0117d8b12405d7e5203d1ec40e965c39dade16c4b5495e95c71c2c5d739ccfec7c4c90dd2f48c004f4ae49497c46927adc81c98ead52978be1
 EBUILD quartus-prime-lite-15.1.0.185-r1.ebuild 2683 BLAKE2B 901edbf9f6a062ebfa3d5ded00f5450d17fdf837b2b3938c3db55513495e7f13873f3cb82f80b746213f227f8f3f1ae66717d55ae7783c5a839659ca49723fca SHA512 23c805238f55e3d9eb6267d27fc1ebc03ac869fa7ffd3db9af466b3661ae70ffffba3dae95a2a918af578ae8751755ed83e503e4073ae71ba1f42c051be0c71b
 EBUILD quartus-prime-lite-15.1.0.185.ebuild 1412 BLAKE2B 152081298c6ea6c474a424ab9508b1ebcfd0ce7d15d5375d741e70a5a6eeb597234dbc5d8b9c58e994506861a38a92b86cde7a113d0b82afce1b865275224bc6 SHA512 b00bb2ea9b8ff2bfbf313507bcb558a453e80198fc6257cb1e28d5f0da32f1cacd1d25a509dfa8b0e01ff192897301e3f77555c0070cacd6cccb1784a1dcf9a5
 MISC metadata.xml 530 BLAKE2B 4f025f0370c7a420a40d8ec1c1f8b763e0c34e307cdf544fc9e3383fbd88a9fae04c7329249764e0a7452011424d042429abb3b92edcdf9b188ea713f8e96ff7 SHA512 fb3cb51e8996744184ad6777620c2fd3f299f40e291c43363784d7827258895ba9eba481e7c9e7cdf0629028ad04d6b8e19ee6cbfa0e629ed1ae7f9a6fb83361
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 4065d819683f..73a98a11f825 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/gsl/Manifest b/sci-libs/gsl/Manifest
index 71dcd4e29514..edb57d4a6650 100644
--- a/sci-libs/gsl/Manifest
+++ b/sci-libs/gsl/Manifest
@@ -1,14 +1,9 @@
 AUX cblas.pc.in 290 BLAKE2B c967d31982888ca2c180be0fc0691586e3fdbe2527fb54995cd5c85113ec6af8695c69ef9c70fc89ac271b818fb4ec5e53c010ea7e54a3e85712f1f51b9cf423 SHA512 2a1dc22097e2a50fd4a797c446b32202b74e9d754c8b61c51a3789c3eb42372adcc7fb25901c468d604cc4e7961d7f11e0e5883179894047948e46879fc04719
 AUX eselect.cblas.gsl 216 BLAKE2B d1f8be34cac7b83d88f69a3fd382fc68c96a04fc39b1e28ebe93b1a86ab5552cc7e6c559167151927ccddc3d8c1a27de30bc4f1aec96a84d8099d86d78bbb3ad SHA512 e5cd92f4e9829538642a0fed54fdf75bc579c8c20769997ec5a3ce0287993476e68fbeefec8e46162d05ea908d2e79187c15ebdd00f6558ecbd25de21ece64dc
-AUX gsl-1.16-cblas.patch 17458 BLAKE2B 2ebd4f395b8e39c9edf4847f1691e980c43a698c2eba3837f598b4aa0e41d426754f869a52030581806276d4f0759eb598151c5f32f90c0a1236182f5e03ddc2 SHA512 70cae5682bfc7788e6f67ec355b52e291f32c2500b9baf9dd336d7cbb42b5eac4d89ecafeb23c4b478836d3c137d40d47dd17d375708df3c2dd41781a78f56bf
-AUX gsl-2.1-cblas.patch 17467 BLAKE2B a6dc1071f641318f9ce59f5ac58593e57d5f89d50459b33519a033b97753b470d658e11dc4390498c065f0958046e8e02513f15ba946bad7c62ca68864d1366a SHA512 e22ece09ac7f846a4b8e4bec123b974d994a66e47a728b732ebbe9493bbb28be16b2e598504068a6a014fc2921df74e03dc9d8bf418e94be1bd8ce7cf662162c
-AUX gsl-2.3-cblas.patch 58225 BLAKE2B 7e89fd8324283142705c9a0f75bb79ef79e7249caeaf1493d2fdcc3b5950f26f4b1a8fc07bd303fd1cd1c2ae71c5f4f78bb0a83df77fe6b13020845c0b76e329 SHA512 08cd7b0416b8510823e77a73e664d0223e91e2726a45c36f61c79125f919aed0f81fca59aa8121fce1466b7312d0dddd88b95ae92b44ddb9d2d9c00e4afef6d7
+DIST gsl-1.16-cblas.patch.bz2 2810 BLAKE2B 364c9f93a386e5d95c86789a3c00231cdfbe588fe4371ae85447bc6574b7798721a8559fda747ee656de96e7d8c5657901db86dc9c59bcee27789c918222e38f SHA512 55a2dab850697b1e378ecf64d299ed6f021f1b1eb7dbad749f5014e5b7f275ec6c981a5699a87969c4d0794677efa51a5a2317526b58ca96aabb3f6a68cabd81
 DIST gsl-1.16.tar.gz 3534080 BLAKE2B 1c55a41e5ed57b57f671074240d23416aa8f23e3cc2bb832e455d4f44d307e6be6adfa3671dbbf2aa14604ea49f96ff636de7909f3532cdc811f6bd99b0aa59d SHA512 94e998953f30d701e1cd0a5e05d572c5cca7b6f40f0533aa85394ba4218946826408093ffe3049a0ab13d6ba87034fcec1a7d52a67d0b8860dc02b5fd4feb8eb
-DIST gsl-2.1.tar.gz 3827265 BLAKE2B 2b359dc9f74ed69aa033508923cff4541894c26a6d2e5c606ee5cf4e4e95c58d270351998537c8c4f4bc8130ee5870b6f64133ede9079f20d8309d83637164f5 SHA512 d63660fdfae9c9ec9f4fd1894b0af705297cefb6169973ef10faacd0b8a3d52f537508e9c07f4f9f4253138cc48e5570bb10ef303538226d7febd92e8fd184b0
-DIST gsl-2.3.tar.gz 4510731 BLAKE2B 5bc58346340a04f039405d4b256598b14f33e9b4e265c4fb159e691f5ea3372a0f9b7526b6ea6e259d5968ef8e7ce5b4d4e2465a78fb0b42f85a383fdc32d4bf SHA512 ada622079f4ac667d95f74b38aa368726fc1b18fd34555bcefe90920d3da93a9289ebff966be43325af806107001bc8973daf9f8418e6c97b866be2296b566ff
+DIST gsl-2.3-cblas.patch.bz2 12036 BLAKE2B ddad801cc42f925581e2e4995292f3eab0d2faf70c43c3b205fcf521b98e426df1d0824ed7d98b2c4cc89bbc4068fd45f2595dc02d23bded5c702b5a01bbfdb2 SHA512 37b867a21e60cd96c453ae24139bcf16c00c85bb6d5a3dcece81185fd9af5870c5167d2fa3c74cffce55bfb84f72be34d28ea94e0889904f8dda8687f66b4d23
 DIST gsl-2.4.tar.gz 5916715 BLAKE2B f22c07b2d5759a383e05b8bfdba70071672cc27f12ff2a8c755451fe7e10c8e2d80e3fcc601508c5e9942e4cfd05e51c43ba96666326b760e4390eb0c2552886 SHA512 12442b023dd959e8b22a9c486646b5cedec7fdba0daf2604cda365cf96d10d99aefdec2b42e59c536cc071da1525373454e5ed6f4b15293b305ca9b1dc6db130
-EBUILD gsl-1.16.ebuild 3029 BLAKE2B ff7a1e8b163f4d4445e349ee902ceb8a7bc398503cba3c043681a2d8875006ce5dc7b4033f9402fe6c33dd31c7b820dce130f0f88c7a68b1b2ea1f86c5f15091 SHA512 d78ce45caf5879c4b059de54e0aa31706a16f10dccdd30c761b683d55c0a45ab8f96c600e959a2c1bd20b5c0780bf4e389757028cce23126840e1d0a9d84fb60
-EBUILD gsl-2.1.ebuild 3014 BLAKE2B c6ce0c0dc98cc0e0659edc8cb604d35cfcdb8d02f52d710ee65d5434ad657acdbab917b8f79bb2e9f2740c5c60daec58076e4c4d74155e56a8729d22b3466d9a SHA512 6afe40abe12fe25cd6811e2d189369cea098d9943780021e4f298780a8a11f278a2910e47736e9adca39a6521320d7f12ba2e7156e5ccd075f0837b6b9a6cd83
-EBUILD gsl-2.3.ebuild 3127 BLAKE2B 4093f7c58e77161947151fbdf6e31c1093e5b30b33c5042760ef50e7cba90de1b3d2a7541172561b810c286a9fdaa9c9ee879aed7810e2b58a449ab1620816be SHA512 fc380378b8b18fd1bd9484a8f118924b6e13e03c5cc6e6caf8943b88eb78892a965990d9236e2c66e217d9f057bf7050790283a8167682c14b5acd74c0937e58
-EBUILD gsl-2.4.ebuild 3139 BLAKE2B ce0799586c299184109c58162a8cf1b423900c1ae239432bfacb92b816dcd1577732eb3dff620e81820d5d76a6f7d50cdf1fec2a4867dfe1aff945ba3764af2d SHA512 a95655ff57d9c5d044cc44b8f146b0f0c91472d28017e486b8e059d820e804f10d2855520e803a53d37241e04dff10af54f3d8e2012b857a613a13b4f5b3be56
+EBUILD gsl-1.16.ebuild 3086 BLAKE2B 19da52fb104356017ae3cbc824783962ac6262c85496a26f9f5a4e4486a17309b0647e386c98a5e8010efcc82c0fe8cf57cf45d0e9a78a52c113edf4a9323d8c SHA512 47658615b8c9dcb1b43f46f1994d1befa73ca79c737a4acff17061e9413191337522d12c2ee274992e6244304d5479d59f45f573f3d400fdaccbcc419d44a1a8
+EBUILD gsl-2.4.ebuild 3201 BLAKE2B b3277c57be36d13fd4d84c8821226cb12ade83582570f20f70daa0b7683c17839445cd9a2c0b9c7ddd6361159f7d49809d01fcd5f889d8cb38ebe0d6478b9b7b SHA512 07784db20ac72dd1004f0736facbf196db0c648c0a8dc1574f4c6eef4fb3970508408a39d072cb2c050e2bae8bcc95d928dcec964e08e2d554eee1440a769b5a
 MISC metadata.xml 1190 BLAKE2B b9015dc09464b327144a546a0e9dae6e1c5eaf3ce118a24b7ad1853f09af1952284f754aada2436d7e1a1df82638720492445d8f015ccb1cec05c78dd718fc26 SHA512 f56ec87aeb8f257480a631748db79c78193797e1ecd586dbbd78f31a01fbbd3341fa67ffd3244e5dba352478ee552184d6a1d9b5ef5d54d67b038215090eca00
diff --git a/sci-libs/gsl/files/gsl-1.16-cblas.patch b/sci-libs/gsl/files/gsl-1.16-cblas.patch
deleted file mode 100644
index c29ef5294717..000000000000
--- a/sci-libs/gsl/files/gsl-1.16-cblas.patch
+++ /dev/null
@@ -1,294 +0,0 @@
-diff -Nur gsl-1.16.orig/ax_cblas.m4 gsl-1.16/ax_cblas.m4
---- gsl-1.16.orig/ax_cblas.m4	1969-12-31 16:00:00.000000000 -0800
-+++ gsl-1.16/ax_cblas.m4	2013-08-19 15:48:54.376300825 -0700
-@@ -0,0 +1,69 @@
-+AC_DEFUN([AX_CBLAS],[
-+
-+  ext_cblas=no
-+  ext_cblas_libs="-lcblas"
-+  ext_cblas_cflags=""
-+
-+  AC_ARG_WITH(cblas-external,
-+	[AS_HELP_STRING([--with-cblas-external], 
-+			[Use external CBLAS library (default is no)])],
-+	[with_ext_cblas=$withval],
-+	[with_ext_cblas=no])
-+
-+  case $with_ext_cblas in
-+	no) ext_cblas=no ;;
-+	yes) ext_cblas=yes ;;
-+	-* | */* | *.a | *.so | *.so.* | *.o) 
-+	   ext_cblas=yes
-+	   ext_cblas_libs="$with_cblas" ;;
-+	*) ext_cblas=yes
-+	   ext_cblas_libs="-l$with_cblas" ;;
-+  esac
-+
-+  AC_ARG_WITH(cblas-external-libs,
-+	[AS_HELP_STRING([--with-cblas-external-libs=<libs>],
-+			[External cblas libraries to link with (default is "$ext_cblas_libs")])],
-+	[ext_cblas_libs=$withval],
-+	[])
-+
-+  AC_ARG_WITH(cblas-external-cflags,
-+	[AS_HELP_STRING([--with-cblas-external-cflags=<flags>],
-+			[Pre-processing flags to compile with external cblas ("-I<dir>")])],
-+	[ext_cblas_cflags=$withval],
-+	[])
-+
-+  if test x$ext_cblas != xno; then
-+	if test "x$CBLAS_LIBS" = x; then
-+	   CBLAS_LIBS="$ext_cblas_libs"
-+     	fi
-+     	if test "x$CBLAS_CFLAGS" = x; then
-+       	   CBLAS_CFLAGS="$ext_cblas_cflags"
-+   	fi
-+
-+   	CFLAGS_sav="$CFLAGS"
-+   	CFLAGS="$CFLAGS $CBLAS_CFLAGS"
-+   	AC_CHECK_HEADER(cblas.h, ,
-+		[AC_MSG_ERROR([
-+	   	*** Header file cblas.h not found.
-+	   	*** If you installed cblas header in a non standard place,
-+	   	*** specify its install prefix using the following option
-+	   	***  --with-cblas-external-cflags="-I<include_dir>"])
-+	 	])
-+   	CFLAGS="$CFLAGS_sav"
-+
-+   	LIBS_sav="$LIBS"
-+   	LIBS="$LIBS $CBLAS_LIBS -lm"
-+   	AC_MSG_CHECKING([for cblas_sgemm in $CBLAS_LIBS])
-+   	AC_TRY_LINK_FUNC(cblas_sgemm, [ext_cblas=yes],
-+    		[AC_MSG_ERROR([
-+	    	*** Linking with cblas with $LIBS failed.
-+       	    	*** If you installed cblas library in a non standard place,
-+   	    	*** specify its install prefix using the following option
-+	    	***  --with-cblas-external-libs="-L<lib_dir> -l<lib>"])
-+	 	])
-+   	AC_MSG_RESULT($ext_cblas)
-+   	LIBS="$LIBS_sav"
-+	AC_SUBST([CBLAS_CFLAGS])
-+	AC_SUBST([CBLAS_LIBS])
-+ fi
-+])
-diff -Nur gsl-1.16.orig/bspline/Makefile.am gsl-1.16/bspline/Makefile.am
---- gsl-1.16.orig/bspline/Makefile.am	2013-07-17 13:04:26.000000000 -0700
-+++ gsl-1.16/bspline/Makefile.am	2013-08-19 15:25:27.728497742 -0700
-@@ -12,6 +12,6 @@
- 
- TESTS = $(check_PROGRAMS)
- 
--test_LDADD = libgslbspline.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../cblas/libgslcblas.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la ../statistics/libgslstatistics.la
-+test_LDADD = libgslbspline.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la @CBLAS_LINK_LIBS@ ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la ../statistics/libgslstatistics.la
- 
- test_SOURCES = test.c
-diff -Nur gsl-1.16.orig/configure.ac gsl-1.16/configure.ac
---- gsl-1.16.orig/configure.ac	2013-07-19 08:14:45.000000000 -0700
-+++ gsl-1.16/configure.ac	2013-08-19 15:28:24.172640793 -0700
-@@ -191,6 +191,16 @@
-   AC_CHECK_LIB(m, cos)
- fi
- 
-+sinclude(ax_cblas.m4)
-+AX_CBLAS
-+if test "x$CBLAS_LIBS" != "x"; then
-+   CBLAS_LINK_LIBS="$CBLAS_LIBS"
-+else
-+   CBLAS_LINK_LIBS="\$(top_builddir)/cblas/libgslcblas.la"
-+   CBLAS_LIBS="-lgslcblas"
-+fi
-+AC_SUBST(CBLAS_LINK_LIBS)
-+
- dnl Remember to put a definition in acconfig.h for each of these
- AC_CHECK_DECLS(feenableexcept,,,[#define _GNU_SOURCE 1
- #include <fenv.h>]) 
-diff -Nur gsl-1.16.orig/eigen/Makefile.am gsl-1.16/eigen/Makefile.am
---- gsl-1.16.orig/eigen/Makefile.am	2013-07-17 13:04:26.000000000 -0700
-+++ gsl-1.16/eigen/Makefile.am	2013-08-19 15:25:27.728497742 -0700
-@@ -11,7 +11,7 @@
- 
- TESTS = $(check_PROGRAMS)
- 
--test_LDADD = libgsleigen.la  ../test/libgsltest.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la  ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../sys/libgslsys.la ../err/libgslerr.la ../utils/libutils.la ../rng/libgslrng.la ../sort/libgslsort.la
-+test_LDADD = libgsleigen.la  ../test/libgsltest.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la  ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../sys/libgslsys.la ../err/libgslerr.la ../utils/libutils.la ../rng/libgslrng.la ../sort/libgslsort.la
- 
- test_SOURCES = test.c
- 
-diff -Nur gsl-1.16.orig/gsl-config.in gsl-1.16/gsl-config.in
---- gsl-1.16.orig/gsl-config.in	2013-07-17 13:04:26.000000000 -0700
-+++ gsl-1.16/gsl-config.in	2013-08-19 15:25:27.728497742 -0700
-@@ -58,11 +58,11 @@
- 	;;
- 
-     --cflags)
--       	echo @GSL_CFLAGS@ 
-+       	echo @GSL_CFLAGS@ @CBLAS_CFLAGS@ 
-        	;;
- 
-     --libs)
--        : ${GSL_CBLAS_LIB=-lgslcblas}
-+        : ${GSL_CBLAS_LIB=@CBLAS_LIBS@}
- 	echo @GSL_LIBS@ $GSL_CBLAS_LIB @GSL_LIBM@
-        	;;
- 
-diff -Nur gsl-1.16.orig/gsl.pc.in gsl-1.16/gsl.pc.in
---- gsl-1.16.orig/gsl.pc.in	2013-07-17 13:04:26.000000000 -0700
-+++ gsl-1.16/gsl.pc.in	2013-08-19 15:25:27.728497742 -0700
-@@ -2,7 +2,7 @@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
- includedir=@includedir@
--GSL_CBLAS_LIB=-lgslcblas
-+GSL_CBLAS_LIB=@CBLAS_LIBS@
- 
- Name: GSL
- Description: GNU Scientific Library
-diff -Nur gsl-1.16.orig/interpolation/Makefile.am gsl-1.16/interpolation/Makefile.am
---- gsl-1.16.orig/interpolation/Makefile.am	2013-07-17 13:04:26.000000000 -0700
-+++ gsl-1.16/interpolation/Makefile.am	2013-08-19 15:25:27.729497736 -0700
-@@ -10,7 +10,7 @@
- 
- TESTS = $(check_PROGRAMS)
- 
--test_LDADD = libgslinterpolation.la ../poly/libgslpoly.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../cblas/libgslcblas.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-+test_LDADD = libgslinterpolation.la ../poly/libgslpoly.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la @CBLAS_LINK_LIBS@ ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
- 
- test_SOURCES = test.c
- 
-diff -Nur gsl-1.16.orig/linalg/Makefile.am gsl-1.16/linalg/Makefile.am
---- gsl-1.16.orig/linalg/Makefile.am	2013-07-17 13:04:26.000000000 -0700
-+++ gsl-1.16/linalg/Makefile.am	2013-08-19 15:25:27.729497736 -0700
-@@ -12,7 +12,7 @@
- 
- check_PROGRAMS = test
- 
--test_LDADD = libgsllinalg.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-+test_LDADD = libgsllinalg.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
- 
- test_SOURCES = test.c
- 
-diff -Nur gsl-1.16.orig/Makefile.am gsl-1.16/Makefile.am
---- gsl-1.16.orig/Makefile.am	2013-07-17 13:04:26.000000000 -0700
-+++ gsl-1.16/Makefile.am	2013-08-19 15:25:27.729497736 -0700
-@@ -19,13 +19,12 @@
- 
- lib_LTLIBRARIES = libgsl.la
- libgsl_la_SOURCES = version.c
--libgsl_la_LIBADD = $(SUBLIBS)
-+libgsl_la_LIBADD = $(SUBLIBS) @CBLAS_LINK_LIBS@
- libgsl_la_LDFLAGS = -version-info $(GSL_LT_VERSION)
- noinst_HEADERS = templates_on.h templates_off.h build.h
- 
- MINGW32_HOST = @MINGW32_HOST@
- if MINGW32_HOST
--libgsl_la_LIBADD += cblas/libgslcblas.la
- libgsl_la_LDFLAGS += -no-undefined
- endif
- 
-@@ -35,10 +34,10 @@
- bin_PROGRAMS = gsl-randist gsl-histogram
- 
- gsl_randist_SOURCES = gsl-randist.c
--gsl_randist_LDADD = libgsl.la cblas/libgslcblas.la
-+gsl_randist_LDADD = libgsl.la
- 
- gsl_histogram_SOURCES = gsl-histogram.c
--gsl_histogram_LDADD = libgsl.la cblas/libgslcblas.la
-+gsl_histogram_LDADD = libgsl.la
- 
- check_SCRIPTS = test_gsl_histogram.sh pkgconfig.test
- TESTS = test_gsl_histogram.sh pkgconfig.test
-@@ -57,6 +56,8 @@
- 	-e 's|@GSL_CFLAGS[@]|$(GSL_CFLAGS)|g' \
- 	-e 's|@GSL_LIBM[@]|$(GSL_LIBM)|g' \
- 	-e 's|@GSL_LIBS[@]|$(GSL_LIBS)|g' \
-+	-e 's|@CBLAS_CFLAGS[@]|$(CBLAS_CFLAGS)|g' \
-+	-e 's|@CBLAS_LIBS[@]|$(CBLAS_LIBS)|g' \
- 	-e 's|@LIBS[@]|$(LIBS)|g' \
- 	-e 's|@VERSION[@]|$(VERSION)|g'
- 
---- gsl-1.16.orig/multifit/Makefile.am	2013-07-18 06:04:26.000000000 +1000
-+++ gsl-1.16/multifit/Makefile.am	2013-11-22 16:57:26.170330257 +1100
-@@ -13,8 +13,8 @@
- TESTS = $(check_PROGRAMS)
- 
- test_SOURCES = test.c
--test_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../sort/libgslsort.la ../statistics/libgslstatistics.la ../vector/libgslvector.la ../block/libgslblock.la  ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la
-+test_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../sort/libgslsort.la ../statistics/libgslstatistics.la ../vector/libgslvector.la ../block/libgslblock.la  ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la
- 
- #demo_SOURCES = demo.c
--#demo_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../randist/libgslrandist.la ../rng/libgslrng.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la
-+#demo_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../randist/libgslrandist.la ../rng/libgslrng.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la
- 
-diff -Nur gsl-1.16.orig/multimin/Makefile.am gsl-1.16/multimin/Makefile.am
---- gsl-1.16.orig/multimin/Makefile.am	2013-07-17 13:04:26.000000000 -0700
-+++ gsl-1.16/multimin/Makefile.am	2013-08-19 15:25:27.729497736 -0700
-@@ -13,8 +13,8 @@
- TESTS = $(check_PROGRAMS) 
- 
- test_SOURCES = test.c test_funcs.c test_funcs.h
--test_LDADD = libgslmultimin.la ../min/libgslmin.la ../poly/libgslpoly.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-+test_LDADD = libgslmultimin.la ../min/libgslmin.la ../poly/libgslpoly.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
- 
- #demo_SOURCES = demo.c 
--#demo_LDADD = libgslmultimin.la ../min/libgslmin.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../linalg/libgsllinalg.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-+#demo_LDADD = libgslmultimin.la ../min/libgslmin.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../linalg/libgsllinalg.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
- 
-diff -Nur gsl-1.16.orig/multiroots/Makefile.am gsl-1.16/multiroots/Makefile.am
---- gsl-1.16.orig/multiroots/Makefile.am	2013-07-17 13:04:26.000000000 -0700
-+++ gsl-1.16/multiroots/Makefile.am	2013-08-19 15:25:27.729497736 -0700
-@@ -15,5 +15,5 @@
- TESTS = $(check_PROGRAMS)
- 
- test_SOURCES = test.c test_funcs.c test_funcs.h
--test_LDADD = libgslmultiroots.la ../linalg/libgsllinalg.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-+test_LDADD = libgslmultiroots.la ../linalg/libgsllinalg.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
- 
-diff -Nur gsl-1.16.orig/ode-initval/Makefile.am gsl-1.16/ode-initval/Makefile.am
---- gsl-1.16.orig/ode-initval/Makefile.am	2013-07-17 13:04:26.000000000 -0700
-+++ gsl-1.16/ode-initval/Makefile.am	2013-08-19 15:25:27.729497736 -0700
-@@ -12,7 +12,7 @@
- 
- TESTS = $(check_PROGRAMS)
- 
--test_LDADD = libgslodeiv.la ../linalg/libgsllinalg.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../permutation/libgslpermutation.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la 
-+test_LDADD = libgslodeiv.la ../linalg/libgsllinalg.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../permutation/libgslpermutation.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la 
- 
- test_SOURCES = test.c
- 
-diff -Nur gsl-1.16.orig/poly/Makefile.am gsl-1.16/poly/Makefile.am
---- gsl-1.16.orig/poly/Makefile.am	2013-07-17 13:04:26.000000000 -0700
-+++ gsl-1.16/poly/Makefile.am	2013-08-19 15:25:27.729497736 -0700
-@@ -10,7 +10,7 @@
- 
- TESTS = $(check_PROGRAMS)
- 
--check_PROGRAMS = test
-+#check_PROGRAMS = test
- 
- test_SOURCES = test.c
- test_LDADD = libgslpoly.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la ../sort/libgslsort.la
-diff -Nur gsl-1.16.orig/specfunc/Makefile.am gsl-1.16/specfunc/Makefile.am
---- gsl-1.16.orig/specfunc/Makefile.am	2013-07-17 13:04:26.000000000 -0700
-+++ gsl-1.16/specfunc/Makefile.am	2013-08-19 15:25:27.729497736 -0700
-@@ -12,7 +12,7 @@
- 
- check_PROGRAMS = test
- 
--test_LDADD = libgslspecfunc.la ../eigen/libgsleigen.la ../linalg/libgsllinalg.la  ../sort/libgslsort.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-+test_LDADD = libgslspecfunc.la ../eigen/libgsleigen.la ../linalg/libgsllinalg.la  ../sort/libgslsort.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
- 
- test_SOURCES = test_sf.c test_sf.h test_airy.c test_bessel.c test_coulomb.c test_dilog.c test_gamma.c test_hyperg.c test_legendre.c test_mathieu.c
-   
-diff -Nur gsl-1.16.orig/wavelet/Makefile.am gsl-1.16/wavelet/Makefile.am
---- gsl-1.16.orig/wavelet/Makefile.am	2013-07-17 13:04:26.000000000 -0700
-+++ gsl-1.16/wavelet/Makefile.am	2013-08-19 15:25:27.729497736 -0700
-@@ -10,7 +10,7 @@
- 
- TESTS = $(check_PROGRAMS)
- 
--test_LDADD = libgslwavelet.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-+test_LDADD = libgslwavelet.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
- 
- test_SOURCES = test.c
- 
diff --git a/sci-libs/gsl/files/gsl-2.1-cblas.patch b/sci-libs/gsl/files/gsl-2.1-cblas.patch
deleted file mode 100644
index 54cc8802c594..000000000000
--- a/sci-libs/gsl/files/gsl-2.1-cblas.patch
+++ /dev/null
@@ -1,326 +0,0 @@
- Makefile.am               |  8 +++---
- ax_cblas.m4               | 69 +++++++++++++++++++++++++++++++++++++++++++++++
- bspline/Makefile.am       |  2 +-
- configure.ac              | 10 +++++++
- eigen/Makefile.am         |  2 +-
- gsl-config.in             |  4 +--
- gsl.pc.in                 |  2 +-
- interpolation/Makefile.am |  2 +-
- linalg/Makefile.am        |  2 +-
- multifit/Makefile.am      |  4 +--
- multimin/Makefile.am      |  4 +--
- multiroots/Makefile.am    |  2 +-
- ode-initval/Makefile.am   |  2 +-
- poly/Makefile.am          |  2 +-
- specfunc/Makefile.am      |  2 +-
- wavelet/Makefile.am       |  2 +-
- 16 files changed, 100 insertions(+), 19 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 278dcd9..a75418c 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -19,7 +19,7 @@ EXTRA_DIST = autogen.sh gsl-config.in gsl.pc.in configure.ac THANKS BUGS gsl.spe
- 
- lib_LTLIBRARIES = libgsl.la
- libgsl_la_SOURCES = version.c
--libgsl_la_LIBADD = $(GSL_LIBADD) $(SUBLIBS)
-+libgsl_la_LIBADD = $(GSL_LIBADD) $(SUBLIBS) @CBLAS_LINK_LIBS@
- libgsl_la_LDFLAGS = $(GSL_LDFLAGS) -version-info $(GSL_LT_VERSION)
- noinst_HEADERS = templates_on.h templates_off.h build.h
- 
-@@ -29,10 +29,10 @@ m4data_DATA = gsl.m4
- bin_PROGRAMS = gsl-randist gsl-histogram
- 
- gsl_randist_SOURCES = gsl-randist.c
--gsl_randist_LDADD = libgsl.la cblas/libgslcblas.la
-+gsl_randist_LDADD = libgsl.la
- 
- gsl_histogram_SOURCES = gsl-histogram.c
--gsl_histogram_LDADD = libgsl.la cblas/libgslcblas.la
-+gsl_histogram_LDADD = libgsl.la
- 
- check_SCRIPTS = test_gsl_histogram.sh pkgconfig.test
- TESTS = test_gsl_histogram.sh pkgconfig.test
-@@ -51,6 +51,8 @@ edit = $(SED) \
- 	-e 's|@GSL_CFLAGS[@]|$(GSL_CFLAGS)|g' \
- 	-e 's|@GSL_LIBM[@]|$(GSL_LIBM)|g' \
- 	-e 's|@GSL_LIBS[@]|$(GSL_LIBS)|g' \
-+	-e 's|@CBLAS_CFLAGS[@]|$(CBLAS_CFLAGS)|g' \
-+	-e 's|@CBLAS_LIBS[@]|$(CBLAS_LIBS)|g' \
- 	-e 's|@LIBS[@]|$(LIBS)|g' \
- 	-e 's|@VERSION[@]|$(VERSION)|g'
- 
-diff --git a/ax_cblas.m4 b/ax_cblas.m4
-new file mode 100644
-index 0000000..6ef143a
---- /dev/null
-+++ b/ax_cblas.m4
-@@ -0,0 +1,69 @@
-+AC_DEFUN([AX_CBLAS],[
-+
-+  ext_cblas=no
-+  ext_cblas_libs="-lcblas"
-+  ext_cblas_cflags=""
-+
-+  AC_ARG_WITH(cblas-external,
-+	[AS_HELP_STRING([--with-cblas-external], 
-+			[Use external CBLAS library (default is no)])],
-+	[with_ext_cblas=$withval],
-+	[with_ext_cblas=no])
-+
-+  case $with_ext_cblas in
-+	no) ext_cblas=no ;;
-+	yes) ext_cblas=yes ;;
-+	-* | */* | *.a | *.so | *.so.* | *.o) 
-+	   ext_cblas=yes
-+	   ext_cblas_libs="$with_cblas" ;;
-+	*) ext_cblas=yes
-+	   ext_cblas_libs="-l$with_cblas" ;;
-+  esac
-+
-+  AC_ARG_WITH(cblas-external-libs,
-+	[AS_HELP_STRING([--with-cblas-external-libs=<libs>],
-+			[External cblas libraries to link with (default is "$ext_cblas_libs")])],
-+	[ext_cblas_libs=$withval],
-+	[])
-+
-+  AC_ARG_WITH(cblas-external-cflags,
-+	[AS_HELP_STRING([--with-cblas-external-cflags=<flags>],
-+			[Pre-processing flags to compile with external cblas ("-I<dir>")])],
-+	[ext_cblas_cflags=$withval],
-+	[])
-+
-+  if test x$ext_cblas != xno; then
-+	if test "x$CBLAS_LIBS" = x; then
-+	   CBLAS_LIBS="$ext_cblas_libs"
-+     	fi
-+     	if test "x$CBLAS_CFLAGS" = x; then
-+       	   CBLAS_CFLAGS="$ext_cblas_cflags"
-+   	fi
-+
-+   	CFLAGS_sav="$CFLAGS"
-+   	CFLAGS="$CFLAGS $CBLAS_CFLAGS"
-+   	AC_CHECK_HEADER(cblas.h, ,
-+		[AC_MSG_ERROR([
-+	   	*** Header file cblas.h not found.
-+	   	*** If you installed cblas header in a non standard place,
-+	   	*** specify its install prefix using the following option
-+	   	***  --with-cblas-external-cflags="-I<include_dir>"])
-+	 	])
-+   	CFLAGS="$CFLAGS_sav"
-+
-+   	LIBS_sav="$LIBS"
-+   	LIBS="$LIBS $CBLAS_LIBS -lm"
-+   	AC_MSG_CHECKING([for cblas_sgemm in $CBLAS_LIBS])
-+   	AC_TRY_LINK_FUNC(cblas_sgemm, [ext_cblas=yes],
-+    		[AC_MSG_ERROR([
-+	    	*** Linking with cblas with $LIBS failed.
-+       	    	*** If you installed cblas library in a non standard place,
-+   	    	*** specify its install prefix using the following option
-+	    	***  --with-cblas-external-libs="-L<lib_dir> -l<lib>"])
-+	 	])
-+   	AC_MSG_RESULT($ext_cblas)
-+   	LIBS="$LIBS_sav"
-+	AC_SUBST([CBLAS_CFLAGS])
-+	AC_SUBST([CBLAS_LIBS])
-+ fi
-+])
-diff --git a/bspline/Makefile.am b/bspline/Makefile.am
-index 3f4f950..d413036 100644
---- a/bspline/Makefile.am
-+++ b/bspline/Makefile.am
-@@ -12,6 +12,6 @@ check_PROGRAMS = test
- 
- TESTS = $(check_PROGRAMS)
- 
--test_LDADD = libgslbspline.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../cblas/libgslcblas.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la ../statistics/libgslstatistics.la
-+test_LDADD = libgslbspline.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la @CBLAS_LINK_LIBS@ ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la ../statistics/libgslstatistics.la
- 
- test_SOURCES = test.c
-diff --git a/configure.ac b/configure.ac
-index d6b673f..c642454 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -205,6 +205,16 @@ if test "x$LIBS" = "x" ; then
-   AC_CHECK_LIB(m, cos)
- fi
- 
-+sinclude(ax_cblas.m4)
-+AX_CBLAS
-+if test "x$CBLAS_LIBS" != "x"; then
-+   CBLAS_LINK_LIBS="$CBLAS_LIBS"
-+else
-+   CBLAS_LINK_LIBS="\$(top_builddir)/cblas/libgslcblas.la"
-+   CBLAS_LIBS="-lgslcblas"
-+fi
-+AC_SUBST(CBLAS_LINK_LIBS)
-+
- dnl Remember to put a definition in acconfig.h for each of these
- AC_CHECK_DECLS(feenableexcept,,,[#define _GNU_SOURCE 1
- #include <fenv.h>]) 
-diff --git a/eigen/Makefile.am b/eigen/Makefile.am
-index c28bfde..14197a4 100644
---- a/eigen/Makefile.am
-+++ b/eigen/Makefile.am
-@@ -11,7 +11,7 @@ noinst_HEADERS =  qrstep.c
- 
- TESTS = $(check_PROGRAMS)
- 
--test_LDADD = libgsleigen.la  ../test/libgsltest.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la  ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../sys/libgslsys.la ../err/libgslerr.la ../utils/libutils.la ../rng/libgslrng.la ../sort/libgslsort.la
-+test_LDADD = libgsleigen.la  ../test/libgsltest.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la  ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../sys/libgslsys.la ../err/libgslerr.la ../utils/libutils.la ../rng/libgslrng.la ../sort/libgslsort.la
- 
- test_SOURCES = test.c
- 
-diff --git a/gsl-config.in b/gsl-config.in
-old mode 100755
-new mode 100644
-index 3f3fa61..c9c4262
---- a/gsl-config.in
-+++ b/gsl-config.in
-@@ -58,11 +58,11 @@ while test $# -gt 0; do
- 	;;
- 
-     --cflags)
--       	echo @GSL_CFLAGS@ 
-+       	echo @GSL_CFLAGS@ @CBLAS_CFLAGS@ 
-        	;;
- 
-     --libs)
--        : ${GSL_CBLAS_LIB=-lgslcblas}
-+        : ${GSL_CBLAS_LIB=@CBLAS_LIBS@}
- 	echo @GSL_LIBS@ $GSL_CBLAS_LIB @GSL_LIBM@
-        	;;
- 
-diff --git a/gsl.pc.in b/gsl.pc.in
-index 5e9ef21..5a7a0f3 100644
---- a/gsl.pc.in
-+++ b/gsl.pc.in
-@@ -2,7 +2,7 @@ prefix=@prefix@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
- includedir=@includedir@
--GSL_CBLAS_LIB=-lgslcblas
-+GSL_CBLAS_LIB=@CBLAS_LIBS@
- 
- Name: GSL
- Description: GNU Scientific Library
-diff --git a/interpolation/Makefile.am b/interpolation/Makefile.am
-index 1d80755..e45bd51 100644
---- a/interpolation/Makefile.am
-+++ b/interpolation/Makefile.am
-@@ -12,7 +12,7 @@ AM_CPPFLAGS = -I$(top_srcdir)
- 
- TESTS = $(check_PROGRAMS)
- 
--test_LDADD = libgslinterpolation.la ../poly/libgslpoly.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../cblas/libgslcblas.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-+test_LDADD = libgslinterpolation.la ../poly/libgslpoly.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la @CBLAS_LINK_LIBS@ ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
- 
- test_SOURCES = test.c
- 
-diff --git a/linalg/Makefile.am b/linalg/Makefile.am
-index 8fb6e7c..90d22e0 100644
---- a/linalg/Makefile.am
-+++ b/linalg/Makefile.am
-@@ -12,7 +12,7 @@ TESTS = $(check_PROGRAMS)
- 
- check_PROGRAMS = test
- 
--test_LDADD = libgsllinalg.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-+test_LDADD = libgsllinalg.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
- 
- test_SOURCES = test.c
- 
-diff --git a/multifit/Makefile.am b/multifit/Makefile.am
-index 891964b..b33f71e 100644
---- a/multifit/Makefile.am
-+++ b/multifit/Makefile.am
-@@ -67,8 +67,8 @@ check_PROGRAMS = test #demo
- TESTS = $(check_PROGRAMS)
- 
- test_SOURCES = test.c
--test_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../sort/libgslsort.la ../statistics/libgslstatistics.la ../vector/libgslvector.la ../block/libgslblock.la  ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la ../rng/libgslrng.la ../specfunc/libgslspecfunc.la
-+test_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../sort/libgslsort.la ../statistics/libgslstatistics.la ../vector/libgslvector.la ../block/libgslblock.la  ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la ../rng/libgslrng.la ../specfunc/libgslspecfunc.la
- 
- #demo_SOURCES = demo.c
--#demo_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../randist/libgslrandist.la ../rng/libgslrng.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la
-+#demo_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../randist/libgslrandist.la ../rng/libgslrng.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la
- 
-diff --git a/multimin/Makefile.am b/multimin/Makefile.am
-index 7071359..65a488a 100644
---- a/multimin/Makefile.am
-+++ b/multimin/Makefile.am
-@@ -13,8 +13,8 @@ check_PROGRAMS = test #demo
- TESTS = $(check_PROGRAMS) 
- 
- test_SOURCES = test.c test_funcs.c test_funcs.h
--test_LDADD = libgslmultimin.la ../min/libgslmin.la ../poly/libgslpoly.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-+test_LDADD = libgslmultimin.la ../min/libgslmin.la ../poly/libgslpoly.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
- 
- #demo_SOURCES = demo.c 
--#demo_LDADD = libgslmultimin.la ../min/libgslmin.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../linalg/libgsllinalg.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-+#demo_LDADD = libgslmultimin.la ../min/libgslmin.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../linalg/libgsllinalg.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
- 
-diff --git a/multiroots/Makefile.am b/multiroots/Makefile.am
-index a351c3f..6178448 100644
---- a/multiroots/Makefile.am
-+++ b/multiroots/Makefile.am
-@@ -15,5 +15,5 @@ check_PROGRAMS = test
- TESTS = $(check_PROGRAMS)
- 
- test_SOURCES = test.c test_funcs.c test_funcs.h
--test_LDADD = libgslmultiroots.la ../linalg/libgsllinalg.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-+test_LDADD = libgslmultiroots.la ../linalg/libgsllinalg.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
- 
-diff --git a/ode-initval/Makefile.am b/ode-initval/Makefile.am
-index 9c774b5..346c381 100644
---- a/ode-initval/Makefile.am
-+++ b/ode-initval/Makefile.am
-@@ -12,7 +12,7 @@ check_PROGRAMS = test
- 
- TESTS = $(check_PROGRAMS)
- 
--test_LDADD = libgslodeiv.la ../linalg/libgsllinalg.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../permutation/libgslpermutation.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la 
-+test_LDADD = libgslodeiv.la ../linalg/libgsllinalg.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../permutation/libgslpermutation.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la 
- 
- test_SOURCES = test.c
- 
-diff --git a/poly/Makefile.am b/poly/Makefile.am
-index f1dae5d..e0f8e83 100644
---- a/poly/Makefile.am
-+++ b/poly/Makefile.am
-@@ -10,7 +10,7 @@ noinst_HEADERS = balance.c companion.c qr.c
- 
- TESTS = $(check_PROGRAMS)
- 
--check_PROGRAMS = test
-+#check_PROGRAMS = test
- 
- test_SOURCES = test.c
- test_LDADD = libgslpoly.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la ../sort/libgslsort.la
-diff --git a/specfunc/Makefile.am b/specfunc/Makefile.am
-index 0a7e672..d1361d0 100644
---- a/specfunc/Makefile.am
-+++ b/specfunc/Makefile.am
-@@ -12,7 +12,7 @@ TESTS = $(check_PROGRAMS)
- 
- check_PROGRAMS = test
- 
--test_LDADD = libgslspecfunc.la ../eigen/libgsleigen.la ../linalg/libgsllinalg.la  ../sort/libgslsort.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-+test_LDADD = libgslspecfunc.la ../eigen/libgsleigen.la ../linalg/libgsllinalg.la  ../sort/libgslsort.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
- 
- test_SOURCES = test_sf.c test_sf.h test_airy.c test_bessel.c test_coulomb.c test_dilog.c test_gamma.c test_hyperg.c test_legendre.c test_mathieu.c
-   
-diff --git a/wavelet/Makefile.am b/wavelet/Makefile.am
-index 9da20d8..8cdbd77 100644
---- a/wavelet/Makefile.am
-+++ b/wavelet/Makefile.am
-@@ -10,7 +10,7 @@ check_PROGRAMS = test
- 
- TESTS = $(check_PROGRAMS)
- 
--test_LDADD = libgslwavelet.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-+test_LDADD = libgslwavelet.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
- 
- test_SOURCES = test.c
- 
diff --git a/sci-libs/gsl/files/gsl-2.3-cblas.patch b/sci-libs/gsl/files/gsl-2.3-cblas.patch
deleted file mode 100644
index 7e12b370b0dc..000000000000
--- a/sci-libs/gsl/files/gsl-2.3-cblas.patch
+++ /dev/null
@@ -1,1485 +0,0 @@
- Makefile.am                     |   8 +-
- Makefile.am.porig               |  66 ++++
- ax_cblas.m4                     |  69 +++++
- bspline/Makefile.am             |   2 +-
- bspline/Makefile.am.porig       |  17 ++
- configure.ac                    |  10 +
- configure.ac.porig              | 647 ++++++++++++++++++++++++++++++++++++++++
- eigen/Makefile.am               |   2 +-
- eigen/Makefile.am.porig         |  18 ++
- gsl-config.in                   |   4 +-
- gsl-config.in.porig             |  80 +++++
- gsl.pc.in                       |   2 +-
- gsl.pc.in.porig                 |  11 +
- interpolation/Makefile.am       |   2 +-
- interpolation/Makefile.am.porig |  18 ++
- linalg/Makefile.am              |   2 +-
- linalg/Makefile.am.porig        |  16 +
- multifit/Makefile.am            |   4 +-
- multifit/Makefile.am.porig      |  74 +++++
- multimin/Makefile.am            |   4 +-
- multimin/Makefile.am.porig      |  20 ++
- multiroots/Makefile.am          |   2 +-
- multiroots/Makefile.am.porig    |  19 ++
- ode-initval/Makefile.am         |   2 +-
- ode-initval/Makefile.am.porig   |  18 ++
- poly/Makefile.am                |   2 +-
- poly/Makefile.am.porig          |  17 ++
- specfunc/Makefile.am            |   2 +-
- specfunc/Makefile.am.porig      |  19 ++
- wavelet/Makefile.am             |   2 +-
- wavelet/Makefile.am.porig       |  17 ++
- 31 files changed, 1157 insertions(+), 19 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index c522001..4513bc8 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -19,7 +19,7 @@ EXTRA_DIST = autogen.sh gsl-config.in gsl.pc.in configure.ac THANKS BUGS gsl.spe
- 
- lib_LTLIBRARIES = libgsl.la
- libgsl_la_SOURCES = version.c
--libgsl_la_LIBADD = $(GSL_LIBADD) $(SUBLIBS)
-+libgsl_la_LIBADD = $(GSL_LIBADD) $(SUBLIBS) @CBLAS_LINK_LIBS@
- libgsl_la_LDFLAGS = $(GSL_LDFLAGS) -version-info $(GSL_LT_VERSION)
- noinst_HEADERS = templates_on.h templates_off.h build.h
- 
-@@ -29,10 +29,10 @@ m4data_DATA = gsl.m4
- bin_PROGRAMS = gsl-randist gsl-histogram
- 
- gsl_randist_SOURCES = gsl-randist.c
--gsl_randist_LDADD = libgsl.la cblas/libgslcblas.la
-+gsl_randist_LDADD = libgsl.la
- 
- gsl_histogram_SOURCES = gsl-histogram.c
--gsl_histogram_LDADD = libgsl.la cblas/libgslcblas.la
-+gsl_histogram_LDADD = libgsl.la
- 
- check_SCRIPTS = test_gsl_histogram.sh pkgconfig.test
- TESTS = test_gsl_histogram.sh pkgconfig.test
-@@ -51,6 +51,8 @@ edit = $(SED) \
- 	-e 's|@GSL_CFLAGS[@]|$(GSL_CFLAGS)|g' \
- 	-e 's|@GSL_LIBM[@]|$(GSL_LIBM)|g' \
- 	-e 's|@GSL_LIBS[@]|$(GSL_LIBS)|g' \
-+	-e 's|@CBLAS_CFLAGS[@]|$(CBLAS_CFLAGS)|g' \
-+	-e 's|@CBLAS_LIBS[@]|$(CBLAS_LIBS)|g' \
- 	-e 's|@LIBS[@]|$(LIBS)|g' \
- 	-e 's|@VERSION[@]|$(VERSION)|g'
- 
-diff --git a/Makefile.am.porig b/Makefile.am.porig
-new file mode 100644
-index 0000000..c522001
---- /dev/null
-+++ b/Makefile.am.porig
-@@ -0,0 +1,66 @@
-+## Process this file with automake to produce Makefile.in
-+
-+# AUTOMAKE_OPTIONS = readme-alpha
-+
-+SUBDIRS = gsl utils sys test err const complex cheb block vector matrix permutation combination multiset sort ieee-utils cblas blas linalg eigen specfunc dht qrng rng randist fft poly fit multifit multifit_nlinear multilarge multilarge_nlinear rstat statistics siman sum integration interpolation histogram ode-initval ode-initval2 roots multiroots min multimin monte ntuple diff deriv cdf wavelet bspline spblas spmatrix splinalg doc
-+
-+SUBLIBS = block/libgslblock.la blas/libgslblas.la bspline/libgslbspline.la complex/libgslcomplex.la cheb/libgslcheb.la dht/libgsldht.la diff/libgsldiff.la deriv/libgslderiv.la eigen/libgsleigen.la err/libgslerr.la fft/libgslfft.la fit/libgslfit.la histogram/libgslhistogram.la ieee-utils/libgslieeeutils.la integration/libgslintegration.la interpolation/libgslinterpolation.la linalg/libgsllinalg.la matrix/libgslmatrix.la min/libgslmin.la monte/libgslmonte.la multifit/libgslmultifit.la multifit_nlinear/libgslmultifit_nlinear.la multilarge/libgslmultilarge.la multilarge_nlinear/libgslmultilarge_nlinear.la multimin/libgslmultimin.la multiroots/libgslmultiroots.la ntuple/libgslntuple.la ode-initval/libgslodeiv.la ode-initval2/libgslodeiv2.la permutation/libgslpermutation.la combination/libgslcombination.la multiset/libgslmultiset.la poly/libgslpoly.la qrng/libgslqrng.la randist/libgslrandist.la rng/libgslrng.la roots/libgslroots.la siman/libgslsiman.la sort/libgslsort.la specfunc/libgslspecfunc.la rstat/libgslrstat.la statistics/libgslstatistics.la sum/libgslsum.la sys/libgslsys.la test/libgsltest.la utils/libutils.la vector/libgslvector.la cdf/libgslcdf.la wavelet/libgslwavelet.la spmatrix/libgslspmatrix.la spblas/libgslspblas.la splinalg/libgslsplinalg.la
-+
-+pkginclude_HEADERS = gsl_math.h gsl_pow_int.h gsl_nan.h gsl_machine.h gsl_mode.h gsl_precision.h gsl_types.h gsl_version.h gsl_minmax.h gsl_inline.h
-+
-+bin_SCRIPTS = gsl-config
-+
-+pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfig_DATA= gsl.pc
-+
-+CLEANFILES = gsl.pc gsl-config
-+
-+EXTRA_DIST = autogen.sh gsl-config.in gsl.pc.in configure.ac THANKS BUGS gsl.spec.in gsl.m4 test_gsl_histogram.sh pkgconfig.test
-+
-+lib_LTLIBRARIES = libgsl.la
-+libgsl_la_SOURCES = version.c
-+libgsl_la_LIBADD = $(GSL_LIBADD) $(SUBLIBS)
-+libgsl_la_LDFLAGS = $(GSL_LDFLAGS) -version-info $(GSL_LT_VERSION)
-+noinst_HEADERS = templates_on.h templates_off.h build.h
-+
-+m4datadir = $(datadir)/aclocal
-+m4data_DATA = gsl.m4
-+
-+bin_PROGRAMS = gsl-randist gsl-histogram
-+
-+gsl_randist_SOURCES = gsl-randist.c
-+gsl_randist_LDADD = libgsl.la cblas/libgslcblas.la
-+
-+gsl_histogram_SOURCES = gsl-histogram.c
-+gsl_histogram_LDADD = libgsl.la cblas/libgslcblas.la
-+
-+check_SCRIPTS = test_gsl_histogram.sh pkgconfig.test
-+TESTS = test_gsl_histogram.sh pkgconfig.test
-+
-+#bin_PROGRAMS = main dummy
-+#dummy_SOURCES = version.c
-+#dummy_LDADD = $(SUBLIBS)
-+#main_SOURCES = version.c env.c
-+#main_LDADD = libgsl.la
-+
-+edit = $(SED) \
-+	-e 's|@prefix[@]|$(prefix)|g' \
-+	-e 's|@exec_prefix[@]|$(exec_prefix)|g' \
-+	-e 's|@libdir[@]|$(libdir)|g' \
-+	-e 's|@includedir[@]|$(includedir)|g' \
-+	-e 's|@GSL_CFLAGS[@]|$(GSL_CFLAGS)|g' \
-+	-e 's|@GSL_LIBM[@]|$(GSL_LIBM)|g' \
-+	-e 's|@GSL_LIBS[@]|$(GSL_LIBS)|g' \
-+	-e 's|@LIBS[@]|$(LIBS)|g' \
-+	-e 's|@VERSION[@]|$(VERSION)|g'
-+
-+gsl-config gsl.pc: Makefile 
-+	@rm -f $@ $@.tmp
-+	@$(edit) '$(srcdir)/$@.in' >>$@.tmp
-+	@chmod a-w $@.tmp
-+	@mv $@.tmp $@
-+	@echo creating $@
-+
-+gsl-config: $(srcdir)/gsl-config.in
-+gsl.pc: $(srcdir)/gsl.pc.in
-+
-diff --git a/ax_cblas.m4 b/ax_cblas.m4
-new file mode 100644
-index 0000000..6ef143a
---- /dev/null
-+++ b/ax_cblas.m4
-@@ -0,0 +1,69 @@
-+AC_DEFUN([AX_CBLAS],[
-+
-+  ext_cblas=no
-+  ext_cblas_libs="-lcblas"
-+  ext_cblas_cflags=""
-+
-+  AC_ARG_WITH(cblas-external,
-+	[AS_HELP_STRING([--with-cblas-external], 
-+			[Use external CBLAS library (default is no)])],
-+	[with_ext_cblas=$withval],
-+	[with_ext_cblas=no])
-+
-+  case $with_ext_cblas in
-+	no) ext_cblas=no ;;
-+	yes) ext_cblas=yes ;;
-+	-* | */* | *.a | *.so | *.so.* | *.o) 
-+	   ext_cblas=yes
-+	   ext_cblas_libs="$with_cblas" ;;
-+	*) ext_cblas=yes
-+	   ext_cblas_libs="-l$with_cblas" ;;
-+  esac
-+
-+  AC_ARG_WITH(cblas-external-libs,
-+	[AS_HELP_STRING([--with-cblas-external-libs=<libs>],
-+			[External cblas libraries to link with (default is "$ext_cblas_libs")])],
-+	[ext_cblas_libs=$withval],
-+	[])
-+
-+  AC_ARG_WITH(cblas-external-cflags,
-+	[AS_HELP_STRING([--with-cblas-external-cflags=<flags>],
-+			[Pre-processing flags to compile with external cblas ("-I<dir>")])],
-+	[ext_cblas_cflags=$withval],
-+	[])
-+
-+  if test x$ext_cblas != xno; then
-+	if test "x$CBLAS_LIBS" = x; then
-+	   CBLAS_LIBS="$ext_cblas_libs"
-+     	fi
-+     	if test "x$CBLAS_CFLAGS" = x; then
-+       	   CBLAS_CFLAGS="$ext_cblas_cflags"
-+   	fi
-+
-+   	CFLAGS_sav="$CFLAGS"
-+   	CFLAGS="$CFLAGS $CBLAS_CFLAGS"
-+   	AC_CHECK_HEADER(cblas.h, ,
-+		[AC_MSG_ERROR([
-+	   	*** Header file cblas.h not found.
-+	   	*** If you installed cblas header in a non standard place,
-+	   	*** specify its install prefix using the following option
-+	   	***  --with-cblas-external-cflags="-I<include_dir>"])
-+	 	])
-+   	CFLAGS="$CFLAGS_sav"
-+
-+   	LIBS_sav="$LIBS"
-+   	LIBS="$LIBS $CBLAS_LIBS -lm"
-+   	AC_MSG_CHECKING([for cblas_sgemm in $CBLAS_LIBS])
-+   	AC_TRY_LINK_FUNC(cblas_sgemm, [ext_cblas=yes],
-+    		[AC_MSG_ERROR([
-+	    	*** Linking with cblas with $LIBS failed.
-+       	    	*** If you installed cblas library in a non standard place,
-+   	    	*** specify its install prefix using the following option
-+	    	***  --with-cblas-external-libs="-L<lib_dir> -l<lib>"])
-+	 	])
-+   	AC_MSG_RESULT($ext_cblas)
-+   	LIBS="$LIBS_sav"
-+	AC_SUBST([CBLAS_CFLAGS])
-+	AC_SUBST([CBLAS_LIBS])
-+ fi
-+])
-diff --git a/bspline/Makefile.am b/bspline/Makefile.am
-index 3f4f950..d413036 100644
---- a/bspline/Makefile.am
-+++ b/bspline/Makefile.am
-@@ -12,6 +12,6 @@ check_PROGRAMS = test
- 
- TESTS = $(check_PROGRAMS)
- 
--test_LDADD = libgslbspline.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../cblas/libgslcblas.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la ../statistics/libgslstatistics.la
-+test_LDADD = libgslbspline.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la @CBLAS_LINK_LIBS@ ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la ../statistics/libgslstatistics.la
- 
- test_SOURCES = test.c
-diff --git a/bspline/Makefile.am.porig b/bspline/Makefile.am.porig
-new file mode 100644
-index 0000000..3f4f950
---- /dev/null
-+++ b/bspline/Makefile.am.porig
-@@ -0,0 +1,17 @@
-+noinst_LTLIBRARIES = libgslbspline.la 
-+
-+pkginclude_HEADERS = gsl_bspline.h
-+
-+AM_CPPFLAGS = -I$(top_srcdir)
-+
-+libgslbspline_la_SOURCES = bspline.c greville.c
-+
-+noinst_HEADERS =  bspline.h
-+
-+check_PROGRAMS = test
-+
-+TESTS = $(check_PROGRAMS)
-+
-+test_LDADD = libgslbspline.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../cblas/libgslcblas.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la ../statistics/libgslstatistics.la
-+
-+test_SOURCES = test.c
-diff --git a/configure.ac b/configure.ac
-index a26fc1e..564d426 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -208,6 +208,16 @@ if test "x$LIBS" = "x" ; then
-   AC_CHECK_LIB(m, cos)
- fi
- 
-+sinclude(ax_cblas.m4)
-+AX_CBLAS
-+if test "x$CBLAS_LIBS" != "x"; then
-+   CBLAS_LINK_LIBS="$CBLAS_LIBS"
-+else
-+   CBLAS_LINK_LIBS="\$(top_builddir)/cblas/libgslcblas.la"
-+   CBLAS_LIBS="-lgslcblas"
-+fi
-+AC_SUBST(CBLAS_LINK_LIBS)
-+
- dnl Remember to put a definition in acconfig.h for each of these
- AC_CHECK_DECLS(feenableexcept,,,[#define _GNU_SOURCE 1
- #include <fenv.h>]) 
-diff --git a/configure.ac.porig b/configure.ac.porig
-new file mode 100644
-index 0000000..a26fc1e
---- /dev/null
-+++ b/configure.ac.porig
-@@ -0,0 +1,647 @@
-+dnl Process this file with autoconf to produce a configure script.
-+
-+AC_INIT([gsl],[2.3])
-+AC_CONFIG_SRCDIR(gsl_math.h)
-+
-+AM_INIT_AUTOMAKE([gnu])
-+AC_CONFIG_HEADERS([config.h])
-+AM_MAINTAINER_MODE
-+
-+dnl Library versioning (C:R:A == current:revision:age)
-+dnl See the libtool manual for an explanation of the numbers
-+dnl
-+dnl gsl-1.0    libgsl 0:0:0  libgslcblas 0:0:0
-+dnl gsl-1.1    libgsl 1:0:1  libgslcblas 0:0:0
-+dnl gsl-1.1.1  libgsl 2:0:2  libgslcblas 0:0:0
-+dnl gsl-1.2    libgsl 3:0:3  libgslcblas 0:0:0
-+dnl gsl-1.3    libgsl 4:0:4  libgslcblas 0:0:0
-+dnl gsl-1.4    libgsl 5:0:5  libgslcblas 0:0:0
-+dnl gsl-1.5    libgsl 6:0:6  libgslcblas 0:0:0
-+dnl gsl-1.6    libgsl 7:0:7  libgslcblas 0:0:0
-+dnl gsl-1.7    libgsl 8:0:8  libgslcblas 0:0:0
-+dnl gsl-1.8    libgsl 9:0:9  libgslcblas 0:0:0
-+dnl gsl-1.9    libgsl 10:0:10 libgslcblas 0:0:0 
-+dnl gsl-1.10   libgsl 10:0:10 (*) libgslcblas 0:0:0 
-+dnl gsl-1.11   libgsl 12:0:12  libgslcblas 0:0:0 
-+dnl gsl-1.12   libgsl 13:0:13  libgslcblas 0:0:0 
-+dnl gsl-1.13   libgsl 14:0:14  libgslcblas 0:0:0 
-+dnl gsl-1.14   libgsl 15:0:15  libgslcblas 0:0:0 
-+dnl gsl-1.15   libgsl 16:0:16  libgslcblas 0:0:0 
-+dnl gsl-1.16   libgsl 17:0:17  libgslcblas 0:0:0 
-+dnl gsl-2.0    libgsl 18:0:18  (**) libgslcblas 0:0:0 
-+dnl gsl-2.1    libgsl 19:0:0   libgslcblas 0:0:0 
-+dnl gsl-2.2    libgsl 20:0:1   libgslcblas 0:0:0 
-+dnl gsl-2.2.1  libgsl 21:0:2   libgslcblas 0:0:0 
-+dnl gsl-2.3    libgsl 22:0:3   libgslcblas 0:0:0 
-+dnl 
-+dnl (*) There was an error on this release.  Firstly, the versioning
-+dnl numbers were not updated.  Secondly, 2 functions were removed, but
-+dnl the age not reset--this should have been 11:0:0.  However these
-+dnl functions were not documented and are regarded as internal, so we
-+dnl will assume 11:0:11.
-+dnl
-+dnl (**) There was an error on this release. Age should have been
-+dnl reset to 18:0:0
-+dnl
-+dnl How to update library version number
-+dnl ====================================
-+dnl 
-+dnl C: increment if the interface has additions, changes, removals.
-+dnl
-+dnl R: increment any time the source changes; set to 0 if you
-+dnl incremented CURRENT
-+dnl
-+dnl A: increment if any interfaces have been added; set to 0 if any
-+dnl interfaces have been removed. removal has precedence over adding,
-+dnl so set to 0 if both happened.
-+dnl
-+dnl See https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-+dnl for more detailed info
-+
-+dnl
-+GSL_CURRENT=22
-+GSL_REVISION=0
-+GSL_AGE=3
-+dnl
-+CBLAS_CURRENT=0
-+CBLAS_REVISION=0
-+CBLAS_AGE=0
-+
-+GSL_LT_VERSION="${GSL_CURRENT}:${GSL_REVISION}:${GSL_AGE}"
-+AC_SUBST(GSL_LT_VERSION)
-+
-+GSL_LT_CBLAS_VERSION="${CBLAS_CURRENT}:${CBLAS_REVISION}:${CBLAS_AGE}"
-+AC_SUBST(GSL_LT_CBLAS_VERSION)
-+
-+case "$VERSION" in
-+    *+)
-+        ;;
-+    *)
-+        AC_DEFINE(RELEASED,[],[Defined if this is an official release])
-+        ;;
-+esac
-+
-+dnl Split VERSION into GSL_VERSION_MAJOR and GSL_VERSION_MINOR
-+dnl Follows AX_SPLIT_VERSION macro from AC-Archive
-+dnl Rhys Ulerich <rhys.ulerich@gmail.com>
-+AC_PROG_SED
-+GSL_MAJOR_VERSION=`echo "$VERSION" | $SED 's/\([[^.]][[^.]]*\).*/\1/'`
-+GSL_MINOR_VERSION=`echo "$VERSION" | $SED 's/[[^.]][[^.]]*.\([[^.]][[^.]]*\).*/\1/'`
-+AC_SUBST(GSL_MAJOR_VERSION)
-+AC_SUBST(GSL_MINOR_VERSION)
-+
-+dnl things required by automake
-+dnl AC_ARG_PROGRAM
-+AC_PROG_MAKE_SET
-+
-+dnl Check for which system.
-+AC_CANONICAL_HOST
-+
-+dnl Checks for programs.
-+AC_LANG(C)
-+AC_PROG_CC
-+AC_PROG_CPP
-+AC_PROG_INSTALL
-+AC_PROG_LN_S
-+LT_INIT([win32-dll])
-+
-+dnl Check compiler features
-+AC_TYPE_SIZE_T
-+dnl AC_C_CONST
-+AC_C_VOLATILE
-+AC_C_INLINE
-+AC_C_CHAR_UNSIGNED
-+
-+GSL_CFLAGS="-I$includedir"
-+GSL_LIBS="-L$libdir -lgsl"
-+dnl macro from libtool - can be replaced with LT_LIB_M when we require libtool 2
-+LT_LIB_M
-+GSL_LIBM=$LIBM
-+
-+AC_SUBST(GSL_CFLAGS)
-+AC_SUBST(GSL_LIBS)
-+AC_SUBST(GSL_LIBM)
-+
-+if test "$ac_cv_c_inline" != no ; then 
-+dnl Check for "extern inline", using a modified version of the test
-+dnl for AC_C_INLINE from acspecific.mt
-+dnl
-+   AC_CACHE_CHECK([for GNU-style extern inline], ac_cv_c_extern_inline,
-+   [ac_cv_c_extern_inline=no
-+   AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[extern $ac_cv_c_inline double foo(double x);
-+   extern $ac_cv_c_inline double foo(double x) { return x + 1.0 ; } ;
-+   double foo (double x) { return x + 1.0 ; };]], [[  foo(1.0)  ]])],[ac_cv_c_extern_inline="yes"],[])
-+   ])
-+
-+   if test "$ac_cv_c_extern_inline" != no ; then
-+      AC_DEFINE(HAVE_INLINE,[1],[Define if you have inline])
-+   else
-+      AC_CACHE_CHECK([for C99-style inline], ac_cv_c_c99inline,
-+      [ac_cv_c_c99inline=no
-+      dnl next line is a necessary condition
-+      AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[extern inline void* foo() { foo(); return &foo ; };]], 
-+      [[  return foo() != 0 ]])],[ac_cv_c_c99inline="yes"],[])
-+      dnl but not sufficient, extern must work but inline on its own should not
-+      if test "$ac_cv_c_c99inline" != no ; then
-+            AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[inline void* foo() { foo(); return &foo ; };]], 
-+            [[  return foo() != 0 ]])],[],ac_cv_c_c99inline="no")
-+      fi
-+      ])
-+      if test "$ac_cv_c_c99inline" != no ; then
-+         AC_DEFINE(HAVE_INLINE,[1],[Define if you have inline])
-+         AC_DEFINE(HAVE_C99_INLINE,[1],[Define if you have inline with C99 behavior])
-+      fi
-+   fi
-+fi
-+
-+dnl Checks for header files.
-+AC_CHECK_HEADERS(ieeefp.h)
-+
-+dnl Checks for typedefs, structures, and compiler characteristics.
-+
-+case $host in
-+  *-*-cygwin* | *-*-mingw* )
-+  if test "$enable_shared" = yes; then
-+    GSLCBLAS_LDFLAGS="$GSLCBLAS_LDFLAGS -no-undefined"
-+    GSL_LDFLAGS="$GSL_LDFLAGS -no-undefined"
-+    GSL_LIBADD="cblas/libgslcblas.la"
-+  fi
-+  ;;
-+esac
-+
-+AC_SUBST(GSLCBLAS_LDFLAGS)
-+AC_SUBST(GSL_LDFLAGS)
-+AC_SUBST(GSL_LIBADD)
-+
-+dnl Checks for library functions.
-+
-+dnl AC_FUNC_ALLOCA
-+AC_FUNC_VPRINTF
-+
-+dnl strcasecmp, strerror, xmalloc, xrealloc, probably others should be added.
-+dnl removed strerror from this list, it's hardcoded in the err/ directory
-+dnl Any functions which appear in this list of functions should be provided
-+dnl in the utils/ directory
-+dnl xmalloc is not used, removed (bjg)
-+AC_REPLACE_FUNCS(memcpy memmove strdup strtol strtoul)
-+
-+AC_CACHE_CHECK(for EXIT_SUCCESS and EXIT_FAILURE,
-+ac_cv_decl_exit_success_and_failure,
-+AC_EGREP_CPP(yes,
-+[
-+#include <stdlib.h>
-+#ifdef EXIT_SUCCESS
-+yes
-+#endif
-+], 
-+ac_cv_decl_exit_success_and_failure=yes,
-+ac_cv_decl_exit_success_and_failure=no)
-+)
-+
-+if test "$ac_cv_decl_exit_success_and_failure" = yes ; then
-+  AC_DEFINE(HAVE_EXIT_SUCCESS_AND_FAILURE,1,[Defined if you have ansi EXIT_SUCCESS and EXIT_FAILURE in stdlib.h])
-+fi ;
-+
-+dnl Use alternate libm if specified by user
-+
-+if test "x$LIBS" = "x" ; then
-+  AC_CHECK_LIB(m, cos)
-+fi
-+
-+dnl Remember to put a definition in acconfig.h for each of these
-+AC_CHECK_DECLS(feenableexcept,,,[#define _GNU_SOURCE 1
-+#include <fenv.h>]) 
-+AC_CHECK_DECLS(fesettrapenable,,,[#define _GNU_SOURCE 1
-+#include <fenv.h>]) 
-+AC_CHECK_DECLS(hypot,,,[#include <math.h>]) 
-+AC_CHECK_DECLS(expm1,,,[#include <math.h>])
-+AC_CHECK_DECLS(acosh,,,[#include <math.h>])
-+AC_CHECK_DECLS(asinh,,,[#include <math.h>])
-+AC_CHECK_DECLS(atanh,,,[#include <math.h>])
-+AC_CHECK_DECLS(ldexp,,,[#include <math.h>])
-+AC_CHECK_DECLS(frexp,,,[#include <math.h>])
-+AC_CHECK_DECLS([fprnd_t],[],[],[[#include <float.h>]]) 
-+AC_CHECK_DECLS(isinf,,,[#include <math.h>])
-+AC_CHECK_DECLS(isfinite,,,[#include <math.h>])
-+AC_CHECK_DECLS(finite,,,[#include <math.h>
-+#if HAVE_IEEEFP_H
-+#include <ieeefp.h>
-+#endif])
-+AC_CHECK_DECLS(isnan,,,[#include <math.h>])
-+
-+dnl OpenBSD has a broken implementation of log1p.
-+case "$host" in
-+    *-*-*openbsd*)
-+       AC_MSG_RESULT([avoiding OpenBSD system log1p - using gsl version])
-+       ;;
-+    *)
-+        AC_CHECK_DECLS(log1p,,,[#include <math.h>])
-+       ;;
-+esac
-+
-+AC_CACHE_CHECK([for long double stdio], ac_cv_func_printf_longdouble,
-+[AC_RUN_IFELSE([AC_LANG_SOURCE([[
-+#include <stdlib.h>
-+#include <stdio.h>
-+int main (void) 
-+{ 
-+const char * s = "5678.25"; long double x = 1.234 ; 
-+fprintf(stderr,"%Lg\n",x) ; 
-+sscanf(s, "%Lg", &x);
-+if (x == 5678.25) {exit (0);} else {exit(1); };
-+}]])],[ac_cv_func_printf_longdouble="yes"],[ac_cv_func_printf_longdouble="no"],[ac_cv_func_printf_longdouble="no"])])
-+
-+if test "$ac_cv_func_printf_longdouble" != no; then
-+  AC_DEFINE(HAVE_PRINTF_LONGDOUBLE,1,[Define this if printf can handle %Lf for long double])
-+fi
-+
-+AC_CACHE_CHECK([for extended floating point registers],ac_cv_c_extended_fp,
-+[case "$host" in
-+    *sparc*-*-*)
-+        ac_cv_c_extended_fp=no
-+        ;;     
-+    *powerpc*-*-*)
-+        ac_cv_c_extended_fp=no
-+        ;;      
-+    *hppa*-*-*)
-+        ac_cv_c_extended_fp=no
-+        ;;      
-+    *alpha*-*-*)
-+        ac_cv_c_extended_fp=no
-+        ;;      
-+    *68k*-*-*)
-+        ac_cv_c_extended_fp=yes
-+        ;;      
-+    *86-*-*)
-+        ac_cv_c_extended_fp=yes
-+        ;;      
-+    x86_64-*-*)
-+        ac_cv_c_extended_fp=yes
-+        ;;      
-+    *) 
-+        ac_cv_c_extended_fp=unknown
-+        ;;
-+esac
-+])
-+
-+if test $ac_cv_c_extended_fp != "no" ; then
-+    AC_DEFINE(HAVE_EXTENDED_PRECISION_REGISTERS,1,[Defined on architectures with excess floating-point precision])
-+fi
-+
-+AC_CACHE_CHECK([for IEEE arithmetic interface type], ac_cv_c_ieee_interface,
-+[case "$host" in
-+    sparc-*-linux*) 
-+        ac_cv_c_ieee_interface=gnusparc
-+        ;;
-+    m68k-*-linux*) 
-+        ac_cv_c_ieee_interface=gnum68k
-+        ;;
-+    powerpc-*-linux*) 
-+        ac_cv_c_ieee_interface=gnuppc
-+        ;;
-+    *86-*-gnu | *86_64-*-gnu | *86-*-linux* | *86_64-*-linux*) 
-+        ac_cv_c_ieee_interface=gnux86
-+        ;;
-+    *-*-sunos4*) 
-+        ac_cv_c_ieee_interface=sunos4
-+        ;;
-+    *-*-solaris*) 
-+        ac_cv_c_ieee_interface=solaris
-+        ;;
-+    *-*-hpux11*) 
-+        ac_cv_c_ieee_interface=hpux11
-+        ;;
-+    *-*-hpux*) 
-+        ac_cv_c_ieee_interface=hpux
-+        ;;
-+    *-*-osf*) 
-+        ac_cv_c_ieee_interface=tru64
-+        ;;
-+    *-*-aix*) 
-+        ac_cv_c_ieee_interface=aix
-+        ;;
-+    *-*-irix*) 
-+        ac_cv_c_ieee_interface=irix
-+        ;;
-+    powerpc-*-*darwin*) 
-+        ac_cv_c_ieee_interface=darwin
-+        ;;
-+    *86-*-*darwin*) 
-+        ac_cv_c_ieee_interface=darwin86
-+        ;;
-+    *-*-*netbsd*) 
-+        ac_cv_c_ieee_interface=netbsd
-+        ;;
-+    *-*-*openbsd*)  
-+        ac_cv_c_ieee_interface=openbsd
-+        ;;
-+    *-*-*bsd*) 
-+        ac_cv_c_ieee_interface=freebsd
-+        ;;
-+    *-*-os2*)
-+        ac_cv_c_ieee_interface=os2emx
-+        ;;
-+    *)
-+        ac_cv_c_ieee_interface=unknown
-+        ;;
-+esac
-+])
-+
-+if test "$ac_cv_c_ieee_interface" = "gnux86" ; then
-+    AC_CACHE_CHECK([for FPU_SETCW], ac_cv_c_fpu_setcw,
-+    [ac_cv_c_fpu_setcw=no
-+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <fpu_control.h>
-+#ifndef _FPU_SETCW
-+#include <i386/fpu_control.h>
-+#define _FPU_SETCW(cw) __setfpucw(cw)
-+#endif
-+]], [[ unsigned short mode = 0 ; _FPU_SETCW(mode); ]])],[ac_cv_c_fpu_setcw="yes"],[ac_cv_c_ieee_interface=unknown])
-+    ])
-+fi
-+
-+if test "$ac_cv_c_ieee_interface" = "gnux86" ; then
-+    AC_CACHE_CHECK([for SSE extensions], ac_cv_c_fpu_sse,
-+    [ac_cv_c_fpu_sse=no
-+    AC_RUN_IFELSE([AC_LANG_PROGRAM([[
-+#include <stdlib.h>
-+#define _FPU_SETMXCSR(cw_sse) asm volatile ("ldmxcsr %0" : : "m" (*&cw_sse))
-+]], [[ unsigned int mode = 0x1f80 ; _FPU_SETMXCSR(mode); exit(0); ]])],[ac_cv_c_fpu_sse="yes"],[ac_cv_c_fpu_sse="no"],[
-+        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-+#include <stdlib.h>
-+#define _FPU_SETMXCSR(cw_sse) asm volatile ("ldmxcsr %0" : : "m" (*&cw_sse))
-+]], [[ unsigned int mode = 0x1f80 ; _FPU_SETMXCSR(mode); exit(0); ]])],[ac_cv_c_fpu_sse="yes"],[ac_cv_c_fpu_sse="no"])
-+])])
-+
-+    if test $ac_cv_c_fpu_sse = yes; then
-+        AC_DEFINE([HAVE_FPU_X86_SSE], 1,
-+                  [Define if x86 processor has sse extensions.])
-+   fi
-+fi
-+
-+ac_tr_ieee_interface=HAVE_`echo $ac_cv_c_ieee_interface | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`_IEEE_INTERFACE
-+AC_DEFINE_UNQUOTED($ac_tr_ieee_interface,1,[IEEE Interface Type])
-+
-+AC_SUBST(HAVE_GNUSPARC_IEEE_INTERFACE)
-+AC_SUBST(HAVE_GNUM68K_IEEE_INTERFACE)
-+AC_SUBST(HAVE_GNUPPC_IEEE_INTERFACE)
-+AC_SUBST(HAVE_GNUX86_IEEE_INTERFACE)
-+AC_SUBST(HAVE_SUNOS4_IEEE_INTERFACE)
-+AC_SUBST(HAVE_SOLARIS_IEEE_INTERFACE)
-+AC_SUBST(HAVE_HPUX11_IEEE_INTERFACE)
-+AC_SUBST(HAVE_HPUX_IEEE_INTERFACE)
-+AC_SUBST(HAVE_TRU64_IEEE_INTERFACE)
-+AC_SUBST(HAVE_IRIX_IEEE_INTERFACE)
-+AC_SUBST(HAVE_AIX_IEEE_INTERFACE)
-+AC_SUBST(HAVE_FREEBSD_IEEE_INTERFACE)
-+AC_SUBST(HAVE_OS2EMX_IEEE_INTERFACE)
-+AC_SUBST(HAVE_NETBSD_IEEE_INTERFACE)
-+AC_SUBST(HAVE_OPENBSD_IEEE_INTERFACE)
-+AC_SUBST(HAVE_DARWIN_IEEE_INTERFACE)
-+AC_SUBST(HAVE_DARWIN86_IEEE_INTERFACE)
-+
-+dnl Check for IEEE control flags
-+
-+save_cflags="$CFLAGS"
-+AC_CACHE_CHECK([for IEEE compiler flags], ac_cv_c_ieee_flags,
-+[
-+case "$host" in
-+    alpha*-*-*)
-+        if test X"$GCC" = Xyes ; then
-+            ieee_flags='-mieee -mfp-rounding-mode=d'
-+        else
-+            # This assumes Compaq's C compiler.
-+            ieee_flags='-ieee -fprm d'
-+        fi
-+        ;;
-+esac
-+if test X"$ieee_flags" != X ; then
-+  CFLAGS="$ieee_flags $CFLAGS"
-+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[int foo;]])],[ac_cv_c_ieee_flags="$ieee_flags"],[ac_cv_c_ieee_flags="none"])
-+else
-+  ac_cv_c_ieee_flags="none"
-+fi])
-+
-+if test "$ac_cv_c_ieee_flags" != "none" ; then
-+   CFLAGS="$ac_cv_c_ieee_flags $save_cflags"
-+else
-+   CFLAGS="$save_cflags"
-+fi
-+
-+dnl Check IEEE comparisons, whether "x != x" is true for NaNs
-+dnl
-+AC_CACHE_CHECK([for IEEE comparisons], ac_cv_c_ieee_comparisons,
-+[AC_RUN_IFELSE([AC_LANG_SOURCE([[
-+#include <math.h>
-+int main (void) 
-+{ 
-+   int status; double inf, nan;
-+   inf = exp(1.0e10);
-+   nan = inf / inf ;
-+   status = (nan == nan);
-+   exit (status);
-+}]])],[ac_cv_c_ieee_comparisons="yes"],[ac_cv_c_ieee_comparisons="no"],[ac_cv_c_ieee_comparisons="yes"])
-+])
-+
-+if test "$ac_cv_c_ieee_comparisons" != no ; then
-+  AC_DEFINE(HAVE_IEEE_COMPARISONS,1,[Define this if IEEE comparisons work correctly (e.g. NaN != NaN)])
-+fi
-+
-+dnl Check for IEEE denormalized arithmetic
-+dnl
-+AC_CACHE_CHECK([for IEEE denormalized values], ac_cv_c_ieee_denormals,
-+[AC_RUN_IFELSE([AC_LANG_SOURCE([[
-+#include <math.h> 
-+int main (void) 
-+{ 
-+   int i, status; 
-+   volatile double z = 1e-308;
-+   for (i = 0; i < 5; i++) { z = z / 10.0 ; };        
-+   for (i = 0; i < 5; i++) { z = z * 10.0 ; };
-+   status = (z == 0.0);
-+   exit (status);
-+}]])],[ac_cv_c_ieee_denormals="yes"],[ac_cv_c_ieee_denormals="no"],[ac_cv_c_ieee_denormals="yes"])
-+])
-+
-+if test "$ac_cv_c_ieee_denormals" != no ; then
-+  AC_DEFINE(HAVE_IEEE_DENORMALS,1,[Define this if IEEE denormalized numbers are available])
-+fi
-+
-+AH_TEMPLATE([HIDE_INLINE_STATIC],[Define if you need to hide the static definitions of inline functions])
-+
-+AH_BOTTOM([/* Use 0 and 1 for EXIT_SUCCESS and EXIT_FAILURE if we don't have them */
-+#if !HAVE_EXIT_SUCCESS_AND_FAILURE
-+#define EXIT_SUCCESS 0
-+#define EXIT_FAILURE 1
-+#endif])
-+
-+AH_BOTTOM([/* Define one of these if you have a known IEEE arithmetic interface */
-+#undef HAVE_GNUSPARC_IEEE_INTERFACE
-+#undef HAVE_GNUM68K_IEEE_INTERFACE
-+#undef HAVE_GNUPPC_IEEE_INTERFACE
-+#undef HAVE_GNUX86_IEEE_INTERFACE
-+#undef HAVE_SUNOS4_IEEE_INTERFACE
-+#undef HAVE_SOLARIS_IEEE_INTERFACE
-+#undef HAVE_HPUX11_IEEE_INTERFACE
-+#undef HAVE_HPUX_IEEE_INTERFACE
-+#undef HAVE_TRU64_IEEE_INTERFACE
-+#undef HAVE_IRIX_IEEE_INTERFACE
-+#undef HAVE_AIX_IEEE_INTERFACE
-+#undef HAVE_FREEBSD_IEEE_INTERFACE
-+#undef HAVE_OS2EMX_IEEE_INTERFACE
-+#undef HAVE_NETBSD_IEEE_INTERFACE
-+#undef HAVE_OPENBSD_IEEE_INTERFACE
-+#undef HAVE_DARWIN_IEEE_INTERFACE
-+#undef HAVE_DARWIN86_IEEE_INTERFACE])
-+
-+AH_BOTTOM([/* Define a rounding function which moves extended precision values
-+   out of registers and rounds them to double-precision. This should
-+   be used *sparingly*, in places where it is necessary to keep
-+   double-precision rounding for critical expressions while running in
-+   extended precision. For example, the following code should ensure
-+   exact equality, even when extended precision registers are in use,
-+
-+      double q = GSL_COERCE_DBL(3.0/7.0) ;
-+      if (q == GSL_COERCE_DBL(3.0/7.0)) { ... } ;
-+
-+   It carries a penalty even when the program is running in double
-+   precision mode unless you compile a separate version of the
-+   library with HAVE_EXTENDED_PRECISION_REGISTERS turned off. */
-+
-+#if HAVE_EXTENDED_PRECISION_REGISTERS
-+#define GSL_COERCE_DBL(x) (gsl_coerce_double(x))
-+#else
-+#define GSL_COERCE_DBL(x) (x)
-+#endif])
-+
-+AH_BOTTOM([/* Substitute gsl functions for missing system functions */
-+
-+#if !HAVE_DECL_HYPOT
-+#define hypot gsl_hypot
-+#endif
-+
-+#if !HAVE_DECL_LOG1P
-+#define log1p gsl_log1p
-+#endif
-+
-+#if !HAVE_DECL_EXPM1
-+#define expm1 gsl_expm1
-+#endif
-+
-+#if !HAVE_DECL_ACOSH
-+#define acosh gsl_acosh
-+#endif
-+
-+#if !HAVE_DECL_ASINH
-+#define asinh gsl_asinh
-+#endif
-+
-+#if !HAVE_DECL_ATANH
-+#define atanh gsl_atanh
-+#endif
-+
-+#if !HAVE_DECL_LDEXP
-+#define ldexp gsl_ldexp
-+#endif
-+
-+#if !HAVE_DECL_FREXP
-+#define frexp gsl_frexp
-+#endif
-+
-+#if !HAVE_DECL_ISINF
-+#define isinf gsl_isinf
-+#endif
-+
-+#if !HAVE_DECL_ISFINITE
-+#define isfinite gsl_finite
-+#endif
-+
-+#if !HAVE_DECL_FINITE
-+#define finite gsl_finite
-+#endif
-+
-+#if !HAVE_DECL_ISNAN
-+#define isnan gsl_isnan
-+#endif])
-+
-+AH_BOTTOM([#ifdef __GNUC__
-+#define DISCARD_POINTER(p) do { ; } while(p ? 0 : 0);
-+#else
-+#define DISCARD_POINTER(p) /* ignoring discarded pointer */
-+#endif])
-+
-+AH_BOTTOM([#if defined(GSL_RANGE_CHECK_OFF) || !defined(GSL_RANGE_CHECK)
-+#define GSL_RANGE_CHECK 0  /* turn off range checking by default internally */
-+#endif])
-+
-+AH_BOTTOM([#define RETURN_IF_NULL(x) if (!x) { return ; }
-+])
-+
-+AH_VERBATIM([GSL_DISABLE_DEPRECATED],
-+[/* Disable deprecated functions and enums while building */
-+#define GSL_DISABLE_DEPRECATED 1])
-+
-+dnl
-+AC_CONFIG_FILES([            \
-+Makefile                     \
-+gsl_version.h                \
-+gsl.spec                     \
-+blas/Makefile                \
-+block/Makefile               \
-+bspline/Makefile             \
-+cblas/Makefile               \
-+cdf/Makefile                 \
-+cheb/Makefile                \
-+combination/Makefile         \
-+complex/Makefile             \
-+const/Makefile               \
-+deriv/Makefile               \
-+dht/Makefile                 \
-+diff/Makefile                \
-+doc/Makefile                 \
-+doc/examples/Makefile        \
-+eigen/Makefile               \
-+err/Makefile                 \
-+fit/Makefile                 \
-+fft/Makefile                 \
-+gsl/Makefile                 \
-+histogram/Makefile           \
-+ieee-utils/Makefile          \
-+integration/Makefile         \
-+interpolation/Makefile       \
-+linalg/Makefile              \
-+matrix/Makefile              \
-+min/Makefile                 \
-+monte/Makefile               \
-+multifit/Makefile            \
-+multifit_nlinear/Makefile    \
-+multilarge/Makefile          \
-+multilarge_nlinear/Makefile  \
-+multimin/Makefile            \
-+multiroots/Makefile          \
-+multiset/Makefile            \
-+ntuple/Makefile              \
-+ode-initval/Makefile         \
-+ode-initval2/Makefile        \
-+permutation/Makefile         \
-+poly/Makefile                \
-+qrng/Makefile                \
-+randist/Makefile             \
-+rng/Makefile                 \
-+roots/Makefile               \
-+rstat/Makefile               \
-+siman/Makefile               \
-+sort/Makefile                \
-+spblas/Makefile              \
-+splinalg/Makefile            \
-+spmatrix/Makefile            \
-+specfunc/Makefile            \
-+statistics/Makefile          \
-+sum/Makefile                 \
-+sys/Makefile                 \
-+test/Makefile                \
-+utils/Makefile               \
-+vector/Makefile              \
-+wavelet/Makefile             \
-+])
-+
-+AC_OUTPUT
-diff --git a/eigen/Makefile.am b/eigen/Makefile.am
-index c28bfde..14197a4 100644
---- a/eigen/Makefile.am
-+++ b/eigen/Makefile.am
-@@ -11,7 +11,7 @@ noinst_HEADERS =  qrstep.c
- 
- TESTS = $(check_PROGRAMS)
- 
--test_LDADD = libgsleigen.la  ../test/libgsltest.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la  ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../sys/libgslsys.la ../err/libgslerr.la ../utils/libutils.la ../rng/libgslrng.la ../sort/libgslsort.la
-+test_LDADD = libgsleigen.la  ../test/libgsltest.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la  ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../sys/libgslsys.la ../err/libgslerr.la ../utils/libutils.la ../rng/libgslrng.la ../sort/libgslsort.la
- 
- test_SOURCES = test.c
- 
-diff --git a/eigen/Makefile.am.porig b/eigen/Makefile.am.porig
-new file mode 100644
-index 0000000..c28bfde
---- /dev/null
-+++ b/eigen/Makefile.am.porig
-@@ -0,0 +1,18 @@
-+noinst_LTLIBRARIES = libgsleigen.la 
-+
-+check_PROGRAMS = test
-+
-+pkginclude_HEADERS = gsl_eigen.h
-+libgsleigen_la_SOURCES =  jacobi.c symm.c symmv.c nonsymm.c nonsymmv.c herm.c hermv.c gensymm.c gensymmv.c genherm.c genhermv.c gen.c genv.c sort.c francis.c schur.c
-+
-+AM_CPPFLAGS = -I$(top_srcdir)
-+
-+noinst_HEADERS =  qrstep.c
-+
-+TESTS = $(check_PROGRAMS)
-+
-+test_LDADD = libgsleigen.la  ../test/libgsltest.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la  ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../sys/libgslsys.la ../err/libgslerr.la ../utils/libutils.la ../rng/libgslrng.la ../sort/libgslsort.la
-+
-+test_SOURCES = test.c
-+
-+
-diff --git a/gsl-config.in b/gsl-config.in
-old mode 100755
-new mode 100644
-index 3f3fa61..c9c4262
---- a/gsl-config.in
-+++ b/gsl-config.in
-@@ -58,11 +58,11 @@ while test $# -gt 0; do
- 	;;
- 
-     --cflags)
--       	echo @GSL_CFLAGS@ 
-+       	echo @GSL_CFLAGS@ @CBLAS_CFLAGS@ 
-        	;;
- 
-     --libs)
--        : ${GSL_CBLAS_LIB=-lgslcblas}
-+        : ${GSL_CBLAS_LIB=@CBLAS_LIBS@}
- 	echo @GSL_LIBS@ $GSL_CBLAS_LIB @GSL_LIBM@
-        	;;
- 
-diff --git a/gsl-config.in.porig b/gsl-config.in.porig
-new file mode 100755
-index 0000000..3f3fa61
---- /dev/null
-+++ b/gsl-config.in.porig
-@@ -0,0 +1,80 @@
-+#! /bin/sh
-+
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+includedir=@includedir@
-+
-+usage()
-+{
-+    cat <<EOF
-+Usage: gsl-config [OPTION]
-+
-+Known values for OPTION are:
-+
-+  --prefix		show GSL installation prefix 
-+  --libs		print library linking information, with cblas
-+  --libs-without-cblas	print library linking information, without cblas
-+  --cflags		print pre-processor and compiler flags
-+  --help		display this help and exit
-+  --version		output version information
-+
-+An external CBLAS library can be specified using the GSL_CBLAS_LIB
-+environment variable. The GSL CBLAS library is used by default.
-+
-+EOF
-+
-+    exit $1
-+}
-+
-+if test $# -eq 0; then
-+    usage 1
-+fi
-+
-+cflags=false
-+libs=false
-+
-+while test $# -gt 0; do
-+    case "$1" in
-+    -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-+    *) optarg= ;;
-+    esac
-+
-+    case "$1" in
-+    --prefix=*)
-+	prefix=$optarg
-+	;;
-+
-+    --prefix)
-+	echo $prefix
-+	;;
-+
-+    --version)
-+	echo @VERSION@
-+	exit 0
-+	;;
-+
-+    --help)
-+	usage 0
-+	;;
-+
-+    --cflags)
-+       	echo @GSL_CFLAGS@ 
-+       	;;
-+
-+    --libs)
-+        : ${GSL_CBLAS_LIB=-lgslcblas}
-+	echo @GSL_LIBS@ $GSL_CBLAS_LIB @GSL_LIBM@
-+       	;;
-+
-+    --libs-without-cblas)
-+	echo @GSL_LIBS@ @GSL_LIBM@
-+       	;;
-+    *)
-+	usage
-+	exit 1
-+	;;
-+    esac
-+    shift
-+done
-+
-+exit 0
-diff --git a/gsl.pc.in b/gsl.pc.in
-index 5e9ef21..5a7a0f3 100644
---- a/gsl.pc.in
-+++ b/gsl.pc.in
-@@ -2,7 +2,7 @@ prefix=@prefix@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
- includedir=@includedir@
--GSL_CBLAS_LIB=-lgslcblas
-+GSL_CBLAS_LIB=@CBLAS_LIBS@
- 
- Name: GSL
- Description: GNU Scientific Library
-diff --git a/gsl.pc.in.porig b/gsl.pc.in.porig
-new file mode 100644
-index 0000000..5e9ef21
---- /dev/null
-+++ b/gsl.pc.in.porig
-@@ -0,0 +1,11 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+GSL_CBLAS_LIB=-lgslcblas
-+
-+Name: GSL
-+Description: GNU Scientific Library
-+Version: @VERSION@
-+Libs: @GSL_LIBS@ ${GSL_CBLAS_LIB} @GSL_LIBM@ @LIBS@
-+Cflags: @GSL_CFLAGS@
-diff --git a/interpolation/Makefile.am b/interpolation/Makefile.am
-index 1d80755..e45bd51 100644
---- a/interpolation/Makefile.am
-+++ b/interpolation/Makefile.am
-@@ -12,7 +12,7 @@ AM_CPPFLAGS = -I$(top_srcdir)
- 
- TESTS = $(check_PROGRAMS)
- 
--test_LDADD = libgslinterpolation.la ../poly/libgslpoly.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../cblas/libgslcblas.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-+test_LDADD = libgslinterpolation.la ../poly/libgslpoly.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la @CBLAS_LINK_LIBS@ ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
- 
- test_SOURCES = test.c
- 
-diff --git a/interpolation/Makefile.am.porig b/interpolation/Makefile.am.porig
-new file mode 100644
-index 0000000..1d80755
---- /dev/null
-+++ b/interpolation/Makefile.am.porig
-@@ -0,0 +1,18 @@
-+noinst_LTLIBRARIES = libgslinterpolation.la 
-+
-+check_PROGRAMS = test
-+
-+pkginclude_HEADERS = gsl_interp.h gsl_spline.h gsl_interp2d.h gsl_spline2d.h
-+
-+libgslinterpolation_la_SOURCES = accel.c akima.c cspline.c interp.c linear.c integ_eval.h spline.c poly.c steffen.c inline.c interp2d.c bilinear.c bicubic.c spline2d.c
-+
-+noinst_HEADERS = test2d.c
-+
-+AM_CPPFLAGS = -I$(top_srcdir)
-+
-+TESTS = $(check_PROGRAMS)
-+
-+test_LDADD = libgslinterpolation.la ../poly/libgslpoly.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../cblas/libgslcblas.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-+
-+test_SOURCES = test.c
-+
-diff --git a/linalg/Makefile.am b/linalg/Makefile.am
-index a6c15b0..447ebbe 100644
---- a/linalg/Makefile.am
-+++ b/linalg/Makefile.am
-@@ -13,4 +13,4 @@ TESTS = $(check_PROGRAMS)
- check_PROGRAMS = test
- 
- test_SOURCES = test.c
--test_LDADD = libgsllinalg.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la ../rng/libgslrng.la
-+test_LDADD = libgsllinalg.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la ../rng/libgslrng.la
-diff --git a/linalg/Makefile.am.porig b/linalg/Makefile.am.porig
-new file mode 100644
-index 0000000..a6c15b0
---- /dev/null
-+++ b/linalg/Makefile.am.porig
-@@ -0,0 +1,16 @@
-+noinst_LTLIBRARIES = libgsllinalg.la 
-+
-+pkginclude_HEADERS = gsl_linalg.h
-+
-+AM_CPPFLAGS = -I$(top_srcdir)
-+
-+libgsllinalg_la_SOURCES = cod.c condest.c invtri.c multiply.c exponential.c tridiag.c tridiag.h lu.c luc.c hh.c qr.c qrpt.c lq.c ptlq.c svd.c householder.c householdercomplex.c hessenberg.c hesstri.c cholesky.c choleskyc.c mcholesky.c pcholesky.c symmtd.c hermtd.c bidiag.c balance.c balancemat.c inline.c
-+
-+noinst_HEADERS = apply_givens.c cholesky_common.c svdstep.c tridiag.h test_cholesky.c
-+
-+TESTS = $(check_PROGRAMS)
-+
-+check_PROGRAMS = test
-+
-+test_SOURCES = test.c
-+test_LDADD = libgsllinalg.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la ../rng/libgslrng.la
-diff --git a/multifit/Makefile.am b/multifit/Makefile.am
-index 988614e..793b485 100644
---- a/multifit/Makefile.am
-+++ b/multifit/Makefile.am
-@@ -67,8 +67,8 @@ check_PROGRAMS = test #demo
- TESTS = $(check_PROGRAMS)
- 
- test_SOURCES = test.c
--test_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../sort/libgslsort.la ../statistics/libgslstatistics.la ../vector/libgslvector.la ../block/libgslblock.la  ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la ../rng/libgslrng.la ../specfunc/libgslspecfunc.la ../min/libgslmin.la
-+test_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../sort/libgslsort.la ../statistics/libgslstatistics.la ../vector/libgslvector.la ../block/libgslblock.la  ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la ../rng/libgslrng.la ../specfunc/libgslspecfunc.la ../min/libgslmin.la
- 
- #demo_SOURCES = demo.c
--#demo_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../randist/libgslrandist.la ../rng/libgslrng.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la
-+#demo_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../randist/libgslrandist.la ../rng/libgslrng.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la
- 
-diff --git a/multifit/Makefile.am.porig b/multifit/Makefile.am.porig
-new file mode 100644
-index 0000000..988614e
---- /dev/null
-+++ b/multifit/Makefile.am.porig
-@@ -0,0 +1,74 @@
-+noinst_LTLIBRARIES = libgslmultifit.la 
-+
-+pkginclude_HEADERS = gsl_multifit.h gsl_multifit_nlin.h
-+
-+AM_CPPFLAGS = -I$(top_srcdir)
-+
-+libgslmultifit_la_SOURCES = gcv.c multilinear.c multiwlinear.c work.c lmniel.c lmder.c fsolver.c fdfsolver.c fdfridge.c fdjac.c convergence.c gradient.c covar.c multirobust.c robust_wfun.c multireg.c
-+
-+noinst_HEADERS =        \
-+linear_common.c         \
-+lmutil.c                \
-+lmpar.c                 \
-+lmset.c                 \
-+lmiterate.c             \
-+lmmisc.c                \
-+qrsolv.c                \
-+test_bard.c             \
-+test_beale.c            \
-+test_biggs.c            \
-+test_box.c              \
-+test_boxbod.c           \
-+test_brown1.c           \
-+test_brown2.c           \
-+test_brown3.c           \
-+test_eckerle.c          \
-+test_enso.c             \
-+test_estimator.c        \
-+test_exp1.c             \
-+test_filip.c            \
-+test_gaussian.c         \
-+test_hahn1.c            \
-+test_helical.c          \
-+test_jennrich.c         \
-+test_kirby2.c           \
-+test_kowalik.c          \
-+test_lin1.c             \
-+test_lin2.c             \
-+test_lin3.c             \
-+test_linear.c           \
-+test_longley.c          \
-+test_meyer.c            \
-+test_meyerscal.c        \
-+test_nelson.c           \
-+test_nonlinear.c        \
-+test_osborne.c          \
-+test_penalty1.c         \
-+test_penalty2.c         \
-+test_pontius.c          \
-+test_powell1.c          \
-+test_powell2.c          \
-+test_powell3.c          \
-+test_rat42.c            \
-+test_rat43.c            \
-+test_reg.c              \
-+test_rosenbrock.c       \
-+test_rosenbrocke.c      \
-+test_roth.c             \
-+test_shaw.c             \
-+test_thurber.c          \
-+test_vardim.c           \
-+test_watson.c           \
-+test_wnlin.c            \
-+test_wood.c
-+
-+check_PROGRAMS = test #demo
-+
-+TESTS = $(check_PROGRAMS)
-+
-+test_SOURCES = test.c
-+test_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../sort/libgslsort.la ../statistics/libgslstatistics.la ../vector/libgslvector.la ../block/libgslblock.la  ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la ../rng/libgslrng.la ../specfunc/libgslspecfunc.la ../min/libgslmin.la
-+
-+#demo_SOURCES = demo.c
-+#demo_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../randist/libgslrandist.la ../rng/libgslrng.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la
-+
-diff --git a/multimin/Makefile.am b/multimin/Makefile.am
-index 7071359..65a488a 100644
---- a/multimin/Makefile.am
-+++ b/multimin/Makefile.am
-@@ -13,8 +13,8 @@ check_PROGRAMS = test #demo
- TESTS = $(check_PROGRAMS) 
- 
- test_SOURCES = test.c test_funcs.c test_funcs.h
--test_LDADD = libgslmultimin.la ../min/libgslmin.la ../poly/libgslpoly.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-+test_LDADD = libgslmultimin.la ../min/libgslmin.la ../poly/libgslpoly.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
- 
- #demo_SOURCES = demo.c 
--#demo_LDADD = libgslmultimin.la ../min/libgslmin.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../linalg/libgsllinalg.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-+#demo_LDADD = libgslmultimin.la ../min/libgslmin.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../linalg/libgsllinalg.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
- 
-diff --git a/multimin/Makefile.am.porig b/multimin/Makefile.am.porig
-new file mode 100644
-index 0000000..7071359
---- /dev/null
-+++ b/multimin/Makefile.am.porig
-@@ -0,0 +1,20 @@
-+noinst_LTLIBRARIES = libgslmultimin.la 
-+
-+pkginclude_HEADERS = gsl_multimin.h
-+
-+AM_CPPFLAGS = -I$(top_srcdir)
-+
-+libgslmultimin_la_SOURCES = fdfminimizer.c steepest_descent.c conjugate_fr.c conjugate_pr.c convergence.c diff.c vector_bfgs.c vector_bfgs2.c fminimizer.c simplex.c simplex2.c
-+
-+noinst_HEADERS = directional_minimize.c linear_minimize.c linear_wrapper.c
-+
-+check_PROGRAMS = test #demo
-+
-+TESTS = $(check_PROGRAMS) 
-+
-+test_SOURCES = test.c test_funcs.c test_funcs.h
-+test_LDADD = libgslmultimin.la ../min/libgslmin.la ../poly/libgslpoly.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-+
-+#demo_SOURCES = demo.c 
-+#demo_LDADD = libgslmultimin.la ../min/libgslmin.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../linalg/libgsllinalg.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-+
-diff --git a/multiroots/Makefile.am b/multiroots/Makefile.am
-index a351c3f..6178448 100644
---- a/multiroots/Makefile.am
-+++ b/multiroots/Makefile.am
-@@ -15,5 +15,5 @@ check_PROGRAMS = test
- TESTS = $(check_PROGRAMS)
- 
- test_SOURCES = test.c test_funcs.c test_funcs.h
--test_LDADD = libgslmultiroots.la ../linalg/libgsllinalg.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-+test_LDADD = libgslmultiroots.la ../linalg/libgsllinalg.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
- 
-diff --git a/multiroots/Makefile.am.porig b/multiroots/Makefile.am.porig
-new file mode 100644
-index 0000000..a351c3f
---- /dev/null
-+++ b/multiroots/Makefile.am.porig
-@@ -0,0 +1,19 @@
-+# -*-makefile-*-
-+
-+noinst_LTLIBRARIES = libgslmultiroots.la 
-+
-+pkginclude_HEADERS = gsl_multiroots.h
-+
-+noinst_HEADERS = enorm.c dogleg.c
-+
-+AM_CPPFLAGS = -I$(top_srcdir)
-+
-+libgslmultiroots_la_SOURCES = fdjac.c fsolver.c fdfsolver.c convergence.c  newton.c gnewton.c dnewton.c broyden.c hybrid.c hybridj.c
-+
-+check_PROGRAMS = test
-+
-+TESTS = $(check_PROGRAMS)
-+
-+test_SOURCES = test.c test_funcs.c test_funcs.h
-+test_LDADD = libgslmultiroots.la ../linalg/libgsllinalg.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-+
-diff --git a/ode-initval/Makefile.am b/ode-initval/Makefile.am
-index 9c774b5..346c381 100644
---- a/ode-initval/Makefile.am
-+++ b/ode-initval/Makefile.am
-@@ -12,7 +12,7 @@ check_PROGRAMS = test
- 
- TESTS = $(check_PROGRAMS)
- 
--test_LDADD = libgslodeiv.la ../linalg/libgsllinalg.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../permutation/libgslpermutation.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la 
-+test_LDADD = libgslodeiv.la ../linalg/libgsllinalg.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../permutation/libgslpermutation.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la 
- 
- test_SOURCES = test.c
- 
-diff --git a/ode-initval/Makefile.am.porig b/ode-initval/Makefile.am.porig
-new file mode 100644
-index 0000000..9c774b5
---- /dev/null
-+++ b/ode-initval/Makefile.am.porig
-@@ -0,0 +1,18 @@
-+noinst_LTLIBRARIES = libgslodeiv.la 
-+
-+pkginclude_HEADERS = gsl_odeiv.h
-+
-+AM_CPPFLAGS = -I$(top_srcdir)
-+
-+libgslodeiv_la_SOURCES = control.c cstd.c cscal.c evolve.c step.c rk2.c rk2imp.c rk2simp.c rk4.c rk4imp.c rkf45.c rk8pd.c rkck.c bsimp.c gear1.c gear2.c
-+
-+noinst_HEADERS = odeiv_util.h
-+
-+check_PROGRAMS = test
-+
-+TESTS = $(check_PROGRAMS)
-+
-+test_LDADD = libgslodeiv.la ../linalg/libgsllinalg.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../permutation/libgslpermutation.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la 
-+
-+test_SOURCES = test.c
-+
-diff --git a/poly/Makefile.am b/poly/Makefile.am
-index f1dae5d..e0f8e83 100644
---- a/poly/Makefile.am
-+++ b/poly/Makefile.am
-@@ -10,7 +10,7 @@ noinst_HEADERS = balance.c companion.c qr.c
- 
- TESTS = $(check_PROGRAMS)
- 
--check_PROGRAMS = test
-+#check_PROGRAMS = test
- 
- test_SOURCES = test.c
- test_LDADD = libgslpoly.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la ../sort/libgslsort.la
-diff --git a/poly/Makefile.am.porig b/poly/Makefile.am.porig
-new file mode 100644
-index 0000000..f1dae5d
---- /dev/null
-+++ b/poly/Makefile.am.porig
-@@ -0,0 +1,17 @@
-+noinst_LTLIBRARIES = libgslpoly.la 
-+
-+pkginclude_HEADERS = gsl_poly.h
-+
-+AM_CPPFLAGS = -I$(top_srcdir)
-+
-+libgslpoly_la_SOURCES = dd.c eval.c solve_quadratic.c solve_cubic.c zsolve_quadratic.c zsolve_cubic.c zsolve.c zsolve_init.c deriv.c
-+
-+noinst_HEADERS = balance.c companion.c qr.c
-+
-+TESTS = $(check_PROGRAMS)
-+
-+check_PROGRAMS = test
-+
-+test_SOURCES = test.c
-+test_LDADD = libgslpoly.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la ../sort/libgslsort.la
-+
-diff --git a/specfunc/Makefile.am b/specfunc/Makefile.am
-index eba9ab2..772cc7e 100644
---- a/specfunc/Makefile.am
-+++ b/specfunc/Makefile.am
-@@ -12,7 +12,7 @@ TESTS = $(check_PROGRAMS)
- 
- check_PROGRAMS = test
- 
--test_LDADD = libgslspecfunc.la ../eigen/libgsleigen.la ../linalg/libgsllinalg.la  ../sort/libgslsort.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../block/libgslblock.la ../complex/libgslcomplex.la ../poly/libgslpoly.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-+test_LDADD = libgslspecfunc.la ../eigen/libgsleigen.la ../linalg/libgsllinalg.la  ../sort/libgslsort.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../block/libgslblock.la ../complex/libgslcomplex.la ../poly/libgslpoly.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
- 
- test_SOURCES = test_sf.c test_sf.h test_airy.c test_bessel.c test_coulomb.c test_dilog.c test_gamma.c test_hyperg.c test_legendre.c test_mathieu.c
-   
-diff --git a/specfunc/Makefile.am.porig b/specfunc/Makefile.am.porig
-new file mode 100644
-index 0000000..eba9ab2
---- /dev/null
-+++ b/specfunc/Makefile.am.porig
-@@ -0,0 +1,19 @@
-+noinst_LTLIBRARIES = libgslspecfunc.la 
-+
-+pkginclude_HEADERS = gsl_sf.h gsl_sf_airy.h gsl_sf_bessel.h gsl_sf_clausen.h gsl_sf_coulomb.h gsl_sf_coupling.h gsl_sf_dawson.h gsl_sf_debye.h gsl_sf_dilog.h gsl_sf_elementary.h gsl_sf_ellint.h gsl_sf_elljac.h gsl_sf_erf.h gsl_sf_exp.h gsl_sf_expint.h gsl_sf_fermi_dirac.h gsl_sf_gamma.h gsl_sf_gegenbauer.h gsl_sf_hyperg.h gsl_sf_laguerre.h gsl_sf_lambert.h gsl_sf_legendre.h gsl_sf_log.h gsl_sf_mathieu.h gsl_sf_pow_int.h gsl_sf_psi.h gsl_sf_result.h gsl_sf_synchrotron.h gsl_sf_transport.h gsl_sf_trig.h gsl_sf_zeta.h gsl_specfunc.h
-+
-+noinst_HEADERS = bessel_amp_phase.h bessel_olver.h bessel_temme.h bessel.h hyperg.h legendre.h eval.h chebyshev.h cheb_eval.c cheb_eval_mode.c check.h error.h legendre_source.c
-+
-+AM_CPPFLAGS = -I$(top_srcdir)
-+
-+libgslspecfunc_la_SOURCES = airy.c airy_der.c airy_zero.c atanint.c bessel.c bessel.h bessel_I0.c bessel_I1.c bessel_In.c bessel_Inu.c bessel_J0.c bessel_J1.c bessel_Jn.c bessel_Jnu.c bessel_K0.c bessel_K1.c bessel_Kn.c bessel_Knu.c bessel_Y0.c bessel_Y1.c bessel_Yn.c bessel_Ynu.c bessel_amp_phase.c bessel_amp_phase.h bessel_i.c bessel_j.c bessel_k.c bessel_olver.c bessel_temme.c bessel_y.c bessel_zero.c bessel_sequence.c beta.c beta_inc.c clausen.c coulomb.c coupling.c coulomb_bound.c dawson.c debye.c dilog.c elementary.c ellint.c elljac.c erfc.c exp.c expint.c expint3.c fermi_dirac.c gegenbauer.c gamma.c gamma_inc.c hyperg_0F1.c hyperg_2F0.c hyperg_1F1.c hyperg_2F1.c hyperg_U.c hyperg.c laguerre.c lambert.c legendre_H3d.c legendre_P.c legendre_Qn.c legendre_con.c legendre_poly.c log.c mathieu_angfunc.c mathieu_charv.c mathieu_coeff.c mathieu_radfunc.c mathieu_workspace.c poch.c pow_int.c psi.c recurse.h result.c shint.c sinint.c synchrotron.c transport.c trig.c zeta.c
-+
-+TESTS = $(check_PROGRAMS)
-+
-+check_PROGRAMS = test
-+
-+test_LDADD = libgslspecfunc.la ../eigen/libgsleigen.la ../linalg/libgsllinalg.la  ../sort/libgslsort.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../block/libgslblock.la ../complex/libgslcomplex.la ../poly/libgslpoly.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-+
-+test_SOURCES = test_sf.c test_sf.h test_airy.c test_bessel.c test_coulomb.c test_dilog.c test_gamma.c test_hyperg.c test_legendre.c test_mathieu.c
-+  
-+
-diff --git a/wavelet/Makefile.am b/wavelet/Makefile.am
-index 9da20d8..8cdbd77 100644
---- a/wavelet/Makefile.am
-+++ b/wavelet/Makefile.am
-@@ -10,7 +10,7 @@ check_PROGRAMS = test
- 
- TESTS = $(check_PROGRAMS)
- 
--test_LDADD = libgslwavelet.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-+test_LDADD = libgslwavelet.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
- 
- test_SOURCES = test.c
- 
-diff --git a/wavelet/Makefile.am.porig b/wavelet/Makefile.am.porig
-new file mode 100644
-index 0000000..9da20d8
---- /dev/null
-+++ b/wavelet/Makefile.am.porig
-@@ -0,0 +1,17 @@
-+noinst_LTLIBRARIES = libgslwavelet.la 
-+
-+pkginclude_HEADERS = gsl_wavelet.h gsl_wavelet2d.h
-+
-+AM_CPPFLAGS = -I$(top_srcdir)
-+
-+libgslwavelet_la_SOURCES = dwt.c wavelet.c bspline.c daubechies.c haar.c
-+
-+check_PROGRAMS = test
-+
-+TESTS = $(check_PROGRAMS)
-+
-+test_LDADD = libgslwavelet.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
-+
-+test_SOURCES = test.c
-+
-+
diff --git a/sci-libs/gsl/gsl-1.16.ebuild b/sci-libs/gsl/gsl-1.16.ebuild
index a26b3b72f776..b09b5db24967 100644
--- a/sci-libs/gsl/gsl-1.16.ebuild
+++ b/sci-libs/gsl/gsl-1.16.ebuild
@@ -7,7 +7,8 @@ inherit eutils flag-o-matic autotools toolchain-funcs
 
 DESCRIPTION="The GNU Scientific Library"
 HOMEPAGE="https://www.gnu.org/software/gsl/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
+	https://dev.gentoo.org/~mgorny/dist/${P}-cblas.patch.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -45,7 +46,7 @@ src_prepare() {
 		&& filter-mfpmath sse
 	filter-flags -ffast-math
 
-	epatch "${FILESDIR}"/${P}-cblas.patch
+	epatch "${WORKDIR}"/${P}-cblas.patch
 	eautoreconf
 
 	cp "${FILESDIR}"/eselect.cblas.gsl "${T}"/ || die
diff --git a/sci-libs/gsl/gsl-2.1.ebuild b/sci-libs/gsl/gsl-2.1.ebuild
deleted file mode 100644
index b380fcc5bb81..000000000000
--- a/sci-libs/gsl/gsl-2.1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="The GNU Scientific Library"
-HOMEPAGE="https://www.gnu.org/software/gsl/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/19"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="cblas-external static-libs"
-
-RDEPEND="cblas-external? ( virtual/cblas )"
-DEPEND="${RDEPEND}
-	app-eselect/eselect-cblas
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${P}-cblas.patch )
-
-pkg_pretend() {
-	# prevent to use external cblas from a previously installed gsl
-	local current_lib
-	if use cblas-external; then
-		current_lib=$(eselect cblas show | cut -d' ' -f2)
-		if [[ ${current_lib} == gsl ]]; then
-			ewarn "USE flag cblas-external is set: linking gsl with an external cblas."
-			ewarn "However the current selected external cblas is gsl."
-			ewarn "Please install and/or eselect another cblas"
-			die "Circular gsl dependency"
-		fi
-	fi
-}
-
-src_prepare() {
-	ESELECT_PROF="gsl"
-
-	# bug 349005
-	[[ $(tc-getCC)$ == *gcc* ]] && \
-		[[ $(tc-getCC)$ != *apple* ]] && \
-		[[ $(gcc-major-version)$(gcc-minor-version) -eq 44 ]] \
-		&& filter-mfpmath sse
-	filter-flags -ffast-math
-
-	default
-	eautoreconf
-
-	cp "${FILESDIR}"/eselect.cblas.gsl "${T}"/
-	sed -i -e "s:/usr:${EPREFIX}/usr:" "${T}"/eselect.cblas.gsl || die
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -i -e 's/\.so\([\.0-9]\+\)\?/\1.dylib/g' \
-			"${T}"/eselect.cblas.gsl || die
-	fi
-}
-
-src_configure() {
-	if use cblas-external; then
-		export CBLAS_LIBS="$($(tc-getPKG_CONFIG) --libs cblas)"
-		export CBLAS_CFLAGS="$($(tc-getPKG_CONFIG) --cflags cblas)"
-	fi
-	econf \
-		--enable-shared \
-		$(use_with cblas-external) \
-		$(use_enable static-libs static)
-}
-
-src_test() {
-	local MAKEOPTS="${MAKEOPTS} -j1"
-	default
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -exec rm -f {} +
-
-	# take care of pkgconfig file for cblas implementation.
-	sed \
-		-e "s/@LIBDIR@/$(get_libdir)/" \
-		-e "s/@PV@/${PV}/" \
-		-e "/^prefix=/s:=:=${EPREFIX}:" \
-		-e "/^libdir=/s:=:=${EPREFIX}:" \
-		"${FILESDIR}"/cblas.pc.in > cblas.pc \
-		|| die "sed cblas.pc failed"
-	insinto /usr/$(get_libdir)/blas/gsl
-	doins cblas.pc
-	eselect cblas add $(get_libdir) "${T}"/eselect.cblas.gsl \
-		${ESELECT_PROF}
-}
-
-pkg_postinst() {
-	local p=cblas
-	local current_lib=$(eselect ${p} show | cut -d' ' -f2)
-	if [[ ${current_lib} == ${ESELECT_PROF} || -z ${current_lib} ]]; then
-		# work around eselect bug #189942
-		local configfile="${EROOT}"/etc/env.d/${p}/$(get_libdir)/config
-		[[ -e ${configfile} ]] && rm -f ${configfile}
-		eselect ${p} set ${ESELECT_PROF}
-		elog "${p} has been eselected to ${ESELECT_PROF}"
-	else
-		elog "Current eselected ${p} is ${current_lib}"
-		elog "To use ${p} ${ESELECT_PROF} implementation, you have to issue (as root):"
-		elog "\t eselect ${p} set ${ESELECT_PROF}"
-	fi
-}
diff --git a/sci-libs/gsl/gsl-2.3.ebuild b/sci-libs/gsl/gsl-2.3.ebuild
deleted file mode 100644
index 9e70befa7198..000000000000
--- a/sci-libs/gsl/gsl-2.3.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="The GNU Scientific Library"
-HOMEPAGE="https://www.gnu.org/software/gsl/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/19.3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="cblas-external +deprecated static-libs"
-
-RDEPEND="cblas-external? ( virtual/cblas )"
-DEPEND="${RDEPEND}
-	app-eselect/eselect-cblas
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${P}-cblas.patch )
-
-pkg_pretend() {
-	# prevent to use external cblas from a previously installed gsl
-	local current_lib
-	if use cblas-external; then
-		current_lib=$(eselect cblas show | cut -d' ' -f2)
-		if [[ ${current_lib} == gsl ]]; then
-			ewarn "USE flag cblas-external is set: linking gsl with an external cblas."
-			ewarn "However the current selected external cblas is gsl."
-			ewarn "Please install and/or eselect another cblas"
-			die "Circular gsl dependency"
-		fi
-	fi
-}
-
-src_prepare() {
-	ESELECT_PROF="gsl"
-
-	# bug 349005
-	[[ $(tc-getCC)$ == *gcc* ]] && \
-		[[ $(tc-getCC)$ != *apple* ]] && \
-		[[ $(gcc-major-version)$(gcc-minor-version) -eq 44 ]] \
-		&& filter-mfpmath sse
-	filter-flags -ffast-math
-
-	default
-	if use deprecated; then
-		sed -i -e "/GSL_DISABLE_DEPRECATED/,+2d" configure.ac || die
-	fi
-	eautoreconf
-
-	cp "${FILESDIR}"/eselect.cblas.gsl "${T}"/ || die
-	sed -i -e "s:/usr:${EPREFIX}/usr:" "${T}"/eselect.cblas.gsl || die
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -i -e 's/\.so\([\.0-9]\+\)\?/\1.dylib/g' \
-			"${T}"/eselect.cblas.gsl || die
-	fi
-}
-
-src_configure() {
-	if use cblas-external; then
-		export CBLAS_LIBS="$($(tc-getPKG_CONFIG) --libs cblas)"
-		export CBLAS_CFLAGS="$($(tc-getPKG_CONFIG) --cflags cblas)"
-	fi
-	econf \
-		--enable-shared \
-		$(use_with cblas-external) \
-		$(use_enable static-libs static)
-}
-
-src_test() {
-	local MAKEOPTS="${MAKEOPTS} -j1"
-	default
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -exec rm -f {} +
-
-	# take care of pkgconfig file for cblas implementation.
-	sed \
-		-e "s/@LIBDIR@/$(get_libdir)/" \
-		-e "s/@PV@/${PV}/" \
-		-e "/^prefix=/s:=:=${EPREFIX}:" \
-		-e "/^libdir=/s:=:=${EPREFIX}:" \
-		"${FILESDIR}"/cblas.pc.in > cblas.pc \
-		|| die "sed cblas.pc failed"
-	insinto /usr/$(get_libdir)/blas/gsl
-	doins cblas.pc
-	eselect cblas add $(get_libdir) "${T}"/eselect.cblas.gsl \
-		${ESELECT_PROF}
-}
-
-pkg_postinst() {
-	local p=cblas
-	local current_lib=$(eselect ${p} show | cut -d' ' -f2)
-	if [[ ${current_lib} == ${ESELECT_PROF} || -z ${current_lib} ]]; then
-		# work around eselect bug #189942
-		local configfile="${EROOT}"/etc/env.d/${p}/$(get_libdir)/config
-		[[ -e ${configfile} ]] && rm -f ${configfile}
-		eselect ${p} set ${ESELECT_PROF}
-		elog "${p} has been eselected to ${ESELECT_PROF}"
-	else
-		elog "Current eselected ${p} is ${current_lib}"
-		elog "To use ${p} ${ESELECT_PROF} implementation, you have to issue (as root):"
-		elog "\t eselect ${p} set ${ESELECT_PROF}"
-	fi
-}
diff --git a/sci-libs/gsl/gsl-2.4.ebuild b/sci-libs/gsl/gsl-2.4.ebuild
index 659ed95f7978..fa10b54618ce 100644
--- a/sci-libs/gsl/gsl-2.4.ebuild
+++ b/sci-libs/gsl/gsl-2.4.ebuild
@@ -7,7 +7,8 @@ inherit autotools eutils flag-o-matic toolchain-funcs
 
 DESCRIPTION="The GNU Scientific Library"
 HOMEPAGE="https://www.gnu.org/software/gsl/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
+	https://dev.gentoo.org/~mgorny/dist/${PN}-2.3-cblas.patch.bz2"
 
 LICENSE="GPL-3"
 SLOT="0/23"
@@ -19,7 +20,7 @@ DEPEND="${RDEPEND}
 	app-eselect/eselect-cblas
 	virtual/pkgconfig"
 
-PATCHES=( "${FILESDIR}"/${PN}-2.3-cblas.patch )
+PATCHES=( "${WORKDIR}"/${PN}-2.3-cblas.patch )
 
 pkg_pretend() {
 	# prevent to use external cblas from a previously installed gsl
diff --git a/sci-libs/mmdb/Manifest b/sci-libs/mmdb/Manifest
index 77823a6f24c6..4e76a77df291 100644
--- a/sci-libs/mmdb/Manifest
+++ b/sci-libs/mmdb/Manifest
@@ -1,6 +1,10 @@
 AUX mmdb-1.25.5-include-path.patch 362 BLAKE2B 930b83c0afe026aaa385853de8496ebbe5f49b4c78590a42a68ffa6c22697d4e67051897c29e7b110d2b1c61ac4e5efc7389afa5a0afd0db77d3d5d0a6b7cf8c SHA512 60b110b173867c4b3eb45ad370141950046e248dd94d6496e8c8a14a72051a24cdfe805a2401083d53b471893d4e528a8f953ed28935393ab40201a973921f3b
 DIST mmdb-1.25.5.tar.gz 732911 BLAKE2B 6c0d49ca028c0140df6cd513d66cd260087f747a755a85508dac2e24c63ed17d684b368e76fe2582c4921f1cf6bbb4cd7fa33cc5e47b6ef79af6fad1b5f1c8ef SHA512 19784f119422e176ff97c0f40256815584ddf2156570593047125ffaf509c961840619799ce20c43efb330d22f068f96c061d31aa5bc5851f538da1742152ba0
+DIST mmdb-1.25.6.1.tar.gz 992256 BLAKE2B cef269f4428b5a553075e6c2d33568ead3271ec4dd87fef5524072530723b8f59760a8dc5c523a985ccb922cef52bcdf88b18334626a71059994ce2a9b30ed8f SHA512 b253ee6096ea90202c061d579d98f324a53de17dad9db0a426e1a2106b23eecf6ec90667697f1e88a5f7b05fc45a0bbd2faada997de3ecca5b0f2b548520bd5c
 DIST mmdb2-2.0.1.tar.gz 721759 BLAKE2B ea79bbbeef345b1e9d7240ec31f67a217e7c9312827f0333d1b089be8b265bf09baf5b54f2d8edd7eee17a530dd9931bd4ec0b6377aa2a15cec67b6ec142e345 SHA512 00465204aa2b76867f805259d25653d48e0e4fe5eabb3929b86a9e3ae8d88345737ca187cfd21dc6c2808e6e8da9c9d61c11be2f587e733390bc69e5ef87b7cd
+DIST mmdb2-2.0.5.tar.gz 733138 BLAKE2B 8197fbd0331aa770144e9fa56ac6a3a89f58fb226d83f1e55afeb1d7df31f194ccaba6fe4a851cd326e77d7362bb5c1fb6d731823690cc9c7295d50d8b7427f8 SHA512 dfcbe9f84a62251976fc44f0a63dfd19306245aa147d7eb0cc7875d4c9295eac3d01bc4aeb165c04e0613e4d0b9bb0e8e6bcaf3872ed1da29e3e66ac4ec8bcc4
 EBUILD mmdb-1.25.5-r1.ebuild 487 BLAKE2B 6d600888c83ce61aa55575f4b1593b4144b741521ce345220f350e429efd5e734d73c10a77470ed676818f0ed9fa2710b9dab0168a2997a6b0f0aa7c7fa82c88 SHA512 983840011e3e1fe935b61b5687d80d21c2358b3b521768551f34c3c81a16522e6ba024d0d470d83d67dff17ae1bc6294c30855a269c29dbf0f91d84e8c2de62f
+EBUILD mmdb-1.25.6.1.ebuild 486 BLAKE2B 55ecf364e9567c6d98961eef9cd59a05fcfe7b83e1c7eb8286dafeeb951c43adfca391c9b44b055147fa3a5bea3324b02dccbc092d8f328ec2685c4152fa2501 SHA512 590b8d4cad702f7b7f6f37bac4eb50f56b09dae6c62e54143d5a6b6ea6fa172faada73119d3609c03f0bf7b93232a879f200b31d3d81cc4871e678e5bb66aa07
 EBUILD mmdb-2.0.1.ebuild 484 BLAKE2B 320fa1dfb1c044c237b78c902af2ba2bcbc8f98b453ae416ea69f624d8873a8087bee4895547546d4a958bce6767115622f288bac33bccb00e9c19822ed8b999 SHA512 a0cd76203854c4b8963e9d3ee5846d3538887b4f8d3d12644591d98b3659ce1b1ec95fecf118e76e21ca7f885e9ab8575976d1a66976ffe2262a71f5c5a97bee
+EBUILD mmdb-2.0.5.ebuild 459 BLAKE2B e008e224cb896fb6be50806abab9123985753e75d5e6d4d265d6fc8387409a12d212691c473e65cc98578606152222e94feb6787f595ecf68c9f29d77a343726 SHA512 76e69c6b3c64f7e1ae68a0f92f4ab0377c4a3fb0e194b438ba53c3ad543cca7dba679702a0fb9df964eb1d4a5cd0596b2fee2956bbd0aa8754ba490344040659
 MISC metadata.xml 347 BLAKE2B c20fb359d6159c1526170b6a97b97413e4d13d6cd824ca18ffa1605e5afb5df030e88bed371d3716489dab5a23c6f482d995df74f31d2853ab0845c44f92f405 SHA512 4638d7dff2f4e4b84c0acb9f4084141bede8166faf8354ef61656597f69584493f64f7552c3f79849d8d910cdfb93292ad1625589e1f9aa175ea4e2e26af90f8
diff --git a/sci-libs/mmdb/mmdb-1.25.6.1.ebuild b/sci-libs/mmdb/mmdb-1.25.6.1.ebuild
new file mode 100644
index 000000000000..d63c4003a026
--- /dev/null
+++ b/sci-libs/mmdb/mmdb-1.25.6.1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="The Coordinate Library for working with CCP4 coordinate files"
+HOMEPAGE="https://launchpad.net/mmdb/"
+SRC_URI="https://launchpad.net/mmdb/1.25/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="static-libs"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.25.5-include-path.patch )
diff --git a/sci-libs/mmdb/mmdb-2.0.5.ebuild b/sci-libs/mmdb/mmdb-2.0.5.ebuild
new file mode 100644
index 000000000000..c19513a77290
--- /dev/null
+++ b/sci-libs/mmdb/mmdb-2.0.5.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P="${PN}2-${PV}"
+
+DESCRIPTION="The Coordinate Library for working with CCP4 coordinate files"
+HOMEPAGE="https://launchpad.net/mmdb/"
+SRC_URI="ftp://ftp.ccp4.ac.uk/opensource/${MY_P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-3"
+SLOT="2"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="static-libs"
+
+S="${WORKDIR}"/${MY_P}
diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index dcfbc909f8a1..3cc7d9eb7694 100644
--- a/sci-physics/Manifest.gz
+++ b/sci-physics/Manifest.gz
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index f0086626a80a..08f4ec037fff 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -9,16 +9,14 @@ AUX root-5.34.05-nobyte-compile.patch 5504 BLAKE2B 052cc5ebd1fae7d439244ccf9f343
 AUX root-5.34.13-unuran.patch 1555 BLAKE2B b476c0f00dd0bfc1f6a6fc63957794cc932fc1e747b5900a0e4b5e2142b3a71b0fe3076591134b46df724b8f9ff5820064bc9cf1e1af4be2a77fb0414f28722c SHA512 571d6bd56d2419e4b96f7ca95d14d291768cc98024f871ca35bfae1a7d1e010a7c101f927c66ece4c006ca89401aeaea89945b8502f1ae2b2068f535d0bc95f3
 AUX root-5.34.26-ldflags.patch 626 BLAKE2B 3c3b8bf4d173afd6024843c0e125d8b64868f367de96775e23ae21ee6adc7fb294700372eb4a3743178728ef947fbaa18e1f3c18ca5731931ed0c1a7b1ab580c SHA512 fa38441a472b8b811c293aecbf1e233ea619cb4a2c9bfb8dda1706c0ac34bf5c3dcf23a43a517a72aab5faa63e733eee74515cbf70b6f15e3cfba46e3e5c4ccc
 AUX root-6.00.01-dotfont.patch 2718 BLAKE2B a130dac163b92a4a91edc22d39722a47fcdb51cb681500a8f734091e2dc0edb6aed4a7e964cbc22120064ea49694e5fd4d2555931da5f89c0f514f75eb7314cf SHA512 8f01655e863d36678dea37df934e3d8d9c2bc85920497345feb8d863bdc1b7413c783b916050d1e7b476ecdf9e1e8afdcbb32e621d625305898d51947b6955c6
-AUX root-6.00.01-llvm.patch 439 BLAKE2B ab63adacefc1758471ea5e369c36bca8c00af5e37b128dd0cc50fde9325db3d18a4afdd594f16c11c8d4b9ad9dd1e1efe7589d97571b40a16b004fcd05b1c4a1 SHA512 cb9edb78a937ace744687506a6ec45b9022b6c7ca687e8fe1e2ee2ddf9e01b49fe8d6933910e2898f14247bdcf5d86b248d28938d28e3453615d56d5f12291d0
-AUX root-6.00.01-nobyte-compile.patch 1308 BLAKE2B 84820b482b8e0052c24773f4c4e214175b28d9fcdd029df4aa55028eeddda575384543a8b7d72b32a2102fadab560797896f6c5b6615ba96aeedd0c9b924c3de SHA512 6387c3277ec16ceb23caa1952b3a9e3869fedd12ed1fd93a4241e865898cd74b4abfe99e0f6fb266cfd5f3a46ede98e56f933ed0ad83829e8445ef583555b674
-AUX root-6.02.05-xrootd4.patch 478 BLAKE2B 0565d04102fd3cf801896f7254e5a1befc667811042bbf53ac620fd406b960cfb00bdc98094c7784acb806e796b1c590382a6eca0aed8de3cc1d5b80a316a268 SHA512 47f37ca84c06d71fc207b18bc38798ccde457e61758ec56f84543aa4619929869e15dd53a8d7302bd4ca458b1e880428aafba4963d63bc5711f4540a096c4ff8
-AUX root-6.04.06-gsl2.patch 1980 BLAKE2B cdd16587648209fe9444b201f47e58748e0411e9869edb1b750b07034f106796d70ad98cf52457b61359a8fc7355d6a28a0f12c098f2f60007363280f59224fe SHA512 493a261589c766fe7ffb1936475466f7aa6ef8f97a99c99c3676149dc5a898621272916e38eaf98d45b4a6a6ef57c0c1eeff565d36d0a2c5c0286ba99c2ed59d
-AUX root-6.04.06-prop-flags.patch 732 BLAKE2B cc1ed237e72aca8954e95a14b8926d83fa6b06512c67db9156fd3f5b1cd1a677eb9fc506e52ad8ff7dfe224d4fe938e5db603225f88fecbc4b7a44d96bc482c8 SHA512 bdd2403c9d96fc3bb4a3a60c584aaa78128d4ed067ba173fd79c7a54e71cd9d3d400f13a4e9f056b4c985a9bdde815f5ae8f5ff22fd40e0a6ab49f38f1c589f5
 AUX root-6.11.02-hsimple.patch 1838 BLAKE2B e5d4a2a04580c1ebe4e1da4cf615939347bcf24003c240870252938421f189e5da3ffc4a913c2241fe93f78077373ac0614bd85d32c33ba0da2203fa906f520a SHA512 3ded889d7a79070d78824bbea059f6451c96d95ac7c45063b2328856111e3dd28677dfd9a0696d0d5cbbe200690ed3f940341966847745c4bcf2f7e235135e5b
+AUX root-6.12.04-find-oracle-12.patch 1013 BLAKE2B 82d9dfc161ede442a8102831abbe042561b5a0b700533b420a2e38cbeddd4d6a2360ec76bdcf5fdd281f3493b6088b39af8edc3bbb33280e6e401474346a9198 SHA512 539cc42a25b1bea39e844a5e8597426f8afe8ea882ea573a40aea9e20e8fe50c6913520239b3aa15195511dfd95fe2baebe2dbeb3fbeddee2e384b25d66d6dc8
+AUX root-6.12.04-no-ocaml.patch 1631 BLAKE2B 808da46144572073e6fac54859a60a9f056e164a4f31718f2962197f162ced11a6f1e9839af50d1d9c720dc0e2811f9eabef4901dfbe0c14d055315abf9dcdad SHA512 37d78c57b05a20088794cf887d60514c932b6b11b2a918b4b2621700be281df80adf3f17d76da17a146e4e941bf472a0a1ddcbbf14406e5d49bd3b8e4dbf3c50
+AUX root-6.12.04-z3.patch 1155 BLAKE2B 31d099bb260a030d88fcfbe0c9c5a7953738619b216da4140e087b29fead0bfd05bd22aa75da99521689decfb54caa23e0b50a9be9c34fe2fd75596b99b13092 SHA512 ca82ed6f3a0eb9e0ae13a0c354eab0a7c9c18e93ef444418f5786decdd8600184a6c2d5deb6d54d1a852076988645a0fbd215459cd15f5569f54606d74ee3e18
 AUX rootd.confd 199 BLAKE2B d7638f5ee8ccb4fcb428d07c59d776a9ab8773fa8a8911281e8f76b32fab5902e3f6f6086ad210af39480df514c947719cc5e76d29c7dbf2a8715ae58ef49880 SHA512 2ce6753d37a7f22cc3656f110f802b8e07c1469bfe4524606c1472369352f8c584c01c716760252fab40369470b72d8c77cdbb2d52126c39371faaf597bf58d8
 AUX rootd.initd 622 BLAKE2B 7edeaf3cf550303642a89eb69edb65e6625215ac2daae5766904bcc14f1b30f6277c6eac6b895f46fbda01656df80cb71fdad6294a19bf581badceaa29278fdf SHA512 fde858a37b52540285d228e52845c963b18065a250aef0753f469753d541f577ac401f01438297c030e47176350bb23c3c0280c9b4ccbc1feda3313ab7c9be2e
 DIST root_v5.34.36.source.tar.gz 75427331 BLAKE2B 203af03e1459c7fe079fcb1b30da145b3262f90c074abb7ff8fb3b1b2b90ac24391ce51aa8afbd10e0db8d69549207f15176207bc30a13720e0ae94342a38dfa SHA512 2cc0c8f8b63b2a3ce01c49c41704483548a7324d92c21a63e3e36a00f4d6f5656a7844fdf48cb71a6f2a2c974112527300ffd3bb5502d8365ffaf138e6ae4c7a
 DIST root_v6.12.04.source.tar.gz 162106020 BLAKE2B f27382cf748d4e31d71b460ecbf9b9f12294fb212bf23dc3d34c98737d8815b2eea2318247e56953ba184bb790bbb2f4b43c675dcb7a02b77c011f19e15d0d83 SHA512 67e400e9e7e8cabfb036a1eb1c262d462f613de7d6e18f8a17109c8eb52932e9ba77e69ab7b1f62c582d06b7f4d020cc888a0dfbefb4d3716743f142c3e3c063
 EBUILD root-5.34.36.ebuild 12173 BLAKE2B 4829235ce5fae8b912afde7d28b619e98c9335cea9f614716f9222916734ef71b87df3d791f18337ddd477a854053ef690e4f4edfd43aeab7ba519686c2baa68 SHA512 52fee9354448cb8b471e28ff4ee2a552a975f36d9b6efc3af1b0e3e83a554dc406c502348ea49bbbbec82cf86cbeb9ed7d6df01645a31e4f5211c665abb27dfd
-EBUILD root-6.12.04.ebuild 9914 BLAKE2B c236344e2f1934049cdcb275fe679ac6ff43dc26c3bd6754106bdc9118e53df89ebd350334f05a3e76a4ef9241cc8a3325a67e4061a3c271e09dc4bc2333e1b9 SHA512 6418593633fab1a8a64ce7adc0ace86d892bd70df0058eea70ff0ab4f39fb6f2b46e0dacbe8f6c8fb0fa42a00521aed3841a53b3641e30967bdfab9a7e5f708e
+EBUILD root-6.12.04-r1.ebuild 9915 BLAKE2B 0a5fa19d389f26fec7af03427c2bc7458daf7358b1ed8ed894dd0592f5aba4d8fc5b2182393692c2abf73ace6f80445fee058f6f430e81f5ae5eeef53ec09989 SHA512 f5eea751b2c20df1e0d0a70771c1e2194a39ca647a5508786c0fdaebd7c634f400cdd42ebb80d03547900f85626c19eee87f99ba36669c8790a8bd20f89b9cf0
 MISC metadata.xml 3238 BLAKE2B 0396ebafbf0bd14c88f7ba401f12f698ccca313c0c04cab46f9fa198681b0f305f21413bab8a86c97bb65e0bbe00eb6b6f488600402784109dc13ed196d6589b SHA512 2ba887003b3dc6dc3d4de379ec9dde8a7ba8144c2bbd7be50ebcfc7b3bfb3154733edd39007fcd8c380034d028a0d3f352e4cb973d8facd9412f38f820c16b1e
diff --git a/sci-physics/root/files/root-6.00.01-llvm.patch b/sci-physics/root/files/root-6.00.01-llvm.patch
deleted file mode 100644
index c6abb353ee64..000000000000
--- a/sci-physics/root/files/root-6.00.01-llvm.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/interpreter/llvm/src/Makefile.config.in b/interpreter/llvm/src/Makefile.config.in
-index 7633be2..c8756b1 100644
---- a/interpreter/llvm/src/Makefile.config.in
-+++ b/interpreter/llvm/src/Makefile.config.in
-@@ -170,6 +170,8 @@ CXXFLAGS += @CXXFLAGS@
- 
- # Linker flags.
- LDFLAGS += @LDFLAGS@
-+NOUNDEF := -Wl,--no-undefined
-+LDFLAGS := $(filter-out $(NOUNDEF),$(LDFLAGS))
- 
- # Path to the library archiver program.
- AR_PATH = @AR@
diff --git a/sci-physics/root/files/root-6.00.01-nobyte-compile.patch b/sci-physics/root/files/root-6.00.01-nobyte-compile.patch
deleted file mode 100644
index aa58f20686dc..000000000000
--- a/sci-physics/root/files/root-6.00.01-nobyte-compile.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Naur root.as-needed/bindings/pyroot/Module.mk root/bindings/pyroot/Module.mk
---- root.as-needed/bindings/pyroot/Module.mk	2011-07-10 10:42:48.991561304 +0400
-+++ root/bindings/pyroot/Module.mk	2011-07-10 10:43:21.493339703 +0400
-@@ -48,8 +48,6 @@
- ROOTPY       := $(subst $(MODDIR),$(LPATH),$(ROOTPYS))
- $(LPATH)/%.py: $(MODDIR)/%.py; cp $< $@
- endif
--ROOTPYC      := $(ROOTPY:.py=.pyc)
--ROOTPYO      := $(ROOTPY:.py=.pyo)
- 
- # used in the main Makefile
- ALLHDRS      += $(patsubst $(MODDIRI)/%.h,include/%.h,$(PYROOTH))
-@@ -68,10 +66,8 @@
- include/%.h:    $(PYROOTDIRI)/%.h
- 		cp $< $@
- 
--%.pyc: %.py;    python -c 'import py_compile; py_compile.compile( "$<" )'
--%.pyo: %.py;    python -O -c 'import py_compile; py_compile.compile( "$<" )'
- 
--$(PYROOTLIB):   $(PYROOTO) $(PYROOTDO) $(ROOTPY) $(ROOTPYC) $(ROOTPYO) \
-+$(PYROOTLIB):   $(PYROOTO) $(PYROOTDO) $(ROOTPY) \
-                 $(ROOTLIBSDEP) $(PYTHONLIBDEP)
- 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
- 		  "$(SOFLAGS)" libPyROOT.$(SOEXT) $@ \
-@@ -113,7 +109,7 @@
- 
- distclean-$(MODNAME): clean-$(MODNAME)
- 		@rm -f $(PYROOTDEP) $(PYROOTDS) $(PYROOTDH) $(PYROOTLIB) \
--		   $(ROOTPY) $(ROOTPYC) $(ROOTPYO) $(PYROOTMAP) \
-+		   $(ROOTPY) $(PYROOTMAP) \
- 		   $(PYROOTPYD) $(PYTHON64DEP) $(PYTHON64)
- 
- distclean::     distclean-$(MODNAME)
diff --git a/sci-physics/root/files/root-6.02.05-xrootd4.patch b/sci-physics/root/files/root-6.02.05-xrootd4.patch
deleted file mode 100644
index 0b4a4bef0f2e..000000000000
--- a/sci-physics/root/files/root-6.02.05-xrootd4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-https://sft.its.cern.ch/jira/browse/ROOT-6998
---- root-6.02.05/net/netxng/src/TNetXNGFile.cxx.orig	2015-02-09 11:59:47.000000000 +0300
-+++ root-6.02.05/net/netxng/src/TNetXNGFile.cxx	2015-04-05 11:32:31.893127758 +0300
-@@ -28,6 +28,7 @@
- #include <XrdCl/XrdClFile.hh>
- #include <XrdCl/XrdClXRootDResponses.hh>
- #include <XrdCl/XrdClDefaultEnv.hh>
-+#include <XrdVersion.hh>
- #include <iostream>
- 
- //------------------------------------------------------------------------------
diff --git a/sci-physics/root/files/root-6.04.06-gsl2.patch b/sci-physics/root/files/root-6.04.06-gsl2.patch
deleted file mode 100644
index 5d9fb102b73c..000000000000
--- a/sci-physics/root/files/root-6.04.06-gsl2.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-commit ee9964210c56e7c1868618a4434c5340fef38fe4
-Author: Pere Mato <pere.mato@cern.ch>
-Date:   Tue Dec 15 11:58:24 2015 +0100
-
-    Fix for ROOT-7776 - Integrate GSL 2.0 in ROOT. Changed the version used when option builtin_gsl=ON to 2.1 (latest production).
-
-diff --git a/cmake/modules/SearchInstalledSoftware.cmake b/cmake/modules/SearchInstalledSoftware.cmake
-index 6f04dad..309a8de 100644
---- a/cmake/modules/SearchInstalledSoftware.cmake
-+++ b/cmake/modules/SearchInstalledSoftware.cmake
-@@ -332,7 +332,7 @@ if(mathmore OR builtin_gsl)
-       endif()
-     endif()
-   else()
--    set(gsl_version 1.15)
-+    set(gsl_version 2.1)
-     message(STATUS "Downloading and building GSL version ${gsl_version}")
-     ExternalProject_Add(
-       GSL
-diff --git a/math/mathmore/src/GSLMultiFit.h b/math/mathmore/src/GSLMultiFit.h
-index 1d86da5..5b5a887 100644
---- a/math/mathmore/src/GSLMultiFit.h
-+++ b/math/mathmore/src/GSLMultiFit.h
-@@ -31,6 +31,7 @@
- #include "gsl/gsl_matrix.h"
- #include "gsl/gsl_multifit_nlin.h"
- #include "gsl/gsl_blas.h"
-+#include "gsl/gsl_version.h"
- #include "GSLMultiFitFunctionWrapper.h"
- 
- #include "Math/IFunction.h"
-@@ -143,7 +144,11 @@ public:
-    /// gradient value at the minimum
-    const double * Gradient() const {
-       if (fSolver == 0) return 0;
-+#if GSL_MAJOR_VERSION  > 1
-+      fType->gradient(fSolver->state, fVec);
-+#else
-       gsl_multifit_gradient(fSolver->J, fSolver->f,fVec);
-+#endif
-       return fVec->data;
-    }
- 
-@@ -154,7 +159,14 @@ public:
-       unsigned int npar = fSolver->fdf->p;
-       fCov = gsl_matrix_alloc( npar, npar );
-       static double kEpsrel = 0.0001;
-+#if GSL_MAJOR_VERSION > 1
-+      gsl_matrix* J = gsl_matrix_alloc(npar,npar);
-+      gsl_multifit_fdfsolver_jac (fSolver, J);
-+      int ret = gsl_multifit_covar(J, kEpsrel, fCov);
-+      gsl_matrix_free(J);
-+#else
-       int ret = gsl_multifit_covar(fSolver->J, kEpsrel, fCov);
-+#endif
-       if (ret != GSL_SUCCESS) return 0;
-       return fCov->data;
-    }
diff --git a/sci-physics/root/files/root-6.04.06-prop-flags.patch b/sci-physics/root/files/root-6.04.06-prop-flags.patch
deleted file mode 100644
index 90db15e21f6d..000000000000
--- a/sci-physics/root/files/root-6.04.06-prop-flags.patch
+++ /dev/null
@@ -1,22 +0,0 @@
- config/Makefile.in | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/config/Makefile.in b/config/Makefile.in
-index 9243c90..a23a4d2 100644
---- a/config/Makefile.in
-+++ b/config/Makefile.in
-@@ -64,11 +64,11 @@ HOST           := @host@
- USECONFIG      := @useconfig@
- MKLIBOPTIONS   := @mkliboption@
- 
--EXTRA_CFLAGS   := -Iinclude @cflags@
-+EXTRA_CFLAGS   := -Iinclude @cflags@ $(CFLAGS)
- USERCONF_CFLAGS:= @usercflags@
--EXTRA_CXXFLAGS := -Iinclude @cflags@
-+EXTRA_CXXFLAGS := -Iinclude @cflags@ $(CXXFLAGS)
- USERCONF_CXXFLAGS:= @usercxxflags@
--EXTRA_LDFLAGS  := @ldflags@
-+EXTRA_LDFLAGS  := @ldflags@ $(LDFLAGS)
- WERROR         := @werror@
- WINRTDEBUG     := @winrtdebug@
- CTORSINITARRAY := @ctorsinitarray@
diff --git a/sci-physics/root/files/root-6.12.04-find-oracle-12.patch b/sci-physics/root/files/root-6.12.04-find-oracle-12.patch
new file mode 100644
index 000000000000..242e76d09879
--- /dev/null
+++ b/sci-physics/root/files/root-6.12.04-find-oracle-12.patch
@@ -0,0 +1,34 @@
+From 7aa8aacad80c75b40bb25bdeccc7cacce9a270ca Mon Sep 17 00:00:00 2001
+From: Guilherme Amadio <amadio@cern.ch>
+Date: Mon, 18 Dec 2017 13:32:06 +0100
+Subject: [PATCH] Fix FindOracle.cmake to find version 12.x
+
+---
+ cmake/modules/FindOracle.cmake | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cmake/modules/FindOracle.cmake b/cmake/modules/FindOracle.cmake
+index 24031664a6..b7c8cfbb99 100644
+--- a/cmake/modules/FindOracle.cmake
++++ b/cmake/modules/FindOracle.cmake
+@@ -12,7 +12,7 @@ set(ORACLE_FOUND 0)
+ if(ORACLE_INCLUDE_DIR AND ORACLE_LIBRARY_OCCI)
+   set(ORACLE_FIND_QUIETLY 1)
+ endif()
+-set(ORACLE_HOME $ENV{ORACLE_DIR})
++set(ORACLE_HOME $ENV{ORACLE_HOME})
+ 
+ IF (ORACLE_PATH_INCLUDES)
+     SET (ORACLE_INCLUDES_LOCATION ${ORACLE_PATH_INCLUDES})
+@@ -55,7 +55,7 @@ FIND_LIBRARY(
+ )
+ FIND_LIBRARY(
+     ORACLE_LIBRARY_LNNZ
+-    NAMES libnnz10 nnz10 libnnz11 nnz11 ociw32
++    NAMES libnnz10 nnz10 libnnz11 nnz11 libnnz12 nnz12 ociw32
+     PATHS ${ORACLE_LIB_LOCATION}
+ )
+ 
+-- 
+2.15.1
+
diff --git a/sci-physics/root/files/root-6.12.04-no-ocaml.patch b/sci-physics/root/files/root-6.12.04-no-ocaml.patch
new file mode 100644
index 000000000000..1d91739f01a0
--- /dev/null
+++ b/sci-physics/root/files/root-6.12.04-no-ocaml.patch
@@ -0,0 +1,49 @@
+From 7405b8848e7c0d5ddcaa1f27b905b6931dc262e2 Mon Sep 17 00:00:00 2001
+From: Guilherme Amadio <amadio@cern.ch>
+Date: Mon, 18 Dec 2017 13:08:14 +0100
+Subject: [PATCH] Disable OCaml bindings in LLVM
+
+---
+ interpreter/llvm/src/cmake/config-ix.cmake | 28 ----------------------------
+ 1 file changed, 28 deletions(-)
+
+diff --git a/interpreter/llvm/src/cmake/config-ix.cmake b/interpreter/llvm/src/cmake/config-ix.cmake
+index 6fb589cfd3..d1c9a70d10 100644
+--- a/interpreter/llvm/src/cmake/config-ix.cmake
++++ b/interpreter/llvm/src/cmake/config-ix.cmake
+@@ -575,32 +575,4 @@ if(CMAKE_HOST_APPLE AND APPLE)
+   endif()
+ endif()
+ 
+-# Keep the version requirements in sync with bindings/ocaml/README.txt.
+-include(FindOCaml)
+-include(AddOCaml)
+-if(WIN32)
+-  message(STATUS "OCaml bindings disabled.")
+-else()
+-  find_package(OCaml)
+-  if( NOT OCAML_FOUND )
+-    message(STATUS "OCaml bindings disabled.")
+-  else()
+-    if( OCAML_VERSION VERSION_LESS "4.00.0" )
+-      message(STATUS "OCaml bindings disabled, need OCaml >=4.00.0.")
+-    else()
+-      find_ocamlfind_package(ctypes VERSION 0.4 OPTIONAL)
+-      if( HAVE_OCAML_CTYPES )
+-        message(STATUS "OCaml bindings enabled.")
+-        find_ocamlfind_package(oUnit VERSION 2 OPTIONAL)
+-        set(LLVM_BINDINGS "${LLVM_BINDINGS} ocaml")
+-
+-        set(LLVM_OCAML_INSTALL_PATH "${OCAML_STDLIB_PATH}" CACHE STRING
+-            "Install directory for LLVM OCaml packages")
+-      else()
+-        message(STATUS "OCaml bindings disabled, need ctypes >=0.4.")
+-      endif()
+-    endif()
+-  endif()
+-endif()
+-
+ string(REPLACE " " ";" LLVM_BINDINGS_LIST "${LLVM_BINDINGS}")
+-- 
+2.15.1
+
diff --git a/sci-physics/root/files/root-6.12.04-z3.patch b/sci-physics/root/files/root-6.12.04-z3.patch
new file mode 100644
index 000000000000..04f6edf2c6d5
--- /dev/null
+++ b/sci-physics/root/files/root-6.12.04-z3.patch
@@ -0,0 +1,39 @@
+From 4445e05660493841b5fb683c7e8a8dc6c08564ac Mon Sep 17 00:00:00 2001
+From: Guilherme Amadio <amadio@cern.ch>
+Date: Mon, 18 Dec 2017 11:49:55 +0100
+Subject: [PATCH] Only look for Z3 if necessary
+
+---
+ interpreter/llvm/src/tools/clang/CMakeLists.txt | 9 ++-------
+ 1 file changed, 2 insertions(+), 7 deletions(-)
+
+diff --git a/interpreter/llvm/src/tools/clang/CMakeLists.txt b/interpreter/llvm/src/tools/clang/CMakeLists.txt
+index 2667b1d689..a1559d9b15 100644
+--- a/interpreter/llvm/src/tools/clang/CMakeLists.txt
++++ b/interpreter/llvm/src/tools/clang/CMakeLists.txt
+@@ -186,8 +186,6 @@ if (LIBXML2_FOUND)
+   set(CLANG_HAVE_LIBXML 1)
+ endif()
+ 
+-find_package(Z3 4.5)
+-
+ include(CheckIncludeFile)
+ check_include_file(sys/resource.h CLANG_HAVE_RLIMITS)
+ 
+@@ -381,11 +379,8 @@ if(NOT CLANG_ENABLE_STATIC_ANALYZER AND (CLANG_ENABLE_ARCMT OR CLANG_ANALYZER_BU
+ endif()
+ 
+ if(CLANG_ANALYZER_BUILD_Z3)
+-  if(Z3_FOUND)
+-    set(CLANG_ANALYZER_WITH_Z3 1)
+-  else()
+-    message(FATAL_ERROR "Cannot find Z3 header file or shared library")
+-  endif()
++  find_package(Z3 4.5 REQUIRED)
++  set(CLANG_ANALYZER_WITH_Z3 1)
+ endif()
+ 
+ if(CLANG_ENABLE_ARCMT)
+-- 
+2.15.1
+
diff --git a/sci-physics/root/root-6.12.04.ebuild b/sci-physics/root/root-6.12.04-r1.ebuild
index 4fb0c10e18f8..f428493ad11e 100644
--- a/sci-physics/root/root-6.12.04.ebuild
+++ b/sci-physics/root/root-6.12.04-r1.ebuild
@@ -31,8 +31,6 @@ KEYWORDS="~amd64 ~x86"
 REQUIRED_USE="
 	!X? ( !asimage !opengl !qt4 !tiff )
 	python? ( ${PYTHON_REQUIRED_USE} )
-	pythia6? ( !pythia8 )
-	pythia8? ( !pythia6 )
 	tmva? ( math gsl )
 	davix? ( ssl )
 "
@@ -130,7 +128,10 @@ src_prepare() {
         "${FILESDIR}"/${PN}-5.32.00-cfitsio.patch \
         "${FILESDIR}"/${PN}-5.32.00-chklib64.patch \
         "${FILESDIR}"/${PN}-6.00.01-dotfont.patch \
-		"${FILESDIR}"/${PN}-6.11.02-hsimple.patch
+		"${FILESDIR}"/${PN}-6.11.02-hsimple.patch \
+		"${FILESDIR}"/${PN}-6.12.04-no-ocaml.patch \
+		"${FILESDIR}"/${PN}-6.12.04-find-oracle-12.patch \
+		"${FILESDIR}"/${PN}-6.12.04-z3.patch
 
 	# make sure we use system libs and headers
 	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die
@@ -254,13 +255,6 @@ src_configure() {
 		${EXTRA_ECONF}
 	)
 
-	if use oracle ; then
-			mycmakeargs+=(
-				-DORACLE_PATH_INCLUDES="${ORACLE_HOME}/include"
-				-DORACLE_PATH_LIB="${ORACLE_HOME}/$(get_libdir)"
-			)
-	fi
-
 	cmake-utils_src_configure
 }
 
@@ -304,6 +298,7 @@ src_install() {
 	use emacs && elisp-install ${PN} "${BUILD_DIR}"/root-help.el
 
 	echo "PATH=${EPREFIX}/${MY_PREFIX}/bin" > 99root || die
+	echo "ROOTPATH=${EPREFIX}/${MY_PREFIX}/bin" > 99root || die
 	echo "LDPATH=${EPREFIX}/${MY_PREFIX}/$(get_libdir)" >> 99root || die
 
 	if use pythia8; then
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 0c8d642f201f..b5c40596be05 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/dbus-broker/Manifest b/sys-apps/dbus-broker/Manifest
index 44a3c182ebcf..4d7ff3444b8d 100644
--- a/sys-apps/dbus-broker/Manifest
+++ b/sys-apps/dbus-broker/Manifest
@@ -4,5 +4,5 @@ DIST c-rbtree-825f626a16257c5f0b0c523c11ce1bca16851180.tar.gz 27988 BLAKE2B 9a6b
 DIST c-sundry-50c8ccf01b39b3f11e59c69d1cafea5bef5a9769.tar.gz 26702 BLAKE2B c67af60b180b80c358c94d43961423cd18b147ec98dd71fa9e858ae6b67ad29d1d1484816be9eff1ce5c7193aa22b7b754f4cc535888c2a62b88ea43155f71c6 SHA512 44fccf4509ad752f7ef8aef7e1afd62eb51660f2daba42f0ad8b1711a62ec53aa2bde78b895fbdd939ba9a1ba1fc06621c2506eb068948da4d6e7192cb8df29e
 DIST dbus-broker-9.tar.gz 155810 BLAKE2B ebb64f35303de988ea081b6dc9186a53317c5e610ca826afc4243191148f6d8d7038d6aa6f94bdd7b5225ebd2f2d93394d467605e5f878617becfd487ad0dfb6 SHA512 4eed5dede2ba6d45b883b1a484d59b774655063334611413e165558cb1e2efb21a5e17a182e836ae43cbfbfd366737c709d53ed0b9ec29ba3a9cd3718b29ec40
 EBUILD dbus-broker-9.ebuild 1823 BLAKE2B a9060cc64329fc18816ac961d0ea4a11894f031ffc2c98ca301cc4f19472523c3d124850fe5ef33b897fdbf11006d3d4f9f71d8032abef7c5c12adfb0b17dc9a SHA512 04978b559c3f7178e2f909c33450b7160bf249de10483f952ebb1b6b6893dabea3c98854daec1b3318af817cc16516d4dc7cbf51f6cdc146b32fc076e86c9425
-EBUILD dbus-broker-9999.ebuild 1823 BLAKE2B a9060cc64329fc18816ac961d0ea4a11894f031ffc2c98ca301cc4f19472523c3d124850fe5ef33b897fdbf11006d3d4f9f71d8032abef7c5c12adfb0b17dc9a SHA512 04978b559c3f7178e2f909c33450b7160bf249de10483f952ebb1b6b6893dabea3c98854daec1b3318af817cc16516d4dc7cbf51f6cdc146b32fc076e86c9425
+EBUILD dbus-broker-9999.ebuild 1823 BLAKE2B a6c2e5b441d56f0caa72e2ccdb68aafe26f58abfbae3c15458025a5f7c9366008e6aae0d0df4783680b11cf81a86d109c3cd223eaa1013d672e2595ee8ca27bb SHA512 45c48046545ef2d598fbb70834528792d2ce2675747323806d2637a4cf6af722e27add476fe47eb6acc2a7bbe84c08fd507414c941fb7036e109fc3a8db3ae91
 MISC metadata.xml 327 BLAKE2B baaa6c7be634d16ffbe1196a29bcc2254c77d857dd1b807d50dac7adbd3d20370bf55ac0ea8f60b0fb160bf9ae69d42a5002b4150c4b22c101b37ecab96028a2 SHA512 b350af1c8be6e227fb301fca4dc1d6c90a8ceaf1e4cbf3d83ea54a302a15baa9df560d9b728a66be843b3eb679fa9536ca2f531776ee5d09753233148a0cabe1
diff --git a/sys-apps/dbus-broker/dbus-broker-9999.ebuild b/sys-apps/dbus-broker/dbus-broker-9999.ebuild
index 62c8053832d1..9c888fb6cf05 100644
--- a/sys-apps/dbus-broker/dbus-broker-9999.ebuild
+++ b/sys-apps/dbus-broker/dbus-broker-9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	dvar=7706828ecda2d8c508d6fc233dc9d198bab482ad
 	list=72c59181d677a3f50b201d51f190b1bff02d4279
-	rbtree=825f626a16257c5f0b0c523c11ce1bca16851180
+	rbtree=ba0527e9157316cdb60522f23fb884ea196b1346
 	sundry=50c8ccf01b39b3f11e59c69d1cafea5bef5a9769
 	SRC_URI="https://github.com/bus1/dbus-broker/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		https://github.com/c-util/c-dvar/archive/${dvar}.tar.gz -> c-dvar-${dvar}.tar.gz
diff --git a/sys-apps/mtree/Manifest b/sys-apps/mtree/Manifest
index 57b2108ced2b..c47eea2ecc22 100644
--- a/sys-apps/mtree/Manifest
+++ b/sys-apps/mtree/Manifest
@@ -1,5 +1,5 @@
-DIST mtree-1.0.1.tar.gz 110979 BLAKE2B 647b1a5312644d9b36cd4f85e12bebb56fbe15a3ee2f5baf4ebcce26209ef70db53f4a1df75cbca77245ef5d0c2f85492fec1916b6fcf80d125d61ccbf57c20b SHA512 47897a1763ba02d095d9d7179ffb513ca847c5e9bde27908a4ef94feced2d59baef6f95f8024cfce3c5f47e4f7b7ae64e283ce1589b2e3826fd14b13f88d4990
 DIST mtree-1.0.3.tar.gz 32882 BLAKE2B 1c1f89594dd1ac265dbbe49101d1764f24f5b1e97bd627bf06a26baf4400364eef51f719326c687626ae64d60b53305424ccd2735a72c917ff226e098c7d0a21 SHA512 aea1d53ff114446d8e7dca20388f2184e6284f69021079eca4edce22f067b8218aafeabf6d08503fd197de3e4f271af8cb8dc310d87696c03360d42de4cac85a
-EBUILD mtree-1.0.1.ebuild 572 BLAKE2B 2e38691699d742f9768c85e11b23991848ffa9e872e8ee304c941331bc7e6f516c4d762946d636835cd66bcc886cd2a41a478a38686447bdd1c296eac7b4843a SHA512 2d8c8e9e769c14e7841ac275ed5dcd0519827cfe77c2f2b2ac791b615d751776b6b04ba99d28918b20f42f5161ffbfaaf1eee89ec69e51d045818209962e3412
+DIST mtree-1.0.4.tar.gz 34024 BLAKE2B 932684df56e0403ee3d30e4eee4250824a067cc5467d0f6b1b3ecc46c94c68367dd323221c70e17f08481d93eb0d3278bb6b3f78a930d4ec906a446f99c7a92a SHA512 b0f09d34584315633fd8fcbc6403ba1ec6bade7e5194b59ec168796d23b6f2d4aeda7112ce4b8b5773e2bf50dbda200700637e361214c98f30818a259294ead0
 EBUILD mtree-1.0.3.ebuild 643 BLAKE2B 8915882242a33f2468dbdd91bd142f332d946d5f67b17a224f245720cce7d65d256c8ac798e3fe88942684804523f197ac8f67cc8e44b2aa570f21f551881523 SHA512 ba5a7e4ef18108655bbdf7dc82b4332c6f9053f24843262ce31b20944e10b65c4a4c8359674fb4c8373d8f1926f543043d73d848d0e96e262b070870bfb75cf9
+EBUILD mtree-1.0.4.ebuild 643 BLAKE2B 8915882242a33f2468dbdd91bd142f332d946d5f67b17a224f245720cce7d65d256c8ac798e3fe88942684804523f197ac8f67cc8e44b2aa570f21f551881523 SHA512 ba5a7e4ef18108655bbdf7dc82b4332c6f9053f24843262ce31b20944e10b65c4a4c8359674fb4c8373d8f1926f543043d73d848d0e96e262b070870bfb75cf9
 MISC metadata.xml 337 BLAKE2B a8e33f9dfd1fbe4ef4edf0f5ff96f7f847b3872b350aa425c855c229b3675407157b73c41673a7189042f9db0d38b42dc82e55a8f034927bceb21bcdd76900a6 SHA512 c55add92235705c893b62cfcfc0c56e40bb1720c0140a87274836a0e6a8a1958511170fbb1ed7335d074b0753b59bf797f3302c3bd8ad2333872adf95dee28b4
diff --git a/sys-apps/mtree/mtree-1.0.1.ebuild b/sys-apps/mtree/mtree-1.0.4.ebuild
index 732721f0658a..151c42b2c734 100644
--- a/sys-apps/mtree/mtree-1.0.1.ebuild
+++ b/sys-apps/mtree/mtree-1.0.4.ebuild
@@ -1,19 +1,22 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit autotools
 
 DESCRIPTION="Directory hierarchy mapping tool from FreeBSD"
 HOMEPAGE="https://github.com/archiecobbs/mtree-port"
-SRC_URI="https://mtree-port.googlecode.com/files/${P}.tar.gz"
+SRC_URI="https://github.com/archiecobbs/mtree-port/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
+S="${WORKDIR}/${PN}-port-${PV}"
+
 src_prepare() {
+	default
 	# don't install unneeded docs
 	sed -i '/doc_DATA=/d' Makefile.am || die
 	eautoreconf
@@ -23,5 +26,5 @@ src_install() {
 	default
 
 	# avoid conflict with app-arch/libarchive
-	rm "${ED}usr/share/man/man5/mtree.5"
+	rm "${ED%/}/usr/share/man/man5/mtree.5"
 }
diff --git a/sys-apps/paxctld/Manifest b/sys-apps/paxctld/Manifest
index 7a398ca24dd5..7cea5684448b 100644
--- a/sys-apps/paxctld/Manifest
+++ b/sys-apps/paxctld/Manifest
@@ -1,7 +1,3 @@
-DIST paxctld_1.1.orig.tar.gz 15977 BLAKE2B 695e1f9b09fc11ba3bebb5c5ad3f283f1572382f9ca6c1b532bee1583794ca715223e2dbe77d46588fd1c26dfe395535dabe6431cdeb59e0dad22a8c2f15a2cc SHA512 82b18d1b5d47831ac865b149dbd02c35062baf3da755312bbc2d7adeb31308b995be3441adb6d4a33ba19e79413df77bb4a7bc71d202bef6e1eb25f2c4f31631
-DIST paxctld_1.2.1.orig.tar.gz 16347 BLAKE2B fdaceeb76110a128c6e6cc8eb65f903ab9e4df50ca6e4f95f9aedcb2c71f039c939c3112e4fdb9415f53c9ad3e7bbb2f8f3882806c7c93209a3f05efe5d2c5c8 SHA512 3daa072155d7eef6911fa716e2ffefe503d4351d375dfc89efaad0434da7e9f879a07f0da0f58f3a70361c5661cb1d5760b8c85fa88dc086dc8c1f113fdaa6a1
-DIST paxctld_1.2.orig.tar.gz 16080 BLAKE2B 57cca82b7c60cddacc9fc3e4aa03d641aee33c78b269836b60e34d75b02174ebe89ee79aeec806fd911f236e6a60cf6eb81995406034e352d99d0c875000d605 SHA512 9b181fdc9e6b4d76fc7670e0773263c598164f90fe0db0c180601e8ba68e9baec4ef23281bba9ebac385e53edc20d8b79fbd7c9646e057334c21c6602013e198
-EBUILD paxctld-1.1.ebuild 720 BLAKE2B 46e2c5c87d26622cec00b94bd23a911a1020255ab42ac2273daef6a57b182a0eab08c9d203c11a47f3208392b98b327fe547fcf5e3098c28136a4bfe791db400 SHA512 b924d46a92be6099e38ec63bb3c2c7cb0dc38d456bc4fc71c997cb64a1711efefa5779c2c1b3acac812429fcab7ec314a8530d27ff75e50fccf2a0550ef3e6d5
-EBUILD paxctld-1.2.1.ebuild 720 BLAKE2B 46e2c5c87d26622cec00b94bd23a911a1020255ab42ac2273daef6a57b182a0eab08c9d203c11a47f3208392b98b327fe547fcf5e3098c28136a4bfe791db400 SHA512 b924d46a92be6099e38ec63bb3c2c7cb0dc38d456bc4fc71c997cb64a1711efefa5779c2c1b3acac812429fcab7ec314a8530d27ff75e50fccf2a0550ef3e6d5
-EBUILD paxctld-1.2.ebuild 720 BLAKE2B 46e2c5c87d26622cec00b94bd23a911a1020255ab42ac2273daef6a57b182a0eab08c9d203c11a47f3208392b98b327fe547fcf5e3098c28136a4bfe791db400 SHA512 b924d46a92be6099e38ec63bb3c2c7cb0dc38d456bc4fc71c997cb64a1711efefa5779c2c1b3acac812429fcab7ec314a8530d27ff75e50fccf2a0550ef3e6d5
+DIST paxctld_1.2.2.orig.tar.gz 16302 BLAKE2B 051be5210704a0a8447eab46f3a8528fccbb43b6ab60725a38e6210da68ae0e60b83e563ab4796dbde9bccce93982ebfd14b4288466b5531c5b1e261a4020e6c SHA512 f3944b752bcaab2644c640a7992d8f267e882ff8528b85664cc3d7926de042d3540044030bac2f5c64121ff5ed0caff60ca41d3837a77fe2cdf19ad58c6b7c81
+EBUILD paxctld-1.2.2.ebuild 734 BLAKE2B 9444984ed05de69499fb53c199c30ae3de416dd69c16f357f58a7ca199aa8ef75e62fd1d118db98555ec8650df6000efe1eab186aa4db28a8dcddbb2d4c29c45 SHA512 eff832df5a89bbb07674f1d315ab2c4a701b1477577c806395b579cdbec07a351d1b315c9ec6924a19e8a39c2e0f224082347bec515acd715b11116491dc9e83
 MISC metadata.xml 363 BLAKE2B 27b81c37d5a0f685942eda5610d73a0933a7654282c851a92bc352f27676c609452b6c7a3f3bb94c0fa358fa360c5c113aac6acd24e186347912f61cf4a0bdf3 SHA512 b848c5de5ed09c4843c3e75d59ea4697c5d1c1fa2ce8c9e9a0bf38b5102d57f25aa626f3c6295f4f3a345b1cedc15553fb45b460bf41e73df43eb2eef6e00281
diff --git a/sys-apps/paxctld/paxctld-1.2.1.ebuild b/sys-apps/paxctld/paxctld-1.2.1.ebuild
deleted file mode 100644
index 7d222c6d4c29..000000000000
--- a/sys-apps/paxctld/paxctld-1.2.1.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 systemd
-
-DESCRIPTION="PaX flags maintenance daemon"
-HOMEPAGE="http://www.grsecurity.net/"
-SRC_URI="https://www.grsecurity.net/${PN}/${PN}_${PV}.orig.tar.gz
-	https://dev.gentoo.org/~blueness/hardened-sources/${PN}/${PN}_${PV}.orig.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="pam"
-
-RDEPEND=""
-DEPEND=""
-
-src_prepare() {
-	# Respect Gentoo flags and don't strip
-	sed -i \
-		-e '/^CC/d' \
-		-e '/^CFLAGS/d' \
-		-e '/^LDFLAGS/d' \
-		-e '/STRIP/d' \
-		Makefile
-}
-
-src_install() {
-	default
-
-	systemd_dounit "${S}"/rpm/${PN}.service
-}
diff --git a/sys-apps/paxctld/paxctld-1.1.ebuild b/sys-apps/paxctld/paxctld-1.2.2.ebuild
index 7d222c6d4c29..02319f8ac64a 100644
--- a/sys-apps/paxctld/paxctld-1.1.ebuild
+++ b/sys-apps/paxctld/paxctld-1.2.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 
 inherit systemd
 
@@ -26,6 +26,8 @@ src_prepare() {
 		-e '/^LDFLAGS/d' \
 		-e '/STRIP/d' \
 		Makefile
+
+	eapply_user
 }
 
 src_install() {
diff --git a/sys-apps/paxctld/paxctld-1.2.ebuild b/sys-apps/paxctld/paxctld-1.2.ebuild
deleted file mode 100644
index 7d222c6d4c29..000000000000
--- a/sys-apps/paxctld/paxctld-1.2.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 systemd
-
-DESCRIPTION="PaX flags maintenance daemon"
-HOMEPAGE="http://www.grsecurity.net/"
-SRC_URI="https://www.grsecurity.net/${PN}/${PN}_${PV}.orig.tar.gz
-	https://dev.gentoo.org/~blueness/hardened-sources/${PN}/${PN}_${PV}.orig.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="pam"
-
-RDEPEND=""
-DEPEND=""
-
-src_prepare() {
-	# Respect Gentoo flags and don't strip
-	sed -i \
-		-e '/^CC/d' \
-		-e '/^CFLAGS/d' \
-		-e '/^LDFLAGS/d' \
-		-e '/STRIP/d' \
-		Makefile
-}
-
-src_install() {
-	default
-
-	systemd_dounit "${S}"/rpm/${PN}.service
-}
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 0a5cb69c6f58..2ddb98c4763b 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,27 +1,20 @@
 AUX 218-Dont-enable-audit-by-default.patch 1027 BLAKE2B 9193a409db4e5c1dec6f6b66ee6e0a4cc1ada49d41ab758c788cf12534fffb67bd7370b8558a6af56572d7f2b73cf47db255fef105e56362c15f0a426f80b256 SHA512 44e512d8bbadbc5714192896a3ba262e460af034846e4e9b9832b4143fff772e2734e655316fd88d1ef386509bd234c195dce2087348f220836b3bf4f26790e0
 AUX 228-noclean-tmp.patch 804 BLAKE2B ffa2edb5e88dbc61d7c7c9b40e8329bc0f86a7b4298181bec61ffdd7b231181bf764e1ed2dcfa3d5cdadae02ae961e53b796a8b68e0be66ad312f5c0e7521330 SHA512 fc3297cb0ceacdab58cdbd5b6c70c6005312aaa790768f87eb637b8cb26be01ba7c2f5f608893689f0132ac35f19561bc0bc77e34d167f01bdfaea3644b56e71
-AUX 233-0001-Avoid-strict-DM-interface-version-dependencies-5519.patch 14035 BLAKE2B 6d8ee6ed32d812a5e39079170f975f20853df777e5014f1eddabd340e1a0f484db26adc67894774ae8d934a00b403f3cccbe78acb74914d0437292e625723cdb SHA512 ab2520e1ab714c9370eb640efe5b465902e7cdca8acbae25c79b5845614311ceab2ce3dbb7fe7b6a0362c6192a3dc812f8248aaa9f813f6e5323e344ccb945a9
-AUX 233-0002-core-load-fragment-refuse-units-with-errors-in-RootD.patch 6124 BLAKE2B bbe2c7d3f07b464af3824316dff3c59a8333bc5bfcc0c039c35309ede7ff9984b1a4556a59fb11edb97b5bbd66cfd6c075eabf6128f5093b7f8fbba025687542 SHA512 4a700bc40d0b7948cd937a674c5e7b7bb6e2f08a81bebd8d316375662ad198cd9562835ec2da557ec0e5fa927e825cdad8cf2c63ec3e5a4c8d2506e6293125f3
-AUX 233-0003-core-load-fragment-refuse-units-with-errors-in-certa.patch 16209 BLAKE2B c1906f3ba707b78c8df8d9fd296548414e9eedbb00ef07a812f6086e8db0da85777b198d4705267211eb8dd34f2a6e6ad8635a5284c28cc315414914ac7a07a8 SHA512 395c0a0a07f17ea5edc876c7541e5b0f7ebfb7e74ef675c7a685a32b5e86d80df0b59c09e345521a54d625093dfe6a9daa9d4ccc6b4529031bfedf16f9bbf824
-AUX 233-CVE-2017-9445.patch 5491 BLAKE2B 9c0e252dbbc273481fde939ef90be1d61046a8c4ae9c288d9aca0167322d669750c7545f572386ddefe2b666ecc26e79fe9f143109946a0be9e0eb6fd002f280 SHA512 16308657911dc3f85520d6de0ee85f04afed1a7940a8a23ece641af2b3766e44e88d8de21cb53afd4db7b8ad8324eeed2860009f3fcc05a227f0c6faafbf351f
-AUX 233-format-warnings.patch 3837 BLAKE2B be24951d2b3b70c6596c9fdabf6faf7492791b3ea5310aff77462ab05fca1c82026e7aabe4fd3656dc486e5d11ce8138c64740c66f75a6151107a86282b90958 SHA512 491cdbdb75e1ef338cd660fd89c776e3dd2881922eb04f505dda985104f14813e9da9e758393d906ff224e9e03888cafd05f7e665f71c43580a2989af54981bc
 AUX 233-systemd-user-pam.patch 443 BLAKE2B fad5c24f35666313efbf1e33640320058022fe17acff869a80104ed87ce0ad7ebaa1498915f8e933985e9c2d66d77172eb21ab480fc4fa857e0e5b985735831a SHA512 0a47368b1b38995a4193492e3add5c716c063366a9bc53dec03b7cb59b524da644033e095344da6e15e01dc84d8f5b335e7510442eeaba26e06918403fed0e5c
 AUX 234-uucp-group.patch 536 BLAKE2B 0620ab9871a74b8ccb4c435fa96125552eb7fd5950dc17e9013d645b2dd94e99a15f7ceaf318bac7d7cd66f28149c4f75d881d8157c2637c2780a5a6f73dd6a9 SHA512 6ffaa3b50f36598682019c1c6b171ad121d57ba9cfd379be5f46f64621dc026a82069922b78a62a5c477bb117e700a31e0315872d78378755cd4150abd22a912
 AUX 235-0001-test-skip-hwdb-and-sysv-generator-if-the-features-ar.patch 1280 BLAKE2B 019ad0113d58d2833b582ac269ecbf4e51c6b46d3a3ba84357cf135ddbf34829e7e98c9c376b4b9bf717be5fefed8cea517f2cc4e9aefee08807185f1057dfbb SHA512 70dd0b3ed7926fc2406aae8fc592ba7bbbf9bdd94151d3045d94683921f2921dbe8184f7184e4e5a9cd4bf1556ddb93f20f741df3bead3c664f4c71757e75376
 AUX 235-0002-networkd-Don-t-stop-networkd-if-CONFIG_FIB_RULES-n-i.patch 2620 BLAKE2B ec6e9cb15160b91c54bf714229785c081044727e5d9e6f5ecfffa0df4ce84e4e71227f177aced29d24f3a26c7b118aba3ed1073fa2353cd7a44c509658f20dce SHA512 52bf63183930872c44c0dc53a616c75a4ae37ffedfcf34b2b5e400994b334d311b2afcadd75e91dd6c37a88cab71e30d2d6690261a980ea5dfc056b67d7e2e78
 AUX 236-uucp-group.patch 562 BLAKE2B 98b629d9b20e4fedfb017864dca1346aa1766d606583d12930e0375a43b10871cfdafabacdaa5f3d70ed8e8f4256b66a61369f459419931e80f57a13cd9f953a SHA512 27a3f0a037494326674e9098eab96199d2dbbd84dfa94a7dd23df0bf7fc632d1ddb21643288e71cc64109342bbcfcc4d77add07348d70633ec1da7cdf2253dc9
 AUX CVE-2017-15908.patch 1371 BLAKE2B ccb735919864347108366e33466d2daa5599825e8efcef29ad2139c20070443a6c2c6cb008ba018ea64a37f7046e366f42d45698d6c82aee19d38ca9f2b489d9 SHA512 e3ca9cb44981a7a5d80a7ca63d6c9249e42dc5af1290ecfd472ec377db4ac372a18c3a3b6a99e1b7cfa322f7c00f0a755c916f67273b0b1e0a0e37957035aba9
-AUX CVE-2017-9217.patch 863 BLAKE2B 14b98f1a1c8f90d8a2421c5e841e9e34c310c891222caf6078f6849e9290c8713951f274a6f83dd505a22f1c8f34d13f3aaa73943b00a989a52e3d3d34d27880 SHA512 d323c6e79f60bb7abdb4583f021041532d1bf1514500d09d07b0a429b6cfb76787f590de04446ae84d51747b0023042d575aeb07da29e4e8c0ad13656a1877a5
 AUX generator-path.patch 1046 BLAKE2B 648d1fff6874135267647ff6ffb52ddd9e991af64fb2b41909246c173e55709c49edd6e47245d566457ba9f55bf6d758ed837ff740f58004f2790b5565f8e462 SHA512 e9999afbf4d2d8a9e828d81dd0b54e2c2ba556e9778a4954dac3da885a15bc6dcc718f7e119c352eb2efd090e410735395ec20ce2eb3c84a481570bc8b5f66b3
 AUX nsswitch.conf 698 BLAKE2B ad209377afa4bea6383dba80b045c3905e6e0c0cd091c6710f753fa7b0bc911ee2c48d6975a0646d688fc534add23d0be3fac7c1da6f3654a5a27a609c2ec434 SHA512 486581b096db702941589bbd3211df58df4979d17856dc935f6e22f7a268c5b6b1c4dfa643d38e21bc01eb258b0b97318d4e97ebab0e87abd718af1e391fde1a
 DIST systemd-233-man.tar.gz 31386 BLAKE2B e4947e658db3efeec6b5a6adf340d2cc8e8aff2a14db4932720f90c3dc898b1e78595db983948373a2e28191fb3b0aad234f80feb91ee8ae4b607a44038a9cae SHA512 cc5215d3590ffc3c9203a64c14d6adeb0148c421c1396b8c1e43dcb58763b687ce99bdee327dd8a00abab7198171e73b22109a3f2032e4cec6adf2dcc85acf40
+DIST systemd-233-patches.tar.gz 12553 BLAKE2B 5d19f2dc82cc6cbd9b2e9393f932dfa3c88a981358b282fe56d43cd432d0ee0c0245e9c13d5460b94d83908b84a382dad3348b999f2356ab3ef2ae2c542a867d SHA512 3081f4cf64542ba64a28fe2eff11d8040af42255eb99b5210db9d583fc4b4360a4a4bb8769a1e43d38474d69ead681974cb98d4605968b38f98fd3d9b40bf211
 DIST systemd-233.tar.gz 4660737 BLAKE2B 38cdd74543447b3c02391b328428fed169fe2cf2df6e9341dcaf2f7d3d977612ec102301e144c1cada90d61e9e9bda3b2faaef708c8ff4bd0b52b143760a83b2 SHA512 5ad5329ea116d973cf67096f7e7ad28e9ea0905696e9451291f1d25e5064f4a9bfcfae87e912996c6a38397e9f4a148d4ccecfa9b70f7ecdf04deadb61784c8e
 DIST systemd-235.tar.gz 6586406 BLAKE2B f2e46a6c51fc9445800c4b7eee66f23ae83b42c2fedf2304acf612e6cb99122afe67f1b93cf72ed022b52384975afb92ab38cfb4efc6026384602c973d2eb98e SHA512 243f2eb5340fa37dd1286eaa63e83387bda9e03953af266cd6196a37535a13491482caf14c6ab10608bba4ed23b6c41923608e52017e0c26988ed72ddd2b9993
 DIST systemd-236.tar.gz 6759035 BLAKE2B 0fc26bd67fb6cc3b0565c763fc26e38186c4b05c3d38652b73a2189dfbfb46382dba239f7f6f889eec57ad1d8f69d4098745c8f4ca16a707aa23b7771f2328f3 SHA512 1a9672960e03e05c09e41fb8cfe9b0f25e867fd43f37f8371515ddddfdbd4270afd746a6da733f6d1d3b2cc43db1ecc7a9f2245f2dac2ec233db74e9e70e4f6d
-EBUILD systemd-233-r4.ebuild 13626 BLAKE2B 42f723d97bd8cdb8bbbfd579026d486f8902e90ec4e6631ed458371bd840f2ed75fa6ea75ecfa7e3aaafea00cab37c59fb9f7474175b6ad31c683b22ef3484f8 SHA512 3527bc62210aba9c50f663d8023440b73ae6185f1a90e6e31a48b6dcc13ac2dc0b312c433cbe74e942cb50ad894d4dd4212d81caf50d17971c9f965cae9535a0
-EBUILD systemd-233-r5.ebuild 13669 BLAKE2B e97ff5d66a6c93ba08b8c728d4675454f853b1571ae7b71d297e98c214361533be02c1c190f3ce71cdcac1ab65e7f11162bc2d891f151871baa7380c782f0f6a SHA512 722307b55c7621f119dee2e483bb7271d5a460945bd938adee6e679345a3549eaf060c96493b54e7a5bcb94a2821ce31949cfaeb5b1a43aeef36b673ecc39d7c
-EBUILD systemd-233-r6.ebuild 13699 BLAKE2B 3ed3402fc222d6ab58406f4c0f92b28864dfaa8af57855148bed7894807ee8598599dcc0a1a13b5eca0776f28e007483c1d45231e629ed950193a5d3b739656e SHA512 8d6f8d99211dbcaa6040657bb7065c2c15b3600f0d5c9e421e7ea3dcd642589679763155dfc80c7cd8ea89ef4afdde3871a2fe70641e49ddf55a7d3908b36751
+EBUILD systemd-233-r6.ebuild 13389 BLAKE2B e0a359f8ca505fc1033951ed7905ac52877ebdf162d27dc15f7c307b2b55471f76bfd97aab92fe5b67a6f1fe55f34c8b14a76057ede2b6e9e5cfa65bda847cd5 SHA512 ad74871cfb5a6f91630ea8018598d5470f881bfcd58baf955c376134c9b5b9321766f749fbbdd58c9438f6ccead3806e3bb243abaa18b53533b5a5bd68eaafe9
 EBUILD systemd-235-r1.ebuild 13481 BLAKE2B be0a0674aa5a9c151e03311a5e0ea50f6c879cf3ae9bbbbf49eb6a2f9ad8bea5fe65c113583006d69c60b703311881d5038ff79ede1bf91dff3fbd4c856714a3 SHA512 11245b058f3dea86cef8cd852b5cc59ede421c552e4a7e0d22a2666e87bc33e14df68e0029d169dc3f4189d3d25d8e0147eec20d48d9a2f3cc0b9c3c96ab8e99
-EBUILD systemd-236.ebuild 12740 BLAKE2B d4572ae69d701e36447210aae5dc45e838c43aa39d244dd86fba884dab4a5b93a0716a0b123048cd1f4a369222d6ddcfb4621c17f170541cff928471ce0a4db0 SHA512 bb377eec41c240832afc0a40f23ce9ab8d7dd0442f8539672447f3445c988b232ade71fe4949234be8a5e28a89cc956c7a9c59ba932c2641716213380435ab30
-EBUILD systemd-9999.ebuild 12740 BLAKE2B d4572ae69d701e36447210aae5dc45e838c43aa39d244dd86fba884dab4a5b93a0716a0b123048cd1f4a369222d6ddcfb4621c17f170541cff928471ce0a4db0 SHA512 bb377eec41c240832afc0a40f23ce9ab8d7dd0442f8539672447f3445c988b232ade71fe4949234be8a5e28a89cc956c7a9c59ba932c2641716213380435ab30
+EBUILD systemd-236.ebuild 12817 BLAKE2B c7cb601e2bec78d4f03fcd7958cbf415aa4436c1ef0c0de924cac97e80bc46b9e687ae4b18e2bd1cf78ca2463c613da34a753d5d598c4dfe3dc82aebcfe49add SHA512 b7ad77337fe102094a49d246a77c0725855ab0ef20f4f0352762d35c53b7370bf81a8f8b3801e246e00bba5b1c38ff6d8ed2e90f4a3eb98fe02d69195ecdf72c
+EBUILD systemd-9999.ebuild 12817 BLAKE2B c7cb601e2bec78d4f03fcd7958cbf415aa4436c1ef0c0de924cac97e80bc46b9e687ae4b18e2bd1cf78ca2463c613da34a753d5d598c4dfe3dc82aebcfe49add SHA512 b7ad77337fe102094a49d246a77c0725855ab0ef20f4f0352762d35c53b7370bf81a8f8b3801e246e00bba5b1c38ff6d8ed2e90f4a3eb98fe02d69195ecdf72c
 MISC metadata.xml 2032 BLAKE2B a554cb3dc21d5c5a5a4227f05f4a91054080999d23022051252f3461fb9c4398112fa1c96982205b4e1709de00ae395706ac46b86ae44610ecf85ededc3ceca7 SHA512 1c97f2c573c63a63d2ed78820d891d9593c5d8636574270c4306dc3c8ce739e52f6829e7e219cc2744acd7f3e2362e340b7c2406923f1aaf9adebc785cdb6544
diff --git a/sys-apps/systemd/files/233-0001-Avoid-strict-DM-interface-version-dependencies-5519.patch b/sys-apps/systemd/files/233-0001-Avoid-strict-DM-interface-version-dependencies-5519.patch
deleted file mode 100644
index be41fc4ec22c..000000000000
--- a/sys-apps/systemd/files/233-0001-Avoid-strict-DM-interface-version-dependencies-5519.patch
+++ /dev/null
@@ -1,456 +0,0 @@
-From dac3407f02116b94866224e0b5ecd46a5fa1c161 Mon Sep 17 00:00:00 2001
-From: Michael Biebl <mbiebl@gmail.com>
-Date: Thu, 2 Mar 2017 19:11:37 +0100
-Subject: [PATCH] Avoid strict DM interface version dependencies (#5519)
-
-Compiling against the dm-ioctl.h header as provided by the Linux kernel
-will embed the DM interface version number. Running an older kernel can
-result in an error like this on shutdown:
-
-Could not detach DM dm-11: ioctl mismatch, kernel(4.34.4), user(4.35.4)
-
-Work around this by shipping a local copy of dm-ioctl.h. We need at
-least the version from 3.13 for DM_DEFERRED_REMOVE [1], so bump the
-requirements in README accordingly.
-
-[1] https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=2c140a246dc0bc085b98eddde978060fcec1080c
-
-Fixes: #5492
----
- Makefile.am                      |   1 +
- README                           |   2 +-
- src/core/umount.c                |   2 +-
- src/shared/dissect-image.c       |   2 +-
- src/shared/linux-3.13/dm-ioctl.h | 355 +++++++++++++++++++++++++++++++++++++++
- 5 files changed, 359 insertions(+), 3 deletions(-)
- create mode 100644 src/shared/linux-3.13/dm-ioctl.h
-
-diff --git a/Makefile.am b/Makefile.am
-index 2a5610740..65de9f16d 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1018,6 +1018,7 @@ libshared_la_SOURCES = \
- 	src/shared/gpt.h \
- 	src/shared/udev-util.h \
- 	src/shared/linux/auto_dev-ioctl.h \
-+	src/shared/linux-3.13/dm-ioctl.h \
- 	src/shared/initreq.h \
- 	src/shared/dns-domain.c \
- 	src/shared/dns-domain.h \
-diff --git a/README b/README
-index a4a649395..30b5f7187 100644
---- a/README
-+++ b/README
-@@ -35,7 +35,7 @@ LICENSE:
-         - except src/udev/* which is (currently still) GPLv2, GPLv2+
- 
- REQUIREMENTS:
--        Linux kernel >= 3.12
-+        Linux kernel >= 3.13
-         Linux kernel >= 4.2 for unified cgroup hierarchy support
- 
-         Kernel Config Options:
-diff --git a/src/core/umount.c b/src/core/umount.c
-index 2f4b12bdb..454383e7e 100644
---- a/src/core/umount.c
-+++ b/src/core/umount.c
-@@ -19,7 +19,6 @@
- 
- #include <errno.h>
- #include <fcntl.h>
--#include <linux/dm-ioctl.h>
- #include <linux/loop.h>
- #include <string.h>
- #include <sys/mount.h>
-@@ -31,6 +30,7 @@
- #include "escape.h"
- #include "fd-util.h"
- #include "fstab-util.h"
-+#include "linux-3.13/dm-ioctl.h"
- #include "list.h"
- #include "mount-setup.h"
- #include "path-util.h"
-diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c
-index 39e724c51..1c9d21566 100644
---- a/src/shared/dissect-image.c
-+++ b/src/shared/dissect-image.c
-@@ -20,7 +20,6 @@
- #ifdef HAVE_LIBCRYPTSETUP
- #include <libcryptsetup.h>
- #endif
--#include <linux/dm-ioctl.h>
- #include <sys/mount.h>
- 
- #include "architecture.h"
-@@ -32,6 +31,7 @@
- #include "fs-util.h"
- #include "gpt.h"
- #include "hexdecoct.h"
-+#include "linux-3.13/dm-ioctl.h"
- #include "mount-util.h"
- #include "path-util.h"
- #include "stat-util.h"
-diff --git a/src/shared/linux-3.13/dm-ioctl.h b/src/shared/linux-3.13/dm-ioctl.h
-new file mode 100644
-index 000000000..c8a430209
---- /dev/null
-+++ b/src/shared/linux-3.13/dm-ioctl.h
-@@ -0,0 +1,355 @@
-+/*
-+ * Copyright (C) 2001 - 2003 Sistina Software (UK) Limited.
-+ * Copyright (C) 2004 - 2009 Red Hat, Inc. All rights reserved.
-+ *
-+ * This file is released under the LGPL.
-+ */
-+
-+#ifndef _LINUX_DM_IOCTL_V4_H
-+#define _LINUX_DM_IOCTL_V4_H
-+
-+#include <linux/types.h>
-+
-+#define DM_DIR "mapper"		/* Slashes not supported */
-+#define DM_CONTROL_NODE "control"
-+#define DM_MAX_TYPE_NAME 16
-+#define DM_NAME_LEN 128
-+#define DM_UUID_LEN 129
-+
-+/*
-+ * A traditional ioctl interface for the device mapper.
-+ *
-+ * Each device can have two tables associated with it, an
-+ * 'active' table which is the one currently used by io passing
-+ * through the device, and an 'inactive' one which is a table
-+ * that is being prepared as a replacement for the 'active' one.
-+ *
-+ * DM_VERSION:
-+ * Just get the version information for the ioctl interface.
-+ *
-+ * DM_REMOVE_ALL:
-+ * Remove all dm devices, destroy all tables.  Only really used
-+ * for debug.
-+ *
-+ * DM_LIST_DEVICES:
-+ * Get a list of all the dm device names.
-+ *
-+ * DM_DEV_CREATE:
-+ * Create a new device, neither the 'active' or 'inactive' table
-+ * slots will be filled.  The device will be in suspended state
-+ * after creation, however any io to the device will get errored
-+ * since it will be out-of-bounds.
-+ *
-+ * DM_DEV_REMOVE:
-+ * Remove a device, destroy any tables.
-+ *
-+ * DM_DEV_RENAME:
-+ * Rename a device or set its uuid if none was previously supplied.
-+ *
-+ * DM_SUSPEND:
-+ * This performs both suspend and resume, depending which flag is
-+ * passed in.
-+ * Suspend: This command will not return until all pending io to
-+ * the device has completed.  Further io will be deferred until
-+ * the device is resumed.
-+ * Resume: It is no longer an error to issue this command on an
-+ * unsuspended device.  If a table is present in the 'inactive'
-+ * slot, it will be moved to the active slot, then the old table
-+ * from the active slot will be _destroyed_.  Finally the device
-+ * is resumed.
-+ *
-+ * DM_DEV_STATUS:
-+ * Retrieves the status for the table in the 'active' slot.
-+ *
-+ * DM_DEV_WAIT:
-+ * Wait for a significant event to occur to the device.  This
-+ * could either be caused by an event triggered by one of the
-+ * targets of the table in the 'active' slot, or a table change.
-+ *
-+ * DM_TABLE_LOAD:
-+ * Load a table into the 'inactive' slot for the device.  The
-+ * device does _not_ need to be suspended prior to this command.
-+ *
-+ * DM_TABLE_CLEAR:
-+ * Destroy any table in the 'inactive' slot (ie. abort).
-+ *
-+ * DM_TABLE_DEPS:
-+ * Return a set of device dependencies for the 'active' table.
-+ *
-+ * DM_TABLE_STATUS:
-+ * Return the targets status for the 'active' table.
-+ *
-+ * DM_TARGET_MSG:
-+ * Pass a message string to the target at a specific offset of a device.
-+ *
-+ * DM_DEV_SET_GEOMETRY:
-+ * Set the geometry of a device by passing in a string in this format:
-+ *
-+ * "cylinders heads sectors_per_track start_sector"
-+ *
-+ * Beware that CHS geometry is nearly obsolete and only provided
-+ * for compatibility with dm devices that can be booted by a PC
-+ * BIOS.  See struct hd_geometry for range limits.  Also note that
-+ * the geometry is erased if the device size changes.
-+ */
-+
-+/*
-+ * All ioctl arguments consist of a single chunk of memory, with
-+ * this structure at the start.  If a uuid is specified any
-+ * lookup (eg. for a DM_INFO) will be done on that, *not* the
-+ * name.
-+ */
-+struct dm_ioctl {
-+	/*
-+	 * The version number is made up of three parts:
-+	 * major - no backward or forward compatibility,
-+	 * minor - only backwards compatible,
-+	 * patch - both backwards and forwards compatible.
-+	 *
-+	 * All clients of the ioctl interface should fill in the
-+	 * version number of the interface that they were
-+	 * compiled with.
-+	 *
-+	 * All recognised ioctl commands (ie. those that don't
-+	 * return -ENOTTY) fill out this field, even if the
-+	 * command failed.
-+	 */
-+	__u32 version[3];	/* in/out */
-+	__u32 data_size;	/* total size of data passed in
-+				 * including this struct */
-+
-+	__u32 data_start;	/* offset to start of data
-+				 * relative to start of this struct */
-+
-+	__u32 target_count;	/* in/out */
-+	__s32 open_count;	/* out */
-+	__u32 flags;		/* in/out */
-+
-+	/*
-+	 * event_nr holds either the event number (input and output) or the
-+	 * udev cookie value (input only).
-+	 * The DM_DEV_WAIT ioctl takes an event number as input.
-+	 * The DM_SUSPEND, DM_DEV_REMOVE and DM_DEV_RENAME ioctls
-+	 * use the field as a cookie to return in the DM_COOKIE
-+	 * variable with the uevents they issue.
-+	 * For output, the ioctls return the event number, not the cookie.
-+	 */
-+	__u32 event_nr;      	/* in/out */
-+	__u32 padding;
-+
-+	__u64 dev;		/* in/out */
-+
-+	char name[DM_NAME_LEN];	/* device name */
-+	char uuid[DM_UUID_LEN];	/* unique identifier for
-+				 * the block device */
-+	char data[7];		/* padding or data */
-+};
-+
-+/*
-+ * Used to specify tables.  These structures appear after the
-+ * dm_ioctl.
-+ */
-+struct dm_target_spec {
-+	__u64 sector_start;
-+	__u64 length;
-+	__s32 status;		/* used when reading from kernel only */
-+
-+	/*
-+	 * Location of the next dm_target_spec.
-+	 * - When specifying targets on a DM_TABLE_LOAD command, this value is
-+	 *   the number of bytes from the start of the "current" dm_target_spec
-+	 *   to the start of the "next" dm_target_spec.
-+	 * - When retrieving targets on a DM_TABLE_STATUS command, this value
-+	 *   is the number of bytes from the start of the first dm_target_spec
-+	 *   (that follows the dm_ioctl struct) to the start of the "next"
-+	 *   dm_target_spec.
-+	 */
-+	__u32 next;
-+
-+	char target_type[DM_MAX_TYPE_NAME];
-+
-+	/*
-+	 * Parameter string starts immediately after this object.
-+	 * Be careful to add padding after string to ensure correct
-+	 * alignment of subsequent dm_target_spec.
-+	 */
-+};
-+
-+/*
-+ * Used to retrieve the target dependencies.
-+ */
-+struct dm_target_deps {
-+	__u32 count;	/* Array size */
-+	__u32 padding;	/* unused */
-+	__u64 dev[0];	/* out */
-+};
-+
-+/*
-+ * Used to get a list of all dm devices.
-+ */
-+struct dm_name_list {
-+	__u64 dev;
-+	__u32 next;		/* offset to the next record from
-+				   the _start_ of this */
-+	char name[0];
-+};
-+
-+/*
-+ * Used to retrieve the target versions
-+ */
-+struct dm_target_versions {
-+        __u32 next;
-+        __u32 version[3];
-+
-+        char name[0];
-+};
-+
-+/*
-+ * Used to pass message to a target
-+ */
-+struct dm_target_msg {
-+	__u64 sector;	/* Device sector */
-+
-+	char message[0];
-+};
-+
-+/*
-+ * If you change this make sure you make the corresponding change
-+ * to dm-ioctl.c:lookup_ioctl()
-+ */
-+enum {
-+	/* Top level cmds */
-+	DM_VERSION_CMD = 0,
-+	DM_REMOVE_ALL_CMD,
-+	DM_LIST_DEVICES_CMD,
-+
-+	/* device level cmds */
-+	DM_DEV_CREATE_CMD,
-+	DM_DEV_REMOVE_CMD,
-+	DM_DEV_RENAME_CMD,
-+	DM_DEV_SUSPEND_CMD,
-+	DM_DEV_STATUS_CMD,
-+	DM_DEV_WAIT_CMD,
-+
-+	/* Table level cmds */
-+	DM_TABLE_LOAD_CMD,
-+	DM_TABLE_CLEAR_CMD,
-+	DM_TABLE_DEPS_CMD,
-+	DM_TABLE_STATUS_CMD,
-+
-+	/* Added later */
-+	DM_LIST_VERSIONS_CMD,
-+	DM_TARGET_MSG_CMD,
-+	DM_DEV_SET_GEOMETRY_CMD
-+};
-+
-+#define DM_IOCTL 0xfd
-+
-+#define DM_VERSION       _IOWR(DM_IOCTL, DM_VERSION_CMD, struct dm_ioctl)
-+#define DM_REMOVE_ALL    _IOWR(DM_IOCTL, DM_REMOVE_ALL_CMD, struct dm_ioctl)
-+#define DM_LIST_DEVICES  _IOWR(DM_IOCTL, DM_LIST_DEVICES_CMD, struct dm_ioctl)
-+
-+#define DM_DEV_CREATE    _IOWR(DM_IOCTL, DM_DEV_CREATE_CMD, struct dm_ioctl)
-+#define DM_DEV_REMOVE    _IOWR(DM_IOCTL, DM_DEV_REMOVE_CMD, struct dm_ioctl)
-+#define DM_DEV_RENAME    _IOWR(DM_IOCTL, DM_DEV_RENAME_CMD, struct dm_ioctl)
-+#define DM_DEV_SUSPEND   _IOWR(DM_IOCTL, DM_DEV_SUSPEND_CMD, struct dm_ioctl)
-+#define DM_DEV_STATUS    _IOWR(DM_IOCTL, DM_DEV_STATUS_CMD, struct dm_ioctl)
-+#define DM_DEV_WAIT      _IOWR(DM_IOCTL, DM_DEV_WAIT_CMD, struct dm_ioctl)
-+
-+#define DM_TABLE_LOAD    _IOWR(DM_IOCTL, DM_TABLE_LOAD_CMD, struct dm_ioctl)
-+#define DM_TABLE_CLEAR   _IOWR(DM_IOCTL, DM_TABLE_CLEAR_CMD, struct dm_ioctl)
-+#define DM_TABLE_DEPS    _IOWR(DM_IOCTL, DM_TABLE_DEPS_CMD, struct dm_ioctl)
-+#define DM_TABLE_STATUS  _IOWR(DM_IOCTL, DM_TABLE_STATUS_CMD, struct dm_ioctl)
-+
-+#define DM_LIST_VERSIONS _IOWR(DM_IOCTL, DM_LIST_VERSIONS_CMD, struct dm_ioctl)
-+
-+#define DM_TARGET_MSG	 _IOWR(DM_IOCTL, DM_TARGET_MSG_CMD, struct dm_ioctl)
-+#define DM_DEV_SET_GEOMETRY	_IOWR(DM_IOCTL, DM_DEV_SET_GEOMETRY_CMD, struct dm_ioctl)
-+
-+#define DM_VERSION_MAJOR	4
-+#define DM_VERSION_MINOR	27
-+#define DM_VERSION_PATCHLEVEL	0
-+#define DM_VERSION_EXTRA	"-ioctl (2013-10-30)"
-+
-+/* Status bits */
-+#define DM_READONLY_FLAG	(1 << 0) /* In/Out */
-+#define DM_SUSPEND_FLAG		(1 << 1) /* In/Out */
-+#define DM_PERSISTENT_DEV_FLAG	(1 << 3) /* In */
-+
-+/*
-+ * Flag passed into ioctl STATUS command to get table information
-+ * rather than current status.
-+ */
-+#define DM_STATUS_TABLE_FLAG	(1 << 4) /* In */
-+
-+/*
-+ * Flags that indicate whether a table is present in either of
-+ * the two table slots that a device has.
-+ */
-+#define DM_ACTIVE_PRESENT_FLAG   (1 << 5) /* Out */
-+#define DM_INACTIVE_PRESENT_FLAG (1 << 6) /* Out */
-+
-+/*
-+ * Indicates that the buffer passed in wasn't big enough for the
-+ * results.
-+ */
-+#define DM_BUFFER_FULL_FLAG	(1 << 8) /* Out */
-+
-+/*
-+ * This flag is now ignored.
-+ */
-+#define DM_SKIP_BDGET_FLAG	(1 << 9) /* In */
-+
-+/*
-+ * Set this to avoid attempting to freeze any filesystem when suspending.
-+ */
-+#define DM_SKIP_LOCKFS_FLAG	(1 << 10) /* In */
-+
-+/*
-+ * Set this to suspend without flushing queued ios.
-+ * Also disables flushing uncommitted changes in the thin target before
-+ * generating statistics for DM_TABLE_STATUS and DM_DEV_WAIT.
-+ */
-+#define DM_NOFLUSH_FLAG		(1 << 11) /* In */
-+
-+/*
-+ * If set, any table information returned will relate to the inactive
-+ * table instead of the live one.  Always check DM_INACTIVE_PRESENT_FLAG
-+ * is set before using the data returned.
-+ */
-+#define DM_QUERY_INACTIVE_TABLE_FLAG	(1 << 12) /* In */
-+
-+/*
-+ * If set, a uevent was generated for which the caller may need to wait.
-+ */
-+#define DM_UEVENT_GENERATED_FLAG	(1 << 13) /* Out */
-+
-+/*
-+ * If set, rename changes the uuid not the name.  Only permitted
-+ * if no uuid was previously supplied: an existing uuid cannot be changed.
-+ */
-+#define DM_UUID_FLAG			(1 << 14) /* In */
-+
-+/*
-+ * If set, all buffers are wiped after use. Use when sending
-+ * or requesting sensitive data such as an encryption key.
-+ */
-+#define DM_SECURE_DATA_FLAG		(1 << 15) /* In */
-+
-+/*
-+ * If set, a message generated output data.
-+ */
-+#define DM_DATA_OUT_FLAG		(1 << 16) /* Out */
-+
-+/*
-+ * If set with DM_DEV_REMOVE or DM_REMOVE_ALL this indicates that if
-+ * the device cannot be removed immediately because it is still in use
-+ * it should instead be scheduled for removal when it gets closed.
-+ *
-+ * On return from DM_DEV_REMOVE, DM_DEV_STATUS or other ioctls, this
-+ * flag indicates that the device is scheduled to be removed when it
-+ * gets closed.
-+ */
-+#define DM_DEFERRED_REMOVE		(1 << 17) /* In/Out */
-+
-+#endif				/* _LINUX_DM_IOCTL_H */
--- 
-2.12.0
-
diff --git a/sys-apps/systemd/files/233-0002-core-load-fragment-refuse-units-with-errors-in-RootD.patch b/sys-apps/systemd/files/233-0002-core-load-fragment-refuse-units-with-errors-in-RootD.patch
deleted file mode 100644
index fe30ef9ff617..000000000000
--- a/sys-apps/systemd/files/233-0002-core-load-fragment-refuse-units-with-errors-in-RootD.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From 433e7893c6c0f6cbc98d8911fc5149ee9beedb79 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
-Date: Thu, 6 Jul 2017 13:54:42 -0400
-Subject: [PATCH 2/3] core/load-fragment: refuse units with errors in
- RootDirectory/RootImage/DynamicUser
-
-Behaviour of the service is completely different with the option off, so the
-service would probably mess up state on disk and do unexpected things.
----
- src/core/load-fragment-gperf.gperf.m4 |  6 +++---
- src/core/load-fragment.c              |  7 +++++--
- src/shared/conf-parser.c              | 16 +++++++++++-----
- 3 files changed, 19 insertions(+), 10 deletions(-)
-
-diff --git a/src/core/load-fragment-gperf.gperf.m4 b/src/core/load-fragment-gperf.gperf.m4
-index cb9e6fea2..d0868bf40 100644
---- a/src/core/load-fragment-gperf.gperf.m4
-+++ b/src/core/load-fragment-gperf.gperf.m4
-@@ -18,8 +18,8 @@ struct ConfigPerfItem;
- m4_dnl Define the context options only once
- m4_define(`EXEC_CONTEXT_CONFIG_ITEMS',
- `$1.WorkingDirectory,            config_parse_working_directory,     0,                             offsetof($1, exec_context)
--$1.RootDirectory,                config_parse_unit_path_printf,      0,                             offsetof($1, exec_context.root_directory)
--$1.RootImage,                    config_parse_unit_path_printf,      0,                             offsetof($1, exec_context.root_image)
-+$1.RootDirectory,                config_parse_unit_path_printf,      true,                          offsetof($1, exec_context.root_directory)
-+$1.RootImage,                    config_parse_unit_path_printf,      true,                          offsetof($1, exec_context.root_image)
- $1.User,                         config_parse_user_group,            0,                             offsetof($1, exec_context.user)
- $1.Group,                        config_parse_user_group,            0,                             offsetof($1, exec_context.group)
- $1.SupplementaryGroups,          config_parse_user_group_strv,       0,                             offsetof($1, exec_context.supplementary_groups)
-@@ -35,7 +35,7 @@ $1.UMask,                        config_parse_mode,                  0,
- $1.Environment,                  config_parse_environ,               0,                             offsetof($1, exec_context.environment)
- $1.EnvironmentFile,              config_parse_unit_env_file,         0,                             offsetof($1, exec_context.environment_files)
- $1.PassEnvironment,              config_parse_pass_environ,          0,                             offsetof($1, exec_context.pass_environment)
--$1.DynamicUser,                  config_parse_bool,                  0,                             offsetof($1, exec_context.dynamic_user)
-+$1.DynamicUser,                  config_parse_bool,                  true,                          offsetof($1, exec_context.dynamic_user)
- $1.StandardInput,                config_parse_exec_input,            0,                             offsetof($1, exec_context)
- $1.StandardOutput,               config_parse_exec_output,           0,                             offsetof($1, exec_context)
- $1.StandardError,                config_parse_exec_output,           0,                             offsetof($1, exec_context)
-diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
-index 5b7471c0d..ae4ec5cf0 100644
---- a/src/core/load-fragment.c
-+++ b/src/core/load-fragment.c
-@@ -242,6 +242,7 @@ int config_parse_unit_path_printf(
-         _cleanup_free_ char *k = NULL;
-         Unit *u = userdata;
-         int r;
-+        bool fatal = ltype;
- 
-         assert(filename);
-         assert(lvalue);
-@@ -250,8 +251,10 @@ int config_parse_unit_path_printf(
- 
-         r = unit_full_printf(u, rvalue, &k);
-         if (r < 0) {
--                log_syntax(unit, LOG_ERR, filename, line, r, "Failed to resolve unit specifiers on %s, ignoring: %m", rvalue);
--                return 0;
-+                log_syntax(unit, LOG_ERR, filename, line, r,
-+                           "Failed to resolve unit specifiers on %s%s: %m",
-+                           fatal ? "" : ", ignoring", rvalue);
-+                return fatal ? -ENOEXEC : 0;
-         }
- 
-         return config_parse_path(unit, filename, line, section, section_line, lvalue, ltype, k, data, userdata);
-diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c
-index 265ac83dc..ffb905fb6 100644
---- a/src/shared/conf-parser.c
-+++ b/src/shared/conf-parser.c
-@@ -614,6 +614,7 @@ int config_parse_bool(const char* unit,
- 
-         int k;
-         bool *b = data;
-+        bool fatal = ltype;
- 
-         assert(filename);
-         assert(lvalue);
-@@ -622,8 +623,10 @@ int config_parse_bool(const char* unit,
- 
-         k = parse_boolean(rvalue);
-         if (k < 0) {
--                log_syntax(unit, LOG_ERR, filename, line, k, "Failed to parse boolean value, ignoring: %s", rvalue);
--                return 0;
-+                log_syntax(unit, LOG_ERR, filename, line, k,
-+                           "Failed to parse boolean value%s: %s",
-+                           fatal ? "" : ", ignoring", rvalue);
-+                return fatal ? -ENOEXEC : 0;
-         }
- 
-         *b = !!k;
-@@ -714,6 +717,7 @@ int config_parse_path(
-                 void *userdata) {
- 
-         char **s = data, *n;
-+        bool fatal = ltype;
- 
-         assert(filename);
-         assert(lvalue);
-@@ -722,12 +726,14 @@ int config_parse_path(
- 
-         if (!utf8_is_valid(rvalue)) {
-                 log_syntax_invalid_utf8(unit, LOG_ERR, filename, line, rvalue);
--                return 0;
-+                return fatal ? -ENOEXEC : 0;
-         }
- 
-         if (!path_is_absolute(rvalue)) {
--                log_syntax(unit, LOG_ERR, filename, line, 0, "Not an absolute path, ignoring: %s", rvalue);
--                return 0;
-+                log_syntax(unit, LOG_ERR, filename, line, 0,
-+                           "Not an absolute path%s: %s",
-+                           fatal ? "" : ", ignoring", rvalue);
-+                return fatal ? -ENOEXEC : 0;
-         }
- 
-         n = strdup(rvalue);
--- 
-2.13.2
-
diff --git a/sys-apps/systemd/files/233-0003-core-load-fragment-refuse-units-with-errors-in-certa.patch b/sys-apps/systemd/files/233-0003-core-load-fragment-refuse-units-with-errors-in-certa.patch
deleted file mode 100644
index 28961b4b1e36..000000000000
--- a/sys-apps/systemd/files/233-0003-core-load-fragment-refuse-units-with-errors-in-certa.patch
+++ /dev/null
@@ -1,339 +0,0 @@
-From f135524cd4cd6b71e7f6073b02389da30c6e94d9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
-Date: Thu, 6 Jul 2017 13:28:19 -0400
-Subject: [PATCH 3/3] core/load-fragment: refuse units with errors in certain
- directives
-
-If an error is encountered in any of the Exec* lines, WorkingDirectory,
-SELinuxContext, ApparmorProfile, SmackProcessLabel, Service (in .socket
-units), User, or Group, refuse to load the unit. If the config stanza
-has support, ignore the failure if '-' is present.
-
-For those configuration directives, even if we started the unit, it's
-pretty likely that it'll do something unexpected (like write files
-in a wrong place, or with a wrong context, or run with wrong permissions,
-etc). It seems better to refuse to start the unit and have the admin
-clean up the configuration without giving the service a chance to mess
-up stuff.
-
-Note that all "security" options that restrict what the unit can do
-(Capabilities, AmbientCapabilities, Restrict*, SystemCallFilter, Limit*,
-PrivateDevices, Protect*, etc) are _not_ treated like this. Such options are
-only supplementary, and are not always available depending on the architecture
-and compilation options, so unit authors have to make sure that the service
-runs correctly without them anyway.
-
-Fixes #6237, #6277.
----
- src/core/load-fragment.c  | 116 ++++++++++++++++++++++++++++------------------
- src/test/test-unit-file.c |  14 +++---
- 2 files changed, 78 insertions(+), 52 deletions(-)
-
-diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
-index ae4ec5cf0..f38240af3 100644
---- a/src/core/load-fragment.c
-+++ b/src/core/load-fragment.c
-@@ -637,26 +637,36 @@ int config_parse_exec(
- 
-                 r = unit_full_printf(u, f, &path);
-                 if (r < 0) {
--                        log_syntax(unit, LOG_ERR, filename, line, r, "Failed to resolve unit specifiers on %s, ignoring: %m", f);
--                        return 0;
-+                        log_syntax(unit, LOG_ERR, filename, line, r,
-+                                   "Failed to resolve unit specifiers on %s%s: %m",
-+                                   f, ignore ? ", ignoring" : "");
-+                        return ignore ? 0 : -ENOEXEC;
-                 }
- 
-                 if (isempty(path)) {
-                         /* First word is either "-" or "@" with no command. */
--                        log_syntax(unit, LOG_ERR, filename, line, 0, "Empty path in command line, ignoring: \"%s\"", rvalue);
--                        return 0;
-+                        log_syntax(unit, LOG_ERR, filename, line, 0,
-+                                   "Empty path in command line%s: \"%s\"",
-+                                   ignore ? ", ignoring" : "", rvalue);
-+                        return ignore ? 0 : -ENOEXEC;
-                 }
-                 if (!string_is_safe(path)) {
--                        log_syntax(unit, LOG_ERR, filename, line, 0, "Executable path contains special characters, ignoring: %s", rvalue);
--                        return 0;
-+                        log_syntax(unit, LOG_ERR, filename, line, 0,
-+                                   "Executable path contains special characters%s: %s",
-+                                   ignore ? ", ignoring" : "", rvalue);
-+                        return ignore ? 0 : -ENOEXEC;
-                 }
-                 if (!path_is_absolute(path)) {
--                        log_syntax(unit, LOG_ERR, filename, line, 0, "Executable path is not absolute, ignoring: %s", rvalue);
--                        return 0;
-+                        log_syntax(unit, LOG_ERR, filename, line, 0,
-+                                   "Executable path is not absolute%s: %s",
-+                                   ignore ? ", ignoring" : "", rvalue);
-+                        return ignore ? 0 : -ENOEXEC;
-                 }
-                 if (endswith(path, "/")) {
--                        log_syntax(unit, LOG_ERR, filename, line, 0, "Executable path specifies a directory, ignoring: %s", rvalue);
--                        return 0;
-+                        log_syntax(unit, LOG_ERR, filename, line, 0,
-+                                   "Executable path specifies a directory%s: %s",
-+                                   ignore ? ", ignoring" : "", rvalue);
-+                        return ignore ? 0 : -ENOEXEC;
-                 }
- 
-                 if (!separate_argv0) {
-@@ -709,12 +719,14 @@ int config_parse_exec(
-                         if (r == 0)
-                                 break;
-                         if (r < 0)
--                                return 0;
-+                                return ignore ? 0 : -ENOEXEC;
- 
-                         r = unit_full_printf(u, word, &resolved);
-                         if (r < 0) {
--                                log_syntax(unit, LOG_ERR, filename, line, 0, "Failed to resolve unit specifiers on %s, ignoring: %m", word);
--                                return 0;
-+                                log_syntax(unit, LOG_ERR, filename, line, r,
-+                                           "Failed to resolve unit specifiers on %s%s: %m",
-+                                           word, ignore ? ", ignoring" : "");
-+                                return ignore ? 0 : -ENOEXEC;
-                         }
- 
-                         if (!GREEDY_REALLOC(n, nbufsize, nlen + 2))
-@@ -725,8 +737,10 @@ int config_parse_exec(
-                 }
- 
-                 if (!n || !n[0]) {
--                        log_syntax(unit, LOG_ERR, filename, line, 0, "Empty executable name or zeroeth argument, ignoring: %s", rvalue);
--                        return 0;
-+                        log_syntax(unit, LOG_ERR, filename, line, 0,
-+                                   "Empty executable name or zeroeth argument%s: %s",
-+                                   ignore ? ", ignoring" : "", rvalue);
-+                        return ignore ? 0 : -ENOEXEC;
-                 }
- 
-                 nce = new0(ExecCommand, 1);
-@@ -1333,8 +1347,10 @@ int config_parse_exec_selinux_context(
- 
-         r = unit_full_printf(u, rvalue, &k);
-         if (r < 0) {
--                log_syntax(unit, LOG_ERR, filename, line, r, "Failed to resolve specifiers, ignoring: %m");
--                return 0;
-+                log_syntax(unit, LOG_ERR, filename, line, r,
-+                           "Failed to resolve specifiers%s: %m",
-+                           ignore ? ", ignoring" : "");
-+                return ignore ? 0 : -ENOEXEC;
-         }
- 
-         free(c->selinux_context);
-@@ -1381,8 +1397,10 @@ int config_parse_exec_apparmor_profile(
- 
-         r = unit_full_printf(u, rvalue, &k);
-         if (r < 0) {
--                log_syntax(unit, LOG_ERR, filename, line, r, "Failed to resolve specifiers, ignoring: %m");
--                return 0;
-+                log_syntax(unit, LOG_ERR, filename, line, r,
-+                           "Failed to resolve specifiers%s: %m",
-+                           ignore ? ", ignoring" : "");
-+                return ignore ? 0 : -ENOEXEC;
-         }
- 
-         free(c->apparmor_profile);
-@@ -1429,8 +1447,10 @@ int config_parse_exec_smack_process_label(
- 
-         r = unit_full_printf(u, rvalue, &k);
-         if (r < 0) {
--                log_syntax(unit, LOG_ERR, filename, line, r, "Failed to resolve specifiers, ignoring: %m");
--                return 0;
-+                log_syntax(unit, LOG_ERR, filename, line, r,
-+                           "Failed to resolve specifiers%s: %m",
-+                           ignore ? ", ignoring" : "");
-+                return ignore ? 0 : -ENOEXEC;
-         }
- 
-         free(c->smack_process_label);
-@@ -1648,19 +1668,19 @@ int config_parse_socket_service(
- 
-         r = unit_name_printf(UNIT(s), rvalue, &p);
-         if (r < 0) {
--                log_syntax(unit, LOG_ERR, filename, line, r, "Failed to resolve specifiers, ignoring: %s", rvalue);
--                return 0;
-+                log_syntax(unit, LOG_ERR, filename, line, r, "Failed to resolve specifiers: %s", rvalue);
-+                return -ENOEXEC;
-         }
- 
-         if (!endswith(p, ".service")) {
--                log_syntax(unit, LOG_ERR, filename, line, 0, "Unit must be of type service, ignoring: %s", rvalue);
--                return 0;
-+                log_syntax(unit, LOG_ERR, filename, line, 0, "Unit must be of type service: %s", rvalue);
-+                return -ENOEXEC;
-         }
- 
-         r = manager_load_unit(UNIT(s)->manager, p, NULL, &error, &x);
-         if (r < 0) {
--                log_syntax(unit, LOG_ERR, filename, line, r, "Failed to load unit %s, ignoring: %s", rvalue, bus_error_message(&error, r));
--                return 0;
-+                log_syntax(unit, LOG_ERR, filename, line, r, "Failed to load unit %s: %s", rvalue, bus_error_message(&error, r));
-+                return -ENOEXEC;
-         }
- 
-         unit_ref_set(&s->service, x);
-@@ -1911,13 +1931,13 @@ int config_parse_user_group(
- 
-                 r = unit_full_printf(u, rvalue, &k);
-                 if (r < 0) {
--                        log_syntax(unit, LOG_ERR, filename, line, r, "Failed to resolve unit specifiers in %s, ignoring: %m", rvalue);
--                        return 0;
-+                        log_syntax(unit, LOG_ERR, filename, line, r, "Failed to resolve unit specifiers in %s: %m", rvalue);
-+                        return -ENOEXEC;
-                 }
- 
-                 if (!valid_user_group_name_or_id(k)) {
--                        log_syntax(unit, LOG_ERR, filename, line, 0, "Invalid user/group name or numeric ID, ignoring: %s", k);
--                        return 0;
-+                        log_syntax(unit, LOG_ERR, filename, line, 0, "Invalid user/group name or numeric ID: %s", k);
-+                        return -ENOEXEC;
-                 }
- 
-                 n = k;
-@@ -1975,19 +1995,19 @@ int config_parse_user_group_strv(
-                 if (r == -ENOMEM)
-                         return log_oom();
-                 if (r < 0) {
--                        log_syntax(unit, LOG_ERR, filename, line, r, "Invalid syntax, ignoring: %s", rvalue);
--                        break;
-+                        log_syntax(unit, LOG_ERR, filename, line, r, "Invalid syntax: %s", rvalue);
-+                        return -ENOEXEC;
-                 }
- 
-                 r = unit_full_printf(u, word, &k);
-                 if (r < 0) {
--                        log_syntax(unit, LOG_ERR, filename, line, r, "Failed to resolve unit specifiers in %s, ignoring: %m", word);
--                        continue;
-+                        log_syntax(unit, LOG_ERR, filename, line, r, "Failed to resolve unit specifiers in %s: %m", word);
-+                        return -ENOEXEC;
-                 }
- 
-                 if (!valid_user_group_name_or_id(k)) {
--                        log_syntax(unit, LOG_ERR, filename, line, 0, "Invalid user/group name or numeric ID, ignoring: %s", k);
--                        continue;
-+                        log_syntax(unit, LOG_ERR, filename, line, 0, "Invalid user/group name or numeric ID: %s", k);
-+                        return -ENOEXEC;
-                 }
- 
-                 r = strv_push(users, k);
-@@ -2146,25 +2166,28 @@ int config_parse_working_directory(
- 
-                 r = unit_full_printf(u, rvalue, &k);
-                 if (r < 0) {
--                        log_syntax(unit, LOG_ERR, filename, line, r, "Failed to resolve unit specifiers in working directory path '%s', ignoring: %m", rvalue);
--                        return 0;
-+                        log_syntax(unit, LOG_ERR, filename, line, r,
-+                                   "Failed to resolve unit specifiers in working directory path '%s'%s: %m",
-+                                   rvalue, missing_ok ? ", ignoring" : "");
-+                        return missing_ok ? 0 : -ENOEXEC;
-                 }
- 
-                 path_kill_slashes(k);
- 
-                 if (!utf8_is_valid(k)) {
-                         log_syntax_invalid_utf8(unit, LOG_ERR, filename, line, rvalue);
--                        return 0;
-+                        return missing_ok ? 0 : -ENOEXEC;
-                 }
- 
-                 if (!path_is_absolute(k)) {
--                        log_syntax(unit, LOG_ERR, filename, line, 0, "Working directory path '%s' is not absolute, ignoring.", rvalue);
--                        return 0;
-+                        log_syntax(unit, LOG_ERR, filename, line, 0,
-+                                   "Working directory path '%s' is not absolute%s.",
-+                                   rvalue, missing_ok ? ", ignoring" : "");
-+                        return missing_ok ? 0 : -ENOEXEC;
-                 }
- 
--                free_and_replace(c->working_directory, k);
--
-                 c->working_directory_home = false;
-+                free_and_replace(c->working_directory, k);
-         }
- 
-         c->working_directory_missing_ok = missing_ok;
-@@ -4444,8 +4467,11 @@ int unit_load_fragment(Unit *u) {
-                         return r;
- 
-                 r = load_from_path(u, k);
--                if (r < 0)
-+                if (r < 0) {
-+                        if (r == -ENOEXEC)
-+                                log_unit_notice(u, "Unit configuration has fatal error, unit will not be started.");
-                         return r;
-+                }
- 
-                 if (u->load_state == UNIT_STUB) {
-                         SET_FOREACH(t, u->names, i) {
-diff --git a/src/test/test-unit-file.c b/src/test/test-unit-file.c
-index 12f48bf43..fd797b587 100644
---- a/src/test/test-unit-file.c
-+++ b/src/test/test-unit-file.c
-@@ -146,7 +146,7 @@ static void test_config_parse_exec(void) {
-         r = config_parse_exec(NULL, "fake", 4, "section", 1,
-                               "LValue", 0, "/RValue/ argv0 r1",
-                               &c, u);
--        assert_se(r == 0);
-+        assert_se(r == -ENOEXEC);
-         assert_se(c1->command_next == NULL);
- 
-         log_info("/* honour_argv0 */");
-@@ -161,7 +161,7 @@ static void test_config_parse_exec(void) {
-         r = config_parse_exec(NULL, "fake", 3, "section", 1,
-                               "LValue", 0, "@/RValue",
-                               &c, u);
--        assert_se(r == 0);
-+        assert_se(r == -ENOEXEC);
-         assert_se(c1->command_next == NULL);
- 
-         log_info("/* no command, whitespace only, reset */");
-@@ -220,7 +220,7 @@ static void test_config_parse_exec(void) {
-                               "-@/RValue argv0 r1 ; ; "
-                               "/goo/goo boo",
-                               &c, u);
--        assert_se(r >= 0);
-+        assert_se(r == -ENOEXEC);
-         c1 = c1->command_next;
-         check_execcommand(c1, "/RValue", "argv0", "r1", NULL, true);
- 
-@@ -374,7 +374,7 @@ static void test_config_parse_exec(void) {
-                 r = config_parse_exec(NULL, "fake", 4, "section", 1,
-                                       "LValue", 0, path,
-                                       &c, u);
--                assert_se(r == 0);
-+                assert_se(r == -ENOEXEC);
-                 assert_se(c1->command_next == NULL);
-         }
- 
-@@ -401,21 +401,21 @@ static void test_config_parse_exec(void) {
-         r = config_parse_exec(NULL, "fake", 4, "section", 1,
-                               "LValue", 0, "/path\\",
-                               &c, u);
--        assert_se(r == 0);
-+        assert_se(r == -ENOEXEC);
-         assert_se(c1->command_next == NULL);
- 
-         log_info("/* missing ending ' */");
-         r = config_parse_exec(NULL, "fake", 4, "section", 1,
-                               "LValue", 0, "/path 'foo",
-                               &c, u);
--        assert_se(r == 0);
-+        assert_se(r == -ENOEXEC);
-         assert_se(c1->command_next == NULL);
- 
-         log_info("/* missing ending ' with trailing backslash */");
-         r = config_parse_exec(NULL, "fake", 4, "section", 1,
-                               "LValue", 0, "/path 'foo\\",
-                               &c, u);
--        assert_se(r == 0);
-+        assert_se(r == -ENOEXEC);
-         assert_se(c1->command_next == NULL);
- 
-         log_info("/* invalid space between modifiers */");
--- 
-2.13.2
-
diff --git a/sys-apps/systemd/files/233-CVE-2017-9445.patch b/sys-apps/systemd/files/233-CVE-2017-9445.patch
deleted file mode 100644
index 22a366ceba07..000000000000
--- a/sys-apps/systemd/files/233-CVE-2017-9445.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-From 29bb43cc46412366fc939c66331a916de07bfac4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
-Date: Sun, 18 Jun 2017 16:07:57 -0400
-Subject: [PATCH 1/4] resolved: simplify alloc size calculation
-
-The allocation size was calculated in a complicated way, and for values
-close to the page size we would actually allocate less than requested.
-
-Reported by Chris Coulson <chris.coulson@canonical.com>.
-
-CVE-2017-9445
----
- src/resolve/resolved-dns-packet.c | 8 +-------
- src/resolve/resolved-dns-packet.h | 2 --
- 2 files changed, 1 insertion(+), 9 deletions(-)
-
-diff --git a/src/resolve/resolved-dns-packet.c b/src/resolve/resolved-dns-packet.c
-index 652970284..2034e3c8c 100644
---- a/src/resolve/resolved-dns-packet.c
-+++ b/src/resolve/resolved-dns-packet.c
-@@ -47,13 +47,7 @@ int dns_packet_new(DnsPacket **ret, DnsProtocol protocol, size_t mtu) {
- 
-         assert(ret);
- 
--        if (mtu <= UDP_PACKET_HEADER_SIZE)
--                a = DNS_PACKET_SIZE_START;
--        else
--                a = mtu - UDP_PACKET_HEADER_SIZE;
--
--        if (a < DNS_PACKET_HEADER_SIZE)
--                a = DNS_PACKET_HEADER_SIZE;
-+        a = MAX(mtu, DNS_PACKET_HEADER_SIZE);
- 
-         /* round up to next page size */
-         a = PAGE_ALIGN(ALIGN(sizeof(DnsPacket)) + a) - ALIGN(sizeof(DnsPacket));
-diff --git a/src/resolve/resolved-dns-packet.h b/src/resolve/resolved-dns-packet.h
-index 2c92392e4..3abcaf8cf 100644
---- a/src/resolve/resolved-dns-packet.h
-+++ b/src/resolve/resolved-dns-packet.h
-@@ -66,8 +66,6 @@ struct DnsPacketHeader {
- /* With EDNS0 we can use larger packets, default to 4096, which is what is commonly used */
- #define DNS_PACKET_UNICAST_SIZE_LARGE_MAX 4096
- 
--#define DNS_PACKET_SIZE_START 512
--
- struct DnsPacket {
-         int n_ref;
-         DnsProtocol protocol;
--- 
-2.13.1
-
-
-From cd3d8a7ebc01cd6913eaa9a591f7d606038a7588 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
-Date: Tue, 27 Jun 2017 14:20:00 -0400
-Subject: [PATCH 2/4] resolved: do not allocate packets with minimum size
-
-dns_packet_new() is sometimes called with mtu == 0, and in that case we should
-allocate more than the absolute minimum (which is the dns packet header size),
-otherwise we have to resize immediately again after appending the first data to
-the packet.
-
-This partially reverts the previous commit.
----
- src/resolve/resolved-dns-packet.c | 12 +++++++++++-
- 1 file changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/src/resolve/resolved-dns-packet.c b/src/resolve/resolved-dns-packet.c
-index 2034e3c8c..9d806ab33 100644
---- a/src/resolve/resolved-dns-packet.c
-+++ b/src/resolve/resolved-dns-packet.c
-@@ -28,6 +28,9 @@
- 
- #define EDNS0_OPT_DO (1<<15)
- 
-+#define DNS_PACKET_SIZE_START 512
-+assert_cc(DNS_PACKET_SIZE_START > UDP_PACKET_HEADER_SIZE)
-+
- typedef struct DnsPacketRewinder {
-         DnsPacket *packet;
-         size_t saved_rindex;
-@@ -47,7 +50,14 @@ int dns_packet_new(DnsPacket **ret, DnsProtocol protocol, size_t mtu) {
- 
-         assert(ret);
- 
--        a = MAX(mtu, DNS_PACKET_HEADER_SIZE);
-+        /* When dns_packet_new() is called with mtu == 0, allocate more than the
-+         * absolute minimum (which is the dns packet header size), to avoid
-+         * resizing immediately again after appending the first data to the packet.
-+         */
-+        if (mtu < UDP_PACKET_HEADER_SIZE)
-+                a = DNS_PACKET_SIZE_START;
-+        else
-+                a = MAX(mtu, DNS_PACKET_HEADER_SIZE);
- 
-         /* round up to next page size */
-         a = PAGE_ALIGN(ALIGN(sizeof(DnsPacket)) + a) - ALIGN(sizeof(DnsPacket));
--- 
-2.13.1
-
-
-From a03fc1acd66d23e239f2545e9a6887c7d0aad7c5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
-Date: Tue, 27 Jun 2017 16:59:06 -0400
-Subject: [PATCH 3/4] resolved: define various packet sizes as unsigned
-
-This seems like the right thing to do, and apparently at least some compilers
-warn about signed/unsigned comparisons with DNS_PACKET_SIZE_MAX.
----
- src/resolve/resolved-dns-packet.c | 2 +-
- src/resolve/resolved-dns-packet.h | 6 +++---
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/resolve/resolved-dns-packet.c b/src/resolve/resolved-dns-packet.c
-index 9d806ab33..e2285b440 100644
---- a/src/resolve/resolved-dns-packet.c
-+++ b/src/resolve/resolved-dns-packet.c
-@@ -28,7 +28,7 @@
- 
- #define EDNS0_OPT_DO (1<<15)
- 
--#define DNS_PACKET_SIZE_START 512
-+#define DNS_PACKET_SIZE_START 512u
- assert_cc(DNS_PACKET_SIZE_START > UDP_PACKET_HEADER_SIZE)
- 
- typedef struct DnsPacketRewinder {
-diff --git a/src/resolve/resolved-dns-packet.h b/src/resolve/resolved-dns-packet.h
-index 3abcaf8cf..5dff272fd 100644
---- a/src/resolve/resolved-dns-packet.h
-+++ b/src/resolve/resolved-dns-packet.h
-@@ -58,13 +58,13 @@ struct DnsPacketHeader {
- /* The various DNS protocols deviate in how large a packet can grow,
-    but the TCP transport has a 16bit size field, hence that appears to
-    be the absolute maximum. */
--#define DNS_PACKET_SIZE_MAX 0xFFFF
-+#define DNS_PACKET_SIZE_MAX 0xFFFFu
- 
- /* RFC 1035 say 512 is the maximum, for classic unicast DNS */
--#define DNS_PACKET_UNICAST_SIZE_MAX 512
-+#define DNS_PACKET_UNICAST_SIZE_MAX 512u
- 
- /* With EDNS0 we can use larger packets, default to 4096, which is what is commonly used */
--#define DNS_PACKET_UNICAST_SIZE_LARGE_MAX 4096
-+#define DNS_PACKET_UNICAST_SIZE_LARGE_MAX 4096u
- 
- struct DnsPacket {
-         int n_ref;
--- 
-2.13.1
diff --git a/sys-apps/systemd/files/233-format-warnings.patch b/sys-apps/systemd/files/233-format-warnings.patch
deleted file mode 100644
index 7bb08f0a3201..000000000000
--- a/sys-apps/systemd/files/233-format-warnings.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From 3e7d14d78c4d15ec7789299216cbf5c58e61547b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
-Date: Sat, 3 Jun 2017 05:41:17 -0400
-Subject: [PATCH] sd-bus: silence format warnings in kdbus code (#6072)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The code is mostly correct, but gcc is trying to outsmart us, and emits a
-warning for a "llu vs lu" mismatch, even though they are the same size (on alpha):
-
-src/libsystemd/sd-bus/bus-control.c: In function ‘kernel_get_list’:
-src/libsystemd/sd-bus/bus-control.c:267:42: error: format ‘%llu’ expects argument of type ‘long long unsigned int’, but argument 3 has type ‘__u64 {aka long unsigned int}’ [-Werror=format=]
-                         if (asprintf(&n, ":1.%llu", name->id) < 0) {
-                                          ^
-src/libsystemd/sd-bus/bus-control.c: In function ‘bus_get_name_creds_kdbus’:
-src/libsystemd/sd-bus/bus-control.c:714:47: error: format ‘%llu’ expects argument of type ‘long long unsigned int’, but argument 3 has type ‘__u64 {aka long unsigned int}’ [-Werror=format=]
-                 if (asprintf(&c->unique_name, ":1.%llu", conn_info->id) < 0) {
-                                               ^
-This is hard to work around properly, because kdbus.h uses __u64 which is
-defined-differently-despite-being-the-same-size then uint64_t. Thus the simple
-solution of using %PRIu64 fails on amd64:
-
-src/libsystemd/sd-bus/bus-control.c:714:47: error: format ‘%lu’ expects argument of type ‘long unsigned int’, but argument 3 has type ‘__u64 {aka long long unsigned int}’ [-Werror=format=]
-                 if (asprintf(&c->unique_name, ":1.%"PRIu64, conn_info->id) < 0) {
-                                               ^~~~~~
-
-Let's just avoid the whole issue for now by silencing the warning.
-After the next release, we should just get rid of the kdbus code.
-
-Fixes #5561.
----
- src/libsystemd/sd-bus/bus-control.c | 6 ++++++
- src/libsystemd/sd-bus/bus-kernel.c  | 2 ++
- 2 files changed, 8 insertions(+)
-
-diff --git a/src/libsystemd/sd-bus/bus-control.c b/src/libsystemd/sd-bus/bus-control.c
-index 9e58ffbd8..303ae0f23 100644
---- a/src/libsystemd/sd-bus/bus-control.c
-+++ b/src/libsystemd/sd-bus/bus-control.c
-@@ -264,10 +264,13 @@ static int kernel_get_list(sd_bus *bus, uint64_t flags, char ***x) {
-                 if ((flags & KDBUS_LIST_UNIQUE) && name->id != previous_id && !(name->flags & KDBUS_HELLO_ACTIVATOR)) {
-                         char *n;
- 
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wformat"
-                         if (asprintf(&n, ":1.%llu", name->id) < 0) {
-                                 r = -ENOMEM;
-                                 goto fail;
-                         }
-+#pragma GCC diagnostic pop
- 
-                         r = strv_consume(x, n);
-                         if (r < 0)
-@@ -711,10 +714,13 @@ int bus_get_name_creds_kdbus(
-         }
- 
-         if (mask & SD_BUS_CREDS_UNIQUE_NAME) {
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wformat"
-                 if (asprintf(&c->unique_name, ":1.%llu", conn_info->id) < 0) {
-                         r = -ENOMEM;
-                         goto fail;
-                 }
-+#pragma GCC diagnostic pop
- 
-                 c->mask |= SD_BUS_CREDS_UNIQUE_NAME;
-         }
-diff --git a/src/libsystemd/sd-bus/bus-kernel.c b/src/libsystemd/sd-bus/bus-kernel.c
-index c82caeb3f..ca6aee7c0 100644
---- a/src/libsystemd/sd-bus/bus-kernel.c
-+++ b/src/libsystemd/sd-bus/bus-kernel.c
-@@ -51,6 +51,8 @@
- #include "user-util.h"
- #include "util.h"
- 
-+#pragma GCC diagnostic ignored "-Wformat"
-+
- #define UNIQUE_NAME_MAX (3+DECIMAL_STR_MAX(uint64_t))
- 
- int bus_kernel_parse_unique_name(const char *s, uint64_t *id) {
--- 
-2.13.2
-
diff --git a/sys-apps/systemd/files/CVE-2017-9217.patch b/sys-apps/systemd/files/CVE-2017-9217.patch
deleted file mode 100644
index 68d0f36d4913..000000000000
--- a/sys-apps/systemd/files/CVE-2017-9217.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From a924f43f30f9c4acaf70618dd2a055f8b0f166be Mon Sep 17 00:00:00 2001
-From: Evgeny Vereshchagin <evvers@ya.ru>
-Date: Wed, 24 May 2017 08:56:48 +0300
-Subject: [PATCH] resolved: bugfix of null pointer p->question dereferencing
- (#6020)
-
-See https://bugs.launchpad.net/ubuntu/+source/systemd/+bug/1621396
----
- src/resolve/resolved-dns-packet.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/resolve/resolved-dns-packet.c b/src/resolve/resolved-dns-packet.c
-index 652970284..240ee448f 100644
---- a/src/resolve/resolved-dns-packet.c
-+++ b/src/resolve/resolved-dns-packet.c
-@@ -2269,6 +2269,9 @@ int dns_packet_is_reply_for(DnsPacket *p, const DnsResourceKey *key) {
-         if (r < 0)
-                 return r;
- 
-+        if (!p->question)
-+                return 0;
-+
-         if (p->question->n_keys != 1)
-                 return 0;
- 
--- 
-2.15.0.rc2
-
diff --git a/sys-apps/systemd/systemd-233-r4.ebuild b/sys-apps/systemd/systemd-233-r4.ebuild
deleted file mode 100644
index b263e395680b..000000000000
--- a/sys-apps/systemd/systemd-233-r4.ebuild
+++ /dev/null
@@ -1,460 +0,0 @@
-# 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/systemd/systemd.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> ${P}.tar.gz
-		!doc? ( https://dev.gentoo.org/~floppym/dist/${P}-man.tar.gz )"
-	KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sparc x86"
-fi
-
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
-
-inherit autotools bash-completion-r1 linux-info multilib-minimal pam python-any-r1 systemd toolchain-funcs udev user
-
-DESCRIPTION="System and service manager for Linux"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0/2"
-IUSE="acl apparmor audit build cryptsetup curl doc elfutils +gcrypt gnuefi http
-	idn importd +kmod +lz4 lzma nat pam policykit
-	qrcode +seccomp selinux ssl sysv-utils test vanilla xkb"
-
-REQUIRED_USE="importd? ( curl gcrypt lzma )"
-
-MINKV="3.11"
-
-COMMON_DEPEND=">=sys-apps/util-linux-2.27.1:0=[${MULTILIB_USEDEP}]
-	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
-	!<sys-libs/glibc-2.16
-	acl? ( sys-apps/acl:0= )
-	apparmor? ( sys-libs/libapparmor:0= )
-	audit? ( >=sys-process/audit-2:0= )
-	cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= )
-	curl? ( net-misc/curl:0= )
-	elfutils? ( >=dev-libs/elfutils-0.158:0= )
-	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
-	http? (
-		>=net-libs/libmicrohttpd-0.9.33:0=
-		ssl? ( >=net-libs/gnutls-3.1.4:0= )
-	)
-	idn? ( net-dns/libidn:0= )
-	importd? (
-		app-arch/bzip2:0=
-		sys-libs/zlib:0=
-	)
-	kmod? ( >=sys-apps/kmod-15:0= )
-	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
-	nat? ( net-firewall/iptables:0= )
-	pam? ( virtual/pam:=[${MULTILIB_USEDEP}] )
-	qrcode? ( media-gfx/qrencode:0= )
-	seccomp? ( >=sys-libs/libseccomp-2.3.1:0= )
-	selinux? ( sys-libs/libselinux:0= )
-	sysv-utils? (
-		!sys-apps/systemd-sysv-utils
-		!sys-apps/sysvinit )
-	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
-
-# baselayout-2.2 has /run
-RDEPEND="${COMMON_DEPEND}
-	>=sys-apps/baselayout-2.2
-	selinux? ( sec-policy/selinux-base-policy[systemd] )
-	!build? ( || (
-		sys-apps/util-linux[kill(-)]
-		sys-process/procps[kill(+)]
-		sys-apps/coreutils[kill(-)]
-	) )
-	!sys-auth/nss-myhostname
-	!<sys-kernel/dracut-044
-	!sys-fs/eudev
-	!sys-fs/udev"
-
-# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
-PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
-	>=sys-apps/hwids-20150417[udev]
-	>=sys-fs/udev-init-scripts-25
-	policykit? ( sys-auth/polkit )
-	!vanilla? ( sys-apps/gentoo-systemd-integration )"
-
-# Newer linux-headers needed by ia64, bug #480218
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils:0
-	dev-util/gperf
-	>=dev-util/intltool-0.50
-	>=sys-apps/coreutils-8.16
-	>=sys-kernel/linux-headers-${MINKV}
-	virtual/pkgconfig
-	gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-	test? ( sys-apps/dbus )
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt:0
-	doc? ( $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]') )
-"
-
-python_check_deps() {
-	has_version --host-root "dev-python/lxml[${PYTHON_USEDEP}]"
-}
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != buildonly ]]; then
-		local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
-			~CHECKPOINT_RESTORE ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
-			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
-			~TIMERFD ~TMPFS_XATTR ~UNIX
-			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
-			~!FW_LOADER_USER_HELPER ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
-			~!SYSFS_DEPRECATED_V2"
-
-		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
-		use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
-		kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
-		kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
-
-		if linux_config_exists; then
-			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
-			if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
-				ewarn "It's recommended to set an empty value to the following kernel config option:"
-				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
-			fi
-			if linux_chkconfig_present X86; then
-				CONFIG_CHECK+=" ~DMIID"
-			fi
-		fi
-
-		if kernel_is -lt ${MINKV//./ }; then
-			ewarn "Kernel version at least ${MINKV} required"
-		fi
-
-		check_extra_config
-	fi
-}
-
-pkg_setup() {
-	:
-}
-
-src_unpack() {
-	default
-	[[ ${PV} != 9999 ]] || git-r3_src_unpack
-}
-
-src_prepare() {
-	# Bug 463376
-	sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die
-
-	local PATCHES=(
-		"${FILESDIR}/233-0001-Avoid-strict-DM-interface-version-dependencies-5519.patch"
-		"${FILESDIR}/233-CVE-2017-9445.patch"
-		"${FILESDIR}/233-format-warnings.patch"
-		"${FILESDIR}/233-0002-core-load-fragment-refuse-units-with-errors-in-RootD.patch"
-		"${FILESDIR}/233-0003-core-load-fragment-refuse-units-with-errors-in-certa.patch"
-	)
-
-	if ! use vanilla; then
-		PATCHES+=(
-			"${FILESDIR}/218-Dont-enable-audit-by-default.patch"
-			"${FILESDIR}/228-noclean-tmp.patch"
-			"${FILESDIR}/233-systemd-user-pam.patch"
-		)
-	fi
-
-	[[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
-
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	# Keep using the one where the rules were installed.
-	MY_UDEVDIR=$(get_udevdir)
-	# Fix systems broken by bug #509454.
-	[[ ${MY_UDEVDIR} ]] || MY_UDEVDIR=/lib/udev
-
-	# Prevent conflicts with i686 cross toolchain, bug 559726
-	tc-export AR CC NM OBJCOPY RANLIB
-
-	use doc && python_setup
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		# disable -flto since it is an optimization flag
-		# and makes distcc less effective
-		cc_cv_CFLAGS__flto=no
-		# disable -fuse-ld=gold since Gentoo supports explicit linker
-		# choice and forcing gold is undesired, #539998
-		# ld.gold may collide with user's LDFLAGS, #545168
-		# ld.gold breaks sparc, #573874
-		cc_cv_LDFLAGS__Wl__fuse_ld_gold=no
-
-		# Workaround for gcc-4.7, bug 554454.
-		cc_cv_CFLAGS__Werror_shadow=no
-
-		# Workaround for bug 516346
-		--enable-dependency-tracking
-
-		--disable-maintainer-mode
-		--localstatedir=/var
-		--with-pamlibdir=$(getpam_mod_dir)
-		# avoid bash-completion dep
-		--with-bashcompletiondir="$(get_bashcompdir)"
-		# make sure we get /bin:/sbin in $PATH
-		--enable-split-usr
-		# For testing.
-		--with-rootprefix="${ROOTPREFIX-/usr}"
-		--with-rootlibdir="${ROOTPREFIX-/usr}/$(get_libdir)"
-		# disable sysv compatibility
-		--with-sysvinit-path=
-		--with-sysvrcnd-path=
-		# no deps
-		--enable-efi
-		--enable-ima
-
-		# Optional components/dependencies
-		$(multilib_native_use_enable acl)
-		$(multilib_native_use_enable apparmor)
-		$(multilib_native_use_enable audit)
-		$(multilib_native_use_enable cryptsetup libcryptsetup)
-		$(multilib_native_use_enable curl libcurl)
-		$(multilib_native_use_enable elfutils)
-		$(use_enable gcrypt)
-		$(multilib_native_use_enable gnuefi)
-		--with-efi-libdir="/usr/$(get_libdir)"
-		$(multilib_native_use_enable http microhttpd)
-		$(usex http $(multilib_native_use_enable ssl gnutls) --disable-gnutls)
-		$(multilib_native_use_enable idn libidn)
-		$(multilib_native_use_enable importd)
-		$(multilib_native_use_enable importd bzip2)
-		$(multilib_native_use_enable importd zlib)
-		$(multilib_native_use_enable kmod)
-		$(use_enable lz4)
-		$(use_enable lzma xz)
-		$(multilib_native_use_enable nat libiptc)
-		$(use_enable pam)
-		$(multilib_native_use_enable policykit polkit)
-		$(multilib_native_use_enable qrcode qrencode)
-		$(multilib_native_use_enable seccomp)
-		$(multilib_native_use_enable selinux)
-		$(multilib_native_use_enable test tests)
-		$(multilib_native_use_enable test dbus)
-		$(multilib_native_use_enable xkb xkbcommon)
-		$(multilib_native_use_with doc python)
-
-		# hardcode a few paths to spare some deps
-		KILL=/bin/kill
-		QUOTAON=/usr/sbin/quotaon
-		QUOTACHECK=/usr/sbin/quotacheck
-
-		# TODO: we may need to restrict this to gcc
-		EFI_CC="$(tc-getCC)"
-
-		# dbus paths
-		--with-dbuspolicydir="${EPREFIX}/etc/dbus-1/system.d"
-		--with-dbussessionservicedir="${EPREFIX}/usr/share/dbus-1/services"
-		--with-dbussystemservicedir="${EPREFIX}/usr/share/dbus-1/system-services"
-
-		--with-ntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
-
-		# Breaks screen, tmux, etc.
-		--without-kill-user-processes
-	)
-
-	# Work around bug 463846.
-	tc-export CC
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	local mymakeopts=(
-		udevlibexecdir="${MY_UDEVDIR}"
-	)
-
-	if multilib_is_native_abi; then
-		emake "${mymakeopts[@]}"
-	else
-		emake built-sources
-		local targets=(
-			'$(rootlib_LTLIBRARIES)'
-			'$(lib_LTLIBRARIES)'
-			'$(pamlib_LTLIBRARIES)'
-			'$(pkgconfiglib_DATA)'
-		)
-		echo "gentoo: ${targets[*]}" | emake "${mymakeopts[@]}" -f Makefile -f - gentoo
-	fi
-}
-
-multilib_src_test() {
-	multilib_is_native_abi || return 0
-	default
-}
-
-multilib_src_install() {
-	local mymakeopts=(
-		# automake fails with parallel libtool relinking
-		# https://bugs.gentoo.org/show_bug.cgi?id=491398
-		-j1
-
-		udevlibexecdir="${MY_UDEVDIR}"
-		dist_udevhwdb_DATA=
-		DESTDIR="${D}"
-	)
-
-	if multilib_is_native_abi; then
-		emake "${mymakeopts[@]}" install
-	else
-		mymakeopts+=(
-			install-rootlibLTLIBRARIES
-			install-libLTLIBRARIES
-			install-pamlibLTLIBRARIES
-			install-pkgconfiglibDATA
-			install-includeHEADERS
-			install-pkgincludeHEADERS
-		)
-
-		emake "${mymakeopts[@]}"
-	fi
-}
-
-multilib_src_install_all() {
-	prune_libtool_files --modules
-	einstalldocs
-	dodoc "${FILESDIR}"/nsswitch.conf
-
-	if [[ ${PV} != 9999 ]]; then
-		use doc || doman "${WORKDIR}"/man/systemd.{directives,index}.7
-	fi
-
-	if use sysv-utils; then
-		for app in halt poweroff reboot runlevel shutdown telinit; do
-			dosym "..${ROOTPREFIX-/usr}/bin/systemctl" /sbin/${app}
-		done
-		dosym "..${ROOTPREFIX-/usr}/lib/systemd/systemd" /sbin/init
-	else
-		# we just keep sysvinit tools, so no need for the mans
-		rm "${D}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \
-			|| die
-		rm "${D}"/usr/share/man/man1/init.1 || die
-	fi
-
-	# Preserve empty dirs in /etc & /var, bug #437008
-	keepdir /etc/binfmt.d /etc/modules-load.d /etc/tmpfiles.d \
-		/etc/systemd/ntp-units.d /etc/systemd/user /var/lib/systemd \
-		/var/log/journal/remote
-
-	# Symlink /etc/sysctl.conf for easy migration.
-	dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
-
-	# If we install these symlinks, there is no way for the sysadmin to remove them
-	# permanently.
-	rm "${D}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service || die
-	rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service || die
-	rm -r "${D}"/etc/systemd/system/network-online.target.wants || die
-	rm -r "${D}"/etc/systemd/system/sockets.target.wants || die
-	rm -r "${D}"/etc/systemd/system/sysinit.target.wants || die
-}
-
-migrate_locale() {
-	local envd_locale_def="${EROOT%/}/etc/env.d/02locale"
-	local envd_locale=( "${EROOT%/}"/etc/env.d/??locale )
-	local locale_conf="${EROOT%/}/etc/locale.conf"
-
-	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
-		# If locale.conf does not exist...
-		if [[ -e ${envd_locale} ]]; then
-			# ...either copy env.d/??locale if there's one
-			ebegin "Moving ${envd_locale} to ${locale_conf}"
-			mv "${envd_locale}" "${locale_conf}"
-			eend ${?} || FAIL=1
-		else
-			# ...or create a dummy default
-			ebegin "Creating ${locale_conf}"
-			cat > "${locale_conf}" <<-EOF
-				# This file has been created by the sys-apps/systemd ebuild.
-				# See locale.conf(5) and localectl(1).
-
-				# LANG=${LANG}
-			EOF
-			eend ${?} || FAIL=1
-		fi
-	fi
-
-	if [[ ! -L ${envd_locale} ]]; then
-		# now, if env.d/??locale is not a symlink (to locale.conf)...
-		if [[ -e ${envd_locale} ]]; then
-			# ...warn the user that he has duplicate locale settings
-			ewarn
-			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
-			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
-			ewarn "and create the symlink with the following command:"
-			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
-			ewarn
-		else
-			# ...or just create the symlink if there's nothing here
-			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
-			ln -n -s ../locale.conf "${envd_locale_def}"
-			eend ${?} || FAIL=1
-		fi
-	fi
-}
-
-pkg_postinst() {
-	newusergroup() {
-		enewgroup "$1"
-		enewuser "$1" -1 -1 -1 "$1"
-	}
-
-	enewgroup input
-	enewgroup systemd-journal
-	newusergroup systemd-bus-proxy
-	newusergroup systemd-coredump
-	newusergroup systemd-journal-gateway
-	newusergroup systemd-journal-remote
-	newusergroup systemd-journal-upload
-	newusergroup systemd-network
-	newusergroup systemd-resolve
-	newusergroup systemd-timesync
-
-	systemd_update_catalog
-
-	# Keep this here in case the database format changes so it gets updated
-	# when required. Despite that this file is owned by sys-apps/hwids.
-	if has_version "sys-apps/hwids[udev]"; then
-		udevadm hwdb --update --root="${ROOT%/}"
-	fi
-
-	udev_reload || FAIL=1
-
-	# Bug 465468, make sure locales are respect, and ensure consistency
-	# between OpenRC & systemd
-	migrate_locale
-
-	systemd_reenable systemd-networkd.service systemd-resolved.service
-
-	if [[ ${FAIL} ]]; then
-		eerror "One of the postinst commands failed. Please check the postinst output"
-		eerror "for errors. You may need to clean up your system and/or try installing"
-		eerror "systemd again."
-		eerror
-	fi
-}
-
-pkg_prerm() {
-	# If removing systemd completely, remove the catalog database.
-	if [[ ! ${REPLACED_BY_VERSION} ]]; then
-		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
-	fi
-}
diff --git a/sys-apps/systemd/systemd-233-r5.ebuild b/sys-apps/systemd/systemd-233-r5.ebuild
deleted file mode 100644
index 74c4b9e56fee..000000000000
--- a/sys-apps/systemd/systemd-233-r5.ebuild
+++ /dev/null
@@ -1,461 +0,0 @@
-# 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/systemd/systemd.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> ${P}.tar.gz
-		!doc? ( https://dev.gentoo.org/~floppym/dist/${P}-man.tar.gz )"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-fi
-
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
-
-inherit autotools bash-completion-r1 linux-info multilib-minimal pam python-any-r1 systemd toolchain-funcs udev user
-
-DESCRIPTION="System and service manager for Linux"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0/2"
-IUSE="acl apparmor audit build cryptsetup curl doc elfutils +gcrypt gnuefi http
-	idn importd +kmod +lz4 lzma nat pam policykit
-	qrcode +seccomp selinux ssl sysv-utils test vanilla xkb"
-
-REQUIRED_USE="importd? ( curl gcrypt lzma )"
-
-MINKV="3.11"
-
-COMMON_DEPEND=">=sys-apps/util-linux-2.27.1:0=[${MULTILIB_USEDEP}]
-	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
-	!<sys-libs/glibc-2.16
-	acl? ( sys-apps/acl:0= )
-	apparmor? ( sys-libs/libapparmor:0= )
-	audit? ( >=sys-process/audit-2:0= )
-	cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= )
-	curl? ( net-misc/curl:0= )
-	elfutils? ( >=dev-libs/elfutils-0.158:0= )
-	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
-	http? (
-		>=net-libs/libmicrohttpd-0.9.33:0=
-		ssl? ( >=net-libs/gnutls-3.1.4:0= )
-	)
-	idn? ( net-dns/libidn:0= )
-	importd? (
-		app-arch/bzip2:0=
-		sys-libs/zlib:0=
-	)
-	kmod? ( >=sys-apps/kmod-15:0= )
-	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
-	nat? ( net-firewall/iptables:0= )
-	pam? ( virtual/pam:=[${MULTILIB_USEDEP}] )
-	qrcode? ( media-gfx/qrencode:0= )
-	seccomp? ( >=sys-libs/libseccomp-2.3.1:0= )
-	selinux? ( sys-libs/libselinux:0= )
-	sysv-utils? (
-		!sys-apps/systemd-sysv-utils
-		!sys-apps/sysvinit )
-	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
-
-# baselayout-2.2 has /run
-RDEPEND="${COMMON_DEPEND}
-	>=sys-apps/baselayout-2.2
-	selinux? ( sec-policy/selinux-base-policy[systemd] )
-	!build? ( || (
-		sys-apps/util-linux[kill(-)]
-		sys-process/procps[kill(+)]
-		sys-apps/coreutils[kill(-)]
-	) )
-	!sys-auth/nss-myhostname
-	!<sys-kernel/dracut-044
-	!sys-fs/eudev
-	!sys-fs/udev"
-
-# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
-PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
-	>=sys-apps/hwids-20150417[udev]
-	>=sys-fs/udev-init-scripts-25
-	policykit? ( sys-auth/polkit )
-	!vanilla? ( sys-apps/gentoo-systemd-integration )"
-
-# Newer linux-headers needed by ia64, bug #480218
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils:0
-	dev-util/gperf
-	>=dev-util/intltool-0.50
-	>=sys-apps/coreutils-8.16
-	>=sys-kernel/linux-headers-${MINKV}
-	virtual/pkgconfig
-	gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-	test? ( sys-apps/dbus )
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt:0
-	doc? ( $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]') )
-"
-
-python_check_deps() {
-	has_version --host-root "dev-python/lxml[${PYTHON_USEDEP}]"
-}
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != buildonly ]]; then
-		local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
-			~CHECKPOINT_RESTORE ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
-			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
-			~TIMERFD ~TMPFS_XATTR ~UNIX
-			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
-			~!FW_LOADER_USER_HELPER ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
-			~!SYSFS_DEPRECATED_V2"
-
-		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
-		use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
-		kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
-		kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
-
-		if linux_config_exists; then
-			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
-			if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
-				ewarn "It's recommended to set an empty value to the following kernel config option:"
-				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
-			fi
-			if linux_chkconfig_present X86; then
-				CONFIG_CHECK+=" ~DMIID"
-			fi
-		fi
-
-		if kernel_is -lt ${MINKV//./ }; then
-			ewarn "Kernel version at least ${MINKV} required"
-		fi
-
-		check_extra_config
-	fi
-}
-
-pkg_setup() {
-	:
-}
-
-src_unpack() {
-	default
-	[[ ${PV} != 9999 ]] || git-r3_src_unpack
-}
-
-src_prepare() {
-	# Bug 463376
-	sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die
-
-	local PATCHES=(
-		"${FILESDIR}/233-0001-Avoid-strict-DM-interface-version-dependencies-5519.patch"
-		"${FILESDIR}/233-CVE-2017-9445.patch"
-		"${FILESDIR}/233-format-warnings.patch"
-		"${FILESDIR}/233-0002-core-load-fragment-refuse-units-with-errors-in-RootD.patch"
-		"${FILESDIR}/233-0003-core-load-fragment-refuse-units-with-errors-in-certa.patch"
-		"${FILESDIR}/CVE-2017-15908.patch"
-	)
-
-	if ! use vanilla; then
-		PATCHES+=(
-			"${FILESDIR}/218-Dont-enable-audit-by-default.patch"
-			"${FILESDIR}/228-noclean-tmp.patch"
-			"${FILESDIR}/233-systemd-user-pam.patch"
-		)
-	fi
-
-	[[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
-
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	# Keep using the one where the rules were installed.
-	MY_UDEVDIR=$(get_udevdir)
-	# Fix systems broken by bug #509454.
-	[[ ${MY_UDEVDIR} ]] || MY_UDEVDIR=/lib/udev
-
-	# Prevent conflicts with i686 cross toolchain, bug 559726
-	tc-export AR CC NM OBJCOPY RANLIB
-
-	use doc && python_setup
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		# disable -flto since it is an optimization flag
-		# and makes distcc less effective
-		cc_cv_CFLAGS__flto=no
-		# disable -fuse-ld=gold since Gentoo supports explicit linker
-		# choice and forcing gold is undesired, #539998
-		# ld.gold may collide with user's LDFLAGS, #545168
-		# ld.gold breaks sparc, #573874
-		cc_cv_LDFLAGS__Wl__fuse_ld_gold=no
-
-		# Workaround for gcc-4.7, bug 554454.
-		cc_cv_CFLAGS__Werror_shadow=no
-
-		# Workaround for bug 516346
-		--enable-dependency-tracking
-
-		--disable-maintainer-mode
-		--localstatedir=/var
-		--with-pamlibdir=$(getpam_mod_dir)
-		# avoid bash-completion dep
-		--with-bashcompletiondir="$(get_bashcompdir)"
-		# make sure we get /bin:/sbin in $PATH
-		--enable-split-usr
-		# For testing.
-		--with-rootprefix="${ROOTPREFIX-/usr}"
-		--with-rootlibdir="${ROOTPREFIX-/usr}/$(get_libdir)"
-		# disable sysv compatibility
-		--with-sysvinit-path=
-		--with-sysvrcnd-path=
-		# no deps
-		--enable-efi
-		--enable-ima
-
-		# Optional components/dependencies
-		$(multilib_native_use_enable acl)
-		$(multilib_native_use_enable apparmor)
-		$(multilib_native_use_enable audit)
-		$(multilib_native_use_enable cryptsetup libcryptsetup)
-		$(multilib_native_use_enable curl libcurl)
-		$(multilib_native_use_enable elfutils)
-		$(use_enable gcrypt)
-		$(multilib_native_use_enable gnuefi)
-		--with-efi-libdir="/usr/$(get_libdir)"
-		$(multilib_native_use_enable http microhttpd)
-		$(usex http $(multilib_native_use_enable ssl gnutls) --disable-gnutls)
-		$(multilib_native_use_enable idn libidn)
-		$(multilib_native_use_enable importd)
-		$(multilib_native_use_enable importd bzip2)
-		$(multilib_native_use_enable importd zlib)
-		$(multilib_native_use_enable kmod)
-		$(use_enable lz4)
-		$(use_enable lzma xz)
-		$(multilib_native_use_enable nat libiptc)
-		$(use_enable pam)
-		$(multilib_native_use_enable policykit polkit)
-		$(multilib_native_use_enable qrcode qrencode)
-		$(multilib_native_use_enable seccomp)
-		$(multilib_native_use_enable selinux)
-		$(multilib_native_use_enable test tests)
-		$(multilib_native_use_enable test dbus)
-		$(multilib_native_use_enable xkb xkbcommon)
-		$(multilib_native_use_with doc python)
-
-		# hardcode a few paths to spare some deps
-		KILL=/bin/kill
-		QUOTAON=/usr/sbin/quotaon
-		QUOTACHECK=/usr/sbin/quotacheck
-
-		# TODO: we may need to restrict this to gcc
-		EFI_CC="$(tc-getCC)"
-
-		# dbus paths
-		--with-dbuspolicydir="${EPREFIX}/etc/dbus-1/system.d"
-		--with-dbussessionservicedir="${EPREFIX}/usr/share/dbus-1/services"
-		--with-dbussystemservicedir="${EPREFIX}/usr/share/dbus-1/system-services"
-
-		--with-ntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
-
-		# Breaks screen, tmux, etc.
-		--without-kill-user-processes
-	)
-
-	# Work around bug 463846.
-	tc-export CC
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	local mymakeopts=(
-		udevlibexecdir="${MY_UDEVDIR}"
-	)
-
-	if multilib_is_native_abi; then
-		emake "${mymakeopts[@]}"
-	else
-		emake built-sources
-		local targets=(
-			'$(rootlib_LTLIBRARIES)'
-			'$(lib_LTLIBRARIES)'
-			'$(pamlib_LTLIBRARIES)'
-			'$(pkgconfiglib_DATA)'
-		)
-		echo "gentoo: ${targets[*]}" | emake "${mymakeopts[@]}" -f Makefile -f - gentoo
-	fi
-}
-
-multilib_src_test() {
-	multilib_is_native_abi || return 0
-	default
-}
-
-multilib_src_install() {
-	local mymakeopts=(
-		# automake fails with parallel libtool relinking
-		# https://bugs.gentoo.org/show_bug.cgi?id=491398
-		-j1
-
-		udevlibexecdir="${MY_UDEVDIR}"
-		dist_udevhwdb_DATA=
-		DESTDIR="${D}"
-	)
-
-	if multilib_is_native_abi; then
-		emake "${mymakeopts[@]}" install
-	else
-		mymakeopts+=(
-			install-rootlibLTLIBRARIES
-			install-libLTLIBRARIES
-			install-pamlibLTLIBRARIES
-			install-pkgconfiglibDATA
-			install-includeHEADERS
-			install-pkgincludeHEADERS
-		)
-
-		emake "${mymakeopts[@]}"
-	fi
-}
-
-multilib_src_install_all() {
-	prune_libtool_files --modules
-	einstalldocs
-	dodoc "${FILESDIR}"/nsswitch.conf
-
-	if [[ ${PV} != 9999 ]]; then
-		use doc || doman "${WORKDIR}"/man/systemd.{directives,index}.7
-	fi
-
-	if use sysv-utils; then
-		for app in halt poweroff reboot runlevel shutdown telinit; do
-			dosym "..${ROOTPREFIX-/usr}/bin/systemctl" /sbin/${app}
-		done
-		dosym "..${ROOTPREFIX-/usr}/lib/systemd/systemd" /sbin/init
-	else
-		# we just keep sysvinit tools, so no need for the mans
-		rm "${D}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \
-			|| die
-		rm "${D}"/usr/share/man/man1/init.1 || die
-	fi
-
-	# Preserve empty dirs in /etc & /var, bug #437008
-	keepdir /etc/binfmt.d /etc/modules-load.d /etc/tmpfiles.d \
-		/etc/systemd/ntp-units.d /etc/systemd/user /var/lib/systemd \
-		/var/log/journal/remote
-
-	# Symlink /etc/sysctl.conf for easy migration.
-	dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
-
-	# If we install these symlinks, there is no way for the sysadmin to remove them
-	# permanently.
-	rm "${D}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service || die
-	rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service || die
-	rm -r "${D}"/etc/systemd/system/network-online.target.wants || die
-	rm -r "${D}"/etc/systemd/system/sockets.target.wants || die
-	rm -r "${D}"/etc/systemd/system/sysinit.target.wants || die
-}
-
-migrate_locale() {
-	local envd_locale_def="${EROOT%/}/etc/env.d/02locale"
-	local envd_locale=( "${EROOT%/}"/etc/env.d/??locale )
-	local locale_conf="${EROOT%/}/etc/locale.conf"
-
-	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
-		# If locale.conf does not exist...
-		if [[ -e ${envd_locale} ]]; then
-			# ...either copy env.d/??locale if there's one
-			ebegin "Moving ${envd_locale} to ${locale_conf}"
-			mv "${envd_locale}" "${locale_conf}"
-			eend ${?} || FAIL=1
-		else
-			# ...or create a dummy default
-			ebegin "Creating ${locale_conf}"
-			cat > "${locale_conf}" <<-EOF
-				# This file has been created by the sys-apps/systemd ebuild.
-				# See locale.conf(5) and localectl(1).
-
-				# LANG=${LANG}
-			EOF
-			eend ${?} || FAIL=1
-		fi
-	fi
-
-	if [[ ! -L ${envd_locale} ]]; then
-		# now, if env.d/??locale is not a symlink (to locale.conf)...
-		if [[ -e ${envd_locale} ]]; then
-			# ...warn the user that he has duplicate locale settings
-			ewarn
-			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
-			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
-			ewarn "and create the symlink with the following command:"
-			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
-			ewarn
-		else
-			# ...or just create the symlink if there's nothing here
-			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
-			ln -n -s ../locale.conf "${envd_locale_def}"
-			eend ${?} || FAIL=1
-		fi
-	fi
-}
-
-pkg_postinst() {
-	newusergroup() {
-		enewgroup "$1"
-		enewuser "$1" -1 -1 -1 "$1"
-	}
-
-	enewgroup input
-	enewgroup systemd-journal
-	newusergroup systemd-bus-proxy
-	newusergroup systemd-coredump
-	newusergroup systemd-journal-gateway
-	newusergroup systemd-journal-remote
-	newusergroup systemd-journal-upload
-	newusergroup systemd-network
-	newusergroup systemd-resolve
-	newusergroup systemd-timesync
-
-	systemd_update_catalog
-
-	# Keep this here in case the database format changes so it gets updated
-	# when required. Despite that this file is owned by sys-apps/hwids.
-	if has_version "sys-apps/hwids[udev]"; then
-		udevadm hwdb --update --root="${ROOT%/}"
-	fi
-
-	udev_reload || FAIL=1
-
-	# Bug 465468, make sure locales are respect, and ensure consistency
-	# between OpenRC & systemd
-	migrate_locale
-
-	systemd_reenable systemd-networkd.service systemd-resolved.service
-
-	if [[ ${FAIL} ]]; then
-		eerror "One of the postinst commands failed. Please check the postinst output"
-		eerror "for errors. You may need to clean up your system and/or try installing"
-		eerror "systemd again."
-		eerror
-	fi
-}
-
-pkg_prerm() {
-	# If removing systemd completely, remove the catalog database.
-	if [[ ! ${REPLACED_BY_VERSION} ]]; then
-		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
-	fi
-}
diff --git a/sys-apps/systemd/systemd-233-r6.ebuild b/sys-apps/systemd/systemd-233-r6.ebuild
index 42b0a4eb4c68..de147be79bd2 100644
--- a/sys-apps/systemd/systemd-233-r6.ebuild
+++ b/sys-apps/systemd/systemd-233-r6.ebuild
@@ -8,6 +8,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		https://dev.gentoo.org/~floppym/dist/${P}-patches.tar.gz
 		!doc? ( https://dev.gentoo.org/~floppym/dist/${P}-man.tar.gz )"
 	KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sparc x86"
 fi
@@ -153,13 +154,7 @@ src_prepare() {
 	sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die
 
 	local PATCHES=(
-		"${FILESDIR}/233-0001-Avoid-strict-DM-interface-version-dependencies-5519.patch"
-		"${FILESDIR}/233-CVE-2017-9445.patch"
-		"${FILESDIR}/233-format-warnings.patch"
-		"${FILESDIR}/233-0002-core-load-fragment-refuse-units-with-errors-in-RootD.patch"
-		"${FILESDIR}/233-0003-core-load-fragment-refuse-units-with-errors-in-certa.patch"
 		"${FILESDIR}/CVE-2017-15908.patch"
-		"${FILESDIR}/CVE-2017-9217.patch"
 	)
 
 	if ! use vanilla; then
diff --git a/sys-apps/systemd/systemd-236.ebuild b/sys-apps/systemd/systemd-236.ebuild
index e0653a7a84ab..8142a96390ba 100644
--- a/sys-apps/systemd/systemd-236.ebuild
+++ b/sys-apps/systemd/systemd-236.ebuild
@@ -202,6 +202,7 @@ multilib_src_configure() {
 		-Dbashcompletiondir="$(get_bashcompdir)"
 		# make sure we get /bin:/sbin in PATH
 		-Dsplit-usr=$(usex usrmerge false true)
+		-Drootprefix="$(usex usrmerge "${EPREFIX}/usr" "${EPREFIX:-/}")"
 		-Dsysvinit-path=
 		-Dsysvrcnd-path=
 		# no deps
@@ -216,7 +217,7 @@ multilib_src_configure() {
 		-Delfutils=$(meson_multilib_native_use elfutils)
 		-Dgcrypt=$(meson_use gcrypt)
 		-Dgnu-efi=$(meson_multilib_native_use gnuefi)
-		-Defi-libdir="/usr/$(get_libdir)"
+		-Defi-libdir="${EPREFIX}/usr/$(get_libdir)"
 		-Dmicrohttpd=$(meson_multilib_native_use http)
 		$(usex http -Dgnutls=$(meson_multilib_native_use ssl) -Dgnutls=false)
 		-Dimportd=$(meson_multilib_native_use importd)
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index e0653a7a84ab..8142a96390ba 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -202,6 +202,7 @@ multilib_src_configure() {
 		-Dbashcompletiondir="$(get_bashcompdir)"
 		# make sure we get /bin:/sbin in PATH
 		-Dsplit-usr=$(usex usrmerge false true)
+		-Drootprefix="$(usex usrmerge "${EPREFIX}/usr" "${EPREFIX:-/}")"
 		-Dsysvinit-path=
 		-Dsysvrcnd-path=
 		# no deps
@@ -216,7 +217,7 @@ multilib_src_configure() {
 		-Delfutils=$(meson_multilib_native_use elfutils)
 		-Dgcrypt=$(meson_use gcrypt)
 		-Dgnu-efi=$(meson_multilib_native_use gnuefi)
-		-Defi-libdir="/usr/$(get_libdir)"
+		-Defi-libdir="${EPREFIX}/usr/$(get_libdir)"
 		-Dmicrohttpd=$(meson_multilib_native_use http)
 		$(usex http -Dgnutls=$(meson_multilib_native_use ssl) -Dgnutls=false)
 		-Dimportd=$(meson_multilib_native_use importd)
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index a0de22fd103d..e7a8eb58d078 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -1,14 +1,12 @@
 AUX runuser-l.pamd 188 BLAKE2B 4fbd934c05386732b32281fdfac19153f01e0610868f3168026fbc4eb828ed1fe177677939958322fb074a95c8f64bdbaea42a4e9c039ac86dee0154ac96242e SHA512 86538adbd3d01c4b9e46fee00c38d298d2857fb1224461206425532404c212f03331308b74347c9af2e00583a3b50802085bdc6cb2bd393cf5e9d032e7290301
 AUX runuser.pamd 278 BLAKE2B 61afa98e02a4ee030176dad97b7aa7d7075b07584c0e9f2c254f90bf22f6bad7ad8d87cb6d7c95efb789dcbec01e266c3192e135a3a36d817ab47c6bc05e7a01 SHA512 a4c4d41078acdc7c7f1d1f1894d20d052d3d5a3c66d5680d7f76665e251c614fd76ca9678a27ea376147f49250c716a1b3b0c0afa9595bd74d26d2190d1680fd
-DIST util-linux-2.28.2.tar.xz 4149700 BLAKE2B da38a047b4a7dc867ba72aea149d515665375089d880d43c40f6d19a09ee33023d64b95c15073d6a83a36ee58ff6d47ef08671ab841b533bb747a337c5da6c02 SHA512 ac1c2d4c92bbc4eabed464cb0334c1d9b21e58df0f07f0b26e7adcfa188879de8632d195b65a4358c5e11e14ac6e09a1c6206265bbf1fab4ce122414bee7e940
-DIST util-linux-2.29.2.tar.xz 4277668 BLAKE2B 176830ad80031ca78fc274ab27f1cb4ccdef7f310101c7e81e1e32b070c9dd11581240b5480c2e8e09bae9a96d5287a0a03fc19281d480f9a6d70aa0b9817404 SHA512 0a87e6758531f74276f3de7607ef545f324b9b36b444aa5d163140c5fb0f4f7602655d7ec9939f92550dcb320d922cd69521a2183199d463795e67d3c27fce79
-DIST util-linux-2.30.1.tar.xz 4459284 BLAKE2B f7308e644bb4aa5a063b285d3a73ed459f4c94e1b7414fe23d862d3791772ab51e55eed8c931cda2a3fa462178a5f2945720fe787c20a45662308fcb331422aa SHA512 bcf1807198660c133c380e13d6ba5dcdb7470c47bcaeea03ccc5a78a0d834e3df3d13ae5ffc35fd7f8fff7ba062629d4b1f5cde78452b846c9315c51c9e108f5
+AUX util-linux-2.31-too_generic_symbols_pt1.patch 5422 BLAKE2B 8274cdcdbfa56917a97c357a9e49b3eb0f6ca0d4cc9b66ad594ef8baa774808aba6e0e4bfe681c762d28e13611bc0d7bfc253a9f3cfb29c897c129af729ccfc8 SHA512 8ceb03b5e1b1d80c64035ce4bb350679b7e49e491ba2217a69f89644e5e1f431ba3efb3813885c60656d7b022abb41838a6149efc604244a7593a3a80456accd
+AUX util-linux-2.31-too_generic_symbols_pt2.patch 11096 BLAKE2B 2f1f278352c7fb2c47b0f094969e9b15860da7ca03cc10522d23f95a05721c9df1f3228cccdbe77a2a6fcf5a998556013d4776e86ab6661fac6b5ba1e00969a3 SHA512 e1b7610db8febf3d693ebafd405d46ed4d07555677ba0a77570292996069e30d663448de0e3a3b68d6624f36eba448c2249fe7431669a9a0193a3acaa8e01014
+AUX util-linux-2.31-too_generic_symbols_pt3.patch 1118 BLAKE2B e2f098346f7359945c26e49012798d910e8f46c099df9421f4ef3fc8801be5f8d31621f660137f171175dee984ea7e53f7614876d142a2cdedc94b7d4011eb98 SHA512 7e63b0f98fd5dace2c904800124e94f9734fffdf04386bbc03a84b2975f9100851f902c46fc923c9c31210359b4e3675ba04d7a844cfcc1fb494bcc7b776bef8
 DIST util-linux-2.30.2.tar.xz 4442624 BLAKE2B 7b76e255c9ee4d8b8f65f037a735808233edcdb8dce951038ae8983a3f4a6e493458622f6c7f6ce68d38672ac6dc5258b45b787c196dabede41cb19afc76e545 SHA512 b92ec16d5e8a405ad9ebbac8673bb49c5bf0a7f630118477f12c7a3c6b3b3ee5d56868632dd71fffd5c0434821207c2769f6859b9d398c2df770ec6487d7c32d
 DIST util-linux-2.31.tar.xz 4503892 BLAKE2B 8a9e2fc674cacbfabfc76cc0ab671f3fdb35d49de9f4ae8660b49df9e196878c2459d8fc57f6c9b6d2ad73cc56d970656ffcbc22deed97bb7a0cc28490a1fbb0 SHA512 48b668526e96a132736b882090d0e33c20b4b3a0e1760502d83118ed98ccc9423d310848a2bb73f82f85e9c19f6191075ae2c5269b007e76be1fbd7b6b88fbf5
-EBUILD util-linux-2.28.2.ebuild 5508 BLAKE2B 0b7a776910d21ce8071958b9b03c2d15969d59a1285d7f82dd24e540cfce717da716edc9d5f35968c2b5a967dff26036178f60d82794347b75cbb24bc4081f22 SHA512 7ce97d8d0325171d047508c3081fa3adadc79837f0821a4c5d63683e52353186328501d09bb0b884f3715ac443757a557c1c205f79c451a93f20c65035fe9516
-EBUILD util-linux-2.29.2-r1.ebuild 6022 BLAKE2B 11be8b43b1bfd2930759299c4a62a6bbb36ba151ff48e90cf1dca03efd633e07aa88b01a8e31c922397ae075ed06d7d5e017d3cf6a10f76eabefb7f4f0ac7ee4 SHA512 ede52a77a6cba1f06f6ae18ae64d2f836e6f5babc2d407409878867e7ef46614ffbd6f8267ceffb51d374d1ab87955d5ebfb3e92863078845aea06488dee6fe5
-EBUILD util-linux-2.30.1.ebuild 6073 BLAKE2B 1254f66e82ad293d9003442d9d8c182ddb57f1fe186b3de08d2a588a27d71388ad80c10b5e8343957492cc6050359f8025fd11df9f9118dd6898789a29b2edde SHA512 f6f247c6119337f79e3ab559de54b35ff8c892633323606e687c957c8b2db540487c9b8b5b37554ae59e29946ad0cdac563cbc2ca7a99cb723c69398aac52366
 EBUILD util-linux-2.30.2.ebuild 6077 BLAKE2B abd7234f5e2622b7a7d1489bd9f57fb3d33dce6556621cb8239ad8eb1260aafc4816cf878cbc5936893d50df263ff75073b79a49370ca9ef1b1dd9a8164c5332 SHA512 fdd4e1fdeef39a5cfdbe747a1e7bb2c35d4386efc8ed1264171156d85e00bc0465e9ec8b88a07e6cb7582659554ad98990f8bb728b581bfc41a3850121f1ce49
+EBUILD util-linux-2.31-r1.ebuild 6185 BLAKE2B 8aae4e20de31ab9161b78af51d8038a98f8ea4909277aa9a499b1aa47fe7c6821a965241a218d4ce166a462889c2e6375cda43e580922ac90ee805f196142ce6 SHA512 4bc749571b57a6720c7bbae2ca8b63d79ae8e2f46de686ff1978b35531d4945e1cab3afd61ec6b76718c31151e3838f06044e15b8bd7143c161a5f7860c74bca
 EBUILD util-linux-2.31.ebuild 6108 BLAKE2B 92ce3d425be12339dac8fb7296dc2e51dc2acff2d7d3382f4103b6c971a72c346564a2be31dcea835b58d5c88292cae7b2b8944408ab96d5d39d3db872e43ec7 SHA512 206118f5ff5fa5d4b21c734965c967d5eaf5934d57aef26199196b9800b89f252d17d676d4c288846062a0ff3d5304edeeda005f7dd62a427b3f6e19bc049da1
 EBUILD util-linux-9999.ebuild 6108 BLAKE2B 92ce3d425be12339dac8fb7296dc2e51dc2acff2d7d3382f4103b6c971a72c346564a2be31dcea835b58d5c88292cae7b2b8944408ab96d5d39d3db872e43ec7 SHA512 206118f5ff5fa5d4b21c734965c967d5eaf5934d57aef26199196b9800b89f252d17d676d4c288846062a0ff3d5304edeeda005f7dd62a427b3f6e19bc049da1
 MISC metadata.xml 947 BLAKE2B aeb1eef359b4be20e0df592245a2d432d92adf29336ecb1519bb4a97deed47c75bd14ca6c132f2e2ffe5c2d2ddcd7638ee38d03c7f8bcf8c8accb36a916663b5 SHA512 3822f7f3ccd120bbc788c64db0b79d55ad892bed99d01f8e0988c57ca7277a1936e03dbffd2898e68a2b6da25c301bc2cafb1da9658cdbbdfee1c9fb65e1699c
diff --git a/sys-apps/util-linux/files/util-linux-2.31-too_generic_symbols_pt1.patch b/sys-apps/util-linux/files/util-linux-2.31-too_generic_symbols_pt1.patch
new file mode 100644
index 000000000000..aa296d2bf2f3
--- /dev/null
+++ b/sys-apps/util-linux/files/util-linux-2.31-too_generic_symbols_pt1.patch
@@ -0,0 +1,207 @@
+From ff5feb96ec70e8a3fde41bd591b28c9855dab3fc Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Tue, 12 Dec 2017 11:29:02 +0100
+Subject: [PATCH] lib/sha1: use ul_/UL_prefix for symbols
+
+Unfortunately, the symbols are visible in statically compiled libuuid
+and the names are too generic.
+
+Addresses: https://github.com/karelzak/util-linux/issues/548
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ include/sha1.h         | 49 +++++++++++++++----------------------------------
+ lib/sha1.c             | 34 +++++++++++++++++-----------------
+ libuuid/src/gen_uuid.c | 12 ++++++------
+ 3 files changed, 38 insertions(+), 57 deletions(-)
+
+diff --git a/include/sha1.h b/include/sha1.h
+index 5c28bce92..62af1da6f 100644
+--- a/include/sha1.h
++++ b/include/sha1.h
+@@ -1,5 +1,5 @@
+-#ifndef SHA1_H
+-#define SHA1_H
++#ifndef UTIL_LINUX_SHA1_H
++#define UTIL_LINUX_SHA1_H
+ 
+ /*
+    SHA-1 in C
+@@ -9,38 +9,19 @@
+ 
+ #include "stdint.h"
+ 
+-#define SHA1LENGTH		20
++#define UL_SHA1LENGTH		20
+ 
+ typedef struct
+ {
+-    uint32_t state[5];
+-    uint32_t count[2];
+-    unsigned char buffer[64];
+-} SHA1_CTX;
+-
+-void SHA1Transform(
+-    uint32_t state[5],
+-    const unsigned char buffer[64]
+-    );
+-
+-void SHA1Init(
+-    SHA1_CTX * context
+-    );
+-
+-void SHA1Update(
+-    SHA1_CTX * context,
+-    const unsigned char *data,
+-    uint32_t len
+-    );
+-
+-void SHA1Final(
+-    unsigned char digest[SHA1LENGTH],
+-    SHA1_CTX * context
+-    );
+-
+-void SHA1(
+-    char *hash_out,
+-    const char *str,
+-    unsigned len);
+-
+-#endif /* SHA1_H */
++    uint32_t	state[5];
++    uint32_t	count[2];
++    unsigned	char buffer[64];
++} UL_SHA1_CTX;
++
++void ul_SHA1Transform(uint32_t state[5], const unsigned char buffer[64]);
++void ul_SHA1Init(UL_SHA1_CTX *context);
++void ul_SHA1Update(UL_SHA1_CTX *context, const unsigned char *data, uint32_t len);
++void ul_SHA1Final(unsigned char digest[UL_SHA1LENGTH], UL_SHA1_CTX *context);
++void ul_SHA1(char *hash_out, const char *str, unsigned len);
++
++#endif /* UTIL_LINUX_SHA1_H */
+diff --git a/lib/sha1.c b/lib/sha1.c
+index a2ac7f8ef..62c036774 100644
+--- a/lib/sha1.c
++++ b/lib/sha1.c
+@@ -51,7 +51,7 @@ A million repetitions of "a"
+ 
+ /* Hash a single 512-bit block. This is the core of the algorithm. */
+ 
+-void SHA1Transform(
++void ul_SHA1Transform(
+     uint32_t state[5],
+     const unsigned char buffer[64]
+ )
+@@ -179,8 +179,8 @@ void SHA1Transform(
+ 
+ /* SHA1Init - Initialize new context */
+ 
+-void SHA1Init(
+-    SHA1_CTX * context
++void ul_SHA1Init(
++    UL_SHA1_CTX * context
+ )
+ {
+     /* SHA1 initialization constants */
+@@ -195,8 +195,8 @@ void SHA1Init(
+ 
+ /* Run your data through this. */
+ 
+-void SHA1Update(
+-    SHA1_CTX * context,
++void ul_SHA1Update(
++    UL_SHA1_CTX * context,
+     const unsigned char *data,
+     uint32_t len
+ )
+@@ -213,10 +213,10 @@ void SHA1Update(
+     if ((j + len) > 63)
+     {
+         memcpy(&context->buffer[j], data, (i = 64 - j));
+-        SHA1Transform(context->state, context->buffer);
++        ul_SHA1Transform(context->state, context->buffer);
+         for (; i + 63 < len; i += 64)
+         {
+-            SHA1Transform(context->state, &data[i]);
++            ul_SHA1Transform(context->state, &data[i]);
+         }
+         j = 0;
+     }
+@@ -228,9 +228,9 @@ void SHA1Update(
+ 
+ /* Add padding and return the message digest. */
+ 
+-void SHA1Final(
++void ul_SHA1Final(
+     unsigned char digest[20],
+-    SHA1_CTX * context
++    UL_SHA1_CTX * context
+ )
+ {
+     unsigned i;
+@@ -262,13 +262,13 @@ void SHA1Final(
+     }
+ #endif
+     c = 0200;
+-    SHA1Update(context, &c, 1);
++    ul_SHA1Update(context, &c, 1);
+     while ((context->count[0] & 504) != 448)
+     {
+         c = 0000;
+-        SHA1Update(context, &c, 1);
++        ul_SHA1Update(context, &c, 1);
+     }
+-    SHA1Update(context, finalcount, 8); /* Should cause a SHA1Transform() */
++    ul_SHA1Update(context, finalcount, 8); /* Should cause a SHA1Transform() */
+     for (i = 0; i < 20; i++)
+     {
+         digest[i] = (unsigned char)
+@@ -279,18 +279,18 @@ void SHA1Final(
+     memset(&finalcount, '\0', sizeof(finalcount));
+ }
+ 
+-void SHA1(
++void ul_SHA1(
+     char *hash_out,
+     const char *str,
+     unsigned len)
+ {
+-    SHA1_CTX ctx;
++    UL_SHA1_CTX ctx;
+     unsigned int ii;
+ 
+-    SHA1Init(&ctx);
++    ul_SHA1Init(&ctx);
+     for (ii=0; ii<len; ii+=1)
+-        SHA1Update(&ctx, (const unsigned char*)str + ii, 1);
+-    SHA1Final((unsigned char *)hash_out, &ctx);
++        ul_SHA1Update(&ctx, (const unsigned char*)str + ii, 1);
++    ul_SHA1Final((unsigned char *)hash_out, &ctx);
+     hash_out[20] = '\0';
+ }
+ 
+diff --git a/libuuid/src/gen_uuid.c b/libuuid/src/gen_uuid.c
+index cf7cacd55..431bf2064 100644
+--- a/libuuid/src/gen_uuid.c
++++ b/libuuid/src/gen_uuid.c
+@@ -589,15 +589,15 @@ void uuid_generate_md5(uuid_t out, const uuid_t ns, const char *name, size_t len
+  */
+ void uuid_generate_sha1(uuid_t out, const uuid_t ns, const char *name, size_t len)
+ {
+-	SHA1_CTX ctx;
+-	char hash[SHA1LENGTH];
++	UL_SHA1_CTX ctx;
++	char hash[UL_SHA1LENGTH];
+ 
+-	SHA1Init(&ctx);
++	ul_SHA1Init(&ctx);
+ 	/* hash concatenation of well-known UUID with name */
+-	SHA1Update(&ctx, ns, sizeof(uuid_t));
+-	SHA1Update(&ctx, (const unsigned char *)name, len);
++	ul_SHA1Update(&ctx, ns, sizeof(uuid_t));
++	ul_SHA1Update(&ctx, (const unsigned char *)name, len);
+ 
+-	SHA1Final((unsigned char *)hash, &ctx);
++	ul_SHA1Final((unsigned char *)hash, &ctx);
+ 
+ 	memcpy(out, hash, sizeof(uuid_t));
+ 
diff --git a/sys-apps/util-linux/files/util-linux-2.31-too_generic_symbols_pt2.patch b/sys-apps/util-linux/files/util-linux-2.31-too_generic_symbols_pt2.patch
new file mode 100644
index 000000000000..f8276ec391cf
--- /dev/null
+++ b/sys-apps/util-linux/files/util-linux-2.31-too_generic_symbols_pt2.patch
@@ -0,0 +1,355 @@
+From 09a69dfc7720d5e0b7a646978a00a7c7a4411c37 Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Tue, 12 Dec 2017 11:54:08 +0100
+Subject: [PATCH] lib/md5: use ul_/UL_ prefix
+
+The symbols names are too generic.
+
+Addresses: https://github.com/karelzak/util-linux/issues/548
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ disk-utils/mkfs.cramfs.c       | 13 +++++++------
+ include/md5.h                  | 25 ++++++++++---------------
+ lib/md5.c                      | 26 +++++++++++++-------------
+ libblkid/src/superblocks/hfs.c | 16 +++++++++-------
+ libuuid/src/gen_uuid.c         | 12 ++++++------
+ misc-utils/mcookie.c           | 14 +++++++-------
+ tests/helpers/test_md5.c       | 12 ++++++------
+ 7 files changed, 58 insertions(+), 60 deletions(-)
+
+diff --git a/disk-utils/mkfs.cramfs.c b/disk-utils/mkfs.cramfs.c
+index a3e9aa48c..729765078 100644
+--- a/disk-utils/mkfs.cramfs.c
++++ b/disk-utils/mkfs.cramfs.c
+@@ -98,7 +98,7 @@ struct entry {
+ 	/* stats */
+ 	unsigned char *name;
+ 	unsigned int mode, size, uid, gid;
+-	unsigned char md5sum[MD5LENGTH];
++	unsigned char md5sum[UL_MD5LENGTH];
+ 	unsigned char flags;	   /* CRAMFS_EFLAG_* */
+ 
+ 	/* FS data */
+@@ -194,16 +194,17 @@ do_munmap(char *start, unsigned int size, unsigned int mode){
+ /* compute md5sums, so that we do not have to compare every pair of files */
+ static void
+ mdfile(struct entry *e) {
+-	MD5_CTX ctx;
+ 	char *start;
+ 
+ 	start = do_mmap(e->path, e->size, e->mode);
+ 	if (start == NULL) {
+ 		e->flags |= CRAMFS_EFLAG_INVALID;
+ 	} else {
+-		MD5Init(&ctx);
+-		MD5Update(&ctx, (unsigned char *) start, e->size);
+-		MD5Final(e->md5sum, &ctx);
++		UL_MD5_CTX ctx;
++
++		ul_MD5Init(&ctx);
++		ul_MD5Update(&ctx, (unsigned char *) start, e->size);
++		ul_MD5Final(e->md5sum, &ctx);
+ 
+ 		do_munmap(start, e->size, e->mode);
+ 
+@@ -255,7 +256,7 @@ static int find_identical_file(struct entry *orig, struct entry *new, loff_t *fs
+ 
+ 		if ((orig->flags & CRAMFS_EFLAG_MD5) &&
+ 		    (new->flags & CRAMFS_EFLAG_MD5) &&
+-		    !memcmp(orig->md5sum, new->md5sum, MD5LENGTH) &&
++		    !memcmp(orig->md5sum, new->md5sum, UL_MD5LENGTH) &&
+ 		    identical_file(orig, new)) {
+ 			new->same = orig;
+ 			*fslen_ub -= new->size;
+diff --git a/include/md5.h b/include/md5.h
+index d997e379d..d6991e1fd 100644
+--- a/include/md5.h
++++ b/include/md5.h
+@@ -1,29 +1,24 @@
+-#ifndef MD5_H
+-#define MD5_H
++#ifndef UTIL_LINUX_MD5_H
++#define UTIL_LINUX_MD5_H
+ 
+-#ifdef HAVE_STDINT_H
+ #include <stdint.h>
+-#else
+-typedef unsigned int uint32_t;
+-#endif
+ 
+-#define MD5LENGTH 16
++#define UL_MD5LENGTH 16
+ 
+-struct MD5Context {
++struct UL_MD5Context {
+ 	uint32_t buf[4];
+ 	uint32_t bits[2];
+ 	unsigned char in[64];
+ };
+ 
+-void MD5Init(struct MD5Context *context);
+-void MD5Update(struct MD5Context *context, unsigned char const *buf,
+-	       unsigned len);
+-void MD5Final(unsigned char digest[MD5LENGTH], struct MD5Context *context);
+-void MD5Transform(uint32_t buf[4], uint32_t const in[16]);
++void ul_MD5Init(struct UL_MD5Context *context);
++void ul_MD5Update(struct UL_MD5Context *context, unsigned char const *buf, unsigned len);
++void ul_MD5Final(unsigned char digest[UL_MD5LENGTH], struct UL_MD5Context *context);
++void ul_MD5Transform(uint32_t buf[4], uint32_t const in[16]);
+ 
+ /*
+  * This is needed to make RSAREF happy on some MS-DOS compilers.
+  */
+-typedef struct MD5Context MD5_CTX;
++typedef struct UL_MD5Context UL_MD5_CTX;
+ 
+-#endif /* !MD5_H */
++#endif /* !UTIL_LINUX_MD5_H */
+diff --git a/lib/md5.c b/lib/md5.c
+index 282e2d22a..3765ab93e 100644
+--- a/lib/md5.c
++++ b/lib/md5.c
+@@ -19,7 +19,7 @@
+ #include "md5.h"
+ 
+ #if !defined(WORDS_BIGENDIAN)
+-#define byteReverse(buf, len)	/* Nothing */
++# define byteReverse(buf, len)	/* Nothing */
+ #else
+ static void byteReverse(unsigned char *buf, unsigned longs);
+ 
+@@ -37,14 +37,14 @@ static void byteReverse(unsigned char *buf, unsigned longs)
+ 	buf += 4;
+     } while (--longs);
+ }
+-#endif
+-#endif
++#endif /* !ASM_MD5 */
++#endif /* !WORDS_BIGENDIAN */
+ 
+ /*
+  * Start MD5 accumulation.  Set bit count to 0 and buffer to mysterious
+  * initialization constants.
+  */
+-void MD5Init(struct MD5Context *ctx)
++void ul_MD5Init(struct UL_MD5Context *ctx)
+ {
+     ctx->buf[0] = 0x67452301;
+     ctx->buf[1] = 0xefcdab89;
+@@ -59,7 +59,7 @@ void MD5Init(struct MD5Context *ctx)
+  * Update context to reflect the concatenation of another buffer full
+  * of bytes.
+  */
+-void MD5Update(struct MD5Context *ctx, unsigned char const *buf, unsigned len)
++void ul_MD5Update(struct UL_MD5Context *ctx, unsigned char const *buf, unsigned len)
+ {
+     uint32_t t;
+ 
+@@ -84,7 +84,7 @@ void MD5Update(struct MD5Context *ctx, unsigned char const *buf, unsigned len)
+ 	}
+ 	memcpy(p, buf, t);
+ 	byteReverse(ctx->in, 16);
+-	MD5Transform(ctx->buf, (uint32_t *) ctx->in);
++	ul_MD5Transform(ctx->buf, (uint32_t *) ctx->in);
+ 	buf += t;
+ 	len -= t;
+     }
+@@ -93,7 +93,7 @@ void MD5Update(struct MD5Context *ctx, unsigned char const *buf, unsigned len)
+     while (len >= 64) {
+ 	memcpy(ctx->in, buf, 64);
+ 	byteReverse(ctx->in, 16);
+-	MD5Transform(ctx->buf, (uint32_t *) ctx->in);
++	ul_MD5Transform(ctx->buf, (uint32_t *) ctx->in);
+ 	buf += 64;
+ 	len -= 64;
+     }
+@@ -104,10 +104,10 @@ void MD5Update(struct MD5Context *ctx, unsigned char const *buf, unsigned len)
+ }
+ 
+ /*
+- * Final wrapup - pad to 64-byte boundary with the bit pattern 
++ * Final wrapup - pad to 64-byte boundary with the bit pattern
+  * 1 0* (64-bit count of bits processed, MSB-first)
+  */
+-void MD5Final(unsigned char digest[MD5LENGTH], struct MD5Context *ctx)
++void ul_MD5Final(unsigned char digest[UL_MD5LENGTH], struct UL_MD5Context *ctx)
+ {
+     unsigned count;
+     unsigned char *p;
+@@ -128,7 +128,7 @@ void MD5Final(unsigned char digest[MD5LENGTH], struct MD5Context *ctx)
+ 	/* Two lots of padding:  Pad the first block to 64 bytes */
+ 	memset(p, 0, count);
+ 	byteReverse(ctx->in, 16);
+-	MD5Transform(ctx->buf, (uint32_t *) ctx->in);
++	ul_MD5Transform(ctx->buf, (uint32_t *) ctx->in);
+ 
+ 	/* Now fill the next block with 56 bytes */
+ 	memset(ctx->in, 0, 56);
+@@ -145,9 +145,9 @@ void MD5Final(unsigned char digest[MD5LENGTH], struct MD5Context *ctx)
+     memcpy(&ctx->in[14 * sizeof(uint32_t)], &ctx->bits[0], 4);
+     memcpy(&ctx->in[15 * sizeof(uint32_t)], &ctx->bits[1], 4);
+ 
+-    MD5Transform(ctx->buf, (uint32_t *) ctx->in);
++    ul_MD5Transform(ctx->buf, (uint32_t *) ctx->in);
+     byteReverse((unsigned char *) ctx->buf, 4);
+-    memcpy(digest, ctx->buf, MD5LENGTH);
++    memcpy(digest, ctx->buf, UL_MD5LENGTH);
+     memset(ctx, 0, sizeof(*ctx));	/* In case it's sensitive */
+ }
+ 
+@@ -170,7 +170,7 @@ void MD5Final(unsigned char digest[MD5LENGTH], struct MD5Context *ctx)
+  * reflect the addition of 16 longwords of new data.  MD5Update blocks
+  * the data and converts bytes into longwords for this routine.
+  */
+-void MD5Transform(uint32_t buf[4], uint32_t const in[16])
++void ul_MD5Transform(uint32_t buf[4], uint32_t const in[16])
+ {
+     register uint32_t a, b, c, d;
+ 
+diff --git a/libblkid/src/superblocks/hfs.c b/libblkid/src/superblocks/hfs.c
+index c2344114a..19f14ed0d 100644
+--- a/libblkid/src/superblocks/hfs.c
++++ b/libblkid/src/superblocks/hfs.c
+@@ -130,19 +130,21 @@ struct hfsplus_vol_header {
+ 
+ static int hfs_set_uuid(blkid_probe pr, unsigned char const *hfs_info, size_t len)
+ {
+-	static unsigned char const hash_init[MD5LENGTH] = {
++	static unsigned char const hash_init[UL_MD5LENGTH] = {
+ 		0xb3, 0xe2, 0x0f, 0x39, 0xf2, 0x92, 0x11, 0xd6,
+ 		0x97, 0xa4, 0x00, 0x30, 0x65, 0x43, 0xec, 0xac
+ 	};
+-	unsigned char uuid[MD5LENGTH];
+-	struct MD5Context md5c;
++	unsigned char uuid[UL_MD5LENGTH];
++	struct UL_MD5Context md5c;
+ 
+ 	if (memcmp(hfs_info, "\0\0\0\0\0\0\0\0", len) == 0)
+ 		return -1;
+-	MD5Init(&md5c);
+-	MD5Update(&md5c, hash_init, MD5LENGTH);
+-	MD5Update(&md5c, hfs_info, len);
+-	MD5Final(uuid, &md5c);
++
++	ul_MD5Init(&md5c);
++	ul_MD5Update(&md5c, hash_init, UL_MD5LENGTH);
++	ul_MD5Update(&md5c, hfs_info, len);
++	ul_MD5Final(uuid, &md5c);
++
+ 	uuid[6] = 0x30 | (uuid[6] & 0x0f);
+ 	uuid[8] = 0x80 | (uuid[8] & 0x3f);
+ 	return blkid_probe_set_uuid(pr, uuid);
+diff --git a/libuuid/src/gen_uuid.c b/libuuid/src/gen_uuid.c
+index 431bf2064..a374e75c9 100644
+--- a/libuuid/src/gen_uuid.c
++++ b/libuuid/src/gen_uuid.c
+@@ -564,15 +564,15 @@ void uuid_generate(uuid_t out)
+  */
+ void uuid_generate_md5(uuid_t out, const uuid_t ns, const char *name, size_t len)
+ {
+-	MD5_CTX ctx;
+-	char hash[MD5LENGTH];
++	UL_MD5_CTX ctx;
++	char hash[UL_MD5LENGTH];
+ 
+-	MD5Init(&ctx);
++	ul_MD5Init(&ctx);
+ 	/* hash concatenation of well-known UUID with name */
+-	MD5Update(&ctx, ns, sizeof(uuid_t));
+-	MD5Update(&ctx, (const unsigned char *)name, len);
++	ul_MD5Update(&ctx, ns, sizeof(uuid_t));
++	ul_MD5Update(&ctx, (const unsigned char *)name, len);
+ 
+-	MD5Final((unsigned char *)hash, &ctx);
++	ul_MD5Final((unsigned char *)hash, &ctx);
+ 
+ 	memcpy(out, hash, sizeof(uuid_t));
+ 
+diff --git a/misc-utils/mcookie.c b/misc-utils/mcookie.c
+index e6c799d24..fd4227a09 100644
+--- a/misc-utils/mcookie.c
++++ b/misc-utils/mcookie.c
+@@ -41,7 +41,7 @@ enum {
+ };
+ 
+ struct mcookie_control {
+-	struct	MD5Context ctx;
++	struct	UL_MD5Context ctx;
+ 	char	**files;
+ 	size_t	nfiles;
+ 	uint64_t maxsz;
+@@ -67,12 +67,12 @@ static uint64_t hash_file(struct mcookie_control *ctl, int fd)
+ 		r = read_all(fd, (char *) buf, rdsz);
+ 		if (r < 0)
+ 			break;
+-		MD5Update(&ctl->ctx, buf, r);
++		ul_MD5Update(&ctl->ctx, buf, r);
+ 		count += r;
+ 	}
+ 	/* Separate files with a null byte */
+ 	buf[0] = '\0';
+-	MD5Update(&ctl->ctx, buf, 1);
++	ul_MD5Update(&ctl->ctx, buf, 1);
+ 	return count;
+ }
+ 
+@@ -131,7 +131,7 @@ int main(int argc, char **argv)
+ {
+ 	struct mcookie_control ctl = { .verbose = 0 };
+ 	size_t i;
+-	unsigned char digest[MD5LENGTH];
++	unsigned char digest[UL_MD5LENGTH];
+ 	unsigned char buf[RAND_BYTES];
+ 	int c;
+ 
+@@ -180,14 +180,14 @@ int main(int argc, char **argv)
+ 	free(ctl.files);
+ 
+ 	random_get_bytes(&buf, RAND_BYTES);
+-	MD5Update(&ctl.ctx, buf, RAND_BYTES);
++	ul_MD5Update(&ctl.ctx, buf, RAND_BYTES);
+ 	if (ctl.verbose)
+ 		fprintf(stderr, P_("Got %d byte from %s\n",
+ 				   "Got %d bytes from %s\n", RAND_BYTES),
+ 				RAND_BYTES, random_tell_source());
+ 
+-	MD5Final(digest, &ctl.ctx);
+-	for (i = 0; i < MD5LENGTH; i++)
++	ul_MD5Final(digest, &ctl.ctx);
++	for (i = 0; i < UL_MD5LENGTH; i++)
+ 		printf("%02x", digest[i]);
+ 	putchar('\n');
+ 
+diff --git a/tests/helpers/test_md5.c b/tests/helpers/test_md5.c
+index 471580e12..6f8dec4aa 100644
+--- a/tests/helpers/test_md5.c
++++ b/tests/helpers/test_md5.c
+@@ -7,22 +7,22 @@
+ int main(void)
+ {
+ 	int i, ret;
+-	struct MD5Context ctx;
+-	unsigned char digest[MD5LENGTH];
++	struct UL_MD5Context ctx;
++	unsigned char digest[UL_MD5LENGTH];
+ 	unsigned char buf[BUFSIZ];
+ 
+-	MD5Init( &ctx );
++	ul_MD5Init( &ctx );
+ 
+ 	while(!feof(stdin) && !ferror(stdin)) {
+ 		ret = fread(buf, 1, sizeof(buf), stdin);
+ 		if (ret)
+-			MD5Update( &ctx, buf, ret );
++			ul_MD5Update( &ctx, buf, ret );
+ 	}
+ 
+ 	fclose(stdin);
+-	MD5Final( digest, &ctx );
++	ul_MD5Final( digest, &ctx );
+ 
+-	for (i = 0; i < MD5LENGTH; i++)
++	for (i = 0; i < UL_MD5LENGTH; i++)
+ 		printf( "%02x", digest[i] );
+ 	printf("\n");
+ 	return 0;
diff --git a/sys-apps/util-linux/files/util-linux-2.31-too_generic_symbols_pt3.patch b/sys-apps/util-linux/files/util-linux-2.31-too_generic_symbols_pt3.patch
new file mode 100644
index 000000000000..2306a210e0be
--- /dev/null
+++ b/sys-apps/util-linux/files/util-linux-2.31-too_generic_symbols_pt3.patch
@@ -0,0 +1,43 @@
+From b4db227582f1d0a14c7b63de8d57e6052b753d57 Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Tue, 12 Dec 2017 11:38:17 +0100
+Subject: [PATCH] test_sha1: update helper
+
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ tests/helpers/test_sha1.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/tests/helpers/test_sha1.c b/tests/helpers/test_sha1.c
+index 5a1972935..ad96da4f0 100644
+--- a/tests/helpers/test_sha1.c
++++ b/tests/helpers/test_sha1.c
+@@ -7,22 +7,22 @@
+ int main(void)
+ {
+ 	int i, ret;
+-	SHA1_CTX ctx;
+-	unsigned char digest[SHA1LENGTH];
++	UL_SHA1_CTX ctx;
++	unsigned char digest[UL_SHA1LENGTH];
+ 	unsigned char buf[BUFSIZ];
+ 
+-	SHA1Init( &ctx );
++	ul_SHA1Init( &ctx );
+ 
+ 	while(!feof(stdin) && !ferror(stdin)) {
+ 		ret = fread(buf, 1, sizeof(buf), stdin);
+ 		if (ret)
+-			SHA1Update( &ctx, buf, ret );
++			ul_SHA1Update( &ctx, buf, ret );
+ 	}
+ 
+ 	fclose(stdin);
+-	SHA1Final( digest, &ctx );
++	ul_SHA1Final( digest, &ctx );
+ 
+-	for (i = 0; i < SHA1LENGTH; i++)
++	for (i = 0; i < UL_SHA1LENGTH; i++)
+ 		printf( "%02x", digest[i] );
+ 	printf("\n");
+ 	return 0;
diff --git a/sys-apps/util-linux/util-linux-2.28.2.ebuild b/sys-apps/util-linux/util-linux-2.28.2.ebuild
deleted file mode 100644
index ff8f436432d5..000000000000
--- a/sys-apps/util-linux/util-linux-2.28.2.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit eutils toolchain-funcs libtool flag-o-matic bash-completion-r1 \
-	python-single-r1 multilib-minimal systemd
-
-MY_PV=${PV/_/-}
-MY_P=${PN}-${MY_PV}
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-2 autotools
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
-else
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
-	SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
-fi
-
-DESCRIPTION="Various useful Linux utilities"
-HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/"
-
-LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain"
-SLOT="0"
-IUSE="build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode"
-
-# Most lib deps here are related to programs rather than our libs,
-# so we rarely need to specify ${MULTILIB_USEDEP}.
-RDEPEND="caps? ( sys-libs/libcap-ng )
-	cramfs? ( sys-libs/zlib )
-	ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] )
-	pam? ( sys-libs/pam )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:0= )
-	selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
-	slang? ( sys-libs/slang )
-	!build? ( systemd? ( sys-apps/systemd ) )
-	udev? ( virtual/libudev:= )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( sys-devel/bc )
-	virtual/os-headers"
-RDEPEND+="
-	kill? (
-		!sys-apps/coreutils[kill]
-		!sys-process/procps[kill]
-	)
-	!sys-process/schedutils
-	!sys-apps/setarch
-	!<sys-apps/sysvinit-2.88-r7
-	!sys-block/eject
-	!<sys-libs/e2fsprogs-libs-1.41.8
-	!<sys-fs/e2fsprogs-1.41.8
-	!<app-shells/bash-completion-2.3-r2"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if [[ ${PV} == 9999 ]] ; then
-		po/update-potfiles
-		eautoreconf
-	fi
-	elibtoolize
-}
-
-lfs_fallocate_test() {
-	# Make sure we can use fallocate with LFS #300307
-	cat <<-EOF > "${T}"/fallocate.${ABI}.c
-		#define _GNU_SOURCE
-		#include <fcntl.h>
-		main() { return fallocate(0, 0, 0, 0); }
-	EOF
-	append-lfs-flags
-	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \
-		|| export ac_cv_func_fallocate=no
-	rm -f "${T}"/fallocate.${ABI}.c
-}
-
-multilib_src_configure() {
-	lfs_fallocate_test
-	# The scanf test in a run-time test which fails while cross-compiling.
-	# Blindly assume a POSIX setup since we require libmount, and libmount
-	# itself fails when the scanf test fails. #531856
-	tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms
-	export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486
-	export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042
-	ECONF_SOURCE=${S} \
-	econf \
-		--enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin" \
-		--docdir='${datarootdir}'/doc/${PF} \
-		$(multilib_native_use_enable nls) \
-		--enable-agetty \
-		--with-bashcompletiondir="$(get_bashcompdir)" \
-		--enable-bash-completion \
-		$(multilib_native_use_enable caps setpriv) \
-		--disable-chfn-chsh \
-		$(multilib_native_use_enable cramfs) \
-		$(multilib_native_use_enable fdformat) \
-		--with-ncurses=$(multilib_native_usex ncurses $(usex unicode auto yes) no) \
-		$(use_enable kill) \
-		--disable-login \
-		$(multilib_native_use_enable tty-helpers mesg) \
-		--disable-nologin \
-		--enable-partx \
-		$(multilib_native_use_with python) \
-		--enable-raw \
-		$(multilib_native_use_with readline) \
-		--enable-rename \
-		--disable-reset \
-		--enable-schedutils \
-		--disable-su \
-		$(multilib_native_use_enable tty-helpers wall) \
-		$(multilib_native_use_enable tty-helpers write) \
-		$(multilib_native_use_enable suid makeinstall-chown) \
-		$(multilib_native_use_enable suid makeinstall-setuid) \
-		$(use_with selinux) \
-		$(multilib_native_use_with slang) \
-		$(use_enable static-libs static) \
-		$(multilib_native_use_with systemd) \
-		--with-systemdsystemunitdir=$(multilib_native_usex systemd "$(systemd_get_unitdir)" "no") \
-		$(multilib_native_use_with udev) \
-		$(tc-has-tls || echo --disable-tls)
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		default
-	else
-		# build libraries only
-		emake -f Makefile -f - mylibs \
-			<<< 'mylibs: $(usrlib_exec_LTLIBRARIES) $(pkgconfig_DATA)'
-	fi
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && emake check
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		default
-	else
-		emake DESTDIR="${D}" install-usrlib_execLTLIBRARIES \
-			install-pkgconfigDATA install-uuidincHEADERS \
-			install-nodist_blkidincHEADERS install-nodist_mountincHEADERS \
-			install-nodist_smartcolsincHEADERS install-nodist_fdiskincHEADERS
-	fi
-
-	if multilib_is_native_abi; then
-		# need the libs in /
-		gen_usr_ldscript -a blkid mount smartcols uuid
-
-		use python && python_optimize
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
-
-	# e2fsprogs-libs didnt install .la files, and .pc work fine
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	if ! use tty-helpers; then
-		elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers."
-	fi
-
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "The agetty util now clears the terminal by default. You"
-		elog "might want to add --noclear to your /etc/inittab lines."
-	fi
-}
diff --git a/sys-apps/util-linux/util-linux-2.29.2-r1.ebuild b/sys-apps/util-linux/util-linux-2.29.2-r1.ebuild
deleted file mode 100644
index 3fc8a7465b9d..000000000000
--- a/sys-apps/util-linux/util-linux-2.29.2-r1.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit eutils toolchain-funcs libtool flag-o-matic bash-completion-r1 \
-	pam python-single-r1 multilib-minimal systemd
-
-MY_PV=${PV/_/-}
-MY_P=${PN}-${MY_PV}
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-2 autotools
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
-	SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
-fi
-
-DESCRIPTION="Various useful Linux utilities"
-HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/"
-
-LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain"
-SLOT="0"
-IUSE="build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode"
-
-# Most lib deps here are related to programs rather than our libs,
-# so we rarely need to specify ${MULTILIB_USEDEP}.
-RDEPEND="caps? ( sys-libs/libcap-ng )
-	cramfs? ( sys-libs/zlib )
-	ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] )
-	pam? ( sys-libs/pam )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:0= )
-	selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
-	slang? ( sys-libs/slang )
-	!build? ( systemd? ( sys-apps/systemd ) )
-	udev? ( virtual/libudev:= )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( sys-devel/bc )
-	virtual/os-headers"
-RDEPEND+="
-	kill? (
-		!sys-apps/coreutils[kill]
-		!sys-process/procps[kill]
-	)
-	!sys-process/schedutils
-	!sys-apps/setarch
-	!<sys-apps/sysvinit-2.88-r7
-	!sys-block/eject
-	!<sys-libs/e2fsprogs-libs-1.41.8
-	!<sys-fs/e2fsprogs-1.41.8
-	!<app-shells/bash-completion-2.3-r2"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if [[ ${PV} == 9999 ]] ; then
-		po/update-potfiles
-		eautoreconf
-	fi
-	# Undo bad ncurses handling by upstream. #601530
-	sed -i -E \
-		-e '/NCURSES_/s:(ncursesw?)[56]-config:$PKG_CONFIG \1:' \
-		-e 's:(ncursesw?)[56]-config --version:$PKG_CONFIG --exists --print-errors \1:' \
-		configure || die
-	elibtoolize
-
-	epatch_user
-}
-
-lfs_fallocate_test() {
-	# Make sure we can use fallocate with LFS #300307
-	cat <<-EOF > "${T}"/fallocate.${ABI}.c
-		#define _GNU_SOURCE
-		#include <fcntl.h>
-		main() { return fallocate(0, 0, 0, 0); }
-	EOF
-	append-lfs-flags
-	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \
-		|| export ac_cv_func_fallocate=no
-	rm -f "${T}"/fallocate.${ABI}.c
-}
-
-multilib_src_configure() {
-	lfs_fallocate_test
-	# The scanf test in a run-time test which fails while cross-compiling.
-	# Blindly assume a POSIX setup since we require libmount, and libmount
-	# itself fails when the scanf test fails. #531856
-	tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms
-	export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486
-	export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042
-
-	local myeconfargs=(
-		--enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin"
-		--docdir='${datarootdir}'/doc/${PF}
-		$(multilib_native_use_enable nls)
-		--enable-agetty
-		--with-bashcompletiondir="$(get_bashcompdir)"
-		--enable-bash-completion
-		$(multilib_native_use_enable caps setpriv)
-		--disable-chfn-chsh
-		$(multilib_native_use_enable cramfs)
-		$(multilib_native_use_enable fdformat)
-		$(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw')
-		$(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses')
-		$(usex ncurses '' '--without-tinfo')
-		$(use_enable unicode widechar)
-		$(use_enable kill)
-		--disable-login
-		$(multilib_native_use_enable tty-helpers mesg)
-		--disable-nologin
-		--enable-partx
-		$(multilib_native_use_with python)
-		--enable-raw
-		$(multilib_native_use_with readline)
-		--enable-rename
-		--disable-reset
-		--enable-schedutils
-		--disable-su
-		$(multilib_native_use_enable tty-helpers wall)
-		$(multilib_native_use_enable tty-helpers write)
-		$(multilib_native_use_enable suid makeinstall-chown)
-		$(multilib_native_use_enable suid makeinstall-setuid)
-		$(use_with selinux)
-		$(multilib_native_use_with slang)
-		$(use_enable static-libs static)
-		$(multilib_native_use_with systemd)
-		--with-systemdsystemunitdir=$(multilib_native_usex systemd "$(systemd_get_unitdir)" "no")
-		$(multilib_native_use_with udev)
-		$(tc-has-tls || echo --disable-tls)
-	)
-	ECONF_SOURCE=${S} \
-	econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		default
-	else
-		# build libraries only
-		emake -f Makefile -f - mylibs \
-			<<< 'mylibs: $(usrlib_exec_LTLIBRARIES) $(pkgconfig_DATA)'
-	fi
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && emake check
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		default
-	else
-		emake DESTDIR="${D}" install-usrlib_execLTLIBRARIES \
-			install-pkgconfigDATA install-uuidincHEADERS \
-			install-nodist_blkidincHEADERS install-nodist_mountincHEADERS \
-			install-nodist_smartcolsincHEADERS install-nodist_fdiskincHEADERS
-	fi
-
-	if multilib_is_native_abi; then
-		# need the libs in /
-		gen_usr_ldscript -a blkid mount smartcols uuid
-
-		use python && python_optimize
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
-
-	# e2fsprogs-libs didnt install .la files, and .pc work fine
-	prune_libtool_files
-
-	if use pam; then
-		newpamd "${FILESDIR}/runuser.pamd" runuser
-		newpamd "${FILESDIR}/runuser-l.pamd" runuser-l
-	fi
-}
-
-pkg_postinst() {
-	if ! use tty-helpers; then
-		elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers."
-	fi
-
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "The agetty util now clears the terminal by default. You"
-		elog "might want to add --noclear to your /etc/inittab lines."
-	fi
-}
diff --git a/sys-apps/util-linux/util-linux-2.30.1.ebuild b/sys-apps/util-linux/util-linux-2.31-r1.ebuild
index c8d83a120f7f..8b029289f46e 100644
--- a/sys-apps/util-linux/util-linux-2.30.1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.31-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 
-inherit ltprune toolchain-funcs libtool flag-o-matic bash-completion-r1 \
+inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \
 	pam python-single-r1 multilib-minimal systemd
 
 MY_PV="${PV/_/-}"
@@ -49,16 +49,21 @@ RDEPEND+="
 		!sys-apps/coreutils[kill]
 		!sys-process/procps[kill]
 	)
+	!net-wireless/rfkill
 	!sys-process/schedutils
 	!sys-apps/setarch
 	!<sys-apps/sysvinit-2.88-r7
 	!sys-block/eject
 	!<sys-libs/e2fsprogs-libs-1.41.8
 	!<sys-fs/e2fsprogs-1.41.8
-	!<app-shells/bash-completion-2.3-r2"
+	!<app-shells/bash-completion-2.7-r1"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-too_generic_symbols_pt{1,2,3}.patch #641226
+)
+
 S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
@@ -106,7 +111,6 @@ multilib_src_configure() {
 		--disable-chfn-chsh
 		--disable-login
 		--disable-nologin
-		--disable-reset
 		--disable-su
 		--docdir='${datarootdir}'/doc/${PF}
 		--enable-agetty
@@ -116,6 +120,7 @@ multilib_src_configure() {
 		--enable-partx
 		--enable-raw
 		--enable-rename
+		--enable-rfkill
 		--enable-schedutils
 		--with-bashcompletiondir="$(get_bashcompdir)"
 		--with-systemdsystemunitdir=$(multilib_native_usex systemd "$(systemd_get_systemunitdir)" "no")
@@ -181,7 +186,7 @@ multilib_src_install_all() {
 	dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
 
 	# e2fsprogs-libs didnt install .la files, and .pc work fine
-	prune_libtool_files
+	find "${ED}" -name "*.la" -delete || die
 
 	if use pam; then
 		newpamd "${FILESDIR}/runuser.pamd" runuser
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 5a48d4bc489f..d76efbdab194 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/nss_ldap/Manifest b/sys-auth/nss_ldap/Manifest
index bab803bbcb9e..56368fb67c95 100644
--- a/sys-auth/nss_ldap/Manifest
+++ b/sys-auth/nss_ldap/Manifest
@@ -1,7 +1,4 @@
-AUX nss_ldap-239-tls-security-bug.patch 1022 BLAKE2B 22a333d9f37612ef0be82bcc97b39d181b41dfe00afe4e911321570070ffd6073488fa7ed56a12169155b1df24ea0109b186a441517cad7f50e50a71bef6e945 SHA512 9700962f0844ed4e4695dd31efe2b654a646a644b401b282a0b23cb80a3eedde95b54a79cd7a9c25ea3ed319c178aef7edf84953a5cf6edbc5a4ac5bf805c603
 AUX nss_ldap-249-sasl-compile.patch 282 BLAKE2B 5fde1a60ca75fb7ed635bf0c7649626de2ea87497067aa8d1d210e4862a1e4b0dcf04e1e8e40d126119fe7d8ae8d3686c4e3166598f941b83d1bb3685d42ee7c SHA512 74af8f635a2bae5d901e685d0a9df3b92583b4480f0736b095df6091eac059226b91149d4b8a30a2ee60b948b55b87b8e6402d0e8fdcf1e84d384781c4880cea
-AUX nss_ldap-252-reconnect-timeouts.patch 3169 BLAKE2B 0bccea69ed25e804bdaf91e1c8f1808177fadf6e38ad6dace8039b62d93cad47be7fe28b9633dd7950bc068b57649209deec518aa232a59e2cd9c8687dd28ca6 SHA512 c3a282d422792830e8572baa05ec58868c3cda7a80591e06c54bc3fc07cabba32f2a9fbe428a5a2f9c6e76eca5c475d200ca113c58ad2cbba290adadf41de4b9
-AUX nss_ldap-254-nss_getgrent_skipmembers.patch 7837 BLAKE2B 41cd44325ff08da3b77ebde6e15d21b94c8e9d1338a3a46d451eaf89720c2c5ee8fc9d5cd3f20a46dcc639f0a2d721c456d17595e5109e6535757ac0d3d7f43f SHA512 38957dd652c5340dab02000b0d62dfad803bd0593c139e84ea26cc9aabbbe68fcf221cd9030b4f9a2faa1ee5ef3ef1242b96a2dd2557cd5432ab8fdb8d513ca0
 AUX nss_ldap-254-soname.patch 604 BLAKE2B 14328e1fb893c11a67e0fc10026035da5e908bdc32998e0970a82bc48cb13f59b615378a090dd3e58954d588bfcbbc9edbe413a48f625946a071ace8622364ad SHA512 4a41f7c5507095a26fc10f2ebc9563cf50017c0e95277db20363dec92e59c2b3cfde49ada036887177d439487c1d5c406c03269f5a329c3f8a381a045d1a1ae2
 AUX nss_ldap-257-nss_max_group_depth.patch 3551 BLAKE2B 6bb9db4af1ae8b74fefdb99119c41ab1e91b6bf73e9637c0b1ed436c432c00fd827cc0acbb2463bf60fc533ad3d4856f86ecdb607ab1a0030203b2a3d3d015bf SHA512 7810f8c053c8f6b01cc61bb1953441d457bc6d90b4e985d03f6c7e8a7ef60225c86dfa0248fe1107955418a3ed205b52510fd2bee07fefc1c559300a1417d1de
 AUX nss_ldap-257.2-gssapi-headers.patch 2343 BLAKE2B d82b77be7a5f449e2367719262aa9effca16af1338c276cbb03a705b3ae0d5f2a3ab931aca16883819ca81c59811e5e01dfe0fd4252f4b5de48cd5e1adc73063 SHA512 51acfb4879c242582fc6f4d8543b96ff5e2e36e5bfacc3e8d8f1648f77a16957bbb7da0fa8d09ee1eea0ea19d81b0511ce72cc1c91ca2c68709203ec60369dde
@@ -12,21 +9,6 @@ AUX nss_ldap-265-missing-entries-oneshot.patch 3734 BLAKE2B 8ecc35b20719222a747c
 AUX nss_ldap-265-pthread.patch 18698 BLAKE2B 1a158ddca1dbc99536b2d637a938c6ab121bb217b6b4b6f9755139ea8aec860023ec5fdcdbcebd925b99d9d440fc4a06da364646cd30f6654e41cbedb18e74df SHA512 2afc8a8ee20043985b739923a4c7472f0e13c6854de6d3023ac6c843d3ba6ecf4cf7ee21da4d8dad907f27ab476eec646fa4603d8be725f079f60a4a220c025d
 AUX nss_ldap-265-reconnect-timeouts.patch 2806 BLAKE2B b254a9959892a0a8ecb6e53778c4581f5ce8f9f0b90ceaf7fdb3e08cdc029b3914d9f95a7b65f3f9ceedf6669ae5727d8bc41c7229c567667896b4cb8868b227 SHA512 d9767cfaf32b9041d222c7b313c327a72ac2766d26fed7ce19cc1acff56cf2493d4e1e83b33852083505952f983ba64c00409e3cf09dcbf74676390968dd935b
 AUX nsswitch.ldap.diff 575 BLAKE2B 9578535ea6cff87ac21fa8f3a0a1b8d727c657a53318b378dd86b4dded15bac950e241af59b15b6898a1ed089d1c481f0615ca7de3ae4e07a231432920af7b52 SHA512 0d08d4dacea0213714cab864300e625158106245eeb34a7d4b983749dd4fa4156d3f36d6c2dd214efdf80cf926c37657eb00651bceb89907286a3310123399a0
-DIST nss_ldap-258.tar.gz 274694 BLAKE2B 6374596d0e6675c89bde561cfcdc26622bfedbacd163183c4838fbb1cf1939078be895dcdd07127503171110bb241ff3e7e40f616865a58caae6931fe2882db0 SHA512 0a92076214e6ffaa60929a9fdc34fe7c9a584a0789d54ea505e65a69eda88a3ee0382ea5a90c581073c95671fa3a50b8a8a529e30f4260afacb3820695773ecb
-DIST nss_ldap-259.tar.gz 274878 BLAKE2B 0d5db5d077f2560b9145c6a19d2af3ede831f2073df562b40b129db995950ab359744ba2fb7156f74720a46edc320dbd44e9be1c5d4fbc515d892ae676876969 SHA512 d20514df1b8dba4ad67cf5d130aa4a2e1b0aea1ee09832bc27078f26a62ecf56b0294b5fcd3425b5b6969889afc99f7fc335a34994034dcfb10f3ab5385d3393
-DIST nss_ldap-261.tar.gz 276065 BLAKE2B d6854f149aadfdbd19d15de9a3085c7932c7b618af490ce738e92c61c6ca6a8de903d776d1e8d60eae9a3043f510e321cfe7f73dcf21d435b1ea9786e0fc84fc SHA512 b44f4ad62f3d3b237370b6393ff38ab5f26608bd8996607f828e3ab32d7dbb96ae2e40398b5b1cea9a232a29ea6c30ee56d5e9b386a514b194ac2b3e94da59da
-DIST nss_ldap-262.tar.gz 274927 BLAKE2B 6db4e236485df7d15daeb613df64e384e4cbd96239c37942267005e8b29fdc991d31be32024e0f073f09c0a9cbb3272672f7f2f8d4c35a97003b0d557283aa02 SHA512 ac4781f36b0dbc9a8e00206b13598d247a3501ca0f7e1cc7e7bcc11675186199b2ea0975ce2feb311b07b50aad36efed5ba297e7c93dc741b806a94d8d051152
-DIST nss_ldap-264.tar.gz 278134 BLAKE2B 0c3e969b444a1a836220e1c6cef3598b6e39a5ed5a8365fa6583df2977118b10cfea46ce19fa98c1c5bbbefcc62f3e745287c6c7fb7fe54010dd4c86dd205106 SHA512 e7decde11377f10ec98fd360a38cbf08b9af7e328e967e417367e9e501faf0868be67a6f8fc1dd9b1fe7ee2ae720ee791ed481e21e80f686e750351b3ea6e689
 DIST nss_ldap-265.tar.gz 280976 BLAKE2B 31b233ef7680204abfb62408141609b9489e133327c787c59afedd9ac41194189bde26d1f3b0a885622f57ec769ddee2bdf7d274b9584d4d5002d1c016c86892 SHA512 c4584682968861dd5880992fe7d11c6005d94f0c17252ab1cda04380fd7a81b419ba7e87d0efa44c24c5ce5bf76b9fd8331034dddb4f1400f132eb2192472077
-EBUILD nss_ldap-258.ebuild 2251 BLAKE2B 51929d26ce22dadf3b423befdc7c7261dd850aaccfe46f90e9b79a173af311237f9c29e94449d8ddb3c6bd5c6322b36b5cda8177cbb4bb77298507a60a2f293a SHA512 73004c7e868983baaf81dc6cfa8cf296790a7a594dba695b89845285474af8190b6801fb8976cbb63d77112de50a11f6ed0d8b565c99988c60cfbde51665cebf
-EBUILD nss_ldap-259.ebuild 2258 BLAKE2B 7baa29b172ba86c25aa63857ae80b6197cbf75fefce031c49e20f4cffabdd9b2a14323347f7064c6582bac1ad56151c61fc97d9679b9f3ca2119501e56e3206d SHA512 b7d2cdf5d00fc1ec03b8a05a1550a8e0c2ff034b6491e742e18cbb6c050f8a55db3f79a03058ab03d4b85cb8daf153e593a323f287ced3d870f9e2d26a59fe00
-EBUILD nss_ldap-261.ebuild 2378 BLAKE2B 7f47a5fa55f7f530b939219479811606fb0c5ecbd60a627892dd92c0983e0e9a3a238b5678b477f0a075463c52ec875b1b607ceaebe6a49d5ac235ad163ffadd SHA512 fab05a285b546102960837dd8bd06e695147c690231a5ef107e0bbcab3f5ea1ec34058073ead753baa0c2b6155aa17357489915c7697decbb0d83279995e4d5e
-EBUILD nss_ldap-262.ebuild 2378 BLAKE2B 7f47a5fa55f7f530b939219479811606fb0c5ecbd60a627892dd92c0983e0e9a3a238b5678b477f0a075463c52ec875b1b607ceaebe6a49d5ac235ad163ffadd SHA512 fab05a285b546102960837dd8bd06e695147c690231a5ef107e0bbcab3f5ea1ec34058073ead753baa0c2b6155aa17357489915c7697decbb0d83279995e4d5e
-EBUILD nss_ldap-264-r1.ebuild 2608 BLAKE2B 59ad9063dfacb84c1226351539453b6b08084b3d2528ea33c01f18f4b19651b85555958a4ebe78b26e81b69fa425deefea29ca9138f92be9e27eb08c43760414 SHA512 c8245e2a64739ef4248675c463e79892e56acd3413e3e7ef6d37d38fcfd2ca4231c6f6435dd1d627f57dad6b9a7fb5869eee597b0bc2fac2315690c60280db6a
-EBUILD nss_ldap-264.ebuild 2549 BLAKE2B 89bc20b6617938f765217e3c13981746535578bf91d98291ba28489fce753eb622016e09fd8c05b775350838788aecd54e75763e7d68bea97863268d6b8bf5e4 SHA512 9d889ae0d7c92cd28ba8fb983f7d010c5b761c9d3ddac915ba4a810b485639fea537cb6b745948780af4d6d51c749a2338de5149beb6ba6724e3c43c70c9738f
-EBUILD nss_ldap-265-r1.ebuild 2946 BLAKE2B 22494a2017d53b22173307f76b3f0a7c6e6cd4687db7b0bf6364aacf37999800158f2055e38b50e7b7568945d3442bdffec68686febcc71dbdda3696e1ff639c SHA512 61c663c260eb7b75df3f1b601ea6d5f339a4b8bf22b977616ee5ebecfea7cd7295a99a6fc4afca263268605ff3a6719f8d8bf775d01b7c9b7d79899bacf198ba
-EBUILD nss_ldap-265-r2.ebuild 3106 BLAKE2B f79713535aef86cba79249927090ed18d4840ae3b9402d3b8ea843530753dfeface8c7515ca3b4f61545ac233877a59be5c6f5f612b65c6dec75a65f8d007861 SHA512 762e5bde4f5359d73e25b49d34ecaf24389383b378df4fd246eb7874c118a32b0720ec411fde0248a4087c8c18198edc0745380976cc4dba584d15b25291cf6b
-EBUILD nss_ldap-265-r4.ebuild 3712 BLAKE2B 7c269443008d950a239091ed60a524ec4644dcc0dcbdc192accf9797d51f33a5615e1edcfd40b0f5f71c55e0fa9adb9b5273b1c36d36cf267e5404b79844688a SHA512 d7abc453958c991123a3aaf78af929169abf6c12d9305b82d92eb1f8499e52b034a3728b076931a04b0db6ab8d54a37d6904234fd977890f10e57845d437337a
 EBUILD nss_ldap-265-r5.ebuild 4116 BLAKE2B 6035f1f73d7dddb7cf0f806c12f6ff24dc3450035d75d928ae769129976b985e41fb97365de29c6f4f28e95584911b348e5b38da92e6d4ec66afb8934bfe9431 SHA512 13e3539a1d6b1c022ee4ddd81a1b59ae4740311a567d26cd0fd67e71da5b111953367befe99302cad3001bbadb5f3a8081ab4181b05040b793118301133eb3a7
-EBUILD nss_ldap-265.ebuild 2691 BLAKE2B aac100c4bd568895a2be9709906b8fe47f78005e5cd34be17754cce20f995216b964f32c1dbb090c62007dab0b533fa7e7be80e9ad112c4b6b9c054cc82a0962 SHA512 49a654acaffd2be41061f680d339d3b5d39b3237050454769644cc7d70ce1a413e3aa38763c6938be25f1af2e1946cd3f35b84da0f0814483476e905581c4661
 MISC metadata.xml 472 BLAKE2B 807d6edadcbc8209f6cefdf43d271376eeb043a7b9cc315d708d20ad3a6765da6436128068b3394a48861343c8823a54efb3588fccbe71e00b257c9ed50f0d48 SHA512 33c52bba49fa13e698544de57b00dc813d87820ef29adf29b57198fadca85a1e45a1e99eff3d8806c77eab456d870ce8ddbfd02a688babb5600ba64cf2cf2419
diff --git a/sys-auth/nss_ldap/files/nss_ldap-239-tls-security-bug.patch b/sys-auth/nss_ldap/files/nss_ldap-239-tls-security-bug.patch
deleted file mode 100644
index 1dbd8dc889a1..000000000000
--- a/sys-auth/nss_ldap/files/nss_ldap-239-tls-security-bug.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- ldap-nss.c	2004-09-28 03:20:11.000000000 +0100
-+++ ldap-nss.c.new	2005-07-04 01:32:12.000000000 +0100
-@@ -330,6 +330,39 @@
- 
-   timelimit = __session.ls_config->ldc_bind_timelimit;
- 
-+#ifdef HAVE_LDAP_START_TLS_S
-+  if (__session.ls_config->ldc_ssl_on == SSL_START_TLS)
-+    {
-+      int version;
-+
-+      if (ldap_get_option
-+	  (__session.ls_conn, LDAP_OPT_PROTOCOL_VERSION,
-+	   &version) == LDAP_OPT_SUCCESS)
-+	{
-+	  if (version < LDAP_VERSION3)
-+	    {
-+	      version = LDAP_VERSION3;
-+	      ldap_set_option (__session.ls_conn, LDAP_OPT_PROTOCOL_VERSION,
-+			       &version);
-+	    }
-+	}
-+
-+      debug ("==> start_tls");
-+      if (ldap_start_tls_s (__session.ls_conn, NULL, NULL) == LDAP_SUCCESS)
-+	{
-+	  debug ("TLS startup succeeded");
-+	}
-+      else
-+	{
-+	  debug ("TLS startup failed");
-+	  do_close ();
-+	  debug ("<== do_open");
-+	  return NSS_UNAVAIL;
-+	}
-+      debug ("<== start_tls");
-+    }
-+#endif /* HAVE_LDAP_START_TLS_S */
-+
-   return do_bind (ld, timelimit, who, cred, with_sasl);
- }
- #else
diff --git a/sys-auth/nss_ldap/files/nss_ldap-252-reconnect-timeouts.patch b/sys-auth/nss_ldap/files/nss_ldap-252-reconnect-timeouts.patch
deleted file mode 100644
index 285a34e3df4b..000000000000
--- a/sys-auth/nss_ldap/files/nss_ldap-252-reconnect-timeouts.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-This patch changes the default timeouts, so that they are much lower, and do
-not cause major delays when booting a system. This is a workaround until the
-core /etc/{passwd,group} contain all of the data needed for a system boot.
-
-Also add a note that 'ssl on' is broken and TLS should be used instead.
-
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-diff -Nuar --exclude '*~' nss_ldap-250.orig/ldap-nss.h nss_ldap-250/ldap-nss.h
---- nss_ldap-250.orig/ldap-nss.h	2006-04-26 18:19:00.000000000 -0700
-+++ nss_ldap-250/ldap-nss.h	2006-06-14 01:58:01.933005492 -0700
-@@ -96,9 +96,9 @@
-  * unacceptable, in which case you may wish to adjust
-  * the constants below.
-  */
--#define LDAP_NSS_TRIES           5	/* number of sleeping reconnect attempts */
--#define LDAP_NSS_SLEEPTIME       4	/* seconds to sleep; doubled until max */
--#define LDAP_NSS_MAXSLEEPTIME    64	/* maximum seconds to sleep */
-+#define LDAP_NSS_TRIES           4	/* number of sleeping reconnect attempts */
-+#define LDAP_NSS_SLEEPTIME       1	/* seconds to sleep; doubled until max */
-+#define LDAP_NSS_MAXSLEEPTIME    16	/* maximum seconds to sleep */
- #define LDAP_NSS_MAXCONNTRIES    2	/* reconnect attempts before sleeping */
- 
- #if defined(HAVE_NSSWITCH_H) || defined(HAVE_IRS_H)
-diff -Nuar --exclude '*~' nss_ldap-250.orig/ldap.conf nss_ldap-250/ldap.conf
---- nss_ldap-250.orig/ldap.conf	2006-04-26 18:19:00.000000000 -0700
-+++ nss_ldap-250/ldap.conf	2006-06-14 02:12:02.008444745 -0700
-@@ -283,7 +283,8 @@
- # OpenLDAP SSL mechanism
- # start_tls mechanism uses the normal LDAP port, LDAPS typically 636
- #ssl start_tls
--#ssl on
-+###ssl on
-+# Gentoo note: Don't use 'ssl on' in 249/250. They are broken in some cases! Use start_tls instead.
- 
- # OpenLDAP SSL options
- # Require and verify server certificate (yes/no)
-@@ -315,3 +316,27 @@
- # Override the default Kerberos ticket cache location.
- #krb5_ccname FILE:/etc/.ldapcache
- 
-+# Timeout behavior
-+# Upstream nss_ldap hard-codes these values:
-+#nss_reconnect_tries 5			# number of times to double the sleep time
-+#nss_reconnect_sleeptime 4		# initial sleep value
-+#nss_reconnect_maxsleeptime 64	# max sleep value to cap at
-+#nss_reconnect_maxconntries 2	# how many tries before sleeping
-+# This leads to a delay of 124 seconds (4+8+16+32+64=124) per lookup if the
-+# server is not available.
-+
-+# For Gentoo's distribution of nss_ldap, as of 250-r1, we use these values
-+# (The hardwired constants in the code are changed to them as well):
-+nss_reconnect_tries 4			# number of times to double the sleep time
-+nss_reconnect_sleeptime 1		# initial sleep value
-+nss_reconnect_maxsleeptime 16	# max sleep value to cap at
-+nss_reconnect_maxconntries 2	# how many tries before sleeping
-+# This leads to a delay of 15 seconds (1+2+4+8=15)
-+
-+# If you are impatient, and know your LDAP server is reliable, fast or local,
-+# you may wish to use these values instead:
-+#nss_reconnect_tries 1			# number of times to double the sleep time
-+#nss_reconnect_sleeptime 1		# initial sleep value
-+#nss_reconnect_maxsleeptime 1	# max sleep value to cap at
-+#nss_reconnect_maxconntries 3	# how many tries before sleeping
-+# This leads to a delay of 1 second.
diff --git a/sys-auth/nss_ldap/files/nss_ldap-254-nss_getgrent_skipmembers.patch b/sys-auth/nss_ldap/files/nss_ldap-254-nss_getgrent_skipmembers.patch
deleted file mode 100644
index 68809bcf1b1b..000000000000
--- a/sys-auth/nss_ldap/files/nss_ldap-254-nss_getgrent_skipmembers.patch
+++ /dev/null
@@ -1,226 +0,0 @@
-diff -c -r nss_ldap-250/ChangeLog nss_ldap-250.1/ChangeLog
-*** nss_ldap-250/ChangeLog	Wed Apr 26 18:19:00 2006
---- nss_ldap-250.1/ChangeLog	Wed Aug 16 16:58:57 2006
-***************
-*** 1,6 ****
---- 1,13 ----
-  $Id$
-  ===============================================================
-  
-+ 250.1   Paul B. Henson <henson@acm.org>
-+ 
-+ 	* add nss_getgrent_skipmembers parameter to ldap.conf,
-+ 	  if enabled will not request member attributes for
-+ 	  group lookups, greatly increasing performance in the
-+ 	  face of large groups
-+ 
-  250	Luke Howard <lukeh@padl.com>
-  
-  	* don't use static _nss_ldap_no_members buffer,
-diff -c -r nss_ldap-250/ldap-nss.c nss_ldap-250.1/ldap-nss.c
-*** nss_ldap-250/ldap-nss.c	Wed Apr 26 18:19:00 2006
---- nss_ldap-250.1/ldap-nss.c	Wed Aug 16 16:51:49 2006
-***************
-*** 1258,1264 ****
-  
-    cfg = __config;
-  
-!   _nss_ldap_init_attributes (cfg->ldc_attrtab);
-    _nss_ldap_init_filters ();
-  
-  #ifdef HAVE_LDAP_SET_OPTION
---- 1258,1264 ----
-  
-    cfg = __config;
-  
-!   _nss_ldap_init_attributes (cfg->ldc_attrtab, cfg->ldc_getgrent_skipmembers);
-    _nss_ldap_init_filters ();
-  
-  #ifdef HAVE_LDAP_SET_OPTION
-diff -c -r nss_ldap-250/ldap-nss.h nss_ldap-250.1/ldap-nss.h
-*** nss_ldap-250/ldap-nss.h	Wed Apr 26 18:19:00 2006
---- nss_ldap-250.1/ldap-nss.h	Wed Aug 16 16:51:59 2006
-***************
-*** 390,395 ****
---- 390,396 ----
-    time_t ldc_mtime;
-  
-    char **ldc_initgroups_ignoreusers;
-+   int ldc_getgrent_skipmembers;
-  };
-  
-  typedef struct ldap_config ldap_config_t;
-diff -c -r nss_ldap-250/ldap-schema.c nss_ldap-250.1/ldap-schema.c
-*** nss_ldap-250/ldap-schema.c	Wed Apr 26 18:19:00 2006
---- nss_ldap-250.1/ldap-schema.c	Wed Aug 16 16:54:52 2006
-***************
-*** 273,279 ****
-  
-  static void init_pwd_attributes (const char ***pwd_attrs);
-  static void init_sp_attributes (const char ***sp_attrs);
-! static void init_grp_attributes (const char ***grp_attrs);
-  static void init_hosts_attributes (const char ***hosts_attrs);
-  static void init_services_attributes (const char ***services_attrs);
-  static void init_network_attributes (const char ***network_attrs);
---- 273,279 ----
-  
-  static void init_pwd_attributes (const char ***pwd_attrs);
-  static void init_sp_attributes (const char ***sp_attrs);
-! static void init_grp_attributes (const char ***grp_attrs, int ldc_getgrent_skipmembers);
-  static void init_hosts_attributes (const char ***hosts_attrs);
-  static void init_services_attributes (const char ***services_attrs);
-  static void init_network_attributes (const char ***network_attrs);
-***************
-*** 289,299 ****
-   * attribute table initialization routines
-   */
-  void
-! _nss_ldap_init_attributes (const char ***attrtab)
-  {
-    init_pwd_attributes (&attrtab[LM_PASSWD]);
-    init_sp_attributes (&attrtab[LM_SHADOW]);
-!   init_grp_attributes (&attrtab[LM_GROUP]);
-    init_hosts_attributes (&attrtab[LM_HOSTS]);
-    init_services_attributes (&attrtab[LM_SERVICES]);
-    init_network_attributes (&attrtab[LM_NETWORKS]);
---- 289,299 ----
-   * attribute table initialization routines
-   */
-  void
-! _nss_ldap_init_attributes (const char ***attrtab, int ldc_getgrent_skipmembers)
-  {
-    init_pwd_attributes (&attrtab[LM_PASSWD]);
-    init_sp_attributes (&attrtab[LM_SHADOW]);
-!   init_grp_attributes (&attrtab[LM_GROUP], ldc_getgrent_skipmembers);
-    init_hosts_attributes (&attrtab[LM_HOSTS]);
-    init_services_attributes (&attrtab[LM_SERVICES]);
-    init_network_attributes (&attrtab[LM_NETWORKS]);
-***************
-*** 357,363 ****
-  }
-  
-  static void
-! init_grp_attributes (const char ***grp_attrs)
-  {
-    int i = 0;
-    static const char *__grp_attrs[ATTRTAB_SIZE + 1];
---- 357,363 ----
-  }
-  
-  static void
-! init_grp_attributes (const char ***grp_attrs, int ldc_getgrent_skipmembers)
-  {
-    int i = 0;
-    static const char *__grp_attrs[ATTRTAB_SIZE + 1];
-***************
-*** 366,374 ****
-  
-    (*grp_attrs)[i++] = (char *) ATM (LM_GROUP, cn);
-    (*grp_attrs)[i++] = (char *) ATM (LM_GROUP, userPassword);
-!   (*grp_attrs)[i++] = (char *) AT (memberUid);
-!   if (_nss_ldap_test_config_flag (NSS_LDAP_FLAGS_RFC2307BIS))
-!     (*grp_attrs)[i++] = (char *) AT (uniqueMember);
-    (*grp_attrs)[i++] = (char *) ATM (LM_GROUP, gidNumber);
-    (*grp_attrs)[i] = NULL;
-  }
---- 366,377 ----
-  
-    (*grp_attrs)[i++] = (char *) ATM (LM_GROUP, cn);
-    (*grp_attrs)[i++] = (char *) ATM (LM_GROUP, userPassword);
-!   if (!ldc_getgrent_skipmembers)
-!     {
-!       (*grp_attrs)[i++] = (char *) AT (memberUid);
-!       if (_nss_ldap_test_config_flag (NSS_LDAP_FLAGS_RFC2307BIS))
-!         (*grp_attrs)[i++] = (char *) AT (uniqueMember);
-!     }
-    (*grp_attrs)[i++] = (char *) ATM (LM_GROUP, gidNumber);
-    (*grp_attrs)[i] = NULL;
-  }
-diff -c -r nss_ldap-250/ldap-schema.h nss_ldap-250.1/ldap-schema.h
-*** nss_ldap-250/ldap-schema.h	Wed Apr 26 18:19:00 2006
---- nss_ldap-250.1/ldap-schema.h	Wed Aug 16 16:54:07 2006
-***************
-*** 30,36 ****
-   * function to initialize global lookup filters.
-   */
-  void _nss_ldap_init_filters ();
-! void _nss_ldap_init_attributes (const char ***attrtab);
-  
-  /**
-   * make filters formerly declared in ldap-*.h globally available.
---- 30,36 ----
-   * function to initialize global lookup filters.
-   */
-  void _nss_ldap_init_filters ();
-! void _nss_ldap_init_attributes (const char ***attrtab, int ldc_getgrent_skipmembers);
-  
-  /**
-   * make filters formerly declared in ldap-*.h globally available.
-diff -c -r nss_ldap-250/nss_ldap.5 nss_ldap-250.1/nss_ldap.5
-*** nss_ldap-250/nss_ldap.5	Wed Apr 26 18:19:00 2006
---- nss_ldap-250.1/nss_ldap.5	Wed Aug 16 17:07:19 2006
-***************
-*** 445,450 ****
---- 445,458 ----
-  to return NSS_STATUS_NOTFOUND if called with a listed users as
-  its argument.
-  .TP
-+ .B nss_getgrent_skipmembers <yes|no>
-+ Specifies whether or not to populate the members list in
-+ the group structure for group lookups. If very large groups
-+ are present, enabling this option will greatly increase
-+ perforance, at the cost of some lost functionality. You should
-+ verify no local applications rely on this information before
-+ enabling this on a production system.
-+ .TP
-  .B nss_srv_domain <domain>
-  This option determines the DNS domain used for performing SRV
-  lookups.
-diff -c -r nss_ldap-250/util.c nss_ldap-250.1/util.c
-*** nss_ldap-250/util.c	Wed Apr 26 18:19:00 2006
---- nss_ldap-250.1/util.c	Wed Aug 16 16:52:55 2006
-***************
-*** 660,665 ****
---- 660,666 ----
-    result->ldc_reconnect_maxsleeptime = LDAP_NSS_MAXSLEEPTIME;
-    result->ldc_reconnect_maxconntries = LDAP_NSS_MAXCONNTRIES;
-    result->ldc_initgroups_ignoreusers = NULL;
-+   result->ldc_getgrent_skipmembers = 0;
-  
-    for (i = 0; i <= LM_NONE; i++)
-      {
-***************
-*** 1137,1142 ****
---- 1138,1156 ----
-  	      break;
-  	    }
-  	}
-+       else if (!strcasecmp (k, NSS_LDAP_KEY_GETGRENT_SKIPMEMBERS))
-+ 	{
-+ 	  if (!strcasecmp (v, "on") || !strcasecmp (v, "yes")
-+ 	      || !strcasecmp (v, "true"))
-+ 	    {
-+ 	      result->ldc_getgrent_skipmembers = 1;
-+ 	    }
-+ 	  else if (!strcasecmp (v, "off") || !strcasecmp (v, "no")
-+ 		   || !strcasecmp (v, "false"))
-+ 	    {
-+ 	      result->ldc_getgrent_skipmembers = 0;
-+ 	    }
-+ 	}
-        else if (!strcasecmp (k, NSS_LDAP_KEY_CONNECT_POLICY))
-          {
-  	  if (!strcasecmp (v, "oneshot"))
-diff -c -r nss_ldap-250/util.h nss_ldap-250.1/util.h
-*** nss_ldap-250/util.h	Wed Apr 26 18:19:00 2006
---- nss_ldap-250.1/util.h	Wed Aug 16 16:49:52 2006
-***************
-*** 83,88 ****
---- 83,89 ----
-  #define NSS_LDAP_KEY_PAGESIZE		"pagesize"
-  #define NSS_LDAP_KEY_INITGROUPS		"nss_initgroups"
-  #define NSS_LDAP_KEY_INITGROUPS_IGNOREUSERS	"nss_initgroups_ignoreusers"
-+ #define NSS_LDAP_KEY_GETGRENT_SKIPMEMBERS	"nss_getgrent_skipmembers"
-  
-  /* more reconnect policy fine-tuning */
-  #define NSS_LDAP_KEY_RECONNECT_TRIES		"nss_reconnect_tries"
diff --git a/sys-auth/nss_ldap/nss_ldap-258.ebuild b/sys-auth/nss_ldap/nss_ldap-258.ebuild
deleted file mode 100644
index 18dbf9fd7de4..000000000000
--- a/sys-auth/nss_ldap/nss_ldap-258.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit fixheadtails eutils multilib autotools
-
-IUSE="debug sasl kerberos"
-
-DESCRIPTION="NSS LDAP Module"
-HOMEPAGE="http://www.padl.com/OSS/nss_ldap.html"
-SRC_URI="http://www.padl.com/download/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="alpha amd64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
-
-DEPEND=">=net-nds/openldap-2.1.30-r5
-		sasl? ( dev-libs/cyrus-sasl )
-		kerberos? ( virtual/krb5 )"
-RDEPEND="${DEPEND}
-		!<net-fs/autofs-4.1.3"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/nsswitch.ldap.diff
-	# Applied by upstream
-	#epatch "${FILESDIR}"/${PN}-239-tls-security-bug.patch
-	epatch "${FILESDIR}"/${PN}-249-sasl-compile.patch
-	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-252-reconnect-timeouts.patch
-	# Applied by upstream
-	#EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-254-nss_getgrent_skipmembers.patch
-	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-257-nss_max_group_depth.patch
-	sed -i.orig \
-		-e '/^ @(#)\$Id: ldap.conf,v/s,^,#,' \
-		"${S}"/ldap.conf || die "failed to clean up initial version marker"
-	# fix head/tail stuff
-	ht_fix_file "${S}"/Makefile.am "${S}"/Makefile.in "${S}"/depcomp
-	# fix build borkage
-	for i in Makefile.{in,am}; do
-	  sed -i.orig \
-	    -e '/^install-exec-local: nss_ldap.so/s,nss_ldap.so,,g' \
-	    "${S}"/$i
-	done
-	epatch "${FILESDIR}"/${PN}-257.2-gssapi-headers.patch
-	eautoreconf
-}
-
-src_compile() {
-	local myconf=""
-	use debug && myconf="${myconf} --enable-debugging"
-	use kerberos && myconf="${myconf} --enable-configurable-krb5-ccname-gssapi"
-	econf \
-		--with-ldap-lib=openldap \
-		--libdir=/$(get_libdir) \
-		--enable-schema-mapping \
-		--enable-paged-results \
-		--enable-rfc2307bis \
-		${myconf} || die "configure failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	dodir /$(get_libdir)
-
-	emake -j1 DESTDIR="${D}" install || die "make install failed"
-
-	insinto /etc
-	doins ldap.conf
-
-	dodoc ldap.conf ANNOUNCE NEWS ChangeLog AUTHORS \
-		CVSVersionInfo.txt README nsswitch.ldap certutil
-	docinto docs; dodoc doc/*
-}
-
-pkg_postinst() {
-	elog "If you use a ldaps:// string in the 'uri' setting of"
-	elog "your /etc/ldap.conf, you must set 'ssl on'!"
-}
diff --git a/sys-auth/nss_ldap/nss_ldap-259.ebuild b/sys-auth/nss_ldap/nss_ldap-259.ebuild
deleted file mode 100644
index 477b68d53787..000000000000
--- a/sys-auth/nss_ldap/nss_ldap-259.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit fixheadtails eutils multilib autotools
-
-IUSE="debug sasl kerberos"
-
-DESCRIPTION="NSS LDAP Module"
-HOMEPAGE="http://www.padl.com/OSS/nss_ldap.html"
-SRC_URI="http://www.padl.com/download/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND=">=net-nds/openldap-2.1.30-r5
-		sasl? ( dev-libs/cyrus-sasl )
-		kerberos? ( virtual/krb5 )"
-RDEPEND="${DEPEND}
-		!<net-fs/autofs-4.1.3"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/nsswitch.ldap.diff
-	# Applied by upstream
-	#epatch "${FILESDIR}"/${PN}-239-tls-security-bug.patch
-	epatch "${FILESDIR}"/${PN}-249-sasl-compile.patch
-	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-252-reconnect-timeouts.patch
-	# Applied by upstream
-	#EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-254-nss_getgrent_skipmembers.patch
-	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-257-nss_max_group_depth.patch
-	sed -i.orig \
-		-e '/^ @(#)\$Id: ldap.conf,v/s,^,#,' \
-		"${S}"/ldap.conf || die "failed to clean up initial version marker"
-	# fix head/tail stuff
-	ht_fix_file "${S}"/Makefile.am "${S}"/Makefile.in "${S}"/depcomp
-	# fix build borkage
-	for i in Makefile.{in,am}; do
-	  sed -i.orig \
-	    -e '/^install-exec-local: nss_ldap.so/s,nss_ldap.so,,g' \
-	    "${S}"/$i
-	done
-	epatch "${FILESDIR}"/${PN}-257.2-gssapi-headers.patch
-	eautoreconf
-}
-
-src_compile() {
-	local myconf=""
-	use debug && myconf="${myconf} --enable-debugging"
-	use kerberos && myconf="${myconf} --enable-configurable-krb5-ccname-gssapi"
-	econf \
-		--with-ldap-lib=openldap \
-		--libdir=/$(get_libdir) \
-		--enable-schema-mapping \
-		--enable-paged-results \
-		--enable-rfc2307bis \
-		${myconf} || die "configure failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	dodir /$(get_libdir)
-
-	emake -j1 DESTDIR="${D}" install || die "make install failed"
-
-	insinto /etc
-	doins ldap.conf
-
-	dodoc ldap.conf ANNOUNCE NEWS ChangeLog AUTHORS \
-		CVSVersionInfo.txt README nsswitch.ldap certutil
-	docinto docs; dodoc doc/*
-}
-
-pkg_postinst() {
-	elog "If you use a ldaps:// string in the 'uri' setting of"
-	elog "your /etc/ldap.conf, you must set 'ssl on'!"
-}
diff --git a/sys-auth/nss_ldap/nss_ldap-261.ebuild b/sys-auth/nss_ldap/nss_ldap-261.ebuild
deleted file mode 100644
index e69f1f77726f..000000000000
--- a/sys-auth/nss_ldap/nss_ldap-261.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit fixheadtails eutils multilib autotools
-
-IUSE="debug sasl kerberos"
-
-DESCRIPTION="NSS LDAP Module"
-HOMEPAGE="http://www.padl.com/OSS/nss_ldap.html"
-SRC_URI="http://www.padl.com/download/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND=">=net-nds/openldap-2.1.30-r5
-		sasl? ( dev-libs/cyrus-sasl )
-		kerberos? ( virtual/krb5 )"
-RDEPEND="${DEPEND}
-		!<net-fs/autofs-4.1.3"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/nsswitch.ldap.diff
-	# Applied by upstream
-	#epatch "${FILESDIR}"/${PN}-239-tls-security-bug.patch
-	epatch "${FILESDIR}"/${PN}-249-sasl-compile.patch
-	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-252-reconnect-timeouts.patch
-	# Applied by upstream
-	#EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-254-nss_getgrent_skipmembers.patch
-	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-257-nss_max_group_depth.patch
-	sed -i.orig \
-		-e '/^ @(#)\$Id: ldap.conf,v/s,^,#,' \
-		"${S}"/ldap.conf || die "failed to clean up initial version marker"
-	# fix head/tail stuff
-	ht_fix_file "${S}"/Makefile.am "${S}"/Makefile.in "${S}"/depcomp
-	# fix build borkage
-	for i in Makefile.{in,am}; do
-	  sed -i.orig \
-	    -e '/^install-exec-local: nss_ldap.so/s,nss_ldap.so,,g' \
-	    "${S}"/$i
-	done
-	# Upstream forgets the version number sometimes
-	epatch "${FILESDIR}"/${PN}-257.2-gssapi-headers.patch
-	sed -i \
-		-e "/^AM_INIT_AUTOMAKE/s~2..~$PV~" \
-		"${S}"/configure.in
-	eautoreconf
-}
-
-src_compile() {
-	local myconf=""
-	use debug && myconf="${myconf} --enable-debugging"
-	use kerberos && myconf="${myconf} --enable-configurable-krb5-ccname-gssapi"
-	econf \
-		--with-ldap-lib=openldap \
-		--libdir=/$(get_libdir) \
-		--enable-schema-mapping \
-		--enable-paged-results \
-		--enable-rfc2307bis \
-		${myconf} || die "configure failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	dodir /$(get_libdir)
-
-	emake -j1 DESTDIR="${D}" install || die "make install failed"
-
-	insinto /etc
-	doins ldap.conf
-
-	dodoc ldap.conf ANNOUNCE NEWS ChangeLog AUTHORS \
-		CVSVersionInfo.txt README nsswitch.ldap certutil
-	docinto docs; dodoc doc/*
-}
-
-pkg_postinst() {
-	elog "If you use a ldaps:// string in the 'uri' setting of"
-	elog "your /etc/ldap.conf, you must set 'ssl on'!"
-}
diff --git a/sys-auth/nss_ldap/nss_ldap-262.ebuild b/sys-auth/nss_ldap/nss_ldap-262.ebuild
deleted file mode 100644
index e69f1f77726f..000000000000
--- a/sys-auth/nss_ldap/nss_ldap-262.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit fixheadtails eutils multilib autotools
-
-IUSE="debug sasl kerberos"
-
-DESCRIPTION="NSS LDAP Module"
-HOMEPAGE="http://www.padl.com/OSS/nss_ldap.html"
-SRC_URI="http://www.padl.com/download/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND=">=net-nds/openldap-2.1.30-r5
-		sasl? ( dev-libs/cyrus-sasl )
-		kerberos? ( virtual/krb5 )"
-RDEPEND="${DEPEND}
-		!<net-fs/autofs-4.1.3"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/nsswitch.ldap.diff
-	# Applied by upstream
-	#epatch "${FILESDIR}"/${PN}-239-tls-security-bug.patch
-	epatch "${FILESDIR}"/${PN}-249-sasl-compile.patch
-	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-252-reconnect-timeouts.patch
-	# Applied by upstream
-	#EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-254-nss_getgrent_skipmembers.patch
-	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-257-nss_max_group_depth.patch
-	sed -i.orig \
-		-e '/^ @(#)\$Id: ldap.conf,v/s,^,#,' \
-		"${S}"/ldap.conf || die "failed to clean up initial version marker"
-	# fix head/tail stuff
-	ht_fix_file "${S}"/Makefile.am "${S}"/Makefile.in "${S}"/depcomp
-	# fix build borkage
-	for i in Makefile.{in,am}; do
-	  sed -i.orig \
-	    -e '/^install-exec-local: nss_ldap.so/s,nss_ldap.so,,g' \
-	    "${S}"/$i
-	done
-	# Upstream forgets the version number sometimes
-	epatch "${FILESDIR}"/${PN}-257.2-gssapi-headers.patch
-	sed -i \
-		-e "/^AM_INIT_AUTOMAKE/s~2..~$PV~" \
-		"${S}"/configure.in
-	eautoreconf
-}
-
-src_compile() {
-	local myconf=""
-	use debug && myconf="${myconf} --enable-debugging"
-	use kerberos && myconf="${myconf} --enable-configurable-krb5-ccname-gssapi"
-	econf \
-		--with-ldap-lib=openldap \
-		--libdir=/$(get_libdir) \
-		--enable-schema-mapping \
-		--enable-paged-results \
-		--enable-rfc2307bis \
-		${myconf} || die "configure failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	dodir /$(get_libdir)
-
-	emake -j1 DESTDIR="${D}" install || die "make install failed"
-
-	insinto /etc
-	doins ldap.conf
-
-	dodoc ldap.conf ANNOUNCE NEWS ChangeLog AUTHORS \
-		CVSVersionInfo.txt README nsswitch.ldap certutil
-	docinto docs; dodoc doc/*
-}
-
-pkg_postinst() {
-	elog "If you use a ldaps:// string in the 'uri' setting of"
-	elog "your /etc/ldap.conf, you must set 'ssl on'!"
-}
diff --git a/sys-auth/nss_ldap/nss_ldap-264-r1.ebuild b/sys-auth/nss_ldap/nss_ldap-264-r1.ebuild
deleted file mode 100644
index 673937695e22..000000000000
--- a/sys-auth/nss_ldap/nss_ldap-264-r1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit fixheadtails eutils multilib autotools
-
-IUSE="debug ssl sasl kerberos"
-
-DESCRIPTION="NSS LDAP Module"
-HOMEPAGE="http://www.padl.com/OSS/nss_ldap.html"
-SRC_URI="http://www.padl.com/download/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
-
-DEPEND=">=net-nds/openldap-2.1.30-r5
-		sasl? ( dev-libs/cyrus-sasl )
-		kerberos? ( virtual/krb5 )
-		ssl? ( dev-libs/openssl )"
-RDEPEND="${DEPEND}
-		!<net-fs/autofs-4.1.3"
-
-src_prepare() {
-	epatch "${FILESDIR}"/nsswitch.ldap.diff
-
-	# Applied by upstream
-	#epatch "${FILESDIR}"/${PN}-239-tls-security-bug.patch
-
-	epatch "${FILESDIR}"/${PN}-249-sasl-compile.patch
-
-	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-252-reconnect-timeouts.patch
-
-	# Applied by upstream
-	#EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-254-nss_getgrent_skipmembers.patch
-
-	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-257-nss_max_group_depth.patch
-
-	sed -i.orig \
-		-e '/^ @(#)\$Id: ldap.conf,v/s,^,#,' \
-		"${S}"/ldap.conf || die "failed to clean up initial version marker"
-
-	# fix head/tail stuff
-	ht_fix_file "${S}"/Makefile.am "${S}"/Makefile.in "${S}"/depcomp
-
-	# fix build borkage
-	for i in Makefile.{in,am}; do
-	  sed -i.orig \
-	    -e '/^install-exec-local: nss_ldap.so/s,nss_ldap.so,,g' \
-	    "${S}"/$i
-	done
-
-	epatch "${FILESDIR}"/${PN}-257.2-gssapi-headers.patch
-
-	# Bug #214750, no automagic deps
-	epatch "${FILESDIR}"/${PN}-264-disable-automagic.patch
-
-	# Upstream forgets the version number sometimes
-	#sed -i \
-	#	-e "/^AM_INIT_AUTOMAKE/s~2..~$PV~" \
-	#	"${S}"/configure.in
-
-	# Include an SONAME
-	epatch "${FILESDIR}"/${PN}-254-soname.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=""
-	use debug && myconf="${myconf} --enable-debugging"
-	use kerberos && myconf="${myconf} --enable-configurable-krb5-ccname-gssapi"
-	# --enable-schema-mapping \
-	econf \
-		--with-ldap-lib=openldap \
-		--libdir=/$(get_libdir) \
-		--enable-paged-results \
-		--enable-rfc2307bis \
-		$(use_enable ssl) \
-		$(use_enable sasl) \
-		$(use_enable kerberos krb) \
-		${myconf} || die "configure failed"
-}
-
-src_install() {
-	dodir /$(get_libdir)
-
-	emake -j1 DESTDIR="${D}" install || die "make install failed"
-
-	insinto /etc
-	doins ldap.conf
-
-	dodoc ldap.conf ANNOUNCE NEWS ChangeLog AUTHORS \
-		CVSVersionInfo.txt README nsswitch.ldap certutil
-	docinto docs; dodoc doc/*
-}
-
-pkg_postinst() {
-	elog "If you use a ldaps:// string in the 'uri' setting of"
-	elog "your /etc/ldap.conf, you must set 'ssl on'!"
-}
diff --git a/sys-auth/nss_ldap/nss_ldap-264.ebuild b/sys-auth/nss_ldap/nss_ldap-264.ebuild
deleted file mode 100644
index 6f18e950d284..000000000000
--- a/sys-auth/nss_ldap/nss_ldap-264.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit fixheadtails eutils multilib autotools
-
-IUSE="debug ssl sasl kerberos"
-
-DESCRIPTION="NSS LDAP Module"
-HOMEPAGE="http://www.padl.com/OSS/nss_ldap.html"
-SRC_URI="http://www.padl.com/download/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND=">=net-nds/openldap-2.1.30-r5
-		sasl? ( dev-libs/cyrus-sasl )
-		kerberos? ( virtual/krb5 )
-		ssl? ( dev-libs/openssl )"
-RDEPEND="${DEPEND}
-		!<net-fs/autofs-4.1.3"
-
-src_prepare() {
-	epatch "${FILESDIR}"/nsswitch.ldap.diff
-
-	# Applied by upstream
-	#epatch "${FILESDIR}"/${PN}-239-tls-security-bug.patch
-
-	epatch "${FILESDIR}"/${PN}-249-sasl-compile.patch
-
-	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-252-reconnect-timeouts.patch
-
-	# Applied by upstream
-	#EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-254-nss_getgrent_skipmembers.patch
-
-	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-257-nss_max_group_depth.patch
-
-	sed -i.orig \
-		-e '/^ @(#)\$Id: ldap.conf,v/s,^,#,' \
-		"${S}"/ldap.conf || die "failed to clean up initial version marker"
-
-	# fix head/tail stuff
-	ht_fix_file "${S}"/Makefile.am "${S}"/Makefile.in "${S}"/depcomp
-
-	# fix build borkage
-	for i in Makefile.{in,am}; do
-	  sed -i.orig \
-	    -e '/^install-exec-local: nss_ldap.so/s,nss_ldap.so,,g' \
-	    "${S}"/$i
-	done
-
-	epatch "${FILESDIR}"/${PN}-257.2-gssapi-headers.patch
-
-	# Bug #214750, no automagic deps
-	epatch "${FILESDIR}"/${PN}-264-disable-automagic.patch
-
-	# Upstream forgets the version number sometimes
-	#sed -i \
-	#	-e "/^AM_INIT_AUTOMAKE/s~2..~$PV~" \
-	#	"${S}"/configure.in
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=""
-	use debug && myconf="${myconf} --enable-debugging"
-	use kerberos && myconf="${myconf} --enable-configurable-krb5-ccname-gssapi"
-	# --enable-schema-mapping \
-	econf \
-		--with-ldap-lib=openldap \
-		--libdir=/$(get_libdir) \
-		--enable-paged-results \
-		--enable-rfc2307bis \
-		$(use_enable ssl) \
-		$(use_enable sasl) \
-		$(use_enable kerberos krb) \
-		${myconf} || die "configure failed"
-}
-
-src_install() {
-	dodir /$(get_libdir)
-
-	emake -j1 DESTDIR="${D}" install || die "make install failed"
-
-	insinto /etc
-	doins ldap.conf
-
-	dodoc ldap.conf ANNOUNCE NEWS ChangeLog AUTHORS \
-		CVSVersionInfo.txt README nsswitch.ldap certutil
-	docinto docs; dodoc doc/*
-}
-
-pkg_postinst() {
-	elog "If you use a ldaps:// string in the 'uri' setting of"
-	elog "your /etc/ldap.conf, you must set 'ssl on'!"
-}
diff --git a/sys-auth/nss_ldap/nss_ldap-265-r1.ebuild b/sys-auth/nss_ldap/nss_ldap-265-r1.ebuild
deleted file mode 100644
index dd2baf6e1bff..000000000000
--- a/sys-auth/nss_ldap/nss_ldap-265-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit fixheadtails eutils multilib autotools
-
-IUSE="debug ssl sasl kerberos"
-
-DESCRIPTION="NSS LDAP Module"
-HOMEPAGE="http://www.padl.com/OSS/nss_ldap.html"
-SRC_URI="http://www.padl.com/download/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86"
-
-DEPEND=">=net-nds/openldap-2.1.30-r5
-		sasl? ( dev-libs/cyrus-sasl )
-		kerberos? ( virtual/krb5 )
-		ssl? ( dev-libs/openssl )"
-RDEPEND="${DEPEND}
-		!<net-fs/autofs-4.1.3"
-
-src_prepare() {
-	epatch "${FILESDIR}"/nsswitch.ldap.diff
-
-	# Applied by upstream
-	#epatch "${FILESDIR}"/${PN}-239-tls-security-bug.patch
-
-	epatch "${FILESDIR}"/${PN}-249-sasl-compile.patch
-
-	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-265-reconnect-timeouts.patch
-
-	# Applied by upstream
-	#EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-254-nss_getgrent_skipmembers.patch
-
-	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-257-nss_max_group_depth.patch
-
-	sed -i.orig \
-		-e '/^ @(#)\$Id: ldap.conf,v/s,^,#,' \
-		"${S}"/ldap.conf || die "failed to clean up initial version marker"
-
-	# fix head/tail stuff
-	ht_fix_file "${S}"/Makefile.am "${S}"/Makefile.in "${S}"/depcomp
-
-	# fix build borkage
-	for i in Makefile.{in,am}; do
-	  sed -i.orig \
-	    -e '/^install-exec-local: nss_ldap.so/s,nss_ldap.so,,g' \
-	    "${S}"/$i
-	done
-
-	epatch "${FILESDIR}"/${PN}-257.2-gssapi-headers.patch
-
-	# Bug #214750, no automagic deps
-	epatch "${FILESDIR}"/${PN}-264-disable-automagic.patch
-
-	# Upstream forgets the version number sometimes
-	#sed -i \
-	#	-e "/^AM_INIT_AUTOMAKE/s~2..~$PV~" \
-	#	"${S}"/configure.in
-
-	# Include an SONAME
-	epatch "${FILESDIR}"/${PN}-254-soname.patch
-
-	sed -i \
-		-e 's, vers_string , ./vers_string ,g' \
-		"${S}"/Makefile.am
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=""
-	use debug && myconf="${myconf} --enable-debugging"
-	use kerberos && myconf="${myconf} --enable-configurable-krb5-ccname-gssapi"
-	# --enable-schema-mapping \
-	econf \
-		--with-ldap-lib=openldap \
-		--libdir=/$(get_libdir) \
-		--enable-paged-results \
-		--enable-rfc2307bis \
-		$(use_enable ssl) \
-		$(use_enable sasl) \
-		$(use_enable kerberos krb) \
-		${myconf} || die "configure failed"
-}
-
-src_install() {
-	dodir /$(get_libdir)
-
-	emake -j1 DESTDIR="${D}" install || die "make install failed"
-
-	insinto /etc
-	doins ldap.conf
-
-	# Append two blank lines and some skip entries
-	echo >>"${D}"/etc/ldap.conf
-	echo >>"${D}"/etc/ldap.conf
-	sed -i "${D}"/etc/ldap.conf \
-		-e '$inss_initgroups_ignoreusers ldap,openldap,mysql,syslog,root,postgres' \
-		|| die "failed to sed /etc/ldap.conf"
-
-	dodoc ldap.conf ANNOUNCE NEWS ChangeLog AUTHORS \
-		CVSVersionInfo.txt README nsswitch.ldap certutil
-	docinto docs; dodoc doc/*
-
-}
-
-pkg_postinst() {
-	elog "If you use a ldaps:// string in the 'uri' setting of"
-	elog "your /etc/ldap.conf, you must set 'ssl on'!"
-}
diff --git a/sys-auth/nss_ldap/nss_ldap-265-r2.ebuild b/sys-auth/nss_ldap/nss_ldap-265-r2.ebuild
deleted file mode 100644
index a44456c8aac5..000000000000
--- a/sys-auth/nss_ldap/nss_ldap-265-r2.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit fixheadtails eutils multilib autotools prefix
-
-IUSE="debug ssl sasl kerberos"
-
-DESCRIPTION="NSS LDAP Module"
-HOMEPAGE="http://www.padl.com/OSS/nss_ldap.html"
-SRC_URI="http://www.padl.com/download/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux"
-
-DEPEND=">=net-nds/openldap-2.1.30-r5
-		sasl? ( dev-libs/cyrus-sasl )
-		kerberos? ( virtual/krb5 )
-		ssl? ( dev-libs/openssl:0 )"
-RDEPEND="${DEPEND}
-		!<net-fs/autofs-4.1.3"
-
-src_prepare() {
-	if use prefix; then
-		epatch "${FILESDIR}"/${P}-installdir.patch
-		eprefixify Makefile.am
-	fi
-
-	# bug 438692
-	epatch "${FILESDIR}"/${P}-pthread.patch
-
-	epatch "${FILESDIR}"/nsswitch.ldap.diff
-
-	# Applied by upstream
-	#epatch "${FILESDIR}"/${PN}-239-tls-security-bug.patch
-
-	epatch "${FILESDIR}"/${PN}-249-sasl-compile.patch
-
-	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-265-reconnect-timeouts.patch
-
-	# Applied by upstream
-	#EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-254-nss_getgrent_skipmembers.patch
-
-	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-257-nss_max_group_depth.patch
-
-	sed -i.orig \
-		-e '/^ @(#)\$Id: ldap.conf,v/s,^,#,' \
-		"${S}"/ldap.conf
-
-	# fix head/tail stuff
-	ht_fix_file "${S}"/Makefile.am "${S}"/Makefile.in "${S}"/depcomp
-
-	# fix build borkage
-	for i in Makefile.{in,am}; do
-	  sed -i.orig \
-	    -e '/^install-exec-local: nss_ldap.so/s,nss_ldap.so,,g' \
-	    "${S}"/$i
-	done
-
-	epatch "${FILESDIR}"/${PN}-257.2-gssapi-headers.patch
-
-	# Bug #214750, no automagic deps
-	epatch "${FILESDIR}"/${PN}-264-disable-automagic.patch
-
-	# Upstream forgets the version number sometimes
-	#sed -i \
-	#	-e "/^AM_INIT_AUTOMAKE/s~2..~$PV~" \
-	#	"${S}"/configure.in
-
-	# Include an SONAME
-	epatch "${FILESDIR}"/${PN}-254-soname.patch
-
-	sed -i \
-		-e 's, vers_string , ./vers_string ,g' \
-		"${S}"/Makefile.am
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=""
-	use debug && myconf="${myconf} --enable-debugging"
-	use kerberos && myconf="${myconf} --enable-configurable-krb5-ccname-gssapi"
-	# --enable-schema-mapping \
-	econf \
-		--with-ldap-lib=openldap \
-		--libdir="${EPREFIX}/$(get_libdir)" \
-		--with-ldap-conf-file="${EPREFIX}/etc/ldap.conf" \
-		--enable-paged-results \
-		--enable-rfc2307bis \
-		$(use_enable ssl) \
-		$(use_enable sasl) \
-		$(use_enable kerberos krb) \
-		${myconf}
-}
-
-src_install() {
-	dodir /$(get_libdir)
-
-	emake -j1 DESTDIR="${D}" install \
-		INST_UID=${PORTAGE_USER:-root} INST_GID=${PORTAGE_GROUP:-root}
-
-	insinto /etc
-	doins ldap.conf
-
-	# Append two blank lines and some skip entries
-	echo >>"${ED}"/etc/ldap.conf
-	echo >>"${ED}"/etc/ldap.conf
-	sed -i "${ED}"/etc/ldap.conf \
-		-e '$inss_initgroups_ignoreusers ldap,openldap,mysql,syslog,root,postgres'
-
-	dodoc ldap.conf ANNOUNCE NEWS ChangeLog AUTHORS \
-		CVSVersionInfo.txt README nsswitch.ldap certutil
-	docinto docs; dodoc doc/*
-}
-
-pkg_postinst() {
-	elog "If you use a ldaps:// string in the 'uri' setting of"
-	elog "your /etc/ldap.conf, you must set 'ssl on'!"
-}
diff --git a/sys-auth/nss_ldap/nss_ldap-265-r4.ebuild b/sys-auth/nss_ldap/nss_ldap-265-r4.ebuild
deleted file mode 100644
index 598a8cb53f3e..000000000000
--- a/sys-auth/nss_ldap/nss_ldap-265-r4.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit fixheadtails eutils multilib autotools prefix
-
-IUSE="debug ssl sasl kerberos"
-
-DESCRIPTION="NSS LDAP Module"
-HOMEPAGE="http://www.padl.com/OSS/nss_ldap.html"
-SRC_URI="http://www.padl.com/download/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
-
-DEPEND=">=net-nds/openldap-2.1.30-r5
-		sasl? ( dev-libs/cyrus-sasl )
-		kerberos? ( virtual/krb5 )
-		ssl? ( dev-libs/openssl:0 )"
-RDEPEND="${DEPEND}
-		!<net-fs/autofs-4.1.3"
-
-src_prepare() {
-	if use prefix; then
-		epatch "${FILESDIR}"/${P}-installdir.patch
-		eprefixify Makefile.am
-	fi
-
-	# bug 438692
-	epatch "${FILESDIR}"/${P}-pthread.patch
-
-	epatch "${FILESDIR}"/nsswitch.ldap.diff
-
-	# Applied by upstream
-	#epatch "${FILESDIR}"/${PN}-239-tls-security-bug.patch
-
-	epatch "${FILESDIR}"/${PN}-249-sasl-compile.patch
-
-	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-265-reconnect-timeouts.patch
-
-	# Applied by upstream
-	#EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-254-nss_getgrent_skipmembers.patch
-
-	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-257-nss_max_group_depth.patch
-
-	sed -i.orig \
-		-e '/^ @(#)\$Id: ldap.conf,v/s,^,#,' \
-		"${S}"/ldap.conf
-
-	# fix head/tail stuff
-	ht_fix_file "${S}"/Makefile.am "${S}"/Makefile.in "${S}"/depcomp
-
-	# fix build borkage
-	for i in Makefile.{in,am}; do
-	  sed -i.orig \
-	    -e '/^install-exec-local: nss_ldap.so/s,nss_ldap.so,,g' \
-	    "${S}"/$i
-	done
-
-	epatch "${FILESDIR}"/${PN}-257.2-gssapi-headers.patch
-
-	# Bug #214750, no automagic deps
-	epatch "${FILESDIR}"/${PN}-264-disable-automagic.patch
-
-	# Upstream forgets the version number sometimes
-	#sed -i \
-	#	-e "/^AM_INIT_AUTOMAKE/s~2..~$PV~" \
-	#	"${S}"/configure.in
-
-	# Include an SONAME
-	epatch "${FILESDIR}"/${PN}-254-soname.patch
-
-	#fix broken oneshot connections
-	epatch "${FILESDIR}/nss_ldap-265-missing-entries-oneshot.patch"
-
-	sed -i \
-		-e 's, vers_string , ./vers_string ,g' \
-		"${S}"/Makefile.am
-
-	if use kernel_FreeBSD; then
-		#fix broken fbsd support
-		EPATCH_OPTS="-p0 -d ${S}" epatch "${FILESDIR}/nss_ldap-265-fbsd.patch"
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=""
-	use debug && myconf="${myconf} --enable-debugging"
-	use kerberos && myconf="${myconf} --enable-configurable-krb5-ccname-gssapi"
-	# --enable-schema-mapping \
-	econf \
-		--with-ldap-lib=openldap \
-		--libdir="${EPREFIX}/$(get_libdir)" \
-		--with-ldap-conf-file="${EPREFIX}/etc/ldap.conf" \
-		--enable-paged-results \
-		--enable-rfc2307bis \
-		$(use_enable ssl) \
-		$(use_enable sasl) \
-		$(use_enable kerberos krb) \
-		${myconf}
-
-	if use kernel_FreeBSD; then
-		# configure.in does not properly handle include dependencies
-		echo "#define HAVE_NETINET_IF_ETHER_H 1" >> ${S}/config.h
-		echo "#define HAVE_NET_ROUTE_H 1" >> ${S}/config.h
-		echo "#define HAVE_RESOLV_H 1" >> ${S}/config.h
-	fi
-}
-
-src_install() {
-	dodir /$(get_libdir)
-
-	if use kernel_FreeBSD; then
-		emake -j1 DESTDIR="${D}" install || die "make install failed"
-	else
-		emake -j1 DESTDIR="${D}" install \
-			INST_UID=${PORTAGE_USER:-root} INST_GID=${PORTAGE_GROUP:-root}
-	fi
-
-	insinto /etc
-	doins ldap.conf
-
-	# Append two blank lines and some skip entries
-	echo >>"${ED}"/etc/ldap.conf
-	echo >>"${ED}"/etc/ldap.conf
-	sed -i "${ED}"/etc/ldap.conf \
-		-e '$inss_initgroups_ignoreusers ldap,openldap,mysql,syslog,root,postgres'
-
-	dodoc ldap.conf ANNOUNCE NEWS ChangeLog AUTHORS \
-		CVSVersionInfo.txt README nsswitch.ldap certutil
-	docinto docs; dodoc doc/*
-}
-
-pkg_postinst() {
-	elog "If you use a ldaps:// string in the 'uri' setting of"
-	elog "your /etc/ldap.conf, you must set 'ssl on'!"
-}
diff --git a/sys-auth/nss_ldap/nss_ldap-265.ebuild b/sys-auth/nss_ldap/nss_ldap-265.ebuild
deleted file mode 100644
index 5321586830a4..000000000000
--- a/sys-auth/nss_ldap/nss_ldap-265.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit fixheadtails eutils multilib autotools
-
-IUSE="debug ssl sasl kerberos"
-
-DESCRIPTION="NSS LDAP Module"
-HOMEPAGE="http://www.padl.com/OSS/nss_ldap.html"
-SRC_URI="http://www.padl.com/download/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND=">=net-nds/openldap-2.1.30-r5
-		sasl? ( dev-libs/cyrus-sasl )
-		kerberos? ( virtual/krb5 )
-		ssl? ( dev-libs/openssl )"
-RDEPEND="${DEPEND}
-		!<net-fs/autofs-4.1.3"
-
-src_prepare() {
-	epatch "${FILESDIR}"/nsswitch.ldap.diff
-
-	# Applied by upstream
-	#epatch "${FILESDIR}"/${PN}-239-tls-security-bug.patch
-
-	epatch "${FILESDIR}"/${PN}-249-sasl-compile.patch
-
-	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-265-reconnect-timeouts.patch
-
-	# Applied by upstream
-	#EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-254-nss_getgrent_skipmembers.patch
-
-	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-257-nss_max_group_depth.patch
-
-	sed -i.orig \
-		-e '/^ @(#)\$Id: ldap.conf,v/s,^,#,' \
-		"${S}"/ldap.conf || die "failed to clean up initial version marker"
-
-	# fix head/tail stuff
-	ht_fix_file "${S}"/Makefile.am "${S}"/Makefile.in "${S}"/depcomp
-
-	# fix build borkage
-	for i in Makefile.{in,am}; do
-	  sed -i.orig \
-	    -e '/^install-exec-local: nss_ldap.so/s,nss_ldap.so,,g' \
-	    "${S}"/$i
-	done
-
-	epatch "${FILESDIR}"/${PN}-257.2-gssapi-headers.patch
-
-	# Bug #214750, no automagic deps
-	epatch "${FILESDIR}"/${PN}-264-disable-automagic.patch
-
-	# Upstream forgets the version number sometimes
-	#sed -i \
-	#	-e "/^AM_INIT_AUTOMAKE/s~2..~$PV~" \
-	#	"${S}"/configure.in
-
-	# Include an SONAME
-	epatch "${FILESDIR}"/${PN}-254-soname.patch
-
-	sed -i \
-		-e 's, vers_string , ./vers_string ,g' \
-		"${S}"/Makefile.am
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=""
-	use debug && myconf="${myconf} --enable-debugging"
-	use kerberos && myconf="${myconf} --enable-configurable-krb5-ccname-gssapi"
-	# --enable-schema-mapping \
-	econf \
-		--with-ldap-lib=openldap \
-		--libdir=/$(get_libdir) \
-		--enable-paged-results \
-		--enable-rfc2307bis \
-		$(use_enable ssl) \
-		$(use_enable sasl) \
-		$(use_enable kerberos krb) \
-		${myconf} || die "configure failed"
-}
-
-src_install() {
-	dodir /$(get_libdir)
-
-	emake -j1 DESTDIR="${D}" install || die "make install failed"
-
-	insinto /etc
-	doins ldap.conf
-
-	dodoc ldap.conf ANNOUNCE NEWS ChangeLog AUTHORS \
-		CVSVersionInfo.txt README nsswitch.ldap certutil
-	docinto docs; dodoc doc/*
-}
-
-pkg_postinst() {
-	elog "If you use a ldaps:// string in the 'uri' setting of"
-	elog "your /etc/ldap.conf, you must set 'ssl on'!"
-}
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 569d98326a90..d4146832743b 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/charm/Manifest b/sys-cluster/charm/Manifest
index 56eb49c46357..afc2bad96aa2 100644
--- a/sys-cluster/charm/Manifest
+++ b/sys-cluster/charm/Manifest
@@ -15,5 +15,5 @@ EBUILD charm-6.5.1-r3.ebuild 5330 BLAKE2B 26314be92b5e5451476bd1611faddb7c194c1d
 EBUILD charm-6.6.0-r1.ebuild 5578 BLAKE2B 843fd7c798641276977c7ff08574d0accc749465d47cb19d798c923327e837e933d2da53f4947c868cce694deddf6ecae6a4737c4609f18aaca6b31b63981a63 SHA512 f049285b990d1627f4bdd2dc5f0bc5ae64bed61769f8a81787a6137ad8ad50ab5c0e80038d77c00a25523085e9ba36f3582217894e3b215b1f031c3a8f081567
 EBUILD charm-6.6.0.ebuild 5572 BLAKE2B 016d5d96033b1fd02a79b85af7ddaa236fc575740b5034d3d4c52de22e4388be4bf1bb101015a1c0257b0b71a4c185e4b4870e255243162dee8045b596ba978c SHA512 6947f911efc5d756537ff8c06754e0f9580f8f4b9e7ee33ea96be3144ad4537da21228ecfd1321f972d97979fcf556e4f3b2646b11de7717006b4491462fafa7
 EBUILD charm-6.6.1.ebuild 5781 BLAKE2B 14d474c34b72731e5c139a3f5be4de882a1f99a0a8043b4220cfa4caa37116e6c1bbeb3ed5c4079a43b328dc4233090b0932db1038039c84d645bafd606c11e1 SHA512 1c278e8e52860772ebbae872d5f172c0e69932baf8555085572d278402782d913ba647f20ef6789d26265f78272d510d5a351047df419299e322f3b0e5217474
-EBUILD charm-6.7.1.ebuild 5598 BLAKE2B 7b0aa34d514acf3868665494d5dccc9f2cf56d5db87c031bc34ab47b6d232d71211ddf97395d2ac8bb5c57a10050858f38017aa11f31fa1cc089d15c783a3bc7 SHA512 b40081a208590bda948ac87350eed55566c6548f273c0b80b16bdf5b68a5ae1fb8a46595960f0cf91c7a5c91083e159564a7cc51db5ed301dac296f77fb58f8b
+EBUILD charm-6.7.1.ebuild 5837 BLAKE2B 763e71d521c95ab06b7225f61cfb63b0f0c5fd9bf71ddec1f4653a6ad63f14dc1f9ea2382c713f0945faf20f435d1b3e07adf2b1f2e3714d0b2f103b9b968604 SHA512 9f51f10e66a46a85959042a3f3f9cf0f336b49a9ccdaf3c3cf0e7f2ca20b127123f1a5da185d79ea5ef2fa2ea0baf1de4ed43d691d3723e87b8b63938270ca7e
 MISC metadata.xml 1012 BLAKE2B ee284d471b4f13534787629319734afacbb998fa7ea115377281648614693fd32b7ff91775eddf292b61f267fbfb9be81397be4f37bf1b4582de8cf06bc9364a SHA512 e8fd7cfac25aa8428adbe77922140eee5621b18afa5f10d1ed0c7b14960affc3a1dc0896b7ea034001855ef3e1c1f12791cada0f959eb210ba78f1be44b89ffc
diff --git a/sys-cluster/charm/charm-6.7.1.ebuild b/sys-cluster/charm/charm-6.7.1.ebuild
index 1f2d2300a744..47af0637e8b4 100644
--- a/sys-cluster/charm/charm-6.7.1.ebuild
+++ b/sys-cluster/charm/charm-6.7.1.ebuild
@@ -30,7 +30,9 @@ DEPEND="
 		')
 		media-libs/netpbm
 		${PYTHON_DEPS}
-	)"
+	)
+	net-libs/libtirpc
+	"
 
 REQUIRED_USE="
 	cmkopt? ( !charmdebug !charmtracing )
@@ -73,20 +75,22 @@ get_opts() {
 }
 
 src_prepare() {
+	append-cppflags $($(tc-getPKG_CONFIG) --cflags libtirpc)
+
 	sed \
-		-e "/CMK_CF77/s:[fg]77:$(usex mpi "mpif90" "$(tc-getF77)"):g" \
-		-e "/CMK_CF90/s:f95:$(usex mpi "mpif90" "$(tc-getFC)"):g" \
+		-e "/CMK_CF77/s:[fg]77:$(usex mpi "mpif90" "$(tc-getF77)") ${FCFLAGS}:g" \
+		-e "/CMK_CF90/s:f95:$(usex mpi "mpif90" "$(tc-getFC)") ${FCFLAGS}:g" \
 		-e "/CMK_CF90/s:\`which f90.*$::g" \
-		-e "/CMK_CXX/s:g++:$(usex mpi "mpic++" "$(tc-getCXX)"):g" \
-		-e "/CMK_CC/s:gcc:$(usex mpi "mpicc" "$(tc-getCC)"):g" \
+		-e "/CMK_CXX/s:g++:$(usex mpi "mpic++" "$(tc-getCXX)") ${CPPFLAGS} ${CXXFLAGS}:g" \
+		-e "/CMK_CC/s:gcc:$(usex mpi "mpicc" "$(tc-getCC)") ${CPPFLAGS} ${CFLAGS}:g" \
 		-e '/CMK_F90_MODINC/s:-p:-I:g' \
 		-e "/CMK_LD/s:\"$: ${LDFLAGS} \":g" \
 		-i src/arch/$(usex mpi "mpi" "net")*-linux*/*sh || die
 	sed \
-		-e "/CMK_CF90/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)"):g" \
-		-e "/F90DIR/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)"):g" \
-		-e "/f95target/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)"):g" \
-		-e "/f95version/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)"):g" \
+		-e "/CMK_CF90/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)") ${FCFLAGS}:g" \
+		-e "/F90DIR/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)") ${FCFLAGS}:g" \
+		-e "/f95target/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)") ${FCFLAGS}:g" \
+		-e "/f95version/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)") ${FCFLAGS}:g" \
 		-i src/arch/common/*.sh || die
 
 	sed \
@@ -97,6 +101,7 @@ src_prepare() {
 		-e "s:-o charmrun:${LDFLAGS} &:g" \
 		-e "s:-o charmd_faceless:${LDFLAGS} &:g" \
 		-e "s:-o charmd:${LDFLAGS} &:g" \
+		-e "/^CHARMC/s:$: ${CPPFLAGS} ${CFLAGS}:g" \
 		-i \
 		src/scripts/Makefile \
 		src/util/charmrun-src/Makefile || die
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 12c42092fb39..d94b91226fd5 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index 09bd7f3c0ce7..6ef9f824416a 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -1,11 +1,12 @@
 AUX 1.6.7-dmcrypt.confd 3919 BLAKE2B 99e81cfe932dda45062966ada065da418500e58499af0f5ed18b7367cb6bc1b3fae1d4a0d4094ebf36c00292a4d4e2606026a65df66d5a96d01a0b9d5f6aa5e5 SHA512 74422d5e1614b43af894ea01da1ea80d805ec7f77981cbb80a6b1a4becad737a8825d7269812499095a7f50d39fa7da5bf4e4edae63529b1fe87b9176943a733
 AUX 1.6.7-dmcrypt.rc 8815 BLAKE2B 9e88475af36f7ab3c7b48672ecf64e885e7be4b1af27c2f41f74fe8640163ac272d44bfbbfeb0befb1af337f88d2711f27003575758d16c5f8104db0fabc2cb9 SHA512 fdbf44f7508ca10ab89e858c206fd9dc397a11d8a553045584ab95046c309a84dd6c7ab0c0ea63c66f7d52b31ed3a1ce46d5ce2ce2588f0d6593a1c4cc1c4194
+AUX cryptsetup-2.0.0-pwquality_static.patch 760 BLAKE2B cdb48b708b936f3b34e2d3f6c200fc3ac8c1ab1ff3c80822c860effc0f597db9f4dae01adb9e516acc14570db7462acd2ca042217bdc8dd693f6bb7dee22b0fd SHA512 327f19ed8cd5a62dc7da3b3e7c58ac030869f2414f702b230014303c0bbc5e44c933f10e42083fb360b1439d673e249cd35cf04d8e096ca063257312c13048e3
 AUX setup-1.7.0.py 788 BLAKE2B dc7a2dbc2187f233f4fae9d85bbec9e2152259a45094f10ab043b36e31d80d40772795cb5f9911b0e9a3aa41d8f1773c0e60aa6da1a530165a26384c65532117 SHA512 823fe8a90a76de9f259a5b69425601b78a0b6c1204cda613e224cc21e4eebc2b22b4be9f53efe843156c45a20a099385bc4dad6d653a26749336023d3ae5de89
 DIST cryptsetup-1.7.4.tar.xz 1232068 BLAKE2B a65295d023f611ac57abf25fe21b4b6b6f64d8cfdcc01f2e008eea8141423e9d364af42fa3b58f9f8a76f898a01b3918a2a3ff98bc62ab105fa85feb3c1d55cd SHA512 c5f58227b38dcc2e2858c4bbcb641acead3b6bcdad0d8d76e5f46936669e4aff4dbc20a2980040341320d35d39f029725a9f20607753cad44f64ac0443b64b71
 DIST cryptsetup-1.7.5.tar.xz 1232696 BLAKE2B 1bd62b186564e0b902480d66f623074f8d2f06ea09f11788566e33d58f7d0dc8c79d5827e5966e1a20a5597c2cbdec76da49c8f54c0538a1ac3f869d8ef55456 SHA512 d473f7b06d705a3868a70f3767fafc664436b5897ba59025ea1268f815cb80a9076841ff9ff96cc130fb83ba18b03c1eee38cfaf1b471fdd883a3e126b771439
 DIST cryptsetup-2.0.0.tar.xz 10079936 BLAKE2B 6e5f1bb20571cf7a66f988e50b2cc88d152a2cd414a9b760ad845cafac3d0aa5b5a1fbd871117b91a78b7cbf1d8a849608221f8a35d1faf26f901518c2d00c6e SHA512 195e9c0b6429d21ec0cc7c5faddfde85cb71eee09d348fa50df6779693a2dc05fce04bada4c835150964e08b2e8af30e4194155e0f6366b24c7812f48477a249
 EBUILD cryptsetup-1.7.4.ebuild 4025 BLAKE2B ba5aec9f19bc046e4269baa7d4b73f0e1e0da13253a5ee700fb62cdfaf05de0cb71b86229379d7ce3176e9075e1d063d0f9f488df97da6a8c77e098ef4754f4f SHA512 9b46af09764085af0f6de8e99629839f45b9567110dde94db040e875805ad753f111136da06ffc0a65f3ebd8fa705e0a7509961a24c08032e501967e081f8928
 EBUILD cryptsetup-1.7.5.ebuild 4045 BLAKE2B 14036d9f2c6a1eb5b245ff66edd50629b517b632b11bd3303fd47e4ba7b830fec10c6eecf18b7109801e8f5e84ae0104303a9c4adbdcb5de22ce623b527ba82d SHA512 838908ef46db7d9710e9071ec21af4c0243a5b1c5220107522b0145cdb38eb1bc0fde392d276c988cf1b3e14880d4db73b1992e849d416113f01ed05dc0581fd
-EBUILD cryptsetup-2.0.0-r1.ebuild 4034 BLAKE2B 0c721b44c70c5efb86a095ed0be33dbd7d08513a0e88013e897671aeab87adc92143b8c8920c366037dbb83f665e6f15414998a743e7b372d0d67570af83e7f6 SHA512 15ccf4858426497aeff2a8fb222139c5ceb4a5ea2396d558342733991cfee53747c88b99f2132ece38b83603bc361d5864728ba0d8bf6860b0ea50c788aa537a
+EBUILD cryptsetup-2.0.0-r1.ebuild 4094 BLAKE2B f378ffe253c54e73164e734d1073ca61e5cbb6163c66b9b1946dc6665b62bf50cc8077b64a94b155108a565e7bbd11c2750e0d82fd4d945488ac6cd4bfb49fc9 SHA512 0732276395cd54332e39982b6157dc7cb176f9880037048b108aab1e26606e3e7d9291bbb4724186e33eba3161038853e214652a7f9123d972b607703801ced0
 EBUILD cryptsetup-2.0.0.ebuild 4316 BLAKE2B fa99d5c813a225b3b2a0fcc53694641c6c61178880c652cef8d81f5a63b2145a9dceb60f0f7249b7e4d511cfb0813c7e71553d95ffd03fcdf3d1f532985679ee SHA512 182a0b657627467b0d4d6be85fe0c9ac48232e68c05a42aabee2a1c17bec28eda9bbc082645a6ed8d5a1a1217ca040b62b2d411d0a16a5f9067cdd0fcd638ce0
 MISC metadata.xml 974 BLAKE2B 7dc6d2696e918f5a5c195194f70ec053bac4bfc84510234ae63a4bebb8363b72e9b1fcc331312c938839a633c95dae1e88dc24bf8ca0602cefc8bb8ab1c822c0 SHA512 a5c9ab70c75af24d3ffdd076f1eb61c6eec3b388a417f611f8988bf3f2da5daaffaab461b50c995e572d2d800c726ca960e78c3c17dd2a40788fcf48e4158f41
diff --git a/sys-fs/cryptsetup/cryptsetup-2.0.0-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-2.0.0-r1.ebuild
index eee71164cf06..66f994df07b9 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.0.0-r1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.0.0-r1.ebuild
@@ -27,7 +27,7 @@ LIB_DEPEND="
 	dev-libs/json-c[static-libs(+)]
 	dev-libs/libgpg-error[static-libs(+)]
 	dev-libs/popt[static-libs(+)]
-	sys-apps/util-linux[static-libs(+)]
+	>=sys-apps/util-linux-2.31-r1[static-libs(+)]
 	argon2? ( app-crypt/argon2[static-libs(+)] )
 	gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
 	nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
@@ -50,7 +50,9 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${P/_/-}"
 
-#PATCHES=( )
+PATCHES=(
+	"${FILESDIR}/${P}-pwquality_static.patch" #641226
+)
 
 pkg_setup() {
 	local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC ~CRYPTO_SHA256"
diff --git a/sys-fs/cryptsetup/files/cryptsetup-2.0.0-pwquality_static.patch b/sys-fs/cryptsetup/files/cryptsetup-2.0.0-pwquality_static.patch
new file mode 100644
index 000000000000..56a2d45cb42b
--- /dev/null
+++ b/sys-fs/cryptsetup/files/cryptsetup-2.0.0-pwquality_static.patch
@@ -0,0 +1,27 @@
+From 7c9312607c5b0923447175480d696b34f47f0e03 Mon Sep 17 00:00:00 2001
+From: Milan Broz <gmazyland@gmail.com>
+Date: Sun, 17 Dec 2017 15:20:49 +0100
+Subject: [PATCH] Fix cryptsetup-reencrypt static build if pwquality is enabled.
+
+In static build we need to link also to pwquality.
+
+Fixes Issue#357.
+---
+ src/Makemodule.am | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/Makemodule.am b/src/Makemodule.am
+index 55a388d..b6889eb 100644
+--- a/src/Makemodule.am
++++ b/src/Makemodule.am
+@@ -112,6 +112,7 @@ cryptsetup_reencrypt_static_LDFLAGS = $(AM_LDFLAGS) -all-static
+ cryptsetup_reencrypt_static_LDADD =	\
+ 	$(cryptsetup_reencrypt_LDADD)	\
+ 	@CRYPTO_STATIC_LIBS@		\
++	@PWQUALITY_STATIC_LIBS@		\
+ 	@DEVMAPPER_STATIC_LIBS@
+ endif
+ endif
+--
+libgit2 0.26.0
+
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 75ba436774df..47d65f71d8e1 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/aufs-sources/Manifest b/sys-kernel/aufs-sources/Manifest
index b2469b610a04..b59a5383bd04 100644
--- a/sys-kernel/aufs-sources/Manifest
+++ b/sys-kernel/aufs-sources/Manifest
@@ -1,22 +1,11 @@
 AUX README.gentoo 933 BLAKE2B a3f338e7fc85ccf980178ccd2b1b4706e11269a00ee4411645286f19730dbfc78a6905c792567f735ceb057dee35e282d78ca3c1fc6d01b53a93fe08f727d431 SHA512 31bac1d8acbc50dfed3d06cdd6c89f3e9847276e18b9379989cc5a3d3696805d7b020a39fef309d1ea53fae3e42530e26016c621b24019174705173b2264db5d
 AUX README.gentoo-r1 913 BLAKE2B dbe93c8d6c289a229d158fe6e4434f139d89f4164db850639d8db9f4eae18369204582ee7515ba0e8708757ed53bed4e0f01ed268544904bb77c7bc9248fd52a SHA512 b4522a200410fc6b30b36796f60843c4065a136c19477049271d8898d6bb6fb08874071181d0e4c6f5568d271098becead30d13eb904aff64ed8e2faacf21c8d
 DIST aufs-sources-4.12_p20170925.tar.xz 180468 BLAKE2B 236b366e465cf815e181611a421c67ab11af16bbe5c227ffb2953c6bac3cb76c4fa724918dd761c67ba206d17f6950c7f8f5f491aa78bb877948b216ec144c1f SHA512 d9c15393744b2e2d01555940b8be81905ecc00b690c0f3e309735b9b69fdc4032f2815379597bcecd419f731229befc6463ecce0ef211fbdef6986b7d7722782
-DIST aufs-sources-4.13_p20171002.tar.xz 180448 BLAKE2B df2d796fd0e7493b9b14f5fe07419bc967ef4c795154a62412ddc71bcade3108a085f441ff1633ff0b4a74d7d3709b98161b10b051a3dab450cfee07788a66e4 SHA512 0557cd49d759bdde8b846a8d2f6459d7015e17f79f289dbb82a0c788e56933a81ef00fe56610e17d3041a5b02fcb6290ae43942e173df4e94482cd5d549530c2
-DIST aufs-sources-4.13_p20171030.tar.xz 181416 BLAKE2B 9cedacfaa381e3ef71b9b927efdf027f86f3c0be57a0237891d575dfab954b80bb002b9babd006c06c695d01f26d55b728044c934385c99a0b6ee8ef2d08f5f1 SHA512 2d10a4e190c7a0bab9fde23fe93614bdd0c8113f0848054b3690888a41f39cbbfc835ecac39cc79141070021895265bee874405f87097dc9caaaea1ec2c45fcc
-DIST aufs-sources-4.13_p20171106.tar.xz 181364 BLAKE2B 5e9df28387ec85d0435558b1233b67ae91ba140a0a9c054a957699882657b4277cf315141c996145a3166b136e9a4f6ab06af8babc4c8947036d84a57f655e16 SHA512 465050b243a62da38a8035494fcf12222bb0dc0b47334c8a7022d31781a875089e794454985c954630197fb3ee6acfcc65f4fa2cd06927873d8150e0d7f0b58a
 DIST aufs-sources-4.13_p20171120.tar.xz 181364 BLAKE2B 5e9df28387ec85d0435558b1233b67ae91ba140a0a9c054a957699882657b4277cf315141c996145a3166b136e9a4f6ab06af8babc4c8947036d84a57f655e16 SHA512 465050b243a62da38a8035494fcf12222bb0dc0b47334c8a7022d31781a875089e794454985c954630197fb3ee6acfcc65f4fa2cd06927873d8150e0d7f0b58a
-DIST aufs-sources-4.14_p20171120.tar.xz 181180 BLAKE2B 477af999db606c6a915b80cdf43d9f6f2c0b838cfcbecad71ed172bef2bf6333f3346be6e774066b70f0a8f54efd354b2c236aba714d46582321eaa05486700a SHA512 d5adf1fbee31861c659690ee126925df2eb75c2a18d6ea45342fad424be6d1370d0db04a86b051e631c8dfe8464454f0709f0129dc39b63f3b43b79ab7a7953e
 DIST aufs-sources-4.14_p20171127.tar.xz 181180 BLAKE2B ac8c6f6e0e90bca44c09f5a2965251716cd9cdd01a939131614078474a79a0d7146e6487fc7c4eec56b7af0d7e11c25ee43d3431b83e7c6662bb5d98bd2fc485 SHA512 5d977c7538221ca9441689a3b330ff50f809d5249d2e1b42089f208278a3d4fa4e3badb1165a8b9a85f7b58067ce2968f833c568d8a4c5bc2eb41c6a0c2df4f7
 DIST aufs-sources-4.4_p20170925.tar.xz 171260 BLAKE2B c7a49fe6bfe4d2a83143872c32e987633db5c698d0ee3bf5018ac7091e1a421df7974fa129cb093dee52fdb6640827a784be5b5fe55a5b63fcc2815fc1228c8c SHA512 97aed8053f003156bac862af5037844554e65948abc13ab10371eb4e37ace25b22f5787f9bb3d444e60cb598aaa416c22222b12198d8842072407aa5f97bb3a8
-DIST aufs-sources-4.4_p20171002.tar.xz 171260 BLAKE2B c7a49fe6bfe4d2a83143872c32e987633db5c698d0ee3bf5018ac7091e1a421df7974fa129cb093dee52fdb6640827a784be5b5fe55a5b63fcc2815fc1228c8c SHA512 97aed8053f003156bac862af5037844554e65948abc13ab10371eb4e37ace25b22f5787f9bb3d444e60cb598aaa416c22222b12198d8842072407aa5f97bb3a8
-DIST aufs-sources-4.4_p20171106.tar.xz 171260 BLAKE2B c7a49fe6bfe4d2a83143872c32e987633db5c698d0ee3bf5018ac7091e1a421df7974fa129cb093dee52fdb6640827a784be5b5fe55a5b63fcc2815fc1228c8c SHA512 97aed8053f003156bac862af5037844554e65948abc13ab10371eb4e37ace25b22f5787f9bb3d444e60cb598aaa416c22222b12198d8842072407aa5f97bb3a8
-DIST aufs-sources-4.4_p20171120.tar.xz 171260 BLAKE2B c7a49fe6bfe4d2a83143872c32e987633db5c698d0ee3bf5018ac7091e1a421df7974fa129cb093dee52fdb6640827a784be5b5fe55a5b63fcc2815fc1228c8c SHA512 97aed8053f003156bac862af5037844554e65948abc13ab10371eb4e37ace25b22f5787f9bb3d444e60cb598aaa416c22222b12198d8842072407aa5f97bb3a8
 DIST aufs-sources-4.4_p20171127.tar.xz 171260 BLAKE2B c7a49fe6bfe4d2a83143872c32e987633db5c698d0ee3bf5018ac7091e1a421df7974fa129cb093dee52fdb6640827a784be5b5fe55a5b63fcc2815fc1228c8c SHA512 97aed8053f003156bac862af5037844554e65948abc13ab10371eb4e37ace25b22f5787f9bb3d444e60cb598aaa416c22222b12198d8842072407aa5f97bb3a8
 DIST aufs-sources-4.9_p20170925.tar.xz 180584 BLAKE2B 82c7bc47df1fb843706b3110a2a778a60840bd874393fd7b0a0ddfb40399e057895ce5360e59a9c0162333661ac7c00c6cbfe8b68d4abea537e6b8bdf92c061d SHA512 06d8db9f115fbf89f5bd8f47ff5ef3b0643b7a5d925d82a113c203272d234b9261a214e4eb9ea4fd083c9cf5d6a8bb64e37a7d4b1c47e1e636f6e56eeebe863f
-DIST aufs-sources-4.9_p20171002.tar.xz 180576 BLAKE2B 5603195e6b17792256d00a05897e037f79d7fbe115f363516daac54d1d8f6f564d87f873a2460384b018e3c8da67f0f90be0c0caf6acf269f75f0fcf16f88ada SHA512 a9b3bae581b900e7b16e27b5a33c930835f9924c2af0f8d0c02ce55ac635e990671df87f7d2dba10402e965835b9ecfbd0bae155d17aaac0b440873ea30ec541
-DIST aufs-sources-4.9_p20171030.tar.xz 180656 BLAKE2B 35826be242a2da7c1bb47aa81e14e6020345825a52d108f2c0a6dde7637ea6c8943b3f1c6d654811b9bd18b285d1dda96a29580d4338330de45c8ea68874e8d4 SHA512 934756ed0d6030853e7fcd2f3458936ed25829dc1f882b7bd3bdf308dadf1d33135411dec438f1515372838300f1acef53f46b2e2c39228df7c6429f27270a9a
-DIST aufs-sources-4.9_p20171106.tar.xz 180656 BLAKE2B 35826be242a2da7c1bb47aa81e14e6020345825a52d108f2c0a6dde7637ea6c8943b3f1c6d654811b9bd18b285d1dda96a29580d4338330de45c8ea68874e8d4 SHA512 934756ed0d6030853e7fcd2f3458936ed25829dc1f882b7bd3bdf308dadf1d33135411dec438f1515372838300f1acef53f46b2e2c39228df7c6429f27270a9a
-DIST aufs-sources-4.9_p20171120.tar.xz 180656 BLAKE2B 35826be242a2da7c1bb47aa81e14e6020345825a52d108f2c0a6dde7637ea6c8943b3f1c6d654811b9bd18b285d1dda96a29580d4338330de45c8ea68874e8d4 SHA512 934756ed0d6030853e7fcd2f3458936ed25829dc1f882b7bd3bdf308dadf1d33135411dec438f1515372838300f1acef53f46b2e2c39228df7c6429f27270a9a
 DIST aufs-sources-4.9_p20171127.tar.xz 180656 BLAKE2B 35826be242a2da7c1bb47aa81e14e6020345825a52d108f2c0a6dde7637ea6c8943b3f1c6d654811b9bd18b285d1dda96a29580d4338330de45c8ea68874e8d4 SHA512 934756ed0d6030853e7fcd2f3458936ed25829dc1f882b7bd3bdf308dadf1d33135411dec438f1515372838300f1acef53f46b2e2c39228df7c6429f27270a9a
 DIST genpatches-4.12-13.base.tar.xz 227724 BLAKE2B 0f94a7ac7eef1ea17a8e675260f7b2139987c6b6c6626b96666deb20c629f78ee2658157fbcf6c615bfd704ba69a1bab828c173f727dfbcd592468432739946e SHA512 6088bbe9b0007715e146917cb4288df69ee0d6a4e5628db90005c68d025bd12e304dd9e00e51a5a1a6844ed06a09571e9faec494257fd2aa3d6abc3bc9838000
 DIST genpatches-4.12-13.experimental.tar.xz 5188 BLAKE2B 99b1038073ab428ecaa9a5120b51d28b5738850fbe4d4a7805d191e52e2868f8008b9c324420384e888e711c0be4568090d04d92ef8c90840524e478e963c008 SHA512 80adbc13d7478b5c55b0b6380ffb1ba42cc10de8eb996db0457a1df6677e401d612f74ab756a9bab83b99f857af323d9d7fa6c36ace9aa0950671e1843c84777
@@ -27,108 +16,48 @@ DIST genpatches-4.12-14.extras.tar.xz 17360 BLAKE2B 4eea1e0375ace3489e9129eca57a
 DIST genpatches-4.12-15.base.tar.xz 247556 BLAKE2B 357bb71d10618597e85ff7eec528a3555a1444d8946cf98fb362f91de82aaafee76346c97882cded03f52ed05564e84d25c36b00f11d8caa3cba577a89f40e52 SHA512 abd9f433fd6247fde9bd9c6655bd6cb90d56d4b3df6fed7f86872ff620f8502a7d277bd418c7d5d1667c792f85eb568b2cebe981cbd8bf4e4b7d7c3746e33d22
 DIST genpatches-4.12-15.experimental.tar.xz 5188 BLAKE2B 84d57dc972407bd00a68b134366772d7711d3bb69614a1e9523c6bc44b8cfc4fb161590c9c5965c53fb0b60f400a47ca580ddb3929c3d116e18a7dc4131e5359 SHA512 af85f2724f767062c06acefb230db5eaae6ae65c68b8d0ba52f7ea9f13cf07adc277929bc9a4e3532ec680c5c0d270d92f1786a21303390e33f41e592d9761c3
 DIST genpatches-4.12-15.extras.tar.xz 17340 BLAKE2B c4943b4e49ace480d17ea789ff1687028b8a4c75fcac84d74a46575fb33bda001e87f29e6bb5e22857b45be188614228def71def1e6933f4724ce60bf4e1c7c2 SHA512 9080bff5dde940c4c96e18e9fd2a6b29946511424cd5bf6c7467efd7d1301a7401155514d97fa5a890339ba84525f36f7a4c272fece3faae3dfaaf24d1498ac1
-DIST genpatches-4.13-12.base.tar.xz 219808 BLAKE2B d2dc7f53d27b15f7040399af2e3d0591b6f323ee1ace6a1d2df464c77fbd3274ec145447ae79fac813baf81eeef4f8f42fba50e470a8659abb8d9dbac75c3250 SHA512 65e1f5bebf942d73719becc60d0c46171176cf34e036374b44232e1de645205aebbb1da90d9e82699bb65dc69b78dbc5b76d39d8a041397c2508471fddd20b6e
-DIST genpatches-4.13-12.experimental.tar.xz 5184 BLAKE2B 8664c583734f1ce5bb603941cf8766982d7611e2fdc3d7e6b823ea2668c389b52a134f8ec87c2e9be626b81706a8701c0d068886ce1395f85a9a452a49ec4f38 SHA512 2d23dbdb14ec619aecc6ae854aeaa8094a689a17a9453383f27b57b226bf23121574c41dafa3ad7744011000bc990c92f4f65a323d38a89675777fbb61083c31
-DIST genpatches-4.13-12.extras.tar.xz 17412 BLAKE2B 24e9e6ac166b2fd1853ac2409454987b7dcfa656e9b19ecef3479f5cfcd7044768d0fb65c2b04d8b8aa94b6f41fb9762b698f6a5fbfbb31e516ca2c3758c7ea1 SHA512 d348bb190a41526ae88cd82d2f77f0ce2bb50f9a8332daca92e09de078f70db6b906f4380f7ef85b807dc5a6cf34da0bff7afbbb68de3e483a5f26de352348d8
-DIST genpatches-4.13-13.base.tar.xz 232160 BLAKE2B bb1ddc51b4a257958de6835ccfd3eae68acb2db4a686e9e8040bd6296da09f44ec0efecba4e7293e47f5d27363a6cec19ca5aaf7a0c6854fcaf6fd911e307ec1 SHA512 02ed31fd0fedf1c312ac12a016946746df549e30c16040ab860a91041872addb0cd33e6b845fb37af179b30c9e50a090e4091d2b48eee1b61cb935fd593c1108
-DIST genpatches-4.13-13.experimental.tar.xz 5184 BLAKE2B 336f63cf6cd456c54ce153c6485ab5b910303a444b2e0d6e07437792993a9e961f3e1831bcc24fe6884dc80a9f7947ead32705cc823b2666b6197357bc273c56 SHA512 c220d229f4dffaf7bf09b9d4cb1a73d61b7646191d715098e5eb51808c66d38827729edcc9999f1252d7b1bfaaed7d2d2566add7b6cbadad1db246379334dee1
-DIST genpatches-4.13-13.extras.tar.xz 17396 BLAKE2B c36c764dd95b63b2e821821da23be8c900b51ddfe5db07536acf97a6650a166d6a09001132efab91ae5ddf14ff9f437104f3722c3255bec24f64c2024e8d7646 SHA512 67a4cf48502378663c5277e5d6c2d98d195d7f7b3a7fe0e79a5118c7e910e19c9882807cd7d80f73c08f28d702b83e4af9248597af751dc3cf923eee40a5c0ab
-DIST genpatches-4.13-14.base.tar.xz 243120 BLAKE2B 768508c4c2652d6f215a40345bbfd9317ad40adb7cb8386da1866108e72877e26fb40ccf2ef904bbb4c4d0ae6c1cc545a6c3ae47b3052c8726dfa79ec0bf3959 SHA512 c885d59f4d301b1ef71d40e3b35758914b669e25a15a64826454b3f46f5b45a49850971ddf11cd1d5db41d1c0fc5d814158dd02f14d9eb0c97af208865c44dd2
-DIST genpatches-4.13-14.experimental.tar.xz 5184 BLAKE2B 336f63cf6cd456c54ce153c6485ab5b910303a444b2e0d6e07437792993a9e961f3e1831bcc24fe6884dc80a9f7947ead32705cc823b2666b6197357bc273c56 SHA512 c220d229f4dffaf7bf09b9d4cb1a73d61b7646191d715098e5eb51808c66d38827729edcc9999f1252d7b1bfaaed7d2d2566add7b6cbadad1db246379334dee1
-DIST genpatches-4.13-14.extras.tar.xz 17396 BLAKE2B c36c764dd95b63b2e821821da23be8c900b51ddfe5db07536acf97a6650a166d6a09001132efab91ae5ddf14ff9f437104f3722c3255bec24f64c2024e8d7646 SHA512 67a4cf48502378663c5277e5d6c2d98d195d7f7b3a7fe0e79a5118c7e910e19c9882807cd7d80f73c08f28d702b83e4af9248597af751dc3cf923eee40a5c0ab
-DIST genpatches-4.13-15.base.tar.xz 254132 BLAKE2B 9079585e89d633821de2408442c2949c080f47831ebdabcf174e142fdf06838a4aef8bc1db288ca8d74074f7fe0f45215a8341a49ed1303360d9ee7718e927d5 SHA512 7d38c30f213a1bc0a38d2bb8e97f1f6b86ecff60779aa36cd1c9bd9cd2726c16b8bd3067364cae716d38e22d8f34dd34cac3072d5fe2c8256de229b99cb9a4b3
-DIST genpatches-4.13-15.experimental.tar.xz 5184 BLAKE2B 6cecdccdb9591650dd3c56944ec44302b9fca22e21f643da2a49ca97ea20daf6428e30fadc01331fbddae62b5ab620933fe8f87be6fb2fc7c9fa82573202cdb7 SHA512 4c5416bdfa602ae083a9058d04d2dede66bef95e5c589dd211aa82264c044a1102b63459dc384e7bdd6c10678b440542db2b274ebeb4456aeef93f09aea4693f
-DIST genpatches-4.13-15.extras.tar.xz 17400 BLAKE2B b0f306dda52425809e3e6365269d6858cbff160825191614a940cf77d441aea08ba31e8c955df9a43161ddba3172fa5b1066a8e1546df2a7e479d79cd3697ab0 SHA512 4e41c0780bc7c37fa5e13847ee203cefc6e1676921d1560fef9a198ffcb948c7df38acb642098a1266661bf5ddeb022510aa0ab6863e654e29400eeccf093cc9
-DIST genpatches-4.13-17.base.tar.xz 266392 BLAKE2B 3c244e967b874c6cb3a0f286466e7994f4c2cf12bbca4a557e30014c0bdd85dba883bd2dea52b90f938e48c7cf6fefb12c6788dcd3c85cad521c3cf0501a6061 SHA512 8cd638064078eef540f614f766b89d845208082109f7af71013ab210ef4f0b7f483eefc112805646cc99b8517c3d938dcbe2eab4fcd4b35be14969c83f71b858
-DIST genpatches-4.13-17.experimental.tar.xz 5184 BLAKE2B 793202f126069c7abf0518cb280766450d777515b7ac74f6303e85781fb57c05e10389423163b18b54cb445874d3f4a230a3bbe792070e4c542b249a8646b0ae SHA512 9f74b4ad9970941ffc931faf933dcd4e3e6fa3b5090c629db4fcac99d07613e0953d33fdae629359fec58207c245627e963e4b6e36e2a13ffc3c654f592cf7bc
-DIST genpatches-4.13-17.extras.tar.xz 17384 BLAKE2B 5ff2388104deb932ce55581405aeaafa1442814875c6bdb9802d7c42dd654201505ca73f92402e062cc73c1303f4570da9f28d448b9179c392e84518e1e379ca SHA512 2e6a14b9a40ea92af1ab79db66892d7f77bfc54380f08e8214ba1ce8d3d3de36e1be4c979ac3cd257545faf364002b7def9f7614bdbe73751692e8aed753ca5a
 DIST genpatches-4.13-18.base.tar.xz 273920 BLAKE2B a399354f7f7d6aedea1c0a16821d79a06c7cb560f66fc4da680dc59cb63d0d4d1b15a94d00c682b42e3123bec5930f70180c7dc6a4122c726736108734642193 SHA512 3164f77eef84977602beed2acc59739d8d8ed99a0e9ea02a1f9a1e8ba95b35c8e7566e020ea88ed73f6bb0d359daa207d9e08d6cecf9cebe9b93fb86ff6280ac
 DIST genpatches-4.13-18.experimental.tar.xz 5180 BLAKE2B 041818f6cae40ec0f39d6b696c67471671036f521d033e5165fc77b3fb8901c49da7f52ac96f0fc057bd076bd068024d82cac9abe311ce78ddf7553c0d4c2f55 SHA512 09a53e6b53c20ddc857b7ff7001be326adacf9d24a565922c8ceae35a98e9a5a1bd214fd6a227115ea90436d3504154cd6ae3e47e5eac270f220ec16255b16ca
 DIST genpatches-4.13-18.extras.tar.xz 17408 BLAKE2B 863c54f3451fff15f51bd65ea9ff1c2f6e42f587323c1251e8e5f1c3edec2653c079b87a87da1358bd06116a49986e5c347a761020d3966198d7a5371ec03524 SHA512 eb0505e6f54051ca3f1cdf3070092d5e78831a649582021a19878d6ada2d47d0c960d1726201c0d276a2eb4eed2ed72dd162dbc0ce0185a82f4a4e9580e7c804
 DIST genpatches-4.13-19.base.tar.xz 281648 BLAKE2B b2dded0ed572fcce3f2b0e361732edad617728eac80a8febe2f2fc8f01faf9de3ded6d392bfa7bfaa7b0c221d292bf902c18d5961ad80db3a7d62e8754c84e97 SHA512 a3c26828df68e1e7595f47612f6a54d7e773feafa3e4ee2fdd0592d74c6e13bd3c50195696408a7d53a10f59e70072626b982f42b678d64bfce055100eb48307
 DIST genpatches-4.13-19.experimental.tar.xz 5180 BLAKE2B 8641931516f97fb88415f6d1496ec3c68efb75bd188f77746068e35d011f71c3ff7246dd2f427eed905ceb3db06327a31678179457280b2f82e7290d1821e4ab SHA512 cf8feb8cea668f2f94b85e211274a186631193f0f0ee2bc8d5c51e8b7a159d0ff9f79e484ca90163de44c1a024e973b69ac4d6730c7aae15c60bab44854c0db1
 DIST genpatches-4.13-19.extras.tar.xz 17404 BLAKE2B 351c85e48c7757bf2bf99cdd8deff6a7a9aee3b5d122a43ec38c4339b1c1ff71fa8a1d7cdee980823d69699a699ea20d0e0fc30011e6b47df905834473f656de SHA512 e3ff1ed750609e8e2625bb97c348e84b0e19577cf382a393d7bdcacd4a8dea8dc605afee8e60b162d08781df2bdb9d380004550c6f46c0b93e274057d2322d3f
-DIST genpatches-4.14-2.base.tar.xz 17648 BLAKE2B 8e97f8aa8b8c45605f920cdbbfc9e55212e16ee33d2776dcc5d741ea68272234bd976fffaffc425e2c7c020bd154301ca06774f2401da8f012c770b183bb9efb SHA512 8562287eef0efd1df7816c65eb452e2b1a037cf572cc5131cc27526a7e93cb610d49b6855eae28039c922c5ce1ca270da1cf4070aa5ceb32edb260c5ca82717a
-DIST genpatches-4.14-2.experimental.tar.xz 5184 BLAKE2B 793202f126069c7abf0518cb280766450d777515b7ac74f6303e85781fb57c05e10389423163b18b54cb445874d3f4a230a3bbe792070e4c542b249a8646b0ae SHA512 9f74b4ad9970941ffc931faf933dcd4e3e6fa3b5090c629db4fcac99d07613e0953d33fdae629359fec58207c245627e963e4b6e36e2a13ffc3c654f592cf7bc
-DIST genpatches-4.14-2.extras.tar.xz 17480 BLAKE2B 16712b535d1548ad14e7c6b21a85f04830d4c7d3617764658d7423e4122c17af5008560ae48090f44d8b4248595b6fd1004333d63f63d747d1fbf36904f07623 SHA512 75ce75cb5248c8822e3798203b6836d689d32d54dc387f8a879d7cdd5aa81decbe7f3794861a92039b2b16a69e5a3de90dadca015eedc88d5d5d92883a6f0ff4
-DIST genpatches-4.14-3.base.tar.xz 22980 BLAKE2B 1856fe273ec373a059be489157cc268f079e3b6fa552f948732aca985b6a039aed0bde1a6e7be64b2c964a4c8a8ee00e02a427a56f72d278e757b1ebae0fc477 SHA512 ad4d27211b69a184ec82f34167b38cf16bee96a6242201304c683aec6d29c3a829202f5ea4ef4a73504f5ff90db22f471bdbf8c643ebfd2c1789c510cd6dabb9
-DIST genpatches-4.14-3.experimental.tar.xz 5180 BLAKE2B 8641931516f97fb88415f6d1496ec3c68efb75bd188f77746068e35d011f71c3ff7246dd2f427eed905ceb3db06327a31678179457280b2f82e7290d1821e4ab SHA512 cf8feb8cea668f2f94b85e211274a186631193f0f0ee2bc8d5c51e8b7a159d0ff9f79e484ca90163de44c1a024e973b69ac4d6730c7aae15c60bab44854c0db1
-DIST genpatches-4.14-3.extras.tar.xz 17480 BLAKE2B 346a3292223a5e046c019a50cce2bf7fbc8f2ab08ac281e0a82e8fec32193750767653f93f2f3e314c749b24ba4da1c4fad0176ade5871b17377b238cf57522e SHA512 1116a712bf223d670eb5eb4f01ed8a916a362d0accb525d2a8fab5b8a4c1c27120a566add7b0ca2658833b4f802db83e094185ecdec4ad2b9d2e07dbfd0bcbd8
-DIST genpatches-4.14-4.base.tar.xz 87480 BLAKE2B 753bc9a5145ae32f1d4562862449f798ac9c78111819c7c279327039f74142fd0ae6955d559801736b6d2a0b074cae56d53226e5745cb8c85e76b0bd42ea0673 SHA512 8c0d8d864dea85f6730cc8c5bb1bcefefc8ef3ee5254ba62f0d4e90c5787ea6423988f4c303e0e32aa41fc9e5d4fc01103136556daa826a57403522066c3c949
-DIST genpatches-4.14-4.experimental.tar.xz 5184 BLAKE2B f1d9938a476a958a5fb42b60589234df5c85211b2ebfe59316dd32036ce2a93fdd405f02976ed8eb9312841a4853bac0baec4df52cfc09278b7cdd1fe76e0718 SHA512 85f3055ce8ee187fc7105bf338dc18fbbf02e9cec27aedec10a6fde4db89dec70e666e63dd24497decfefb4b1f59c74789079614025304df67484d80f81d7ede
-DIST genpatches-4.14-4.extras.tar.xz 17488 BLAKE2B ddab5ff81dc6cfe85ce3805846d8d74ce1eb8a2c79b2156e4363fa9592d1a0edec9f9812b9f41bd9ed955ac7030188776a7da5ff4a59408a0d5cf74bf0e629d6 SHA512 7ab148e3db28367ac7d8e56f75e65cafc3b80fd0932018d5ebd1ba1ba1b97521c94e30055fd653803806825bbc8be65e4fff2924907f9144b5ccdb48a53b00c8
 DIST genpatches-4.14-5.base.tar.xz 115968 BLAKE2B d48a56eef5c045c79a355b765f7b569280b741f5879b7ae2ffd411922a27225d8150554f42f70503218bb7ac674434c01f0e2350e7c7e8da256cd36be11a502c SHA512 67c9b9c295ec90137c05385be239b6d2d0e79465a3f1e9f92ac3d0e6d8bb50a9107885a009a185d0cb2102e31d773cfd690f0d8ccafc0bacdcfab607ae556872
 DIST genpatches-4.14-5.experimental.tar.xz 5184 BLAKE2B 13611ce70740cae179fd732ddab8b5daa1f8feab9d5fe80081753020e0df42dd76c8c8696522769a950f9eded8a92b80c93dece78a9c959a1fb9ac5ee61af101 SHA512 c6725e6728c9fbe923472116977136a13bf6ee4e4e450478ab2eb2e7c91d88fb50961b017d9c57335bd329543a830ba629bd064975326f187d72ae7376687d5e
 DIST genpatches-4.14-5.extras.tar.xz 17488 BLAKE2B 16281a8110e0e1156aeaa1b5bc219e3bad364b22da6ef3a540e16c0f0a2a9fd1fd3fd550d002e79b4095916863f93cfdf4b49617b9b1c3bea8263c54702205a0 SHA512 f15a3b545b5d4c1359f57046cc2dcd273508737129b181ab3a8c7eb7ee65f5ddb82ecf8b1f96095da87d5fb9659ec4f0eb4826aab63b45bfda2530ed8a609605
 DIST genpatches-4.14-6.base.tar.xz 135424 BLAKE2B 28b59fc433c1b4d5c4fa4fd5bc71192eda5da51ce63a4af245b746425bac1abe9313a1cbc760396fcaa160c1c6333e756697923d45f114da94eaa2ed3ae8659b SHA512 460e38c9895156c2a16d3aadcaa4a2c9974a14e561155b914da143b14c726d9e8ad74cb435bd2ee51ad2a0966166e3705f943bd3831e3e33932373b2e04ace36
 DIST genpatches-4.14-6.experimental.tar.xz 5176 BLAKE2B e28358bab3de6aa0274d537ca15239154bb69e5819ada8cb050ee35bb5885ff3ef5610988ebb1afa2bab3500c28300299c65e58aa302a6cfacad0aa2a8cb0244 SHA512 bdca000c196e1db78b27d16bf1abda0872d982375a5e33d4a9cbb5610df384f08692120460cda43ae06e0b9a6ea9c2c1c565697fbffdc9cb46e92d1ad628c74a
 DIST genpatches-4.14-6.extras.tar.xz 17488 BLAKE2B 39d46c202139f9d4b19eee37e711c81e95ce3b25924a70a3f75e6e4c6d4c665c1c73890fb0f61ea4ecad04cf9d9e2ad4788bad1e9c9e0e2fd03a07c3f5f8c713 SHA512 0fc7403ab27bc6a7ca1ff641bee8e8ea92bd04913e84c9559ac210cb6ecebb08dc4be9fdba6176c4c2d543990ea23d68a9f403dede6f1b2b56456d63d992faf3
-DIST genpatches-4.4-100.base.tar.xz 1513104 BLAKE2B 9b14d28288288ba467f32ed32f1944734f6f457883f360d844171c0d22f28e75a00026b8d736ce0673a80812e5471e9de0e89dbb45e510dfa3f6bd85391eef2f SHA512 75324834165e3493387e635918cb81d73d27b3274cc6826557df548f7f84a0aab456faf1b60e1e4bf35d8ae5fef00d1bdb4298f43208440c0422e006a3b248ef
-DIST genpatches-4.4-100.experimental.tar.xz 87748 BLAKE2B 81c2c32d1f590c958895c9f0de60b2e1ddea61c994e950ef721ea59c33432934a4ccb443b08cf164c0031b4fb0f03ad6f85029e5f23508988230f1da18c6ed5b SHA512 822c943f114c35a8caeea20ee5f6c56d67f0d1122ca9db8f3bd9f34561735b0eaa72f9be7161b55c390ab5adf967ee64540a81a042746e39c6d294158cfd52b9
-DIST genpatches-4.4-100.extras.tar.xz 16464 BLAKE2B a8f9d161806e308f87b25d9d8b56b3f4eb61d9315e5eb753d7bd75506c9ce729262c2d3444f98e295e2ac9d5b52b5d147361f9b502f4718b0203a2eb67474671 SHA512 b9ae815130b993cd2723ba54c41aa62b04e8e373b4b26f63ad0c511c445eaa1af71e7d63f0eaecd23b6ded8589b65b4e9da0dd62349a0b8b836b15b01a4e523b
-DIST genpatches-4.4-101.base.tar.xz 1522480 BLAKE2B 0fdf33f46e74537d41bae2e13e71ec8747bf92538dc8bc155a2986a08545cd25398972f65aff18e5c4ea210fef7545811cfb290890dda703f626bebb6492078d SHA512 4b0c6aaabca1984996c393c118a61e289553c7b2e65847d19f8148a75a363ac50f88b63666e3cd3c90ae8aa6724da402ec6867b30e3cab6bdc6fdbe4de6373bf
-DIST genpatches-4.4-101.experimental.tar.xz 87768 BLAKE2B 00c9eae05561f82a7629e1f14079b6256870ac031b765035df025f0aa8939957d4d130039d57131464a3040e7140d9568fc14c548a503708b48ba9aaade1fea7 SHA512 631feeed11f995d6071f38a7cd8d6b50a824cc33b3736a6ba8bb89943cb00c0c17039e4f4d27e8bd69740739b27d877d03616b2a88d19cf30ad0a51708077670
-DIST genpatches-4.4-101.extras.tar.xz 16468 BLAKE2B 44e2acdbd4029aec39f7667c43b2139e2e702f6be0a0f7eb7cbaccaa369d8228659a161aba99e59339d95134b37fd4542fea69d338f244d34c56025eb966460b SHA512 aaed443e351ff3c24063e7edfb2c24e73ed6e2d8796bafb03202b7eb35ff6d50985d22f45c1f0eb811f8074c1fc43cbc84116d37cbe81110776a867b79eb8a23
-DIST genpatches-4.4-102.base.tar.xz 1534876 BLAKE2B 71002baad6872614ebf986adc3e0c24f33284ef6e1ab4bc80c1074472bff0057e6dcceeeb9b815a35c65e231de5c6487470260acc36001ec9740ff2f647d7391 SHA512 bc314f6a6bd7477ae3e217ce27c8b859f4574de76a7e5f3c1e70247eb3236d7bfd8e37a12d27a46cded56e49056e6e7d646c2814935634f387d2ab680b23e5af
-DIST genpatches-4.4-102.experimental.tar.xz 87724 BLAKE2B 458a096fb3319b2d1eb123b83e32c11d30cafeafca2258fc917cc7c19a4cddb03e01e5fd6493f058838cd593b6de02bf0736656b53225c2e227ce8e6c67f42ce SHA512 f38af999df68a51778d44aa83dc442824f09cdc4a743ebf1f96cb091338bd77ac0f8a0d49d04ddeca80c5930fc10fb00e3589ad5074e0ec08cdc9c7f09b7316e
-DIST genpatches-4.4-102.extras.tar.xz 16460 BLAKE2B c03212d57a906ae15e3445bd3c1ec553aedf5f5fcd64c5d12aec357b900f04d68aca453c5f41f306a19606de62c4b7aea3a09cc0cd2359c9ecaff49045f2ea15 SHA512 c93def08004c8a7f15aae95d8be454c2ff9142dc0721eb6623cb18fa621093539fa9458a3735cbc803aa76b8353b8e6ae421b32bb38bfafdcaaf131179b8c5e3
-DIST genpatches-4.4-103.base.tar.xz 1542244 BLAKE2B 7f94fd8ca4721047a81fc6f94427c17c7fd5617daa3b8092508f01d6ebafc099a09db2918194d2f404e1d1ace9bfa0ed6dea486d43a21bd8b3d94848e56bfd32 SHA512 d3d615dd6e912afa23db3b23c88f0adcf55b2cec987ad6902e997d55cf8ef6af48a01e576c5d9dad998c2ef6963cf9f5b56a605dac08dc8f8c9a2d0732c22f79
-DIST genpatches-4.4-103.experimental.tar.xz 87784 BLAKE2B 7b41ad75cafba6778aabfa4278a1b731ca236f20b989373ae2400c0b137aea124520ae2e6056a7419a70702eb1c147d8f82ff5c0d66364db7ff1d220c53b60bd SHA512 71747c2a01baa8f288d720b093a9035bd0ecb65a6c22a308c9f97c150f7c8ffdba48172b2cd18730298b6cbfe0f9718737f2975017382d15d403eabcba3f3198
-DIST genpatches-4.4-103.extras.tar.xz 16460 BLAKE2B e5e601bf64497ddf2674b5cef052e692e4d5cfe9e109048e55bc550facc7c309ec27262b7282145744997105f14190b5e8d1f082960b499620afed3daf429e1a SHA512 7caee6577147b750fb178126b73f7204082c1b353720695abd091e004211f42b0a5ec279783a98a5cbe294239eb1b29a2492a1af662a8efb70263403604715a7
-DIST genpatches-4.4-104.base.tar.xz 1555020 BLAKE2B 650c7e4538cf8635495bac98b05519941022ae2f29a8b59a95bc1f34b39bbf6730f16f54f4b691538c4f328fce17745d491f2febe766997fd00c70ed2dfa1367 SHA512 7b6625a1dc8669e25f5702509c7f25d7e72c102c6eb959afe295000cbd320db18a4d896fe385751cbbc569d74f056db70f610053a165f2f01683a411acc120b4
-DIST genpatches-4.4-104.experimental.tar.xz 87752 BLAKE2B fcd492594ce917948f596983f5950275cb2d5a4a9cb44dd417209a1fd6006b71d84b18cd6d54ab13538d6a842eb61eff50a3a664eef25fdc943d9a5c3a3e3b5c SHA512 75148631440426b827ea17e397212594c7e6b99e5ef6913c96f39ed9cbc25a4078d6ccb0be0a375eb88a1db952a4c7a877df05f6fda98c6e8ae5ec91ea1c19be
-DIST genpatches-4.4-104.extras.tar.xz 16464 BLAKE2B 5e9a96777058c213d9dc5495bbd6e0b97422bf7d0de4ebd09475b6e50a338daa2120b551bbeb2a5c041899f717f1618105c6033cf1039834ca0519ec71f094b3 SHA512 6248bb8482697705b3c339c70cb1c64e286cde8d454051a5aa5633220a31e310ab77080e6acca6b4afcb60ba317763ed179e3789ce5587527229fe6dae6fdf1c
-DIST genpatches-4.4-105.base.tar.xz 1559072 BLAKE2B cd0c70448977b247cf1bd67878fd2cc335179de501b115f5be14441c6b0f5680dc0b0f14aec42f2072ba8c63c812203a0d03e86fef4958f4b0f1ce141362066c SHA512 9129608889884057651a8532492f6ad2b5cb4ddc18bd21dfdc64c1dc97c43b97ef2ca3188808ff1d101ddcdf2f44661f8de363bc4a1bc53c07df22b719b5e6eb
-DIST genpatches-4.4-105.experimental.tar.xz 87780 BLAKE2B ccc052ca22d8b44df734c70872a07d2b7898b2320d47f038a13c55e9b072437d73d795ce3705f552b985a70fe329df09d9a19b7a8231a60d07d9cd227791e5a0 SHA512 3c80f5b4d54d9d1890f8a2ee2442b1da29b83bee4502371974d096731f85bbe18d79a3201a23ede662e762e6a1c4af8cf7c05280e81eb5e1308f5fa310ee4a14
-DIST genpatches-4.4-105.extras.tar.xz 16460 BLAKE2B 672957c70a6d024dc6791e643ad29e9f3e91972df1f66aa126744f31ac00475e10f84bfde3721ed9d6f997b23f01c4e5ece93de056dec31e984768a683ba3e04 SHA512 b2df138aff124f426cc88fc15e6931c19371c5d59de294f529828a0b8fb46197638a69d67995fa0f8ffc40202d94692904d4ea790de3ff62206498f6fef046ee
-DIST genpatches-4.4-106.base.tar.xz 1578596 BLAKE2B db4ebc32b4af5b13d436eeb28370207d308c8795dcad3f19e1213040584a114fe85622b7681765699d5e5e1ca6924c92409814d769a1434d6126b4e066ddbefe SHA512 927e4ab34c59e1a1a22c4fb2f162f7883188339b67688a31c707a7edaf33f5de36cabd709fab484b43da2dd0ec5101857a4c9be5ed10e490b36182fc208036f5
-DIST genpatches-4.4-106.experimental.tar.xz 87780 BLAKE2B 2e5ee20d172653a7d05495ced9cf759ab1ba8e8d20cefffa6c41c2fceb1192eaad2c8956b22ad7db88ffc8e3b068929d92b3042572f84028b9fe295382606e5f SHA512 a231ffa95aa64325a0d09cdd61d4515f17768b13c21c38c817e57b57dc244c1a162fd05bc408f94bd3cc5ec99a55748065e0384b9ff99bee2582203a7778c510
-DIST genpatches-4.4-106.extras.tar.xz 16460 BLAKE2B 7911a046df74d53a7ce79ed6c8e89f635f2e038806eeeb90fe19541cdef743992982a599a5f8e30a2079303112629d942f4e4eb31ae71a43168e6d74adf25a2b SHA512 3da45183686a962d33f6ae7a9ae10cd275bced09dba0913874737ba5915970e7142fe9ea96c1c294f6f43f10d24560a42d78edf664c3e6d0f1318ceb753a85ac
+DIST genpatches-4.14-7.base.tar.xz 170916 BLAKE2B 176af85faceb355a6a62f701f8f99eed90a1099e8c2a73808e2c96274398fbb94668a516f51675412865f1f5b8069b80db368b9829f57f9e6e46d356e446e8a9 SHA512 55615b8d48d3266e2b392c5bd6cf3d1a52167e1ea0e6f20681ba738a8db8c25a0aca47fe4d33ff592fbb1e58a59d611e5af49f4a2f4f7363e83ae63f1097daf9
+DIST genpatches-4.14-7.experimental.tar.xz 5180 BLAKE2B c1eb32bb2c1a0bb253b624bf9b825cb35ae174b372c1048fead1c019f6f72f6d0e39d1c5767c79fe380216e8cc61b0a47a25993cc50e144312249a8683088f21 SHA512 6a0d1206c7bea440cb7ac93719d972a7e8ad0c33817ff383ed8318a6c8904a701e84bc63d8618c36075176c5228420ae5b8935342b887cd5a54187f504d6413b
+DIST genpatches-4.14-7.extras.tar.xz 17488 BLAKE2B dffe838e8913976777080d5e7123e2341506ef3127a8889c5cde24a0662f54c62823780e4fc75c2d12cf55cfa50a591726981cad5d39046ee96e66156d6bafea SHA512 a22d9505e769d09fc996945cbeb35cb765493cbbcffd981e0b6afafdb9a03159be9acde754dce0f2bcf414242b2a62aa6b74b9d7762ffc169492e90fa495d35c
 DIST genpatches-4.4-107.base.tar.xz 1587988 BLAKE2B 827d3ae42c0fc412c165568edaf1f8550bf828d7e2edb7c5abd3013a2b639dbeb68d2e3a9656e2995baee07c7619695918e654174528ce3eebc8a891715bc636 SHA512 1fffc6d7b2c186c87c8b343d4bf5fcf94086dae9f4e70b2965f5dc8c18ff4753d417074ec4ad7deca29ff597a6e5d0cfca4bf325609596678febea5ac2f5ea24
 DIST genpatches-4.4-107.experimental.tar.xz 87776 BLAKE2B b239fcc9ee1d0344a9fac8b6ae8e712bdf97df7547a2d3d1d6b39ea23f50d8836ae8fac3bfffcc401b3af52dd333b2b2b1e1626fb739da608d247be5fc67dbf3 SHA512 49e0cbc980cfafc7992d92e0bd2dd07d594ec39b9ba0bae27dd915eaffbd78c5af6d3d47847a98ee9a619447b3b220faf0c44484dc99088609ff8053f3c5d907
 DIST genpatches-4.4-107.extras.tar.xz 16468 BLAKE2B 1ece602969ead12faab3e0e5d5703a75c737a18efe873d5bdda71ff134387f5760a76105262270543b4a0e882a9b5434905b3846bd68cc3af5bc1b0383122cd2 SHA512 0843f4cc2cb2b3219f7e1343d68062a9c86f08c51c67a801f82c7685c8c0eb92ea32841a8a6d4bb8da9fc9882eeb965bc66317d7c14e7a5ffbb58214f962dc35
 DIST genpatches-4.4-108.base.tar.xz 1596748 BLAKE2B 20fca27a2b2b68f6e2b2b1254f21498805597470c4fc9a01a33c8d03baea3ae62e5b7e8af0f2f16f236f84063e7d6d24351b8b7ac07db198c1c98d5f0a7ecf51 SHA512 8fdd0a541c8c7ad1800557153d8d2caea2c04abb6ecc50eb0e789cbb790fe63192bdc4f2a3b6c9a0f7059699aff6385082491d721466d696968ba69861987a0d
 DIST genpatches-4.4-108.experimental.tar.xz 87776 BLAKE2B 16109490dc0247b221fe7cc51e53628e3f458c0387e2add18ec79ab6607189287763eb90c20685fedfbc4a8b06a36b65b16b25cb2c60aa8a33e1e8d72858a53f SHA512 97f169cc9fcb966118ced170a26cd58926a470a8b4bce5e96dcfe352f2537d0dcd2c3407d2b4df8c07d10d00e22f3a32fa82f3621567a367cbc59424203574ea
 DIST genpatches-4.4-108.extras.tar.xz 16444 BLAKE2B e5779b1707eeedc2c79f8280b995ad8e3dfdf4d15f12f6189da7b1600d72e9ffef8b94b7def795415862d70e7704170bfa5fb26573d4ba69934357e351c9ef45 SHA512 ea496a3275612cd1b56ed8be01c6c4b413b39c0e0815d52ba359dd50c2717ffe123ac92138c4f9f61065a3c2c710c54bfc63dc9e35314ec30fef03e5625bb2db
+DIST genpatches-4.4-109.base.tar.xz 1616300 BLAKE2B 26be64d724314a04694cbe78af7799df110993729b1516017c5ee40fc83a9ad782d280ecfe2237d924173da6a0bed24ad091b9d42fb9e4db0ed4f1b173af987d SHA512 2d05db5a2a37ccb73eb1541e00a0bc418aa9ed210d64c371b9b4847a31322523516ab7d2fc5b93b3dd7fb19a864dca9762a13fb6e08311780950743b89718127
+DIST genpatches-4.4-109.experimental.tar.xz 87744 BLAKE2B f22fd19a026a897e526ef205720d9bb6ca0bd569e2bdd84333b3fa729c4409ec8bfd0abb83f61dd08cd5510c5ba5a3f735fa0f14dc8b3b2a15d3bea6740985a0 SHA512 e3d0a500d2ab3502f03246e048a68e5e4082fa15d5f5227785245737d9d0e0cd27b8ae2b0904d64459d4cab071015226b0843ece6ba4e35b3c9deb61bb951e00
+DIST genpatches-4.4-109.extras.tar.xz 16444 BLAKE2B 67440d30e36e1754bfc785dfa8fe5312a3302f33ef8108d032f304498ff665f3c5b4409b55bd87013cea5f267f40e2529a9e21f2a6f8a3cf88817f8ff394440b SHA512 e27327acfd90654509650fe8e082414e95a71d23d9214cac2e57af9a7bb3f4aae686e04e1d73674b6613e58c7b5a98c9ce9f7e5dc2e5ad8b93ecd79c13488b34
 DIST genpatches-4.4-91.base.tar.xz 1428436 BLAKE2B 4b706e9682e883dd1954632efe5ec161347432a6260c353e160b8591f8377e6d1e1768acd2e3e72237e3ea6b7104137e3504e3f290fb12b0dabf662b0fb034c1 SHA512 cdddd25be04b33558f7ebcee66df992aae38f29181474ebed82958d4d50639097b4a82eaf256d7b3576bfcd0cd3fe7682956e1d2cdbdb912d47fe86205d9b554
 DIST genpatches-4.4-91.experimental.tar.xz 87760 BLAKE2B d8a165fb3708192a12e826a713e896ca83785da084c9a9aeaae909473c598669867fa303636d762facd2d7bc1a857da3ba0d994ee62d008dc17955dd84181942 SHA512 0bbc83e076d45da1d0258bfd7f6acf6170e99891a9a857b2552f3a0fcefff4f318a8c5c8779591b0bb654760f905530de18723f2ba960618eae59a1b7219c28f
 DIST genpatches-4.4-91.extras.tar.xz 16468 BLAKE2B b99298cd9e57a2b8a0619495df0450373c9f5c14ff2398d76534c7167f3a563c05e67f9aff80ff97a474ae7a8cb298a4ffbc5eab25d79075aac5cc01964c3e9d SHA512 229922945fcb882a0cb7dcba8bac9de51683690462a8df59e181a03d702fcb1c9b54078c5434624b4a197c481f0bb9b73dca58456ef5a5884a30bfd3644dfd6d
-DIST genpatches-4.4-99.base.tar.xz 1507732 BLAKE2B 90f6b0dbf7f7a2dc54c47e6722bc0af102cebaf9d9f0c5c5cc455b5689753589ea7e0a1dce831508bd1213c3e94919daf42a8b454b5cd03c17b7524bd6ee94b1 SHA512 fe1cc9fa965fc42d647898fed34323988c6a4b38a747568f6710293d0aedbb865aaa50821100b8c240f7ad8864bde44de3953c3ebab5147c5334bc4aa423dfa5
-DIST genpatches-4.4-99.experimental.tar.xz 87760 BLAKE2B aa8cb76c724cb2eeb7e3144eeb970539c3db2a4f611c8068708e4d71bca2243999b470351a9b8e76f48046fa65750223f87d2a99eed4fdf8d0e4895beb2465c3 SHA512 40f7f034dd40802adf2270ca5482c8db1a63533a552346dbecbfd4ae925430b50e712cf9fda3fe1c5993215fe4342c86bbd75d6f31c7e75913fc6623c9fec228
-DIST genpatches-4.4-99.extras.tar.xz 16468 BLAKE2B ff25bf4ca04c5095afed263988b697595eeff2823c87bc44b58bbfcbf241de3f6d77d239019f9ade8248b84a5ab5c072e5c042b861a6daf3dcb156f40980a39d SHA512 cce5dd2620edcd13892fe3de55f098c2cd080591a47f08310c3925cf9776c33ff6547792f7c8cfe130ed0c54cef4ea7544e2a28e6c1a37f9d89d6959db56b024
 DIST genpatches-4.9-51.base.tar.xz 1001928 BLAKE2B be8a1a304f634b40dba1daa56922473c25fc57cedca73401bc1a142674832bb797f805f883aecc56a4b17fd63dae6aebe42f7c642739e8c5704f130b6675dfde SHA512 2ab0efa23c556547bd223f066acbebe250346064a3588ee866871e36e3b5b5533ca7a3add6a62b53339acf89dfc8539c42b3877b5a2055ca7e20bc25c5657ca5
 DIST genpatches-4.9-51.experimental.tar.xz 106416 BLAKE2B 483d57d8e19a135130e7084238c304e07ddf04e51dba8aa705566d4be3cf3a3b21a1f8a4ed49a7b2b06bc5b70f820788bc22e42ece8e6eb5d3ea3597eaf31289 SHA512 af7a00b9a3200a50341b9af607fbef362ead2e4f5ca35d58eec505de490c03d6366ab4645e35bbddd6903ac75396413d2902b6a9fc7e2c9d0d1d1254620cfdb3
 DIST genpatches-4.9-51.extras.tar.xz 17356 BLAKE2B 03160cc66db43d543f4bbd3171741cc36ecdd1d3088a143144e8725d1a8452fbb3743dbbd196ba387875cd0eb4fd966821fc9d3b3269a6848d2fda650da5ccbe SHA512 e05c44a5ad1b68afb04647a86efc6f67e03515861e670e39f960c0a02b87fbcb71194efa6773259ee2be5c8362794a5bb6512e876784d5a521d8890865b3ba0e
-DIST genpatches-4.9-61.base.tar.xz 1158552 BLAKE2B 88297a1b9f10db6a6dbc1eb5f5cf24db3161560133700d9d43ece24a7ed67876a734117b75e72da7cb6d4211c90e46c9fd1b0b61417d1540b1e2fd9147bc48d6 SHA512 dac7ef5bac6a116c813e614861be3304fb21d5fc004fb6e8d1cb7f05cfc7c4384dfafc8d8482efa737d4cbaaf110701a1c8ed23116aaac394b7ae3a38ac7c785
-DIST genpatches-4.9-61.experimental.tar.xz 106392 BLAKE2B 0d3617879407a74e7266288503bc644c49383ccac7a6c4685250014f7f6df33403118b677acca8ff944eac2b366a65e2865922c825e2c94133f8bd40fa9ce358 SHA512 5dc9e00964aa44a782dffb447b13fca58f234627882cef0009c53f747bf633ec9138462cf58b12f288545e2af5a33cfb2adec49b3cd1a0da96d7967e1eeb116f
-DIST genpatches-4.9-61.extras.tar.xz 17352 BLAKE2B e084d1482e62de3375401f45e9d4c158a5cd5f5e60f880963609cffa2096704d4588179ba7de73f739848f2b901b347f580282f89637476bdf46d107a54c91d5 SHA512 b1acc2fe16a07d8927f5b2c21f982fde4dda608d9e80db8cd6c60739887d84a86792d39f8975920276987880ab344a58ef493816061f926c27cd7b059bcf5552
-DIST genpatches-4.9-62.base.tar.xz 1165604 BLAKE2B 09bd68db3628c20ac9622887e7cf7c88424bfd46a1bdbf8557f75b2a72c5c178eecfa3a7735bdba14cc0cbcd0e91a38d32eeb34a30be43ef5f8be4db71087d5d SHA512 6fec6da3e943b18235427d1df588aa3ffd5337c3239d1525f8cbb812ae2f250ba1b358b29ff80d08cc6f8f44e554e9c88c0500594a65f24ea6abce47f136a26b
-DIST genpatches-4.9-62.experimental.tar.xz 106392 BLAKE2B 2c1957e8d90094c264616c54a34ca77faf7b8b4bb85d1c803c14ea6779dd8b320ff4bd0445eca3d539a60210d64990596863e29a6d4fea7d81f87210987cc6a0 SHA512 c1134056fa2be38f70e6fc3315fc7ba396d36f03d6cc3a58b453558b242dd1902fad06dbe64454fba1f25d3bd4c856c76cb74d525b016f276e990704e6a80ace
-DIST genpatches-4.9-62.extras.tar.xz 17356 BLAKE2B a75b67cc024606cfe50cd2b9722ebe3f03d77da12cb37c8e9f471137c9fdfc1b282dde179b50822999262247572f90495f0805ecea5bd94941c50f4ec43ed8f8 SHA512 0e37dcdb94a7c1cc9f55de24c90eb07f2c6c5c63044d68f862e3562913bc53cd0882d8ef48e164eab5c3e201d5e9cb50145f38f59729bad9ed79f9a8b3a8bbbb
-DIST genpatches-4.9-63.base.tar.xz 1183404 BLAKE2B 4e49c39b91a86ec1d7cb0bdf24c9cb9c66bbd3fbf9847c1d2246e98618f49f57b4702699fddad6595003b146f35b2b4416ac788410d4dd5076342ae470834c65 SHA512 cb8e7ee1e8cf88e08bad0ec7078667f8cb044a5369a7bda6db68846ac56696d888125527b3dc0d4b5fc90bc072cbd31a75c327c6317036ba697ffa235c1c074e
-DIST genpatches-4.9-63.experimental.tar.xz 106440 BLAKE2B ece4f2c9cba523a9eb44a59a4ae8f3bbfcba22660f9143fb2ba23ddbafd6468459b1a70cafc373145a33c07d0a881c4d1b4f3a262e3ddd59b39deb17a58d95d3 SHA512 3c03fadd3a532cf0db5e3b7a319f8ffa6a96e3d304f31cf017baba5766da4af619daacb08749ec12bf8d62ce7439d2087de05b07f42ae0a41d81540f130a615a
-DIST genpatches-4.9-63.extras.tar.xz 17348 BLAKE2B 613eef1455b723fa71d79d9df0c71f29cc7e1507ae0e2ac588e1410576d18d1320107d37c9f462477adb62c6f8c3460b557b11d6235c47d5ef2e85f2bcaa0940 SHA512 26e91da7d56177e7d0ec5c0c58e1acdddb99432978551a60cd48b58800c6f286054fbfabb87cf15b56ac4b7102c12f2c3edc2865f8fecce89e7eb0e7191ef1fa
-DIST genpatches-4.9-64.base.tar.xz 1203336 BLAKE2B 318c3a751192626875fb0c2f9168b5ce0af9b3825b458d05511570e1d091b76ed9e3abb2bbd1df0b215d8d81c146df27bd4d2caf72aef160cc230773ee04c4f9 SHA512 34bfbd0f72570d6f50b6d22b10dc2aa742b9554e467cbe82fad8c9fb463baaaaf7cad9acb46a4f65f44c3d720af539fa5923647afb144363110ec0cc3928bf65
-DIST genpatches-4.9-64.experimental.tar.xz 106388 BLAKE2B 5e6f5dfcb6062af4e7bb8310e2018138d70e92f91dcb900280c4e6c909a0f97c79ce658d4df08b6886bec6ec3012b14468e1235dfe64b10af49abf2a09306f12 SHA512 9ba6da1ae2a618b5c766a1b9cabb459d5e3296643ede83fc9a2eb3991030abcd37652e1cdcfa9f1756f42b386b2fccdfd498ccd6e7b54f87e7c953cd05faa8a7
-DIST genpatches-4.9-64.extras.tar.xz 17356 BLAKE2B 0832648e3c54edece9cf4d1cdaf9f8c3bb7d68430367ae30bf14bb87e165856c3ec1abec4621378245b4e7fcd47efb4ea02846cd52952dcc06ee4a9de1e75f11 SHA512 2788478d0f659ab53b9fb5569cb6286b7db457520b2257db19ba8b9e2ef08be7e20e1901fe6d09069da09c8504507b2c1ea8ef3483ea5fda5272902ad49c18fe
-DIST genpatches-4.9-65.base.tar.xz 1214800 BLAKE2B c96065b56d5467506fa62e14ab0887e2ca8cca54f356f9bd600ef6f8fd344d55fcddb0dcbe018302b51096c5d0026e870032467504a5e5ae14606b2d6dd0ce3a SHA512 7610c1ea5d98ffb5d7f1f036c6dd9d67dac5edc64d5e161f551e3091f295a2c5c1e8f4c0be02450c6c50baa65435b127d0c57c7118184d59377c13ecf6b9880e
-DIST genpatches-4.9-65.experimental.tar.xz 106380 BLAKE2B ab340f99943fd160d3180be21cbc0f736816888d96af6f8e23faf05701576450e00736e734e129d9b5daa8fcb61e5fa1478191b1600573f64008428f1f9ba3f8 SHA512 6463eda4311ea2e47233076970a196fc6a55f79791c9e776b77ad54e326c9dfcdad1befb677323befec068bfe4740b137b7af82118920ddc6241c002c7040466
-DIST genpatches-4.9-65.extras.tar.xz 17352 BLAKE2B fa70933a00c725c6f5514529d37cfcc27730cd719f0b86c981e3b538ba822ba32d1d64b7801e092eb20fc7058a876b33cc87dbb9e9b8332db60455dda3ea580b SHA512 ced79ee5bd932605f3c183b19acd8a4b38a0119bcb74908e5949f37060479a3bb7b69dd0081f38e23aff2c572778d59939def79fab02b4026e6c496e1c19b8ba
-DIST genpatches-4.9-66.base.tar.xz 1230840 BLAKE2B 18b0dafafa5789b8ff3dcf0b04043bcf9ec36c4024de9b0a2acdadd8caa62ef5a2449a66274cd7f884e671bedecfa1d689e6c0bfea460a14d338d964f2cb5c94 SHA512 b0a3ad38f32e4ddaf591977144ff7d292822433ee87c0af3adf5b6493feda8f9e3f9d49a7c1813529cb24ae4f83b434f7e75513ba068a2fafed4039a1383e8b1
-DIST genpatches-4.9-66.experimental.tar.xz 106396 BLAKE2B d194ac6b8374707be1445458a5ee26f47154adf11e87668a5a0487cca0e7e42ebf365df3910ec66729954cab9de4ce7711679e311bcfe7a22566e3e4085a282a SHA512 efe86fb3f0e29e62919cf4c175405fefa0f9a3a6d9fa02bb98a922a513c1a3672ca059058004cd023509b87499772a0b634db0d8595d7d947652813c03dee341
-DIST genpatches-4.9-66.extras.tar.xz 17348 BLAKE2B 979895fd39c5c51a7a6aec25594247b8b8d980aa7ec79e293e9d963cb2769e7e6a4272590ebea381446c0d8689cdb4bf6c689827db1cf1f72122954cbadee26d SHA512 d16849e39d0fae50deb3aba0824020a7a64f1c4f566ab8bf0e90a8adb21fe94c06191651315f3607ede253dd6369cddec142d51438cd5bfdfe686a3af27bef0f
-DIST genpatches-4.9-67.base.tar.xz 1234920 BLAKE2B f0d33a73b4565b4dc52443af1197d4707cbc2678c787d52ac08ac355ae0bb95fe8affec304ba68fc72c1ce4e9a9af403770da1b0dc6393e251a722feb1896d67 SHA512 837b32b66b046e7de0927b39fe049f5d556a053cb49c53e1214da31d1e6a18604edd0204ee9d1d7cf873908f06d9808c500f4c8b597f6c974a0a07daa0d9f7f4
-DIST genpatches-4.9-67.experimental.tar.xz 106376 BLAKE2B 8dfc71899c2cab0235d1ec697ba8b6b127b9563dec410275e7af97f1bf6a54965e17e11747e8aaebd621194db4c160987279a550a1291da4af3928c4511d3fdc SHA512 7d536a0e5feae1045cf820840b50f0d8ff28c0e255d45c09ff80692c681aa287ccad3fb5336d3597aa99e599c73a750ff408e945366acfb9f1e23dc0b691eed3
-DIST genpatches-4.9-67.extras.tar.xz 17352 BLAKE2B c56b8e7483fc9f44fcaf9303136143932f6abaa27e92be5cc4c1bf946b208a56247dc34e205dfb355d6664e5666858213f7b11853660e832f8bee49f5bed3265 SHA512 500793184ddaad5efabf43dabee89fecbadab3a3a2c1d3c6e9ccddf3099f42fab3b3714f711a1ee640aeb0dd1a3b52728a5b11a9f6f8f20bbe83362e82592141
-DIST genpatches-4.9-68.base.tar.xz 1266744 BLAKE2B 287306aeecbab6cf9b9c08440ee333e729d0af555fec354400c54e407a1c3b8a723ea95c28b7d3c13fe37f4c7fb78c273eec8d6a68f31b68ec24ba45a374bef7 SHA512 4ba94ae3f592cdc466ab58e4bba9781fee915df4994beb6c9dec4efd3622b180cf0d145de585ec9a7361ed2ec636910a42b449d937dca50983bd7f13494edd16
-DIST genpatches-4.9-68.experimental.tar.xz 106380 BLAKE2B e360ddf86cc6db981937c188ccd5106754c7533ec01e6e4d4c9dcef72092b11c4d9accf0389414c3f20032977e010d29344f1014f490e9e13cc51b59d1f59d1b SHA512 000567fef478babbe86b706bc9532756bf42f2c2e09aa3f4e39f7fff8d90fd9dfe65929fb1b9473031d6529ce4ea4a9a8dd8bb7dc615a58f5157ccb2ad4b9249
-DIST genpatches-4.9-68.extras.tar.xz 17352 BLAKE2B 215a823f33f6d5cccbfd9597ae123a885abaf1bd2deef215b1f4c76dbd0652c4160152b96b62cfaa7523899f49263a48d49c9bfc43cab3fd44ca3aabadb54605 SHA512 549e8fc65d62b5197ffd047b7c281c183d267a7d93dbe4c46fe19c161fa84db9a00db9e4cf254431303dbfc8652dc360aa53af8057ab5a433fcc98dbc3748c9f
 DIST genpatches-4.9-69.base.tar.xz 1274148 BLAKE2B 732076c76dc8c5077ea804065c86e3c384004b484d661c60a5534964fe94a07ea86e6cec9e47d1484ace04a22123f88ac9a511e90998da948869c266f3b2c3be SHA512 5db83495c9b9757822df7a3733a29cb897163ce51bbb143fdfd31d42f9e5fab73dcd5c4ef18fa0c502838359ad3d9b9c9de625041042119df46f68d847eb26e6
 DIST genpatches-4.9-69.experimental.tar.xz 106392 BLAKE2B a8025d5b3c4a86240beaca7237f8876d9690a6029dfbed72ad86b4e64ae69103717b034d3071a13d70e966ded9bd5847f40c9a81003380b0e0c6530dc0f404a6 SHA512 b91c383adb79de67fca53d4c729cd449973544d5d0c9c03cbd4fb2eeab37db4c018d460e15c985a8bd63ce6294dad160ad44dd9cfaf860a35e911b4a31594291
 DIST genpatches-4.9-69.extras.tar.xz 17352 BLAKE2B e9a8c063812acf2155ebd6241e6061ab40328194c3a158feb8e53d4dc464b011184892ad8a0f240ef8cd8e5e1569981999fc46fda9d23b8e8ce9e1a05d8a7109 SHA512 5d48f1dc65bd352fe77793f3e8f5b3f689582aaa649a423b62ffc4d4e84113d6cb305d60bc09d37c191c46daf85e5021b27b4c7097b10a7df0aa5335d5e8116c
 DIST genpatches-4.9-70.base.tar.xz 1296720 BLAKE2B 77d1f7205ecf185b1ba438737d5601b178c2bf7a7abb495eba32b96cc0431827ae7a4c3a8b2a5a694c72e266fbb9a403b1be910c161c0f07c575ddc010edcda6 SHA512 5359503b833430531a75e6a67d841031d1275034db9cc885180eea6569bd5ac52325fde6a650902f988850b87ee2e184b9449020ad197278814cad75e38a490e
 DIST genpatches-4.9-70.experimental.tar.xz 106392 BLAKE2B 8fa9653f9bdec9a2104730fad3e2d7133da1ff08d8469c79386fd133e3de46a5562d4efa9087f4e7202143357d8f0fe777a1ed04e8267939f9eecdb333298f27 SHA512 fe319fb330fdde6c172df864b9ffcfe3b7449d31b66af7a739dbd6f1f721a64e94c450af077594e208d5c52cd0fe9bd60f320b73898c2e5c21ae2b0ab97cf1bc
 DIST genpatches-4.9-70.extras.tar.xz 17352 BLAKE2B e466ca37103e8ed9eef13095b939a2adb0827da183bfdb866e3fd6b99f8821dbe77fdf0e64f597d1c09c9e916825a1563211c5620af2ce9aa383c64ac4e1bd4c SHA512 9bfbc48de9c0b460429fe51de7122b7961907bcb66d7acd7a1e93a2bc29960e824737bac3fed8193758f50a0f6f5b540ef58a8364bb7948e0103f64bb950c8a4
+DIST genpatches-4.9-71.base.tar.xz 1324744 BLAKE2B 7a47aa8381c09f3f0a6898576c7338db56056c564f63e62e5c0e5d2dead50df94d3735b388913b68fef04365d459488621db18eaac3f5fe3d3ad02624644486f SHA512 fa80e013125dfbea5fb5d3a6fd907110001c08d8e521b0491a17c9f0496f1e37b7c7d0272115648212e530b639807845d52212bf64dc8db38b1d74381066ba8a
+DIST genpatches-4.9-71.experimental.tar.xz 106376 BLAKE2B 12c185207671d701640a1850ca77c851404ff71028a37af6da30c04dbe3b12553626ed04518f83b97545afd144bc0808b3de9f34eac29fb108720e3e27e1b4ca SHA512 d7036273e39b14bdcb843332630ec6ff3360bd3f402ed724fafd1ec424b846ca30ff6e7c2e99bcbf5c53c65f19de92641d4acf0d1553e04eef8a8c39fc25209f
+DIST genpatches-4.9-71.extras.tar.xz 17356 BLAKE2B 7459d34097707897e114b58b3402d4ba7603156deb7fd3444e1ae777a38a821a743b9267405b738b2af9421702e2a46a5927ce39c700950e9940e69f0dcef010 SHA512 572cbf8b83b2a43e8a49b7316495dbb027a14bdc74febba9629026e31ebaf0496b48104212f694be3cd1a37a28290da6564dfcac711db1d4ba84b7ab78d3123a
+DIST genpatches-4.9-72.base.tar.xz 1331880 BLAKE2B 95633d5edfbb0d0a4a540baf57d65903dec6ea59bd65b3b79f5421954d1c771ad7e6ca83c6bd753f5f6bb2d89f964c1e67e1dd118336e6a39e25d35ed26e75d7 SHA512 38ebf8069d2a519f477e2f91a3fdef24379684b82235a4002547b4958cb267442a669638a71bbd6c6fdfc70198cfd7922319be310cb5978d566a4b653643575a
+DIST genpatches-4.9-72.experimental.tar.xz 106384 BLAKE2B a4e4b637d9441ba3dfa32716453579dec282c959ff895cfd94cb541bf4d2f70755e4da4e0e453c367fed6388d5ecd71371702fdccdde9c198ad758aaed2ab0e8 SHA512 5aef8acd3de7054afec6efd4ee13fcc048a9b5efeaf70b377b07fb728bb4c09e274cf74ed3eae131ecab3c0c22b6b4539a3ff2df97d18c29468313aa9e6f0910
+DIST genpatches-4.9-72.extras.tar.xz 17344 BLAKE2B da29beb376baef01ffe18c4e0ce88bab6dba8b977f0c04dddfa6dc8e94831fcf72be9e09019b6687da1a7aeaf2c2e010412c9131f2a4d169e6c6cb06c8bcc3c3 SHA512 46bc8c28c18fd5dd1b8a4a609cc091532e17630088e763803c2a8a9e7241762a83f02cc8e2b044acc744403a4d9cf99a5d6f727a27aad41cad469b2f2cfc2a32
 DIST linux-4.12.tar.xz 99186576 BLAKE2B 02d031c7f2f29849c06a6b5b589af78bc486a05a758267e47f2ff16844ae8ca701fff53cb859fcc105f7ea92c0769acf8d7f7cc116444c15235ef4d63cadc8c0 SHA512 8e81b41b253e63233e92948941f44c6482acb52aa3a3fd172f03a38a86f2c35b2ad4fd407acd1bc3964673eba344fe104d3a03e3ff4bf9cd1f22bd44263bd728
 DIST linux-4.13.tar.xz 100579888 BLAKE2B 2f8be07d403071b097b019c43fa332bc7d4805dee633a6fdffe5a99d5475015ca9e4881e7f4cbfd36f8c451bacf423436364ea3d9f25b8723a29a178dededb2b SHA512 a557c2f0303ae618910b7106ff63d9978afddf470f03cb72aa748213e099a0ecd5f3119aea6cbd7b61df30ca6ef3ec57044d524b7babbaabddf8b08b8bafa7d2
 DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
@@ -137,38 +66,18 @@ DIST linux-4.9.tar.xz 93192404 BLAKE2B 83ae310b17d47f1f18d6d28537c31e10f3e60458c
 EBUILD aufs-sources-4.12.12.ebuild 2230 BLAKE2B e971208fb3fafc490d6e149da7237e7a9865ca3d171ef7515546790b8079bf4d2ab3f358cf2f7e0065ceabd555388032a49476280af2b9e923aab60ab2a6b911 SHA512 f3460edd57159f911576b2d58721c993a83411de0dd41c2ee47802a0a06fa8fe434ee3f2a0d7bc8acb386957cd83f81ffab3aebf062a818ae9f015cfd1ecc650
 EBUILD aufs-sources-4.12.13.ebuild 2230 BLAKE2B 9fa909db0a3bab90af5534be84565ead85e7a192e73e8e49836a8ddd4b7a558a590f1aca73538a6199d232680852341acc44756db73953fa04a2fadffbed6920 SHA512 c06e962577b688299cd40e0bd5dd82349ca35623a24df8516c999115190889fae5ae1dd57e86b9b7cf2d0db0e748c95088bfff8271983143b4f3b782c3ed1a1d
 EBUILD aufs-sources-4.12.14.ebuild 2230 BLAKE2B 878006cb91cc11f68fec829ae1bf37beaaa557632357133e11c173b4105ed897e1ddb6299d14327a06eb71f838166e9e3c41157b4c7b225d831d35fd3d51cdf6 SHA512 4de222f27c0bd5ac418a5046ba21145140a6498dcb2f42239d855eebb9da9ecd1160a76d543b3e02290f0b617a00a8966b2999b9a4d7fc32236b5080a1d808f3
-EBUILD aufs-sources-4.13.10.ebuild 2230 BLAKE2B b1efa9e6a9399240205365b330ee0c07935317d9454cf7a533e8228009570b684ef73744fd5b441fe661b6caa4041964f45ff61b9003380f19ed7fa682fae453 SHA512 c2d4dc8adf0485374b0c654dcd4d1739af028547ca2e10e94546ed56f3cb8a3e89216563cdbadd195fbbd7b1242e15699c7111b219f04a936b724e952288e4ca
-EBUILD aufs-sources-4.13.11.ebuild 2230 BLAKE2B f07abf66aa544da005ba92b67858f32a5c56547fca3573aa5862ae84183196bc087b79ae4333136a823bad02fa5e5adff866f54b2a89d804152a12ceb60d273c SHA512 f6011de6bbf3e035211cd4924bedea3d2c5563f793943296b8909b893d1f5653ccc53675f42038f0d6e4371dc172bb317d5b1d1f1bc571c3525b3e649d7d1bba
-EBUILD aufs-sources-4.13.12.ebuild 2230 BLAKE2B 72efc6f434aefe4360de92fe04ec898f03b716144a8dc9f39c8d3dd43747d3db3ef2c4a7de4b409a0d7b7f12f383780981edaf44d9edc4acb0401f139c6c082f SHA512 2aa890e24956de33602f2ddc1b51e36e2fe97bcd422f094858db9203064efa7b4be4b16dc99d8ab2b9459a16929a156a7ef687af5bcd01d9b19f9490f5861f48
-EBUILD aufs-sources-4.13.13.ebuild 2230 BLAKE2B d25e486913adf95033af777d5ab8896efb519645430abc49c5566940f9c63b7b40c80059a2dbf3dba9a3a71c696db0308a75f74b6628652e27cc1670b3f057a2 SHA512 7560134b92958c8c0a9bba913ce95bfefb48b46c2733f581b88664cb634aac8d6f26e217152fe9fd8221ed8667d58ce68886dc09bb9bf5b768d943d4e0d4d93d
-EBUILD aufs-sources-4.13.14.ebuild 2230 BLAKE2B 085df15ec058e23cb9c0f3d3fa4bfc16843044a8ff2b621c72fa047cd357c8d695dabb6e1968243bb331baa430b8db0980b87fda3640676172afc60fbd6c7221 SHA512 0d87eb3d4c68d291e02f983b59eb916766a171f2369cbeaa3788fa015d5af5801fb5aabbe6cab987e4d2ad29ecf7ea5ec0a6d9ad9d1e621795e12efc45b4a1c4
 EBUILD aufs-sources-4.13.15.ebuild 2230 BLAKE2B 71f9e09abe663f882f81cfee2fcf3446c0381f99247f7439fd2a1d1ff82d89da1c9a7cbd2d25f4a1c54eb62cb00940cd141006ea3f685376cbd6649e73c1f4fd SHA512 de850944abadd3373f72802cf80c7236f846aeaa450a6b96e8ead6918fd6a8108c078fb4a79717198bfec0eca68cd648bff599f82bd303cb1f20481a22f90833
 EBUILD aufs-sources-4.13.16.ebuild 2230 BLAKE2B d1a9b278ccd136842899ed244cc8ed8385d05bed9189170672ba5412b05e5f821bb98fea8b8704f1588e5d4737f3c3a50023ce7aef542af6c795c425f99274e0 SHA512 8a858460f49967240fe028c7771e6623447bd8b7140256d77149768aaa42f8b975d5fcc1763d7f59d76e8aa9313766e5e1f05a00096bb1b8b8a4a416453c937f
-EBUILD aufs-sources-4.14.1.ebuild 2229 BLAKE2B 15d615468d232133136982eee1a89dbea334504fabdee9d329ccc853cf4fa20ffba147deaae821cf54d4329f382520f2ce9fe2dba278a9a0d7aa89b824465ef6 SHA512 fcdf31d4e0e6f5bedc805327f76aa2eb77dbe24e02cf1bdf748169032491761f82edbd1b23f32737f4864954e5cf6b93b190c8979bf3331308f4b5faae7e5868
-EBUILD aufs-sources-4.14.2.ebuild 2229 BLAKE2B 1cde4d57d1ea1621dfb8e6db76b738e7ed38b0b0cfaff356163385c47bdb2255a476de26b0e157a1c8b3722042117c4a0cbefed822c1e178772cd5348452aa1f SHA512 74a2e930e592856d95b46d43c09469a07b8ab3db3902c3b4e03f21b2f635874f2fc8db29bcde84f28a3122bc0ef2ef562c353912e7d5f9f99fc0b37907afe7b8
-EBUILD aufs-sources-4.14.3.ebuild 2229 BLAKE2B 3703e82d7c8a1ffffceea4261419f90abacee9eed9ce78c212599c78cb4d95b88e245ada2a255f092abd0a798644f911b4b1eb63186875cd98a91f5669558259 SHA512 b4675fcfe917d6dbf29af1b23833acc54b21fb07053928f06ecaa23eba6532fdf9e0edcbc88b635684be1ae2411d41dfd362e97a3cc2bef1220f55a52554d101
 EBUILD aufs-sources-4.14.4.ebuild 2229 BLAKE2B 9427ee4b97add5ceaef44677c1147445a0eaf50c12ba917500dacede3b4a464ec7e25aa907f1743b551e0f3a86997e8c86d81b702bc250d9c9fd47d8422e21cb SHA512 5858c421294703df971e62c12ef1993984d928b24ffc8f9f55421ddd77269c9d024afbe91fdcbafbc35c20e897f29bbbfde6f6fcb4392803a6fd2acfdbd3c758
 EBUILD aufs-sources-4.14.5.ebuild 2229 BLAKE2B f6fee8a8694530b2d3c0f5d42b1e1de0d6018d8cc5621fb7521d7fe724d6cc22bee88158b79f9ad70054902828e7ff94e1c9d4688ed8a35b393fa0de4b0cb3db SHA512 7e83491623761a87f008ae1a6a140102f17e76fa5f8950c235330dbb14bfe2fd5a3b17b54a6603f585051e791048e3f39f4cdfe36d25386bdea91e16ff8abd43
-EBUILD aufs-sources-4.4.100.ebuild 2230 BLAKE2B 6f7990cd623126133f64ee7c3e6d1ac88d3d143fc9c4db6ce5b110cf88a1b15a6f3dd007b1ce96a6c5eef12aafbb8743da93094f45779ec7bfe48b94a0a5c070 SHA512 419eeb1d94a6e8dda80b7100d1164654a0be0f333c1dd112ea223bc6b526d6e21bd5160159841bb83b39d16e1e767d90da337b7041e44a50116b13a31d65054b
-EBUILD aufs-sources-4.4.102.ebuild 2230 BLAKE2B 96d8ff9be37bc3de15d1f582166b1d463c80aaf335a457b30af4b11d7fb831e271bbfc907cb845fbb50005187e2a6c4918a2a6a6a45b5aee6d02cc5557e1119f SHA512 582fa4ab8f00c56e7c8e5fc7704d035bc18e64dfe34ab930c0b5a243606c04270a99dc82f0b60530b486ac88e1ec69388878b3a095ba0c480ae0221d3028f355
-EBUILD aufs-sources-4.4.103.ebuild 2230 BLAKE2B dc5df12376b856a9700139a5b5aba5f2867f034143428a456daaf37f4a9f486600f28e1a34e9df684f4aa52918ac045b9d23d7b2241511edb065316d9ee4729b SHA512 455963087b12dd30c1d09733482dc182e8f0189aa22f19b5829c2c1d4c7e5be66858e8afe133055f4902f854d6807fe40642b92be43bac75b7f771485965571c
+EBUILD aufs-sources-4.14.6.ebuild 2229 BLAKE2B 635f7381843dad471c44433997e879d626afdaecdf06f0e4ae9ad04ec89a4ba1514a40398ba807eb5d7c167c99cd7b9af127185c54a126bdb4392cee8ec0c0b0 SHA512 b8735d8a51ae3b728949f9646953f437c426b5cd35639214965ced81fd15fe725c9f3137ad1bc4758d8e82c17a8975002bb6b14f6bd9e0607d01525c72c50cff
 EBUILD aufs-sources-4.4.104.ebuild 2230 BLAKE2B 7a9ca3e6cd72247427066785157924eca0cfb71a5100222bc88b36b43f9b0be69ed30df459210af4788de65c0612f4bb8d8fd9cf1f810c6b72972e8de91c5189 SHA512 e797e62f2b379585bab5c79c151819f56dab9b41a6af608615757f7731b5de8ce75dc2c0945ec797c62f1a287ed0ba50956e7adf252634c4f9e8ccf09f1c3549
 EBUILD aufs-sources-4.4.105.ebuild 2230 BLAKE2B 1af796992d6b7e1b45888c3dbd9d35e839c5711b2a33c3f09c7e25e7cde11aeeefa5f3184398702c23e663baca2e76b855fa562af4c89597710ddcd85c3e1a6b SHA512 a85dd5e50cf37873f5309f1827d2093747d051738c7247fb66f52a23de3387ba23940f6ea06533ab5fb9174f60bc2adf01ddee89d62325a2039c7df9fa156c73
+EBUILD aufs-sources-4.4.106.ebuild 2230 BLAKE2B ad0645144376521b1d2ce745a0f1afaad63e8a57d0ff9b37d393ac284a91da504ef817fc8f43c5567aac1c2166046dcda46f2872281c128a83a0627804e01a09 SHA512 b3c507339b0d09faf1c9b8b3b1cf1d5f0b7559329bad4702ce04c28124aa5b114a711560c762e130f8e236fef0e35905eac8442ce92965752b4a7ea5e10db781
 EBUILD aufs-sources-4.4.87-r1.ebuild 2229 BLAKE2B c833f0bdf1e89ee3f3a3258de89a4e53c1d35cd7774fd2e93e1ce0cc532f6995f4ff99d1df83de37acd82fac150fd7f305b08588e4b48727ac865b5758889381 SHA512 f6caec63aba14857d6992cc9d2edd2b6bc345c93a2ab36efe6b87e5d6412c295d64d4777bf9174a71d3fdecaa90d5af7596c66343a2b875d5be1b6d1e64971a1
-EBUILD aufs-sources-4.4.95.ebuild 2229 BLAKE2B 37b7c671f764d74bd6fd6c6a94a2975b018b8a79440a699c51f561b4724293a3e9278600137958151c8b27e593b189f3b474f4897afe7295498bccc8718734a8 SHA512 4d8e5b01d3ca4bafb49330a5823bde20b75b415ea2fe4fa0b9c9c49f674a3b27bb7df5410ccfd29a6a12e4acd19d127b06f1583f063ad1e78c0925f1576bfd3b
-EBUILD aufs-sources-4.4.96.ebuild 2230 BLAKE2B 36bcad0d3d0b5cde70c84c49988f9bd96086b617881df83bb26e02351423a6fa6fa0abae6381c02638c0cc166ef147c77f10a207d354ad8c7d308a6af3be5de3 SHA512 0cf5e83c3a8cec0d0e7ece1ebeb7a0f73aa8f2f0f7df7709aa9aab856a3bd6eebe402ba18212bc6609d4376481bacf95dd9aad5dcec41ce2d3d9c29ef790d217
-EBUILD aufs-sources-4.4.97.ebuild 2230 BLAKE2B a1e3a869cfb00742a170c9803450de3fe2a2686eeb9aaca27be2a97b7b8be61bba10f3c37d913364e4bcd0a537a217d21c87408fe82d80eeca0ed0366d852b2b SHA512 9a1c0ae1ea33bfc9ff5777b872d009f66ccbc6ab49dd95b8e27c3d91f84f19ddc551e1f02c8880074dcdfbb1eade4ed8e4d336065c066c5526de0efc6376ada4
-EBUILD aufs-sources-4.4.98.ebuild 2230 BLAKE2B 7e6e7d4493426aeeed51b042d57d4aecdf6f15f86690ec00c8deef82caf93cfcd81c26a3df0e1954b9c6e9bc4701d34111fa9788b6d25b127bd45aee4aa180d7 SHA512 efd8fda116f9e6ec39ed26cc87dddc8c84cfd51886e0339698d76278762a3f5ad1914149df815c3d235094806b0e048947ab8c69eb6c9ff30919767a1f714464
-EBUILD aufs-sources-4.4.99.ebuild 2230 BLAKE2B 2a3b5893f8bd2478cd0c18238adb7c5bc6f8e8de685f571fcca41824e60364b59cfe83f1fedba5c9631a159b42a808933575ddbb37786d5470daf246b913f67a SHA512 31449f10ba4a94a01ab0fb00871834f97a8c2c715ca8f0fab6627f2d5909fbc85a31488c579dc6e5507231bbc6ac3736345d19e1235b4e8ca404874218877216
 EBUILD aufs-sources-4.9.49-r1.ebuild 2229 BLAKE2B 2b551c3767df65c6008704f6e4c0beee15b26fc255e5f11f126b8f82950dee9c6797d7cf216898c3e4b50b3638fc7ffa2b77721611db325138e08cbb9cdabc70 SHA512 5c0a4dd8fce85cf8db60366e3bb8bf851310e00f02b368890e7f2cdda8ec8adc40791e77160081ac664ab86a8350d1508783f8a738a11bbe12e0c31e95d2ed9d
-EBUILD aufs-sources-4.9.59.ebuild 2229 BLAKE2B fab6c7cc538151a1ed31a3c9a402c258c2116d91b6a08469d4819e7db956f3cae21b35fabdec4f69e53757242db9ade127d891850528f2368811fed3c2e44a52 SHA512 35f657b3725669538e8004990199d9249bc80fbb9e20196497fb1b701f05ea2248fffe1e65bcf25df88097fe6839f8361aebc62adb8e7685323198864f23bcc9
-EBUILD aufs-sources-4.9.60.ebuild 2229 BLAKE2B 7eddd7f07494050b9806d600d3fe04e10a9258c1c9d8b0caca565de738a82441cc982f224dd674d53f1a8f6fc1035402dea27a23153d1cb55c36614cda1c4a2a SHA512 ff7209b494fb3cc0bc0e224b0c6ac031038a59901cdbd548b107163ff829571862bf5408aef2882bae81db55b77744d99d440b89ca00c18519d5798e3d7a4131
-EBUILD aufs-sources-4.9.61.ebuild 2229 BLAKE2B 3f9a9f33ae0383a3e90f7fd4ba7914617c5de0e4083c22a7b85fb8fcf66c2db359cbc28c7391744fd187a5aab309330998ed3fa0a6d14bfe893e0f36475db182 SHA512 52b7a71363711a3ab60445137699fbb169613af20afacdc5d8913d56df28270d7c90a39622bda0b5376d28f37945f0e2b5b39a1d522740a709e41c07c2b2d85c
-EBUILD aufs-sources-4.9.62.ebuild 2229 BLAKE2B deafc2c5284bb56217cd5df1e7c64b6f31e205ee59bf753ed5cd63448d0b56d78974322d804946c73acffa730001c6c1cc06a917daaf3cbc39b689888a8b7177 SHA512 eabaf6012775e21381e68a0bee41d1cc234c2622ad5fef956c8d7d60d5ef8f91aee30aade88e8c8186cbdb41e317da72ef3861c2a5accd8892b4a77d27b0a276
-EBUILD aufs-sources-4.9.63.ebuild 2229 BLAKE2B 78dda2ddd6f4ddf722aa1985a33ae17c90ba87da36929f93a4ed4b90b721a7b57da1f60e786832dce1682c99ad53f191ad68ff9ee0ab914eda12a9817dc46b5e SHA512 16c0cb51766e76f77b755b05a139ed1e597525cb22770f9225dcb60d6b8a8401f79eb4872e345cde4cbbbbf99f439cab5c55614303ac3ccacd325e215e5c9e38
-EBUILD aufs-sources-4.9.64.ebuild 2229 BLAKE2B a4cfecf20022c1eb05969ad4e817f9ec1811d2255b10715b2b010d35eb22245be3b28daf9e552e5cd6f6af4e9d1b85a437ec02a165d492bb76889cb766f613b2 SHA512 039c047a4a449621f336b6367694326788c15c4998eef75dc9c5aef5c9ae6dbd7f33ab7ff31a4592fa799d66aff8bf27aeff44bae54fdb433d0edd85df7eeae4
-EBUILD aufs-sources-4.9.65.ebuild 2229 BLAKE2B ca42d53e9ba11c665d98e9c6132ba0b2ca27fc11b7928aa05556d743357dd47a5ee0b38502e2f59d26c5cfa7257a1af296fb3174e5407d39260ce4c097764680 SHA512 3f5ace0a9be5322ae3e13ec98504e92464f35e12decb9d72978e2349d876d427c488d976c99a3ae76faa3381c333a42774b6df4c78ab8d8547e0a35e4d527733
-EBUILD aufs-sources-4.9.66.ebuild 2229 BLAKE2B 25bba1015401648476cc987266a583c7ede4f590c7614594b07d22923d6904e11d9258754827a55b79a30f92563a08ce944bad91d2d755fe94eb125a1d83c0e5 SHA512 550d66edab908cd23f153cb385ab6aaaee64afd3b12051b1800c9bb5cffe8bef6c5932195782e9ab781ef803fabdf6d90723a6a96dd687b18c7233b8451de1d1
 EBUILD aufs-sources-4.9.67.ebuild 2229 BLAKE2B f153cc37109461ad6b3a9cf77276b89caf45cfdf72ea3206c559594aac73268706a9d01e92e7333c42a3b8602b31fe8c6c76762cf6b13581dd0ee5dd65ea8a0a SHA512 7fa142870ea13dd4c24f5afa0f60a874b9416c005ba00e4a755b10e5708dc9f348eea56097d4a44df11c52099cd0238dcfd906f90b9edd1bed3f3c2dc6fe68f9
 EBUILD aufs-sources-4.9.68.ebuild 2229 BLAKE2B 49917bd63d699ca1b9dcb1695577ea26f98a3b8ed6ad15cc398c30d498b4e3cca74457cba8c407bd1156500aeba649b6660704e7cf42447b5dcf8540fd7ce746 SHA512 b2abf30e79f8f6ccc33a1c0a7497ccda75ec966ce5623f4bc103c8fba7324fd2d82346657119d45ee80a86570c5b7858c37c2f78461119c66d50533ade4e830b
+EBUILD aufs-sources-4.9.69.ebuild 2229 BLAKE2B 2d3fbd87a6998f061a36541ace48835552befddf9550c1517d0bc657a07fdbd95dffe074d5e24dc25e460c65e62160f98dcccb95cedf743ae570ba6d1f4d2a1e SHA512 431374545f2a6d5e740d28d12cc020483563daa4954cca569f983dc42ed2c067f355d267a36797998abd30af5aa20dc97acdec3fb38c47b65d6c0680c7234009
+EBUILD aufs-sources-4.9.70.ebuild 2229 BLAKE2B e18ad1556fbc825949d180375fe2027c9e7ab9d612df49918f25f7aa1fb51eb0afd897e8b0fd594705abcf9033ecd0e024dc369467337d057aafc8a46d76c0ab SHA512 9a62a312fda315ec63fd8263e7b04b49fa142f1776bf980aea8411c3aa126ad78236d0714ebf5147f1e1dbd6c26e32f57d7fa62d8f054ca2f2b63524025d6cfc
 MISC metadata.xml 786 BLAKE2B 4a7ec566e14be79c65ccf8f9b04db4c66ef27e0940af8d3d870a3f08d96bbc8987836100aff699d90a5564a1986c929af02b9cb00553ed3f400378ca20f41fda SHA512 95853521c2369a4bfa752be73e2e7e8e5665e790a5763c7d347da1762ac142fd6caec3e20f7d31f58c16f3a38df6dfcca63b296569b7131dcbd72eeb23e9d3ff
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.13.11.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.13.11.ebuild
deleted file mode 100644
index aaa706e05c90..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.13.11.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=13
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.13_p20171030
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.13.12.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.13.12.ebuild
deleted file mode 100644
index 21456562ed8a..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.13.12.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=14
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.13_p20171106
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.13.13.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.13.13.ebuild
deleted file mode 100644
index ce40897fc9dc..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.13.13.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=15
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.13_p20171106
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.13.14.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.13.14.ebuild
deleted file mode 100644
index cc313fa2f463..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.13.14.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=17
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.13_p20171120
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.14.1.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.14.6.ebuild
index ceda58312b59..b16a9ff76dd0 100644
--- a/sys-kernel/aufs-sources/aufs-sources-4.14.1.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-4.14.6.ebuild
@@ -5,11 +5,11 @@ EAPI=6
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=2
+K_GENPATCHES_VER=7
 UNIPATCH_STRICTORDER=1
 inherit kernel-2 eutils readme.gentoo-r1
 
-AUFS_VERSION=4.14_p20171120
+AUFS_VERSION=4.14_p20171127
 AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
 # git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
 AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.100.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.100.ebuild
deleted file mode 100644
index 2a952b3f79f0..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.4.100.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=104
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.4_p20171120
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.102.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.102.ebuild
deleted file mode 100644
index c2c67fb9734d..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.4.102.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=105
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.4_p20171120
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.103.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.103.ebuild
deleted file mode 100644
index 446c1233cc3c..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.4.103.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=106
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.4_p20171120
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.13.10.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.106.ebuild
index aaa490ca5c03..4ed196d2d2ae 100644
--- a/sys-kernel/aufs-sources/aufs-sources-4.13.10.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-4.4.106.ebuild
@@ -5,11 +5,11 @@ EAPI=6
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=12
+K_GENPATCHES_VER=109
 UNIPATCH_STRICTORDER=1
 inherit kernel-2 eutils readme.gentoo-r1
 
-AUFS_VERSION=4.13_p20171002
+AUFS_VERSION=4.4_p20171127
 AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
 # git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
 AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.95.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.95.ebuild
deleted file mode 100644
index 246c785d1ee6..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.4.95.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=99
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.4_p20171002
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.96.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.96.ebuild
deleted file mode 100644
index 15e42b635669..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.4.96.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=100
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.4_p20171002
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.97.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.97.ebuild
deleted file mode 100644
index 7e11f786ae80..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.4.97.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=101
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.4_p20171106
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.98.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.98.ebuild
deleted file mode 100644
index 2a4cceb68208..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.4.98.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=102
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.4_p20171106
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.99.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.99.ebuild
deleted file mode 100644
index 583f3e51ff8e..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.4.99.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=103
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.4_p20171120
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.9.59.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.59.ebuild
deleted file mode 100644
index 7054a822a023..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.9.59.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=61
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.9_p20171002
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.9.60.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.60.ebuild
deleted file mode 100644
index 17eaebf59f76..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.9.60.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=62
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.9_p20171030
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.9.61.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.61.ebuild
deleted file mode 100644
index 97c4cfbaf436..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.9.61.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=63
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.9_p20171106
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.9.62.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.62.ebuild
deleted file mode 100644
index 252b9c7507ba..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.9.62.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=64
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.9_p20171106
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.9.63.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.63.ebuild
deleted file mode 100644
index 0ba18b8c6912..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.9.63.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=65
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.9_p20171120
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.9.64.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.64.ebuild
deleted file mode 100644
index b45bc40d39e6..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.9.64.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=66
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.9_p20171120
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.9.65.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.65.ebuild
deleted file mode 100644
index 7b6cec71e1b4..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.9.65.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=67
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.9_p20171120
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.9.66.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.66.ebuild
deleted file mode 100644
index 30741b99b987..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-4.9.66.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=68
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.9_p20171120
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="experimental module vanilla"
-
-DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	kernel-2_src_prepare
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.14.2.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.69.ebuild
index 0309ddd87426..7fe87fae3807 100644
--- a/sys-kernel/aufs-sources/aufs-sources-4.14.2.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-4.9.69.ebuild
@@ -5,11 +5,11 @@ EAPI=6
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=3
+K_GENPATCHES_VER=71
 UNIPATCH_STRICTORDER=1
 inherit kernel-2 eutils readme.gentoo-r1
 
-AUFS_VERSION=4.14_p20171120
+AUFS_VERSION=4.9_p20171127
 AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
 # git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
 AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.14.3.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.70.ebuild
index 4f93b362f283..81d63353ada4 100644
--- a/sys-kernel/aufs-sources/aufs-sources-4.14.3.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-4.9.70.ebuild
@@ -5,11 +5,11 @@ EAPI=6
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=4
+K_GENPATCHES_VER=72
 UNIPATCH_STRICTORDER=1
 inherit kernel-2 eutils readme.gentoo-r1
 
-AUFS_VERSION=4.14_p20171120
+AUFS_VERSION=4.9_p20171127
 AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
 # git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
 AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index f676c965b1ed..cdc3a3fccd4e 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -34,6 +34,9 @@ DIST genpatches-4.14-6.extras.tar.xz 17488 BLAKE2B 39d46c202139f9d4b19eee37e711c
 DIST genpatches-4.14-7.base.tar.xz 170916 BLAKE2B 176af85faceb355a6a62f701f8f99eed90a1099e8c2a73808e2c96274398fbb94668a516f51675412865f1f5b8069b80db368b9829f57f9e6e46d356e446e8a9 SHA512 55615b8d48d3266e2b392c5bd6cf3d1a52167e1ea0e6f20681ba738a8db8c25a0aca47fe4d33ff592fbb1e58a59d611e5af49f4a2f4f7363e83ae63f1097daf9
 DIST genpatches-4.14-7.experimental.tar.xz 5180 BLAKE2B c1eb32bb2c1a0bb253b624bf9b825cb35ae174b372c1048fead1c019f6f72f6d0e39d1c5767c79fe380216e8cc61b0a47a25993cc50e144312249a8683088f21 SHA512 6a0d1206c7bea440cb7ac93719d972a7e8ad0c33817ff383ed8318a6c8904a701e84bc63d8618c36075176c5228420ae5b8935342b887cd5a54187f504d6413b
 DIST genpatches-4.14-7.extras.tar.xz 17488 BLAKE2B dffe838e8913976777080d5e7123e2341506ef3127a8889c5cde24a0662f54c62823780e4fc75c2d12cf55cfa50a591726981cad5d39046ee96e66156d6bafea SHA512 a22d9505e769d09fc996945cbeb35cb765493cbbcffd981e0b6afafdb9a03159be9acde754dce0f2bcf414242b2a62aa6b74b9d7762ffc169492e90fa495d35c
+DIST genpatches-4.14-8.base.tar.xz 189280 BLAKE2B eab48c38a3fc06d08754cd080f16df08214f853c9159096e8dd8267c84f25c2dd4ea4891bdafaff1a20788ffad4ed100510b914aca2ccc03e73545f52a22fa7e SHA512 47b715073a3d9b6401831fb0dc88200dabc5b9e9e2188c60d19f6e64a87cb726221a055a6b8905978703b61ed3dcc5ad23458cde6c20ef4ddf789c90fde9fa00
+DIST genpatches-4.14-8.experimental.tar.xz 5180 BLAKE2B 5489b6157fdef6874f224f97d6fcaae34799b385a3b4ca3e57764413d2e48b63fe33c6a9749754ade1e4b7e25dd5928cb6a5e1ec11adca3ae4afd49b1fad84bc SHA512 cd2e4f7957e79d766df7e5d4c2dff4d95ee85e96759c4995083edfb7bb76b86139916cf83718a46860af4d78f82f6e4e6ef24422f0c6d329c4e002d0ade443bc
+DIST genpatches-4.14-8.extras.tar.xz 17496 BLAKE2B 0f076c8fce10e1a7e3845c185e88725962813303a9c62c517330055f0d3aca27b5c839897b61802df3d91cf9b9001f8c3d303b2d381e969a4d177bc4a116202a SHA512 54084331894549a80a72a7095662611762f1b6516c4d34919be4e313a8c0fcfa6bd42997a447bc739aa7ba1f07f66c579c9c2e105710a5b42c9b0ddb85485d79
 DIST genpatches-4.4-107.base.tar.xz 1587988 BLAKE2B 827d3ae42c0fc412c165568edaf1f8550bf828d7e2edb7c5abd3013a2b639dbeb68d2e3a9656e2995baee07c7619695918e654174528ce3eebc8a891715bc636 SHA512 1fffc6d7b2c186c87c8b343d4bf5fcf94086dae9f4e70b2965f5dc8c18ff4753d417074ec4ad7deca29ff597a6e5d0cfca4bf325609596678febea5ac2f5ea24
 DIST genpatches-4.4-107.experimental.tar.xz 87776 BLAKE2B b239fcc9ee1d0344a9fac8b6ae8e712bdf97df7547a2d3d1d6b39ea23f50d8836ae8fac3bfffcc401b3af52dd333b2b2b1e1626fb739da608d247be5fc67dbf3 SHA512 49e0cbc980cfafc7992d92e0bd2dd07d594ec39b9ba0bae27dd915eaffbd78c5af6d3d47847a98ee9a619447b3b220faf0c44484dc99088609ff8053f3c5d907
 DIST genpatches-4.4-107.extras.tar.xz 16468 BLAKE2B 1ece602969ead12faab3e0e5d5703a75c737a18efe873d5bdda71ff134387f5760a76105262270543b4a0e882a9b5434905b3846bd68cc3af5bc1b0383122cd2 SHA512 0843f4cc2cb2b3219f7e1343d68062a9c86f08c51c67a801f82c7685c8c0eb92ea32841a8a6d4bb8da9fc9882eeb965bc66317d7c14e7a5ffbb58214f962dc35
@@ -80,6 +83,7 @@ EBUILD gentoo-sources-4.13.16.ebuild 742 BLAKE2B ef97bf684728c93444702f7433a2128
 EBUILD gentoo-sources-4.14.4.ebuild 741 BLAKE2B 6fbf38e4366e00d539d1f105fdd6096af45271d3ba4dfe9e5a88c75f24af372746402743ca043de663a00aa59d9c94dab99f703a4397d79299b02086e7178a4e SHA512 6528a95e5c2b83be431339553ea2ba60667b9a675af1d62ec7ee6c0e0ee664653388182e5f14eec65bb0096885f1e73dd7cb969922f57554671da2d3e965c351
 EBUILD gentoo-sources-4.14.5.ebuild 741 BLAKE2B c8b202e28bc74be598e5a230598db2e43f7583436af1bac8b59a75b28090b1f9884ce8837f07dd951f33f4029998423b622822521ff888d6af29faafcc6331e8 SHA512 5c4ba68cd82fc6dc9d12f2be0cf068b738f77f6bac8d0c8281a61f70ddea4ec2493a98823983c26175ebaa4cf18e36484d02ff49eb4de11c34a72cf4fec29bd0
 EBUILD gentoo-sources-4.14.6.ebuild 741 BLAKE2B a488fc28bf54c41459e6a1857558bdab761ef19ab94602e21e1d0015310de6abadbc00afb798c48a2d1a7a318da20b8dce3fc8646c9fedea544089108dfa4e7b SHA512 2fdcc7f85ee790ebed2e6399409bdcda8437f1cd92a541bb4a8f1cf8eae1eaebc84b691aa0b65c44d5dd684663e99088d6a716b8a6fe18e94a6ea01d7d3107bb
+EBUILD gentoo-sources-4.14.7.ebuild 741 BLAKE2B 29516c6d6d06470c33d816318eabedddaa3e69d35a2c9c44891d3de16f6e149df0df78b16dc88a5c6b4cf531368b7ab4868d92946e5f1c94cf242705836883a0 SHA512 f532e57cab7ca86c90d3780750f9fbfc619fd5cfbb2f6980b57ed212c1a23709a175ec33d447dd3678368d4a98ff4780243cc8644982f803e303b989994b1356
 EBUILD gentoo-sources-4.4.104.ebuild 743 BLAKE2B 802e40cca68ffd0a60e89b78472150c9607d1536a24da4ce8b6931e05fbaa630dfb5e30d1f3b49fd8a94c7d33fb9489f377bd96de471712d16450ec4d704de7a SHA512 55a5c40f01ceeced4a226f18e7e30bfed7a0e8fe684d3d1f3e8ab66a3509ff3c4fc128e4d0b551a5f1efff44e95f1e5a19db3d4ca4d567499b2e1b6951e36c21
 EBUILD gentoo-sources-4.4.105.ebuild 743 BLAKE2B b928e1bdcb11b512c1d1b855d282a08fc6e8f3d80ca7178599c1fd5ecfd001f78bf9be71262919988b3541e1310d4dfed142ae216d0dadb2f171da94e1978d77 SHA512 3fd6636e5d03b204c7a64f90d7bb4352641bc3938e5be217be588dd0b2ff40ddbb71067409f06ee092a88ea7324a51e73e92d337043d3ccf326640ec6fc77e6b
 EBUILD gentoo-sources-4.4.106.ebuild 743 BLAKE2B 20e6ec2d4fe6f872921d54cc8510cce5a325a546c1cf36edd94f2c664fd88aaaf201b23664559351dac47a27f3e2ee3803931e6aa7380f0eaa0294476defc525 SHA512 d0e045062971878d254fd791c8763b5a67932ea7ff028e8d63ebdb0c2a238e78290f08d32889b22f3aee328002c8a5c0eccf3d610be82a6de1242d5d405905b6
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.7.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.7.ebuild
new file mode 100644
index 000000000000..6c9556150bda
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.7.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="8"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/git-sources/Manifest b/sys-kernel/git-sources/Manifest
index f21bd438e019..13cc1833e2fa 100644
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@@ -2,7 +2,9 @@ DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97
 DIST patch-4.15-rc1.patch 43506905 BLAKE2B b6126c5f86574042d1c1dc3f305eea3453b24a7049458d720d2a7826ad0070ff4f7db930e46969bd5696bbba74008e58217ff742ba1c2ef67c94a2795a64c31e SHA512 ede06f733521cc274456f62b01441ec6194425c0455d937db9324275978fc855372aefbf19d895e8bfbe11dcfe2145dff672c9c3b693315fb9c8e14b280fd43a
 DIST patch-4.15-rc2.patch 44097969 BLAKE2B b0ebb776063a83eda0dab583a4c53cb19366dcc50ac32dc12eb7de7a033a8b8671f66f587ad34a62864958d111e16e1efe336e8fef0b6b188bccaaecce8d9451 SHA512 a1833e28b7e513c71c6a14e3caf6c1709ebb2c4cb9804ec31a4d0afd2a6b3f339f5fd6523197459f6a96d0b9b4ba4885e188a88365b1d195a8e38ced3c2910cb
 DIST patch-4.15-rc3.patch 45281665 BLAKE2B ff9051f836b8efeaa0c356a58221f5464413807dbe5c5e2b879e6b57f0ee67da1ab1b245f10de95db4054d3b20c799d3b30b8f6573a118172b38939d4b09575a SHA512 871bd2804f50ab732c73c67e9d41daa3f1bc427c00d846be06068155e5f2fb0e3a6b0941d949e8488f6b987953dd8ee06f23f34d676d567cadabae894f9b1025
+DIST patch-4.15-rc4.patch 45578434 BLAKE2B cddb2beb403d3cbd0d0d98218dad90078fba989e386f5926af97cffdbcc5d5e1cb7c2d71aba428e4ed85e3c61811ee91d14d5864de6b1f88acad1eba9da28841 SHA512 378f693d76ee16043da844e9cd053bbfe086c31025ea8d295803845c9d71b1a310c816238703bae81ecbe76dbe45cc69bc007f0b3e7ff6d8eb9dbf621c401847
 EBUILD git-sources-4.15_rc1.ebuild 1179 BLAKE2B d39c295f0236a43b21562e0ae3cf4948c4600e92597847fb4d5e7b3bd85812f521a9e03b8fdcd9f289ae290317e6f282bfd744c6ec0838dc75a6a2f3a13a8706 SHA512 3508bb056d2eff50de33dab587fd4a17f251e0655d947c369dcdf55a1d6ebf438bb64e44beb99a4dd1c6e6d4f80db1b4072f208da4836906aea3e4a3d5208f17
 EBUILD git-sources-4.15_rc2.ebuild 1179 BLAKE2B d39c295f0236a43b21562e0ae3cf4948c4600e92597847fb4d5e7b3bd85812f521a9e03b8fdcd9f289ae290317e6f282bfd744c6ec0838dc75a6a2f3a13a8706 SHA512 3508bb056d2eff50de33dab587fd4a17f251e0655d947c369dcdf55a1d6ebf438bb64e44beb99a4dd1c6e6d4f80db1b4072f208da4836906aea3e4a3d5208f17
 EBUILD git-sources-4.15_rc3.ebuild 1179 BLAKE2B d39c295f0236a43b21562e0ae3cf4948c4600e92597847fb4d5e7b3bd85812f521a9e03b8fdcd9f289ae290317e6f282bfd744c6ec0838dc75a6a2f3a13a8706 SHA512 3508bb056d2eff50de33dab587fd4a17f251e0655d947c369dcdf55a1d6ebf438bb64e44beb99a4dd1c6e6d4f80db1b4072f208da4836906aea3e4a3d5208f17
+EBUILD git-sources-4.15_rc4.ebuild 1179 BLAKE2B d39c295f0236a43b21562e0ae3cf4948c4600e92597847fb4d5e7b3bd85812f521a9e03b8fdcd9f289ae290317e6f282bfd744c6ec0838dc75a6a2f3a13a8706 SHA512 3508bb056d2eff50de33dab587fd4a17f251e0655d947c369dcdf55a1d6ebf438bb64e44beb99a4dd1c6e6d4f80db1b4072f208da4836906aea3e4a3d5208f17
 MISC metadata.xml 647 BLAKE2B 49e79ab62f697fd3e7dcdc63376cc3412f8d91afe7a6219a2402551ce48b67ca5b707a501ee4401437d44dd3b7ee77b861fb3a5d0d55d766e2b9734697f3cff0 SHA512 4a673cd7f8ca3ee46bbf065d87337efa6ee77218781f25ce8b3924b9a90ca3cf10435b6f667d49ad16ba50662f82d107696622b3e55c707d56689ae0c5d2eda9
diff --git a/sys-kernel/git-sources/git-sources-4.15_rc4.ebuild b/sys-kernel/git-sources/git-sources-4.15_rc4.ebuild
new file mode 100644
index 000000000000..163014d38b8d
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-4.15_rc4.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+UNIPATCH_STRICTORDER="yes"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_NOUSEPR="yes"
+K_SECURITY_UNSUPPORTED="1"
+K_BASE_VER="4.14"
+K_EXP_GENPATCHES_NOUSE="1"
+K_FROM_GIT="yes"
+ETYPE="sources"
+CKV="${PVR/-r/-git}"
+
+# only use this if it's not an _rc/_pre release
+[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="The very latest -git version of the Linux kernel"
+HOMEPAGE="https://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
+experimental nature. If you have any issues, try a matching vanilla-sources
+ebuild -- if the problem is not there, please contact the upstream kernel
+developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
+report the problem so it can be fixed in time for the next kernel release."
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=sys-devel/patch-2.7.5"
+
+pkg_postinst() {
+	postinst_sources
+}
diff --git a/sys-kernel/rt-sources/Manifest b/sys-kernel/rt-sources/Manifest
index 081a677dae40..238b69f74482 100644
--- a/sys-kernel/rt-sources/Manifest
+++ b/sys-kernel/rt-sources/Manifest
@@ -3,18 +3,21 @@ DIST deblob-3.18 127087 BLAKE2B 2108917cc6c44bf02afabd1d296f5f1806741a4f92005bb3
 DIST deblob-4.1 130695 BLAKE2B 55b914b4e502019018f71bc14db82d5ed73dda0e4c46436e491ddc8762144161e74583e321900d59b5a45c2958dec8015afb6f10908071de2d50d1572cb5dd12 SHA512 b861b9b53f9295e5e993784031ce57cf8cddc418184ec00c28ed92c9e7660406e0ede581a93d0def36e7847b8e068c8ca6c4dfdd65c15cb174d6c5803c16214a
 DIST deblob-4.11 148749 BLAKE2B 3b15b0b433a183f3e002e9546ce341dfdd0bdb6cab8f2deb21caffac74a775b42213a570cbd78efb7c7e2d9c668162ccbdd0f264b47d8dfa3c71dae90f82e9ef SHA512 e560c76cf340d88930e1b2ff1cd86ced028922faa30a0ae6ade34eb92dc8ca916917b62d84c33be5030c697326bc8808fd1fa259a6767eec83227a06df646199
 DIST deblob-4.13 153698 BLAKE2B 92589ffb1a26bcd4ef80557d9eb7302d8d64175f9f77970bb5ee6545e766af130139bcbf0dfd91b176a001534fd66606f22887295a3dc9b68b96e02ca33594c7 SHA512 e69a95ac3cdfccb042cd9a987d789a4d17e2b1f253bf724023896c936a2e36e3c205ca28064d96ba8bbdf8946822099e70da573ac99d881a837c91e55e8c7970
+DIST deblob-4.14 143883 BLAKE2B aaad9858bf626f1495f83187fd2ab91f812504534c7294cfb6818c773229eb780096a2c78a6aa963f3826df3cfdf7a7db5238f71fa8955c21b4acd75660d2b17 SHA512 662a11c03f51d85158175a8bf35fce20f01d94659d36b97a9773304ff9c091b2a9ab72a0445065c20188457fbe174fb43334a79e17b3a9e8553bb6144a971f4c
 DIST deblob-4.4 137370 BLAKE2B 05f96867d5e50e4bc6ea8073f6f0400c2af27bd920a7732f9a9b30e7d1181fe9de745de239b2c5cf12ef647adf1f169180627fd71eb2316d994488fb3e799ca4 SHA512 ea5f2f2cdbc97bdc90c2131f846761dc1630a53986db10d8e9d07d1ddee12a9d878c57790edd3ecc75ed9792d479b7b726c39d688a3926e850608c81b1b78a3a
 DIST deblob-4.9 146273 BLAKE2B 8bc593ca375e003183dc6260aab0b2f81675b0814ec50fae3afe5d4ce9ce41c1c1401ce80e1c285153f610f8f730f82d6ad03e2578c792fd4af8779f2d1e3079 SHA512 3654b28e72b343bafdb38de10ef0c3621db0539bc0e7434bc99bb8f8ed911d4c9e53ca4785fd193fcfec369328f014fa5c6f3bda51b6f1a8f98b8c37ece119a6
 DIST deblob-check-3.18 654232 BLAKE2B ffcd72a9c86ea2fb107b7791053ef25bc99f09a6b55bbac742fecdb1e49bce4ac871f7b5b3d5c888b28d8b95217feb543c2c8cffe47d5dc1d99386d14c2ca8ad SHA512 2cff9abef479a55dd6a0699371be8227ba63b18da1fb153d5df382e0a5e4f1b745b7de256a367a36efa9d12e2aad5622cc288efef009feebf81c108dbef4fe16
 DIST deblob-check-4.1 674781 BLAKE2B 3883506b2a05d06f4cfc2602ea64808025992080905d38e99866b2536393cae28a03695a8d1f4038e0297af8b370ab62e579c189d0119904d7dd783a89940b46 SHA512 51fe9d70d723992aaf70f8bfcfcc12ecfedd7a039402ddae07858fb087693b00cd80d1e0e1a5053e049f2a2b8c58ed23e4598e2dae902c4999999c08bc2eeb33
 DIST deblob-check-4.11 734493 BLAKE2B 1124ff79e3069110166f481aa2731b48e0ecc837c136e0ac2525081b137cb1a83d5ecc3beba6e0404225a842bfaa6e899f4f0d2fedf4c2ca892e8685f154d31e SHA512 f3ae2b80ac16f223349c741877c64d619fda2be9ce5a28741cfaf626cb2104547f0f638e6d56afa524054b4ec4ccc8f720515c8518ab333d95bfd29cd8ad056d
 DIST deblob-check-4.13 748983 BLAKE2B 6aeafbb878105a50f68afc321dd57faf387c2fd40f240abe7fa0eddf70f7340233178d9d4ba26592c69d3ec9bea25e87dacd88d9cf4a80c23007dae6a7bafd3d SHA512 83042d108418b5bc423c98a21c5aa6f022bcd7dc4aae0bf4c9703ee4d383019487af69529a7d381003ede6a706ff4ca7eea35e11d1aab6e23b029c02ab7ac662
+DIST deblob-check-4.14 755969 BLAKE2B 5573bdf913554e23dba3d3c56227a2c8c3fcfad7f4a99e1ec9208171008b5d2d50bdc55000672af95e020ef8171325b9d1797a69c988b4df5b0f71bc2a186fad SHA512 09626864cea33804d3dc94ceb691b24b6c14d1b9531eee8e745276dbc403903d762b1f75d685bf831f42b942d6f7ea265efb0d4889fecc976d95b11faf843fd3
 DIST deblob-check-4.4 694225 BLAKE2B 9369f81751bc80d97c37a07ce92628d212185a4ccd1b1d4ed3b21972f4a135e93910271f0e80a35bb8695d1b9ef6d30c8d303abe51814275115735a8043ddc21 SHA512 6554ae567566da4d30e94a37622f88343b8e96ab39a9204fee34de4ddb5dac8c4906b25843b63c2388d03a4441821c25d395b3c39fc875c498a69e677a4f0cb5
 DIST deblob-check-4.9 717834 BLAKE2B f2471b45f6953ce83c0819b9157ce638a1d93959ec4074a329766ecb0c3adf90fd3022307ea70c2cb3bd3c291f98d6153576cc6597c62ca97abae6524b98112e SHA512 46258698f1c574b44a8c5c78cc2b7fdbaca746976266974ee0f6787904531754b17ad15d542b68e07d4633ee91a8e2d9c32a991ea214292ac072c4f26deed9c9
 DIST linux-3.18.tar.xz 80934708 BLAKE2B cf796fa1eb24276470b51bd3754f02932e57c6469e45959893b3714457ba33f0081ff04137990f228e1aae6d42a05073478a3ef932df468af7cd02bf8c8836c4 SHA512 2f0b72466e9bc538a675738aa416573d41bbbd7e3e2ffd5b5b127afde609ebc278cec5a3c37e73479607e957c13f1b4ed9782a3795e0dcc2cf8e550228594009
 DIST linux-4.1.tar.xz 83017828 BLAKE2B d1dc4e458db191f16306b3d2d7eb60ef5e04307406c769cccdd88beb407f8de228ab1f095a44d6e992b06d01cd896fda31dec1cdf16667f4ca0b628da594aee3 SHA512 168ef84a4e67619f9f53f3574e438542a5747f9b43443363cb83597fcdac9f40d201625c66e375a23226745eaada9176eb006ca023613cec089349e91751f3c0
 DIST linux-4.11.tar.xz 95447768 BLAKE2B 5e6000e771f58baac2c4484fc8b9f83079aafdac03ea4f2a641bc025a0c79e789820f03b66ec852e28eba9bf3c5c9497a5a6b2e2aca13017fbd82d44ece97e02 SHA512 6610eed97ffb7207c71771198c36179b8244ace7222bebb109507720e26c5f17d918079a56d5febdd8605844d67fb2df0ebe910fa2f2f53690daf6e2a8ad09c3
 DIST linux-4.13.tar.xz 100579888 BLAKE2B 2f8be07d403071b097b019c43fa332bc7d4805dee633a6fdffe5a99d5475015ca9e4881e7f4cbfd36f8c451bacf423436364ea3d9f25b8723a29a178dededb2b SHA512 a557c2f0303ae618910b7106ff63d9978afddf470f03cb72aa748213e099a0ecd5f3119aea6cbd7b61df30ca6ef3ec57044d524b7babbaabddf8b08b8bafa7d2
+DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
 DIST linux-4.4.tar.xz 87295988 BLAKE2B f260f1858994f5d481fd078c86e51bddbc958f7c5d1586f60dced772e1b1107ecf3aae0558c3e6f39c36f7d3aa1e6cd1e5c64ec9d6f2218f47b98413da6466fb SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e
 DIST linux-4.9.tar.xz 93192404 BLAKE2B 83ae310b17d47f1f18d6d28537c31e10f3e60458c5954c4611158ca99e71cc0da2e051272eabf27d5887df4a7cb4a5dd66ff993077c11d2221e92d300a0b48d7 SHA512 bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a
 DIST patch-3.18.69-rt75.patch.xz 173580 BLAKE2B fb0fa6c7bb72a1a9754d837f7ae532c4837f3fac17d803c1d6634758190210d7f717a8ef8744413cffaf79e36ae361a6af4deb0663b76bedffe0fa024a3d2f33 SHA512 50aff123705223689a59da8d931b6a42434391c0e87c68636d8ced6556e98482b9ac68ddfefd923ee37625642a7da860c15719190637b700505a869678374dbc
@@ -24,6 +27,7 @@ DIST patch-3.18.82.xz 1354196 BLAKE2B c5cc3bc681ec835087355998a18cd61755331d1433
 DIST patch-4.1.42-rt50.patch.xz 190032 BLAKE2B b1723b4dd1ac49c85a962c09b5aac4bdf49f1798fea3b312289d7d875b5ca8e2cdd37e313c80e7decd94f0f80aeefbd7305d3883a6f50a33102f2c5886c0b2f5 SHA512 a8bc66d368176e5d02bdc54b9a5a1eb9865b277d89fe6f43e2e212832bb0d3b435a510ba8e03a64e1f8d94cf5a870076405b2687c51558b1d47586c0f5738d2a
 DIST patch-4.1.42.xz 1109816 BLAKE2B b01888185a28df8c12f4f1cee4e6a417e656fcf0f09ee2179840a3d5f255650451a89e133d2bb628bbd645d9235cad147ba2e8a45efcaeeeace3d75a49f10b6e SHA512 a3b4e29e7cb613a72b8176edfe2cb5da0aa4e6064bb717c1bd5caa9463563cdb66a4bebe6256a8eddd58f32ae6f658fdbb66a3e4337a91def9d08b7c0e23fb2d
 DIST patch-4.1.46-rt51.patch.xz 189892 BLAKE2B 3800f353d42b4c01461d9781dbf822fa6c14e408eec0c7158da8dd24673d33fea26d6241a8ec335fc7cf21e392be85543f88896cfa82b9a3aa8e5c08c5c214e4 SHA512 f009602913cfb22ae23943c452900b646d192146002b58517b591a874306b138e2e680170a70e1ead06ba38b76fc2e3fc55f83164dc5ef0b8dae5bdc30a54d8a
+DIST patch-4.1.46-rt52.patch.xz 190088 BLAKE2B 2468002852ead5b171d043486b912bb710f4689b5b549f90890de572069f430f4de709cb54c4cde723bd8e888c0027cf13ecb7708f116575fc6801ab1a97cecc SHA512 2c6813cc0f0efe990e9599f3e38048142fafb6fbfd7d3f9670d118cec0ada6fc69fb897509759cbb0c54798316ac30d137cd2721fb9a88a98024ddcd7ee90e7b
 DIST patch-4.1.46.xz 1236640 BLAKE2B 0c4305e3a3d2da4dfb8f23e0837d27d7916830170a0f10e9108d7517c69fca89bfccf35455a12f6e944f4c0527041172b072ea93978b19410daa2e9ec0b9f43d SHA512 c6b50ddd848c949119dfe1ebe45542a53c8116718e09345e8b47b300f057d4396f0991de51a6ce0ae1ea88502e53339573c8873126bfe202c742a09455b00519
 DIST patch-4.11.12-rt16.patch.xz 232408 BLAKE2B 2c16730105c645a4f73bbf0dc59ed37ef9440bcd118f3a1d0f79822dbddf411abdece9bd5e859aefb38402f6b02d430350d056769eb8810be31fce5cc4db11f1 SHA512 1ef1324210e0c3d308cbededd3e7da41e47c972563858a21ae8178d060906cf24249f48dd0f8667d528be29d50755feaf1ede4fe35e662f89195ee91355a8ced
 DIST patch-4.11.12.xz 298784 BLAKE2B 7e494b92a44fd2320ae91dd3a4860c37fe8ad543479e18607ad18142c3cbcda8b97ad11ad1a4452c9e1d239e71ca25d8565e237556abf7e72b21630a2852fb24 SHA512 ee9c5ac45896d84739c679834fcd15dfc46f9e939dcefd54ba049ac47168d71f0af680153615de002a2073ba79e44a9214f74af17ed16aa97d85e6df157fc6e8
@@ -31,8 +35,10 @@ DIST patch-4.13.10-rt3.patch.xz 200756 BLAKE2B ded34c73a82eb0a9b9f9a215bde7d7210
 DIST patch-4.13.10.xz 212680 BLAKE2B f20177d79b7ebce15ab91cf36d2c2d6a408c4d10a2ca3167e1c69cba5effaeaf6c19b1b5d817bc19602d8a409ca8a0a95f0158203eb9693fbcbf3fd2d0892291 SHA512 634d81ea509aac5555d8d11631babe9bb04ea771c873f084cea7067313a566d5cad291b0c311002ae8d1d6dd498a93a9a43517923aa449eebb405fb4c1e34753
 DIST patch-4.13.13-rt5.patch.xz 201552 BLAKE2B 0a16b41f9f39340105ae62d2d04201f3836f31dea9b44e4f7a6cd09e19885946353dd9266ff36a197e26f14290bc44e95c3d918a1c4a675567e494ccd226622b SHA512 15a776bbc6eb26aee343ad59f4671cd35d0bcac1c9ea09ccf64bd6d2f2f3146df938ba092a70875d660373b2e29621d9173a1be33712ccaef146e741b4a9e768
 DIST patch-4.13.13.xz 245028 BLAKE2B 893a465c988e09f8b9c1f5dd301e09507257f39a52180a805e2caa996b6a6776b86d9920428a261358faa5426660637ec8e987cd2ae072ca78f277b34b61ae68 SHA512 27966bedc01ef5e2d023ee0b91224ca5ab3c5019f431305a9daa62b3acddf80e4e4c201ec47ca06243aba7778810d5ecb95e9d115e15935153a4a5d061af3fac
-DIST patch-4.13.7-rt1.patch.xz 199252 BLAKE2B fdb11597557fc59b046559716e8af10e61bdd7e57b7f6db85861d67c347be8ec11cc15ba81ed566d2b1e0d007aab6075af29d0b20130ce2c61aae739ce8adf4a SHA512 efffccb597b53d096bcfde6d32688e175c975ef194093ccf165a03d2ca985165589dbc10b62e81f816f1264ab932563b23d20eab41c1a20214a11a940c02499d
-DIST patch-4.13.7.xz 165784 BLAKE2B 72fa2862168d5ad038a90d9bf8d234b21ee51d7835bc31def66396dfe14c42443c5525bc6a549146ba6107e2bff735997895b5f7583abc05f5e85dacf94e60bb SHA512 4d96c655ca4c720b872e1a88ba9989a419880cb5fec2a4a9190077588066f205c5dce2591a76f26375f6f50001334ceb7631d489d3b24ca443d10e1e6879ed54
+DIST patch-4.14.6-rt7.patch.xz 227192 BLAKE2B 1253224989c3787ff364c182e5924e84d0fa909cf8b1d8abb5d747c97b472125952e19f75ee90617786d6a4250e7b3dbd86019a4e7e661903d169b04e768d1ed SHA512 3073ad820c5fce77c982ebcc4835b875ac3d5421dee9a476c396d1efe33a87f034bf6d5aa08f7f6c63f45424bd8c74273a908c30ff77a788bec1259ff110a521
+DIST patch-4.14.6.xz 163536 BLAKE2B bfd141411a2077a64fba3f5e256b1ff9b60f099bac16a91782c5f32f7366139a5797d943df147f8218291a6c582fcff4a496efe07447c8a445c2f9e0fa6219fc SHA512 c37b437f740fbb480766149ca1c6ddb5ee763b88b034b9b4eaf3ce000f299545ee19a93638d1a4161ab0c76ec73e1a53b2264b94213d53d6ad7dcda6bee45b8c
+DIST patch-4.4.105-rt120.patch.xz 194500 BLAKE2B a2714c0f0ddf6f533d4cbc7d325fbb911cf1dd0c3a58afef9b979ffc8ae1f7aec2f652e8cb20d8456bc88c91ff35932751e0e7fa56e2b732e48d3564c9279170 SHA512 10cbf7b109a6376df6fc2e672decf10fcf52f5c2f855984dc4cecb245e71c3b8b19efe7c134a5f27d84ff6c848b42a93fc5a7b9289634a62b33b699d8a40c225
+DIST patch-4.4.105.xz 1476744 BLAKE2B b524b02c9c5d0c18b45d2c94d99c7759a71a74a213efd68a43f0a0ef2b1f5b6c166552b449d3adaeb856e6ffb397073cdf7b9f0b11a463e468f734f389fcd989 SHA512 c44e483a790730a7ab3d2b64a2cfa37e9f1a9ed93dd8118632c1034de05e93c31f54882fbdc414d1677c22f2beaf0e102d7082ec596ce5ba2395e38692b0d807
 DIST patch-4.4.86-rt99.patch.xz 191740 BLAKE2B 7e0627722dab7d34e2fefa0ebbaa9e433a65202c8fc67095a5d95a5150aebe39453ef9f0ecfb1d8c4e5be6b0b59801547f551c348aa8e0a7660791b4c24f45ae SHA512 253b31069748dad1758b68a6afb1c5af1d42652185f80521b48f52f43b26fe846e0c5433ed66db337a54a4e62abb88f64fd8d98dd694870e3c2b68a66fac7e30
 DIST patch-4.4.86.xz 1322684 BLAKE2B ec213137276e5b34086e92b0f59c38e39fc922e7e6034a80aa8c0d9f2221ee2799cbcd8ab942bff9d439850946227147247e94201121da225eb7c089bb743b53 SHA512 c8d97bbe5ac83801272ed2c33f003cfb2a3e8f56a022dc8965bc540bd9ce691b3eb91268c4ba6f7226c2e23470f983e37cbb735d382f547a66086af06161ae7d
 DIST patch-4.4.97-rt110.patch.xz 191772 BLAKE2B 9ce80852c224589df2b661d13e6369066657b27c4b1bfd3a8d1d588e2f6711f3931b0a690684ce6a5bf8d0ee2d46a0ec179699074d13041aad177e7a0920bf3e SHA512 26521e1025abe5e5e363daaf3cb6261d43d90f83808b3843fd3c3a4c0908a4066d8468df20a1cee7c7a07df20fe35e37b93907b3833539181ffb229a129b86c3
@@ -41,16 +47,21 @@ DIST patch-4.9.47-rt37.patch.xz 171208 BLAKE2B 124341097e524fdb711a16175108168c9
 DIST patch-4.9.47.xz 937408 BLAKE2B f81827ccdedcdb34b1d8f18b73674bf7ea19d83bb16c5f9f3c76909ec0a0561fcfda37da40ad410c74c1c7c00716a43540db5af50e8261f394a3253a2295df03 SHA512 1444676c9bdff6133191db4885fb6ddfb989e355c7f16ddc42ff1ed9415917f06c8147cd69346525624da8547204a68303d5002417b40e11c0174341f55cfc09
 DIST patch-4.9.61-rt51.patch.xz 171084 BLAKE2B accaafb5afa9b3f4e3f5d3c9bd2e52926b727ef9b81b2f45279ee9b23a0e03d0b6b1da3d1aa5d72051a8ed36a63e1123babe2a2d06622c6027793de7f0393f07 SHA512 d5dbfa5f0802365b5547efbccd3e3e3e00d7d7e9ea5ce9ecc60a11438854384df9de333d348ac4237c315c5c3a0f69487e99ade3afaafd26e098399abde73289
 DIST patch-4.9.61.xz 1113680 BLAKE2B 6616fd0676cad33aedad73fd3d6f2f1afab70d02830ec97ed50b3e1e39bd24930662eb9b861a4a099a26e704b3d3944aca6c101ce4810080a2c0b8943f6377ea SHA512 2b558fd3f5f7c70a1dde7a39ef3dd6bef621e5001d24f9945b887d58a4d640e58fbc0eecf77d845e4ca5815b507ee03f64e0db03a38c7d8e283eacae3d7dfb6a
+DIST patch-4.9.68-rt60.patch.xz 173760 BLAKE2B fd2837714f44f1d66d25c4abb247adc18cb36542be66b1e7eb060e084c5eaa23ebd6e6da3f7cc5ce7d7fe0214a9cbb3a3b657767026eb652bc7e8fb18a41b81c SHA512 d95fbddc27af73512cbf7751abc9158ecf075a242ab42b30c59148e3c3ecb2f969fbc9447be62db5e50b82981fdd9b5dafc44e635be2103f8f9271b992436c41
+DIST patch-4.9.68.xz 1216096 BLAKE2B a37893a9526c31ac3a5b0eac06e17cd1d2a6ad23dcfd7ef5c1c0955a9cdd3c5912486a35b111d9eacc24aa4b4ecccdd43ec3e7e6f77c76b4fd697c092a2676e0 SHA512 2eb4479a89dd59a3b441c65f235777e69e06e24c91e8269ab77e4b628283cbc954376d685ce9a9b7fa408132e183a2581a3867e32d8c38666ec66b6d6b8bcd79
 EBUILD rt-sources-3.18.69_p75.ebuild 1512 BLAKE2B 879e64588915e915dbd5f91bd398a9674435090b7dc54b9e2feec301d6527ca3c55550bb356a516837826583ebaf4ff0371200fa550f270717321528c8611391 SHA512 330a243a7084d3b5bdbd23e07550e636ade52e6034d15303987547fe8361ad65affffa697f4ae7a5de0c5aacc41c566319f877fa1ffc0c4bb167aef21d198183
 EBUILD rt-sources-3.18.82_p88.ebuild 1445 BLAKE2B 004134fe10c96636bd977951171e289cfa40472f48eadf90e777c5cd38e5f052815af790afc79cc09b859da4e1595913443cd64fb1275563ded1371f2ca67f6b SHA512 29f06648a0e813d797a02e7e86507649327d417bd42a7c87e5e7d13ffba4c9983c8da6e83707cd50a60504b42e53be130c9bde6571bd0a26c0c261f6901d3314
 EBUILD rt-sources-4.1.42_p50.ebuild 1512 BLAKE2B 879e64588915e915dbd5f91bd398a9674435090b7dc54b9e2feec301d6527ca3c55550bb356a516837826583ebaf4ff0371200fa550f270717321528c8611391 SHA512 330a243a7084d3b5bdbd23e07550e636ade52e6034d15303987547fe8361ad65affffa697f4ae7a5de0c5aacc41c566319f877fa1ffc0c4bb167aef21d198183
 EBUILD rt-sources-4.1.46_p51.ebuild 1445 BLAKE2B 004134fe10c96636bd977951171e289cfa40472f48eadf90e777c5cd38e5f052815af790afc79cc09b859da4e1595913443cd64fb1275563ded1371f2ca67f6b SHA512 29f06648a0e813d797a02e7e86507649327d417bd42a7c87e5e7d13ffba4c9983c8da6e83707cd50a60504b42e53be130c9bde6571bd0a26c0c261f6901d3314
+EBUILD rt-sources-4.1.46_p52.ebuild 1445 BLAKE2B 004134fe10c96636bd977951171e289cfa40472f48eadf90e777c5cd38e5f052815af790afc79cc09b859da4e1595913443cd64fb1275563ded1371f2ca67f6b SHA512 29f06648a0e813d797a02e7e86507649327d417bd42a7c87e5e7d13ffba4c9983c8da6e83707cd50a60504b42e53be130c9bde6571bd0a26c0c261f6901d3314
 EBUILD rt-sources-4.11.12_p16.ebuild 1512 BLAKE2B 879e64588915e915dbd5f91bd398a9674435090b7dc54b9e2feec301d6527ca3c55550bb356a516837826583ebaf4ff0371200fa550f270717321528c8611391 SHA512 330a243a7084d3b5bdbd23e07550e636ade52e6034d15303987547fe8361ad65affffa697f4ae7a5de0c5aacc41c566319f877fa1ffc0c4bb167aef21d198183
 EBUILD rt-sources-4.13.10_p3.ebuild 1445 BLAKE2B 004134fe10c96636bd977951171e289cfa40472f48eadf90e777c5cd38e5f052815af790afc79cc09b859da4e1595913443cd64fb1275563ded1371f2ca67f6b SHA512 29f06648a0e813d797a02e7e86507649327d417bd42a7c87e5e7d13ffba4c9983c8da6e83707cd50a60504b42e53be130c9bde6571bd0a26c0c261f6901d3314
 EBUILD rt-sources-4.13.13_p5.ebuild 1445 BLAKE2B 004134fe10c96636bd977951171e289cfa40472f48eadf90e777c5cd38e5f052815af790afc79cc09b859da4e1595913443cd64fb1275563ded1371f2ca67f6b SHA512 29f06648a0e813d797a02e7e86507649327d417bd42a7c87e5e7d13ffba4c9983c8da6e83707cd50a60504b42e53be130c9bde6571bd0a26c0c261f6901d3314
-EBUILD rt-sources-4.13.7_p1.ebuild 1445 BLAKE2B 004134fe10c96636bd977951171e289cfa40472f48eadf90e777c5cd38e5f052815af790afc79cc09b859da4e1595913443cd64fb1275563ded1371f2ca67f6b SHA512 29f06648a0e813d797a02e7e86507649327d417bd42a7c87e5e7d13ffba4c9983c8da6e83707cd50a60504b42e53be130c9bde6571bd0a26c0c261f6901d3314
+EBUILD rt-sources-4.14.6_p7.ebuild 1445 BLAKE2B 004134fe10c96636bd977951171e289cfa40472f48eadf90e777c5cd38e5f052815af790afc79cc09b859da4e1595913443cd64fb1275563ded1371f2ca67f6b SHA512 29f06648a0e813d797a02e7e86507649327d417bd42a7c87e5e7d13ffba4c9983c8da6e83707cd50a60504b42e53be130c9bde6571bd0a26c0c261f6901d3314
+EBUILD rt-sources-4.4.105_p120.ebuild 1445 BLAKE2B 004134fe10c96636bd977951171e289cfa40472f48eadf90e777c5cd38e5f052815af790afc79cc09b859da4e1595913443cd64fb1275563ded1371f2ca67f6b SHA512 29f06648a0e813d797a02e7e86507649327d417bd42a7c87e5e7d13ffba4c9983c8da6e83707cd50a60504b42e53be130c9bde6571bd0a26c0c261f6901d3314
 EBUILD rt-sources-4.4.86_p99.ebuild 1512 BLAKE2B 879e64588915e915dbd5f91bd398a9674435090b7dc54b9e2feec301d6527ca3c55550bb356a516837826583ebaf4ff0371200fa550f270717321528c8611391 SHA512 330a243a7084d3b5bdbd23e07550e636ade52e6034d15303987547fe8361ad65affffa697f4ae7a5de0c5aacc41c566319f877fa1ffc0c4bb167aef21d198183
 EBUILD rt-sources-4.4.97_p110.ebuild 1445 BLAKE2B 004134fe10c96636bd977951171e289cfa40472f48eadf90e777c5cd38e5f052815af790afc79cc09b859da4e1595913443cd64fb1275563ded1371f2ca67f6b SHA512 29f06648a0e813d797a02e7e86507649327d417bd42a7c87e5e7d13ffba4c9983c8da6e83707cd50a60504b42e53be130c9bde6571bd0a26c0c261f6901d3314
 EBUILD rt-sources-4.9.47_p37.ebuild 1512 BLAKE2B 879e64588915e915dbd5f91bd398a9674435090b7dc54b9e2feec301d6527ca3c55550bb356a516837826583ebaf4ff0371200fa550f270717321528c8611391 SHA512 330a243a7084d3b5bdbd23e07550e636ade52e6034d15303987547fe8361ad65affffa697f4ae7a5de0c5aacc41c566319f877fa1ffc0c4bb167aef21d198183
 EBUILD rt-sources-4.9.61_p51.ebuild 1445 BLAKE2B 004134fe10c96636bd977951171e289cfa40472f48eadf90e777c5cd38e5f052815af790afc79cc09b859da4e1595913443cd64fb1275563ded1371f2ca67f6b SHA512 29f06648a0e813d797a02e7e86507649327d417bd42a7c87e5e7d13ffba4c9983c8da6e83707cd50a60504b42e53be130c9bde6571bd0a26c0c261f6901d3314
+EBUILD rt-sources-4.9.68_p60.ebuild 1445 BLAKE2B 004134fe10c96636bd977951171e289cfa40472f48eadf90e777c5cd38e5f052815af790afc79cc09b859da4e1595913443cd64fb1275563ded1371f2ca67f6b SHA512 29f06648a0e813d797a02e7e86507649327d417bd42a7c87e5e7d13ffba4c9983c8da6e83707cd50a60504b42e53be130c9bde6571bd0a26c0c261f6901d3314
 MISC metadata.xml 656 BLAKE2B 3bd604678b07a267b32917a36104fae8ac19abfed08ad8400368dd1d165f628712ba924653b6a03062f065a1d93660c5bd95addd463633f799a525cdcc5134a6 SHA512 7645322de766780bef064c3b6313009bf7ce4e4e28c247ce7707d0950bb7bbb792091254a4af1fc9ab3d24923fd69ebea0f9d253115527ef6b48cffecbcdfb67
diff --git a/sys-kernel/rt-sources/rt-sources-4.13.7_p1.ebuild b/sys-kernel/rt-sources/rt-sources-4.1.46_p52.ebuild
index 3b5bc7251fce..3b5bc7251fce 100644
--- a/sys-kernel/rt-sources/rt-sources-4.13.7_p1.ebuild
+++ b/sys-kernel/rt-sources/rt-sources-4.1.46_p52.ebuild
diff --git a/sys-kernel/rt-sources/rt-sources-4.14.6_p7.ebuild b/sys-kernel/rt-sources/rt-sources-4.14.6_p7.ebuild
new file mode 100644
index 000000000000..3b5bc7251fce
--- /dev/null
+++ b/sys-kernel/rt-sources/rt-sources-4.14.6_p7.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+KEYWORDS="~amd64"
+
+HOMEPAGE="https://www.kernel.org/pub/linux/kernel/projects/rt/"
+
+inherit versionator
+
+CKV="$(get_version_component_range 1-3)"
+K_SECURITY_UNSUPPORTED="1"
+K_DEBLOB_AVAILABLE="1"
+RT_PATCHSET="${PV/*_p}"
+
+inherit kernel-2
+detect_version
+
+K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
+RT_FILE="patch-${K_BRANCH_ID}.${KV_PATCH}-rt${RT_PATCHSET}.patch.xz"
+RT_URI="mirror://kernel/linux/kernel/projects/rt/${K_BRANCH_ID}/${RT_FILE} \
+		mirror://kernel/linux/kernel/projects/rt/${K_BRANCH_ID}/older/${RT_FILE}"
+
+DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with the CONFIG_PREEMPT_RT patch"
+SRC_URI="${KERNEL_URI} ${RT_URI}"
+
+KV_FULL="${PVR/_p/-rt}"
+S="${WORKDIR}/linux-${KV_FULL}"
+
+UNIPATCH_LIST="${DISTDIR}/${RT_FILE}"
+UNIPATCH_STRICTORDER="yes"
+
+src_prepare() {
+	default
+
+	# 627796
+	sed \
+		"s/default PREEMPT_NONE/default PREEMPT_RT_FULL/g" \
+		-i "${S}/kernel/Kconfig.preempt"
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	ewarn
+	ewarn "${PN} are *not* supported by the Gentoo Kernel Project in any way."
+	ewarn "If you need support, please contact the RT project developers directly."
+	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
+	ewarn "the ebuilds."
+	ewarn
+}
+
+K_EXTRAEINFO="For more info on rt-sources and details on how to report problems, see: \
+${HOMEPAGE}."
diff --git a/sys-kernel/rt-sources/rt-sources-4.4.105_p120.ebuild b/sys-kernel/rt-sources/rt-sources-4.4.105_p120.ebuild
new file mode 100644
index 000000000000..3b5bc7251fce
--- /dev/null
+++ b/sys-kernel/rt-sources/rt-sources-4.4.105_p120.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+KEYWORDS="~amd64"
+
+HOMEPAGE="https://www.kernel.org/pub/linux/kernel/projects/rt/"
+
+inherit versionator
+
+CKV="$(get_version_component_range 1-3)"
+K_SECURITY_UNSUPPORTED="1"
+K_DEBLOB_AVAILABLE="1"
+RT_PATCHSET="${PV/*_p}"
+
+inherit kernel-2
+detect_version
+
+K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
+RT_FILE="patch-${K_BRANCH_ID}.${KV_PATCH}-rt${RT_PATCHSET}.patch.xz"
+RT_URI="mirror://kernel/linux/kernel/projects/rt/${K_BRANCH_ID}/${RT_FILE} \
+		mirror://kernel/linux/kernel/projects/rt/${K_BRANCH_ID}/older/${RT_FILE}"
+
+DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with the CONFIG_PREEMPT_RT patch"
+SRC_URI="${KERNEL_URI} ${RT_URI}"
+
+KV_FULL="${PVR/_p/-rt}"
+S="${WORKDIR}/linux-${KV_FULL}"
+
+UNIPATCH_LIST="${DISTDIR}/${RT_FILE}"
+UNIPATCH_STRICTORDER="yes"
+
+src_prepare() {
+	default
+
+	# 627796
+	sed \
+		"s/default PREEMPT_NONE/default PREEMPT_RT_FULL/g" \
+		-i "${S}/kernel/Kconfig.preempt"
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	ewarn
+	ewarn "${PN} are *not* supported by the Gentoo Kernel Project in any way."
+	ewarn "If you need support, please contact the RT project developers directly."
+	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
+	ewarn "the ebuilds."
+	ewarn
+}
+
+K_EXTRAEINFO="For more info on rt-sources and details on how to report problems, see: \
+${HOMEPAGE}."
diff --git a/sys-kernel/rt-sources/rt-sources-4.9.68_p60.ebuild b/sys-kernel/rt-sources/rt-sources-4.9.68_p60.ebuild
new file mode 100644
index 000000000000..3b5bc7251fce
--- /dev/null
+++ b/sys-kernel/rt-sources/rt-sources-4.9.68_p60.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+KEYWORDS="~amd64"
+
+HOMEPAGE="https://www.kernel.org/pub/linux/kernel/projects/rt/"
+
+inherit versionator
+
+CKV="$(get_version_component_range 1-3)"
+K_SECURITY_UNSUPPORTED="1"
+K_DEBLOB_AVAILABLE="1"
+RT_PATCHSET="${PV/*_p}"
+
+inherit kernel-2
+detect_version
+
+K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
+RT_FILE="patch-${K_BRANCH_ID}.${KV_PATCH}-rt${RT_PATCHSET}.patch.xz"
+RT_URI="mirror://kernel/linux/kernel/projects/rt/${K_BRANCH_ID}/${RT_FILE} \
+		mirror://kernel/linux/kernel/projects/rt/${K_BRANCH_ID}/older/${RT_FILE}"
+
+DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with the CONFIG_PREEMPT_RT patch"
+SRC_URI="${KERNEL_URI} ${RT_URI}"
+
+KV_FULL="${PVR/_p/-rt}"
+S="${WORKDIR}/linux-${KV_FULL}"
+
+UNIPATCH_LIST="${DISTDIR}/${RT_FILE}"
+UNIPATCH_STRICTORDER="yes"
+
+src_prepare() {
+	default
+
+	# 627796
+	sed \
+		"s/default PREEMPT_NONE/default PREEMPT_RT_FULL/g" \
+		-i "${S}/kernel/Kconfig.preempt"
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	ewarn
+	ewarn "${PN} are *not* supported by the Gentoo Kernel Project in any way."
+	ewarn "If you need support, please contact the RT project developers directly."
+	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
+	ewarn "the ebuilds."
+	ewarn
+}
+
+K_EXTRAEINFO="For more info on rt-sources and details on how to report problems, see: \
+${HOMEPAGE}."
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index 26beabc94639..5efa688851ae 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -7,13 +7,13 @@ DIST linux-4.9.tar.xz 93192404 BLAKE2B 83ae310b17d47f1f18d6d28537c31e10f3e60458c
 DIST patch-3.16.51.xz 1793852 BLAKE2B 56ca956f9e3512530be5c3151b77fe06410eda5890641df4abdcab157368ee43f833067b415cf5c472097b28123b8bc3ab65a85af62146cf9aff56608157d78c SHA512 b67629a04a9e047861d7eede2356784bae8f9b214aa84cd56af2fb12e6cf1cc0233d94e3d037141d495af72b654cbece55d04b65affd11478acedd822fa5b147
 DIST patch-3.2.96.xz 1827208 BLAKE2B 0ea04438b4dc7009240c1f6e84e1b16fbcd63952d5fb4fadb819b04bf00938c84e67a1902cd9f7d1b50757a2a33c48c7413676d5a509e8b38b7d18df8c2f05a8 SHA512 83f435421105feff463b497a7cfed58920ac05f760823d9867bbb2864c8c52915d099ceaf9c6a5924b1abd4b0409066bb00ec64603bc90e52a4abbc73e365ce8
 DIST patch-4.1.48.xz 1286376 BLAKE2B bc72b596f8fadaadeca4d4424465220e8ea2a9e96b51a718ee537ee7586c99dc796920ec760d7e351ee1d32a289fc06f0407bc5e85c3578be4bf3f062ffc7ebc SHA512 6bdab31db1f64f311b6181efa6b3a104a92be0e438e1f1c01cdec121bded8fe6cdc3340400a2249b3796cab454d81a0a19293adb07d40d52fd3d6ac1fe9963f9
-DIST patch-4.14.6.xz 163536 BLAKE2B bfd141411a2077a64fba3f5e256b1ff9b60f099bac16a91782c5f32f7366139a5797d943df147f8218291a6c582fcff4a496efe07447c8a445c2f9e0fa6219fc SHA512 c37b437f740fbb480766149ca1c6ddb5ee763b88b034b9b4eaf3ce000f299545ee19a93638d1a4161ab0c76ec73e1a53b2264b94213d53d6ad7dcda6bee45b8c
+DIST patch-4.14.7.xz 181512 BLAKE2B 6ec0a939799d7b70d795e652a5e9533f174d3041ae0319d145d7981b55596ee4abc648949186f273e198845b5de00da336229f12a122550f1be3a894fe40ae59 SHA512 7a0aa00af73fbac34a0f96ebbd977688275538f8f2f3e0ba32ac3f9eb0d02498dd75d4d6481cfdd1236d45616231dd376a453ce8c04663ceaeb5ccc553996251
 DIST patch-4.4.106.xz 1489608 BLAKE2B 5fa091865f15ca694bde5c571364205eaeb22aebc594bef0791fefac0df476ebc6bdc37b777c8eb5b011f4f57c3177df1aa7fd3d90e30f12e4e3c2961acaf938 SHA512 b6d94e3f15fb39569b476c1d65bb07536f6f0f486c4668d8d299bc5bfc5e03401ee7ebe3683351d0290bbe1b3456ce4900dd6c2672a0c6b7b63c4f00102abae1
 DIST patch-4.9.69.xz 1241568 BLAKE2B 1241b5a46be1864dd7d18757242981fae01987c037d2b488b38e7426c9bee700ac33f333b640e2f185653b5db0cb184dfc390805c73b10f00652732c36f19d5b SHA512 452304c2c885056b384dae97c860469f6152e146ac2d9d97c9191e71a0fe1195a796980d2f8407b05b4e6ca32abe4dcfda210a4b4b108dc4326702139d6a8332
 EBUILD vanilla-sources-3.16.51.ebuild 426 BLAKE2B 099baed06d1e27838b57dff744d75d916be9ba4698c839f7ba316bf11b3ba4efb8c6098e69827ab125b9ecee7773b0c36cdeb3747415926fbb843202c2a7810a SHA512 61c2bff9920b131b34aff6713441ce702cd84532a04a60b7b59ae17c65618d56637bc9aa106657596fda25197df41cc64f4d62e231493b78fd44c01afc70070a
 EBUILD vanilla-sources-3.2.96.ebuild 426 BLAKE2B 099baed06d1e27838b57dff744d75d916be9ba4698c839f7ba316bf11b3ba4efb8c6098e69827ab125b9ecee7773b0c36cdeb3747415926fbb843202c2a7810a SHA512 61c2bff9920b131b34aff6713441ce702cd84532a04a60b7b59ae17c65618d56637bc9aa106657596fda25197df41cc64f4d62e231493b78fd44c01afc70070a
 EBUILD vanilla-sources-4.1.48.ebuild 426 BLAKE2B 099baed06d1e27838b57dff744d75d916be9ba4698c839f7ba316bf11b3ba4efb8c6098e69827ab125b9ecee7773b0c36cdeb3747415926fbb843202c2a7810a SHA512 61c2bff9920b131b34aff6713441ce702cd84532a04a60b7b59ae17c65618d56637bc9aa106657596fda25197df41cc64f4d62e231493b78fd44c01afc70070a
-EBUILD vanilla-sources-4.14.6.ebuild 426 BLAKE2B 099baed06d1e27838b57dff744d75d916be9ba4698c839f7ba316bf11b3ba4efb8c6098e69827ab125b9ecee7773b0c36cdeb3747415926fbb843202c2a7810a SHA512 61c2bff9920b131b34aff6713441ce702cd84532a04a60b7b59ae17c65618d56637bc9aa106657596fda25197df41cc64f4d62e231493b78fd44c01afc70070a
+EBUILD vanilla-sources-4.14.7.ebuild 426 BLAKE2B 099baed06d1e27838b57dff744d75d916be9ba4698c839f7ba316bf11b3ba4efb8c6098e69827ab125b9ecee7773b0c36cdeb3747415926fbb843202c2a7810a SHA512 61c2bff9920b131b34aff6713441ce702cd84532a04a60b7b59ae17c65618d56637bc9aa106657596fda25197df41cc64f4d62e231493b78fd44c01afc70070a
 EBUILD vanilla-sources-4.4.106.ebuild 426 BLAKE2B 099baed06d1e27838b57dff744d75d916be9ba4698c839f7ba316bf11b3ba4efb8c6098e69827ab125b9ecee7773b0c36cdeb3747415926fbb843202c2a7810a SHA512 61c2bff9920b131b34aff6713441ce702cd84532a04a60b7b59ae17c65618d56637bc9aa106657596fda25197df41cc64f4d62e231493b78fd44c01afc70070a
 EBUILD vanilla-sources-4.9.69.ebuild 426 BLAKE2B 099baed06d1e27838b57dff744d75d916be9ba4698c839f7ba316bf11b3ba4efb8c6098e69827ab125b9ecee7773b0c36cdeb3747415926fbb843202c2a7810a SHA512 61c2bff9920b131b34aff6713441ce702cd84532a04a60b7b59ae17c65618d56637bc9aa106657596fda25197df41cc64f4d62e231493b78fd44c01afc70070a
 MISC metadata.xml 642 BLAKE2B 6aa41c5f612d15c0b53c6aed058b2dd01bf9d7dd1ef8abb188f85cad84b43be94b3279d7c7ba50b3ac1b112c385ce01a8a8bf77d3a85dfd8e18838d7def5031d SHA512 b7e1d4e4e6a4a75046ace025fa1b42a38068dcbdafddf2b468287e9280832173617202c036b1ad1fb42c2f2e16920c44f0580039e3844cbb73402143361f764e
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.14.6.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.14.7.ebuild
index 20e2c109b44b..20e2c109b44b 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.14.6.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.14.7.ebuild
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 972ab895b189..6938233cf7ac 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/compiler-rt-sanitizers/Manifest b/sys-libs/compiler-rt-sanitizers/Manifest
index f01451232370..937c87a1b459 100644
--- a/sys-libs/compiler-rt-sanitizers/Manifest
+++ b/sys-libs/compiler-rt-sanitizers/Manifest
@@ -1,10 +1,11 @@
 DIST compiler-rt-4.0.1.src.tar.xz 1434100 BLAKE2B ca6bf78fc07f387b7244a52ef648b06a5685effb46a66b241a9ee847ecafb17d02602f49b0dbe473d47202586874a043a6d75141400062f526d2f808da323e1e SHA512 cfeb625884b273f7c0e6767b81a8d3e5f24e0b96a510d5764d9d47a0e215fc841b4cb9d1843c8fb428cd21def720cfbfe8d3593ff5bb390548ebc8c32a902649
 DIST compiler-rt-5.0.0.src.tar.xz 1507996 BLAKE2B 7294b7c4fee6401baaf2a9c9bd22d3f94d57334575ae0d5c599b613990d6f139b72acee8c2c66f6c7bc17378d5258290e749f691cc6c6c5bf9f204e3a76b37a0 SHA512 5f3fd49736fba35232b0baa19a5f03c4ab3bf85ec16f23355eb3c516fe6d861c14272c224ca2f2092a80636df4307e49a3df1b60a3791949b3f1ba4a0c8c81fb
 DIST compiler-rt-5.0.1rc2.src.tar.xz 1509784 BLAKE2B 898e32e189589b6b72073cb791dc9498201d7267e13ad60704b9a66f3e4e839497a84c7cfc5817e72263b5287d00cf25debd2e739ea4174213c56ddb2aed6e38 SHA512 ec2a91e81bc7ac069849f07c31335c88734fd34b512ca3bedaed9c33116549853ac6ac7188552c181900ed8d7ff14ec08c004c87d7fbcbc234e73710c2047d2b
+DIST compiler-rt-sanitizers-4.0.1-patchset.tar.xz 2384 BLAKE2B 6f9eee711c83570767f0bb634d0f91c18ee7f2af93a478938b8d5b6ce6f2c2fbaadb7bd5c7ee94a14dc1834359a046187db6bc7005b7c2efa539325dc0701ad9 SHA512 72d7357b4c27bbf8fa8b34803ddea905a9f1054e8fc7bf99a4ead9dc00408989ea2709f04be9cf45a27eeb4b9386c89feeb25b53a84f3cac9739196b89813887
 DIST llvm-4.0.1.src.tar.xz 21065652 BLAKE2B 6327eed2d1feb108440f22d2581d1ff86c10a10c29793538d8d899c7e2dc83d3f7b147d3fd4bcce2bd2bf57c071b08c624aeafe40a3e7a3914506e7751727e6c SHA512 16adc39b34ddb628f81b171119a8e2a0e9138b25011e803ef0b688e2fbea116fc4953d3a1b61b90a98a75e33619f81566b7cb06a9a2ea4d04ac5e0eb303a2d1d
 DIST llvm-5.0.0.src.tar.xz 23411980 BLAKE2B bc3d8b75b766c83912252b51d6b57c8151c9d83415eff7bc771923d35138ed253a788d6c8e0a384c5e78ce1a1065f10d66ef5004df163b4c3b0c6274bb3aa6b7 SHA512 e6d8fdcb5bf27bded814d02f39f69c6171bc3a512d5957c03e5ac2e231f903b7de87634b059bd5c5da670f7c3a8f7a538f6299225799f15f921857f1452f6b3a
 DIST llvm-5.0.1rc2.src.tar.xz 23508164 BLAKE2B 3594d1658310a99787b4ff6f85aa8dd12a0405464bcb095ba4f205ce5b4ed3240a8ae1bef726ff98aba61ae5c8f8c10eeb8e415320d210af60f9e74bff7a8d5c SHA512 0a156e3949d22304b5e173dc9a3628161dff2798ad67924341c11494544350ef3a35a3ebb6ec8e7223b2407ce47cf12dafa6de8c006c5799a620e35a86c30b1b
-EBUILD compiler-rt-sanitizers-4.0.1.ebuild 3698 BLAKE2B 6c9de6cb35220bb75078cca984f69ada001f461a23ddf22d90f79363ea73021ada54a6de142f2d6f2be07a349044cf903aaf172829006c9ee38fc77b083ae517 SHA512 fc8d225f02a62ea92aab4472e3d75865f94fe22a25caae5e47be156dc9d65242bc3d6cc1643c23dad8616e96f3865b3a9e102eefc4dbaaecb7c433505dff4aeb
+EBUILD compiler-rt-sanitizers-4.0.1.ebuild 3840 BLAKE2B 72c9943e4bafed115dabfa2fa33a035af9259bc764e8ac6797a9fc7c62aa60110feba43305b25595b6819e7fab261edc2619113deb5ef5629d0b433fc788717a SHA512 1d0d63f67b71a718bf7ed8bb422659a1b83f7c5dddd7d5cf436d5e7c266eb5ffd9096a2653c18b5272c79d659b898ec9fe489ba94d8786cce7823acea11724a9
 EBUILD compiler-rt-sanitizers-5.0.0.ebuild 3645 BLAKE2B 2ebf4a7189fce215a4c3bc91c59bd2af1e5ff20da607bbc80a5881b479a2c7a5e108c7efce269dffa5705141d0792842fb5227143bcb0afa84f0c03a88b7cffb SHA512 c54db543aafa607484f49bba0171c5e46c30ac461431711baa7ec1f65e81aae633c48bb5c83dc1f0b77a3aacaab539040e3fdadb842c27ae1b1fb4904ff1c95e
 EBUILD compiler-rt-sanitizers-5.0.1_rc2.ebuild 3858 BLAKE2B 47cab615a0e744cb17cf82a197486dddf2624f92b28e9429a3a854866d5a4423ddf1ababad4830a07fb9eaa2487eccec64a9bcfbb1a5c180619e3f64132b86a6 SHA512 76476996e5fa8966e0bf58ed3a319e60819ad86749872e8f172d21f293e886b5324d05dfef76bfe9cb49ef1af3f5f6488e2e6eeef74bdbe1aca27d3a5d600516
 EBUILD compiler-rt-sanitizers-5.0.9999.ebuild 3880 BLAKE2B 0a35eefb914655b0c1071b8c41d4aed44f0f2ef650a0368361bd499da2b2d935c8ad505cc9a07fc346d6bb7e66645166b20a41bb063c74928befb8630acd73bf SHA512 0c805ba6b3d3a4fff09fb46e715c2cf7b9963b4c8502fcdcc1946a0128cece01ee84f7efa6dc25d3a181f9c7803d24e3590ff28bb9d79cafade48597cd0bf49e
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-4.0.1.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-4.0.1.ebuild
index 892c742dd09d..70a21aa3a6f9 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-4.0.1.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-4.0.1.ebuild
@@ -13,6 +13,7 @@ inherit check-reqs cmake-utils flag-o-matic llvm python-any-r1
 DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
 HOMEPAGE="https://llvm.org/"
 SRC_URI="https://releases.llvm.org/${PV/_//}/compiler-rt-${PV/_/}.src.tar.xz
+	https://dev.gentoo.org/~mgorny/dist/llvm/${P}-patchset.tar.xz
 	test? ( https://releases.llvm.org/${PV/_//}/llvm-${PV/_/}.src.tar.xz )"
 
 LICENSE="|| ( UoI-NCSA MIT )"
@@ -62,6 +63,11 @@ src_unpack() {
 	fi
 }
 
+src_prepare() {
+	eapply "${WORKDIR}/${P}-patchset"
+	cmake-utils_src_prepare
+}
+
 src_configure() {
 	# pre-set since we need to pass it to cmake
 	BUILD_DIR=${WORKDIR}/${P}_build
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index d16fd3999d59..2c578b660199 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -41,6 +41,6 @@ EBUILD glibc-2.22-r4.ebuild 5009 BLAKE2B c627e49eef4e48b62d1f2f464da61f9d77de1f3
 EBUILD glibc-2.23-r4.ebuild 5011 BLAKE2B 5b002c214f74b9eeb1c5898c32560bd7b8f865138fd7c4851887f3f81be98635285344eca8cb88264b3b527b8a3dd1f03008beb642461a8fcb98ea309c08ee3e SHA512 3695c8acea09838cc79c33379cfcaf0eb774759f3af5863892ff9c63732926764a8a5187ab9aaccdfd358d62c0884feab95a7055735c9295549d5c8f0c198221
 EBUILD glibc-2.24-r4.ebuild 5047 BLAKE2B 295eeb6cecff9f9b33d428a3f52d68a5af0c92ab239a6086164593b63338cf7a841f3cde2891cb108859ea41d2b9993884411d132a8db787d2cc06e9a7087cdf SHA512 d93834a9012716293c1992d6217eed6364782e6e01c692e349c6edb00bbda6dd5f227f70977e438b46de0861e9a2d4bc8c04270873cec75b1eb395b1328ea8e2
 EBUILD glibc-2.25-r9.ebuild 5039 BLAKE2B 0706fb07b8ebe4c746e0654274a7a7ee60e197e8765b8f78995af7b0ed11327628ccb5addfe423205e63f00990b19e1d1a6c22104ca437966d947ad2913354fb SHA512 bbcfc6992111c0b8a4638c0d1fe45c1f95f9f03a3db79afbd2a7a61f4736d38810f191bbb0cc4cecdedf4485c2586419f867587084575c5f50e5e7b7cea7228b
-EBUILD glibc-2.26-r3.ebuild 24818 BLAKE2B c6d94bc8c4a336951427984084b1c0d48263108f863c2b8378f0177934d96628d5b4d510f661bc05522205e326f7ab58b1f879a0259261eceee69924389cacb3 SHA512 e6e0c2b4a481151aae29230486d5a83f18070128e31e171d6083d169bda1c828641c8cb9d7e4ad89dcbdaa014c81a10030a37f47a0f918dfbdaa216963ca3bba
-EBUILD glibc-9999.ebuild 25060 BLAKE2B c0e2a92beda9b42402265d283ac9993229b143f8cd2392c6f2a21bbf5d222a7e494b62aee77891a2a2bbfba9759227ff2651f5d948ca645ee205e42381f45eaf SHA512 35fcdbc25be22cb6c0bd4f52fa6f3b5cb5e5ef0f74515b73398eb7911eab8c6a31b08f56eef048134da2762478ff469c6b41307c76f4725f8efbc43eb2885dc4
+EBUILD glibc-2.26-r3.ebuild 24943 BLAKE2B 42d1721d3cc9621368983e0933917c0ba7c67c1472d8cdac35112030d65c8dd4578a214d2546acb22c306ffcad29ba9c72c4d940f523578160c0b6ca35c9dbc8 SHA512 af5463d3757b70cbfffc3d2c7b82e30ada86de8d0aeb105dc3708d23bbd1beb444c0f0ceb948fd10594697e5a590085fac2dc8675fc856d93774d1d772bf65c5
+EBUILD glibc-9999.ebuild 25185 BLAKE2B e68de57a706879b932db7089c9981107bb9cac9056f1607800fa1f5e452cb4369f14d30596ea77adf92f562d3ef646600bdaa15515ade14fd85e11ff4063d8b4 SHA512 2f10ca2c5535a4c542ee4a8141841a501c738d07715da1e0e2f70da4cccb54ff28bee9f90917fa26ad32779f48f446c96d73e1601b037bad70a40665f1eaeafe
 MISC metadata.xml 1054 BLAKE2B dbc091e54130729385bc02aaa1025885f101caa88d601b1f7670974d89e7e24aae5d37fd6699278a37c0064e1f3232c04954dc127869427317b5d80b499f3813 SHA512 65474b7d32ceb6bafe8ae0e18aa0b46b68cefecce5570a0e8d4a0117019e6540f2feae35cecbebad382b4f06d6e5ae1dfa9b8a61889881e8534956dd42df8e4b
diff --git a/sys-libs/glibc/glibc-2.26-r3.ebuild b/sys-libs/glibc/glibc-2.26-r3.ebuild
index 88a9cd4b5b3d..ceb5b6846859 100644
--- a/sys-libs/glibc/glibc-2.26-r3.ebuild
+++ b/sys-libs/glibc/glibc-2.26-r3.ebuild
@@ -32,7 +32,7 @@ PATCH_VER=4
 SRC_URI+=" https://dev.gentoo.org/~dilfridge/distfiles/${P}-patches-${PATCH_VER}.tar.bz2"
 SRC_URI+=" multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2 )"
 
-IUSE="audit caps debug gd hardened multilib nscd selinux systemtap profile suid vanilla crosscompile_opts_headers-only"
+IUSE="audit caps debug doc gd hardened multilib nscd selinux systemtap profile suid vanilla crosscompile_opts_headers-only"
 
 # Min kernel version glibc requires
 : ${NPTL_KERN_VER:="3.2.0"}
@@ -80,6 +80,7 @@ DEPEND="${COMMON_DEPEND}
 	>=app-misc/pax-utils-0.1.10
 	!<sys-apps/sandbox-1.6
 	!<sys-apps/portage-2.1.2
+	doc? ( sys-apps/texinfo )
 "
 RDEPEND="${COMMON_DEPEND}
 	!sys-kernel/ps3-sources
@@ -286,8 +287,14 @@ glibc_do_configure() {
 
 	einfo "Configuring glibc for $1"
 
+	if use doc ; then
+		export MAKEINFO=makeinfo
+	else
+		export MAKEINFO=/dev/null
+	fi
+
 	local v
-	for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CXX LD {AS,C,CPP,CXX,LD}FLAGS ; do
+	for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CXX LD {AS,C,CPP,CXX,LD}FLAGS MAKEINFO ; do
 		einfo " $(printf '%15s' ${v}:)   ${!v}"
 	done
 
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index a3b427221e28..68d17a224695 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -33,7 +33,7 @@ PATCH_VER="3"
 SRC_URI+=" https://dev.gentoo.org/~dilfridge/distfiles/${P}-patches-${PATCH_VER}.tar.bz2"
 SRC_URI+=" multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2 )"
 
-IUSE="audit caps compile-locales debug gd hardened multilib nscd selinux systemtap profile suid vanilla crosscompile_opts_headers-only"
+IUSE="audit caps compile-locales debug doc gd hardened multilib nscd selinux systemtap profile suid vanilla crosscompile_opts_headers-only"
 
 # Min kernel version glibc requires
 : ${NPTL_KERN_VER:="3.2.0"}
@@ -85,6 +85,7 @@ DEPEND="${COMMON_DEPEND}
 	>=app-misc/pax-utils-0.1.10
 	!<sys-apps/sandbox-1.6
 	!<sys-apps/portage-2.1.2
+	doc? ( sys-apps/texinfo )
 "
 RDEPEND="${COMMON_DEPEND}
 	!sys-kernel/ps3-sources
@@ -298,8 +299,14 @@ glibc_do_configure() {
 
 	einfo "Configuring glibc for nptl"
 
+	if use doc ; then
+		export MAKEINFO=makeinfo
+	else
+		export MAKEINFO=/dev/null
+	fi
+
 	local v
-	for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CXX LD {AS,C,CPP,CXX,LD}FLAGS ; do
+	for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CXX LD {AS,C,CPP,CXX,LD}FLAGS MAKEINFO ; do
 		einfo " $(printf '%15s' ${v}:)   ${!v}"
 	done
 
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index 6ae5a6372cc8..1d83e505eda3 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/jdk/Manifest b/virtual/jdk/Manifest
index 6a121a937f96..d26c576965d4 100644
--- a/virtual/jdk/Manifest
+++ b/virtual/jdk/Manifest
@@ -1,2 +1,3 @@
 EBUILD jdk-1.8.0-r3.ebuild 403 BLAKE2B e80a768ae6876ac384f50d9dcaba436f42babf812e635a6ea59c3835c2b3c87fb8b3538478b4b8776759f57e7b34d2c4b9fc6b736bdf75126210184c5b066b9f SHA512 48473c2c28a1775dab16624e2a7479b91282f39b719557903e1ca499d736cdb82de842ac80c83399583facadc985815700b65d0a960ce81e85dc5cc0535b5a9f
+EBUILD jdk-9.ebuild 290 BLAKE2B 629927326cbe9f207205e211fc8b0165ba281df815369ee068d1caf12b343b7f4779be356814128ad196c0484928387ce1e3b7a46951df2217846bc619a9772e SHA512 f4946e3cd9dd420c24b2c3dd10138679d59988c980b102eb961df99ad007c4809d82cf309f814cba71e0d79d2becff5bf567e9628b699214665f21fa9f50ef2f
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/virtual/jdk/jdk-9.ebuild b/virtual/jdk/jdk-9.ebuild
new file mode 100644
index 000000000000..179fcc7dda49
--- /dev/null
+++ b/virtual/jdk/jdk-9.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Virtual for Java Development Kit (JDK)"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x64-macos ~sparc64-solaris"
+
+RDEPEND="
+		dev-java/oracle-jdk-bin:${SLOT}[gentoo-vm(+)]
+	"
diff --git a/virtual/jre/Manifest b/virtual/jre/Manifest
index dc412e249848..6bbf04a4ef29 100644
--- a/virtual/jre/Manifest
+++ b/virtual/jre/Manifest
@@ -1,2 +1,3 @@
 EBUILD jre-1.8.0-r1.ebuild 379 BLAKE2B 4e35789a6f87dd7e76a62a2b8a8a477a59a13968ac0e613c419bfb90d72d2372082e5948cb5086b33117c5ba391b2f1102055bdc3e23aa8e4b3ae089e92ed105 SHA512 43cda60d964ea06a6ed494c4a3a8f067802d258f09be50edfa111c2fb04a7c1c86310339d39a38b67b661647505bd8d386fb5d645c543554a886a818fb5a5d8c
+EBUILD jre-9.ebuild 321 BLAKE2B 5d7705f5c9e52261c1625fa93827fea95863d2c1665773c7c86be9b773c68738e379c0a4d257f427496e8d543ba29b6ffe572b781edd4be352fed4edea2f58fc SHA512 71b9e922fc59ee6621c01506f4d7caf8fa3bfc282f70cba5b2546e3d670a8988845261d2840833a254f3a43da722a65c2fc7eede6cbaa6d9dd2f82a44e265ec4
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/virtual/jre/jre-9.ebuild b/virtual/jre/jre-9.ebuild
new file mode 100644
index 000000000000..1c10f13ff2fa
--- /dev/null
+++ b/virtual/jre/jre-9.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Virtual for Java Runtime Environment (JRE)"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x64-macos ~sparc64-solaris"
+
+RDEPEND="|| (
+		virtual/jdk:${SLOT}
+		dev-java/oracle-jre-bin:${SLOT}[gentoo-vm(+)]
+	)"
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index dd5c1976d591..21d507cba7a5 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 6f2ade602aed..4bd9954131b9 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -17,9 +17,9 @@ DIST chromium-63.0.3239.84.tar.xz 534280828 BLAKE2B 08437f625a97ea49f274140a0444
 DIST chromium-64.0.3282.14.tar.xz 482211216 BLAKE2B 0ffc69478719903e39998fd6f908883dadcb32580a64b1e8a93b270dfb221cb89b674c7e288649de24e468a56da78cdbf35af9693cd24f5cba158789db609d30 SHA512 75b851be4bf4814e91a4e7a036b7aa78d0c76e138605a42ebe9ce8d2017a1f95eb2dc67bd73f4fa911ce2a28cec769a699f52c98c2b1b3a037321af517692c28
 DIST chromium-64.0.3282.24.tar.xz 482195676 BLAKE2B fdbe03cd5ee936913300beba18faf2a14b07a28a3904642bb4aef076c69914e1d058bde076e8f093836c4b5c548b7aa33c292b283f2807104ee5f5ebf87d6c91 SHA512 84bf757cf7a5ce08f81c4d2ef7b628b4bc393f457b81df8d86a4420a5cf68b61e01d5add6c6b221cbaf19f85b411228770d2c821e81cd8b0c16e27a455a96dff
 DIST chromium-65.0.3294.5.tar.xz 484687920 BLAKE2B 2d4d30ea83bfa0d5753eecd4ea735ec5d81097867b7c32c190853adee372c5032dac549c064fb22688555ef6231a3e2e43b274735883285f91a0a2d9c7a151ec SHA512 089bcc7eba7d5a2a964b5b6e94c7735653582cd6925325b9bdb2788bd4abb4b3cbc8c71f5c77004600864106a18da3fddda0adaa53ad54a96efe21498e45f23a
-EBUILD chromium-63.0.3239.108.ebuild 19794 BLAKE2B 9f53872a2d9a55447dc1ecc0d84f24108b3b02b047319296147780808c35cbd59e61ab53e7dfe69ce62c634b5cb2d054ab2520aded579efa2566553d6925f72f SHA512 484011ee1466804c6a95094e49a7c8d1023f40efd8e2c1d79a0f6ed588ca276ab5292238f30ee6b556a3962ed4bb0c3a1202239a31b9f54eef358c2122995342
+EBUILD chromium-63.0.3239.108.ebuild 19923 BLAKE2B 89152f731324efd4f726ea65d5b81e1edaa2e4ec10d2f211541e3b7c07ccbdb1d7711790083ffc17af2805b7199aed7371d01fdced6a6a541e53480838377b48 SHA512 5b1a459631ae23b3238d0cf3fa2b2734672f9500a3a3cf558d959dacd4938a63cf6ad717410a1117698f400f2a9aefbaf91ca7a7fff27eb82ae37937ab0cd884
 EBUILD chromium-63.0.3239.84.ebuild 19793 BLAKE2B c308aaa23701593e8f628698eff765716d51127e70d0b35692189b6f1fc4ae9bd6969e6865287637141a94685bce2c0038e4721177f36044003e68056f2290d4 SHA512 e983e0dd6e5d2281c271c620cd42d51c81c268458db17f3bf26fe96fb97b3e541473255dba870541761df05c5ef95d367a34a621591351a5b5f78a87fcce922c
 EBUILD chromium-64.0.3282.14.ebuild 19911 BLAKE2B a72ebcdb2614b0d2597b10cae01d69964df9525fa8417b7a48f0b6e5200eb8d58f25292a88c5fbd4efb3913bc5a21351f1aa3852c71784edb5a3de37935c028e SHA512 25e6f8f937724d751229d7986dd5ee7b82e479ffa95aa1d429f1519ab4db4857277266c97721fea1fe752d3ae5606bc631cefaf43688d7c2f0c9ed5e6e8bcee5
-EBUILD chromium-64.0.3282.24.ebuild 19988 BLAKE2B 9b3aaecda7453cb2fc4ec2a60bb7e9dd83e8409c5bfb1cf4c8ca7b01757e0e349402cc0fd8ae669f639adfa83b93a5ef4312d7fb1da95e935ad6ba144f3f825d SHA512 f08f7f8e3732abb5b2814b8aa6d6019661da2a5f573d6b0c6d857551905d98dba5e520c566c8ab433c91b7168bad8424e7fcceee49923c29b7066ff45d4aebf3
-EBUILD chromium-65.0.3294.5.ebuild 20262 BLAKE2B 9a95b4d2e272974335968073862ad150351e1d5f93faff4ff649f3e37f8ae4d14a5f97d44ce4d9c51f18a26edc6ec485859da1b68c45d3d72f51d1657bed2675 SHA512 5e7195adc21a9075ca131ad2df58a7e61420fb4848648d711b02ecb0823d4a1fb854385a38082c08dcec02c698c4faecf09e63d564007e39a564fd715d51c551
+EBUILD chromium-64.0.3282.24.ebuild 20117 BLAKE2B fc44b9afc646024f3fc02791b376915e9dfbf157337b6e93e4ace43f6d8ca5a5400ccbfa75a783cf8861ced1d4705a89fd7aeca0ea6ab64e7090acb79e7ee0e2 SHA512 d9bd10e62eb5b2e3c538ddd48d5ba725bb7b0981e807e4fba181bbcf31b89e4557ab22f1019b5272d3cf8e71a58b8518df28c9df8f52943926d54e9831e9a24d
+EBUILD chromium-65.0.3294.5.ebuild 20391 BLAKE2B 4b12a96597d3f66114dbe4f71f4a5c02a33900e7df242f13d2b9c1ccba7dad44e39a67b83bcda8c83cf024d05332ce58937bc4c1073ae1259db16501d49ce92c SHA512 657bb209f41df93edce6e3aa1023346b29b3d3bf00694ad146d5f5b180a1e4de1a8bfe4e09d9e0168e3947aae4f13a894591644457dad9dfe320b6f32da0cbab
 MISC metadata.xml 1336 BLAKE2B 77878a208aff8c9744fca1874e9f692dc6dd55484303274012288c01def548cb96e0d428125613c84f49966adae9702c430ff1ca61c7df5654d1fda4ac9aa22d SHA512 028de2d2f3068ec95dc586b1d5b40cc4f69feba6ca685038427c606005ffc1ede58d056b0502822be83e28217182adc5305e81a7de8fd49f3162250a476cc1a0
diff --git a/www-client/chromium/chromium-63.0.3239.108.ebuild b/www-client/chromium/chromium-63.0.3239.108.ebuild
index c5e75dfa71e9..992afee3e792 100644
--- a/www-client/chromium/chromium-63.0.3239.108.ebuild
+++ b/www-client/chromium/chromium-63.0.3239.108.ebuild
@@ -8,7 +8,7 @@ CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
 	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
 	sv sw ta te th tr uk vi zh-CN zh-TW"
 
-inherit check-reqs chromium-2 eutils gnome2-utils flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs versionator xdg-utils
+inherit check-reqs chromium-2 eutils gnome2-utils flag-o-matic multilib multiprocessing ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs versionator xdg-utils
 
 DESCRIPTION="Open-source version of Google Chrome web browser"
 HOMEPAGE="http://chromium.org/"
@@ -164,16 +164,24 @@ pre_build_checks() {
 	fi
 
 	# Check build requirements, bug #541816 and bug #471810 .
-	CHECKREQS_MEMORY="3G"
+	local reqmem=3
 	CHECKREQS_DISK_BUILD="5G"
 	eshopts_push -s extglob
 	if is-flagq '-g?(gdb)?([1-9])'; then
 		CHECKREQS_DISK_BUILD="25G"
 		if ! use component-build; then
-			CHECKREQS_MEMORY="16G"
+			reqmem=16
 		fi
 	fi
 	eshopts_pop
+
+	local jobs=$(makeopts_jobs)
+	if (( jobs > reqmem )); then
+		CHECKREQS_MEMORY="${jobs}G"
+	else
+		CHECKREQS_MEMORY="${reqmem}G"
+	fi
+
 	check-reqs_pkg_setup
 }
 
diff --git a/www-client/chromium/chromium-64.0.3282.24.ebuild b/www-client/chromium/chromium-64.0.3282.24.ebuild
index 7737358b3393..766965c04765 100644
--- a/www-client/chromium/chromium-64.0.3282.24.ebuild
+++ b/www-client/chromium/chromium-64.0.3282.24.ebuild
@@ -8,7 +8,7 @@ CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
 	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
 	sv sw ta te th tr uk vi zh-CN zh-TW"
 
-inherit check-reqs chromium-2 eutils gnome2-utils flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs versionator xdg-utils
+inherit check-reqs chromium-2 eutils gnome2-utils flag-o-matic multilib multiprocessing ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs versionator xdg-utils
 
 DESCRIPTION="Open-source version of Google Chrome web browser"
 HOMEPAGE="http://chromium.org/"
@@ -164,16 +164,24 @@ pre_build_checks() {
 	fi
 
 	# Check build requirements, bug #541816 and bug #471810 .
-	CHECKREQS_MEMORY="3G"
+	local reqmem=3
 	CHECKREQS_DISK_BUILD="5G"
 	eshopts_push -s extglob
 	if is-flagq '-g?(gdb)?([1-9])'; then
 		CHECKREQS_DISK_BUILD="25G"
 		if ! use component-build; then
-			CHECKREQS_MEMORY="16G"
+			reqmem=16
 		fi
 	fi
 	eshopts_pop
+
+	local jobs=$(makeopts_jobs)
+	if (( jobs > reqmem )); then
+		CHECKREQS_MEMORY="${jobs}G"
+	else
+		CHECKREQS_MEMORY="${reqmem}G"
+	fi
+
 	check-reqs_pkg_setup
 }
 
diff --git a/www-client/chromium/chromium-65.0.3294.5.ebuild b/www-client/chromium/chromium-65.0.3294.5.ebuild
index cd5fc3c1b0fd..5bd06fad5513 100644
--- a/www-client/chromium/chromium-65.0.3294.5.ebuild
+++ b/www-client/chromium/chromium-65.0.3294.5.ebuild
@@ -8,7 +8,7 @@ CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
 	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
 	sv sw ta te th tr uk vi zh-CN zh-TW"
 
-inherit check-reqs chromium-2 eutils gnome2-utils flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs versionator xdg-utils
+inherit check-reqs chromium-2 eutils gnome2-utils flag-o-matic multilib multiprocessing ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs versionator xdg-utils
 
 DESCRIPTION="Open-source version of Google Chrome web browser"
 HOMEPAGE="http://chromium.org/"
@@ -164,16 +164,24 @@ pre_build_checks() {
 	fi
 
 	# Check build requirements, bug #541816 and bug #471810 .
-	CHECKREQS_MEMORY="3G"
+	local reqmem=3
 	CHECKREQS_DISK_BUILD="5G"
 	eshopts_push -s extglob
 	if is-flagq '-g?(gdb)?([1-9])'; then
 		CHECKREQS_DISK_BUILD="25G"
 		if ! use component-build; then
-			CHECKREQS_MEMORY="16G"
+			reqmem=16
 		fi
 	fi
 	eshopts_pop
+
+	local jobs=$(makeopts_jobs)
+	if (( jobs > reqmem )); then
+		CHECKREQS_MEMORY="${jobs}G"
+	else
+		CHECKREQS_MEMORY="${reqmem}G"
+	fi
+
 	check-reqs_pkg_setup
 }
 
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index 9da778c2d574..cf5ecafb47bf 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.24-1_amd64.deb 52994522 BLAKE2B 9dd60e6bdf6977ced00ba47bc647e0cfe29f45fe30b81d5bfbc0406604c60245d28476da4b74210daf610e1c73ba8115e380a9fd3881f1f89afaa591ff97ebb5 SHA512 89c79bb3d1ee6eae8ed0823f79d6f90c644bb3032610f5b83ab1c8433755ca130e7e6455a479c1afdee70343095c891a0c0b10356a13c95b78b9f4411abf3660
-EBUILD google-chrome-beta-64.0.3282.24.ebuild 3542 BLAKE2B 8a60e8775b05d299f9bbc092215a650d168639d28eb55fab223d0d2f6526eb5954e710e52abf33aa3c288629c197ac29f65b497463a48fb42c59b4eb4e91a4d2 SHA512 b8fb1a8cb9625273dbb6771f76fa1eed9f048b280bbf75861041a848880296ec48cbeac47d7ea2c8f6dfcd32f54bf9b4e7588a366a66c17ba9750e4055d58ac5
+EBUILD google-chrome-beta-64.0.3282.24.ebuild 3559 BLAKE2B 5a1eb688323640ce81aaebd74215844ffe06ad88c85046aa633f1d412350d97f0c98004b82218c3314a087ddfe571938ccbb417f03d83e0824f0708a7961ab1e SHA512 51df0ed3d1dfab83ec82cf03238ca9d1edda85f647b77c8232b46716ebdb5156c28a0c7d2706efe5b9cca4ab825437ddd9be865ddd99726ef47094d54eda4adf
 MISC metadata.xml 624 BLAKE2B 372623c9dbc8036c089252bb38922138513bb8ad9d485fb7ad33618dc531c8c08fa2c3d3ca68acc08cbef8b0b36d902b91ad0411bb75ec4b12a055b44a6eabf9 SHA512 318638d149ddf7c81310b8d1fc6e38525665ea5e3b7fc6830ed3b13547f80635e6a5fba60b60829187742ffc1217beaf7a72bcee2c6b76736316e004ad336786
diff --git a/www-client/google-chrome-beta/google-chrome-beta-64.0.3282.24.ebuild b/www-client/google-chrome-beta/google-chrome-beta-64.0.3282.24.ebuild
index 266639cc2941..ab556f06a5d3 100644
--- a/www-client/google-chrome-beta/google-chrome-beta-64.0.3282.24.ebuild
+++ b/www-client/google-chrome-beta/google-chrome-beta-64.0.3282.24.ebuild
@@ -57,6 +57,7 @@ RDEPEND="
 	x11-libs/libXrender
 	x11-libs/libXScrnSaver
 	x11-libs/libXtst
+	x11-libs/libxcb
 	x11-libs/pango
 	x11-misc/xdg-utils
 "
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index 77a8a3d1ae59..e4c493e3f8d3 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1,3 +1,3 @@
 DIST google-chrome-unstable_65.0.3294.5-1_amd64.deb 53115364 BLAKE2B ece7e4f82aca38bca313abe9896393876a73aa2256166bddca407ca1f7dde99d6d8cecd8f8c94c03ce4425cc3b9cba77a10e7dba476f49b17abda05dcc072881 SHA512 3c1eee8e477df2dbed1540af818f76ece0454125cc22ecb8dcf57fad6c499fe4972da61bfdb5e0e77ee15b060db196461bebe183b6b3fb813629a28a997286eb
-EBUILD google-chrome-unstable-65.0.3294.5.ebuild 3541 BLAKE2B 00bd9bd85a20bfe4208d8d277c31cc5e07ebf1f5db4884bdcaed4dda9b3289e2a2841f825b140c48b2a0a7e89b20717595c06ca7a368b743bc6ce30781c7a95e SHA512 248c13a71edcda7d763dcf7d38d8ae79c7ded3421fe1cc1626afa9b9dc241aaab98e2dbe7985b8f46630b0ad55f92394c205104373f15f70f72d7713a632de40
+EBUILD google-chrome-unstable-65.0.3294.5.ebuild 3585 BLAKE2B ec0a96ad744a6cdb6758e9f12ef046b4bbfd2161f50567ad40221fe723f28ae4fb1faf1603e29c81f829bf0e155755541ff5d0731b5f17559bdaa5eb73a6de08 SHA512 b4403921b9328fc48d59fd7f54a0f3b57e85f6023c7203fa64f86d3cd32fabbaba7cf8dd2c1dce91aa0d1fd814049d2e7b9aa0170eda19be26e818fbceacc5e3
 MISC metadata.xml 624 BLAKE2B 372623c9dbc8036c089252bb38922138513bb8ad9d485fb7ad33618dc531c8c08fa2c3d3ca68acc08cbef8b0b36d902b91ad0411bb75ec4b12a055b44a6eabf9 SHA512 318638d149ddf7c81310b8d1fc6e38525665ea5e3b7fc6830ed3b13547f80635e6a5fba60b60829187742ffc1217beaf7a72bcee2c6b76736316e004ad336786
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-65.0.3294.5.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-65.0.3294.5.ebuild
index 4c187d4a1953..22a757fa5892 100644
--- a/www-client/google-chrome-unstable/google-chrome-unstable-65.0.3294.5.ebuild
+++ b/www-client/google-chrome-unstable/google-chrome-unstable-65.0.3294.5.ebuild
@@ -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
@@ -57,6 +58,7 @@ RDEPEND="
 	x11-libs/libXrender
 	x11-libs/libXScrnSaver
 	x11-libs/libXtst
+	x11-libs/libxcb
 	x11-libs/pango
 	x11-misc/xdg-utils
 "
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index bc22d5e58e92..a12a33a92b86 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -1,3 +1,3 @@
 DIST google-chrome-stable_63.0.3239.108-1_amd64.deb 49035482 BLAKE2B 9bf364e69232f6b6a9888e5525fcbda476e5e8bbe1bd138c3b78fdc6e8e88412fbc5a10d625139e4155d822983bac75be16d7682214f28470c6e9d9891a84703 SHA512 50a0eb154d550db3473f255f27b8297522660654ed344477c967f84926103056552f404ce411a8aa4041c1aa8142c7ab929097904236d8696eb37347abecfb74
-EBUILD google-chrome-63.0.3239.108.ebuild 3536 BLAKE2B def8240ab17c12b1b0077dba80e8a2c460b4d76855dd4aad32eb1166a24ce50a5f67e0441f97f217a4e6efcd6896a3769d7e5cac2aceea3512dbbd2b47744cd1 SHA512 bd8215fd16e9881fcdf712e20b0f9b5df8c5ffef6beee296b927d084f2619748369ba95318cd3238f80ad330c0be8f0926153f6c3a653fbbb09fa0780441055a
+EBUILD google-chrome-63.0.3239.108.ebuild 3553 BLAKE2B 4852fafe114ec873814a8c2312b390893cbc042d97d75037cfbb88cb5ca896c90556b4b9dcc723f0dd87c79c7112f8690b0c719039e68fe0a1500d3529e4b8b4 SHA512 c42999a6f86cecc48c9d528c2087d5c881219e285d780aa7bee3113c99bee894c5fb11cf4b58114c23efa1c3210d91b9aedba67566aba252c9c034e2401b45d9
 MISC metadata.xml 624 BLAKE2B 372623c9dbc8036c089252bb38922138513bb8ad9d485fb7ad33618dc531c8c08fa2c3d3ca68acc08cbef8b0b36d902b91ad0411bb75ec4b12a055b44a6eabf9 SHA512 318638d149ddf7c81310b8d1fc6e38525665ea5e3b7fc6830ed3b13547f80635e6a5fba60b60829187742ffc1217beaf7a72bcee2c6b76736316e004ad336786
diff --git a/www-client/google-chrome/google-chrome-63.0.3239.108.ebuild b/www-client/google-chrome/google-chrome-63.0.3239.108.ebuild
index eb98674ec422..87289197530d 100644
--- a/www-client/google-chrome/google-chrome-63.0.3239.108.ebuild
+++ b/www-client/google-chrome/google-chrome-63.0.3239.108.ebuild
@@ -57,6 +57,7 @@ RDEPEND="
 	x11-libs/libXrender
 	x11-libs/libXScrnSaver
 	x11-libs/libXtst
+	x11-libs/libxcb
 	x11-libs/pango
 	x11-misc/xdg-utils
 "
diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index 899f63255d70..afc3ca41ffe9 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -1,10 +1,10 @@
 AUX vivaldi-snapshot-1.13.997.3_p1-libffmpeg.patch 1164 BLAKE2B f62ac321731ae3237cd5cd67b17cb2027afc751f8d54b46b58f9f060ee5af67cd37501278a279424463d2d6e2b42c728e90f7d94f3cab39b41342decc7778bab SHA512 2a78bae6ee58a415029c0db0c7ebbdc11611d2e167da6fef21a6a76df66b88ac65f803f9aa8b1a22007709f435803a6c967e1a82249c6c42e8d9e1cfb2c114cb
-DIST vivaldi-snapshot-1.14.1036.3_p1-amd64.deb 50264420 BLAKE2B 2fe4e7d49d74fc1b734671dfaf6b46fd36b8f6d8658bf289483bbf29a6b256c63689d2a3629153df4f39056946c01beba63d3e3ed5f30212981fd1db27142673 SHA512 6b74f0b00fa29512f7f4bc24f9fb9bd050104b9417d1b125088f71a8812741c18eea07415df6990fb7252fca4c4ee7da1957b06b2be16a5b872ea40efe9a28b5
-DIST vivaldi-snapshot-1.14.1036.3_p1-armhf.deb 46064022 BLAKE2B 6b9cdd22172d3f8b6763a48f10dcbf4faa1c8ec0784411cc6ab537344dba1ea86b290778a03328b6c91290be3d1bb71a6f6b502146f24f99902e7c4ea651df99 SHA512 e8617b38828b24817ebbbb76ce9a435e77c4a94f835cc01c7b61270a284d50a1752a4c7ad1799b41c74f215d32ea7a938f9d7abe2b7c5d82599e32a1b3c3c91f
-DIST vivaldi-snapshot-1.14.1036.3_p1-i386.deb 51157712 BLAKE2B 0d94000d871dbc2206f060a052d6fc3362879b2c3f7fab84dfbb39ae7cda0adfe2419adf82a3ba091f5bff996a56ac49834e7a6f0eccc09b379a1345af4d3821 SHA512 9878e683e5446efc397fae63c044936d2c2583b25a7db89413fb9c2e5bdcb7c306f524541f1494690c8712dac903cf6a12fbed07eece22afd78f318ae206ed71
 DIST vivaldi-snapshot-1.14.1038.3_p1-amd64.deb 50280622 BLAKE2B 4aa71d793d2fdfe4d35a4dbb401475a761b69c451bc6729b306f42e548c61b655017a723de0a1d1c114beb9792acac0d497d318d0a452e0ecab85f27f6b26f36 SHA512 e27b00629280dc8535488b6367122ca4416aa1ea27dad8f6cc231c9d05af6a4e3d548032fdd4e854955cddd512cdadef48aa627c10a6b33ae4d31db56598573a
 DIST vivaldi-snapshot-1.14.1038.3_p1-armhf.deb 46065648 BLAKE2B 6442142aafec2db84bff7df1bade96a1918eb3d3ea22c6c4b8585daab5c255ebe7fab2616938816c9fe94d306a3aa1b612e2a82f29af7a59957194b73fda8da7 SHA512 cbf042f97caa4f11281355e237eae1040cee5c7ab274d6a51a1445b4c1916aaca1693ee50b709efbfdbc46d037aaea25846d09f66b62a52849d7dfa99c641c4f
 DIST vivaldi-snapshot-1.14.1038.3_p1-i386.deb 51173448 BLAKE2B 1ade624b0b3de6b808d669290e070a283238269114450064395719705e77c8cccf52bc4cbfb6fff41cb9c000c22f168583ad4e98a5ef4b529f3dcf1cb5125253 SHA512 a3a35ca8bdaa29b63b79c85930a379a31dd9ef7fba877c464d105f9eae140255d4a984bac6a1910396be97c766b14e32529ff8774a24e9bf81ce1102e4068691
-EBUILD vivaldi-snapshot-1.14.1036.3_p1.ebuild 2627 BLAKE2B 69eaf8281f6cd8a3ad729a180492f6ec7bf73a4b9ed3109cd84c5d9bea22bc2dc5ebc9f2e3fb72ef4036b5beb744cefdc32ad145b8429e9cbfed300066ac4f6a SHA512 4b8321a07d5cc427c84bf99aa41eebcb2c137868d3934ca482873702d1e08f50cfc9ddc5aee980fe098b803c7ecd66b573f1bcebb6912fce5a6b597efe11c61a
+DIST vivaldi-snapshot-1.14.1042.3_p1-amd64.deb 50287094 BLAKE2B 9c89f00576a555c1180d080616f36a9259fc7f00319bccc55150c4a34b11980e7fdf37fcf2ec93319a87666a910238185771ab37bc2c5f79927ebdbf1b6bd4e6 SHA512 ce28ac3a0f9d7767527f919973f3fb1523c4ef4088b873479a969a38b5fcaa7f38bfb100867fbf91f11bce5cfc7b68746bef11874b4696307c526ab4a3156c71
+DIST vivaldi-snapshot-1.14.1042.3_p1-armhf.deb 46091200 BLAKE2B e368823b206ae432659cd23fd349088054df0993ed37e92125f7c48a7229a63530ba145cb0f553aa68f5438ecb6fd70a473ebcfd8de4bc0c90925417147c049d SHA512 51bf9736ac125610242282be493b584dd01e84fd8bbb79b418c739478f04f3d53db949de801b5366b26c2b265c7a98b224420cd169fcd53563c584cd50527c0b
+DIST vivaldi-snapshot-1.14.1042.3_p1-i386.deb 51181200 BLAKE2B ccea3f9ea3d23cb8f944c49b1629b06081db72615216d244316066dd57f18e76e68b6203c0b0355cfc1add114cc7ede3e25e9fb75d3b7f7c635b29dd584fd556 SHA512 0c311577e336c5f95549a3d8d25259d468b6af10bbfb66c30fc7cd5d5837bf33bff9592ba7cdc043d66050e793a21e0e2d670657a397cd3ad132a61bcba4e0ac
 EBUILD vivaldi-snapshot-1.14.1038.3_p1.ebuild 2627 BLAKE2B 69eaf8281f6cd8a3ad729a180492f6ec7bf73a4b9ed3109cd84c5d9bea22bc2dc5ebc9f2e3fb72ef4036b5beb744cefdc32ad145b8429e9cbfed300066ac4f6a SHA512 4b8321a07d5cc427c84bf99aa41eebcb2c137868d3934ca482873702d1e08f50cfc9ddc5aee980fe098b803c7ecd66b573f1bcebb6912fce5a6b597efe11c61a
+EBUILD vivaldi-snapshot-1.14.1042.3_p1.ebuild 2627 BLAKE2B 69eaf8281f6cd8a3ad729a180492f6ec7bf73a4b9ed3109cd84c5d9bea22bc2dc5ebc9f2e3fb72ef4036b5beb744cefdc32ad145b8429e9cbfed300066ac4f6a SHA512 4b8321a07d5cc427c84bf99aa41eebcb2c137868d3934ca482873702d1e08f50cfc9ddc5aee980fe098b803c7ecd66b573f1bcebb6912fce5a6b597efe11c61a
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-1.14.1036.3_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-1.14.1042.3_p1.ebuild
index 2297488b834f..2297488b834f 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-1.14.1036.3_p1.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-1.14.1042.3_p1.ebuild
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 5df820d6ca61..026eaa576b75 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
index 2fd54c647814..a94536cb95e2 100644
--- a/x11-libs/gdk-pixbuf/Manifest
+++ b/x11-libs/gdk-pixbuf/Manifest
@@ -1,8 +1,10 @@
 AUX 2.36.10-fix-tiff-loader.patch 2300 BLAKE2B 19724c9585802d8a30bbb67247366e43614d8926ed3cc826f37b74420cbdd93b90be011571ae2cbfc8e7b4cf7d6c7f17410819f412e3b331ead9b5e186ce50fd SHA512 e1c04c53b74cc62c63f144b3f9b1ac4246709c809d92ac29dda973ce17232c87fdde6dbceb1295b87d1dad93eb1b2dcf55038c6072bdaac021d96cef3129bd59
+AUX 2.36.11-fix-libtiff-disable.patch 879 BLAKE2B bc50115c3255892187a3e78b5f02770690776913284cb4c421c26e937f62079c0e554f0c10d9decfe66a207a21abb4c2abb720053f0e80c886c56491a0744e38 SHA512 b894e172b24cdcbd487f1d8bcee44a49ea867eb5775d6163605a64d3beffae7056c6d77acc96eee20728075b40c9d52b75e9e7024b16fd804f49720eef6f9225
 AUX gdk-pixbuf-2.32.3-fix-lowmem-uclibc.patch 1075 BLAKE2B e6fc37605b136d12dbc7e7c95c59ec0b8d5f65f72c1675186b0c0cc105be5537e7b4660730dce3799227217a582a64f295afbd33a8cf52071f5fe8c4e153c0d3 SHA512 0a3e51c52f947d6231b472525b11e13fdc752b8eaa34c95ec3c76cfb0faf33ef3109c8381189261e8ebae76a4070af24e58c373bebc69bbb6b69399bf833395d
 DIST gdk-pixbuf-2.36.10.tar.xz 5772196 BLAKE2B 542df9a5b9d3e790cb592b714a402633eaf37ecd4a21d597f307bdc3f5a0a35e3c3d9e3f6c822e163d0d64b9de62d7b120cb2b174f3109bdffc5e08225506f0c SHA512 d080d20baa20efe58cc5e5d043532f57e7950c0f7a3661998f924ae2a819f6bf1113e1da7785ac2063dfa582576d418eea5b3c80ea3db16057de43cc3f911d35
+DIST gdk-pixbuf-2.36.11.tar.xz 5675908 BLAKE2B 1b111c2866b06ff5da5d5e043481956d6ffbc69fa66236d91b29a6e923c01b91054eb491d2ba15a2e5d2d694f143eb0cc472bbed9bfce0bc015d6602449920fa SHA512 231e13ef2339fc6953788e8597a0c455143273338793ed835dac6ccf42e26e0292dec4121a4976b859ba8ffaa81b3ca5b250b54bd4897dbd3146a1874a59d4e3
 DIST gdk-pixbuf-2.36.9.tar.xz 5769124 BLAKE2B 7e21831659cd0bca44de4858fe37887a8a2ea494fffed5015fd35155873fe820336b762be8e8057c4f41c48dbe7c6b55e8eba9fbbee8692a9b72e7fe6b0dd24e SHA512 ab8f2cda4490012936b094a1321e64b85e1fa1f8d070fae135a514f87f695201b845f4192e4a02954e2767d44314c0a95d727118853528182952d15890130261
 EBUILD gdk-pixbuf-2.36.10-r2.ebuild 3797 BLAKE2B 0fdf831d2b2f8f3649019e73cadc44d38492f2e08403b5fba0847058d54d55094105d24d76519b5d43a39c60c52f5815f864e05540792ba20c6b7eb0f902c8e8 SHA512 8c93298741e57d623a4b0109126c654b6f670ac57895fb649c56e57c3e4d120f06b46976d35711ac03eb823aa9acc54528dc6c68cf4cab6b7340818b84eeff5c
-EBUILD gdk-pixbuf-2.36.10.ebuild 3671 BLAKE2B 02f2bed33fb3c7cafb0e986204243e11d5b30763590e472cfe83314cfc8d4305c49fae377928b673684ad49e00af5920468b58d5fc40d421a89442df02dbbc86 SHA512 8a2b3fa2f1f7dc063e7939ba745b3d10b497da1d5d13ff336e9fe487d2cc31125b428278178dd187c57302409fddfa175f5bbbd6b5f796d6abf77f34f5b3655e
+EBUILD gdk-pixbuf-2.36.11.ebuild 3893 BLAKE2B 470bfec07a8c38410284dc44907d4aa09ef02c2a57a7f900174933dec7c002eaaf3cb1da49e4ac969ac0aadc66803ce77da970974dbeb37d12ebf87dab9640fe SHA512 98af3703315a23eecb103d3fab88dfc8369ad72d5e7f5ab50d2f037307c571f23347e968565c3cc9ca18bcbeb41a82ff1f8a1823e70c1f3de8568fa542e1eda5
 EBUILD gdk-pixbuf-2.36.9.ebuild 3662 BLAKE2B 72352663cd372208aac722a3cee1ac2280d332b28168d6f181eebbca4b83acd2ac25e81e001975e9bd4ff3b0312f533dc5a4df486694d42426afb370d861184c SHA512 5622f0a3df9ba6972958d63d08ee0bd6b73c933bca2c05dd2e65a89e3f44076c5d042cec3f519523a8bb778d98a2051d6a5adaffab04238a3f6415741be67694
 MISC metadata.xml 342 BLAKE2B 5c92b45d7291b4eec6ceb423c901fb1222fa8eea6d39dd62bae495f4203862447ec15727e6e1e8b65dc6f9cbd7c2372464ad21540d130d44e842e33c887151e3 SHA512 c889bb461ef578170d304b124dbf7ffb9ae35fd4b7530caa4ec15b815c4cda2c297971e6023faf4c4ca81460ab4971c6369093a99b2891f3c1837cb80caa8a7a
diff --git a/x11-libs/gdk-pixbuf/files/2.36.11-fix-libtiff-disable.patch b/x11-libs/gdk-pixbuf/files/2.36.11-fix-libtiff-disable.patch
new file mode 100644
index 000000000000..23caca99a594
--- /dev/null
+++ b/x11-libs/gdk-pixbuf/files/2.36.11-fix-libtiff-disable.patch
@@ -0,0 +1,26 @@
+From 5c4edf2cc22468a8410c19cb8b236b227fca300a Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Tue, 10 Oct 2017 14:33:18 +0300
+Subject: [PATCH] build: Fix --without-libtiff not having an effect
+
+https://bugzilla.gnome.org/show_bug.cgi?id=788770
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index b45f407b5..9f5d6fbee 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -676,7 +676,7 @@ if test x$gio_can_sniff = x; then
+   AC_DEFINE(GDK_PIXBUF_USE_GIO_MIME, 1, [Define if gio can sniff image data])
+ fi
+ 
+-AM_CONDITIONAL(HAVE_TIFF, test "x$libtiff_found" != x)
++AM_CONDITIONAL(HAVE_TIFF, test "x$libtiff_found" != xno)
+ AM_CONDITIONAL(HAVE_PNG, test "x$LIBPNG" != x)
+ AM_CONDITIONAL(HAVE_JPEG, test "x$LIBJPEG" != x)
+ AM_CONDITIONAL(HAVE_JASPER, test "x$LIBJASPER" != x)
+-- 
+2.15.0
+
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.10.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.11.ebuild
index a0c235ef3cb6..80f31f97b247 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.10.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.11.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=6
 GNOME2_LA_PUNT="yes"
+GNOME2_EAUTORECONF="yes"
 
 inherit flag-o-matic gnome2 multilib multilib-minimal
 
@@ -40,10 +41,16 @@ MULTILIB_CHOST_TOOLS=(
 	/usr/bin/gdk-pixbuf-query-loaders$(get_exeext)
 )
 
-src_prepare() {
+PATCHES=(
+	# Do not run lowmem test on uclibc
 	# See https://bugzilla.gnome.org/show_bug.cgi?id=756590
-	eapply "${FILESDIR}"/${PN}-2.32.3-fix-lowmem-uclibc.patch
+	"${FILESDIR}"/${PN}-2.32.3-fix-lowmem-uclibc.patch
+	# Fix --without-libtiff having no effect (from master)
+	# https://bugzilla.gnome.org/show_bug.cgi?id=788770
+	"${FILESDIR}"/${PV}-fix-libtiff-disable.patch
+)
 
+src_prepare() {
 	# This will avoid polluting the pkg-config file with versioned libpng,
 	# which is causing problems with libpng14 -> libpng15 upgrade
 	# See upstream bug #667068
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 5dd875c8d3bc..27b1d10f2544 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -5,13 +5,9 @@ AUX gtk+-3.22.2-update-icon-cache.patch 5474 BLAKE2B fe374a5f50ffc69df0d09e5b50d
 AUX gtkrc 627 BLAKE2B 57af25dcadfa09ea784ac485db383753deda23c42ce22582f03041abf7a061e70eced09592ab0750786bea3555d760febc913762b8369b50b327fbd03d918279 SHA512 9fb246b8e483cfb5f8d3666397d50547ad0cdaa8bdf5737e67e14dd100952438ac93396f0d752306c02aa4934453a43eb360093c4e323e99bbe0706c40171dc4
 AUX settings.ini 96 BLAKE2B dd0ffe58f3c702d0518e1ad59930a511f98fd1b6e7139b2b2293a3dc8b0419a63a14260ba75b30dc9197f0423a375c675b4f3b34d593ce12828192d18e539fbb SHA512 76eff45e3413ed7b2fb6bb557c363cd6d8a65ae505709cf5ce26d579470e38968d51e72615779f47fac2994937a3c64ac4143c6cbd2cf5a2db23a01bcd9b6418
 DIST gtk+-2.24.31.tar.xz 12805344 BLAKE2B f516f9970a95afa21ae5dbe9f0cafd3c57c5cd27af0c6740a0f7f4367eb8032719e39e533bf89db72dddba7485ee499da9c2370707f51bbc4a7af2d4fb7c1309 SHA512 75b846661308d94b5236e7e1c367deabf57753792ca87e92f9769822dd5ec90e00cd8d5574adcc12162e3702e1ae6dc152278a1d218f9bd9e4d1c8dc1dd520c1
-DIST gtk+-3.22.15.tar.xz 18662944 BLAKE2B 9a9ed9021b266411dfe14d7487d0f8dde1bf60ed7f2cfbfd2cca79b022deaf9f6ee368878e26beb7ea4c8238f3a496c4ab0da6250dec014af13b16e5b6548e85 SHA512 c99c4a52bc447a21be20546bdc7808081abde076af9603424c1de20af031ac3f9bd121709d4c18705db8ba2f66ace0aae9b32741347788a8d81afa358d67e758
 DIST gtk+-3.22.16.tar.xz 18655144 BLAKE2B 947ef2768afbd7a242834e5eb1cef218f3978543193e18a4c216bb91be30482955f887b298a9a50786b0aa24613b924933994cc8472752587140bb796898afd0 SHA512 a981ba3c420db649645787916d603a22f1da9d839aba39f3786bab47f9a247867d94d342ce4c3aa47de4876072ed9cf3615304a73de7e613063cef08b8c0d612
-DIST gtk+-3.22.17.tar.xz 18702864 BLAKE2B b2f45e8cab5be9fc2dd594b7ff35ab316a298448c80483a3191344f749c24bfb8ad7920b2e861e198b773c62755b01da5a5c6c2734a4bf4d673de68fcc1dc3a9 SHA512 9503baa73f6e199a1fe807bec739df2bb8bc2e586e9c316184d37e874191eb5938c962d1eb83e58841579b16cde8b85d80e058a3577c0033de12fc3fce066dfa
 DIST gtk+-3.22.19.tar.xz 18841024 BLAKE2B dc4c27d022c6766036b16e52b53b4aa3946c41457abaabca390bdba2b720db71b9c584101990928af1bef73dc49f7b71a951ba0000bd52e11aa5306a1d877f18 SHA512 c83198794433ee6eb29f8740d59bd7056cd36808b4bff1a99563ab1a1742e6635dab4f2a8be33317f74d3b336f0d1adc28dd91410da056b50a08c215f184dce2
 EBUILD gtk+-2.24.31-r1.ebuild 10104 BLAKE2B 2d9f63b1aaea867dc1bf0267e0e4000590ae10bfc3b4e1f3539cc1d83b55e874383f621db1cb5564283c069f606ed90dcb5c8cc3c45716507bbff31924da0ba3 SHA512 7efbaaa3ffccb8268f50fdf05cc96f0c87a6801a64e89977153368ae334176325ee77822fa663455e808d18008e54faf86c0d5a4cf9b6d5dc995ca8c3d33f61e
-EBUILD gtk+-3.22.15.ebuild 6930 BLAKE2B 46582abe0fcd044f30e26e072f5c1d856a180d40c282a49c7f1dd2d8f93ae60dde1c7af1b2c28d719f7ed53b7ff52d20ebddc725bd0425d7684e09217f27e1dd SHA512 3103bbf23ab5dc56738513599c48f6f090a0aacaa33424f498e7ad5bb0b3841537a4b6a6cadd8a9d86c8fd9a88f99623cc85d8565338229ff6419f267b93b7ac
 EBUILD gtk+-3.22.16.ebuild 6781 BLAKE2B 80671c5006fda95249da52f1510ba0eb8144a61855afb6ab2d042df61c6ed4de5ef60d16c076f3dfed7e6515815b937607a7aa8b7e60b2e3bc479dcc7d1fc476 SHA512 a1960b76bb8b195cf927facdaa739fae5bec90e22c554d43d1066fb41c9efe869d9ef6fcdab97d46848869be0d46caaa03426ca7987145c56baeea3a7013f400
-EBUILD gtk+-3.22.17.ebuild 6788 BLAKE2B 4eed96a48af3e9a8e5d4192cb13e1bc32bf865857593d0328e5a5119df95715dffee39994a8a6cb72bdcafa723d82cb447e9a41c81f361771a5d8da8b8d78e0f SHA512 237f05cc646d2167ce857a85306468ee3f68c1670e048c91a6b13c5291f0291cd2fb0f00961440e4d69072519027626e3081e4954fe77fe830fadede7d3a185d
 EBUILD gtk+-3.22.19.ebuild 6781 BLAKE2B 9ab906ef83b3b11d9dc1cc039664920eca4c90ab422deb1eec0daa3451c4551ed2a69c830503140cbd77caa78efb1180de56aeb614089de936b07f94dc1ca254 SHA512 0193fa8c920e1a222ac9fe839a6f758a849d84cf23a25ddc7e7f541aa8e1fd41177f348f3f09398a317b294c3fbdc4b3b2b8e83e21721a8c699127f8550ba782
 MISC metadata.xml 834 BLAKE2B 0b1145d2da83bf549af3758dbca4c5dbf734e5c90c99f3856404b98584dc18d913ac70a19480fb0a16cc503c9831e4209df77c0adf7283eb0d8146079a381fe9 SHA512 e1ec73c4c9433c70c17fc3826193d8289200e347a32d67a824b803213ac281f21364a08c21c819c3e93a2d8582d90bef48766f22ba9ed495099b3eb6071aa561
diff --git a/x11-libs/gtk+/gtk+-3.22.15.ebuild b/x11-libs/gtk+/gtk+-3.22.15.ebuild
deleted file mode 100644
index a26e067b2e13..000000000000
--- a/x11-libs/gtk+/gtk+-3.22.15.ebuild
+++ /dev/null
@@ -1,229 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit autotools flag-o-matic gnome2 multilib virtualx multilib-minimal
-
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2+"
-SLOT="3"
-IUSE="aqua broadway cloudprint colord cups examples +introspection test vim-syntax wayland +X xinerama"
-REQUIRED_USE="
-	|| ( aqua wayland X )
-	xinerama? ( X )
-"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# Upstream wants us to do their job:
-# https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
-RESTRICT="test"
-
-# FIXME: introspection data is built against system installation of gtk+:3,
-# bug #????
-COMMON_DEPEND="
-	>=dev-libs/atk-2.15[introspection?,${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.49.4:2[${MULTILIB_USEDEP}]
-	media-libs/fontconfig[${MULTILIB_USEDEP}]
-	>=media-libs/libepoxy-1.0[X(+)?,${MULTILIB_USEDEP}]
-	>=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}]
-	>=x11-libs/gdk-pixbuf-2.30:2[introspection?,${MULTILIB_USEDEP}]
-	>=x11-libs/pango-1.37.3[introspection?,${MULTILIB_USEDEP}]
-	x11-misc/shared-mime-info
-
-	cloudprint? (
-		>=net-libs/rest-0.7[${MULTILIB_USEDEP}]
-		>=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] )
-	colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] )
-	cups? ( >=net-print/cups-1.2[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.39:= )
-	wayland? (
-		>=dev-libs/wayland-1.9.91[${MULTILIB_USEDEP}]
-		>=dev-libs/wayland-protocols-1.7
-		media-libs/mesa[wayland,${MULTILIB_USEDEP}]
-		>=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
-	)
-	X? (
-		>=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}]
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		>=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		>=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}]
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/libXcomposite[${MULTILIB_USEDEP}]
-		x11-libs/libXdamage[${MULTILIB_USEDEP}]
-		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xsl-stylesheets
-	app-text/docbook-xml-dtd:4.1.2
-	dev-libs/libxslt
-	dev-libs/gobject-introspection-common
-	>=dev-util/gdbus-codegen-2.48
-	>=dev-util/gtk-doc-am-1.20
-	>=sys-devel/gettext-0.19.7[${MULTILIB_USEDEP}]
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	X? (
-		x11-proto/xextproto[${MULTILIB_USEDEP}]
-		x11-proto/xproto[${MULTILIB_USEDEP}]
-		x11-proto/inputproto[${MULTILIB_USEDEP}]
-		x11-proto/damageproto[${MULTILIB_USEDEP}]
-		xinerama? ( x11-proto/xineramaproto[${MULTILIB_USEDEP}] )
-	)
-	test? (
-		media-fonts/font-misc-misc
-		media-fonts/font-cursor-misc )
-"
-# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90
-# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90
-# >=xorg-server-1.11.4 needed for
-#  https://mail.gnome.org/archives/desktop-devel-list/2012-March/msg00024.html
-RDEPEND="${COMMON_DEPEND}
-	>=dev-util/gtk-update-icon-cache-3
-	!<gnome-base/gail-1000
-	!<x11-libs/vte-0.31.0:2.90
-	>=x11-themes/adwaita-icon-theme-3.14
-	X? ( !<x11-base/xorg-server-1.11.4 )
-"
-# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
-PDEPEND="
-	gnome-base/librsvg[${MULTILIB_USEDEP}]
-	vim-syntax? ( app-vim/gtk-syntax )
-"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/gtk-query-immodules-3.0$(get_exeext)
-)
-
-strip_builddir() {
-	local rule=$1
-	shift
-	local directory=$1
-	shift
-	sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
-		|| die "Could not strip director ${directory} from build."
-}
-
-src_prepare() {
-	if ! use test ; then
-		# don't waste time building tests
-		strip_builddir SRC_SUBDIRS testsuite Makefile.{am,in}
-
-		# the tests dir needs to be build now because since commit
-		# 7ff3c6df80185e165e3bf6aa31bd014d1f8bf224 tests/gtkgears.o needs to be there
-		# strip_builddir SRC_SUBDIRS tests Makefile.{am,in}
-	fi
-
-	if ! use examples; then
-		# don't waste time building demos
-		strip_builddir SRC_SUBDIRS demos Makefile.{am,in}
-		strip_builddir SRC_SUBDIRS examples Makefile.{am,in}
-	fi
-
-	# gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache
-	eapply "${FILESDIR}"/${PN}-3.22.2-update-icon-cache.patch
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	# need libdir here to avoid a double slash in a path that libtool doesn't
-	# grok so well during install (// between $EPREFIX and usr ...)
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		$(use_enable aqua quartz-backend) \
-		$(use_enable broadway broadway-backend) \
-		$(use_enable cloudprint) \
-		$(use_enable colord) \
-		$(use_enable cups cups auto) \
-		$(multilib_native_use_enable introspection) \
-		$(use_enable wayland wayland-backend) \
-		$(use_enable X x11-backend) \
-		$(use_enable X xcomposite) \
-		$(use_enable X xdamage) \
-		$(use_enable X xfixes) \
-		$(use_enable X xkb) \
-		$(use_enable X xrandr) \
-		$(use_enable xinerama) \
-		--disable-papi \
-		--disable-mir-backend \
-		--enable-man \
-		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
-
-	# work-around gtk-doc out-of-source brokedness
-	if multilib_is_native_abi; then
-		local d
-		for d in gdk gtk libgail-util; do
-			ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
-		done
-	fi
-}
-
-multilib_src_test() {
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
-	GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx emake check
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
-
-multilib_src_install_all() {
-	insinto /etc/gtk-3.0
-	doins "${FILESDIR}"/settings.ini
-	# Skip README.{in,commits,win32} and useless ChangeLog that would get installed by default
-	DOCS=( AUTHORS NEWS README )
-	einstalldocs
-}
-
-pkg_preinst() {
-	gnome2_pkg_preinst
-
-	multilib_pkg_preinst() {
-		# Make immodules.cache belongs to gtk+ alone
-		local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
-
-		if [[ -e ${EROOT}${cache} ]]; then
-			cp "${EROOT}"${cache} "${ED}"/${cache} || die
-		else
-			touch "${ED}"/${cache} || die
-		fi
-	}
-	multilib_parallel_foreach_abi multilib_pkg_preinst
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	multilib_pkg_postinst() {
-		gnome2_query_immodules_gtk3 \
-			|| die "Update immodules cache failed (for ${ABI})"
-	}
-	multilib_parallel_foreach_abi multilib_pkg_postinst
-
-	if ! has_version "app-text/evince"; then
-		elog "Please install app-text/evince for print preview functionality."
-		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
-		elog "add it to your settings.ini file."
-	fi
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-
-	if [[ -z ${REPLACED_BY_VERSION} ]]; then
-		multilib_pkg_postrm() {
-			rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache
-		}
-		multilib_foreach_abi multilib_pkg_postrm
-	fi
-}
diff --git a/x11-libs/gtk+/gtk+-3.22.17.ebuild b/x11-libs/gtk+/gtk+-3.22.17.ebuild
deleted file mode 100644
index 2034f00888c9..000000000000
--- a/x11-libs/gtk+/gtk+-3.22.17.ebuild
+++ /dev/null
@@ -1,226 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit autotools flag-o-matic gnome2 multilib virtualx multilib-minimal
-
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2+"
-SLOT="3"
-IUSE="aqua broadway cloudprint colord cups examples +introspection test vim-syntax wayland +X xinerama"
-REQUIRED_USE="
-	|| ( aqua wayland X )
-	xinerama? ( X )
-"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# Upstream wants us to do their job:
-# https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
-RESTRICT="test"
-
-# FIXME: introspection data is built against system installation of gtk+:3,
-# bug #????
-COMMON_DEPEND="
-	>=dev-libs/atk-2.15[introspection?,${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.49.4:2[${MULTILIB_USEDEP}]
-	media-libs/fontconfig[${MULTILIB_USEDEP}]
-	>=media-libs/libepoxy-1.0[X(+)?,${MULTILIB_USEDEP}]
-	>=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}]
-	>=x11-libs/gdk-pixbuf-2.30:2[introspection?,${MULTILIB_USEDEP}]
-	>=x11-libs/pango-1.37.3[introspection?,${MULTILIB_USEDEP}]
-	x11-misc/shared-mime-info
-
-	cloudprint? (
-		>=net-libs/rest-0.7[${MULTILIB_USEDEP}]
-		>=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] )
-	colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] )
-	cups? ( >=net-print/cups-1.2[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.39:= )
-	wayland? (
-		>=dev-libs/wayland-1.9.91[${MULTILIB_USEDEP}]
-		>=dev-libs/wayland-protocols-1.7
-		media-libs/mesa[wayland,${MULTILIB_USEDEP}]
-		>=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
-	)
-	X? (
-		>=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}]
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		>=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		>=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}]
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/libXcomposite[${MULTILIB_USEDEP}]
-		x11-libs/libXdamage[${MULTILIB_USEDEP}]
-		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xsl-stylesheets
-	app-text/docbook-xml-dtd:4.1.2
-	dev-libs/libxslt
-	dev-libs/gobject-introspection-common
-	>=dev-util/gdbus-codegen-2.48
-	>=dev-util/gtk-doc-am-1.20
-	>=sys-devel/gettext-0.19.7[${MULTILIB_USEDEP}]
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	X? (
-		x11-proto/xextproto[${MULTILIB_USEDEP}]
-		x11-proto/xproto[${MULTILIB_USEDEP}]
-		x11-proto/inputproto[${MULTILIB_USEDEP}]
-		x11-proto/damageproto[${MULTILIB_USEDEP}]
-		xinerama? ( x11-proto/xineramaproto[${MULTILIB_USEDEP}] )
-	)
-	test? (
-		media-fonts/font-misc-misc
-		media-fonts/font-cursor-misc )
-"
-# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90
-# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90
-RDEPEND="${COMMON_DEPEND}
-	>=dev-util/gtk-update-icon-cache-3
-	!<gnome-base/gail-1000
-	!<x11-libs/vte-0.31.0:2.90
-"
-# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
-PDEPEND="
-	>=x11-themes/adwaita-icon-theme-3.14
-	gnome-base/librsvg[${MULTILIB_USEDEP}]
-	vim-syntax? ( app-vim/gtk-syntax )
-"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/gtk-query-immodules-3.0$(get_exeext)
-)
-
-strip_builddir() {
-	local rule=$1
-	shift
-	local directory=$1
-	shift
-	sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
-		|| die "Could not strip director ${directory} from build."
-}
-
-src_prepare() {
-	if ! use test ; then
-		# don't waste time building tests
-		strip_builddir SRC_SUBDIRS testsuite Makefile.{am,in}
-
-		# the tests dir needs to be build now because since commit
-		# 7ff3c6df80185e165e3bf6aa31bd014d1f8bf224 tests/gtkgears.o needs to be there
-		# strip_builddir SRC_SUBDIRS tests Makefile.{am,in}
-	fi
-
-	if ! use examples; then
-		# don't waste time building demos
-		strip_builddir SRC_SUBDIRS demos Makefile.{am,in}
-		strip_builddir SRC_SUBDIRS examples Makefile.{am,in}
-	fi
-
-	# gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache
-	eapply "${FILESDIR}"/${PN}-3.22.2-update-icon-cache.patch
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	# need libdir here to avoid a double slash in a path that libtool doesn't
-	# grok so well during install (// between $EPREFIX and usr ...)
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		$(use_enable aqua quartz-backend) \
-		$(use_enable broadway broadway-backend) \
-		$(use_enable cloudprint) \
-		$(use_enable colord) \
-		$(use_enable cups cups auto) \
-		$(multilib_native_use_enable introspection) \
-		$(use_enable wayland wayland-backend) \
-		$(use_enable X x11-backend) \
-		$(use_enable X xcomposite) \
-		$(use_enable X xdamage) \
-		$(use_enable X xfixes) \
-		$(use_enable X xkb) \
-		$(use_enable X xrandr) \
-		$(use_enable xinerama) \
-		--disable-papi \
-		--disable-mir-backend \
-		--enable-man \
-		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
-
-	# work-around gtk-doc out-of-source brokedness
-	if multilib_is_native_abi; then
-		local d
-		for d in gdk gtk libgail-util; do
-			ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
-		done
-	fi
-}
-
-multilib_src_test() {
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
-	GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx emake check
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
-
-multilib_src_install_all() {
-	insinto /etc/gtk-3.0
-	doins "${FILESDIR}"/settings.ini
-	# Skip README.{in,commits,win32} and useless ChangeLog that would get installed by default
-	DOCS=( AUTHORS NEWS README )
-	einstalldocs
-}
-
-pkg_preinst() {
-	gnome2_pkg_preinst
-
-	multilib_pkg_preinst() {
-		# Make immodules.cache belongs to gtk+ alone
-		local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
-
-		if [[ -e ${EROOT}${cache} ]]; then
-			cp "${EROOT}"${cache} "${ED}"/${cache} || die
-		else
-			touch "${ED}"/${cache} || die
-		fi
-	}
-	multilib_parallel_foreach_abi multilib_pkg_preinst
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	multilib_pkg_postinst() {
-		gnome2_query_immodules_gtk3 \
-			|| die "Update immodules cache failed (for ${ABI})"
-	}
-	multilib_parallel_foreach_abi multilib_pkg_postinst
-
-	if ! has_version "app-text/evince"; then
-		elog "Please install app-text/evince for print preview functionality."
-		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
-		elog "add it to your settings.ini file."
-	fi
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-
-	if [[ -z ${REPLACED_BY_VERSION} ]]; then
-		multilib_pkg_postrm() {
-			rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache
-		}
-		multilib_foreach_abi multilib_pkg_postrm
-	fi
-}
diff --git a/x11-libs/gtksourceview/Manifest b/x11-libs/gtksourceview/Manifest
index b0f214bf9a9c..b379e1544d61 100644
--- a/x11-libs/gtksourceview/Manifest
+++ b/x11-libs/gtksourceview/Manifest
@@ -4,8 +4,10 @@ DIST gtksourceview-2.10.5.tar.bz2 1253321 BLAKE2B 810a3eeca69bab4356b21c64129bb8
 DIST gtksourceview-3.22.2.tar.xz 1596384 BLAKE2B d638cdec2aaa510c0039d9cbda3105e0c6ca6586cbf6e542370efafcf52f01aaf59b163a44f93544dbcfa1535f3d6d2f84206e5a912d2101319b553b53b5e6d1 SHA512 1d51a975471172835cd9af64828ba93eb1b45e26fae91b1778c5963a8578404bbbdf1fe7f2c92953dff436bf2dac2d9e01a5188216d2a60a705e4635f0c91b81
 DIST gtksourceview-3.24.3.tar.xz 1625584 BLAKE2B ec040a91d8c98a28bd488a91652b3a8a17b1d3d88fe85e58fc2c68743f4136b435fcfdb64d7b072d077d29386acc33f1d29d50d98933a192b37ef8d350f793fb SHA512 354a06502d55d7b237d5cbec5a35102225ae3d7e80e53d1ba42e506fc9c75470c4548b4ab8e9e6b2813d732617a2f13b978194240556b8d810066c94ec13de44
 DIST gtksourceview-3.24.4.tar.xz 1619860 BLAKE2B 4d402bf96be9a52d88f974314e165946bcad49ab70474cf3528c8ca924a4f49c2dfdb3f8c9797a41e962f9e53be9ac040f386f17719cbd560b4b65cbe434ea71 SHA512 fef2008dccae6bca859f99b7171851b84f30e7b4cdb00500972039bf111ab5901498820c91926374a7b446491330c55f7179e8522b90279d0169371981bc90fd
+DIST gtksourceview-3.24.6.tar.xz 1623288 BLAKE2B 2332b31534f4fb7e4115e3827c3d57fe4d465eda67c977d238521fc68e0390809e1f0fc46e75adec2b966c83fe5ce0caa3cf312eba97bba76b9b7719b94ca42b SHA512 1b7621dbc1effc979fe08af8e6683ef43cc25563aab37a87abce15a0aa74bd0698bf10377a3fc2539b0cba1ad2f4bce2bb3981ef2dd4245bfe2fcba866d72f5d
 EBUILD gtksourceview-2.10.5-r3.ebuild 1353 BLAKE2B e019389cd3e530c9f1d696d3574d7641125a0e10ad542d61949eb89d4a4f46bbfba1f37e2565f938228c43bba9cf34e611eadec8c222530c113ec17766e55c6b SHA512 1d8dfed14a7bca7114fd4641949144781775cf02344e4b4fc886c82374f92a73b61a81666cd1c7ab5ff75daaff71ed368d4f80a18480237a32129b17ce086fb6
 EBUILD gtksourceview-3.22.2.ebuild 1323 BLAKE2B 8ecf0ab49a768d96515df5c4790c30cb6a1d8382b45c9aa2110c392274af1f9b05987ace8ba9e5c787cae3b7c4248c37c33aac2070cfd7d9d60654e212191e2b SHA512 ff2ca2a7344608b335d59bb2391e85342e082a523ef1a799dd47c4c989f8e7bb294027f551b13546c2d84aac35913b2e0d122d52a1df03b5df289b652159fc45
 EBUILD gtksourceview-3.24.3.ebuild 1331 BLAKE2B d679001eba2791cec08a0ca1c9a35fbcb024a13e11af021045161e985f7d85a8e9d4b04e3ef58366a4616f4f771263c661e4e004c8fe26146cfa057abe73e61f SHA512 9282a5de6620b638b901e49e493b7b538870ac0baf95d200a597ae99968115b85a2f566ecc4dc55142664259efe111a117cc06e96b7f3c596b2b47bb8d6fca26
 EBUILD gtksourceview-3.24.4.ebuild 1331 BLAKE2B d679001eba2791cec08a0ca1c9a35fbcb024a13e11af021045161e985f7d85a8e9d4b04e3ef58366a4616f4f771263c661e4e004c8fe26146cfa057abe73e61f SHA512 9282a5de6620b638b901e49e493b7b538870ac0baf95d200a597ae99968115b85a2f566ecc4dc55142664259efe111a117cc06e96b7f3c596b2b47bb8d6fca26
+EBUILD gtksourceview-3.24.6.ebuild 1331 BLAKE2B d679001eba2791cec08a0ca1c9a35fbcb024a13e11af021045161e985f7d85a8e9d4b04e3ef58366a4616f4f771263c661e4e004c8fe26146cfa057abe73e61f SHA512 9282a5de6620b638b901e49e493b7b538870ac0baf95d200a597ae99968115b85a2f566ecc4dc55142664259efe111a117cc06e96b7f3c596b2b47bb8d6fca26
 MISC metadata.xml 318 BLAKE2B 63b73a76e8f01503afd3f29f3329056ce6b95614aceef233ee4308ab7589dd5f0f35b84f317ecdf5829847a01bdf18987ca87e345ea7e92bf9556d81b15dde1f SHA512 c0954dc93b8b12dbad5d31805afc40d8075c55aafc209d6292cdbc50727f4e17a24353d115004e1e6974fdbb4bdfdb1588ff86ad93b6a60cd1ed430c13865ac5
diff --git a/x11-libs/gtksourceview/gtksourceview-3.24.6.ebuild b/x11-libs/gtksourceview/gtksourceview-3.24.6.ebuild
new file mode 100644
index 000000000000..1e25a7583c48
--- /dev/null
+++ b/x11-libs/gtksourceview/gtksourceview-3.24.6.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+VALA_MIN_API_VERSION="0.24"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 vala virtualx
+
+DESCRIPTION="A text widget implementing syntax highlighting and other features"
+HOMEPAGE="https://wiki.gnome.org/Projects/GtkSourceView"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="3.0/3"
+
+IUSE="glade +introspection vala"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+
+RDEPEND="
+	>=dev-libs/glib-2.48:2
+	>=dev-libs/libxml2-2.6:2
+	>=x11-libs/gtk+-3.20:3[introspection?]
+	glade? ( >=dev-util/glade-3.9:3.10 )
+	introspection? ( >=dev-libs/gobject-introspection-1.42:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.25
+	>=sys-devel/gettext-0.19.4
+	dev-util/itstool
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-deprecations \
+		$(use_enable glade glade-catalog) \
+		$(use_enable introspection) \
+		$(use_enable vala)
+}
+
+src_test() {
+	virtx emake check
+}
+
+src_install() {
+	gnome2_src_install
+
+	insinto /usr/share/${PN}-3.0/language-specs
+	doins "${FILESDIR}"/2.0/gentoo.lang
+}
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index 26b6e1b51e7b..2edfca58f30e 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -1,9 +1,7 @@
 DIST pango-1.40.12.tar.xz 856228 BLAKE2B c6fe562f64ac7b641b5b8519f831b999418ab06c1686ac07aa08b587bfba761a834e698f033bdb79666ea6ddd6c1f672ce968897c7594e4467c5b6dee644877e SHA512 772792edac9ab5b6f76617cd3512432ca6b9af1d5ee6bfb87d0b60293f560026d479df059da66f53ba567f916a275e82f1cdd17ca75bb0da7ae2a79d4a75ed6d
 DIST pango-1.40.3.tar.xz 1061044 BLAKE2B 79acd03144b58a3c160888cf4e3638faaf622cfcb406ddcd6a17907bddb7b3c6bf8c4a8ffbedb095664b7d19daa6837239e317d03e9a485f01b832227d1c3b7d SHA512 ff82395e8487624dffe212975b72b3383dcebb197a8675c8b409665e3e2e30fc23d9a6c25c3129a115adb7182b2a71a49550dbe881eb7ee9bbc572de6ba18d27
-DIST pango-1.40.5.tar.xz 1065152 BLAKE2B cdce82d561c8fd5d342d0138b21ce3204d9c1a726926f8eee68d074466ca58270df19ae6c0ff0581d927cd34531e626904bac00017c386764c89ed415b04389a SHA512 40e8bf85dbb4b6fd35da3acec06a0d2b9dde95a3c5a212d243dbcbc0d00f12bd061757a04cb2f4a8db61329efd7ed9be53e3f5d6a2eb2a3defba1d12f9eed43d
 DIST pango-1.40.6.tar.xz 832040 BLAKE2B af5597194e02c21b8e3ceb6097482dd23a9eaf74b5ca618cc39a1f44317cdab6ecef3125f5952a7b9fd306e67301de4503efbf082b3c8c172615c523e71d6a55 SHA512 d916b364a77de3e68779e6d841d95bca456daf89405b92eaf51dceef093a9761cbb6c48f4c2971dec47c0bbdb645a3f3f4fb9af425274bf1d1822b278575e1f7
 EBUILD pango-1.40.12.ebuild 1703 BLAKE2B 4215d6642b61e259719358ab61cd4583ebb9c1e53f50c5102a34f33fd64ea56490587007089d243acee6007309424c1dc6da5769e2760a177639235935c88c5e SHA512 172916acea9cc2af4d04399e67afed575eebbcbd92e501e7d2653f0bb3377f60dc61e8f9278891bba49f8ce132ae1b96277c7d20157d343f4569cd7c3baec851
 EBUILD pango-1.40.3.ebuild 1710 BLAKE2B bf310621d2b86abf1162aa80788b5d6c6db33bb05ce13f398705cb0fe45389007f7494ecff8f1d6fb6f1752ef94ee358b27baef1052e4bdb725a6c47c820da70 SHA512 6fbbf1ba010f5d5d527822ff2f4f43a6184dbb61b4c3c9e61507bf65c17f815caea1bfa8793dacd7f902d0d42c66d1beb31ec66ac70452730b6c1d08f6a1f139
-EBUILD pango-1.40.5.ebuild 1702 BLAKE2B 7686e147bc6b0130d326c874d64582ccb5e2881efc5985c1bd1fa27d7e2bd03b8f744a5fca424466a97aab7b59e75ad36e7c0ac572508da5ea34acb6a164c67c SHA512 7111f759d6202669fae7a881e298a30962ec2a07184a566ddda64e5f681923803ae60d385b2cbabda05dfbc062de44c3962176ad6ce37aa2e11b7a5a2cd9e1be
 EBUILD pango-1.40.6.ebuild 1702 BLAKE2B 1fa06c4602f29f8961f5935de4f6f52fc643dba2f3f4272864aa708f5da473ce33e0fbd5618c78e4cc395c1beb101232ceb22ed8627db7b7a14232c6a2753450 SHA512 81d280a89db9f79c26c6472247cf373f250eae38861b1105e4ddf7ee979cd0a55bff8aae9ab34cce6a590d72573354d5662bfd16707015dde3d3abeb693f3d5b
 MISC metadata.xml 412 BLAKE2B a35a48a5b045c8d88090806f3ae50702a22a89828429c18682810ab492f743b4c1ef48369a7cb3b2a473eb059da899d20810d7533a63295ae848ac1b1c44f490 SHA512 bf95749c7606d0556904e6a6db1636fe93a919b35c6ab8252087f11658c40dcb08aa0dfce74fafe67e609b2c20f9e8ec632dc878a80e467442b7994d03dea27e
diff --git a/x11-libs/pango/pango-1.40.5.ebuild b/x11-libs/pango/pango-1.40.5.ebuild
deleted file mode 100644
index 2b45739d6f2c..000000000000
--- a/x11-libs/pango/pango-1.40.5.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 multilib-minimal toolchain-funcs
-
-DESCRIPTION="Internationalized text layout and rendering library"
-HOMEPAGE="http://www.pango.org/"
-
-LICENSE="LGPL-2+ FTL"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-IUSE="X +introspection test"
-
-RDEPEND="
-	>=media-libs/harfbuzz-0.9.30:=[glib(+),truetype(+),${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-	>=media-libs/fontconfig-2.10.92:1.0=[${MULTILIB_USEDEP}]
-	>=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}]
-	>=x11-libs/cairo-1.12.14-r4:=[X?,${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
-	X? (
-		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.20
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	test? ( media-fonts/cantarell )
-	X? ( >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] )
-	!<=sys-devel/autoconf-2.63:2.5
-"
-
-multilib_src_configure() {
-	tc-export CXX
-
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		--with-cairo \
-		$(multilib_native_use_enable introspection) \
-		$(use_with X xft) \
-		"$(usex X --x-includes="${EPREFIX}/usr/include" "")" \
-		"$(usex X --x-libraries="${EPREFIX}/usr/$(get_libdir)" "")"
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/docs/html docs/html || die
-	fi
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index 3dd468a4f7a2..396f83bf1af1 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/pidgin-sipe/Manifest b/x11-plugins/pidgin-sipe/Manifest
index 05d0af4b4175..4616e119c8c7 100644
--- a/x11-plugins/pidgin-sipe/Manifest
+++ b/x11-plugins/pidgin-sipe/Manifest
@@ -1,7 +1,9 @@
 DIST pidgin-sipe-1.21.1.tar.gz 1212621 BLAKE2B f2fb149a867af1771987857e90eccd0cc9a9624749eafb101b3f1c4e956c63e4f43c237a86925af34a8db81e03b287b1972e19e2bb1315959eb1cb606ef485bb SHA512 d9b5ad67967c35e29d6742d9d09346c7702a339450de7522aad73f0b379505f24104a306292ee91960c679498073376081479b335eab8eba090e492f444b5378
 DIST pidgin-sipe-1.22.0.tar.gz 1255851 BLAKE2B 442206854bc420f8a93a34246f28a923adc83c08a9c113d871f920799e2b33505a14b4181d1b20aa65e03c6d6483b01be22e66ed4496ea8571247bfc560d2a97 SHA512 4135bbf526659663b0b053592d889588574ed2a1bc9346e6ba62960203409e2604552ffb02ed32e2b4bb46c4f40f62089302b301344b9f7b45657e64a585f7ed
 DIST pidgin-sipe-1.22.1.tar.gz 1265440 BLAKE2B 88f5ef6473af2b50aab0d2adfb9bccf62c9654a1d80319d5e8e43b18719e875e0b3fda45a76e85a6fd892fd516dcfbf5f5ec4a134b1525972eaf35b9841d5210 SHA512 1fff886b32f7f8cb99a0af710b3a1502f62d27dedb541a9e2d8ae9eaf5eb7be0983216e730ccc912c20eee3d940ed1f789f704ee21736db76d141efda66ec018
+DIST pidgin-sipe-1.23.0.tar.gz 1296050 BLAKE2B 1c69587ab6407b6c83dda349ab9a5ad61e3e1d8936b58d7edd71cbead3f8573ab60f7e95866968ec55163a533077be268d6166354d9d22cd2110e6b2ae1708c0 SHA512 8ed0c353e83707b99059791b97568d874634eb1d5ec1a43031864cc8469dc859e7485eb617fe5e23960c091fb15334a903452827ef8a650ed4d677f3a2222cef
 EBUILD pidgin-sipe-1.21.1.ebuild 1311 BLAKE2B 6e4775ea9f2bc979b1bfeeefa343a4efdc3aa2ec8fef56b4e0e6988efff0a428e88a85ba11c2ed1cb152b836642c5cda2359bffbc735b769d8b01d73eb6d8947 SHA512 349bd4adff488c0cdc94230cee7112818eb1a99dbd56ea36f351e66b6a7215d72623fb1aaef7b6a0d3bf8b6364f293748adabf793ebae51da2f6356dc387927c
 EBUILD pidgin-sipe-1.22.0.ebuild 1341 BLAKE2B ed5be88ca89073860f316078ec1133c2320513fc15e07d694b0c364959ab1b445d4b356a626d54a5b746d154619991669728bac87cb322380a43ec9749a73dc4 SHA512 eff9f421b21e3f108ba85c8f6f3ba22420c262cd1df01f3a5c6ffce5a56bd2c79e4641279dab12c54fc40a6733868a105835f8fecac3440a179c3e8aa519e46f
 EBUILD pidgin-sipe-1.22.1.ebuild 1343 BLAKE2B 15d14dfbc6f20da9ecd1be0b0a6c8816abe7484583a2d9356e278080cffb6c81b2247752c2ba1267964ed200a04bb039e5a18c64b5c1be0084445743da89cfb6 SHA512 43baf3436eb8e9728c09cf2b99565e73c7e69ab0d93708ac03039d785ac280110ceec8ccfa42beaa59e1998ef0dad63a39b268ed34cfa71ddc7a6ca1574b172d
+EBUILD pidgin-sipe-1.23.0.ebuild 1344 BLAKE2B 3a1721aa32f475098613ad9e9bc7f2fbc763bafd792f56241255a645b71fc9fcdb980a476f72349e5d73f23cba7398bb89f56d0345cc6f8d4c0d98a09a6ad272 SHA512 3079263ade25f09405f42d95c5c0a22cb5444593d7343573549c68fb0893444621704bdf4182c437d9aba9a09a7dcc3dc611abf3f7c337202d513ce5d47f9cc6
 MISC metadata.xml 862 BLAKE2B a48a0574208ea31609e18d48b4676763e509d97e28f562bc7a103d99183ee75184b8d674245e24b19e0d1adcda6b8091fbfc1c7e3cdb42569094fb9aeb02e932 SHA512 ff38f1be40af0b781cb545c216873eff77f07f0142b1c3db8a1ce2ca43b53fa9f2ce6a9b4940ff8843f26bb5f024d2ed8d3917762cf74b4820550bb704cc4b14
diff --git a/x11-plugins/pidgin-sipe/pidgin-sipe-1.23.0.ebuild b/x11-plugins/pidgin-sipe/pidgin-sipe-1.23.0.ebuild
new file mode 100644
index 000000000000..0f84cb3d0a0b
--- /dev/null
+++ b/x11-plugins/pidgin-sipe/pidgin-sipe-1.23.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Pidgin Plug-in SIPE (Sip Exchange Protocol)"
+HOMEPAGE="http://sipe.sourceforge.net/"
+SRC_URI="mirror://sourceforge/sipe/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="dbus debug kerberos ocs2005-message-hack openssl telepathy voice"
+
+RDEPEND="
+	dev-libs/gmime:2.6
+	dev-libs/libxml2
+	openssl? ( dev-libs/openssl:= )
+	!openssl? ( dev-libs/nss )
+	kerberos? ( virtual/krb5 )
+	voice? (
+		>=dev-libs/glib-2.28.0
+		>=net-libs/libnice-0.1.0
+		media-libs/gstreamer:1.0
+		net-libs/farstream:0.2
+	)
+	!voice? (
+		>=dev-libs/glib-2.12.0:2
+	)
+	net-im/pidgin[dbus?]
+	telepathy? (
+		>=sys-apps/dbus-1.1.0
+		>=dev-libs/dbus-glib-0.61
+		>=dev-libs/glib-2.28:2
+		>=net-libs/telepathy-glib-0.18.0
+	)
+"
+
+DEPEND="dev-util/intltool
+	virtual/pkgconfig
+	${RDEPEND}
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-purple \
+		--disable-quality-check \
+		$(use_enable telepathy) \
+		$(use_enable debug) \
+		$(use_enable ocs2005-message-hack) \
+		$(use_with dbus) \
+		$(use_with kerberos krb5) \
+		$(use_with voice vv) \
+		$(use_enable !openssl nss) \
+		$(use_enable openssl)
+}
+
+src_install() {
+	emake install DESTDIR="${D}"
+	dodoc AUTHORS ChangeLog NEWS TODO README
+}
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 4f2148b6beaf..07ba25b4b7c5 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/aterm/Manifest b/x11-terms/aterm/Manifest
index bcbab98e31fb..65e88b2b2bda 100644
--- a/x11-terms/aterm/Manifest
+++ b/x11-terms/aterm/Manifest
@@ -2,6 +2,5 @@ AUX aterm-1.0.1-deadkeys.patch 1358 BLAKE2B f692e190a33e50877da050cce3e7a3c8ab36
 AUX aterm-1.0.1-display-security-issue.patch 797 BLAKE2B 2f3d4bcc2c7e705106c6c1e81526e7575514e9a83e064158bcc3dc5a554db5f5592c3af2c33eea78864ff0d8d16770dadf1ef20aea52fa131c5c75ace20991d2 SHA512 23e088f188b2d454f5a3c1f863439426c80524f71c1d8484e451f301aa7b4007ba54988a86b4fe49fc8f3401e0af7ff9b725c5d3e8c08ba2eef007b7ada13e4d
 AUX aterm-1.0.1-dpy.patch 848 BLAKE2B 27325ce9a768ad44ab4d6e875e8b2c85c5e1cb419e4578d14a8bd960c754a5a3cce4646dc40e266f4e32a4fdffa2cddb395fd0af404405ac75d9578f61f8e061 SHA512 5d4040cf5c5933e91348531a271cf9687387a740312b12f5185f41877e91f58a0c216e5ad67be19bf47607b23eb9e1b31ca577ceed2a0239a01118073716c2bc
 DIST aterm-1.0.1.tar.bz2 276810 BLAKE2B 05d8e70caf20bfe2170ffcea2231b6a1bca0ff3414867bb9e48785e4822112a82868793c0b25f7111545b835aff61852f78461166a574288bc238146226be745 SHA512 05c78590bba55d892d9f7add384e4ae8d56197dbcd9caff2be4a52d5c162e767a464359ba806fc95961d8035575a2b4a962fc35cfa44f95025b477fa3e15e56b
-EBUILD aterm-1.0.1-r2.ebuild 1995 BLAKE2B b4768f5dbab89bdb3df89cc86c4eaf561d0b1047351a085396f9202b5df03e6000fe98568a6fe7c71ce51453fd43083fbc82089ff73e1cdc7a9557df855653cf SHA512 f344337763155570f96bf1da4e630deb27beae3b57ccdbbe3d4e6e211e45b891f99a1579404495c49a990472b72792015ef0bef948ada584f0c2fb9f1f31a031
-EBUILD aterm-1.0.1-r3.ebuild 2049 BLAKE2B f82988391d794f4139ee4988e0c7e8e62841cad6a9338df00c4d655b0edb98c77cdc04865b21bd294d74458bb414748ba2026231d778d51c8ab2d1cb1a931b2c SHA512 f9a999b0067003aa1c5d2c7c7a8575fb4a6db8038e979f7be710d8c09437f72bb3a73800056a4282d29b528eb0b4c2f87f0607b0293f1a44eb59a09f757caa13
+EBUILD aterm-1.0.1-r3.ebuild 2047 BLAKE2B 4e2335f96ebf493a2c8dac54b843ff74e98abeff2a473c00a2e536625012e35f10c5bc5144f3b73b151ef18978d7a48f1bbcef9ab492bdb1d3a984fae75ac762 SHA512 def49da830ad3308ea3e7b26b6b7b4cbd36d8e9d140fd872971f24803efe73c105fd20bc48b116c21927dc43ff3bc1cbb666e2028b4dbe200969e2ea5a5c200e
 MISC metadata.xml 456 BLAKE2B 268ce12677cb3678b091d810094c33905df594b0956e4103b132d6c5bc01bb234dffff4f65e34d8331a4ee76f2b893bf5fecbf4bc403b2c0690a357929a0a2cd SHA512 664fece05ae3d5cf3fcf713f83ec9756c1248dbde0fdbb6dd4cc5174ba54aa3238fb2ad1ec060cd9e665a83d83c0eacecddd1422ea44cc95850fe680198806cf
diff --git a/x11-terms/aterm/aterm-1.0.1-r2.ebuild b/x11-terms/aterm/aterm-1.0.1-r2.ebuild
deleted file mode 100644
index 067274a1a236..000000000000
--- a/x11-terms/aterm/aterm-1.0.1-r2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=3
-inherit flag-o-matic eutils
-
-DESCRIPTION="rxvt compatible terminal emulator with transparency support"
-HOMEPAGE="http://aterm.sourceforge.net"
-SRC_URI="ftp://ftp.afterstep.org/apps/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-IUSE="background cjk xgetdefault"
-
-RDEPEND="virtual/jpeg
-	media-libs/libpng
-	background? ( x11-wm/afterstep )
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libICE"
-
-DEPEND="${RDEPEND}
-	x11-libs/libXt
-	x11-proto/xproto"
-
-src_prepare() {
-	# Security bug #219746
-	epatch "${FILESDIR}/${P}-display-security-issue.patch"
-	epatch "${FILESDIR}"/${P}-deadkeys.patch
-
-	#fix pre-stripped files
-	sed -i -e "/INSTALL_PROGRAM/ s:-s::" autoconf/Make.common.in || die "sed Makefile
-	failed"
-}
-
-src_configure() {
-	local myconf
-
-	use cjk && myconf="$myconf
-		--enable-kanji
-		--enable-thai
-		--enable-big5"
-
-	case "${CHOST}" in
-		*-darwin*) myconf="${myconf} --enable-wtmp" ;;
-		*-interix*) ;;
-		*) myconf="${myconf} --enable-utmp --enable-wtmp"
-	esac
-
-	econf \
-		$(use_enable xgetdefault) \
-		$(use_enable background background-image) \
-		--with-terminfo="${EPREFIX}"/usr/share/terminfo \
-		--enable-transparency \
-		--enable-fading \
-		--enable-background-image \
-		--enable-menubar \
-		--enable-graphics \
-		--with-x \
-		${myconf}
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	fowners root:utmp /usr/bin/aterm
-	fperms g+s /usr/bin/aterm
-
-	doman doc/aterm.1
-	dodoc ChangeLog doc/FAQ doc/README.*
-	docinto menu
-	dodoc doc/menu/*
-	dohtml -r .
-}
-
-pkg_postinst() {
-	echo
-	ewarn "The transparent background will only work if you have the 'real'"
-	ewarn "root wallpaper set. Some tools that might help include: Esetroot"
-	ewarn "(x11-terms/eterm), wmsetbg (x11-wm/windowmaker), and/or"
-	ewarn "media-gfx/feh."
-	echo
-}
diff --git a/x11-terms/aterm/aterm-1.0.1-r3.ebuild b/x11-terms/aterm/aterm-1.0.1-r3.ebuild
index 0a0939af86a8..b0a0fda87d06 100644
--- a/x11-terms/aterm/aterm-1.0.1-r3.ebuild
+++ b/x11-terms/aterm/aterm-1.0.1-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.afterstep.org/apps/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE="background cjk xgetdefault"
 
 RDEPEND="
diff --git a/x11-terms/terminology/Manifest b/x11-terms/terminology/Manifest
index f7989e12131b..eef1efca982d 100644
--- a/x11-terms/terminology/Manifest
+++ b/x11-terms/terminology/Manifest
@@ -2,5 +2,5 @@ DIST terminology-0.9.1.tar.xz 4961876 BLAKE2B 03aab7c5c0740bede4c06b90721d96c121
 DIST terminology-1.0.0.tar.xz 4979420 BLAKE2B cbc78b751a2e6812ab31c69a62ea4abe2bb53f12b647cea7adae03e54fe0a238c56c5c029c43057c3a1326c7c8af0412574a85a404896554a142ed068ab581ab SHA512 5c99e1e1eea0de24d67779059d3ba65a8fbd1fdf63d9f22099e38defc11fdc8923fbe50a7276bc483ce5ee7527f665e3f2c48358d85c3a06f33e551bd8ef2320
 EBUILD terminology-0.9.1.ebuild 506 BLAKE2B 3097c37a90df56759cbaf924688fdfa0d54ae3f66ca0081fccde7a7f6a5b1d0555f93dd7ca5920079f5490a45f73792c7d24d9de709fcd7ddd55be8982213a93 SHA512 caff7eac7a6502dbbe1141f46ebd187979ff4c68660dada0e6f887a7415c178d53667d3d12486ea12350b9aacb9058e85bc251215cce0b10049c5b8ab585717a
 EBUILD terminology-1.0.0.ebuild 588 BLAKE2B a750d055620ae81bc6c700dd1878078383542bbc90a32c052a85c78a9e5755909ea77b5ab746d71cc1c7d11fdc9ebee789977c9efe7d3ed53fe2e0eaa32ccc9c SHA512 a68f7ecc0f45cfd251bd45b7d7363c89ab2f321f38480424106a8cd1903894c88fb4a5a506c585cf4002ed380261fdfb56f301522de3ffda7993e291a3b81c57
-EBUILD terminology-9999.ebuild 576 BLAKE2B 369226a1c4c228abdc46838f5225eb650c4d74a2db5b9e3cfb14bc583e1e0229206389ee0efcbb7dcf84e46f74de889bb9f30899cfc47826b1d043c7ee70d0e5 SHA512 9db6f350518a1bfd170086c261ade4aa6c720a22df37e70d1956abf514faba0d7ba812eb9054191f3a6a080216bb11bef132474a12397cfa56d294ffa634aa4b
+EBUILD terminology-9999.ebuild 633 BLAKE2B 1b678fd3b8dac053848d407580dcfaa9e90c50c2f21e472bfd75b1c8c3d8b29813fb7e22bbf93c493b01395260e8d0a09d5ed6a388074ba120aeef69a0eb69af SHA512 d8fce4e45f7990c60bf282e13392b3a2224e368ec6a8bea06796ad697ffb1de5fa1e14532b1d896d2da8c82c962323eb70029e34bc5b54ece30175e6e3c80f44
 MISC metadata.xml 258 BLAKE2B 6f5319cbc6d7bd06cd594c3891600067b2e1dee2d7450ad6b5a7eee0d6e3bf29242a3511f8a28e9e561c6dabe340ab93490e110c4dfe249da6831697c991e27e SHA512 59d30cd09990b755f6e1f0198e7ce860fe587038c5c020e44a9219aba431d96393ff0c5bdd5dd0db3512cc3d5c7b9992af242810204883663591432a0fa67997
diff --git a/x11-terms/terminology/terminology-9999.ebuild b/x11-terms/terminology/terminology-9999.ebuild
index f28072ea6386..141d654af246 100644
--- a/x11-terms/terminology/terminology-9999.ebuild
+++ b/x11-terms/terminology/terminology-9999.ebuild
@@ -1,23 +1,27 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 
 MY_P=${P/_/-}
 
-if [[ "${PV}" == "9999" ]] ; then
-	EGIT_SUB_PROJECT="apps"
-	EGIT_URI_APPEND="${PN}"
-else
+if [[ "${PV}" != "9999" ]] ; then
 	SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${MY_P}.tar.xz"
 	KEYWORDS="~amd64 ~x86"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://git.enlightenment.org/apps/${PN}.git"
 fi
 
-inherit enlightenment
+inherit meson
 
 DESCRIPTION="Feature rich terminal emulator using the Enlightenment Foundation Libraries"
 HOMEPAGE="https://www.enlightenment.org/p.php?p=about/terminology"
 
-RDEPEND=">=dev-libs/efl-1.18"
+LICENSE="BSD-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND=">=dev-libs/efl-1.18[X]"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"