gentoo resync : 25.05.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-05-25 15:22:17 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-05-25 15:22:17 +0100
commit: 22910f5d14da606bd7f06e19a2f61c5d1a8fc94b (patch)
tree: 808b5701901fb54b53ec3ecf6f33272e933f3ea6
parent: 91c0ec2d7067f6ab1ef578bd9967b32ca07eb502 (diff)
1598 files changed, 12923 insertions, 16863 deletions
diff --git a/Manifest b/Manifest
index eb22609fc056..41ad568dd6a0 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 28963 BLAKE2B cee10322e6dc64481122e96fec23722be19d2eb458767305dd1b7743595f480ee94cdee3b8845cea712ae63103b82179d5509983116ca5713dc315ca2894c065 SHA512 94d6c6566bb59ca1e85b89209945c56b91529eeee443f10477143c1db84282b341817b4ace1490aedc2941f9395d7b6da77682fa2f95a694cd563a9095e330d9
-TIMESTAMP 2018-05-22T12:08:41Z
+MANIFEST Manifest.files.gz 28991 BLAKE2B 3094a6bd552bd3e2bd57a76daa1aaa6f49c5ecbf7fa6d17f85d09f4912f98fb7f7a165799ed31dd3f01bdb6a26878b70ec0cf4f955e1453ddb89041eb96e46d9 SHA512 910732204033d28dafaaf81ab7c2330f6b18c047ae1ef1b2784021bfb258337ba6f4aa11c8b2546e195c095911820c206a640b87168ccabb8456353d346ba3e4
+TIMESTAMP 2018-05-25T13:38:49Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlsECElfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlsIEelfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAjUA/7BGXLirR9ccKQGgPWr3/JtxBUeyFfONjQ3PzfV6UDwg3AiUVMyPMnPtEW
-VYJ8cF3ZxnAY1ls7XJ/Znyn4WRUi4eKvWK3sd7tIKA8jTyEv3OWl7FXu2DaXXVli
-cMGgCSE3WFhWCYWUS06R4b0C4PljXTY+3AYbK3GPBeZ+z9oXFg3Sj5UjHPPC9QwS
-a68Rp4q+8Yd+OZYSW39Z78geunE5PJnUPEMRW1eoj0TXyC3Vddeu64VEFzIen28C
-q9cFUg2yhYjL/MYdVsgnSe3d/WCm46lDurqq/ueq/v1OkvDpNbxOz0NGl5Q8DM5+
-dCWY3LKvOx7EMkpyUvNKP4fBrOvbcU/IILx9xMkHDXtwNL77382FnGs3vrTssFVi
-4kBIG29QtC/vMSarWEXt50PG67/d1r7laoSxF4VbR78gBE+uj5J6XVn73Sc4e/nz
-PjugPfHF0ibnQpAhxGYm4I4zY7L/0BDIKLeWeOukDh8/ACLISAwRbaGWI22NLqZE
-Yo8Obdk0LhsNmeoDgEWX6Akbca6puecLgrC4m2UvJlYOv9owtCEYtAqYFUVCsG4n
-M0V63wye80QOY9weOiu8/paZ7lwy7SHA352humVzTPG4Ki1BXVX/l1DtCSjOLcoq
-t96PXsUSYJtRZv4Pp17n/oAhvkP3NHiEPjAOK18gnduf1ok5cCM=
-=q5Bl
+klChAQ/9EVMERVtDjEEROjKvEUIJMdt+HGL0oa7wfiLXTi8NHbd7LT20dWi/j+n2
+yWlALdX9CIDnnAihpA8p9v9d1+P+PYcUl252v1ojaoOWhyI0XVUztbfPQRiro3ZF
+wVL/ol3VWcbQP9SzluI1fhlBpVNersWkmg8VbUkwe1gMTDlz1YvvJSS0oOuFxqB7
+b0EyibrYWlWZMnun+gVA3OwpQDX8tcFRvRue+g5g46TTYeygmeDA31Heg7ZgKB9G
+Dt/N0EkUYGYrA0B9PYzvuP+xkNO9r79YY0LTnzT5s7JyLsdx42eUVorO95NaxLo4
+lp1EXhK4t7zhj+s4XbgeC4hzFeCHnPumU0tEqJ1nijBrqyiUdYfc9wtV+HXWI4sn
+lysyF2f7e8tyO4oN8t48DKRi3AvUIgAKPmnVH7voYPHvn6y8oBBbEbnopjv/sFAd
+WJKM7w/gyq36Ey/zdKRLHICjqXsRoheIFtSlIQxQsJSWORwp5Et5ERF3XPzxwprG
++WsyMVuIeGl+KDy4OLX81HwVF1GXC5b9c1n9SKqkNSGfoO6v7DXXTUOJIsBldmCk
+FviHMKXV7czzl3j0bL4zEyyISx/BRCDQGN7kTwte/gfsh0hpQcL+0Bnb1Y9o1L9y
+9IplN0t7wty9vX/x3UX4gP/lz40LkBJQRjmMvzGbyATeQHPTEsE=
+=LF8f
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 48efc11e92ed..2cb7874773ad 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index e892d7fea306..8324be8bdaa2 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/abrt/Manifest b/app-admin/abrt/Manifest
index ad52b193e5bb..6cc3544e240c 100644
--- a/app-admin/abrt/Manifest
+++ b/app-admin/abrt/Manifest
@@ -5,5 +5,7 @@ AUX abrt-2.0.12-r1-conf 687 BLAKE2B 771c5370e3f7f181c22f8a56d8a13a02759aed2fdd5f
 AUX abrt-2.0.12-r1-init 1921 BLAKE2B dc8bbe3d4902ac65165f1e71eb6400810980f6b90014619aa87614f0a8e1c6e9bb79afa964e5c0324ca090fefa9b90f2705c7388b488709f31619d824850e3e8 SHA512 a6f7c4029f974af083f33020756bc0eaa877c23f658d6b92388627e3a923aae499dd44e1b0e22af792a6c431a683ebe4604d6dec62bf09f70a2a5209cd45be81
 AUX abrt-2.0.6-format-security.patch 911 BLAKE2B e502ea10a65de1b0ebff3f7d954d42af365a8384be817ff0b891153877d2714f63b9edb8565df503b455824a03f94bc62ef596aa670516d212239922d23e0b62 SHA512 8e9f8bb37698834b998d1d4a9452e17f5484a2fa9fbc400b80f2154fb4f7ad35dcbc65112afa3fef2f1b2ccf78a01f745e436e61323c40d76f17da11a6229b71
 DIST abrt-2.0.12.tar.gz 1090121 BLAKE2B 272f486bd166a33fea3e340763b3443b5643a650fe16ad326e249309c355f214c67937456dd2d8f3e7cdac65cb85bd8030e6b89671f427085a05dca64b8f874d SHA512 5432205edb4483fb1883b9bcebab48784b16dd9e72c3a929ea0d50c48dab638d80f136b6b0d7648d8ec9fcb79d5ce8c1be37d36301d3b2b151868901be82a63a
+DIST abrt-2.10.9.tar.gz 6830234 BLAKE2B ec96b915103c8b8157eb64c98791d283225091d0f2aa7b78520bfae1bee22f43703715fabc43828c750aa7e84eea4a886878d411670b7b4ad31ca49b96d387f3 SHA512 1ff7e2edf29085fb03c569b67e8bf2bc83aaf4dd77730e5fc96184453224f83dd0632eaf85a7ad03351fdfaea3d4ed50e8a89eb28d82151f95bd34eb1850f93c
 EBUILD abrt-2.0.12-r2.ebuild 2643 BLAKE2B 2799f38b03a18400cdaa0d471a64aada8204cd837198b107f1217740d00c50bab937f98a46354811fe573d99d5e84b61730a60d39ea45cf5d1c1d31f57ce4de1 SHA512 f9fcd1f028b14744c7f9e930ee684bd6e010bd453d7d4b44b689cca103e7a5770a1b5a6a041193826a29229ab6acde442b8f91cc1714384a3312e0560beb4809
+EBUILD abrt-2.10.9.ebuild 2687 BLAKE2B 2554c809fdb24139c97f968fac129f0b408025033e8c6a4241295a94db18241ecae501299de57eb3fd1318df0e770db0e3ce4bb84d9fb99f478c41ee59c74cfa SHA512 59743039a3316da2c725e2ca3ca97e30d4c4242636523f02aa75baacfbb4191639d4c364ee3feffd5ccdfb004e93f1a390391fd1752918dec16035c430a40b21
 MISC metadata.xml 327 BLAKE2B e5a24f189c128e35fd3b878143c5d99da897af8535258f7eece0153df8a5b2dfc8b4f19000c60a6fcb70bb4f0b9efad98d2deab9e36dd205615e4176a06c0c45 SHA512 687cee8b12e63a46b815a1d6099a2853ed72d3d19d118e4e0cdbe67f501475ed02949848a4537a7c5eef0ac4a398edab868f816bdff277e3c1b348e5ab73ee40
diff --git a/app-admin/abrt/abrt-2.10.9.ebuild b/app-admin/abrt/abrt-2.10.9.ebuild
new file mode 100644
index 000000000000..313aab7271b3
--- /dev/null
+++ b/app-admin/abrt/abrt-2.10.9.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit autotools gnome2-utils python-single-r1 systemd user
+
+DESCRIPTION="Automatic bug detection and reporting tool"
+HOMEPAGE="https://github.com/abrt/abrt/wiki/ABRT-Project"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug selinux"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.43:2
+	>=dev-libs/libreport-2.9.5[python]
+	dev-libs/libxml2
+	dev-libs/nss
+	>=gnome-base/gsettings-desktop-schemas-3.15.1
+	sys-apps/dbus
+	sys-apps/systemd
+	sys-auth/polkit
+	sys-fs/inotify-tools
+	x11-libs/gtk+:3
+	>=x11-libs/libnotify-0.7"
+RDEPEND="${COMMON_DEPEND}
+	app-arch/cpio
+	dev-libs/elfutils
+	dev-python/argcomplete
+	dev-python/argh
+	dev-python/humanize
+	sys-apps/util-linux
+	>=sys-devel/gdb-7"
+DEPEND="${COMMON_DEPEND}
+	app-text/asciidoc
+	app-text/xmlto
+	dev-libs/satyr[${PYTHON_USEDEP}]
+	>=dev-util/intltool-0.35.0
+	virtual/pkgconfig
+	>=sys-devel/gettext-0.17"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RESTRICT="test" # tests *may* be broken due to all the RHEL crap.  explore later.
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+
+	enewgroup abrt
+	enewuser abrt -1 -1 -1 abrt
+}
+
+src_prepare() {
+	default
+
+	# pyhook test is sensitive to the format of python's error messages, and
+	# fails with certain python versions
+	sed -e '/pyhook.at/ d' \
+		-i tests/Makefile.* tests/testsuite.at || die "sed remove pyhook tests failed"
+	./gen-version || die # Needed to be run before autoreconf
+	eautoreconf
+}
+
+src_configure() {
+
+	myeconfargs=(
+		--libdir="${EPREFIX}/$(get_libdir)"
+		--localstatedir="${EPREFIX}/var"
+		--without-bodhi
+		# package breaks due to not finding libreport-web with bodhi plugin enabled
+		--without-rpm
+		$(usex selinux "" "--without-selinux")
+		--without-python2
+		# Fixes "syntax error in VERSION script" and we aren't supporting Python2 anyway
+		--with-python3
+		--without-pythondoc
+		# package breaks due to no sphinx-build-3
+		--without-pythontests
+		# kill tests for now until they can be explored.
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	keepdir /var/run/abrt
+	# /var/spool/abrt is created by dev-libs/libreport
+
+	diropts -m 700 -o abrt -g abrt
+	keepdir /var/spool/abrt-upload
+
+	diropts -m 775 -o abrt -g abrt
+	keepdir /var/cache/abrt-di
+
+	find "${D}" -name '*.la' -exec rm -f {} + || die
+
+	newinitd "${FILESDIR}/${PN}-2.0.12-r1-init" abrt
+	newconfd "${FILESDIR}/${PN}-2.0.12-r1-conf" abrt
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-admin/aerospike-amc-community/Manifest b/app-admin/aerospike-amc-community/Manifest
index 10e39dbbc517..54eead6536c3 100644
--- a/app-admin/aerospike-amc-community/Manifest
+++ b/app-admin/aerospike-amc-community/Manifest
@@ -1,21 +1,11 @@
 AUX amc.init 562 BLAKE2B f4aed655b924f345905aa8d3f149799ad299086cca1555e4902e09b376a47e2da8a34445446b00f7508cf4b6ef1d7eb83df93ae6af7c89d9b6e23d027ea5ce45 SHA512 4f50237b23ec1d2257791266ee5ee4c8b963bb0429c7386d50e4ba74ee8a451cd99a8dde277ed92b490a9b40bf33f5f6920e66c777e388bae43cfe402d255094
 AUX amc.init.3 422 BLAKE2B d7ad7a2a2e610da62542728da59d581f3bd69fdd5a7bf077f42cf2057e6c6bed05c298c73aee7ae9dee8ef93c3d684fc467619d202f2dd7a371b566b4e8cdf7c SHA512 71109e0779408e0cad3b4073a680ff40500daab6f2efe9af7d69286939437de0bc2b6e3a406ac65355f11b56d84077a04d98a2a6e06aac1147e1e516fe4e5181
 AUX amc.init2 583 BLAKE2B 0745a48ecfdc060ac9995c0634761d9b16d7d190df9d6a3d8fd7ec415fda486157e22f6f7ff03b2d4a3afe93632a67e7ad07214831007101bd9ebc71557f6003 SHA512 c91d1e66a6bcd286efec425295fc168c7d277f0d4886c9e0cd43f49e58b9c9ae0b0c2c453d278404d4d07935c55baf91bffe272699de095df13028316cc0d317
-DIST aerospike-amc-community-3.6.10.1.all.x86_64.deb 1434334 BLAKE2B a632ebfece64b9cb2d86246819b3c57df9970b002e6503d1768b5d590058bc1e3c0eafdf4e9cc8061c128c5438542160b8c9039718ac18e7053b6213169dad98 SHA512 2f9d208c501800d7a73d419347883ff9b4f8d65e76238c8676f1f04ad6c38aae2c9746ea65ed0d4ef36bcc9419a3a70b4d95f42aea72556935cdb3e82d943f05
-DIST aerospike-amc-community-3.6.11.all.x86_64.deb 1434296 BLAKE2B 9892604fb2a5b88e45b1b857bb5ec37c49376cf3f33be4d4ae9ad010336c3c2ac81ec9311fc314b0cb4f50dd01f102e3210fa3e126af699eb94dd4476a546f10 SHA512 e6396d8328f1021bbe4505bd63d4b4835857f151d58e0bb089f18ad7b3115d4893e9b3aaac18321f26150e6d1d2f15eadcd39d2f361af145426dee0c8fd9e90d
-DIST aerospike-amc-community-3.6.12.all.x86_64.deb 1436482 BLAKE2B ddb128add54b11b3c94c7bf119eb86ec3d4576b486adb89f0b653d8cb6e315e4aaf5178a5f923f5163cc20dd7dc25831214481cf4fbe5d615f0aa15eb360fdde SHA512 d02e02db2c041bdb4ed8392dc2703840fc7eec5a7de8f5bbb24db61538631302c94f0bcffe8e31c8e03ec2ca35b8ea82f49d713cdfe2c1e14d0a078b53fb9695
 DIST aerospike-amc-community-3.6.13.all.x86_64.deb 1436414 BLAKE2B cd823dd1c546fe69948ef3f77fa8bf0a68a8d95ed3ee778272b84c39b1b1bc4e5afef803931ce859fd957421f4816358590a3c1e0845fdc524a0f029b52ce828 SHA512 8077f8c51aab39ca701eb1ada633a3a378e02fed39ef2e565fed57fa57cf12da6c69a2b3d93e179110c29043a0a5a114512d30752eab6356e1b819ae490d23bb
-DIST aerospike-amc-community-3.6.8.2.all.x86_64.deb 1429424 BLAKE2B 591f9982af0f9c696211fca341fc521b7e096f0cb57a0c0f0ff8d807422dfbcf121f31d87c7c3d89143c2e1e1bf96b2161531c3bad998cc5d3a069e545951e3f SHA512 ed1b82f825888ce2985b77d75e2e9988f87a241159fc0452af12892f66c37ec0d88f7edd2be6fce6d06184a5c09305f5e9727af48774e55b6290402fa406abc3
-DIST aerospike-amc-community-3.6.8.all.x86_64.deb 1429404 BLAKE2B efebdb3d1d9136b0a1fcf5aa09d8c293cc552b32895070afc1557752d304a88f3da9970f178b8e30a0c8b9ac0762c18af93ab9446e3ba6e12a70b57c8d179370 SHA512 de44333471307410461bd53266b84fdc9fa92f7115012eb4b29b3ad415dd471ca3d9bf1a7c52bec7063df02a7e600dce9366910a089751dd19163cc212574d28
-DIST aerospike-amc-community-3.6.9.all.x86_64.deb 1431182 BLAKE2B 6ba0618d048e7aa57b11a13dc92b9a838de2e26a316ae1fa35bf157656c3463e2933667dc96323648f28c5013093d59c7bf460906e2f7ff04ac3d9bd94f7e7c2 SHA512 67059ef2b96c4cf69b8a2edacb3edc711a18889b7eee16a038c63e8176d80e4b5ff23f126c0c16113a529e181b9c6f16601cbfa0251b0b12231ad7a23b8bc65e
 DIST aerospike-amc-community-4.0.17.tar.gz 7868123 BLAKE2B 86ada2e5af69b9306dc10b5386d21bd4459fff8a05672f289511f1b4efc27b1bd114cdd7bf9e5d6656fa3911ca111c8eabaa178a564f2ff9e6ab64c4a88a0145 SHA512 3dce8e8d435f70685498083d50818c1655faa61125391424c0ff99ea50618df4f9f3c3ddc7be5c64aba7118e75c5c3f24f7c5bfe834ba7fb504fa7d72bd00db3
-EBUILD aerospike-amc-community-3.6.10.1.ebuild 1403 BLAKE2B 43ab0bd0890e9b6876b18b18ea44adf33b75abde9bdca7d0f8881c353ffe11039ceb67cd37555f3ad6559d52b6ebbad55ad40f03f8b2c94f801565f0c59639a4 SHA512 2de0eae1ff0ae5ecf6d9b5ee5c2215c980c857ad5155219fc578730e315e69c952eee2fa1aa34a0a74beec6f73b5554cceb2e7c7655e1727c8e2447d4e309798
-EBUILD aerospike-amc-community-3.6.11.ebuild 1403 BLAKE2B 43ab0bd0890e9b6876b18b18ea44adf33b75abde9bdca7d0f8881c353ffe11039ceb67cd37555f3ad6559d52b6ebbad55ad40f03f8b2c94f801565f0c59639a4 SHA512 2de0eae1ff0ae5ecf6d9b5ee5c2215c980c857ad5155219fc578730e315e69c952eee2fa1aa34a0a74beec6f73b5554cceb2e7c7655e1727c8e2447d4e309798
-EBUILD aerospike-amc-community-3.6.12.ebuild 1403 BLAKE2B 43ab0bd0890e9b6876b18b18ea44adf33b75abde9bdca7d0f8881c353ffe11039ceb67cd37555f3ad6559d52b6ebbad55ad40f03f8b2c94f801565f0c59639a4 SHA512 2de0eae1ff0ae5ecf6d9b5ee5c2215c980c857ad5155219fc578730e315e69c952eee2fa1aa34a0a74beec6f73b5554cceb2e7c7655e1727c8e2447d4e309798
+DIST aerospike-amc-community-4.0.19.tar.gz 7868527 BLAKE2B 69835bdf3d7f1a4b23cd63bb7344c50b6bbbdc04fd55b2d6ec5783a429a442fa6cdf985c77cb4ac73f8ac0663ed2524c8d7a853e970cc086335cf810fd9eaecf SHA512 821de8569bf020b9a2b829e71aab5d48d25639620468aa0b3ed28dc24e0d57bc61be60939425c0a69c418602fa2fbf5ef60f1870edb3f04fa40a2a2aca281218
 EBUILD aerospike-amc-community-3.6.13-r1.ebuild 1404 BLAKE2B 8b278cd44569c009fb9801ebded251e7dbbb074056a94ff07f9634660150171219e73af4638990bb660676a1e6d127015eef515b46026e97ba30a6eaed360baf SHA512 b359adddaf57972b90436bf09edac8081ee5113636f427f69e94e57eae15da8ad1a93c0e1c97ee2ddd590a98ff22290a360fe2ff54da292a16d4ed009fbbf77d
 EBUILD aerospike-amc-community-3.6.13.ebuild 1403 BLAKE2B 43ab0bd0890e9b6876b18b18ea44adf33b75abde9bdca7d0f8881c353ffe11039ceb67cd37555f3ad6559d52b6ebbad55ad40f03f8b2c94f801565f0c59639a4 SHA512 2de0eae1ff0ae5ecf6d9b5ee5c2215c980c857ad5155219fc578730e315e69c952eee2fa1aa34a0a74beec6f73b5554cceb2e7c7655e1727c8e2447d4e309798
-EBUILD aerospike-amc-community-3.6.8.2.ebuild 1403 BLAKE2B 43ab0bd0890e9b6876b18b18ea44adf33b75abde9bdca7d0f8881c353ffe11039ceb67cd37555f3ad6559d52b6ebbad55ad40f03f8b2c94f801565f0c59639a4 SHA512 2de0eae1ff0ae5ecf6d9b5ee5c2215c980c857ad5155219fc578730e315e69c952eee2fa1aa34a0a74beec6f73b5554cceb2e7c7655e1727c8e2447d4e309798
-EBUILD aerospike-amc-community-3.6.8.ebuild 1403 BLAKE2B 43ab0bd0890e9b6876b18b18ea44adf33b75abde9bdca7d0f8881c353ffe11039ceb67cd37555f3ad6559d52b6ebbad55ad40f03f8b2c94f801565f0c59639a4 SHA512 2de0eae1ff0ae5ecf6d9b5ee5c2215c980c857ad5155219fc578730e315e69c952eee2fa1aa34a0a74beec6f73b5554cceb2e7c7655e1727c8e2447d4e309798
-EBUILD aerospike-amc-community-3.6.9.ebuild 1403 BLAKE2B 43ab0bd0890e9b6876b18b18ea44adf33b75abde9bdca7d0f8881c353ffe11039ceb67cd37555f3ad6559d52b6ebbad55ad40f03f8b2c94f801565f0c59639a4 SHA512 2de0eae1ff0ae5ecf6d9b5ee5c2215c980c857ad5155219fc578730e315e69c952eee2fa1aa34a0a74beec6f73b5554cceb2e7c7655e1727c8e2447d4e309798
 EBUILD aerospike-amc-community-4.0.17.ebuild 539 BLAKE2B f1b3f5551986370c16c24fae02ecc0c733fe52057bb0e47d770267a7103313421c54e2292381e04475cb4c2dbd2e538ee34546249f051b06f2e5abc6317b2089 SHA512 ae0703242bc3706586d021d58738cab5ab7babf9427e63d0a421fda4f5c25b75d103d9f40489f219058710919425c6ab3e2ce1c07277893e372dcac0a047a0d0
+EBUILD aerospike-amc-community-4.0.19.ebuild 539 BLAKE2B f1b3f5551986370c16c24fae02ecc0c733fe52057bb0e47d770267a7103313421c54e2292381e04475cb4c2dbd2e538ee34546249f051b06f2e5abc6317b2089 SHA512 ae0703242bc3706586d021d58738cab5ab7babf9427e63d0a421fda4f5c25b75d103d9f40489f219058710919425c6ab3e2ce1c07277893e372dcac0a047a0d0
 MISC metadata.xml 218 BLAKE2B 2189d142b4baed0b8edb49fcc98f7397610a257a4cb5f87873272b284f84290420f0950c8b41d1d050ca7a1e0486c6e00344672a3f0479d1d382c14bf7f18485 SHA512 882f7787b97aa780dd3ba4112b9e1dcc84986e2a17704cba9a557ec3a3f9211bcf93532b92d42f60157b56b457ee9ee17e5409066230e54d48931b91bd6786cd
diff --git a/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.10.1.ebuild b/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.10.1.ebuild
deleted file mode 100644
index 5e04b68567fe..000000000000
--- a/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.10.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils user
-
-DESCRIPTION="Web UI based monitoring tool for Aerospike Community Edition Server"
-HOMEPAGE="http://www.aerospike.com"
-SRC_URI="http://www.aerospike.com/artifacts/${PN}/${PV}/${P}.all.x86_64.deb"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="app-crypt/gcr
-	dev-python/eventlet
-	dev-python/flask
-	dev-python/greenlet
-	dev-python/setproctitle
-	www-servers/gunicorn"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	default
-	mkdir "${P}"
-	tar -xf data.tar.xz -C "${S}" || die
-	tar -xzf "${S}"/opt/amc.tar.gz -C "${S}"/opt/ || die
-}
-
-src_install() {
-	mv opt/amc/amc/* opt/amc/
-	rm -rf opt/amc/amc
-	rm -f opt/amc/install
-	rm -f opt/amc/bin/uninstall
-	rm -f opt/amc/bin/amc_*.sh
-	rm -f opt/amc/bin/gunicorn
-	rm -rf opt/amc/server/site-packages/
-	rm -rf opt/amc/server/setups/
-
-	insinto /etc/logrotate.d
-	newins opt/amc/config/logrotate amc
-	rm -f opt/amc/config/logrotate
-
-	insinto /etc/cron.daily
-	newins opt/amc/config/logcron amc
-	rm -f opt/amc/config/logcron
-
-	sed -e 's@/tmp/amc.pid@/run/amc.pid@g' -i opt/amc/config/gunicorn_config.py || die
-
-	insinto /etc/amc/config
-	doins -r opt/amc/config/*
-	rm -rf opt/amc/config/
-
-	echo "${PV}" > opt/amc/amc_version
-
-	insinto /opt/amc/
-	doins -r opt/amc/*
-
-	keepdir /var/log/amc
-
-	newinitd "${FILESDIR}"/amc.init amc
-}
diff --git a/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.11.ebuild b/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.11.ebuild
deleted file mode 100644
index 5e04b68567fe..000000000000
--- a/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.11.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils user
-
-DESCRIPTION="Web UI based monitoring tool for Aerospike Community Edition Server"
-HOMEPAGE="http://www.aerospike.com"
-SRC_URI="http://www.aerospike.com/artifacts/${PN}/${PV}/${P}.all.x86_64.deb"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="app-crypt/gcr
-	dev-python/eventlet
-	dev-python/flask
-	dev-python/greenlet
-	dev-python/setproctitle
-	www-servers/gunicorn"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	default
-	mkdir "${P}"
-	tar -xf data.tar.xz -C "${S}" || die
-	tar -xzf "${S}"/opt/amc.tar.gz -C "${S}"/opt/ || die
-}
-
-src_install() {
-	mv opt/amc/amc/* opt/amc/
-	rm -rf opt/amc/amc
-	rm -f opt/amc/install
-	rm -f opt/amc/bin/uninstall
-	rm -f opt/amc/bin/amc_*.sh
-	rm -f opt/amc/bin/gunicorn
-	rm -rf opt/amc/server/site-packages/
-	rm -rf opt/amc/server/setups/
-
-	insinto /etc/logrotate.d
-	newins opt/amc/config/logrotate amc
-	rm -f opt/amc/config/logrotate
-
-	insinto /etc/cron.daily
-	newins opt/amc/config/logcron amc
-	rm -f opt/amc/config/logcron
-
-	sed -e 's@/tmp/amc.pid@/run/amc.pid@g' -i opt/amc/config/gunicorn_config.py || die
-
-	insinto /etc/amc/config
-	doins -r opt/amc/config/*
-	rm -rf opt/amc/config/
-
-	echo "${PV}" > opt/amc/amc_version
-
-	insinto /opt/amc/
-	doins -r opt/amc/*
-
-	keepdir /var/log/amc
-
-	newinitd "${FILESDIR}"/amc.init amc
-}
diff --git a/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.12.ebuild b/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.12.ebuild
deleted file mode 100644
index 5e04b68567fe..000000000000
--- a/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.12.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils user
-
-DESCRIPTION="Web UI based monitoring tool for Aerospike Community Edition Server"
-HOMEPAGE="http://www.aerospike.com"
-SRC_URI="http://www.aerospike.com/artifacts/${PN}/${PV}/${P}.all.x86_64.deb"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="app-crypt/gcr
-	dev-python/eventlet
-	dev-python/flask
-	dev-python/greenlet
-	dev-python/setproctitle
-	www-servers/gunicorn"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	default
-	mkdir "${P}"
-	tar -xf data.tar.xz -C "${S}" || die
-	tar -xzf "${S}"/opt/amc.tar.gz -C "${S}"/opt/ || die
-}
-
-src_install() {
-	mv opt/amc/amc/* opt/amc/
-	rm -rf opt/amc/amc
-	rm -f opt/amc/install
-	rm -f opt/amc/bin/uninstall
-	rm -f opt/amc/bin/amc_*.sh
-	rm -f opt/amc/bin/gunicorn
-	rm -rf opt/amc/server/site-packages/
-	rm -rf opt/amc/server/setups/
-
-	insinto /etc/logrotate.d
-	newins opt/amc/config/logrotate amc
-	rm -f opt/amc/config/logrotate
-
-	insinto /etc/cron.daily
-	newins opt/amc/config/logcron amc
-	rm -f opt/amc/config/logcron
-
-	sed -e 's@/tmp/amc.pid@/run/amc.pid@g' -i opt/amc/config/gunicorn_config.py || die
-
-	insinto /etc/amc/config
-	doins -r opt/amc/config/*
-	rm -rf opt/amc/config/
-
-	echo "${PV}" > opt/amc/amc_version
-
-	insinto /opt/amc/
-	doins -r opt/amc/*
-
-	keepdir /var/log/amc
-
-	newinitd "${FILESDIR}"/amc.init amc
-}
diff --git a/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.8.2.ebuild b/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.8.2.ebuild
deleted file mode 100644
index 5e04b68567fe..000000000000
--- a/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.8.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils user
-
-DESCRIPTION="Web UI based monitoring tool for Aerospike Community Edition Server"
-HOMEPAGE="http://www.aerospike.com"
-SRC_URI="http://www.aerospike.com/artifacts/${PN}/${PV}/${P}.all.x86_64.deb"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="app-crypt/gcr
-	dev-python/eventlet
-	dev-python/flask
-	dev-python/greenlet
-	dev-python/setproctitle
-	www-servers/gunicorn"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	default
-	mkdir "${P}"
-	tar -xf data.tar.xz -C "${S}" || die
-	tar -xzf "${S}"/opt/amc.tar.gz -C "${S}"/opt/ || die
-}
-
-src_install() {
-	mv opt/amc/amc/* opt/amc/
-	rm -rf opt/amc/amc
-	rm -f opt/amc/install
-	rm -f opt/amc/bin/uninstall
-	rm -f opt/amc/bin/amc_*.sh
-	rm -f opt/amc/bin/gunicorn
-	rm -rf opt/amc/server/site-packages/
-	rm -rf opt/amc/server/setups/
-
-	insinto /etc/logrotate.d
-	newins opt/amc/config/logrotate amc
-	rm -f opt/amc/config/logrotate
-
-	insinto /etc/cron.daily
-	newins opt/amc/config/logcron amc
-	rm -f opt/amc/config/logcron
-
-	sed -e 's@/tmp/amc.pid@/run/amc.pid@g' -i opt/amc/config/gunicorn_config.py || die
-
-	insinto /etc/amc/config
-	doins -r opt/amc/config/*
-	rm -rf opt/amc/config/
-
-	echo "${PV}" > opt/amc/amc_version
-
-	insinto /opt/amc/
-	doins -r opt/amc/*
-
-	keepdir /var/log/amc
-
-	newinitd "${FILESDIR}"/amc.init amc
-}
diff --git a/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.8.ebuild b/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.8.ebuild
deleted file mode 100644
index 5e04b68567fe..000000000000
--- a/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.8.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils user
-
-DESCRIPTION="Web UI based monitoring tool for Aerospike Community Edition Server"
-HOMEPAGE="http://www.aerospike.com"
-SRC_URI="http://www.aerospike.com/artifacts/${PN}/${PV}/${P}.all.x86_64.deb"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="app-crypt/gcr
-	dev-python/eventlet
-	dev-python/flask
-	dev-python/greenlet
-	dev-python/setproctitle
-	www-servers/gunicorn"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	default
-	mkdir "${P}"
-	tar -xf data.tar.xz -C "${S}" || die
-	tar -xzf "${S}"/opt/amc.tar.gz -C "${S}"/opt/ || die
-}
-
-src_install() {
-	mv opt/amc/amc/* opt/amc/
-	rm -rf opt/amc/amc
-	rm -f opt/amc/install
-	rm -f opt/amc/bin/uninstall
-	rm -f opt/amc/bin/amc_*.sh
-	rm -f opt/amc/bin/gunicorn
-	rm -rf opt/amc/server/site-packages/
-	rm -rf opt/amc/server/setups/
-
-	insinto /etc/logrotate.d
-	newins opt/amc/config/logrotate amc
-	rm -f opt/amc/config/logrotate
-
-	insinto /etc/cron.daily
-	newins opt/amc/config/logcron amc
-	rm -f opt/amc/config/logcron
-
-	sed -e 's@/tmp/amc.pid@/run/amc.pid@g' -i opt/amc/config/gunicorn_config.py || die
-
-	insinto /etc/amc/config
-	doins -r opt/amc/config/*
-	rm -rf opt/amc/config/
-
-	echo "${PV}" > opt/amc/amc_version
-
-	insinto /opt/amc/
-	doins -r opt/amc/*
-
-	keepdir /var/log/amc
-
-	newinitd "${FILESDIR}"/amc.init amc
-}
diff --git a/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.9.ebuild b/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.9.ebuild
deleted file mode 100644
index 5e04b68567fe..000000000000
--- a/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.9.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils user
-
-DESCRIPTION="Web UI based monitoring tool for Aerospike Community Edition Server"
-HOMEPAGE="http://www.aerospike.com"
-SRC_URI="http://www.aerospike.com/artifacts/${PN}/${PV}/${P}.all.x86_64.deb"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="app-crypt/gcr
-	dev-python/eventlet
-	dev-python/flask
-	dev-python/greenlet
-	dev-python/setproctitle
-	www-servers/gunicorn"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	default
-	mkdir "${P}"
-	tar -xf data.tar.xz -C "${S}" || die
-	tar -xzf "${S}"/opt/amc.tar.gz -C "${S}"/opt/ || die
-}
-
-src_install() {
-	mv opt/amc/amc/* opt/amc/
-	rm -rf opt/amc/amc
-	rm -f opt/amc/install
-	rm -f opt/amc/bin/uninstall
-	rm -f opt/amc/bin/amc_*.sh
-	rm -f opt/amc/bin/gunicorn
-	rm -rf opt/amc/server/site-packages/
-	rm -rf opt/amc/server/setups/
-
-	insinto /etc/logrotate.d
-	newins opt/amc/config/logrotate amc
-	rm -f opt/amc/config/logrotate
-
-	insinto /etc/cron.daily
-	newins opt/amc/config/logcron amc
-	rm -f opt/amc/config/logcron
-
-	sed -e 's@/tmp/amc.pid@/run/amc.pid@g' -i opt/amc/config/gunicorn_config.py || die
-
-	insinto /etc/amc/config
-	doins -r opt/amc/config/*
-	rm -rf opt/amc/config/
-
-	echo "${PV}" > opt/amc/amc_version
-
-	insinto /opt/amc/
-	doins -r opt/amc/*
-
-	keepdir /var/log/amc
-
-	newinitd "${FILESDIR}"/amc.init amc
-}
diff --git a/app-admin/aerospike-amc-community/aerospike-amc-community-4.0.19.ebuild b/app-admin/aerospike-amc-community/aerospike-amc-community-4.0.19.ebuild
new file mode 100644
index 000000000000..ee583da80e5f
--- /dev/null
+++ b/app-admin/aerospike-amc-community/aerospike-amc-community-4.0.19.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils user
+
+DESCRIPTION="Web UI based monitoring tool for Aerospike Community Edition Server"
+HOMEPAGE="http://www.aerospike.com"
+SRC_URI="http://www.aerospike.com/download/amc/${PV}/artifact/linux -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+S=$WORKDIR
+
+src_install() {
+	cp -r "$S/"* "$D"
+	rm "${D}/etc/init.d/*"
+	newinitd "${FILESDIR}/amc.init.3" amc
+}
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index e26ec76682d8..a823f4a2ba4d 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -8,6 +8,7 @@ EBUILD ansible-2.4.2.0.ebuild 1447 BLAKE2B fef57c75e03546d508eba962d556823db77a0
 EBUILD ansible-2.4.3.0.ebuild 1406 BLAKE2B f2c87ce03b3c4914087b0401485a07f7b3287ebf62a4d0b7acaa7b9c06bd670c0f91bf2288edbbd45ab577403a1b85de2733c0a3fced85c99720ae8f7848ed46 SHA512 b4d4d40758c6f638f07480af76ff2cdcebe787276c27c23b3e046841ecfaacac83845c14bca352ed603c15a3fff4eb19ae53c990e7fa2662d5b5822890091a1a
 EBUILD ansible-2.4.4.0.ebuild 1408 BLAKE2B acca3919cf1cf8240b4d4cad16ad41b61cf7d6af7c4adefd81c404dc538d1bf75b97dc3e4a87ba38b1e4dd7e3cbf3b319144adad083b1e813492322cc179baae SHA512 cdf8791066fc9b72bf1c1dd3a3595c2901f71e69b24a163f2b6eb100a410d5bfc942a76cf92a5fc2d730eecd57028165eed3c4e3330ac06f1975c7022b6d904b
 EBUILD ansible-2.5.2.ebuild 1406 BLAKE2B f2c87ce03b3c4914087b0401485a07f7b3287ebf62a4d0b7acaa7b9c06bd670c0f91bf2288edbbd45ab577403a1b85de2733c0a3fced85c99720ae8f7848ed46 SHA512 b4d4d40758c6f638f07480af76ff2cdcebe787276c27c23b3e046841ecfaacac83845c14bca352ed603c15a3fff4eb19ae53c990e7fa2662d5b5822890091a1a
+EBUILD ansible-2.5.3-r1.ebuild 1638 BLAKE2B 867eaee65aba92146eab5a003bd77f2e8c07cd14bc757e52886b0934297f5a4af186f5f53012809606bc7e4972d6ec29e57f6e1cbc724eac3e74e2918b39def7 SHA512 60851978084f2d683d5bd4281c34817f643a03fff840de9a942aaa5652bde04e7ab2619334381e4eeccdc4b4e81a36f5ca4beadb9adf3dbbeba21df057280ae6
 EBUILD ansible-2.5.3.ebuild 1408 BLAKE2B acca3919cf1cf8240b4d4cad16ad41b61cf7d6af7c4adefd81c404dc538d1bf75b97dc3e4a87ba38b1e4dd7e3cbf3b319144adad083b1e813492322cc179baae SHA512 cdf8791066fc9b72bf1c1dd3a3595c2901f71e69b24a163f2b6eb100a410d5bfc942a76cf92a5fc2d730eecd57028165eed3c4e3330ac06f1975c7022b6d904b
-EBUILD ansible-9999.ebuild 1476 BLAKE2B 794681453a56d367c67f048b17091b31d7439d710f2ca81da14a1f913257d8b55f0c7f0a090945fc0fbde63ec7ccf2a6e19bf31d9a953305ec4feac1761e8f83 SHA512 662d09bff2f18205c7698d69f9b07eb831a436bc733794b9767eb9ca25f48fcdea7d924d84051c4e033d4a849fff8507be687509a29ed04145f7a10b19a709b5
+EBUILD ansible-9999.ebuild 1664 BLAKE2B 8463e681f2153fab9d62b7f47bae487cb40927af74817f769ebc0c66cf75480de8ad985ea370041531c5c7c221ae3fabe0003d9bb3c4107139697597d1d2e937 SHA512 859021b4e84575812e732c38e6915e6524ca4f6a75b8800e85c77546f82af47760c779821526447264279cf93cede262838a4ccc7aa495d3b1340dc78402a0f8
 MISC metadata.xml 952 BLAKE2B 53640d081ebb558274f8c10095aa6e477820e28a7fdf62c169f5fb3b82153223a7f8ecd1807d14646eae2ec2262b50341919bbb13255293d379ba017b30b20bd SHA512 03b75d65cd0a4b32021b34d9f7ba21b6c4c6893cf185a36dbe6fc10728e0f18c65fc5b6a4c197be8c2b1dadb7243ddce02dbe2f504034a2df1c621f8ba6e26a7
diff --git a/app-admin/ansible/ansible-2.5.3-r1.ebuild b/app-admin/ansible/ansible-2.5.3-r1.ebuild
new file mode 100644
index 000000000000..8f63e8546445
--- /dev/null
+++ b/app-admin/ansible/ansible-2.5.3-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+
+inherit distutils-r1 eutils versionator
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://ansible.com/"
+SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]
+	net-misc/sshpass
+	virtual/ssh
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+# not included in release tarball
+RESTRICT="test"
+
+python_compile_all() {
+	if use doc; then
+		cd docs/docsite || die
+		export CPUS=4
+		emake -f Makefile.sphinx html
+	fi
+}
+
+python_test() {
+	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
+	distutils-r1_python_install_all
+
+	doman docs/man/man1/*.1
+	dodoc -r examples
+}
diff --git a/app-admin/ansible/ansible-9999.ebuild b/app-admin/ansible/ansible-9999.ebuild
index cbb8b3767281..0ca97a267cc6 100644
--- a/app-admin/ansible/ansible-9999.ebuild
+++ b/app-admin/ansible/ansible-9999.ebuild
@@ -15,7 +15,7 @@ EGIT_BRANCH="devel"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
-IUSE="test"
+IUSE="doc test"
 
 RDEPEND="
 	dev-python/paramiko[${PYTHON_USEDEP}]
@@ -32,6 +32,7 @@ RDEPEND="
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	test? (
 		${RDEPEND}
 		dev-python/nose[${PYTHON_USEDEP}]
@@ -42,6 +43,14 @@ DEPEND="
 		dev-vcs/git
 	)"
 
+python_compile_all() {
+	if use doc; then
+		cd docs/docsite || die
+		export CPUS=4
+		emake -f Makefile.sphinx html
+	fi
+}
+
 python_prepare_all() {
 	rm -fv MANIFEST.in || die
 	distutils-r1_python_prepare_all
@@ -51,11 +60,8 @@ python_test() {
 	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
 }
 
-python_compile_all() {
-	emake -j1 docs
-}
-
 python_install_all() {
+	use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
 	distutils-r1_python_install_all
 
 	doman docs/man/man1/*.1
diff --git a/app-admin/eselect/Manifest b/app-admin/eselect/Manifest
index 086022850c9e..f7ca8f147ff9 100644
--- a/app-admin/eselect/Manifest
+++ b/app-admin/eselect/Manifest
@@ -1,6 +1,6 @@
 DIST eselect-1.4.11.tar.xz 177444 BLAKE2B e6f758e2acd17cea3ae37af48e4b4327a9c9d74784aa0723b003f2e1d84ec4c13167de33c311b785fddf7b045b3312955c4d84cf6e35ef7ec9265ef5de503670 SHA512 eec3091c5e386e8b7a52cb263e3c5ce6f41e285d2ae7974f4876e2ffa93b00f9f939055d978c6b9032ee1be2561992015560cdfa93a1ff2b1720ea0100fcf96d
 DIST eselect-1.4.12.tar.xz 177520 BLAKE2B 0938fe9bd8785fe711edc1af63a9c318a4a5fe9141c61d7f1c4da0352242322f1e18e4f68f7e219a1aa2beae5b25ddac58d7c47d4272408fd8fe5207324ef7c7 SHA512 2ea182364dfb2333112e9eebe691e1963e95a4c9ab40945eb2e5bc8c81da76105c1ae6aa3d153b78dea6c1e0cadb9b0237f7556b8ceb9d48e0fba67a642d6081
 EBUILD eselect-1.4.11.ebuild 1634 BLAKE2B e28298f0caa8e8751385c546d23bebbcf6839481a43a3752c5b1e35e7d62822dbf961c58f8c81b5d7eab01cfbb0ddecf88697670c2c6003ab73906078270b3d9 SHA512 22e4238d5ed8f6229236bdcd3cb6186a1fe80bbf5b51a356392d382fbe83839a5287bf212603214dbd2f40e155dc647c3a4fd366676a707339b4550c0223d8a9
-EBUILD eselect-1.4.12.ebuild 1639 BLAKE2B 47aa049e198ebba59dede4aa3561e715479c53d55877adf1edce222413b13aa358b360225fccae1e6a3fff7c8467a0f574eb8711b25139a032020c3fa5ecdf7d SHA512 92cc9af5302ba7bdfec733a832ffc1753c5b013d6eb88a2173ba96c0893bba5f5c974193249063ced055c23b0041d00a2601221c492106f79252f75d294042a0
+EBUILD eselect-1.4.12.ebuild 1637 BLAKE2B 0dfd814784a55aac0aaf5e6c2b67add4efca363d5453a4dc8f6d1a20dfc69a8fe5eb99aea9d500cb63578393e3ce35e535c2c26e4f2cecb3799762668126313e SHA512 5d7182eb5c087d6753a2354a976832f773459b62299a60a47c5c3a2fb36743140f7d88031ff066c24c38d1bd2b9e1c09b5b44348e4048ddfcc120209390c8019
 EBUILD eselect-9999.ebuild 1437 BLAKE2B a390e3198a7f7f52f48ef56bdb73a8075d5c4c1560c0df7971d32798f1296114053b16a8faeee2982b8e106be835e3b61c3655dc2de270b488259f185e8a8980 SHA512 06a5eb4f7bed5a17f9cd56fe497a7cadb7a153580fac6aeefd6f0762ed029c78c79e4f4a50301177eff4e50ac3ac5ddfae342eb0eb4b5c64aa6a840493fa5868
 MISC metadata.xml 272 BLAKE2B 68f9c1edf77cdf1dc46891129ed694307cab4e954c6cb002c3fc32fba216949c83a21dc0618f4bf24fd8e1da5558043709210e6697fda3881adeb69a30eb569f SHA512 55cba722900834986e0ea0c9cd8463c3b69d3ada26227d45c8cc3aa07f6ca40919457f80b03a559a8f9ad55636d931cc2101b928b438aeca19b0531c90ec40a3
diff --git a/app-admin/eselect/eselect-1.4.12.ebuild b/app-admin/eselect/eselect-1.4.12.ebuild
index 460d56ceb510..63d1ee0f08a5 100644
--- a/app-admin/eselect/eselect-1.4.12.ebuild
+++ b/app-admin/eselect/eselect-1.4.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
 
 LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs vim-syntax"
 
 RDEPEND="sys-apps/sed
diff --git a/app-admin/glance/Manifest b/app-admin/glance/Manifest
index fc7222df62e6..71ef5251b6e7 100644
--- a/app-admin/glance/Manifest
+++ b/app-admin/glance/Manifest
@@ -1,10 +1,8 @@
 AUX glance.initd 375 BLAKE2B 3d061f0357b8782e6abb0e2f6c779d8901fc7211238b877f3078cea66bc6086e80a530729b6484f110c02e23375fddde7f0ddfd22a6451ef84d9ec3caaa9d6cc SHA512 c6c433334bb337c708e31fac7869bf29e89516b857800d7cb77d264766483f54976dda6d83460078eed0dee14f0770a31adce344ec7fca04c2040b21dcf239b5
 DIST glance-15.0.1.tar.gz 1815463 BLAKE2B ec6e51340fc4d737e2bd777baf03163a0b515d19c1dc8e5203918e07b304a9539f47ba763207e26def985c6a384d21250ffe1386b433d8b606b55d3d70e4431a SHA512 2da3ada256424a7817d0c49aac0940443cbefcfff3df77a623d7099badf356808b5df59f109ac233f84ac561b7310d3b8d53cafd6c9955a8e2b296a1655cedd3
-DIST glance-16.0.0.tar.gz 1956293 BLAKE2B 457f18412885287d8a3ea1b702af0e7b826eeeaf93ce8b1b7456a42d3a84594cfe270670ac35e9c63d8fbb464a3ed0db823a6949fbfa37f993b260681222d9c1 SHA512 20ff8ba74eee3a5b69f7e357f69870398e96341831bea56bbad61314d3eff9d6767dfd48634d04f96cfbc4cc96c7eff3ab900748461ecaa14e2cf329aec40481
 DIST glance-16.0.1.tar.gz 1957403 BLAKE2B a58a37b1926432ff227ebbd2b8538d25276085c4183244f930cdb6432ce00ed3927130ede24faeb9ebd25489f649c7f6542d71b9fe9614859ed3953bded13ab2 SHA512 dad883c308cfa6799bd5fc4111585af2bd7f2c5a20126976d1044e2bf573f94756f2ecea87f3b04fe611f80602709e0501c0efceed5061d0c752416b6255a2a2
 EBUILD glance-15.0.1.ebuild 5275 BLAKE2B 4f8c013b81327ce5020b5a2ad63b707e79939fe979ff5d7c07fbd95680dee369f2e30402c7303d3e9c521fc92a8093cf5149a7a431c7f50180db41d51a90bbf6 SHA512 9a59f6431a047dbea53eb17c09b3363ca50e8c1e93d4c565d28e96dcebacd00b43f18403753ab28427f87813d1e0f9f4cc57776486bcbae21138313ceed6e554
-EBUILD glance-16.0.0.ebuild 5039 BLAKE2B 309a3153f779e69ed2b207aafae12ed05e88c691ba9625bba5c82968891b050f63b3ea887d832d53c0ba857dfa28d72a06d20d35aad84e99aa6238c8ed48910e SHA512 60ed74da5b4abf1b5dab6b9aee720b9eb6a073f929123318c1fff5288a050ad3d08c367a56ad881f6bea5a55e010c34197c459eff26e11b244c373429dbfa032
-EBUILD glance-16.0.1.ebuild 5041 BLAKE2B 95bf44041a4e387394ffe140a08699aa895dd8b99e1d28ddc1f35700840e530555134885bad23e03771e6ac29ea66471eb4ae38f83d8e7a3b9cdb077b88f3386 SHA512 4408e7cdc946b1f1ac47a259f87ac68ba3d5e1756da49cbc2260f92c7c5e6533b511283b013f0d2585c9ccbbd712fbed03b82689b8410e240eb09c476557b0f7
+EBUILD glance-16.0.1.ebuild 5039 BLAKE2B 309a3153f779e69ed2b207aafae12ed05e88c691ba9625bba5c82968891b050f63b3ea887d832d53c0ba857dfa28d72a06d20d35aad84e99aa6238c8ed48910e SHA512 60ed74da5b4abf1b5dab6b9aee720b9eb6a073f929123318c1fff5288a050ad3d08c367a56ad881f6bea5a55e010c34197c459eff26e11b244c373429dbfa032
 EBUILD glance-2017.2.9999.ebuild 5277 BLAKE2B b6b68c59d4d45ee94c78ffd465c38d3d3f1dce98fc4b71051d23b1858a7cdc199dc1ab64f6153c9f5a75c4263528cf75334f085a1b556a37220619d1d11e6fd2 SHA512 f79d9aaccc149061028bc1a4fa8ba131fcdbe2f7b708da4dc71d91c78bc26e8f2e8102ebd62fd7aafac0f58e73e5aea19b62a00dfdd0af372ebd3d1e980e6147
 EBUILD glance-2018.1.9999.ebuild 5041 BLAKE2B 95bf44041a4e387394ffe140a08699aa895dd8b99e1d28ddc1f35700840e530555134885bad23e03771e6ac29ea66471eb4ae38f83d8e7a3b9cdb077b88f3386 SHA512 4408e7cdc946b1f1ac47a259f87ac68ba3d5e1756da49cbc2260f92c7c5e6533b511283b013f0d2585c9ccbbd712fbed03b82689b8410e240eb09c476557b0f7
 MISC metadata.xml 786 BLAKE2B 2d0d8d4d270200eafcb2570528bfc0fb0f3932295550186f9cf930c05d7ade06faf004d159047fe347716249166cf9f595c2512cea86aa86fc2c604582380106 SHA512 eed1ca2a7e15b1844de0a3a35453ab5890622cf161407df5ccb9d21ab2634691c94237496ddc8ab02881a687e16f8378f37817b20705112e11ee55d2a813f99a
diff --git a/app-admin/glance/glance-16.0.0.ebuild b/app-admin/glance/glance-16.0.0.ebuild
deleted file mode 100644
index 4d76fb8c4b27..000000000000
--- a/app-admin/glance/glance-16.0.0.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-
-inherit distutils-r1 user
-
-DESCRIPTION="Services for discovering, registering, and retrieving VM images"
-HOMEPAGE="https://launchpad.net/glance"
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/openstack/glance.git"
-	EGIT_BRANCH="stable/queens"
-else
-	SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="doc mysql postgres +sqlite +swift"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-
-#note to self, wsgiref is a python builtin, no need to package it
-#>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}]
-
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/defusedxml-0.5.0[${PYTHON_USEDEP}]
-	sqlite? (
-		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
-	)
-	mysql? (
-		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
-		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
-	)
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
-	<dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
-	>=dev-python/python-sqlparse-0.2.2[${PYTHON_USEDEP}]
-	>=dev-python/alembic-0.8.10[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.25.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/futurist-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/taskflow-2.16.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.3.0[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
-	>=dev-python/WSME-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.0[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-16.2.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
-	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
-	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/glance_store-0.22.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.9[${PYTHON_USEDEP}]
-	!~dev-python/cryptography-2.0[${PYTHON_USEDEP}]
-	>=dev-python/cursive-0.2.1[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
-"
-
-#PATCHES=(
-#)
-
-pkg_setup() {
-	enewgroup glance
-	enewuser glance -1 -1 /var/lib/glance glance
-}
-
-python_prepare_all() {
-	sed -i '/xattr/d' test-requirements.txt || die
-	sed -i '/pysendfile/d' test-requirements.txt || die
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && "${PYTHON}" setup.py build_sphinx
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	newinitd "${FILESDIR}/glance.initd" glance-api
-
-	diropts -m 0750 -o glance -g glance
-	dodir /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber
-	keepdir /etc/glance
-	keepdir /var/log/glance
-	keepdir /var/lib/glance/images
-	keepdir /var/lib/glance/scrubber
-
-	insinto /etc/glance
-	insopts -m 0640 -o glance -g glance
-	doins -r etc/*.ini etc/*.conf etc/*.sample etc/*.json etc/meta*
-
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/app-admin/glance/glance-16.0.1.ebuild b/app-admin/glance/glance-16.0.1.ebuild
index a3a068b143c5..4d76fb8c4b27 100644
--- a/app-admin/glance/glance-16.0.1.ebuild
+++ b/app-admin/glance/glance-16.0.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]];then
 	EGIT_BRANCH="stable/queens"
 else
 	SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/app-admin/installer/Manifest b/app-admin/installer/Manifest
index c1c7bfca955e..706920095904 100644
--- a/app-admin/installer/Manifest
+++ b/app-admin/installer/Manifest
@@ -1,3 +1,3 @@
 DIST installer-0.1.1_beta.tar.gz 49946 BLAKE2B 845df010036446e65479affc3d901fe114248130627ce76583c42adc9ecf9c0e2585600106c1559c8d3dac8c086553fed1d48d00002ede9e9be509fc98632662 SHA512 940272cefed17bd6c370fe26b2941da611cbd0aa8fb1c7f51bfaef483c7f9189f10754fb7e3d84dc099ac687f4644e24ae22e7ec09c41f39efba30d5743c9163
-EBUILD installer-0.1.1_beta.ebuild 509 BLAKE2B 71a9b09a2e7a42401ec48bd9db1d8ed097808795f06cd87e90d7dab151d3a5733965a7f41ab84d86ead83a11a541e957d25e77519cb73f57b091f88b7df2821a SHA512 1eb5dbc20898d1392b85aa9f24a68930808a9caa3c7c9df1c6cf0ef8d143e140e3694e35b93c27c18024aaf2d3c1ca75d80b609a32428455e35634761ca7dff4
+EBUILD installer-0.1.1_beta.ebuild 512 BLAKE2B b93b2f2fcd04f5a1780586bd031dafa942093605a531020e29531c81541589ce4f584bdd2ad738e78fd09bc356de295cb3b2fded1b4ade719a430b0e4928d02e SHA512 19698b48f8d34be506c2386473f3b552498ebf8283c6e4b09297612aa952c5c758ac0a4524262bde471ed703a2199be1a1b153e97dce1823a443749df596eb7d
 MISC metadata.xml 650 BLAKE2B 85405d55a8203f929a0a11864b7df6ddb9763160da824a1a1f037c1ea3e52f3a1fd1540316142f47af0ed575f90deab90fc71a90085ac1ba3f571954d079f541 SHA512 d1c0b0a1fe0b4aa0fb00595d7c46c73254ee22bd801b81a9895e176a0577ae64174dd587bacd3ac5ca17fe6c56f771274d508f9249a990608e6b515bc8aabef2
diff --git a/app-admin/installer/installer-0.1.1_beta.ebuild b/app-admin/installer/installer-0.1.1_beta.ebuild
index cf7c24cab885..17bc218aa0e4 100644
--- a/app-admin/installer/installer-0.1.1_beta.ebuild
+++ b/app-admin/installer/installer-0.1.1_beta.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{3_4,3_5} )
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
 PYTHON_REQ_USE="ncurses(+)"
 
 inherit distutils-r1
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/ChrisADR/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 DOCS=( README.md CONTRIBUTING.md )
diff --git a/app-admin/logcheck/Manifest b/app-admin/logcheck/Manifest
index 43b0ee2e2f88..f5fe80dd8ec6 100644
--- a/app-admin/logcheck/Manifest
+++ b/app-admin/logcheck/Manifest
@@ -2,5 +2,5 @@ AUX logcheck.cron 184 BLAKE2B 5b773a77dace97e78efa565d8edf3bd715f564721ba0097e82
 DIST logcheck_1.3.15.tar.gz 162397 BLAKE2B 111e16f482c8610ffc39c518b3fd523abaa9720e7873bcadba58d85bd13bd7a8a9d93881e64f5d8cc5cb30c8254f2216fe97d1b77fe1cf77d5e14859ec701621 SHA512 45c9e779fc1d1f417aea3f02e70eff4dbc7cd0b45e04f7efc458a4552866686cbb095d0b5ebaf32a57d423a3753b4573277a464f5539789350b087569e025abf
 DIST logcheck_1.3.18.tar.xz 131252 BLAKE2B 024259d965c02d5f27a82f1df1e947d48e4b1bad705882243c4b743a1c061012f2437ecab1a97265f5a330fdec2f813a36c078dca282f54fdfaab03833340320 SHA512 3ab75969f732efa123d9df2c8b44557e4a7eddef8332a8357463930714148a13130c763c22e562bd60e106abf5e18cf39b3572e0c048727a117fbc67430b7e3f
 EBUILD logcheck-1.3.15-r2.ebuild 1190 BLAKE2B 6ed4f41e90da2f690b2298c7a6be0205ad590f795a491982a8c8b43f53e7f56d3985f297183f246ed8b7175000c027e448368b7713da7e13b2c6bd79039a94a5 SHA512 0ce8c2c37e1a2bc40bce826709d117562e35232f522dad22291dbfb3007e7d8ae2c92d857c74fc7a32191204998f200dd2122cf817e893a214d7cc32777f7c46
-EBUILD logcheck-1.3.18-r1.ebuild 1368 BLAKE2B 7f7fedc652b010c6c4c0c9b36ac2f25a80147a39f718472d3f6a5598ee6974492ba8ac236d58e3e31d036c4dc56cb313ac39025f0f1c3ef8b93660e6800c3daa SHA512 a4532de06b10fc2d119d279feddfa78b1d912699a96a00c6b73c03f8011806cae7a44fd4e9db0829f7600dc240ddb6190702d496a5107875726292cb9953b0fe
+EBUILD logcheck-1.3.18-r1.ebuild 1367 BLAKE2B 6c022dab7058af3f770491f8d15f3843298df0b92568ae333ecc2dbb9823e8146da791aa1945742cdd4c392f6c176111e18a5d41f406b0e74317f7ce3d7f8e3f SHA512 cd6bda63d7f764c330aaa8c12b1191fe1222bbe8cb2cc6d4420a2037f82a1a8b14bf3f7d53e90e59c79aaf0e8c1508bb745dcf5e5ae3642ea0f24b8b6776847d
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-admin/logcheck/logcheck-1.3.18-r1.ebuild b/app-admin/logcheck/logcheck-1.3.18-r1.ebuild
index 4dab96b452d8..f7f8569bb21a 100644
--- a/app-admin/logcheck/logcheck-1.3.18-r1.ebuild
+++ b/app-admin/logcheck/logcheck-1.3.18-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/l/${PN}/${PN}_${PV}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/app-admin/pass/Manifest b/app-admin/pass/Manifest
index 12d01b509796..3545dc905ae9 100644
--- a/app-admin/pass/Manifest
+++ b/app-admin/pass/Manifest
@@ -1,5 +1,5 @@
 AUX 50pass-gentoo.el 491 BLAKE2B 30c24a820e877e74d4308b42fab036c3c670353af6eb79454c18b471ab62134074765c313be5633e5fc8d1d9105a51d4dc648e3e08f200487ea62e3b9cd4e4a1 SHA512 eaba952f7b080bb44f1a415ee3fa1e71469177a993116b890a0788b177ec70948c1ea6923f17ddddf5f1c01af2fca03e98a71e06a5dff32ff6ebe0b73a79f659
 DIST password-store-1.7.1.tar.xz 62340 BLAKE2B 21e25b2b840a123273f65dd030459e2d9ef6da30fbb56157f54be079b05429392cc6149eb2d5557ccbd883295ff8f249348136b3490690d8dc31299a43880a4e SHA512 2ba2ebc80c90454bbab1da3c43c2cfc87135f838f381e2616eef7c36b0c1de01e491cf587a666bb052d6dfd475fa429bc8fd82b0269325bd2b70afbb897b923e
-EBUILD pass-1.7.1.ebuild 2046 BLAKE2B a4d64d41ef4b07b84e974ad169fa3c61ad6a1e06fc90433f790f72db00e13dcfabd995d6fa6f407156cefdcfed45ca59648f77b4f0e144ac411fb93004ad113c SHA512 b09afa669bb60136edf781b637b01714af9526665afc4d31b999805f4208863304752ad74a30a6d868433a5632d9c837e9ec3e92606535a0133ba2dc8238ec80
+EBUILD pass-1.7.1.ebuild 2056 BLAKE2B 45beac312a1acc149c67dac9801377f6722f5eff67a834e84e1a44fd5c7687a9f0c4f7e69fdca21b9cc070018ff2bf4e7dca1827222ce5261e5ed451c567b531 SHA512 27c994e62a3917be3ab836bff56e380cc3573a87ae62fabd8deba8c7e5b9b195812677799f378ff1290c39ef92e22922082761da59f7f24176fbcd811c73f918
 EBUILD pass-9999.ebuild 1960 BLAKE2B e06b86833158fb55e9656a1bbc2168bbdfb0cc1fa48924437e2a05b81dc79c0f110cc2edf664610b43b29cb67c4563db568bbbf3cb6edd7f135b5db0d027751f SHA512 b170aaa7a41a628684735cd24994f40a95abd8e7c1ffa9bd52d381f4d94be246c7465cb617404eb61bc6221fede56f43dc76f18517329b83d00c0ebff02e4580
 MISC metadata.xml 881 BLAKE2B 59fee6aeadb16d050eeaedc6d5081963e3ffa8316ddd00afb67661d721fa60b80483c16348e0c3d6c20fdb6513fd5840552c3a95724b619e07122d8755c4e7c1 SHA512 49df1e24751818d46a0c23fcdc9e41d965dca29f9964f7d142e4dba9b076b472c860d9b3eafc15b04a983f49d2cd78eb6b529742469549209c7e4160a15f1323
diff --git a/app-admin/pass/pass-1.7.1.ebuild b/app-admin/pass/pass-1.7.1.ebuild
index 710fc5a1d86d..477672132803 100644
--- a/app-admin/pass/pass-1.7.1.ebuild
+++ b/app-admin/pass/pass-1.7.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit bash-completion-r1 elisp-common
 
@@ -30,6 +30,8 @@ RDEPEND="
 S="${WORKDIR}/password-store-${PV}"
 
 src_prepare() {
+	default
+
 	use elibc_Darwin || return
 	# use coreutils'
 	sed -i -e 's/openssl base64/base64/g' src/platform/darwin.sh || die
diff --git a/app-admin/puppet-lint/Manifest b/app-admin/puppet-lint/Manifest
index c3b888c7b36a..a87d499962db 100644
--- a/app-admin/puppet-lint/Manifest
+++ b/app-admin/puppet-lint/Manifest
@@ -1,5 +1,5 @@
 DIST puppet-lint-2.3.3.gem 84992 BLAKE2B 57b6d6332b7d26daf193ba983ff1e5d560cf4f902f1b476de3b1f7254755851397685d7b435dd7365f81e1427d91ca47ffa889a9d87a14e1c4720e44aa2b7996 SHA512 9203e8d29cb4a5c5abf8279598599db4a9063d33d7b7d6c76f8ebf09c3ba539f6035083b5438bae2b0fda1d16880ffcb69a2776ebce7f54bc1a1430c2ceb0d68
 DIST puppet-lint-2.3.5.gem 86528 BLAKE2B 7455c729cb0512cb26838439c854c70d2581f2102594ac60d76a34f9839b0bb7dbab65beb87369419dc0e66583bfac1ad9f22d65ee3ee9bf35aa3c37e8f0d1b9 SHA512 5e1978c5438869c12c2151e76fe6cea12c447d9f59f1fbbc90fb80e61c7ff9c220be85f70cf95dec2380cd35205ffec0473cc7eda0db21b94a30b533d4214707
 EBUILD puppet-lint-2.3.3.ebuild 620 BLAKE2B 8f3a4952c092b4ed4bc1a0fdb400a170faf7aa5f3dcb6a94a38a36dfd3c493c6f8c5fc2bfbc2f15dedf84fab404bcfa70124b7cefb68c845aea2cf222153e180 SHA512 a4cb6b8dedfc02d929c7b78bbba4eab2099cf5b3d81628f994c1e5389c76ac52171e376aa9bd470facd5d26b82f4d41cbd7c04d81af0c393bd1fa543f07dc736
-EBUILD puppet-lint-2.3.5.ebuild 620 BLAKE2B 8f3a4952c092b4ed4bc1a0fdb400a170faf7aa5f3dcb6a94a38a36dfd3c493c6f8c5fc2bfbc2f15dedf84fab404bcfa70124b7cefb68c845aea2cf222153e180 SHA512 a4cb6b8dedfc02d929c7b78bbba4eab2099cf5b3d81628f994c1e5389c76ac52171e376aa9bd470facd5d26b82f4d41cbd7c04d81af0c393bd1fa543f07dc736
+EBUILD puppet-lint-2.3.5.ebuild 620 BLAKE2B 399b76cf047bc8fb99c005d1be3835ad189365d72da45d27bd8ebe47ee4022d7aa9b0f2ac31948214dedf1cf608971716bcf0425a593801a2538bc196fc5304b SHA512 57c3880b02b0febe9c94da09e7e7710730e75f4fb4b92e674c86dbcb5bd0b1864d7df79f032b634063b94fdf46a28d79d9b556c2605731cb91f0ca9571c078b2
 MISC metadata.xml 453 BLAKE2B 4fb00983f98c8c178fa1dc667f966b0f1fd54861ef71e37211fb46edceb8f91c15d55add637a50eda53ccaff8a1d3a6dcbdd02afe2ae32cf0f69797427897d6a SHA512 bd9238c56ddcdcb124df5d7530343756b865d2f279b719fb0ce7bf4e37565709194cb7f564811be6376fd4d3b61403d76eb9542aac3a267c2eb08f1bade21524
diff --git a/app-admin/puppet-lint/puppet-lint-2.3.5.ebuild b/app-admin/puppet-lint/puppet-lint-2.3.5.ebuild
index e672004b0fd5..c86bd234ccc4 100644
--- a/app-admin/puppet-lint/puppet-lint-2.3.5.ebuild
+++ b/app-admin/puppet-lint/puppet-lint-2.3.5.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest
index dc0cb1342843..bb2aa3175b90 100644
--- a/app-admin/setools/Manifest
+++ b/app-admin/setools/Manifest
@@ -2,12 +2,7 @@ AUX setools-3.3.8-no-check-file.patch 558 BLAKE2B 2f1fd260f579e39307ea84e857b6a7
 AUX setools-3.3.8-policy-max.patch 1051 BLAKE2B 4311df1a6918dc4cf1e339702cc8b5c337fa440495282d5b1d9c7a151f5e0998097716dbe77c91c84bdf76f4057ad73e6026cebf665addef2117a7700d57c1e1 SHA512 9eacd76d450b6e68d85f14c4d38cb9370a7cd435610c209d83063b3ddc7bb45f8bd75b1aa8573991e021d4af4205646465b3c2b19ac89296bb7e43147eb0775b
 AUX setools-4.0.1-remove-gui.patch 1031 BLAKE2B 4eea567961c1a180b85dfecd00f174be5440d61e587fa2e8220819d91e930d344508f1cdba68e4685e65332e351831808b70d6d19f2bfec04364056cd5ef2c55 SHA512 982c0cd43bdf9473df5dd9584d199bbf1bc71bfee284a2f4e7e800c877bb62bbb6aca03ae3099e481c0538bf3f12d425ca23e19763b1b58c647e9749925283ef
 AUX setools-4.1.1-remove-gui.patch 890 BLAKE2B 70c7a7fb4b6bb31d8735d4b938ff848000c3181e590e557413011ebd5db650f79dfad270f6506128ef9971975ec2b26323b18f793bb914759449679bc34f388c SHA512 c30d7fa3624164d3ec5574b1ae36cc896fb5132ed875f232e9e84cf080e7081dadce61f6d88b55aefa45e417a081622acf7aa2d9f10406d23be7646905dfb3e6
-DIST setools-3.3.8-04-gentoo-patches.tar.bz2 94986 BLAKE2B e502d44d277572be660871794afb0a58655e65d445e3c6d5f06ff5cadf4be29b95a0c19e5faa21f46919da99b4efecf1404ac91f3d6671165ad5426858d1aaac SHA512 39bf00b6aaf31821c6e2e2fb4c460dd1914fba4bf8385acebedf88f1533da990f1fb925dd49d75827aebef3f394a50a1edea46a07204193b58c65a066a064e6a
-DIST setools-3.3.8.tar.bz2 951428 BLAKE2B b3d78bd4e40d6d695dfbf670ff952ecdec2c9654ade3b0bba99b5afe240456d846782c001f63cc31ea93c72b3a7a632949da6fc86632ae7d217987e1d353eb38 SHA512 2c42ee9904174ed6c6fc129e374ec3591925094ab0ef65001b0104e365c5634bf4a79f28369608c80199d8f59fafaa5f274107c04c129c380eeef7adb0c32667
-DIST setools-4.0.1.tar.gz 399888 BLAKE2B 688a5ed18b197391b43a89375818b50b47dda5834a81a8c4b05d0f3c4a9c232ae9663c8135e46b8ce038df0c14b2e9eb93068333dce177b952741249e84d45d2 SHA512 d0a36cfddc6a6f47ecaa8402141271558e97467b6c449d18b98bf6fe894189f29a32fb672e3ff573efdb44964bd361283c68c2906d02f8a9c1269b6b71903bc2
 DIST setools-4.1.1.tar.gz 461649 BLAKE2B a753718aa6a5de889ba7a2eea921340061edf1bcb0b572a365e858949a92d2f8a92a876be2e4bc539d85fa6029511ab6afabfbe8138cdb5a73b587a9b58551bb SHA512 2e55a3b07e2f94d7c84054f31d266567b9acc708fe2b0e16ac3ea24e8301c712bcf564ff915a6135a1a6ba6822682bb3a6530dae20161a832fb7048364acbd04
-EBUILD setools-3.3.8-r7.ebuild 3686 BLAKE2B 440799c9f4d5a944adb5bbe4f6826c1445835db6a6c0ff3a3278f516fc67b4aac83f535dbb4b306524766f947dd40dcb4ff9edd2b24ffae13a85e92c62eaca9e SHA512 984ceb81a0fd293e16097cbbf8aba94ad2418095cd21de4ac322c02ea77d1a64cce97ddceaa8495b1f6a02fe927511532d54572a8c88888014796529ade6126c
-EBUILD setools-4.0.1.ebuild 1245 BLAKE2B 93963b8a7f7a82c105d52e23645f6b81097df55095141b72d0216a66333a90cce40b0afac652bc243d98b872301a1c5fcbcd474dcf6e9fa81ed753d12c682853 SHA512 1803bfdb18d0fb1278c24ed5272bbb55327381debc023fce62f9897c1d863a8afe4d509c0514bd24f52ac77ba7d64702ee6bce4ed33467bf0bf72a3ba778efb3
-EBUILD setools-4.1.1.ebuild 1349 BLAKE2B 972acc7929aa60c4373c72129ae53a0762a46664aa66c40af20489e35178507eabf64ad99dba305391380d7fe543151bc40d5a983816e2676f372cbdc9aa2e00 SHA512 8baa0cbe696c1ec8ba3ab885316423106945746629c0f18a23e8e44ca5d60793dd9ddf562ca7e1dfdf8c6a5f5289444c8eae10dccff601cd0d75b011da5a71a4
+EBUILD setools-4.1.1.ebuild 1500 BLAKE2B 53b4c6594e89582af55e7e29894b413c44a7dad7702931175155dd5e20f77d75519617ca2e3ada157aadc35a19e54cb7c3d81d7e7e6ee490d0351f2aac552ed2 SHA512 2d0b9aa87f79464e348981673d2a5bc6ac8ab2b7853496bfd7b03c0ab67a1cda77f1cad1c0d80e86097634f38192897f075eb35ea94712e6f316667f4dfabd28
 EBUILD setools-9999.ebuild 1344 BLAKE2B 1ece52a683c8d99a436655acd639ac78f81e7ecc7a08730ea87bd8dcea8379738d9fe4ae1926ffefb8726f2d080ee40135f5c649fe8e8a4a911990dc1a7694d1 SHA512 c7507642de4d6a100982d6da702a47fc6a47ca9f106b248aac8c158be0fc77d1a9d4af8727f531e80570710f94260a68702f8a4892970b4b76a97ba9bc40fb81
 MISC metadata.xml 403 BLAKE2B 954bfb344e48933f43c746ed626da3851b9e887b9d1c68541fa97356992c2e80f0626198d2170b431d32489347bb6e5ee46d2577a5d672940892ec5d5fd87e4e SHA512 be645abfaf1149e2f2a9b7f0613b61f015df81a16bc6dde593513aa2ba7b4a9a8fba65520b53a2511ba65c022258f48bcd2aed3f85c273a35c94359e358a8fa6
diff --git a/app-admin/setools/setools-3.3.8-r7.ebuild b/app-admin/setools/setools-3.3.8-r7.ebuild
deleted file mode 100644
index 3240c25b84d5..000000000000
--- a/app-admin/setools/setools-3.3.8-r7.ebuild
+++ /dev/null
@@ -1,141 +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 )
-
-inherit autotools java-pkg-opt-2 python-r1 eutils toolchain-funcs
-
-DESCRIPTION="SELinux policy tools"
-HOMEPAGE="https://github.com/TresysTechnology/setools/wiki"
-SRC_URI="http://oss.tresys.com/projects/setools/chrome/site/dists/${P}/${P}.tar.bz2
-	https://dev.gentoo.org/~perfinion/patches/setools/${P}-04-gentoo-patches.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
-IUSE="X debug java python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMONDEPEND=">=sys-libs/libsepol-2.4
-	>=sys-libs/libselinux-2.4
-	>=dev-db/sqlite-3.2:3
-	dev-libs/libxml2:2
-	python? ( ${PYTHON_DEPS} )
-	X? (
-		>=dev-lang/tk-8.4.9:0=
-		>=gnome-base/libglade-2.0
-		>=x11-libs/gtk+-2.8:2
-	)"
-
-DEPEND="${COMMONDEPEND}
-	>=sys-devel/automake-1.12.1
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	java? ( dev-lang/swig
-	        virtual/jdk:= )
-	python? ( dev-lang/swig )"
-
-RDEPEND="${COMMONDEPEND}
-	java? ( >=virtual/jre-1.4:= )
-	X? ( >=dev-tcltk/bwidget-1.8 )"
-
-RESTRICT="test"
-# setools dirs that contain python code to build
-PYTHON_DIRS="libapol/swig/python libpoldiff/swig/python libqpol/swig/python libseaudit/swig/python libsefs/swig/python python"
-
-pkg_setup() {
-	if use java; then
-		java-pkg-opt-2_pkg_setup
-	fi
-}
-
-src_prepare() {
-	EPATCH_MULTI_MSG="Applying various (Gentoo) setool fixes... " \
-	EPATCH_SUFFIX="patch" \
-	EPATCH_SOURCE="${WORKDIR}/gentoo-patches" \
-	EPATCH_FORCE="yes" \
-	epatch
-
-	epatch "${FILESDIR}"/${PN}-3.3.8-no-check-file.patch
-	epatch "${FILESDIR}"/${PN}-3.3.8-policy-max.patch
-
-	# Fix build failure due to double __init__.py installation
-	sed -e "s/^wrappedpy_DATA = qpol.py \$(pkgpython_PYTHON)/wrappedpy_DATA = qpol.py/" -i libqpol/swig/python/Makefile.am || die
-	# Disable broken check for SWIG version. Bug #542032
-	sed -e "s/AC_PROG_SWIG(2.0.0)/AC_PROG_SWIG/" -i configure.ac || die "sed failed"
-
-	local dir
-	for dir in ${PYTHON_DIRS}; do
-		# Python bindings are built/installed manually.
-		sed -e "s/MAYBE_PYSWIG = python/MAYBE_PYSWIG =/" -i ${dir%python}Makefile.am || die "sed failed"
-		# Make PYTHON_LDFLAGS replaceable during running `make`.
-		sed -e "/^AM_LDFLAGS =/s/@PYTHON_LDFLAGS@/\$(PYTHON_LDFLAGS)/" -i ${dir}/Makefile.am || die "sed failed"
-	done
-
-	epatch_user
-
-	eautoreconf
-
-	# Disable byte-compilation of Python modules.
-	echo '#!/bin/sh' > py-compile
-}
-
-src_configure() {
-	tc-ld-disable-gold #467136
-	econf \
-		--with-java-prefix=${JAVA_HOME} \
-		--disable-selinux-check \
-		--disable-bwidget-check \
-		$(use_enable python swig-python) \
-		$(use_enable java swig-java) \
-		$(use_enable X swig-tcl) \
-		$(use_enable X gui) \
-		$(use_enable debug)
-
-	# work around swig c99 issues.  it does not require
-	# c99 anyway.
-	sed -i -e 's/-std=gnu99//' "${S}/libseaudit/swig/python/Makefile"
-}
-
-src_compile() {
-	emake
-
-	if use python; then
-		building() {
-			python_export PYTHON_INCLUDEDIR
-			python_export PYTHON_SITEDIR
-			python_export PYTHON_LIBS
-			emake \
-				SWIG_PYTHON_CPPFLAGS="-I${PYTHON_INCLUDEDIR}" \
-				PYTHON_LDFLAGS="${PYTHON_LIBS}" \
-				pyexecdir="${PYTHON_SITEDIR}" \
-				pythondir="${PYTHON_SITEDIR}" \
-				-C "$1"
-		}
-		local dir
-		for dir in ${PYTHON_DIRS}; do
-			python_foreach_impl building ${dir}
-		done
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	if use python; then
-		installation() {
-			python_export PYTHON_SITEDIR
-			emake DESTDIR="${D}" \
-				pyexecdir="${PYTHON_SITEDIR}" \
-				pythondir="${PYTHON_SITEDIR}" \
-				-C "$1" install
-		}
-
-		local dir
-		for dir in ${PYTHON_DIRS}; do
-			python_foreach_impl installation "${dir}"
-		done
-	fi
-}
diff --git a/app-admin/setools/setools-4.0.1.ebuild b/app-admin/setools/setools-4.0.1.ebuild
deleted file mode 100644
index 4f9175aaf823..000000000000
--- a/app-admin/setools/setools-4.0.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="Policy Analysis Tools for SELinux"
-HOMEPAGE="https://github.com/TresysTechnology/setools/wiki"
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/TresysTechnology/setools.git"
-else
-	SRC_URI="https://github.com/TresysTechnology/setools/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 ~mips x86"
-fi
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-IUSE="X debug test"
-
-RDEPEND="${PYTHON_DEPS}
-	>=sys-libs/libselinux-2.4:=[${PYTHON_USEDEP}]
-	>=dev-python/networkx-1.8[${PYTHON_USEDEP}]
-	app-arch/bzip2:=
-	dev-libs/libpcre:=
-	X? (
-	    dev-python/PyQt5
-	)"
-
-DEPEND="${RDEPEND}
-	>=dev-lang/swig-2.0.12:0
-	sys-devel/bison
-	sys-devel/flex
-	>=sys-libs/libsepol-2.5
-	test? (
-		python_targets_python2_7? ( dev-python/mock[${PYTHON_USEDEP}] )
-		dev-python/tox[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	sed -i "s/'-Werror', //" "${S}"/setup.py || die "failed to remove Werror"
-
-	use X || local PATCHES=( "${FILESDIR}"/setools-4.0.1-remove-gui.patch )
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/app-admin/setools/setools-4.1.1.ebuild b/app-admin/setools/setools-4.1.1.ebuild
index 03451253583d..5142d939a869 100644
--- a/app-admin/setools/setools-4.1.1.ebuild
+++ b/app-admin/setools/setools-4.1.1.ebuild
@@ -44,6 +44,8 @@ DEPEND="${RDEPEND}
 
 python_prepare_all() {
 	sed -i "s/'-Werror', //" "${S}"/setup.py || die "failed to remove Werror"
+	sed -i "s@^base_lib_dirs = .*@base_lib_dirs = ['${ROOT:-/}usr/lib','${ROOT:-/}usr/lib64']@g" "${S}"/setup.py || \
+		die "failed to set base_lib_dirs"
 
 	use X || local PATCHES=( "${FILESDIR}"/setools-4.1.1-remove-gui.patch )
 	distutils-r1_python_prepare_all
diff --git a/app-admin/supervisor/Manifest b/app-admin/supervisor/Manifest
index 9063afcddea8..dac1e19c4be2 100644
--- a/app-admin/supervisor/Manifest
+++ b/app-admin/supervisor/Manifest
@@ -1,8 +1,14 @@
 AUX conf.d 85 BLAKE2B 09d98219fcb93738cfb22e25b914011235684b0e5f1154512a14ca7c2c70ffd515d800be9b7820be75e574b0d9d4c5ad7ec95bff981595650fb5414062de4756 SHA512 73a831b1d5b30686fa8120cbb3317ca2291da72f8217e1402791eee1dee7d232b26b9146e8eee5ce75c69a4c1c7993bb29eeb5de758cf731f1c093ecb340fcc2
+AUX conf.d-r1 182 BLAKE2B eae951b6dc0252ee7b13988d65addb667d24dc452a2c50644a7857362a2ba42c85c2fc9d35cb44dc6d8f3d4f2fdcd75e4621f7b58d42e887e7175d15f7c5828f SHA512 30334b022c6473cb5594be8a241571d080b60b1c4fee5d2fe2d04533b75543ebe2e43a5be1e282a1960eb6edc106585edbcdf43c18ba6e476b8374876cfec2cb
 AUX init.d 630 BLAKE2B 541cb9bb68547f093a68586504129823c7c1b519960f50284f45c395bc6bd964c1caa37daecfb58f8f8aeffea598eefecf517c71e929771a0b58f9a38e7f9493 SHA512 95f7320dc8c4de958f9b61c0d39f9fe27ee8916a23dfc2ea9af0ad46b76302e93232dc4c418739769a5c34b204e8c6cd3bad8a4dd85fc2fd854e62e99b571fc2
 AUX init.d-r1 452 BLAKE2B 5d1b15d6d4a39ebb586ffdccd138bd1f2f3681798c3ff3e1465654967a87e96a922cfc6b1aca193173ce6f06714b4f4f8216c81acf02dc77cb65476101a216c9 SHA512 8490213db35c47d31ae901401673ad7ffb6a15e32abc54ac8d3ac50fe59261a0767dbd706015edfef4dfd83c9ecd2c7c9201c9cb4a04d0b2f5634280c5883959
+AUX init.d-r2 553 BLAKE2B 270ff81ca5bac99f22b49bf47ec64d73b4328804ea264e99301de3d563d2479a3640a0f5e35b2553d679e97a85480d273db170b741638b0a90929fccb490deb2 SHA512 d8d7d6165445fb4bef75454dd2b03c866fb4942c19d6ae4a8b36a900bdd9ee3a55cade02304d49d6e0095df885a1a4fa52694012a7d85d67cc1b181aaf69d8cc
+AUX supervisord.conf 2525 BLAKE2B d36d6ef6b952a99ccfd61976c21eb54922555db4802288d9364f02331da5e693bce3862869248f7c0b81285576ca633e679a26acf75f03b2e620e16eea963909 SHA512 1ce55ef1f9a4cd7592645007af5e0f18147e8dca1c324ac2e48bf58aa2191ec657cfa68d7e6bdc9ba8e0747b32f4e6a44009e8c55a7bd77b265ac8593f51eeb7
+AUX supervisord.service 404 BLAKE2B 87c99a2b388befb04f1d8e3442a5c0b6d802837047c45da2bb7017631bf4af4b858bc4d7964f1d64937e331728884bc21e62e9d01b11cca46aaea389372c6bad SHA512 0fe777d1f0bf70dc9b49132102ac90083261321850f80e9e323459c894c55f722ab8470eba3ba7bb35a9d69ad411a3247546066d6cba5801c9b289350ea4bed5
 DIST supervisor-3.1.4.tar.gz 392321 BLAKE2B 316789fae200f02242a90d3a22a3c6486576f74dbab81b95efc72768a89c54999a370625f9589afe1edff08351840fbe27a7ef8674e6f1e3bbdd4237f3227df6 SHA512 7182db4169d37aa8f7a2a4e1d57ce40f6dea21759ed73fb49286dd5ffb2bdede0fccdc71344e93c8f8c067a2cbc4e3cb0a9a50b22bacdb1b8bc1378581ed5f07
 DIST supervisor-3.3.3.tar.gz 418354 BLAKE2B 50ce29cdad6c4d8c1a041de74d970ef57031c8b3b77180f8b837e402773ac912d384397e650b94eaeaf1db2d9a6bbb21f19247454262e96ea0f1b733226701a2 SHA512 8285445da8a0ed790fbdf75d988304ab8fcefd9c36975ae6526ec58f511c73cd8707f22b7cff40c3aed5e63f3665d096ed4b5dbc2cc456fe0c5b4547149dbb4a
+DIST supervisor-3.3.4.tar.gz 419794 BLAKE2B b916c22f3ec1cc180d495f08dac1a66cfd5a93c060906c015a85b2bf64733b4ed298b67050db1332639902a1c6601118a5c05e01c54ed4fc32910d1c24431131 SHA512 fab141b52a548a3efd26f175798b1b8fbb46ce465aa48c3281cb80584b829ecef90ae1355e4106632d13c84363ae03f081d69fb4148303ff387ab7d4e778d21a
 EBUILD supervisor-3.1.4.ebuild 1190 BLAKE2B 914c69c7e7d8146273fa3b2dc9445a5fee5f7d52692884a208d1b4cd3b3ac11d902823ebf1f33e2d82aaa0bdf316de85b12d04917cd115d800516733b20fc445 SHA512 be9e9ece37f97cc515679f06ca358e3af4b06039ee9009be02e28c6acecbd157fde107622201e6cea2a5c00221a6ffb078a98611662ab002edc08e3ade26c983
 EBUILD supervisor-3.3.3.ebuild 1075 BLAKE2B 53cf037167e7706893bf8dc22eab6f32d70573576745b71da1913958d169ddb936f4ef46abf0095c327c9174254124414d200449792e6aa208881d9d16ee8960 SHA512 920938eebe8368c84a564cb556c137caddd0342f2eb2c293e7a1d64e8283add801530c605d61391b11af9ada569a7a5a55170285837fee70d1497487e09b41f4
+EBUILD supervisor-3.3.4.ebuild 1962 BLAKE2B b9d1166a42facd65d57fe1eb72e261d394d51de3a1df394a877197165357959282f4094ea21255729f15d8438aeca4123e126e76ca0aa3bd75c0ab7e1068165f SHA512 1a808d9979563f2ea818ab577c43a7ed39489cc33403d6ad2650299b78224269c03245e7ebf05d9b0cd54b32efa56edc39a4af017b2798a4cae362abb796023f
 MISC metadata.xml 747 BLAKE2B 7457a1fcfee7f890a2e1ddc071f8c428884d9882401bcc43067954f50890016492da9935fdf89588c9ad1f4cd9ad114be06081af25582538c39393c36f777a2a SHA512 420e1cc33360e66c4d45c4ed7bd535615669b073bd7f5f7e5fd2c21f561b6246e19fe01bdc93809068f923f2025a5ef9fbfb133da6b451af7780dc514586037b
diff --git a/app-admin/supervisor/files/conf.d-r1 b/app-admin/supervisor/files/conf.d-r1
new file mode 100644
index 000000000000..7a80c826ef51
--- /dev/null
+++ b/app-admin/supervisor/files/conf.d-r1
@@ -0,0 +1,7 @@
+# /etc/conf.d/supervisord
+
+# Configuration file (default: /etc/supervisord.conf)
+#SUPD_CONFIG_FILE="/etc/supervisord.conf"
+
+# Options to pass to the supervisord process
+SUPD_OPTS=""
diff --git a/app-admin/supervisor/files/init.d-r2 b/app-admin/supervisor/files/init.d-r2
new file mode 100644
index 000000000000..c5723b36f013
--- /dev/null
+++ b/app-admin/supervisor/files/init.d-r2
@@ -0,0 +1,15 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="client/server system that allows its users to monitor and control a number of processes on UNIX-like operating systems"
+
+SUPD_CONFIG_FILE="${SUPD_CONFIG_FILE:-/etc/supervisord.conf}"
+
+command="/usr/bin/supervisord"
+pidfile="/run/supervisord.pid"
+command_args="--nodaemon --pidfile ${pidfile} --configuration \
+  \"${SUPD_CONFIG_FILE}\" ${SUPD_OPTS}"
+command_background="yes"
+
+required_files="${SUPD_CONFIG_FILE}"
diff --git a/app-admin/supervisor/files/supervisord.conf b/app-admin/supervisor/files/supervisord.conf
new file mode 100644
index 000000000000..91d6be018123
--- /dev/null
+++ b/app-admin/supervisor/files/supervisord.conf
@@ -0,0 +1,69 @@
+; Supervisor configuration file based on supervisor/skel/sample.conf
+; vim: set ft=dosini:
+
+; The below section contains configuration parameters for an HTTP server
+; that listens on a UNIX domain socket. If the configuration file has no
+; [unix_http_server] section, a UNIX domain socket HTTP server will not
+; be started.
+[unix_http_server]
+; the path to the socket file (with which supervisorctl can communicate)
+file=/run/supervisord.sock
+; socket file mode (default 0700)
+chmod=0770
+; socket file uid:gid owner
+chown=root:supervisor
+; default is no username (open server)
+;username=user
+; default is no password (open server)
+;password=123
+
+; The below section contains global settings
+; related to the supervisord process.
+[supervisord]
+; main log file; default $CWD/supervisord.log
+logfile=/var/log/supervisor/supervisord.log
+; 'AUTO' child log dir, default $TEMP
+childlogdir=/var/log/supervisor
+; max main logfile bytes before rotation; default 50MB
+logfile_maxbytes=50MB
+; number of main logfile backups; 0 means none, default 10
+logfile_backups=10
+; log level; default info; others: debug, warn, trace
+loglevel=info
+; minimum available startup file descriptors; default 1024
+minfds=1024
+; minimum available process descriptors; default 200
+minprocs=200
+; default is current user, must be explicitely set if running as root
+user=root
+; process file creation umask; default 022
+;umask=022
+; supervisord identifier, default is 'supervisor'
+;identifier=supervisor
+; default is not to cd during start
+;directory=/tmp
+; don't clean up tempfiles at start; default false
+;nocleanup=true
+; key value pairs to add to environment
+;environment=KEY="value"
+; strip ANSI escape codes in logs; default false
+;strip_ansi=false
+
+; The below section must remain in the config file for RPC
+; (supervisorctl/web interface) to work, additional interfaces may be
+; added by defining them in separate rpcinterface: sections
+[rpcinterface:supervisor]
+supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
+
+; The below section contains settings for
+; the supervisorctl interactive shell program.
+[supervisorctl]
+serverurl=unix:///run/supervisord.sock ; use a unix:// URL for a unix socket
+
+; The below section can just contain the "files" setting. This
+; setting can list multiple files (separated by whitespace or
+; newlines). It can also contain wildcards. The filenames are
+; interpreted as relative to this file. Included files *cannot*
+; include files themselves.
+[include]
+files = /etc/supervisord.d/*.conf
diff --git a/app-admin/supervisor/files/supervisord.service b/app-admin/supervisor/files/supervisord.service
new file mode 100644
index 000000000000..4ccd1ca5fcc0
--- /dev/null
+++ b/app-admin/supervisor/files/supervisord.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=Supervisor process control system for UNIX
+Documentation=http://supervisord.org
+After=network.target
+
+[Service]
+ExecStart=/usr/bin/supervisord -n -c /etc/supervisord.conf
+ExecStop=/usr/bin/supervisorctl $OPTIONS shutdown
+ExecReload=/usr/bin/supervisorctl -c /etc/supervisord.conf $OPTIONS reload
+KillMode=process
+Restart=on-failure
+RestartSec=50s
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-admin/supervisor/supervisor-3.3.4.ebuild b/app-admin/supervisor/supervisor-3.3.4.ebuild
new file mode 100644
index 000000000000..1b78252cdb4d
--- /dev/null
+++ b/app-admin/supervisor/supervisor-3.3.4.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )	# py2 only
+# xml.etree.ElementTree module required.
+PYTHON_REQ_USE="xml"
+
+inherit distutils-r1 systemd user
+
+MY_PV="${PV/_beta/b}"
+
+DESCRIPTION="A system for controlling process state under UNIX"
+HOMEPAGE="http://supervisord.org/ https://pypi.org/project/supervisor/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${PN}-${MY_PV}.tar.gz"
+
+LICENSE="repoze ZPL BSD HPND GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/meld3[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+python_prepare_all() {
+	# https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages
+	sed -i '/namespace_packages=/d' setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html
+		HTML_DOCS=( docs/.build/html/. )
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	newinitd "${FILESDIR}/init.d-r2" supervisord
+	newconfd "${FILESDIR}/conf.d-r1" supervisord
+	dodoc supervisor/skel/sample.conf
+	keepdir /etc/supervisord.d
+	insinto /etc
+	doins "${FILESDIR}/supervisord.conf"
+	keepdir /var/log/supervisor
+	systemd_dounit "${FILESDIR}/supervisord.service"
+}
+
+pkg_preinst() {
+	enewgroup supervisor
+	fowners :supervisor /var/log/supervisor
+	fperms 750 /var/log/supervisor
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+		elog "You may install your configuration files in ${EROOT%/}/etc/supervisord.d"
+		elog "For config examples, see ${EROOT%/}/usr/share/doc/${PF}/sample.conf.bz2"
+		elog ""
+		elog "By default, only members of the supervisor group can run supervisorctl."
+	fi
+}
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index b76dd696664d..3daec37c8f56 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/advancecomp/Manifest b/app-arch/advancecomp/Manifest
index 3cb756822c97..e4e1af069326 100644
--- a/app-arch/advancecomp/Manifest
+++ b/app-arch/advancecomp/Manifest
@@ -4,5 +4,5 @@ DIST advancecomp-1.23.tar.gz 1288937 BLAKE2B 48044f8e896e29ec41518f50daee50bd10e
 DIST advancecomp-2.0.tar.gz 1292164 BLAKE2B 16f24820ac8f6de517edc91237b743935673894fd784271ab7ef7c1b5e7ff11fb4087dffa4e99b0b5b5ef550514f7267962cfcc7dde2976db69a28c68398c8ac SHA512 e324cdf1687d3a92d3416d07269b3d03087ccece9cf636cd4cd0075fbededcd27da5c84a2d77cc1265800f252fcd75a841459fcc55dd9d5eee3ea3fa48d9f906
 EBUILD advancecomp-1.15.ebuild 919 BLAKE2B 765d9dc15ce846b70c0d29548b65343f8a47ebe8757e1881b38dba191aa1afeaaf7f1b975147e086712a5290031fda36b8400ac793dbec942a4aba1948c32060 SHA512 a4ef58fbf394c95cd311a27195480b7f054c46c8890ae7ecd3527969ebe8a060ef2081c1820ce8761796c9768e76d741ff3783aa98032b6587c98c51b2a382e1
 EBUILD advancecomp-1.23.ebuild 916 BLAKE2B 203186b5cfad20b2df8ea1ae4608b7b2290f3a6d2868581a6b3c373fffbe073266e84253e71a4d5db4afa9c1fd53affd74f285df385d5e247b26a4a63db377fa SHA512 0d103571a0f9d4d5d4a6144401e86e9e48dd293a9c4767250e7fa845b0da917e032340930edb4bc70b895ef5015f3f154dd20644c154dd55b9cbfd550fb70593
-EBUILD advancecomp-2.0.ebuild 916 BLAKE2B 203186b5cfad20b2df8ea1ae4608b7b2290f3a6d2868581a6b3c373fffbe073266e84253e71a4d5db4afa9c1fd53affd74f285df385d5e247b26a4a63db377fa SHA512 0d103571a0f9d4d5d4a6144401e86e9e48dd293a9c4767250e7fa845b0da917e032340930edb4bc70b895ef5015f3f154dd20644c154dd55b9cbfd550fb70593
+EBUILD advancecomp-2.0.ebuild 915 BLAKE2B 451c776fe4e417379ce26cbe1ec9f46bb26489178bee833249c26864dcc64131dfa42142c015926521323da3a4ac39c2ba8390c706e3ea6b982d189efe01f086 SHA512 90e5805a3f37c7e7d480d34ba565fea28af048dac3f7e1749e6f027d1e671ae718628936e25ab8696f64862094c83349710e748ed25aadc738db23eca2842eb5
 MISC metadata.xml 521 BLAKE2B 84acb45e5f88abc50bd2e45d1b03a98b62623c52a7ba5fe1a6b54cb6f481c6328418d23920b55fb570c633223a115a36b1c89992f95b9673c9986a449c1765be SHA512 48bd30d199f5dae792a18e564454c3bf6707767a15a752aaaa28e2f8507e0824ccc348a9478531d03db839176742f00beabc95f532540ded145b734d2f4b3c45
diff --git a/app-arch/advancecomp/advancecomp-2.0.ebuild b/app-arch/advancecomp/advancecomp-2.0.ebuild
index da4307230c37..02c4e4276dc0 100644
--- a/app-arch/advancecomp/advancecomp-2.0.ebuild
+++ b/app-arch/advancecomp/advancecomp-2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/amadvance/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="GPL-3 LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="mng png test"
 
 RDEPEND="app-arch/bzip2
diff --git a/app-arch/alien/Manifest b/app-arch/alien/Manifest
index 3ae43c3c9fa4..9a434c405e40 100644
--- a/app-arch/alien/Manifest
+++ b/app-arch/alien/Manifest
@@ -1,3 +1,5 @@
+AUX alien-8.95-tar-extensions.patch 733 BLAKE2B 75aa07b9c3b4b3e48d381309caeef41ad312c7d71c81958eb74193752276240dcf6ca91fbf5a4dc6279a35cf6a6c90e77a11ee8ec7f5b087a50bfd6ba089710f SHA512 6bcaea2b8a0dd5bd5a493aaf6f0b19edb691e49fc7684486da2331621619745baeaa30d88889d8aa345f989016a096745b875aca2c01c5b8127e93903f4e8b10
 DIST alien-8.95.tar.xz 56940 BLAKE2B c2f6b71d39800a7bc4ab00bcd50d165855bad4eb1a17fe217aeb302c6b7af701bcd9445276d7e522db7e6c81f1e8d7e9e2ada99f9d7505e6ec958ae87df7c9f7 SHA512 c46d3c82542dc3d96eeabea0f0c7ab5b572acaf67d15e2064ea01df32d69a2cf6e083754be49269df6cd7431ec5b3e09ddcb83fbe2ee17843b22e9cd3e73073c
+EBUILD alien-8.95-r1.ebuild 764 BLAKE2B 283f36f16148748575029629aae5bf8ac0cd67f5461bf4ca663ed0f4a6b5216a309e88d16f17f9a0b67072f031cfc3defa390e3539db7ecdb78c9569a4b62fc1 SHA512 a6c188dc13fd2773f88837172f42de118971927fc585708d0f06d14317583cf76e1ee14ed0fdd25fd9b112b46243f6685785012a59b6b1b92ab7cf28ae920a22
 EBUILD alien-8.95.ebuild 697 BLAKE2B c642f99017920dab03230135924cca52f059cf0722adaefebd50de977e805fd6185730f35f613d687d6d9706044021f8301de0d3873c16130185c18b2a9cdac6 SHA512 0b95e1e9168c109d4398191a78fc8946f5f93b91dd4c16a6f15d8dc9c8e92979315b82f92e8ec79c9adeada792bd094cbcae0dc76b1c0e91c37cacc20839e894
 MISC metadata.xml 299 BLAKE2B f0c85fbabcb5ea8dd194f3560a66469354932c2df8a09aacfa26eb980bf1b301ff1d59e5c5196e4014fc637b7f78361ab031930409509c4529a08e78c8d540b6 SHA512 bdfc3c82d7f1c34ba9ee5c104ce164a73e4dea8d9cbbed424f2f9e6a16da20ccd081d02a39a45000a49d265bbcbd362b34ed91c4688396cf73e423591de2b46b
diff --git a/app-arch/alien/alien-8.95-r1.ebuild b/app-arch/alien/alien-8.95-r1.ebuild
new file mode 100644
index 000000000000..c088b5dc1813
--- /dev/null
+++ b/app-arch/alien/alien-8.95-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit perl-module
+
+DESCRIPTION="Converts between the rpm, dpkg, stampede slp, and slackware tgz file formats"
+HOMEPAGE="http://kitenet.net/programs/alien"
+SRC_URI="mirror://debian/pool/main/a/${PN}/${PN}_${PV}.tar.xz -> ${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="+bzip2"
+
+RDEPEND="
+	app-arch/rpm
+	app-arch/dpkg
+	dev-util/debhelper
+	>=app-arch/tar-1.14.91
+	bzip2? (
+		app-arch/bzip2
+	)"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-tar-extensions.patch" )
+
+src_prepare() {
+	default
+	sed -e s%'$(VARPREFIX)'%${D}% -e s%'$(PREFIX)'%${D}/usr%g \
+		-i "${S}"/Makefile.PL || die "sed failed"
+}
diff --git a/app-arch/alien/files/alien-8.95-tar-extensions.patch b/app-arch/alien/files/alien-8.95-tar-extensions.patch
new file mode 100644
index 000000000000..4709fcc1c4f8
--- /dev/null
+++ b/app-arch/alien/files/alien-8.95-tar-extensions.patch
@@ -0,0 +1,25 @@
+From 01aabf053ea28308df87272cca79e645a9268fd7 Mon Sep 17 00:00:00 2001
+From: Austin English <austinenglish@gmail.com>
+Date: Fri, 1 Sep 2017 02:20:37 -0500
+Subject: [PATCH] add more tar extensions
+
+Signed-off-by: Austin English <austinenglish@gmail.com>
+---
+ Alien/Package/Tgz.pm | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Alien/Package/Tgz.pm b/Alien/Package/Tgz.pm
+index 7ab6e8b..65a3d2d 100644
+--- a/Alien/Package/Tgz.pm
++++ b/Alien/Package/Tgz.pm
+@@ -11,7 +11,7 @@ use strict;
+ use base qw(Alien::Package);
+ use Cwd qw(abs_path);
+ 
+-my $tarext=qr/\.(?:tgz|tar(?:\.(?:gz|Z|z|bz|bz2))?|taz)$/;
++my $tarext=qr/\.(?:taz|tar(?:\.(?:bz|bz2|gz|Z|z|))?|tb2|tbz|tbz2|tZ|xpak)$/;
+ 
+ =head1 DESCRIPTION
+ 
+-- 
+2.14.0
diff --git a/app-arch/bzip2/Manifest b/app-arch/bzip2/Manifest
index da0fcf7a6ea2..5d0fe480127e 100644
--- a/app-arch/bzip2/Manifest
+++ b/app-arch/bzip2/Manifest
@@ -9,5 +9,5 @@ AUX bzip2-1.0.6-progress.patch 5716 BLAKE2B 8f89dcc1f9d95440cba7df54ee80e861e02e
 AUX bzip2-1.0.6-saneso.patch 443 BLAKE2B b496406e6f3c520886fff99c9206d6d1a01dc0e55a8491bec0318741dc53ad6da321553e73c8929c5fb4938e7275671c04d4b5c86730b580a042a18bb81b7116 SHA512 b9798368d12ab3547ccd3bb614e3a81f1b232990c0f9e3e4472532a8070a3c212274d5b9d093cd046cfee7c8d25da9cfd368c7ca4bd86fbb67f34510107159ab
 DIST bzip2-1.0.6.tar.gz 782025 BLAKE2B b31533af7c71d715e6600874bb0a11b9b3aebbb08af0414a6d88bd5a2ad879a482ad408338159cb6c241815da8f48798d2ea7789ea971431d0be42ee827b0a7e SHA512 00ace5438cfa0c577e5f578d8a808613187eff5217c35164ffe044fbafdfec9e98f4192c02a7d67e01e5a5ccced630583ad1003c37697219b0f147343a3fdd12
 EBUILD bzip2-1.0.6-r8.ebuild 3016 BLAKE2B 1f48f0161c93dabc18beeab6f064b5ec44b901ca474525c3159c7859cafe3fd6207bafeb7254e763c5a9261f9d4b59271af564771d9201c00ecc408928154388 SHA512 b969bde987920cd44a90c4b89efc90f35f71c988852e0c623c38b461d8ec5ab9e969963aaf7b2177e5dad1fa4d0e0da7c61092527a5aebf2a6d17d5d6949bc85
-EBUILD bzip2-1.0.6-r9.ebuild 3061 BLAKE2B 9524a49b0eb6605bea586dccf9ff822e30e3b845239f4027126656e72f406657a8c1755a299e6638462a2195d652596cb0f220e21bc0b35b16ccf9b5d879abb4 SHA512 d0b6898314fe2498421a6f516ad5946dab295ca84459389a2dad32e5d09acf4e6806bd776d2100d10d5fb06f3d98ff1f0000d8420df84d988a46e7893566cdc1
+EBUILD bzip2-1.0.6-r9.ebuild 3058 BLAKE2B 84ef512a98f1829fc0fae2e6559ebb599c6531ba9a2ab202ed99a9c54ef6afb6c25f08335c9457934e4ae005224644c51a5d741bcefef14abcad92d4ab222a60 SHA512 38b452d940339af54541f23bfc2c36ce3e5b01f665acf76cbf158edbfc5aacec8e7e3c0940879d30e0979101b0af2dc12d944871034f87870e9e843d61fd60f3
 MISC metadata.xml 332 BLAKE2B b949c1c7d17334fcb499bbbd042cb217092743b6ae29fc64e634f7957767bf8c6a46f865b1681ce165d60143307795ebc417887fa8ba7a69afee95062411ea07 SHA512 1a7f730b73728875e428e7b123cd8e7773e8ea88a02d6891727775b50196854c608ae541846063a258874a83aab38800dc697b37196fe1c75162abe21b8f92d0
diff --git a/app-arch/bzip2/bzip2-1.0.6-r9.ebuild b/app-arch/bzip2/bzip2-1.0.6-r9.ebuild
index 35cf13b6d7b6..69a0d6fe4773 100644
--- a/app-arch/bzip2/bzip2-1.0.6-r9.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.6-r9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.bzip.org/${PV}/${P}.tar.gz"
 
 LICENSE="BZIP2"
 SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="static static-libs"
 
 PATCHES=(
diff --git a/app-arch/lz4/Manifest b/app-arch/lz4/Manifest
index b8eec8a7022c..545b937c8ac7 100644
--- a/app-arch/lz4/Manifest
+++ b/app-arch/lz4/Manifest
@@ -1,10 +1,12 @@
 DIST lz4-1.7.5.tar.gz 208019 BLAKE2B a3d79d622eb0be2447cc6b0459bd81ae22b44ebe536ebd34b1c394bf1ff560c9b53e3f9203d5c94d046101a48d9b1ea7db74c39875d0a67b3a5f71d9633aa3b7 SHA512 b4e5b17fe06805e676608e636a45f0b480b79a02c6b7ffce84dc4d607861cb2652b2852493ab9d9249e7caeae6f00b6834801fdc39f58d901cbc1c7347915295
 DIST lz4-1.8.0.tar.gz 222840 BLAKE2B 0b33f920f59a5ec9576051baa9ba887b320d424f8f64e1a752124371797d3f8bf2dbf13ee2e7268ef363d70697b8358e7ad627489c6843c61bdba004df80c5ec SHA512 aea46d4a900a3ede7dd7b498ee938ecd98397d3277c5b3a85b4236a44777cba85cd68a2f32c993b872afda96c5dafe0cb3dd391101fe8181e17c9f48884c1535
 DIST lz4-1.8.1.2.tar.gz 228640 BLAKE2B e5e7176dcce5319e2dcb1f6d69c47749976fd7e8c53c2379bdd0ef4c6f60bf426b2b58d606407f69d0b91e6835c9740265299107d11554e7a13963cdc855e8e5 SHA512 f4ed450bc05477cc6c2b42e6fe1fbb1fb0907f1d05b68b1d69d975b555ddb385550f204258e6d91642e14ce373815141dc218cda03b711793935d5458bc45c7f
+DIST lz4-1.8.2.tar.gz 320742 BLAKE2B cd97b6a31a1f45d410d598af0b0b696b3ccc3ffdc4fd523316576ebc68e24e545b8ce359889b0dca1968b1c296cb69951617b91b49cbe8eb98cfdb9ce400803c SHA512 5fadc79334d37739c947d6dfc24f48ce82989fc5ee4f2bb8201ccf7ee3230b9e6e7c8488beb64050a035369f4247161d258bdb539578bec224ccebfef1b8a763
 DIST lz4-r131.tar.gz 133784 BLAKE2B f072d1f97ac6f804140c3896dfa95c16eb3c2c2208cfeb35a07535bb345fa100e4169ea91b2aa05655fb61f6f2d64a7c25444778b99841d3e3d0f09b10f570d8 SHA512 60bd95d529691ffee2c43f0d8a62484c3cff74c0154094f073192606806ac8182dced61e0534ffa7e0ccf5f18e9a8cfd2738883a83814c0711a6d7f1d1b252e5
 EBUILD lz4-0_p131.ebuild 1521 BLAKE2B 5748445c1b995930382c846a6ffdca206f008a447b63660f07b6817f9710f0c434c29e775f635e1928d781053dc16142546f5c9d9606df3ee4465eaa85f4d799 SHA512 466cf8f24471af82f9789dc02ff9b93d69a450f7ec768e3d5c4f2a374ae36a46209d39859701cbd7856b7600dc1d33fbf993d1651cc56338601390f72f78e61c
 EBUILD lz4-1.7.5-r1.ebuild 1033 BLAKE2B 1e6724ddeb18f9e4ffe78a84e96d0593b2501e96bad632db32e10082559c1ea77c38686ec77b953dc0c981796a14bbabf38985ed953617e02ea0d704cdebe59e SHA512 763b64264b063b7066052ead680c262ce1019ddd41dd627dc76d38eb72b2ba9e1da23df7356188901fc92984822563179df9e06df975976c988e7bfd86c7b9ee
 EBUILD lz4-1.8.0.ebuild 1058 BLAKE2B 3a3c63fd72df58c8e69c4e9981fe7e06f6dbdefd939b4638536898a407bb508ca7873ffa9d8b34bdea23523b52af3bd14571f4ae1b48e3c115f92465e4674f9b SHA512 ae91981fc93118aa57d261292412aac4141d04974e5358819b27dbeaca8902bb995e4439373d35b625e5c19b5f3cf50073e4c22c2293ab8c2390ad7ddaf3ccf7
 EBUILD lz4-1.8.1.2.ebuild 1068 BLAKE2B c29f13447c24f824d19816f9c8bd97e5be475a39ca4fc94c3dbabcf476779d1ce7177ebdf3cf97ec7ff899b7bb27b6867793ec5852b95b57093bafbad07d9a56 SHA512 e300a60ac5575a1fc16577efec351f886d98e7ecfa389098e72f4ec393fecf6b675caea554647eddf91edae1c0e01f2784602f4e94ac7fed5285a28801ef7cb6
+EBUILD lz4-1.8.2.ebuild 847 BLAKE2B d74ec14097136bb3e244bba53c6e0f60e9f0a261ff646ee0e47c6633f81238cb1f879db36fa482e8368580bceb35958a3337f96d12af9659601d737cdd20f4f6 SHA512 9a333c5d7d56e5f9d598ae04fabd812d703749b04d7e4b9f5fb247ade28099e82823e2bd85bea065af66820e6f42186ac49f4966ef279890b372111fc5abaf10
 EBUILD lz4-9999.ebuild 824 BLAKE2B dbc4eeaf3f65d527eaafd48a1083c43b76fd564b9dec1e6393c93445be4a0d9b56e540a4dd24df5438ea9b2ffeeb8a53a113a69b40f9b1ded3af4567b00122d8 SHA512 f28250733aa50bab0d908f5288d69d3d78af865433864716474d6d8fc639a44de61fb25dff06614bee003b9fee1d1a71528f9b96d2347c3562a5eb5736a340a9
 MISC metadata.xml 516 BLAKE2B 89b858097e6409d3b6f9855c0eb82ef02ee9c705516a1c32d1eb81730b03733e7abca122e59e43c193367429bb277dc1f044d09276f7b3db37f79d6f5c3a8054 SHA512 b559b65a4eebe71824ad3cd46c1ef3aabcc1c43f4312cb2e1072f0e7ab4396890696ef7450d7a41a2e03498db9da9e6823f9d8de4d413a0244607b85192efaa8
diff --git a/app-arch/lz4/lz4-1.8.2.ebuild b/app-arch/lz4/lz4-1.8.2.ebuild
new file mode 100644
index 000000000000..0fc870435ede
--- /dev/null
+++ b/app-arch/lz4/lz4-1.8.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-multilib
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/lz4/lz4.git"
+	EGIT_BRANCH=dev
+else
+	SRC_URI="https://github.com/Cyan4973/lz4/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+fi
+
+DESCRIPTION="Extremely Fast Compression algorithm"
+HOMEPAGE="https://github.com/lz4/lz4"
+
+LICENSE="BSD-2 GPL-2"
+# https://abi-laboratory.pro/tracker/timeline/lz4/
+SLOT="0/r131"
+IUSE="static-libs"
+
+CMAKE_USE_DIR=${S}/contrib/cmake_unofficial
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_STATIC_LIBS=$(usex static-libs)
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/app-arch/unar/Manifest b/app-arch/unar/Manifest
index a8ed282efbbf..583c6c577b34 100644
--- a/app-arch/unar/Manifest
+++ b/app-arch/unar/Manifest
@@ -1,3 +1,3 @@
 DIST unar1.10.1_src.zip 2552535 BLAKE2B 678c90dae6572cf9de6f90d044de650d82293df3918eb298de27fe5a557efdda1c1da284c6829c667bb2812033627fcb1a31bf22318d277e9467ca965435f6b2 SHA512 2755f1e2dcca68912f748587f195887d785d5c30933ca0d7a7de1dd35c6c1c115571e49f462fe15722e1b34560f02503382727e1df19a1f23d4a3cc75750434e
-EBUILD unar-1.10.1.ebuild 1145 BLAKE2B 2ed53334ac8b07a4356b55491604a351cf7760ae90dbaf66d3496352f88f8b0a787a1796d6d4201ac0eedad6c8fb02181b68b58f5147d92cf267334eab590c16 SHA512 28741166d10ba1a7392107ab76f1246c3be0907c348cc0f20d58275fad6d281d55094fb819207e00c5f1e4e5c84c876269427e79ccba9edd30e605a52bbcc045
+EBUILD unar-1.10.1.ebuild 1169 BLAKE2B ebac22af794e9a19dba80156dfe96c912ddb27b163b485e884a3c9cb7a8e725c01f420f733cf216a5b19c97d50330144700b56f12426152f893d80e33f2cd261 SHA512 e8681f438331639273f32e52a9fd51f761b628584a75ad0792f42fecadde25cc5dbc175a647df031bbb1914b2f848feb1e60ce098e9a707287013ae727936492
 MISC metadata.xml 299 BLAKE2B e4ba80605afa425e3affada863a2816f561e3ac3a7eba58e6392df43b9772dbc8de406a660688c556a4ebcd48647722bbb1139b2016596901a34712b9a8d4a31 SHA512 6b3bfdb09755e678dc609356ff3819f66574af5718870ff7f2ca29a6f1a1c85e1cc781d713bd27ebc8ae2d44171efabd3a69202f3b1c75323c4f410136c2850f
diff --git a/app-arch/unar/unar-1.10.1.ebuild b/app-arch/unar/unar-1.10.1.ebuild
index b482d11dbaba..e81a5cd05425 100644
--- a/app-arch/unar/unar-1.10.1.ebuild
+++ b/app-arch/unar/unar-1.10.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit toolchain-funcs
 
@@ -14,20 +14,24 @@ SLOT="0"
 KEYWORDS="amd64"
 IUSE=""
 
-RDEPEND="gnustep-base/gnustep-base
+RDEPEND="
+	app-arch/bzip2:=
 	dev-libs/icu:=
-	sys-libs/zlib
-	app-arch/bzip2"
+	gnustep-base/gnustep-base
+	sys-libs/zlib:=
+"
 DEPEND="${RDEPEND}
 	>=gnustep-base/gnustep-make-2.6.0[native-exceptions]
-	sys-devel/gcc[objc]"
+	sys-devel/gcc[objc]
+"
 
 S="${WORKDIR}/The Unarchiver/XADMaster"
 
 src_prepare() {
+	default
 	# avoid jobserver warning, upstream bug:
 	# https://bitbucket.org/WAHa_06x36/theunarchiver/issues/918/dont-call-make-from-makefile
-	sed -i -e 's:make:$(MAKE):g' Makefile.linux
+	sed -i -e 's:make:$(MAKE):g' Makefile.linux || die
 }
 
 src_compile() {
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 65f0af39de9a..4a6f6f783bd3 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/burp/Manifest b/app-backup/burp/Manifest
index bbaba2af65d8..114adca3a284 100644
--- a/app-backup/burp/Manifest
+++ b/app-backup/burp/Manifest
@@ -10,17 +10,8 @@ AUX burp.service 193 BLAKE2B fa9a00f32999834afaf84db9d28f2e8b65688e784e32f78bc01
 AUX burp.tmpfiles 29 BLAKE2B 8cf38caeb3109607d4a8b7a0397e0a053d3cf2b25a196c4d76671a245c99dd48991ec820e15f8227325040c38d4ab8d5f5e67692052d7b0cbd0f7cdd35f1282c SHA512 b109b405d0add3d357269fbec65de06654068624672eff4ed44af69e5151586a727a13c9526e02b97fc18a4be77ba48d4d4d41cdf6b76b62fed242f9172cebff
 AUX burp2.initd 1091 BLAKE2B 55d7bd294fc4c603627c682a396f59e6004bcd131ac03210dde3346d5abf1904f19b683e57d131c04218e9638ad1049b818b8c5e5e60c01099d3065ffd108eb2 SHA512 68b460484e049f816c36a862f748da0902c9c7320a5fd8f46813cec55f5c0e9c3a54ac726d76a62f90e2d740456283215028ba3d4c91613191cac70554d8f8f9
 DIST burp-2.0.54.tar.gz 558845 BLAKE2B f6a868b09ad73e3b8aa171993849c8fec43c141d14a64ba7919ad73890905647741688d2f0c0b01ef2a584474ecd1464423b07279160d86c7f37d1bf37a384a7 SHA512 dccc4d3679dd759028cd6b71d09ae4e49a511e5d94b4df2f112ad974abb507bbc8fffaf63ef85c847b0f9363b20a9e817179ab556c5a788acacb7a25e7600fa4
-DIST burp-2.1.22.tar.gz 582938 BLAKE2B dbc0b7612e9cda2186d16426ec1a39559af965fcbc393259e5d4d1f376c666e8532f25dbe51d2ec816fc2e630f81b059c77aee572c562bf47f466f4114e875fd SHA512 028b48c585cdc607eb00af5f60e01541a54885b8084e0353d01b1e01744848967011cd330a443ae143884852c2dbc18fb25f364ce129a31ccbcf0f8d25ccb730
-DIST burp-2.1.24.tar.gz 586055 BLAKE2B 6186e791e8b0cea74ecfbd4a85624f2492bd2721e705d8f5fb6783eb03390c7c10d88e4e4e33095aff985c70e6da59b3bb3b0f652cc850f443dabef23517c05f SHA512 b23f5e33510493e08b9b6eda405a017c8f75811fa18c9bcb6f96fbf716a79934e6c714f1258c39a81dcc52ef1a88e3629a0862bbd2462fbdc30cc7fb1b117ba6
-DIST burp-2.1.26.tar.gz 588548 BLAKE2B f17d03cd79972d1a6bee3163092cd8957208024ca121113493c942cf268e53ab4dadfe05b74c5653a42088f1fb5e4e16b11632c602f2f1f09ecf1010ef43050c SHA512 abfd6866413b4bd9e382fde4cd1f2a51b41a306605dc1fce309011c4340c6e58900839878ade4e53e2d70077ea8ea92eac3ee727783e6a316efaa7b0e75e116f
-DIST burp-2.1.28.tar.gz 590482 BLAKE2B 933e7b966ea75012b46af828fc50df1dbdafec3d6fef41149dc37d9526dd8819a3f5ffef53b75a5a196781a37e8220b58ba81dbeff8e7f0006617c7d021949b5 SHA512 8784f9dfad58cdcd1f25f669bccefaaf8df95c02ae317d17b6a70e4215e40eb16e8f65bdee3e25e463cc9b58516d2244f72877d4fbd1509938ed9d542d7a62ad
 DIST burp-2.1.32.tar.gz 591737 BLAKE2B fd525bff32348f1dbc37b1c065d262ff8af1d999d19f63711ebcff3fb55e90a7440cc6cfc0b7eefe6f8e250672c799d86e65ed599f0b8d7dd80bebcb99888987 SHA512 2477b7a9a2123b227a27519f7f3d9facca7173a9e63d66f6a8fb2ae5408d8af4ad5bfdd0a14efd6cf80e7bc8e91907f7c293a3d621b86bafdbf163bfa08d0c81
-EBUILD burp-2.0.54-r2.ebuild 2997 BLAKE2B f1273b3897c72cab7a54e149e31c4ed9bc1ae3bf3c9c7f5cee706720161846d37622fd5398389e920dbb884b4a5c43f03e1218f6f1e28aca1ec079893833755b SHA512 e46d39437a830437ef6fa32e7406cb32c738514e22fffaee722523df4973b9e90ca8d2d1247b9c70b12e0068fb420016d2cdbe1522ea1d75622471feed0e6f3e
 EBUILD burp-2.0.54-r4.ebuild 2958 BLAKE2B e7ebacc80b7c78d92af1a13d069ae4aad495efcd4ed16baa05929c6fa5c6ea39afb2e33b61d1d0856f180bb5c9c839644dd60b00f64b68abe4c29f66243a8987 SHA512 d3f28bf715688bf5fcafc94d5242524ddf22fea6a898f2f71620439e49117dd626889f90d37875996c2f7fbb5521175af5a661a38ac93bf830af10a3f28d1390
 EBUILD burp-2.0.54.ebuild 2888 BLAKE2B 8b1082f4461af6be06f44487c3dd2f3a11cf6baeb16fa9ccf7aaf61226b7fbc49ab5fa844beabf8dfc8c619f798a82ec5fe0df2ade5aa5b59de329a0b0f0723a SHA512 25cbf3277f4d8a1ff6f897c06cd3205d9e2acf312cb9117120c3803ef1db97d0b0705b533dfb57b702cfc6ed4d4cfaad76a63d4a594b5853ff54a2b49b4b4be3
-EBUILD burp-2.1.22.ebuild 2944 BLAKE2B 4eace50b19e23adb1909efc2cd73846a852cd88c7ec3f03a0208f89b6eede0ecedce060fb3e41b87f899425d916c88952e226007444dec72d4ff2fec9daf2579 SHA512 afb696b8d45e7cd98f8db4a2c647a6c74b20e0ed5fa72010e45c594b56bbe8b340d434352733f50d6d368ad0f3534ccd5f40400021120230474c951263acab71
-EBUILD burp-2.1.24-r1.ebuild 2845 BLAKE2B 7ac52194fb89b2eeccfc66e28de8fcff590d92bded3bda76a24c722ef78dd19f15b2aa51f5a15d9b75df1268423a21c9630f61fc0aca826fb1cd190476ffb88c SHA512 2bd8f4f1c7928615b08b16a9cc1bff2fe38b601a7a71ea22487ba064ef4758e67792f99dfcdcc9ce0683d788ad7e9fe0362a32e1e26d1c6c735abb5e74fa0a0d
-EBUILD burp-2.1.26.ebuild 2845 BLAKE2B d2e9b2ea57a6cdcd4eba9e1ca385da7d1b8460a1f5d034f4f23c02ad5989e422d5631ec695d3824d98013d023be1e693e6c609e8a106f5b1eab341451e75e7f9 SHA512 ab0056b1475b9af65fc70a134419ab9f1029e393c6c930ecbf4eef18841823b00260164030f63d56c7bb21f42bbf9cd30843a397b3e2ec1b9dee358a24b20cc0
-EBUILD burp-2.1.28.ebuild 2845 BLAKE2B d2e9b2ea57a6cdcd4eba9e1ca385da7d1b8460a1f5d034f4f23c02ad5989e422d5631ec695d3824d98013d023be1e693e6c609e8a106f5b1eab341451e75e7f9 SHA512 ab0056b1475b9af65fc70a134419ab9f1029e393c6c930ecbf4eef18841823b00260164030f63d56c7bb21f42bbf9cd30843a397b3e2ec1b9dee358a24b20cc0
 EBUILD burp-2.1.32.ebuild 2844 BLAKE2B 3d4d514b41716f6efcc8641e47ca7e5ed411138d1b5cc8d971c1491962e28ac96828825e91c5e518596f5abbfdbd57d31bb532537c3d4d07e05377693a14709f SHA512 a67a390d4def2f0a8d78a69a5ff41a5b91c6d3483040c4ab33b44765478509330ddc2707b8f9c06cc31975f3ccbd9f9367e5253619c5c71690c75d23ab3d1094
 MISC metadata.xml 684 BLAKE2B 3b4511a62d65ec23ef3b1311f57d703154f08e8d82d189a5ea0b555b5d7d686c54365d2992b85c6e5dffa0ee93f7331367925766ea1bfe349446c23d73dba392 SHA512 3752a2b8e2fb49d44d8fe431768ab1b4bc9995099e9bbe4f957677b39ca038a75874bfb0781b1cd1bd4bd79186c0994f2ce5654921a58c9645ffd6dc553f3c9f
diff --git a/app-backup/burp/burp-2.0.54-r2.ebuild b/app-backup/burp/burp-2.0.54-r2.ebuild
deleted file mode 100644
index e05b1d7a3ff6..000000000000
--- a/app-backup/burp/burp-2.0.54-r2.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools systemd tmpfiles user versionator
-
-DESCRIPTION="Network backup and restore client and server for Unix and Windows"
-HOMEPAGE="http://burp.grke.org/"
-SRC_URI="https://github.com/grke/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="acl ipv6 libressl test xattr"
-
-CDEPEND="dev-libs/uthash
-	net-libs/librsync
-	sys-libs/ncurses:0=
-	sys-libs/zlib
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	acl? ( sys-apps/acl )
-	xattr? ( sys-apps/attr )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	test? ( dev-libs/check )"
-RDEPEND="${CDEPEND}
-	virtual/logger"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.0.54-ncurses_pkg-config.patch
-	"${FILESDIR}"/${PN}-2.0.54-no_mkdir_run.patch
-	"${FILESDIR}"/${PN}-2.0.54-protocol1_by_default.patch
-	"${FILESDIR}"/${PN}-2.0.54-server_user.patch
-)
-
-pkg_setup() {
-	enewgroup "${PN}"
-	enewuser "${PN}" -1 "" "" "${PN}"
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--localstatedir=/var
-		--sysconfdir=/etc/burp
-		--enable-largefile
-		$(use_enable acl)
-		$(use_enable ipv6)
-		$(use_enable xattr)
-	)
-	# --runstatedir option will only work from autoconf-2.70 onwards
-	runstatedir='/run/burp' \
-		econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	fowners -R root:${PN} /var/spool/burp
-	fperms 0770 /var/spool/burp
-
-	emake DESTDIR="${D}" install-configs
-	fowners -R root:${PN} /etc/burp
-	fperms 0775 /etc/burp
-	fperms 0640 /etc/burp/burp-server.conf
-	fperms 0750 /etc/burp/clientconfdir
-
-	newinitd "${FILESDIR}"/${PN}2.initd ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-
-	newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}.conf
-}
-
-pkg_postinst() {
-	tmpfiles_process ${PN}.conf
-
-	elog "Burp ebuilds now support the autoupgrade mechanism in both"
-	elog "client and server mode. In both cases it is disabled by"
-	elog "default. You almost certainly do NOT want to enable it in"
-	elog "client mode because upgrades obtained this way will not be"
-	elog "managed by Portage."
-
-	if [[ ! -e /etc/burp/CA/index.txt ]]; then
-		elog ""
-		elog "At first run burp server will generate DH parameters and SSL"
-		elog "certificates.  You should adjust configuration before."
-		elog "Server configuration is located at"
-		elog ""
-		elog "  /etc/burp/burp-server.conf"
-		elog ""
-	fi
-
-	# According to PMS this can be a space-separated list of version
-	# numbers, even though in practice it is typically just one.
-	local oldver
-	for oldver in ${REPLACING_VERSIONS}; do
-		if [[ $(get_major_version ${oldver}) -lt 2 ]]; then
-			ewarn "Starting with version 2.0.54 we no longer patch bedup to use"
-			ewarn "the server config file by default. If you use bedup, please"
-			ewarn "update your scripts to invoke it as"
-			ewarn ""
-			ewarn "  bedup -c /etc/burp/burp-server.conf"
-			ewarn ""
-			ewarn "Otherwise deduplication will not work!"
-			break
-		fi
-	done
-}
diff --git a/app-backup/burp/burp-2.1.22.ebuild b/app-backup/burp/burp-2.1.22.ebuild
deleted file mode 100644
index ca210f89c0ff..000000000000
--- a/app-backup/burp/burp-2.1.22.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools systemd tmpfiles user versionator
-
-DESCRIPTION="Network backup and restore client and server for Unix and Windows"
-HOMEPAGE="http://burp.grke.org/"
-SRC_URI="https://github.com/grke/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="acl ipv6 libressl test xattr"
-
-CDEPEND="dev-libs/uthash
-	net-libs/librsync
-	sys-libs/ncurses:0=
-	sys-libs/zlib
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	acl? ( sys-apps/acl )
-	xattr? ( sys-apps/attr )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	test? ( dev-libs/check )"
-RDEPEND="${CDEPEND}
-	virtual/logger"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.20-no_mkdir_run.patch
-	"${FILESDIR}"/${PN}-2.1.20-protocol1_by_default.patch
-	"${FILESDIR}"/${PN}-2.0.54-server_user.patch
-)
-
-pkg_setup() {
-	enewgroup "${PN}"
-	enewuser "${PN}" -1 "" "" "${PN}"
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--localstatedir=/var
-		--sysconfdir=/etc/burp
-		--enable-largefile
-		$(use_enable acl)
-		$(use_enable ipv6)
-		$(use_enable xattr)
-	)
-	# --runstatedir option will only work from autoconf-2.70 onwards
-	runstatedir='/run/burp' \
-		econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	fowners -R root:${PN} /var/spool/burp
-	fperms 0770 /var/spool/burp
-
-	emake DESTDIR="${D}" install-configs
-	fowners -R root:${PN} /etc/burp
-	fperms 0775 /etc/burp
-	fperms 0640 /etc/burp/burp-server.conf
-	fperms 0750 /etc/burp/clientconfdir
-
-	newinitd "${FILESDIR}"/${PN}2.initd ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-
-	newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}.conf
-}
-
-pkg_postinst() {
-	tmpfiles_process ${PN}.conf
-
-	elog "Burp ebuilds now support the autoupgrade mechanism in both"
-	elog "client and server mode. In both cases it is disabled by"
-	elog "default. You almost certainly do NOT want to enable it in"
-	elog "client mode because upgrades obtained this way will not be"
-	elog "managed by Portage."
-
-	if [[ ! -e /etc/burp/CA/index.txt ]]; then
-		elog ""
-		elog "At first run burp server will generate DH parameters and SSL"
-		elog "certificates.  You should adjust configuration before."
-		elog "Server configuration is located at"
-		elog ""
-		elog "  /etc/burp/burp-server.conf"
-		elog ""
-	fi
-
-	# According to PMS this can be a space-separated list of version
-	# numbers, even though in practice it is typically just one.
-	local oldver
-	for oldver in ${REPLACING_VERSIONS}; do
-		if [[ $(get_major_version ${oldver}) -lt 2 ]]; then
-			ewarn "Starting with version 2.0.54 we no longer patch bedup to use"
-			ewarn "the server config file by default. If you use bedup, please"
-			ewarn "update your scripts to invoke it as"
-			ewarn ""
-			ewarn "  bedup -c /etc/burp/burp-server.conf"
-			ewarn ""
-			ewarn "Otherwise deduplication will not work!"
-			break
-		fi
-	done
-}
diff --git a/app-backup/burp/burp-2.1.24-r1.ebuild b/app-backup/burp/burp-2.1.24-r1.ebuild
deleted file mode 100644
index c4b44cdd39c9..000000000000
--- a/app-backup/burp/burp-2.1.24-r1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools systemd user versionator
-
-DESCRIPTION="Network backup and restore client and server for Unix and Windows"
-HOMEPAGE="http://burp.grke.org/"
-SRC_URI="https://github.com/grke/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="acl ipv6 libressl test xattr"
-
-CDEPEND="dev-libs/uthash
-	net-libs/librsync
-	sys-libs/ncurses:0=
-	sys-libs/zlib
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	acl? ( sys-apps/acl )
-	xattr? ( sys-apps/attr )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	test? ( dev-libs/check )"
-RDEPEND="${CDEPEND}
-	virtual/logger"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.20-no_mkdir_run.patch
-	"${FILESDIR}"/${PN}-2.1.20-protocol1_by_default.patch
-	"${FILESDIR}"/${PN}-2.0.54-server_user.patch
-)
-
-pkg_setup() {
-	enewgroup "${PN}"
-	enewuser "${PN}" -1 "" "" "${PN}"
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--localstatedir=/var
-		--sysconfdir=/etc/burp
-		--enable-largefile
-		$(use_enable acl)
-		$(use_enable ipv6)
-		$(use_enable xattr)
-	)
-	# --runstatedir option will only work from autoconf-2.70 onwards
-	runstatedir='/run' \
-		econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	fowners -R root:${PN} /var/spool/burp
-	fperms 0770 /var/spool/burp
-
-	emake DESTDIR="${D}" install-configs
-	fowners -R root:${PN} /etc/burp
-	fperms 0750 /etc/burp
-	fperms 0640 /etc/burp/burp-server.conf
-	fperms 0750 /etc/burp/clientconfdir
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-}
-
-pkg_postinst() {
-	elog "Burp ebuilds now support the autoupgrade mechanism in both"
-	elog "client and server mode. In both cases it is disabled by"
-	elog "default. You almost certainly do NOT want to enable it in"
-	elog "client mode because upgrades obtained this way will not be"
-	elog "managed by Portage."
-
-	if [[ ! -e /etc/burp/CA/index.txt ]]; then
-		elog ""
-		elog "At first run burp server will generate DH parameters and SSL"
-		elog "certificates.  You should adjust configuration before."
-		elog "Server configuration is located at"
-		elog ""
-		elog "  /etc/burp/burp-server.conf"
-		elog ""
-	fi
-
-	# According to PMS this can be a space-separated list of version
-	# numbers, even though in practice it is typically just one.
-	local oldver
-	for oldver in ${REPLACING_VERSIONS}; do
-		if [[ $(get_major_version ${oldver}) -lt 2 ]]; then
-			ewarn "Starting with version 2.0.54 we no longer patch bedup to use"
-			ewarn "the server config file by default. If you use bedup, please"
-			ewarn "update your scripts to invoke it as"
-			ewarn ""
-			ewarn "  bedup -c /etc/burp/burp-server.conf"
-			ewarn ""
-			ewarn "Otherwise deduplication will not work!"
-			break
-		fi
-	done
-}
diff --git a/app-backup/burp/burp-2.1.26.ebuild b/app-backup/burp/burp-2.1.26.ebuild
deleted file mode 100644
index 0b3678fbd2a0..000000000000
--- a/app-backup/burp/burp-2.1.26.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools systemd user versionator
-
-DESCRIPTION="Network backup and restore client and server for Unix and Windows"
-HOMEPAGE="http://burp.grke.org/"
-SRC_URI="https://github.com/grke/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="acl ipv6 libressl test xattr"
-
-CDEPEND="dev-libs/uthash
-	net-libs/librsync
-	sys-libs/ncurses:0=
-	sys-libs/zlib
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	acl? ( sys-apps/acl )
-	xattr? ( sys-apps/attr )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	test? ( dev-libs/check )"
-RDEPEND="${CDEPEND}
-	virtual/logger"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.20-no_mkdir_run.patch
-	"${FILESDIR}"/${PN}-2.1.20-protocol1_by_default.patch
-	"${FILESDIR}"/${PN}-2.0.54-server_user.patch
-)
-
-pkg_setup() {
-	enewgroup "${PN}"
-	enewuser "${PN}" -1 "" "" "${PN}"
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--localstatedir=/var
-		--sysconfdir=/etc/burp
-		--enable-largefile
-		$(use_enable acl)
-		$(use_enable ipv6)
-		$(use_enable xattr)
-	)
-	# --runstatedir option will only work from autoconf-2.70 onwards
-	runstatedir='/run' \
-		econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	fowners -R root:${PN} /var/spool/burp
-	fperms 0770 /var/spool/burp
-
-	emake DESTDIR="${D}" install-configs
-	fowners -R root:${PN} /etc/burp
-	fperms 0750 /etc/burp
-	fperms 0640 /etc/burp/burp-server.conf
-	fperms 0750 /etc/burp/clientconfdir
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-}
-
-pkg_postinst() {
-	elog "Burp ebuilds now support the autoupgrade mechanism in both"
-	elog "client and server mode. In both cases it is disabled by"
-	elog "default. You almost certainly do NOT want to enable it in"
-	elog "client mode because upgrades obtained this way will not be"
-	elog "managed by Portage."
-
-	if [[ ! -e /etc/burp/CA/index.txt ]]; then
-		elog ""
-		elog "At first run burp server will generate DH parameters and SSL"
-		elog "certificates.  You should adjust configuration before."
-		elog "Server configuration is located at"
-		elog ""
-		elog "  /etc/burp/burp-server.conf"
-		elog ""
-	fi
-
-	# According to PMS this can be a space-separated list of version
-	# numbers, even though in practice it is typically just one.
-	local oldver
-	for oldver in ${REPLACING_VERSIONS}; do
-		if [[ $(get_major_version ${oldver}) -lt 2 ]]; then
-			ewarn "Starting with version 2.0.54 we no longer patch bedup to use"
-			ewarn "the server config file by default. If you use bedup, please"
-			ewarn "update your scripts to invoke it as"
-			ewarn ""
-			ewarn "  bedup -c /etc/burp/burp-server.conf"
-			ewarn ""
-			ewarn "Otherwise deduplication will not work!"
-			break
-		fi
-	done
-}
diff --git a/app-backup/burp/burp-2.1.28.ebuild b/app-backup/burp/burp-2.1.28.ebuild
deleted file mode 100644
index 0b3678fbd2a0..000000000000
--- a/app-backup/burp/burp-2.1.28.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools systemd user versionator
-
-DESCRIPTION="Network backup and restore client and server for Unix and Windows"
-HOMEPAGE="http://burp.grke.org/"
-SRC_URI="https://github.com/grke/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="acl ipv6 libressl test xattr"
-
-CDEPEND="dev-libs/uthash
-	net-libs/librsync
-	sys-libs/ncurses:0=
-	sys-libs/zlib
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	acl? ( sys-apps/acl )
-	xattr? ( sys-apps/attr )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	test? ( dev-libs/check )"
-RDEPEND="${CDEPEND}
-	virtual/logger"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.20-no_mkdir_run.patch
-	"${FILESDIR}"/${PN}-2.1.20-protocol1_by_default.patch
-	"${FILESDIR}"/${PN}-2.0.54-server_user.patch
-)
-
-pkg_setup() {
-	enewgroup "${PN}"
-	enewuser "${PN}" -1 "" "" "${PN}"
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--localstatedir=/var
-		--sysconfdir=/etc/burp
-		--enable-largefile
-		$(use_enable acl)
-		$(use_enable ipv6)
-		$(use_enable xattr)
-	)
-	# --runstatedir option will only work from autoconf-2.70 onwards
-	runstatedir='/run' \
-		econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	fowners -R root:${PN} /var/spool/burp
-	fperms 0770 /var/spool/burp
-
-	emake DESTDIR="${D}" install-configs
-	fowners -R root:${PN} /etc/burp
-	fperms 0750 /etc/burp
-	fperms 0640 /etc/burp/burp-server.conf
-	fperms 0750 /etc/burp/clientconfdir
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-}
-
-pkg_postinst() {
-	elog "Burp ebuilds now support the autoupgrade mechanism in both"
-	elog "client and server mode. In both cases it is disabled by"
-	elog "default. You almost certainly do NOT want to enable it in"
-	elog "client mode because upgrades obtained this way will not be"
-	elog "managed by Portage."
-
-	if [[ ! -e /etc/burp/CA/index.txt ]]; then
-		elog ""
-		elog "At first run burp server will generate DH parameters and SSL"
-		elog "certificates.  You should adjust configuration before."
-		elog "Server configuration is located at"
-		elog ""
-		elog "  /etc/burp/burp-server.conf"
-		elog ""
-	fi
-
-	# According to PMS this can be a space-separated list of version
-	# numbers, even though in practice it is typically just one.
-	local oldver
-	for oldver in ${REPLACING_VERSIONS}; do
-		if [[ $(get_major_version ${oldver}) -lt 2 ]]; then
-			ewarn "Starting with version 2.0.54 we no longer patch bedup to use"
-			ewarn "the server config file by default. If you use bedup, please"
-			ewarn "update your scripts to invoke it as"
-			ewarn ""
-			ewarn "  bedup -c /etc/burp/burp-server.conf"
-			ewarn ""
-			ewarn "Otherwise deduplication will not work!"
-			break
-		fi
-	done
-}
diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index fb4c9702b96c..ce14fa5be798 100644
--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
diff --git a/app-benchmarks/spew/Manifest b/app-benchmarks/spew/Manifest
index f9e8d7aa5fc2..e05e5ed7947b 100644
--- a/app-benchmarks/spew/Manifest
+++ b/app-benchmarks/spew/Manifest
@@ -4,5 +4,4 @@ AUX fix-ncurses-tinfo.patch 1094 BLAKE2B 446d9c396fef3b03898153e840536557af9aeaf
 AUX remove-symlinks-makefile.patch 1125 BLAKE2B 85f660d6ae7da3ebefd4f728c4537919373b4083930f8bdc8bf548efb57905c2ed38802b1aa72b0cfe16b8fa4018d832e0b1c85c60485b0f4d7e4e3defdeffe9 SHA512 4cedf0afe234089cced001bc5f491d49c836fc3acdf2264eecdc6d5621e9130efe9b4b24ce2198ed3edd9a4ec413bb5cbf45a2803650f8525acf3a903511cccc
 DIST spew-1.0.8.tgz 162091 BLAKE2B 9ca0bba6cc749feb016d86bd4e159646538e0a89842aad44474bc377fe67c7f51aa33df2c4df14b329e1b7dabe78ef7da9f50daa0b01f8679a0e98810e5ea1b1 SHA512 ec76a1e681bbaabef6cdc63ced5114a856a312e91c5ff3e0d1536221583a1c939f9308139863670695121c8c720123a6d0697491867ccafc091607888cc81b56
 EBUILD spew-1.0.8-r1.ebuild 1077 BLAKE2B 505b6271d37c638c396f3d6258bdef0d6e7288054cff8aba09f9dc7683139c927bd6fb8e06c94667ea0542904d3c1b74353b57f69baedf76f671b644fd03ae5f SHA512 012b63e9f8c23adfc7e0ccfb878c1b424e74c120cd96d8ceb268ae1e26120b5f42e28a66919506456fd9092247b56f07b397edce70feafd6f1f6cda8b0100f41
-EBUILD spew-1.0.8.ebuild 983 BLAKE2B 0d7df175f35c7fac473257632ead8ccaff350059600169ae04a94b81b507a9af2e6e315383a965389ea61d99ab1ddc03d5409a5ae84fce439948d1af931a131a SHA512 4dcaf1c3adfc0cb0635f7f6e76e11cae307cf5679f6112ef051e2bb717cc1c8600ae75fe311be69c7f42b0b23d15af7b23b88edb27a2f3dc4e8c2c0c2a1aa2bb
 MISC metadata.xml 461 BLAKE2B 33e988b7c7846f687d9c6b83fbf3b560bde47a5be6cac346baa32a8f783ca7c0c5ba64be1c40411630884504aec99429e4a7f9cb9648fb55a23fd046c0be614d SHA512 fe2f2e2cac973a052af263b4021d198835077aaa43dcae82a1101b8156a6cc6d309078f78d6216234ea591a9202afaae298aa6d87755e7e3c032a5d841056597
diff --git a/app-benchmarks/spew/spew-1.0.8.ebuild b/app-benchmarks/spew/spew-1.0.8.ebuild
deleted file mode 100644
index a699f26eac3d..000000000000
--- a/app-benchmarks/spew/spew-1.0.8.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools eutils toolchain-funcs
-
-DESCRIPTION="Measures I/O performance and/or generates I/O load"
-HOMEPAGE="http://spew.berlios.de/"
-SRC_URI="ftp://ftp.berlios.de/pub/spew/1.0.8/spew-1.0.8.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ~ppc ~ppc64 x86"
-IUSE="static"
-
-DEPEND="static? ( sys-libs/ncurses[-gpm] dev-libs/popt[static-libs] )
-	!static? ( sys-libs/ncurses dev-libs/popt )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/fix-automake-1.13.patch
-	epatch "${FILESDIR}"/remove-symlinks-makefile.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable static static-link)
-}
-
-src_compile() {
-	emake AR=$(tc-getAR)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dosym ${PN} /usr/bin/gorge
-	dosym ${PN} /usr/bin/regorge
-	dosym ${PN}.1.bz2 /usr/share/man/man1/gorge.1.bz2
-	dosym ${PN}.1.bz2 /usr/share/man/man1/reorge.1.bz2
-}
diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index 0ed05aef891d..5195e52b40a5 100644
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
diff --git a/app-cdr/cdrdao/Manifest b/app-cdr/cdrdao/Manifest
index 58b7fa08317c..392b9bd7266a 100644
--- a/app-cdr/cdrdao/Manifest
+++ b/app-cdr/cdrdao/Manifest
@@ -3,6 +3,10 @@ AUX cdrdao-1.2.3-glibc212.patch 260 BLAKE2B 6f84d32fc4b3e2254c61453f6e0a77c99b6f
 AUX cdrdao-1.2.3-lame-3.100.patch 737 BLAKE2B 63765fe4b6a689705bc9eaf08ce823e3b8e0f004d1d5141c65d133e743c58b52bfcd599e950d6114450f12230b3c932a76ae903a54c2d1a77ffe803654af52a8 SHA512 bf6aa3cba34317c87a008c2c6b698be51a7e544a28bb6f7d5d42719a71e78e08903a89e7544ffd54b8d7d9d01d1f996e6d599263f0f10a4f043e33b1b45e8913
 AUX cdrdao-1.2.3-unsigned-char.patch 1119 BLAKE2B e5e52f03541d77740dd4a61f6b275e2f6edf0045c1671539745d42b60c11fda623e3b983801efa6979bdea1fdefad23293d2156ebbce37d7fdf39d20eb7f98f1 SHA512 77227662a86f17a10841e4b3085d9c40067f7a1c46694e188371018e200ec8bd94ae2fdd86143bba9cc345211abfdaf197e4aa2dd8cb1b1749b954ef70055cf2
 AUX cdrdao-1.2.3-wformat-security.patch 6279 BLAKE2B dabab6d2575e24b5bfcf690daa634cfbd795d18930e03fc9acfcf630408fcb6e60af077053a577507725365a23083c273f43f5efea65f8c58189279085a2e472 SHA512 aff829cf227658ac1a11975c818385999ee91582f239bd70ad440021cd08554cf80c29470683f55ca9d50aef05e33b326e853ba022ecfa9e7eae84fb4c51acd3
+AUX cdrdao-1.2.4-ax_pthread.patch 16846 BLAKE2B a76c7c68c53a57731e652325d98f9f2ce434c9c9385e8583fb948fe2e1c120ad564a95bc247993493afbef1163206c30fc8a141d72ee723b3bcabb20a5f9f36a SHA512 83789963569dbaa599294bd79447e3351309675817eef683e2f90974d68fda00c705eca43c015128d6c6e9ec98f14bf7f205f8e3ab46f33c1bf0afaf0f055694
+AUX cdrdao-1.2.4-wformat-security.patch 4864 BLAKE2B fa300eefe5d714de0245a9e745d13f051dcbc14590efb33a367dd113474984618e62e347fc3cdc26a057169ff95bdde25b36d9b7bcb25aa9cdd5fd9b07a42ec1 SHA512 a40fd8c91fa207ad52f3cde9318fc4422f14aeea15bab4d2cd1e04d3f09a2fc2b666397cdbddc89245c97a6a98ac155c0ecf71c1e2993a366a21016bd337a33e
 DIST cdrdao-1.2.3.tar.bz2 1428695 BLAKE2B d5d8e9f2f17b4e4a385e226233d219afdf48fa98bade0dad57292ba45fc4f25c3bb146289884c9ad35224c26a826b305c6f8a1e43c22fe7f1cbd812f1a69790a SHA512 36b14180acf476de062f5f31e2b9dece39e3cc7a84552e80a6714931fa35d6090ec90ddfcdbd2651d690be8ce3fc78d483aa13856c3c311bcc2f571f0040adf6
+DIST cdrdao-1.2.4.tar.bz2 1442181 BLAKE2B e1163b25c165a7acd7ec8c53069794724d93f09a486150255a58985e3fd0a222ba7ac5c124cb7a6991cf440ac701651be38754615fd3d0d295affa93595dc388 SHA512 41f20275ca44ec9003d0e3ed280cc98012353005cda6f544ebfa44f3f79f991845c0ef17af74db9456f1bacc342a7fd48c9e942d757927a4a9ff91808f7bbb09
 EBUILD cdrdao-1.2.3-r4.ebuild 1363 BLAKE2B 39976860881ab6c78968cbc03705cc52d693a25f82ca444567d7904ac6c517bc0e68c73279caf7b76cec3c663095435ec3907dbb842c61fb5e87c79fbbac96d8 SHA512 61bf45c88cb48a58375cee24fa82df7d45d2e4f3ca1d9712d087e625b8aee20c014a4954be6e47a2dd1a8d7466e72a7b1b47f39cab5e8821f0beb0ebc5b2786c
+EBUILD cdrdao-1.2.4.ebuild 1300 BLAKE2B 1dcec4244516cf139cf47d703d9050f4f18dee304a07b603161ad439f044e3f3915eaed6df8ebfb789dbfba43752b1df471074b49002125c530f502d5caca49d SHA512 a7a8a64be2514108efa4dfb31d9c332b8fcf12dc9c90794a2d01d431ee398872297d98d02e5ec13bf67574a01b8782dd7bc4eff6e95ea9566dc3dd03b2136fe7
 MISC metadata.xml 395 BLAKE2B 271ac8836e1bc4bd8b8405ab9fdfdaaa4046b47bb44b07bdb78d063853a82433117d69d4dd46e89b4f42008b55f10e69d8262340bd29fe396061add32ed9959a SHA512 66d6f12a07e09dd91c828d34941963b1a498e1be14f0cadcb145b47471e148559280fb237a68c1d99ba3c2360e0603a231f124b950b3debde76fe476a5491351
diff --git a/app-cdr/cdrdao/cdrdao-1.2.4.ebuild b/app-cdr/cdrdao/cdrdao-1.2.4.ebuild
new file mode 100644
index 000000000000..f856d437c8c5
--- /dev/null
+++ b/app-cdr/cdrdao/cdrdao-1.2.4.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="Burn CDs in disk-at-once mode -- with optional GUI frontend"
+HOMEPAGE="http://cdrdao.sourceforge.net/"
+if [[ ${PV/*_rc*} ]]
+then
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+else
+	SRC_URI="http://www.poolshark.org/src/${P/_}.tar.bz2"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="encode mad vorbis"
+
+COMMON_DEPEND="
+	virtual/cdrtools
+	encode? ( >=media-sound/lame-3.99 )
+	mad? (
+		media-libs/libmad
+		media-libs/libao
+	)
+	vorbis? (
+		media-libs/libvorbis
+		media-libs/libao
+	)"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}
+	!app-cdr/cue2toc
+	!dev-util/pccts"
+
+PATCHES=(
+	"${FILESDIR}/${P}-ax_pthread.patch"
+	"${FILESDIR}/${P}-wformat-security.patch"
+)
+
+S="${WORKDIR}/${P/_}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# Fix building with latest libsigc++
+	append-cxxflags -std=c++11
+	find -name '*.h' -exec sed -i '/sigc++\/object.h/d' {} + || die
+
+	local myeconfargs=(
+		--without-gcdmaster
+		$(use_with vorbis ogg-support)
+		$(use_with mad mp3-support)
+		$(use_with encode lame)
+	)
+	econf "${myeconfargs[@]}"
+}
diff --git a/app-cdr/cdrdao/files/cdrdao-1.2.4-ax_pthread.patch b/app-cdr/cdrdao/files/cdrdao-1.2.4-ax_pthread.patch
new file mode 100644
index 000000000000..fe052db02af7
--- /dev/null
+++ b/app-cdr/cdrdao/files/cdrdao-1.2.4-ax_pthread.patch
@@ -0,0 +1,418 @@
+Use AX_PTHREAD for finding proper pthread flags. Forcibly add these flags
+to CFLAGS, CXXFLAGS and LIBS.
+Also use AM_PROG_AR to detect proper ar
+See also: https://bugs.gentoo.org/548004
+
+--- cdrdao-1.2.4/configure.ac
++++ cdrdao-1.2.4/configure.ac
+@@ -2,6 +2,7 @@
+ AC_REVISION($Revision: 1.26 $)dnl
+ 
+ AC_INIT(cdrdao, 1.2.4)
++AC_CONFIG_MACRO_DIR([m4])
+ 
+ AC_CONFIG_SRCDIR(dao/main.cc)
+ AM_INIT_AUTOMAKE
+@@ -32,7 +33,7 @@
+ AC_PROG_CPP
+ AC_PROG_INSTALL
+ AC_PROG_RANLIB
+-AC_CHECK_PROG(AR,ar,ar)
++AM_PROG_AR
+ AC_PROG_MAKE_SET
+ AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+ 
+@@ -113,7 +114,10 @@
+ fi
+ 
+ if test "$use_pthreads" = yes; then
+-  AC_CHECK_FUNC(pthread_create,have_pthread_std=yes,have_pthread_std=no)
++  AX_PTHREAD([have_pthread_std=yes],[have_pthread_std=no])
++  LIBS="$PTHREAD_LIBS $PTHREAD_CFLAGS $LIBS"
++  CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
++  CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS"
+ 
+   if test "$have_pthread_std" = yes; then
+     AC_DEFINE(USE_POSIX_THREADS,1,"")
+--- cdrdao-1.2.4/m4/ax_pthread.m4
++++ cdrdao-1.2.4/m4/ax_pthread.m4
+@@ -0,0 +1,332 @@
++# ===========================================================================
++#        http://www.gnu.org/software/autoconf-archive/ax_pthread.html
++# ===========================================================================
++#
++# SYNOPSIS
++#
++#   AX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
++#
++# DESCRIPTION
++#
++#   This macro figures out how to build C programs using POSIX threads. It
++#   sets the PTHREAD_LIBS output variable to the threads library and linker
++#   flags, and the PTHREAD_CFLAGS output variable to any special C compiler
++#   flags that are needed. (The user can also force certain compiler
++#   flags/libs to be tested by setting these environment variables.)
++#
++#   Also sets PTHREAD_CC to any special C compiler that is needed for
++#   multi-threaded programs (defaults to the value of CC otherwise). (This
++#   is necessary on AIX to use the special cc_r compiler alias.)
++#
++#   NOTE: You are assumed to not only compile your program with these flags,
++#   but also link it with them as well. e.g. you should link with
++#   $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS
++#
++#   If you are only building threads programs, you may wish to use these
++#   variables in your default LIBS, CFLAGS, and CC:
++#
++#     LIBS="$PTHREAD_LIBS $LIBS"
++#     CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
++#     CC="$PTHREAD_CC"
++#
++#   In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant
++#   has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to that name
++#   (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
++#
++#   Also HAVE_PTHREAD_PRIO_INHERIT is defined if pthread is found and the
++#   PTHREAD_PRIO_INHERIT symbol is defined when compiling with
++#   PTHREAD_CFLAGS.
++#
++#   ACTION-IF-FOUND is a list of shell commands to run if a threads library
++#   is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it
++#   is not found. If ACTION-IF-FOUND is not specified, the default action
++#   will define HAVE_PTHREAD.
++#
++#   Please let the authors know if this macro fails on any platform, or if
++#   you have any other suggestions or comments. This macro was based on work
++#   by SGJ on autoconf scripts for FFTW (http://www.fftw.org/) (with help
++#   from M. Frigo), as well as ac_pthread and hb_pthread macros posted by
++#   Alejandro Forero Cuervo to the autoconf macro repository. We are also
++#   grateful for the helpful feedback of numerous users.
++#
++#   Updated for Autoconf 2.68 by Daniel Richard G.
++#
++# LICENSE
++#
++#   Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu>
++#   Copyright (c) 2011 Daniel Richard G. <skunk@iSKUNK.ORG>
++#
++#   This program is free software: you can redistribute it and/or modify it
++#   under the terms of the GNU General Public License as published by the
++#   Free Software Foundation, either version 3 of the License, or (at your
++#   option) any later version.
++#
++#   This program is distributed in the hope that it will be useful, but
++#   WITHOUT ANY WARRANTY; without even the implied warranty of
++#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
++#   Public License for more details.
++#
++#   You should have received a copy of the GNU General Public License along
++#   with this program. If not, see <http://www.gnu.org/licenses/>.
++#
++#   As a special exception, the respective Autoconf Macro's copyright owner
++#   gives unlimited permission to copy, distribute and modify the configure
++#   scripts that are the output of Autoconf when processing the Macro. You
++#   need not follow the terms of the GNU General Public License when using
++#   or distributing such scripts, even though portions of the text of the
++#   Macro appear in them. The GNU General Public License (GPL) does govern
++#   all other use of the material that constitutes the Autoconf Macro.
++#
++#   This special exception to the GPL applies to versions of the Autoconf
++#   Macro released by the Autoconf Archive. When you make and distribute a
++#   modified version of the Autoconf Macro, you may extend this special
++#   exception to the GPL to apply to your modified version as well.
++
++#serial 21
++
++AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD])
++AC_DEFUN([AX_PTHREAD], [
++AC_REQUIRE([AC_CANONICAL_HOST])
++AC_LANG_PUSH([C])
++ax_pthread_ok=no
++
++# We used to check for pthread.h first, but this fails if pthread.h
++# requires special compiler flags (e.g. on True64 or Sequent).
++# It gets checked for in the link test anyway.
++
++# First of all, check if the user has set any of the PTHREAD_LIBS,
++# etcetera environment variables, and if threads linking works using
++# them:
++if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
++        save_CFLAGS="$CFLAGS"
++        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
++        save_LIBS="$LIBS"
++        LIBS="$PTHREAD_LIBS $LIBS"
++        AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS])
++        AC_TRY_LINK_FUNC([pthread_join], [ax_pthread_ok=yes])
++        AC_MSG_RESULT([$ax_pthread_ok])
++        if test x"$ax_pthread_ok" = xno; then
++                PTHREAD_LIBS=""
++                PTHREAD_CFLAGS=""
++        fi
++        LIBS="$save_LIBS"
++        CFLAGS="$save_CFLAGS"
++fi
++
++# We must check for the threads library under a number of different
++# names; the ordering is very important because some systems
++# (e.g. DEC) have both -lpthread and -lpthreads, where one of the
++# libraries is broken (non-POSIX).
++
++# Create a list of thread flags to try.  Items starting with a "-" are
++# C compiler flags, and other items are library names, except for "none"
++# which indicates that we try without any flags at all, and "pthread-config"
++# which is a program returning the flags for the Pth emulation library.
++
++ax_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
++
++# The ordering *is* (sometimes) important.  Some notes on the
++# individual items follow:
++
++# pthreads: AIX (must check this before -lpthread)
++# none: in case threads are in libc; should be tried before -Kthread and
++#       other compiler flags to prevent continual compiler warnings
++# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
++# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
++# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
++# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads)
++# -pthreads: Solaris/gcc
++# -mthreads: Mingw32/gcc, Lynx/gcc
++# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
++#      doesn't hurt to check since this sometimes defines pthreads too;
++#      also defines -D_REENTRANT)
++#      ... -mt is also the pthreads flag for HP/aCC
++# pthread: Linux, etcetera
++# --thread-safe: KAI C++
++# pthread-config: use pthread-config program (for GNU Pth library)
++
++case ${host_os} in
++        solaris*)
++
++        # On Solaris (at least, for some versions), libc contains stubbed
++        # (non-functional) versions of the pthreads routines, so link-based
++        # tests will erroneously succeed.  (We need to link with -pthreads/-mt/
++        # -lpthread.)  (The stubs are missing pthread_cleanup_push, or rather
++        # a function called by this macro, so we could check for that, but
++        # who knows whether they'll stub that too in a future libc.)  So,
++        # we'll just look for -pthreads and -lpthread first:
++
++        ax_pthread_flags="-pthreads pthread -mt -pthread $ax_pthread_flags"
++        ;;
++
++        darwin*)
++        ax_pthread_flags="-pthread $ax_pthread_flags"
++        ;;
++esac
++
++# Clang doesn't consider unrecognized options an error unless we specify
++# -Werror. We throw in some extra Clang-specific options to ensure that
++# this doesn't happen for GCC, which also accepts -Werror.
++
++AC_MSG_CHECKING([if compiler needs -Werror to reject unknown flags])
++save_CFLAGS="$CFLAGS"
++ax_pthread_extra_flags="-Werror"
++CFLAGS="$CFLAGS $ax_pthread_extra_flags -Wunknown-warning-option -Wsizeof-array-argument"
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([int foo(void);],[foo()])],
++                  [AC_MSG_RESULT([yes])],
++                  [ax_pthread_extra_flags=
++                   AC_MSG_RESULT([no])])
++CFLAGS="$save_CFLAGS"
++
++if test x"$ax_pthread_ok" = xno; then
++for flag in $ax_pthread_flags; do
++
++        case $flag in
++                none)
++                AC_MSG_CHECKING([whether pthreads work without any flags])
++                ;;
++
++                -*)
++                AC_MSG_CHECKING([whether pthreads work with $flag])
++                PTHREAD_CFLAGS="$flag"
++                ;;
++
++                pthread-config)
++                AC_CHECK_PROG([ax_pthread_config], [pthread-config], [yes], [no])
++                if test x"$ax_pthread_config" = xno; then continue; fi
++                PTHREAD_CFLAGS="`pthread-config --cflags`"
++                PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
++                ;;
++
++                *)
++                AC_MSG_CHECKING([for the pthreads library -l$flag])
++                PTHREAD_LIBS="-l$flag"
++                ;;
++        esac
++
++        save_LIBS="$LIBS"
++        save_CFLAGS="$CFLAGS"
++        LIBS="$PTHREAD_LIBS $LIBS"
++        CFLAGS="$CFLAGS $PTHREAD_CFLAGS $ax_pthread_extra_flags"
++
++        # Check for various functions.  We must include pthread.h,
++        # since some functions may be macros.  (On the Sequent, we
++        # need a special flag -Kthread to make this header compile.)
++        # We check for pthread_join because it is in -lpthread on IRIX
++        # while pthread_create is in libc.  We check for pthread_attr_init
++        # due to DEC craziness with -lpthreads.  We check for
++        # pthread_cleanup_push because it is one of the few pthread
++        # functions on Solaris that doesn't have a non-functional libc stub.
++        # We try pthread_create on general principles.
++        AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>
++                        static void routine(void *a) { a = 0; }
++                        static void *start_routine(void *a) { return a; }],
++                       [pthread_t th; pthread_attr_t attr;
++                        pthread_create(&th, 0, start_routine, 0);
++                        pthread_join(th, 0);
++                        pthread_attr_init(&attr);
++                        pthread_cleanup_push(routine, 0);
++                        pthread_cleanup_pop(0) /* ; */])],
++                [ax_pthread_ok=yes],
++                [])
++
++        LIBS="$save_LIBS"
++        CFLAGS="$save_CFLAGS"
++
++        AC_MSG_RESULT([$ax_pthread_ok])
++        if test "x$ax_pthread_ok" = xyes; then
++                break;
++        fi
++
++        PTHREAD_LIBS=""
++        PTHREAD_CFLAGS=""
++done
++fi
++
++# Various other checks:
++if test "x$ax_pthread_ok" = xyes; then
++        save_LIBS="$LIBS"
++        LIBS="$PTHREAD_LIBS $LIBS"
++        save_CFLAGS="$CFLAGS"
++        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
++
++        # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
++        AC_MSG_CHECKING([for joinable pthread attribute])
++        attr_name=unknown
++        for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
++            AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>],
++                           [int attr = $attr; return attr /* ; */])],
++                [attr_name=$attr; break],
++                [])
++        done
++        AC_MSG_RESULT([$attr_name])
++        if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then
++            AC_DEFINE_UNQUOTED([PTHREAD_CREATE_JOINABLE], [$attr_name],
++                               [Define to necessary symbol if this constant
++                                uses a non-standard name on your system.])
++        fi
++
++        AC_MSG_CHECKING([if more special flags are required for pthreads])
++        flag=no
++        case ${host_os} in
++            aix* | freebsd* | darwin*) flag="-D_THREAD_SAFE";;
++            osf* | hpux*) flag="-D_REENTRANT";;
++            solaris*)
++            if test "$GCC" = "yes"; then
++                flag="-D_REENTRANT"
++            else
++                # TODO: What about Clang on Solaris?
++                flag="-mt -D_REENTRANT"
++            fi
++            ;;
++        esac
++        AC_MSG_RESULT([$flag])
++        if test "x$flag" != xno; then
++            PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
++        fi
++
++        AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT],
++            [ax_cv_PTHREAD_PRIO_INHERIT], [
++                AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]],
++                                                [[int i = PTHREAD_PRIO_INHERIT;]])],
++                    [ax_cv_PTHREAD_PRIO_INHERIT=yes],
++                    [ax_cv_PTHREAD_PRIO_INHERIT=no])
++            ])
++        AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes"],
++            [AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], [1], [Have PTHREAD_PRIO_INHERIT.])])
++
++        LIBS="$save_LIBS"
++        CFLAGS="$save_CFLAGS"
++
++        # More AIX lossage: compile with *_r variant
++        if test "x$GCC" != xyes; then
++            case $host_os in
++                aix*)
++                AS_CASE(["x/$CC"],
++                  [x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6],
++                  [#handle absolute path differently from PATH based program lookup
++                   AS_CASE(["x$CC"],
++                     [x/*],
++                     [AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])],
++                     [AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])])])
++                ;;
++            esac
++        fi
++fi
++
++test -n "$PTHREAD_CC" || PTHREAD_CC="$CC"
++
++AC_SUBST([PTHREAD_LIBS])
++AC_SUBST([PTHREAD_CFLAGS])
++AC_SUBST([PTHREAD_CC])
++
++# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
++if test x"$ax_pthread_ok" = xyes; then
++        ifelse([$1],,[AC_DEFINE([HAVE_PTHREAD],[1],[Define if you have POSIX threads libraries and header files.])],[$1])
++        :
++else
++        ax_pthread_ok=no
++        $2
++fi
++AC_LANG_POP
++])dnl AX_PTHREAD
+--- cdrdao-1.2.4/m4/gconf-2.m4
++++ cdrdao-1.2.4/m4/gconf-2.m4
+@@ -0,0 +1,44 @@
++dnl AM_GCONF_SOURCE_2
++dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
++dnl  (i.e. pass to gconftool-2
++dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
++dnl  you should install foo.schemas files
++dnl
++
++AC_DEFUN([AM_GCONF_SOURCE_2],
++[
++  if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
++    GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
++  else
++    GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
++  fi
++
++  AC_ARG_WITH([gconf-source],
++	      AC_HELP_STRING([--with-gconf-source=sourceaddress],
++			     [Config database for installing schema files.]),
++	      [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],)
++
++  AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
++  AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
++
++  if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
++    GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
++  fi
++
++  AC_ARG_WITH([gconf-schema-file-dir],
++	      AC_HELP_STRING([--with-gconf-schema-file-dir=dir],
++			     [Directory for installing schema files.]),
++	      [GCONF_SCHEMA_FILE_DIR="$withval"],)
++
++  AC_SUBST(GCONF_SCHEMA_FILE_DIR)
++  AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
++
++  AC_ARG_ENABLE(schemas-install,
++  	AC_HELP_STRING([--disable-schemas-install],
++		       [Disable the schemas installation]),
++     [case ${enableval} in
++       yes|no) ;;
++       *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;;
++      esac])
++  AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
++])
diff --git a/app-cdr/cdrdao/files/cdrdao-1.2.4-wformat-security.patch b/app-cdr/cdrdao/files/cdrdao-1.2.4-wformat-security.patch
new file mode 100644
index 000000000000..92ebbdc37460
--- /dev/null
+++ b/app-cdr/cdrdao/files/cdrdao-1.2.4-wformat-security.patch
@@ -0,0 +1,130 @@
+Fix -Werror=format-security errors
+Also fix incorrect printf() format specifiers
+https://bugs.gentoo.org/show_bug.cgi?id=520988
+
+* gen.c: In function 'genHdr':
+* gen.c:3869:17: error: format not a string literal and no format arguments [-Werror=format-security]
+
+--- cdrdao-1.2.4/pccts/antlr/bits.c
++++ cdrdao-1.2.4/pccts/antlr/bits.c
+@@ -574,13 +574,13 @@
+ 	else
+ 		fprintf(DefFile, "extern SetWordType zzerr%d[];\n", esetnum);
+ 	if ( name!=NULL ) {
+-		fprintf(ErrFile, "SetWordType %s%s[%d] = {",
++		fprintf(ErrFile, "SetWordType %s%s[%lu] = {",
+ 				name,
+                 suffix,
+ 				NumWords(TokenNum-1)*sizeof(unsigned));
+ 	}
+ 	else {
+-		fprintf(ErrFile, "SetWordType zzerr%d[%d] = {",
++		fprintf(ErrFile, "SetWordType zzerr%d[%lu] = {",
+ 				esetnum,
+ 				NumWords(TokenNum-1)*sizeof(unsigned));
+ 	}
+@@ -642,20 +642,20 @@
+ 	esetnum++;
+ 
+ 	if ( name!=NULL ) {
+-		fprintf(Parser_h, "\tstatic SetWordType %s%s[%d];\n", name, suffix,
++		fprintf(Parser_h, "\tstatic SetWordType %s%s[%lu];\n", name, suffix,
+ 				NumWords(TokenNum-1)*sizeof(unsigned));
+-		fprintf(Parser_c, "SetWordType %s::%s%s[%d] = {",
++		fprintf(Parser_c, "SetWordType %s::%s%s[%lu] = {",
+ 				CurrentClassName,
+ 				name,
+ 				suffix,
+ 				NumWords(TokenNum-1)*sizeof(unsigned));
+ 	}
+ 	else {
+-		fprintf(Parser_c, "SetWordType %s::err%d[%d] = {",
++		fprintf(Parser_c, "SetWordType %s::err%d[%lu] = {",
+ 				CurrentClassName,
+ 				esetnum,
+ 				NumWords(TokenNum-1)*sizeof(unsigned));
+-		fprintf(Parser_h, "\tstatic SetWordType err%d[%d];\n", esetnum,
++		fprintf(Parser_h, "\tstatic SetWordType err%d[%lu];\n", esetnum,
+ 				NumWords(TokenNum-1)*sizeof(unsigned));
+ 	}
+ 
+@@ -788,7 +788,7 @@
+ 
+ 	/* Build constructors */
+ 	fprintf(Parser_c, "\n%s::", CurrentClassName);
+-	fprintf(Parser_c,	"%s(ANTLRTokenBuffer *input) : %s(input,%d,%d,%d,%d)\n",
++	fprintf(Parser_c,	"%s(ANTLRTokenBuffer *input) : %s(input,%d,%d,%d,%lu)\n",
+ 						CurrentClassName,
+ 						(BaseClassName == NULL ? "ANTLRParser" : BaseClassName),
+ 						OutputLL_k,
+@@ -913,7 +913,7 @@
+ #ifdef DUM
+ 	if ( LexGen ) fprintf(ErrFile, "#define zzEOF_TOKEN %d\n", (TokenInd!=NULL?TokenInd[EofToken]:EofToken));
+ #endif
+-	fprintf(ErrFile, "#define zzSET_SIZE %d\n", NumWords(TokenNum-1)*sizeof(unsigned));
++	fprintf(ErrFile, "#define zzSET_SIZE %lu\n", NumWords(TokenNum-1)*sizeof(unsigned));
+ 	if ( DemandLookahead ) fprintf(ErrFile, "#define DEMAND_LOOK\n");
+ 	fprintf(ErrFile, "#include \"antlr.h\"\n");
+ 	if ( GenAST ) fprintf(ErrFile, "#include \"ast.h\"\n");
+--- cdrdao-1.2.4/pccts/antlr/gen.c
++++ cdrdao-1.2.4/pccts/antlr/gen.c
+@@ -159,7 +159,7 @@
+ #define gen6(s,a,b,c,d,e,f)	{tab(); fprintf(output, s,a,b,c,d,e,f);}
+ #define gen7(s,a,b,c,d,e,f,g)	{tab(); fprintf(output, s,a,b,c,d,e,f,g);}
+ 
+-#define _gen(s)			{fprintf(output, s);}
++#define _gen(s)			{fprintf(output, "%s", s);}
+ #define _gen1(s,a)		{fprintf(output, s,a);}
+ #define _gen2(s,a,b)	{fprintf(output, s,a,b);}
+ #define _gen3(s,a,b,c)	{fprintf(output, s,a,b,c);}
+@@ -3911,7 +3911,7 @@
+ 	}
+ #endif
+ 	/* ###WARNING: This will have to change when SetWordSize changes */
+-	if ( !GenCC ) _gen1("#define zzSET_SIZE %d\n", NumWords(TokenNum-1)*sizeof(unsigned));
++	if ( !GenCC ) _gen1("#define zzSET_SIZE %lu\n", NumWords(TokenNum-1)*sizeof(unsigned));
+     if (TraceGen) {
+       _gen("#ifndef zzTRACE_RULES\n");  /* MR20 */
+       _gen("#define zzTRACE_RULES\n");  /* MR20 */
+@@ -4125,7 +4125,7 @@
+ 	if ( LexGen ) fprintf(f, "#define zzEOF_TOKEN %d\n", (TokenInd!=NULL?TokenInd[EofToken]:EofToken));
+ #endif
+ 	/* ###WARNING: This will have to change when SetWordSize changes */
+-	fprintf(f, "#define zzSET_SIZE %d\n", NumWords(TokenNum-1)*sizeof(unsigned));
++	fprintf(f, "#define zzSET_SIZE %lu\n", NumWords(TokenNum-1)*sizeof(unsigned));
+     if (TraceGen) {
+       fprintf(f,"#ifndef zzTRACE_RULES\n");  /* MR20 */
+       fprintf(f,"#define zzTRACE_RULES\n");  /* MR20 */
+--- cdrdao-1.2.4/pccts/antlr/set.c
++++ cdrdao-1.2.4/pccts/antlr/set.c
+@@ -263,7 +263,7 @@
+ 	static set a;
+ 
+ 	if ( b == nil ) return( empty );
+-	set_new(a, b);
++	set_new(a, (long unsigned int) b);
+ 	a.setword[DIVWORD(b)] = bitmask[MODWORD(b)];
+ 
+ 	return(a);
+--- cdrdao-1.2.4/pccts/dlg/set.c
++++ cdrdao-1.2.4/pccts/dlg/set.c
+@@ -263,7 +263,7 @@
+ 	static set a;
+ 
+ 	if ( b == nil ) return( empty );
+-	set_new(a, b);
++	set_new(a, (long unsigned int) b);
+ 	a.setword[DIVWORD(b)] = bitmask[MODWORD(b)];
+ 
+ 	return(a);
+--- cdrdao-1.2.4/pccts/h/set.h
++++ cdrdao-1.2.4/pccts/h/set.h
+@@ -55,7 +55,7 @@
+ /* make arg1 a set big enough to hold max elem # of arg2 */
+ #define set_new(a,_max) \
+ if (((a).setword=(unsigned *)calloc(NumWords(_max),BytesPerWord))==NULL) \
+-        fprintf(stderr, "set_new: Cannot allocate set with max of %d\n", _max); \
++        fprintf(stderr, "set_new: Cannot allocate set with max of %lu\n", _max); \
+         (a).n = NumWords(_max);
+ 
+ #define set_free(a)									\
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index b373ff8c85ed..e29096cbbc6e 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
index 1ad98e7fa14b..4fa730c7af3d 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -2,5 +2,5 @@ AUX qca-2.1.3-c++11.patch 3555 BLAKE2B 68b9e4a9e13543b2f98c564f19deef32090be25bb
 AUX qca-disable-pgp-test.patch 446 BLAKE2B a98d5951d7b89c65787d7d586a5504949c51271ebe09c5e19b90a2e24f24fb6d03d6c1f76d7ad4234354bc2507cf7031c716b3b2bf8243b8c1d85065079dded4 SHA512 30bb6d31b9392166d6bbae39da2eeb1788ac9cccffb801b074468a3606a6e1a56d6a41ee276d3b8b8d39112bf6aea7025f07f4810bb835102bd00521ee9eb104
 DIST qca-2.1.3.tar.xz 686340 BLAKE2B 60ebf9add907632ed17426ee53c6c35a9aed279a4492012f1c174608cbe9579d366feb7ff7bff551d2e9e4ef2f271e8f340fcb4c9e1f67f209657d388567d44f SHA512 0aec277e0695da2e45298f0a9006213829fe4c449a79969e472947db54f45000ba6e22361b782465bdc03f269b7301d318c843f5a83db459a118e58a03f3116a
 EBUILD qca-2.1.3-r1.ebuild 2719 BLAKE2B cc8c3ed0071caf9c474c2ecaab4cdca0d1db9a53f0324ff2bf2741e26363a90f685a088cc7159853347387928ca466d6723f74513b486a4c543d92a0a85a6bd0 SHA512 395f82a689752d6248e64c94e535e60fe0ed78c1e5592fa78ff9ee2e52c6410520a7f37fef61fe7bcdf3a3d50797ab3edbd797923278d9c7761541c972e03f07
-EBUILD qca-2.1.3-r2.ebuild 2150 BLAKE2B 7f12cb90bcf417ec0652f2f5fd203b196aa39f86c036ac2fcbd82e90c3bad197636acb83cba7eb7236b198dbe12576915582ae2ceb961e72969a1c2babb8a9c0 SHA512 34e2dd86037f684defe4896455f233edaebfff306a07a47d377c251b61b351c8358e23c8cd6f7ecf70d3ebc238332328d5c8023d029453203cfdc9d16417d3e5
+EBUILD qca-2.1.3-r2.ebuild 2147 BLAKE2B acba740fb4bb5b794fca5a1956fece33af370956edb894416942f8eedbf4a8bb9f973c53e5cef47bbff0fa21b07ed43242ac777d3bbad625f6c750e173c7623d SHA512 dc3482e9681d71f582f6b16bdba54e8560202f9f4e4b2f97552b23ca132033eea10bd8dcb7ad23f2d01985bb7632d2147b89ae733e4b685554adda4e0f702a0d
 MISC metadata.xml 842 BLAKE2B 1732f7a0efeba7de6c54bfb817a69f9be88eab8bb37a75f5ee685ba7893ad9be13a10ea8b2a404954846e1ea73dc617d0a89ac3b1f69a83928275b9e8d5fc7ab SHA512 900de0e8b914d1970b3e4fcfbdbeea48c1e56ab596e6c959e4dce29a0fd0cb0b6969ab6899784a80b6c233a656f3a4501513d8af6b4acc8519a5ecf1c9a1a622
diff --git a/app-crypt/qca/qca-2.1.3-r2.ebuild b/app-crypt/qca/qca-2.1.3-r2.ebuild
index 396b23660490..36d32fac5278 100644
--- a/app-crypt/qca/qca-2.1.3-r2.ebuild
+++ b/app-crypt/qca/qca-2.1.3-r2.ebuild
@@ -82,7 +82,7 @@ src_install() {
 
 	if use doc; then
 		pushd "${BUILD_DIR}" >/dev/null || die
-		doxygen Doxyfile.in || die
+		doxygen Doxyfile || die
 		dodoc -r apidocs/html
 		popd >/dev/null || die
 	fi
diff --git a/app-crypt/veracrypt/Manifest b/app-crypt/veracrypt/Manifest
index 0bdd9c033f7f..ac809c557726 100644
--- a/app-crypt/veracrypt/Manifest
+++ b/app-crypt/veracrypt/Manifest
@@ -8,5 +8,5 @@ DIST VeraCrypt_1.21.tar.gz 24106162 BLAKE2B 5afe48830bde81d91d16f0bdf16010bdbdb8
 DIST VeraCrypt_1.22.tar.gz 24820384 BLAKE2B 52fb822d07af96a9f47c17f8aacf13a949fb5a7c5d064a720e003e6d1bfbb5f221a5823720527e1f2c82f08547d77349cc90bc839336a622efcf1836dd97bb88 SHA512 83cdaf673bc9cdeadeb70b2beeabf87a2a9a65d3b0b0cc7fdf9c87671714af1e207ddd1db716302919e2d14414f5d4dd9d8f5203847d72834f53544a04c1a62a
 EBUILD veracrypt-1.19.ebuild 1988 BLAKE2B 20e3a4725dc5b8d319a11cb44d5865afcdcc6f956ff8c3390ed225f605e01b01537db1af5aa1c82deb7c236b27eea69cbc0c29b2f2f4b770fae4514360c45a2d SHA512 b9829bad13c5ba781d9ec2e8353ed72f30a23459d3e9eaa7384a5718be051f1eeff70c3c097225c8f557c57634d7b14b5db83bb189671630c673568667e67da0
 EBUILD veracrypt-1.21.ebuild 1921 BLAKE2B 1adf1a612afa33dc2cdbed7f0bc971e84e3ec45236ee6d7d7bf317c00a6b03a57eda5b30c85f8aeb4684abbd9879b9dab40b9dc2ceb6cffe36946a74ba1544dd SHA512 1766b6db76015cc6fb6f147a8ba1f75795b7038d402c38129c60cbdb09831dd0aed2241d4ec9d403cffa8dfe38f3481085c64ae653a49362be39c08f462de1dc
-EBUILD veracrypt-1.22.ebuild 2066 BLAKE2B f092deec3e48e6b0dfe50d8c5768770b1aaca5e2a65adffd8ac4a7f86ff458f8927267f36b53b7a3e2878920b3f1e393476f9b3bed7bd52cdcce9fa5cc19d09a SHA512 1a455b646f8ebe271f8e5493113a82007562e1cd7f7fca6ec984da95229674a9dee068b4778f2f07a399a491f2272ac20953d82edb574d4c767903a8332a4fd9
+EBUILD veracrypt-1.22.ebuild 2065 BLAKE2B 98dcdbe443fae6ad4a4fa0e6086fe4c171ada85fc69f3fc9bb79d61cb512dc5f8ed6339cff5b2705a35ed7d74449bebf04dba626e63d26fb7530dbf4a9566aeb SHA512 169f927f0745dc1e6d0d6c2c6f9c25f93240b09301cb6f318a28decb4f367b35e035f5eff57d2e9902e4e8bd9a496246e580b3c2d5d57380d1aada9cc1c24ada
 MISC metadata.xml 726 BLAKE2B f70a62997301172fd3e6928dd694720fe1e7a8a41a2eb842800a220bed3531828423e2b4bcbb6c6d7f2d1d8ec96f74d1a987fac64390323662028efe57fe5d72 SHA512 7898d7a419ba57600609578ae308d558d2aacf6b7dcc625adb6adfadca9b6f580123650d63ed8a618131459f71fc9a1b2b367745e2f07da75cbdf6ef9c1595bb
diff --git a/app-crypt/veracrypt/veracrypt-1.22.ebuild b/app-crypt/veracrypt/veracrypt-1.22.ebuild
index 98de71aa6704..c1e8355fcbf2 100644
--- a/app-crypt/veracrypt/veracrypt-1.22.ebuild
+++ b/app-crypt/veracrypt/veracrypt-1.22.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/${PN}/VeraCrypt/archive/VeraCrypt_${PV}.tar.gz"
 
 LICENSE="Apache-2.0 truecrypt-3.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="+asm cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3 +doc X"
 RESTRICT="bindist mirror"
 
diff --git a/app-crypt/xca/Manifest b/app-crypt/xca/Manifest
index c2b2e8cdca38..528bc9c6b9e9 100644
--- a/app-crypt/xca/Manifest
+++ b/app-crypt/xca/Manifest
@@ -5,5 +5,5 @@ DIST xca-1.4.0.tar.gz 940245 BLAKE2B 1f0c9d72b647fa803c2b6b6019b0b9828f37b1d38d8
 DIST xca-1.4.1.tar.gz 959107 BLAKE2B 7437cdbaa5277998de200e9a5ad3a7d44aed9ae8af8fd926d7ed1917d49bec79562455ca2e82557149d748840f299ffd66edfc7f265be7d5bdcd6e4fe8dbaf9b SHA512 8294669c4887ba7a9060c3c2c06014b8a1807898569842ed61c066e8a864de014fba51a2ff867b579048083fdd4934cc7f97c92268de4944bf4aafea9c2e7b42
 EBUILD xca-1.3.2-r2.ebuild 1107 BLAKE2B 40eaa44f511936f3be91eda8632bafba91511e9596e0fffdca6f53acf75e2fe11d6725e136cdc8c5d1fcd1bc4ec467dbb26f5c29ed9763185447c5ebbf59a6d5 SHA512 9379423c902b218ba5b7d60de2d8074c05e7a65a2223e723429ae47f4ef491b215ab3c68d2204f80b9d88a16207b4b30c993735e73d0ff2f5ed38b4588190de4
 EBUILD xca-1.4.0.ebuild 948 BLAKE2B d1cb112f8b1214c346f612d4c63bbc1a456a29f2a5bb57d8f86148fcad51ee4e74ad8871263f45618ee4bc1b894926d4a0576abe4d3c7b20269fc3d1e761e6b1 SHA512 31929fba97fa0a3c4c74849ecd23cfa56786cbd64af748cf4e521f534fb4a613013016dd271e81d6f2632464987359ed6f026be2d1f01f53ddc531cf225968e1
-EBUILD xca-1.4.1.ebuild 1160 BLAKE2B 54567a0e83187eb027f962096843616430e0c97f2a04c31c863324b40f25a0c095da5de4332c467c6ec8062810a74b8a041793dcd0867833340324ae0f21b5da SHA512 032795c1108e59f53f9cb7a37530cbccfa42bc7b0c5dff3789103aedf75b33e44a218e96e3c9d7bdeebacb00c4b2b1ac6cd8150e425bb57449941bd98126773e
+EBUILD xca-1.4.1.ebuild 1181 BLAKE2B e28006d2140f54762b7207b3d440600319968c6a511c4c66f084ac11a7ff5eeb82881b32b35dd0402192691ca9299eec52f683ff6a9f5eb004d2b1271ee6afea SHA512 996eb26155821bf9a2c15fcf7e95a8e1ca660c08c2bf8d8a1db26003f1044aed372d39028b75c0e5d5077bb7a222bb7f43fdef00fb3b89fa94d680b744a60d9f
 MISC metadata.xml 313 BLAKE2B 6e1376d870ee5ab083ed80dcc19c1acd60d487e285e9bdba7b92c13e97cb05a3a6fa8bc4c6107d5d54470e6ca93889fca15c1a2f7e690a169ca7aff64bd2499e SHA512 ebc38746afd94878384ef0e4d7933e2a7433216716b1854cfc0227c3f0abf0847d784d36de4b04a778743e442298abd3769329deecdc771003681ecd3dbf3fa1
diff --git a/app-crypt/xca/xca-1.4.1.ebuild b/app-crypt/xca/xca-1.4.1.ebuild
index fe1dd14b6919..dc23da6b0000 100644
--- a/app-crypt/xca/xca-1.4.1.ebuild
+++ b/app-crypt/xca/xca-1.4.1.ebuild
@@ -15,6 +15,7 @@ KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="bindist doc libressl"
 
 RDEPEND="
+	dev-libs/libltdl:0=
 	dev-qt/qtgui:5
 	dev-qt/qtwidgets:5
 	!libressl? ( dev-libs/openssl:0=[bindist=] )
diff --git a/app-crypt/yubikey-manager-qt/Manifest b/app-crypt/yubikey-manager-qt/Manifest
index a0f1fadcfe90..b7a7d4d5e306 100644
--- a/app-crypt/yubikey-manager-qt/Manifest
+++ b/app-crypt/yubikey-manager-qt/Manifest
@@ -1,3 +1,5 @@
 DIST yubikey-manager-qt-0.4.0.tar.gz 183566 BLAKE2B 2364d0d257ab5c05d0555aba4bb01ee1639a2c3a42b47173ae905945a6265b123985ad7d8fe50b0cfd38a1a0a588f3e1424aa46585ddbf50337ce2456899067e SHA512 12cef9636f06a92fdb3fce7cea5b97af3255b9cdd1b4feb4e184999eb77c17e465db927f56cd0e443a8ce8afc27b7e4be19ed07da7c41259f909ac4e98971de2
+DIST yubikey-manager-qt-0.5.1.tar 655360 BLAKE2B 6b109190750bd9675e32c836831a7e0ea286021303deffc64a351f2a127f5a5ee0190e3ca99abf0407bbb34a1a1c454f453fab464de2726f6cae539d5f865da1 SHA512 a8ceab5fd8d20eca2424d3f9a92ad12066e8fc26a7640df478965e5d9e2896fbc64885b26f599fcb2588f5b64d2f046af373f87e23ef266178ddf877e422ed36
 EBUILD yubikey-manager-qt-0.4.0-r2.ebuild 1211 BLAKE2B 50e1f5f13343fd19b9b871f3c15a62bdbdeebddc9721d9aa7ac81de7c3312811d7cec0985e1063fdfa9d13b542cb03e0eace12c01d40c248df04c940fb2cb2d0 SHA512 d0511a033597c2e901736aa73b6b840fec03adabdda384a026ad4047be0d5ad0a3373ea2519b62e91efb0d864129d5d14a571a351ffc03477b899349985da64c
+EBUILD yubikey-manager-qt-0.5.1.ebuild 1445 BLAKE2B b11dd07d657c4e61f284d733ddcc71a3a2a0860a39b0a8d6ae9f3895cda38922dacb3816cd4464c91664f456e8edaf2b06175a07b1c8ad0d68cc2a616f00c881 SHA512 6beafa82aa84056534d0a99dac7438da46f7d9fd3328b220c39fed6da7da6c24239c8d2e68c48a994d6b691d4fc7ea832fae953243b6138df078ae16e0d226d2
 MISC metadata.xml 257 BLAKE2B fd7fdb57fdce3a565a08cedc4d99216724e4013515d77ea89cb41a5c01e8f5479cab25fe53d44a705e3a71164cdc3c93e658e61deae654a13e5c2471dd83c57c SHA512 35e59430f93d3bb2e7e3042a2464b84f8e6cdf1e1624c1e7674bfc5147f9b9694da6b39ac081ed5fc22f1623aea889b743cfee11007911f3c8c17cf61443675b
diff --git a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-0.5.1.ebuild b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-0.5.1.ebuild
new file mode 100644
index 000000000000..b9627b57544b
--- /dev/null
+++ b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-0.5.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit eutils qmake-utils python-single-r1
+
+DESCRIPTION="Cross-platform application for configuring any YubiKey over all USB transports"
+HOMEPAGE="https://developers.yubico.com/yubikey-manager-qt https://github.com/Yubico/yubikey-manager-qt"
+# >yubikey-manager-qt-0.5.1 should have the tarball issue fixed: https://github.com/Yubico/yubikey-manager-qt/issues/49
+SRC_URI="https://github.com/Yubico/yubikey-manager-qt/releases/download/${P}/${P}.tar.gz -> ${P}.tar"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	>=app-crypt/yubikey-manager-0.7.0[${PYTHON_USEDEP}]
+	<app-crypt/yubikey-manager-0.8
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/pyotherside[${PYTHON_USEDEP}]
+	dev-qt/qtsingleapplication[qt5(+),X]
+	dev-qt/qtdeclarative:5
+	dev-qt/qtsvg:5
+	dev-qt/qtquickcontrols:5[widgets]
+	dev-qt/qtwidgets:5"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	default
+
+	sed -i -e "s/ykman-cli//" ${PN}.pro || die
+	sed -e "/qtsingleapplication.pri/d" \
+		-e "/CONFIG += c++11/a CONFIG += qtsingleapplication" \
+		-i ykman-gui/ykman-gui.pro || die
+}
+
+src_configure() {
+	eqmake5
+}
+
+src_install() {
+	emake install INSTALL_ROOT="${D}"
+
+	domenu resources/ykman-gui.desktop
+	doicon -s 128 resources/icons/ykman.png
+	doicon -s scalable resources/icons/ykman.svg
+
+	einstalldocs
+}
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index 50d6595f8065..b69170f2844f 100644
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
diff --git a/app-doc/mkdoxy/Manifest b/app-doc/mkdoxy/Manifest
index 6031185d70e7..3b7b26394e97 100644
--- a/app-doc/mkdoxy/Manifest
+++ b/app-doc/mkdoxy/Manifest
@@ -1,4 +1,4 @@
 DIST mkdoxy-1.0.0.tar.gz 11109 BLAKE2B 348d62a189d2f79432eafb65824b90bf0a3f82fab3621edcdc9fc04859b1a901cb71fd05773aee57431559bbc7a1055668fe710e719a6a8fa86a987b2c8d64e2 SHA512 0d40282da6b15cdbfe10e41549acc48241e6732519025e93f38d5d76c93ff180b41cc458fc8dbad4ab81bc28a96e4801c15577d39496392a05e743e581d19241
-EBUILD mkdoxy-1.0.0-r1.ebuild 550 BLAKE2B 8679eedfb72fb7aa57714342c93b728b02201bfc1123fbcc5c5b97ee25627ad5a35ef43e113916a250513958cddaebf630df1b6d8af25d3ca416ec37ffb5e1b0 SHA512 ca50e1e211449e016b399e7a490f94794254fee2e62306fb121978a4f0c308ae9db5027b8b7a8b64e428595db2e0db304342e2c72b7dd2c589c5fdbf12b21240
+EBUILD mkdoxy-1.0.0-r1.ebuild 549 BLAKE2B ab2dd5578b9c850bdc8c06a1f6589aed41d880157bfc6a0c0e00b1be24ad434198cc2893d013d5afca53882c8642f7d741ca947803187027ca5f4c25fdc41910 SHA512 8b6d233f691770e2f21bd3ca1c9a75b8d8348923a8b06c0683394854a240f6570c1ca48f0ea10c6618ef9b540453dfc13f6b1125344b76bb8640c98f369c70e6
 EBUILD mkdoxy-1.0.0.ebuild 525 BLAKE2B 82b77033e710ddbb73efdb56946c39bef726e2cf70657c0962b58ca3ad1c230c5af134aa4d3e6ab5cd7aceccddf18b1b4a3204a482756bbbd7eb15d46da476d9 SHA512 972310d237b60e7ed38277a7d8614b423248a3f0e75d9214466ee85b31459390ac8babdb1938f395128bded2170402b55ef5a185294b14ccea0cdfc0655f7184
 MISC metadata.xml 353 BLAKE2B 0433be5fd165f3af420f9f1fe357b7ea3edb785662dfcf3c4a47fbfdf7134ad82b733bd6d54ca5c9bb9640fcdd35e0a0b94634071dfe6ffc50018e0f05477d38 SHA512 aaf9f25dbd03b04756347b66753434800e575c2c9e63ebbbd58602c7a67929498db6b9ff4c3b50ff1031f49438c48cdf88d61169e00bd09b2b6510a68666ae83
diff --git a/app-doc/mkdoxy/mkdoxy-1.0.0-r1.ebuild b/app-doc/mkdoxy/mkdoxy-1.0.0-r1.ebuild
index 98ce30fe0328..1aaec08132b0 100644
--- a/app-doc/mkdoxy/mkdoxy-1.0.0-r1.ebuild
+++ b/app-doc/mkdoxy/mkdoxy-1.0.0-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ia64 ppc sparc x86"
+KEYWORDS="~alpha amd64 hppa ia64 ppc sparc x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 60af36f4a4b8..97cfb3622685 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/jupp/Manifest b/app-editors/jupp/Manifest
index fb50945a177d..4856a0fb4774 100644
--- a/app-editors/jupp/Manifest
+++ b/app-editors/jupp/Manifest
@@ -1,5 +1,3 @@
-DIST joe-3.1jupp27.tgz 455759 BLAKE2B 06f6e2c8610a48ddd90e15da3aa3b9044735087af2e5b4b537c85b0e5008af9185abf66f34cfd5bf6dc4a671576ddf51f77554e5052ab471286d0b2686259b53 SHA512 9f7b86275ed69151e79c2b8bea4e6e0b4fbaa4093646dbd894824d8cbe5a57ead385c5f37b102bd2647f14f5426791c8d8d9fab12b8951fd27a0be79ca72c96c
 DIST joe-3.1jupp30.tgz 468421 BLAKE2B 630ef1cd3f3c73060b331126ec8e6a24d7277b3f2bfb293eb6110d1dade34ffe6efc502d0985e603b2c86a10bf27faa6151e28b777189332b805e387b756dea6 SHA512 673d48da41f61797d6aeb548e62720d1a60e3e000445558be88fb0d7ca8a1a7ce7c8bdd5b5bd58ac2c16d46dd4541da7922999256669f693a570a11562d6550f
-EBUILD jupp-3.1_p27.ebuild 643 BLAKE2B d9ad1770d3b58553e01f7d5045f4ecba4356feedeaddc1dd1dd20670ddd2f83537fbcd7e64e8d8192c19f0a38a3414bb11fef41d15231e2e3b9d6f3aea6ad677 SHA512 dfadbcd064abab9cc3d24ea8105daeaaa21424f14afee1626fd125391cbb44b2ce9b395d3fb125ec8a7d5424066d77a68ec1c63c6bc5aae09faf41802b020b46
 EBUILD jupp-3.1_p30.ebuild 655 BLAKE2B acb7eb09ef67338fd151402e1d2eb5cd1973754e444b949dcfb0686e595bedeb51580a931fbd3f233cc376380dce84303d5457de6a02421ddfeb69c1ffd37036 SHA512 2d6c88d083f3f60ca6ae05db950ce05a87742546ac675baae43abb96d3b73f52843c82bdee795b782e3e7c36c27a6f6baefd11cf20027bdb2e3641a6cbdeeb37
 MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
diff --git a/app-editors/jupp/jupp-3.1_p27.ebuild b/app-editors/jupp/jupp-3.1_p27.ebuild
deleted file mode 100644
index 2f3b214bbbf6..000000000000
--- a/app-editors/jupp/jupp-3.1_p27.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="portable version of JOE's Own Editor"
-HOMEPAGE="https://www.mirbsd.org/jupp.htm"
-SRC_URI="https://www.mirbsd.org/MirOS/dist/${PN}/joe-${PV/_p/${PN}}.tgz"
-
-LICENSE="GPL-1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ncurses"
-
-RDEPEND="ncurses? ( sys-libs/ncurses )
-	!app-editors/joe"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	chmod +x configure
-}
-
-src_configure() {
-	econf \
-		--enable-search_libs \
-		--enable-termcap \
-		$(use_enable ncurses curses)
-}
-
-src_install() {
-	default
-	dodoc HINTS INFO LIST
-}
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 566925cc84fc..1ed2f64be9f5 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/puppet-mode/Manifest b/app-emacs/puppet-mode/Manifest
index cc8de322fe41..48f70166bc7e 100644
--- a/app-emacs/puppet-mode/Manifest
+++ b/app-emacs/puppet-mode/Manifest
@@ -1,5 +1,7 @@
 AUX 50puppet-mode-1-gentoo.el 217 BLAKE2B 632d02667437b04642b7d3510d5010a3a7952ccd6aaa301a463c629c5dd6320c847e9f05425bd5882681a471761d0fe501ccf6860faa33b9e5458a761dad40a1 SHA512 3fbe7045df9ac9d30520020d4df454a03f02989bbcaa4bae0c632f86f6e6d3fd2eeb3bed84d864077c2b85b65586406525fa621a262ec363f53d714a093f6d1a
 AUX puppet-mode-0.3-version.patch 547 BLAKE2B a3731babc0e9d207c5dde31f28f0a3e2481679bc2d95f9fdadc77e153689bf6e7c1498acb93e1783863bc66de1e65ecb332a4a605fb6c3856dc8964a42e4dd5e SHA512 623496493b6f920700e042c69099060b9e89cec3a04281af0d8fb7b32c57cfa9b70833935f1ec723c4e877545ac0962b9c70054891084b50c6eb2ad8bb1eb9f2
+DIST puppet-mode-0.3.20171221.tar.gz 36707 BLAKE2B 97b285e409a1e344c12773fd1fa64c87090c883662f87fbf01f5b535e5c9027a035b6c4656ac6ca138cf872b05ff8f05af2478f2bfa5b04a10168507b48c387c SHA512 12db350e4005d2b13d8e936f1a956c3bd603709a7a88489565fd4be3a8e74c7b33e6523a7371db85927c018c260762467d6e50153eea659f87711426df7774fc
 DIST puppet-mode-0.3.tar.gz 25617 BLAKE2B a9afb8e2f6c0a2b40cef6bb39d0fa2effe2ddffaa3b646562f0fc5b84d1613e556df88206835d6aad5862d526161d69c49ecd188e299e4f4175b479fe1957eee SHA512 16ba5f71a1ec6c40b1eddf2acf5c1aa1968526b959279e1cac0cfac947f82f404fc35978ce12f5851309f293e2c92f054a718ade97d156528d505dcda58434e8
 EBUILD puppet-mode-0.3-r1.ebuild 613 BLAKE2B f98dab8fc53fcd00f2b3156ee8572d4c11181ff5d6660dda7b172e99f6ad7abf7f826c423e9500aacaa6d273c51b6acf3725deb76ab155ba5a5f4c34348382ca SHA512 12a42f2ecce4bce4b2963e22dd7c4b9f9545f1ccbb8713c0cf4344ee00da59b42e3eb5922b3b20e161d946aa7314a5c95df1a61797842e0ffcad4ae43e4f92e3
+EBUILD puppet-mode-0.3.20171221.ebuild 696 BLAKE2B 880055162bb6a62c1ce6ad5cf1843c8213aa24dbd56ef0664848320a349fac820c95e0dadbf17a3c3b5bb421230559b1f080c8bfb694ad19ca5e90f867380051 SHA512 4ce05b8aa028fdffca6b21c8309ddc4bf71bbf6e5ab183f4d3ed1028c97d556eb3914aaa7a7778cf75070d02998d6e31a90874618bb935e4d50468ef96adda47
 MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
diff --git a/app-emacs/puppet-mode/puppet-mode-0.3.20171221.ebuild b/app-emacs/puppet-mode/puppet-mode-0.3.20171221.ebuild
new file mode 100644
index 000000000000..2cf8f9430f72
--- /dev/null
+++ b/app-emacs/puppet-mode/puppet-mode-0.3.20171221.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp
+
+COMMIT=b3ed5057166a4f49dfa9be638523a348b55a2fd2
+
+DESCRIPTION="Emacs major mode for editing Puppet manifests"
+HOMEPAGE="https://github.com/voxpupuli/puppet-mode"
+SRC_URI="https://github.com/voxpupuli/puppet-mode/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+
+DOCS="CHANGES.md README.md"
+SITEFILE="50${PN}-1-gentoo.el"
+
+# Tests require unpackaged ert-runner
+RESTRICT="test"
+
+src_prepare() {
+	elisp_src_prepare
+
+	sed -i -e 's/@VERSION@/'${PV}'/' puppet-mode.el || die
+}
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index edeca833215e..b74794880fe3 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/spice-vdagent/Manifest b/app-emulation/spice-vdagent/Manifest
index cc3cf3252f4d..06d3e07d2d0b 100644
--- a/app-emulation/spice-vdagent/Manifest
+++ b/app-emulation/spice-vdagent/Manifest
@@ -1,8 +1,6 @@
-AUX spice-vdagent-0.17.0-add-missing-stub-function.patch 418 BLAKE2B f677282366e7f670f09f05a6057468f59579fcd3086e712b4bcd006eb0dcee6a61712323bef216fc09212b0bc245eb570ecce68f1f62e6c1ec51ef08d22b3b54 SHA512 eaca4fe895bb749406f712fb4a04a2be82cbf199f064d11f915fe233cc7c52a381c217a78ac723d63c1625cffe40fc8b8d404cc414b2add3579d37eb70a7b8a8
 AUX spice-vdagent.confd-2 314 BLAKE2B 93d93f9e03e3aba9d889703ad24d08401222cf9d4b5fd0e72001bd0c0cf261d9f6879d1d0a89b51fc34dee2b15729425c694aca5522b1918f01edeea9b38b536 SHA512 ef3e02c65dd83ed0d4b1eaad9c6000a9d5d53fbbf2c19fe9604583f85478c92276b3b80554bd1573af6866e242c484f02da5c3500c0b4c430d3af0de755eed38
 AUX spice-vdagent.initd-3 1475 BLAKE2B 0d39828bd5be6271e0d3f1f7262751e1bee263bb52c0d409f5e85c51ac69b2ed1f6fa1b0ea377cae0e2879ed7d0ae39b93219fc961ed34c3d1d42b771a452932 SHA512 11e61f5cd8081231318248e332f081e43a36fb2315c70d52e436e83a14f1fca5ee4ddd8016e8c9d639cdafe69c3e5f360fb66dc2405f0d45f817130221ece516
 DIST spice-vdagent-0.17.0-patches-20180319.tar.xz 38924 BLAKE2B c7c7f851d307cd7dde620278c6ea240d71f8b1f25d6367f81213c7e902d2b2c15f72c71344f965743a45b5693832a2937041ca7b5511ce1db479dafe137bc7b1 SHA512 8ac627f56605151aebc100a6c6d61243776662150095c768196d750929971f98f4b6d1a831cfb547d29ae8a6734795c93e51a9c4f27dcf53bd66aca6df437c51
 DIST spice-vdagent-0.17.0.tar.bz2 130413 BLAKE2B b2fb522f491512d94ac15fa8d253e8e682210ad40657eb9e5e40489eaab18c9f1d5ef5f97075a4389501050a758e1f56d47132de6b1c74bb153fc6b5e87a698d SHA512 b26e44f6463ba70d5815956b301cc2351db22de41ed2ce8b2828d9bfa1cc581c86acd433f8f0d35d552d20f6ca140f88fa39b079ba26e9166dc07ad35bee502e
-EBUILD spice-vdagent-0.17.0.ebuild 1529 BLAKE2B 0fe73b36c13b53956de50b4336219f3d1be114d9139698e43cef90796a3f15faceac3919222328839e1cf183370d7dfa2fabcaa59215d649a2ab331a6456b49f SHA512 a9f36bec7245932f69e0c6c24055288667d0ceb8a6e99ad389ed913b746b19c12e288fdd7d5f9e07bab558b51c47c89b1a1b6e48d00019db23cf9b2bfce475a1
 EBUILD spice-vdagent-0.17.0_p20180319-r1.ebuild 1684 BLAKE2B 061a8c3d2423b3824f4d86501a8fe7767c8cd55cbb4aa304ef087a6fcbf713ddfaba610c4261bdf40d495a261eee2347f814c554c959faf66c6b331adefdca6e SHA512 427881f201729f926372826cab0cb0ee2595c6340f3aa49a54bdb4b9ad9d641e42b8baf49c211ccaae9a03fbde832e7107cfbd7a06a9e9ecaef616a58f63a78a
 MISC metadata.xml 557 BLAKE2B 03e0f3f159d333513fb7a575b46ad91167fc30e96b4e982cdb2bf545f19a53982e82698b03b02df0dc7dbfb90d9d05aa155c56aa1dc2cf6a13153145fd4231b3 SHA512 1f3892771740224f1275a9eb3507e1ac32be745340b50f983383e6b09e69de75d2e0562fd13465a588d08a4d049d0b33b233ada1a3a9883e1ee24c431fa7e236
diff --git a/app-emulation/spice-vdagent/files/spice-vdagent-0.17.0-add-missing-stub-function.patch b/app-emulation/spice-vdagent/files/spice-vdagent-0.17.0-add-missing-stub-function.patch
deleted file mode 100644
index 1d68ed53565f..000000000000
--- a/app-emulation/spice-vdagent/files/spice-vdagent-0.17.0-add-missing-stub-function.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Add missing stub function to prevent underlinking error.
-Patch provided by Pat Erley
-See also: https://bugs.gentoo.org/show_bug.cgi?id=585994
-
---- a/src/dummy-session-info.c
-+++ b/src/dummy-session-info.c
-@@ -50,6 +50,11 @@
-     return FALSE;
- }
- 
-+gboolean session_info_session_is_locked(struct session_info *ck)
-+{
-+    return FALSE;
-+}
-+
- gboolean session_info_is_user(struct session_info *si)
- {
-     return TRUE;
diff --git a/app-emulation/spice-vdagent/spice-vdagent-0.17.0.ebuild b/app-emulation/spice-vdagent/spice-vdagent-0.17.0.ebuild
deleted file mode 100644
index 92f797d2746a..000000000000
--- a/app-emulation/spice-vdagent/spice-vdagent-0.17.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit linux-info
-
-DESCRIPTION="SPICE VD Linux Guest Agent"
-HOMEPAGE="https://www.spice-space.org/"
-SRC_URI="https://www.spice-space.org/download/releases/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+consolekit selinux systemd"
-
-CDEPEND="
-	>=app-emulation/spice-protocol-0.12.8
-	media-libs/alsa-lib
-	>=x11-libs/libpciaccess-0.10
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libX11
-	x11-libs/libXinerama
-	consolekit? ( sys-auth/consolekit sys-apps/dbus )
-	systemd? ( sys-apps/systemd )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-vdagent )"
-
-CONFIG_CHECK="~INPUT_UINPUT ~VIRTIO_CONSOLE"
-ERROR_INPUT_UINPUT="User level input support (INPUT_UINPUT) is required"
-ERROR_VIRTIO_CONSOLE="VirtIO console/serial device support (VIRTIO_CONSOLE) is required"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.17.0-add-missing-stub-function.patch )
-
-src_configure() {
-	local opt=()
-	if use consolekit; then
-		opt+=( --with-session-info=console-kit )
-	elif use systemd; then
-		opt+=( --with-session-info=systemd )
-	else
-		opt+=( --with-session-info=none )
-	fi
-
-	econf \
-		--with-init-script=systemd \
-		--localstatedir="${EPREFIX}"/var \
-		"${opt[@]}"
-}
-
-src_install() {
-	default
-
-	cd "${ED}" && rmdir -p var/run/spice-vdagentd || die
-
-	keepdir /var/log/spice-vdagentd
-
-	newinitd "${FILESDIR}/${PN}.initd-3" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd-2" "${PN}"
-}
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index 7be135981d5f..efab0007b6cb 100644
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
diff --git a/app-eselect/eselect-blas/Manifest b/app-eselect/eselect-blas/Manifest
index 066c437b8acc..89a51ff4fe70 100644
--- a/app-eselect/eselect-blas/Manifest
+++ b/app-eselect/eselect-blas/Manifest
@@ -1,4 +1,4 @@
 AUX blas.eselect-0.1 350 BLAKE2B a21d38edf3188c2f26d384010d070048c0df19dcf87338ecfa1c08b9667ae97bb2875d6ae9958d797a416524de28540a4a95597c36d25df340bbe956ed95d342 SHA512 25f9250c3fae6d31871ca08260f1cd6597d9263fe51d3d696dd55c8648b604ea52b705dc5d128c7d9677cc1cd63f9aa1e31e124bdf52374eaf02f991db0045f2
 AUX blas.eselect.5 2065 BLAKE2B a86cf9f357871021867c30a24fe945435d247b755eec8557c4e6986fab7658ee2ee7246e46c650998a5ce252544f35142ec4d67a8c4e865602d02779e812ac20 SHA512 94264f61bbe29ac027d9ec82b3921e99cc8f7108544682508748e407fbe7d393748cef876c240796adf82122370ac963def90fd8b01a3186049223e3eaf21ffd
-EBUILD eselect-blas-0.1.ebuild 706 BLAKE2B d095947877327d95a95a0c5b7d78679f529ddaf9882e58384af12e2720d154fafd6ee558524913d7ee6d3c78914d1fce1ad7e57aa1ff6606c8beb88d35ff85d3 SHA512 9b82e7037c333c9623ba39cd3ca06fc3a0efc56ff30d3c2d3e874bfe850fe8c9fc48a69104a301cbca79f30d9bad51797b5a1b86ae83e2e3f7f81b89c5be495c
+EBUILD eselect-blas-0.1.ebuild 689 BLAKE2B 64864b2363fab19d2506ea437994354106572215f12bba7ea39c830170499aa8c24be81bea44d05073d8168b4fa3e973b895b0d9981c85ac138d8757db4a3eaa SHA512 a5eeaa6ae57d57f647cdff8d54625e3306b8d081d3e1337036b2d9367be1e1b8f88cd4107061ee757de36da59581ab6b8beed4125dc348c9042a1d0a09e716ea
 MISC metadata.xml 249 BLAKE2B 03207049d5e7c62319639b2c37769d9d8c0d9cbf1e44fbc6cab9ea006e60bff3526193fea60902a0e64a362b02463104969700074602e31d8fb8f86a042d1ed8 SHA512 29a9c1817fd4299246d5fa995b73b9f1996b112b70f468139cf9cd8f07077d831e0788d3b93aaba67bb38dce5850830c27543fccbddbac02b0da4ff899def519
diff --git a/app-eselect/eselect-blas/eselect-blas-0.1.ebuild b/app-eselect/eselect-blas/eselect-blas-0.1.ebuild
index 10e7af070571..2de86608508b 100644
--- a/app-eselect/eselect-blas/eselect-blas-0.1.ebuild
+++ b/app-eselect/eselect-blas/eselect-blas-0.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=6
 
 DESCRIPTION="BLAS module for eselect"
-HOMEPAGE="https://www.gentoo.org/proj/en/eselect/"
+HOMEPAGE="https://www.gentoo.org"
 SRC_URI=""
 
 LICENSE="GPL-2"
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index a09e850b8192..4c8d7528d4ae 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/fcitx-cloudpinyin/Manifest b/app-i18n/fcitx-cloudpinyin/Manifest
index c6b05b68eccf..804bb5c4d597 100644
--- a/app-i18n/fcitx-cloudpinyin/Manifest
+++ b/app-i18n/fcitx-cloudpinyin/Manifest
@@ -1,6 +1,4 @@
-DIST fcitx-cloudpinyin-0.3.5.tar.xz 22424 BLAKE2B 9f44bf3a16681d994a8f202c7b9ba5bcb14a77c70e6e854626df675f647582632b6b4c110cf315fe376a6dd876607fe815d57d07361e219ddc11222ad1a95d6c SHA512 b56cde4955fab02d204cfe937b46aeb5b6adf9e4eb4fead6e7b8e0b5cd1ebce06a0de3f9d477a1cb58eb077655f17975b7e13951074d1766b283b86eeb5b276e
 DIST fcitx-cloudpinyin-0.3.6.tar.xz 22596 BLAKE2B e53f64dc999eb1ffb1d3c37b6ed75272da9a76d196df681b71876281ded778f83c73eef2f9100233f580a389e36bfc8681cd7be5e23ce4d9c27c26384062cf9a SHA512 d3a05fc48659db64a0a827c9b75cfb8b33f7cdb48bd936a2ba33f49469e29558a7da0f58cb7e6929b1265d451d23b0a37d87b7b69752599656c94049077d9914
-EBUILD fcitx-cloudpinyin-0.3.5.ebuild 735 BLAKE2B 8bdc4639220467f736b4279261d6503672eaa47cb0503b17d45c9e238c00d252a42e29cdc75ab0bd00a2f1b35bb4d4ba870aeaf0bc6bf8ccfc22570d822a3659 SHA512 f49bd32b4d8131934d4e7b48568fe22f6d981e35f15d52f11d20fb9673465d3ff2199dccc30e1625ea49e40f2ca94ebd84e1f5f2f0aaced9382aba590e98bd5c
 EBUILD fcitx-cloudpinyin-0.3.6.ebuild 735 BLAKE2B 13d35ea6c57fb9fe2f764a44483880816428e53e0557ac5fec1a55f2a69d1c638019dc05b19c7549015a09142d3daa7a0a01e085442dd6591aa6dcf98f832f9f SHA512 c23621b57049b3b287c057efddae9bc7d1d43ae3887646d7c92b32da836fa00773ae72ae86e62ecfcf543fe5216072cde272162eca186d7c1f534a12d2b0f053
 EBUILD fcitx-cloudpinyin-4.9999.ebuild 716 BLAKE2B 3d539d407c980eb098ab9465118f5887e9c7fc1a2422f1313d2726aaa7de250074b125a8f6a1d687e482fbce2f09efdfa4151a16327f4355ebbe9591185533a5 SHA512 fb16336058eda6ebd85001efa3f515eadc7dae11d0c0009015fa59a25ce51261cd005dd96b01004a1528e8f31430a39e73bc378035fa188ea30db310e8a33338
 MISC metadata.xml 456 BLAKE2B e7aea5104a7beb0c6d879e801dd4988557759cc89cb48331dfe64b5cb336da07eb5ca0db77fd07f70e2b035a556b41327a1a619a12fd1a80480e0be40373c227 SHA512 d101b830ffa54146258fa424d14129c3693abe3e64582a3fecae2add16d0928d4d18642ff5c5816227cd458862dde6778d679a9cdf8605187862c657060f63ca
diff --git a/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.5.ebuild b/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.5.ebuild
deleted file mode 100644
index 202297a958e5..000000000000
--- a/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.5.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils
-
-if [[ "${PV}" =~ (^|\.)9999$ ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/fcitx/fcitx-cloudpinyin"
-fi
-
-DESCRIPTION="Internet look-up support for Chinese Pinyin input methods for Fcitx"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-cloudpinyin"
-if [[ "${PV}" =~ (^|\.)9999$ ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
-fi
-
-LICENSE="GPL-2+"
-SLOT="4"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-RDEPEND=">=app-i18n/fcitx-4.2.9:4
-	net-misc/curl:=
-	virtual/libiconv
-	virtual/libintl"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=()
diff --git a/app-i18n/fcitx-qt5/Manifest b/app-i18n/fcitx-qt5/Manifest
index c2cc1970d3ca..3d9c484b7488 100644
--- a/app-i18n/fcitx-qt5/Manifest
+++ b/app-i18n/fcitx-qt5/Manifest
@@ -1,9 +1,5 @@
-DIST fcitx-qt5-1.1.1.tar.xz 56352 BLAKE2B 1fea4484f79fa9f9bcd52ac59b4e64cb9947a2cdc46e3df3c3729ef37d136c4fcf787d7a8abd946e5a0d02f909c0a94b6d19b98a93cf9dc2ec49d172a5f19550 SHA512 ea7faa953561527fd0f6224a06ab97ab84a9e36a06d44f9807e38e6d8e537ab2c7126c4cda2d4718473ace1245709ce6175ac9431b6f0527a63b2d6e92feb18c
-DIST fcitx-qt5-1.2.0.tar.xz 134224 BLAKE2B 8358ec0b1cf95534f15536dd9529d4f7da47e6c08c050cc93503db958348ce4d940eb1903be8f161fec8adeca58c03838f021e36ecf39908361cddee40d806d4 SHA512 38d49d626e4aaee80f44ddeb627b07e45430c6eb1c1c37f2a5fb0c73d5dae6da5ed276366c40c3b6e8609543af95396091e240b5a88b684f399752b3eceee915
 DIST fcitx-qt5-1.2.1.tar.xz 134304 BLAKE2B c158b20bdcb287e9cb52aa74d6a7f66f113a759538b6748b1d38dcbb2213956e88dec54ed29307427d45d84861654bf5e70c9effba70d88738bf0a1a664cc3cd SHA512 0fd726974492e173084e29d3308aa1d97141a1e4034b7192cf505391540533eff473849929e931e4a84589d233fefac70cbd9c122cf6d0d0de412150cad1b1d3
 DIST fcitx-qt5-1.2.2.tar.xz 134216 BLAKE2B 9922dafaa42937737f5ef0018f519e83ed3c3105bef5a30505b323239c999ac8c921435b2bb72b35a73ebf1a9b7787ecd4ad405d8b6311e806e3bcbcbd79ff5e SHA512 902180ff8336c688d5d548a1628dc481f1ce0ea6cc79719ab53337ebfbb745232bfc58cf6e739a60c562d30c3d996eb5e07bd8ef932eade72a79fb35e096e1c3
-EBUILD fcitx-qt5-1.1.1.ebuild 846 BLAKE2B 2473b95b1dac058ab06d279c79de3cbf8d211439173ff31faaa2cfbef1f4050e257903f47f99b08aab01f7541600dc3ba2e6db393635e60a395db799d5202f52 SHA512 1fdcacc24874adc4ffd7e110265fc029eaf3c2a6e5ef4a427d161f091081e5e8f76d1b9e03f3b3e873ac2e7f2852fecf3e7e0572556e8de23493ee46b2daa4a7
-EBUILD fcitx-qt5-1.2.0.ebuild 872 BLAKE2B b7a400a699a427eecfe044c5aaf0a2521e959ca26b1fe7be59a75c1295d9408ccfdc8f717ef85ec955e7c7af054a9af15292c723388944ec8965ab695cb4bc57 SHA512 93a1876b5b9684f9c624dca1e50b980e37017714cd5bdd24625c51a2a0bff4dcb265a1e7175325ce6faefe509460cc99440d5d6b6928741eb20ace4f39426af2
 EBUILD fcitx-qt5-1.2.1.ebuild 873 BLAKE2B 24262bf61697f53de093458a87e2a91727bf7978ca95485572673ca712c1374b55fbbb3dd82a567b03794216a63a3df869dcb1d9269c85fa03965ad09955f40a SHA512 ec9cc8db96b8ecfddb38c174aff447f2af5a1c99a3ef9f096015438e9220d56507fd38a7526f2fa9ea327d9a8ba00b71af44b492d17e182756bbd71bd72d58d5
 EBUILD fcitx-qt5-1.2.2.ebuild 1159 BLAKE2B 9d67d4183ff2fa33adca1c47958186e17bcabf7a1ad62640cf1ffee81fa51f4c4dfc02c91e0d8fc8e5ab078963fa79fa935c884e58a4db19dea0dc5ce4adafb1 SHA512 edcbd778b35c2ee224cdb39ecb89089507845e3c714875b098eb9cf9ffe503cc5c7cedbff26115a390a527c9a4439f6195f45716b322edc8b079ac4866a95c5a
 EBUILD fcitx-qt5-4.9999.ebuild 848 BLAKE2B 9dcd52abba77d2b9679721edc4c5d4614182739cd59912d4a058d2ed56cd34478b934f783aa03d4bdc2912047fb269859d298b91d7f943053c43dd0524948ca0 SHA512 2b13a220dbf44f0acd6872961930dd9f01374bcd4c54c1b668dd49dc1129039a87a620e37cbc04c091a6fdb06837fb75ef8b7c171e030457ee239201dd4426fe
diff --git a/app-i18n/fcitx-qt5/fcitx-qt5-1.1.1.ebuild b/app-i18n/fcitx-qt5/fcitx-qt5-1.1.1.ebuild
deleted file mode 100644
index 6147d92535e6..000000000000
--- a/app-i18n/fcitx-qt5/fcitx-qt5-1.1.1.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 cmake-utils
-
-if [[ "${PV}" =~ (^|\.)9999$ ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/fcitx/fcitx-qt5"
-fi
-
-DESCRIPTION="Fcitx input method module for Qt 5"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-qt5"
-if [[ "${PV}" =~ (^|\.)9999$ ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
-fi
-
-LICENSE="GPL-2+ GPL-3+ LGPL-2+"
-SLOT="4"
-KEYWORDS="amd64 ~hppa ppc ppc64 x86"
-IUSE=""
-
-# Private headers of dev-qt/qtgui:5 used.
-RDEPEND=">=app-i18n/fcitx-4.2.9:4
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5=
-	dev-qt/qtwidgets:5
-	virtual/libintl
-	x11-libs/libxkbcommon"
-DEPEND="${RDEPEND}
-	kde-frameworks/extra-cmake-modules:5
-	virtual/pkgconfig"
-
-DOCS=()
diff --git a/app-i18n/fcitx-qt5/fcitx-qt5-1.2.0.ebuild b/app-i18n/fcitx-qt5/fcitx-qt5-1.2.0.ebuild
deleted file mode 100644
index 39a4fc5f78f1..000000000000
--- a/app-i18n/fcitx-qt5/fcitx-qt5-1.2.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils
-
-if [[ "${PV}" =~ (^|\.)9999$ ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/fcitx/fcitx-qt5"
-fi
-
-DESCRIPTION="Fcitx input method module for Qt 5"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-qt5"
-if [[ "${PV}" =~ (^|\.)9999$ ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
-fi
-
-LICENSE="BSD GPL-2+ GPL-3+ LGPL-2+"
-SLOT="4"
-KEYWORDS="~amd64 ~hppa ~ppc64 ~x86"
-IUSE=""
-
-# Private headers of dev-qt/qtgui:5 used.
-RDEPEND=">=app-i18n/fcitx-4.2.9:4
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5=
-	dev-qt/qtwidgets:5
-	virtual/libintl
-	x11-libs/libxkbcommon"
-DEPEND="${RDEPEND}
-	dev-qt/qtconcurrent:5
-	kde-frameworks/extra-cmake-modules:5
-	virtual/pkgconfig"
-
-DOCS=()
diff --git a/app-i18n/fcitx-unikey/Manifest b/app-i18n/fcitx-unikey/Manifest
index 288054241c54..33d09a52ac7c 100644
--- a/app-i18n/fcitx-unikey/Manifest
+++ b/app-i18n/fcitx-unikey/Manifest
@@ -1,6 +1,4 @@
-DIST fcitx-unikey-0.2.6.tar.xz 75124 BLAKE2B f3adedefca336deb73e9a8ddfc5829e6b9455d97ec9f6454c484847e57dc2af9db32f8bd6eb7285f0a4f430ba8fb048105b60e42348271220ac90129c6d8491c SHA512 18efb387387c29bb059e1260bfb3c91e97f9989aedbe590596f1ad8659e9fad20777f048f20fb24e0fb5e2318eee1c25fc20a2d57ac846368c4c9bebf4eb2b90
 DIST fcitx-unikey-0.2.7.tar.xz 75204 BLAKE2B a0d70747a560b2493a3b7f7e06ff35f7e465bb4c4c8d22cb4db02f70a6298c49780fd0045874faeba1f20ad188a01a81fefc67a4f6ac9d6946d959f731a376a4 SHA512 1bb78e4f27f0cda1e3aa5a633be45e0a26d121d5b472b1325b0c028ff65ca156d23e7ffee0367badeac1dd21ba1743ee8a2c9c27c629ae0996e84e0062b67ad2
-EBUILD fcitx-unikey-0.2.6.ebuild 1009 BLAKE2B 29460778785b893bb1d858161dfb0a726131fd80cb5d487a13e71dc80455deea05646b4cb9541bff59df194adaaf64536a2d402797620e72a9f7de19f7546ecc SHA512 2b750681ad0c13a764ff408a5b9cef1bca099a44147f9b2e180c532e8e9f6e5b2b430b0f9b0c507cbbdc3e4cacc74186b94ca50c331047cfa6320cb2e89359a5
 EBUILD fcitx-unikey-0.2.7.ebuild 1045 BLAKE2B 32c5f1b30f0ee6673fed45ee8f67fb2b9ea3d17488058cff92180853d11b5640b8ecb4967df53d1b56122d9516579ee9eb5d875478ac685001d0ad9f7a68bdcb SHA512 5fd01038929e1e95c3820b11f3a90214b4ad29b0d0bf0aea8b0418431731597b46a37e02cd7429d93737e8e942ad790541bcf693974d8daa92844c6939f9f575
 EBUILD fcitx-unikey-4.9999.ebuild 1026 BLAKE2B 20e92a45b3fc1f7ed45cf1f05de896e8d1d5fc36e679e1b00919384118712579e1aa664ad0a82e3aff5f4049e88e3d1d01f44622bef3ea6a753c3365f4865be1 SHA512 fa5050db2a5acfcb7badbb1df231461d08d1c789cbce2e4c129be937ba82154843ba9c8a434f66d85b8f2fd3488b96068a69730e45f84af01515794f35221541
 MISC metadata.xml 522 BLAKE2B 8d69748cb9296020466c42b0277d8618dccb9c787f35e920d5a0d5e9447c723d7ba1e5c0a7c508053fa33b7c989d7a5c0542a144958083a6214f23399440e83e SHA512 c08e14d4e9268a0c0608148117d50b77754f1f9d96433a28f243fd0643d7021a9e2b85ca57de9f4196bcee54eb05b3c5bee497a3dbf77ef9b279c1bff7814694
diff --git a/app-i18n/fcitx-unikey/fcitx-unikey-0.2.6.ebuild b/app-i18n/fcitx-unikey/fcitx-unikey-0.2.6.ebuild
deleted file mode 100644
index b35d3941e9c1..000000000000
--- a/app-i18n/fcitx-unikey/fcitx-unikey-0.2.6.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils gnome2-utils
-
-if [[ "${PV}" =~ (^|\.)9999$ ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/fcitx/fcitx-unikey"
-fi
-
-DESCRIPTION="Vietnamese Unikey input methods for Fcitx"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-unikey"
-if [[ "${PV}" =~ (^|\.)9999$ ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
-fi
-
-LICENSE="GPL-2+ GPL-3+ LGPL-2+"
-SLOT="4"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="+macro-editor"
-
-RDEPEND=">=app-i18n/fcitx-4.2.9:4
-	virtual/libintl
-	macro-editor? (
-		>=app-i18n/fcitx-4.2.9:4[qt4]
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-	)"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-DOCS=()
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_QT=$(usex macro-editor)
-	)
-
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-i18n/fcitx/Manifest b/app-i18n/fcitx/Manifest
index b51e68079acd..d6396bc3dabc 100644
--- a/app-i18n/fcitx/Manifest
+++ b/app-i18n/fcitx/Manifest
@@ -1,4 +1,3 @@
-DIST fcitx-4.2.9.4_dict.tar.xz 8731804 BLAKE2B 8363d7908cb68b9da3c71c2bea237dbad20740e4f9b07a1b5625c5228aab09e1c5c86134fce681dcaaaaf2cdc570b7701a23ca6e1c01d09117133fd07f4d8b7a SHA512 2e8ead59a154a857dfc011af83715dbe1225cbccf1e2c6ced1d9aaf92a7881f89fbe806da3c66ed1805cf27994c91a2d463c455be726b7d4b73c07bfde83972b
 DIST fcitx-4.2.9.5_dict.tar.xz 8736972 BLAKE2B 01255554aa0caf5e4f638121febcf0951549d5752884dd436c90042587048598724b91d4839ff2470e8b9ee119f0abb40650c45fd8253ae1bd74608812c84a1d SHA512 5e2ec5405b01fe85b1659b1db3e15389b0d7e096808db598d0865381bcb8f6de960e8e16d4432c95c586cfc3359d17d4f7bad0cff2fe0146fe00b9fb80491168
 DIST fcitx-4.2.9.6_dict.tar.xz 8738408 BLAKE2B 812256657ef8f6648a8a3de4bef4e423288ee3d91d493783eae2cb55b5b5964a791f3317af1aea0d877e01ea06491c34f6c594038d27713be3a6b35c93bc5545 SHA512 dc8308d1a4e9b7595da285ca6521f33027f5b8e6968bc28f751bd4f40116166cabbe1c05e29072afbe88473d2a9d6999124476260785e07f62a243df6e896bb0
 DIST fcitx-data-en_dict-20121020.tar.gz 630491 BLAKE2B 2df897b1c9fb3a2ce186ee590e5f3ccbc7930f047218bf0fefa317f74b3287fc0be9c393d3310fe07208379118ec4c46608a1c703ef37b3aee65b2d790cb7f0d SHA512 8418bd02492bfd786c0fab93be4400ef027ec8e9fac02220cc1f653f5eb67f54573a6a84a15baba19bb34ab892745c87df16499d6304ea75009131e2ab3b97f2
@@ -6,7 +5,6 @@ DIST fcitx-data-pinyin.tar.gz 1608886 BLAKE2B 3b7e72559bb838b4f2245e6faf2d627df1
 DIST fcitx-data-py_stroke-20121124.tar.gz 445601 BLAKE2B 43b29b30da11b18196918e4df847406871eff75595b62608ad86b0ef6de83ec5e1b722645cabb809281075b393b5970e4d9580594caa73060c866c2d3cd988e7 SHA512 d80ff9a3549e07c7a6935e686785f9a076c58f1a782a832ae28ee65e2a213d67f089f450ce09bed87ec2a141c32b9c1fcb83c221ddcab436858fa9009f161fb3
 DIST fcitx-data-py_table-20121124.tar.gz 186822 BLAKE2B d696413f2e88f1ca87938d632e12997d14a31a66eaf011c6a7b3c0f607cf45f48e53644ea07d73dbbb0ad898dee6d5ff2d0e4fc2fdcae923acbc03d3d387aaeb SHA512 0fa72ce6820a316e9729bc0d7a08af5ca3468134de9ff1bf0c559a398846a7bcf7313a3609d943e6bab637d930cf45ad9acfe25a8d3df078a774b071a7296486
 DIST fcitx-data-table.tar.gz 4144686 BLAKE2B 696845bb234915a364d614d47cc3baf8421a12ca1778611b0843e52e651da98b5ed9f3e0c9895a829b67f1bcceb1f982a7f6606c8a2d383af8c4573a150c71ef SHA512 99e1d69c679355fcf3e117a1ef39b131cbd3af841387d2335757247d840b90ff6b7323e16fca98cf7a043033faf250d2e9c6d47b96845d18c278a0cf6f30fec9
-EBUILD fcitx-4.2.9.4.ebuild 4382 BLAKE2B a2429c0d0ba22c4786732b5646d3f28e067e096629da8d8134a772c6f5ee563a12cb87ab59cb64477cc79ca7fe6168f3763d3649fbae80e8736d2f1876e4ee61 SHA512 efb5fdd20620cf0d4553b61283473e809f170fc8978cefc874c0d59362d6aa5d6668f141ad7647b4f62c5deac394e26824ac6e24cb6fef0a62cc979763150e45
 EBUILD fcitx-4.2.9.5.ebuild 4492 BLAKE2B 645c945bb687141763bac75d0bdd8fc4ad496d008232e3480e4ff21a19daca4b9b80cd8af9276aa58370a695dcd55a3312a2cbd64ec67ff96b07e7e5bb91f001 SHA512 87ebc30abd084722c12fc6af0abae2972e3e145af5b836bd127029cf18586bfd22c258819609f9168e6bbaf94df1f0fdb284bb504074b296bf2a6213d19a12a4
 EBUILD fcitx-4.2.9.6.ebuild 4494 BLAKE2B f36af66bdecedce1231796d40cbb668effcc9537b62c9244757768df9cb49303553a80d13e2be3a92da9ca82defc97a40863b0953e5a95c18ecae413f2d14449 SHA512 1c1ca03eca6642144a41c5dc1380351fb1a3e5fe04d961ca80b6894a7d01b80ec2f5908edcae7426af07a024855bb1c23443b8632310e6e63ba91c6b282b5abe
 EBUILD fcitx-4.9999.ebuild 4467 BLAKE2B d574d8ee533e0ae37a2b2f1dabf8e230b7bc78b89c9cfb0658aefe2d6e00949b07bc4bb15f07adc26f21a08feaa4ca066033cfb8fe1fd7a3b56af5dd15b0d842 SHA512 f7d9d243928dfb9d65681dbc250782f238357308f6547ec1dc64e32e492c0f3ee2a52b74b062182f54425b91e4a5ed9385e2b68ad1292c57052fc3bd811c704e
diff --git a/app-i18n/fcitx/fcitx-4.2.9.4.ebuild b/app-i18n/fcitx/fcitx-4.2.9.4.ebuild
deleted file mode 100644
index d90b281559b4..000000000000
--- a/app-i18n/fcitx/fcitx-4.2.9.4.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils gnome2-utils xdg-utils
-
-if [[ "${PV}" =~ (^|\.)9999$ ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/fcitx/fcitx"
-fi
-
-DESCRIPTION="Fcitx (Flexible Context-aware Input Tool with eXtension) input method framework"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx"
-if [[ "${PV}" =~ (^|\.)9999$ ]]; then
-	SRC_URI="https://download.fcitx-im.org/data/pinyin.tar.gz -> fcitx-data-pinyin.tar.gz
-		https://download.fcitx-im.org/data/table.tar.gz -> fcitx-data-table.tar.gz
-		https://download.fcitx-im.org/data/py_stroke-20121124.tar.gz -> fcitx-data-py_stroke-20121124.tar.gz
-		https://download.fcitx-im.org/data/py_table-20121124.tar.gz -> fcitx-data-py_table-20121124.tar.gz
-		https://download.fcitx-im.org/data/en_dict-20121020.tar.gz -> fcitx-data-en_dict-20121020.tar.gz"
-else
-	SRC_URI="https://download.fcitx-im.org/${PN}/${P}_dict.tar.xz"
-fi
-
-LICENSE="BSD-1 GPL-2+ LGPL-2+ MIT"
-SLOT="4"
-KEYWORDS="amd64 ~hppa ppc ppc64 x86"
-IUSE="+X +autostart +cairo debug +enchant gtk2 gtk3 +introspection lua nls opencc +pango qt4 static-libs +table test +xml"
-REQUIRED_USE="cairo? ( X ) pango? ( cairo ) qt4? ( X )"
-
-RDEPEND="dev-libs/glib:2
-	sys-apps/dbus
-	virtual/libiconv
-	virtual/libintl
-	x11-libs/libxkbcommon
-	X? (
-		x11-libs/libX11
-		x11-libs/libXfixes
-		x11-libs/libXinerama
-		x11-libs/libXrender
-		xml? (
-			x11-libs/libxkbfile
-			x11-misc/xkeyboard-config
-		)
-	)
-	cairo? (
-		x11-libs/cairo[X]
-		x11-libs/libXext
-		pango? ( x11-libs/pango )
-		!pango? ( media-libs/fontconfig )
-	)
-	enchant? ( app-text/enchant:0= )
-	gtk2? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )
-	introspection? ( dev-libs/gobject-introspection )
-	lua? ( dev-lang/lua:= )
-	nls? ( sys-devel/gettext )
-	opencc? ( app-i18n/opencc:= )
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtdbus:4
-		dev-qt/qtgui:4
-	)
-	xml? (
-		app-text/iso-codes
-		dev-libs/libxml2
-	)"
-DEPEND="${RDEPEND}
-	kde-frameworks/extra-cmake-modules:5
-	virtual/pkgconfig"
-
-DOCS=(AUTHORS ChangeLog THANKS)
-
-src_prepare() {
-	if [[ "${PV}" =~ (^|\.)9999$ ]]; then
-		ln -s "${DISTDIR}/fcitx-data-pinyin.tar.gz" src/im/pinyin/data/pinyin.tar.gz || die
-		ln -s "${DISTDIR}/fcitx-data-table.tar.gz" src/im/table/data/table.tar.gz || die
-		ln -s "${DISTDIR}/fcitx-data-py_stroke-20121124.tar.gz" src/module/pinyin-enhance/data/py_stroke-20121124.tar.gz || die
-		ln -s "${DISTDIR}/fcitx-data-py_table-20121124.tar.gz" src/module/pinyin-enhance/data/py_table-20121124.tar.gz || die
-		ln -s "${DISTDIR}/fcitx-data-en_dict-20121020.tar.gz" src/module/spell/dict/en_dict-20121020.tar.gz || die
-	fi
-
-	# https://github.com/fcitx/fcitx/issues/250
-	sed \
-		-e "/find_package(XkbFile REQUIRED)/i\\    if(ENABLE_X11)" \
-		-e "/find_package(XkbFile REQUIRED)/s/^/    /" \
-		-e "/find_package(XkbFile REQUIRED)/a\\        find_package(XKeyboardConfig REQUIRED)\n    endif(ENABLE_X11)" \
-		-e "/^find_package(XKeyboardConfig REQUIRED)/,+1d" \
-		-i CMakeLists.txt
-
-	cmake-utils_src_prepare
-	xdg_environment_reset
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
-		-DSYSCONFDIR="${EPREFIX}/etc"
-		-DENABLE_CAIRO=$(usex cairo)
-		-DENABLE_DEBUG=$(usex debug)
-		-DENABLE_ENCHANT=$(usex enchant)
-		-DENABLE_GETTEXT=$(usex nls)
-		-DENABLE_GIR=$(usex introspection)
-		-DENABLE_GTK2_IM_MODULE=$(usex gtk2)
-		-DENABLE_GTK3_IM_MODULE=$(usex gtk3)
-		-DENABLE_LIBXML2=$(usex xml)
-		-DENABLE_LUA=$(usex lua)
-		-DENABLE_OPENCC=$(usex opencc)
-		-DENABLE_PANGO=$(usex pango)
-		-DENABLE_QT=$(usex qt4)
-		-DENABLE_QT_GUI=$(usex qt4)
-		-DENABLE_QT_IM_MODULE=$(usex qt4)
-		-DENABLE_SNOOPER=$(if use gtk2 || use gtk3; then echo yes; else echo no; fi)
-		-DENABLE_STATIC=$(usex static-libs)
-		-DENABLE_TABLE=$(usex table)
-		-DENABLE_TEST=$(usex test)
-		-DENABLE_X11=$(usex X)
-		-DENABLE_XDGAUTOSTART=$(usex autostart)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	rm -r "${ED}usr/share/doc/${PN}"
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	use gtk2 && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	use gtk2 && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
-}
diff --git a/app-i18n/mozc/Manifest b/app-i18n/mozc/Manifest
index 7c47b5bf86b9..95fe447e6267 100644
--- a/app-i18n/mozc/Manifest
+++ b/app-i18n/mozc/Manifest
@@ -10,6 +10,6 @@ DIST japanese-usage-dictionary-20120416091336.tar.gz 71051 BLAKE2B 08eecf0aa021e
 DIST mozc-2.20.2673.102.tar.gz 48624369 BLAKE2B 0d80065f989c1f61e5f2852e7f471dd83777323b21499c118dc87f4fd6596329ab096dd64db3419895090ab61d6aef9a07e61c7fddeaf4f3a40ce3f3acbad949 SHA512 ad7a78b03b29847057625fd5422c03ac8fc5755c5e85c66fd6e80f81be719dd56bf1349a1d745797118deed239641512789687b4f9ffe49bab1bc966385229ae
 DIST mozc-2.23.2815.102.tar.gz 47739041 BLAKE2B 045a8a4a07e09cf923b67824111cdf672febc30256a6aef951ae779a3f582b3860042750d766120e376898c63be5b4baea870798a192cee34b0d48647e1ec5e6 SHA512 a3face616ca89990bca52371dcc8003604ebe0e9633116a64550add070152b1bc4d9b21e9f102c5afa6f8b1aa11d8dbc4bafbcebfaf4a12a934f085f245d548f
 EBUILD mozc-2.20.2673.102.ebuild 9276 BLAKE2B 9308d63a798e68954c444139908b498bc2a1a50e3c3cfeac4b68aa5858452a5edd04ef81bb86e01cbe0fa1a396f3f83790474b8a4949f1ca3f3b2230fb4d088c SHA512 008e15376cbd7ec69c23309d23f06a20981a2b8f77b8f218e24915bfd525aa6a564e495fd5362ca3d5c50c85f07056544bb02f2d6d5d307758e2db86af97ae4e
-EBUILD mozc-2.23.2815.102.ebuild 9308 BLAKE2B f73c31538e1e77b7b7b05c4e76113b2de207203f736c9710168b8dcf378d2f5abd779c7732bf461eefe85196356050e589dff44fe9914f9022e5b29c4e9ffbaf SHA512 4f882f60ce69f1451e1e9f4ff2ff730ddf9b14f5cb3a13b8b9353920c68b57c28524177ba8372454da46b4f15808b4063992d035949c7ff81da8bfb4ec3730e0
+EBUILD mozc-2.23.2815.102.ebuild 9306 BLAKE2B 963632d28582ce506c1f37b879e586648133d8d9c45113b430c5e71a625c6e12833bd4d41ddd9e103aedafb435f6a5b828ddcb93384296084605733be76ceb1a SHA512 56db2d6dbdd468d59d7249eb4c659ac5e125e148078aa76fb929f090f756e5defbb399663aa659e24614ee0131ff704321bd0ce2c76fad7f535ad2db2eadbd1a
 EBUILD mozc-9999.ebuild 9146 BLAKE2B 3b6dea8d23f165e78b3da5a2d2fa3465605703ce77fe2df8069e9e7dc75f72ef8106f049b2039cf2fd1c78e06dbfa803bf31b076db2c2f2a9c7af0095dce41cf SHA512 0fccc09b374549a312a4a561b70d8e34fd0fe8b2e7e8161ce680c6662ea529e0c797bbe23ed388c8318bd18b07cf79dc946306906e3de9e2bf6f0fb6a6d545e1
 MISC metadata.xml 1127 BLAKE2B 55c44374c1d0c03845435544fb8bcd254bfa59faa54e773110fe2a9bcfba0f6863a1f5c167e3ca7d2a1108e566ae4d7d4155a1a1994bef006bbde906265fffe1 SHA512 8d1ee79d5e359c746627cc10ddae170088dd1be8a69379f60969e588c0c6141fea80ebcba0183a91e786116e8937c14e76888c9232526244aab584ed4ef27a54
diff --git a/app-i18n/mozc/mozc-2.23.2815.102.ebuild b/app-i18n/mozc/mozc-2.23.2815.102.ebuild
index d24cd9f07a0f..de335e87e8d6 100644
--- a/app-i18n/mozc/mozc-2.23.2815.102.ebuild
+++ b/app-i18n/mozc/mozc-2.23.2815.102.ebuild
@@ -34,7 +34,7 @@ fi
 # japanese-usage-dictionary: BSD-2
 LICENSE="BSD BSD-2 ipadic public-domain unicode"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE="debug emacs fcitx4 +gui +handwriting-tegaki handwriting-tomoe ibus renderer test"
 REQUIRED_USE="|| ( emacs fcitx4 ibus ) gui? ( ^^ ( handwriting-tegaki handwriting-tomoe ) ) !gui? ( !handwriting-tegaki !handwriting-tomoe )"
 
diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index bbe5ca0a4656..9f419a4280f5 100644
--- a/app-metrics/Manifest.gz
+++ b/app-metrics/Manifest.gz
diff --git a/app-metrics/pushgateway/Manifest b/app-metrics/pushgateway/Manifest
index 44324b732836..e6e32cbeff5d 100644
--- a/app-metrics/pushgateway/Manifest
+++ b/app-metrics/pushgateway/Manifest
@@ -1,7 +1,12 @@
+AUX pushgateway-1.confd 827 BLAKE2B b1a089d29ef99f692c4b38a8fb8c2d48ac018e5141fd700d160b944287670eba674035c3929e175bf131a71f2edbd594d2cbdae43a1f6be30dc455784286ce85 SHA512 c83cce3088b426f30b90a50ee507e93f1c8ff3ea4f54ddf4d5da90d4f895e8aa02550952243d044d9e2c819798d8ee6f231206405f61dd350b1ca541e535361f
+AUX pushgateway-1.initd 664 BLAKE2B f24a389eb6f968d63a21ab0e8740604bcae440d3797ff1640c4e5cd09c9bba398db10c385321a6a50da78518ed341ba654baffb2671106e8ae04eb303bedb3a1 SHA512 515a49e4b1aa6934611f86f85e2132004d234d312c13be23887709fbcaad86280034942967b25d7e355ab491ac4c09e7c88221a95279f2f751cbd2387eba9ad5
+AUX pushgateway-1.service 477 BLAKE2B 123c630e40ca47626cf1d6bc93e8556ab1fccb1dd799cd72c245e5a937aff1a5c1b5ad9280d8680a8643d055376960012e36691f9e4f6a8d64bbdc91a749b876 SHA512 0985e8e45b1557adefe5f36ed163440c81f432b95198819d3e46c3f946f255954e5cbe41cf378b33cd3dcb75c457970877f2f6a7585bfc90b58ac2df9abb2970
 AUX pushgateway.confd 819 BLAKE2B 9c42a6d012f70a2ac03d4b90999d94683bc62f6d203ef8d2bf59019e30aea59c3beceae34f2579a2958acfaf882c275453aa5e46e488c5afebaebfc3f17b896b SHA512 c941bc2350bbda14d49effbc0a7988869fc38ccf2236951a88721bd15397c9e5b5d5a98d58285610b33eedc7a26f6cca51e3ec6f4909bdabf0658afd51b99feb
 AUX pushgateway.initd 662 BLAKE2B 652c58309ce31f7a37cb92beb128848ef28118b9b05278e79765b8c6555b6020266c062ef58463488dd39389f6bf0e2d1e0a9b5371ec4b5c26b821d6fac8877e SHA512 7bb32a7848607d939f3343c8d3fc88454b9ffc9d8d89f2af992d9f6f9fafe266c965b068cc466adbcf0ab014f1e5ca9214b567feacce09b73c8c2212e12aab00
 AUX pushgateway.logrotated 95 BLAKE2B 78db6689bbfac484b13a3444ebef47180aa94bfa6fa0c6b4fe273f415713b539116c1c05fc5348d504b9c6de270449a422fa7f49e63854a65d4ef6d25c3bf8c3 SHA512 615a8d105d97412b6819f65b9e34e28cb326457765ec9426f33d71cc4794aa1cbfff0abbcee14dbf94b6ae3f622c95d087ad485250c48b3e3efa8edcfe997069
 AUX pushgateway.service 476 BLAKE2B 1634abf2aebcc5423654bb70855d46917569e687c2b545590dbee5a99cb11ebe0744aff53969c9e20685e4c7fa8bb81bfd354e907fdd6c913c34ba43e1eb3588 SHA512 6564ba12bdda356b8dd368191e19383f2363f997a443e93c754ea1f6b1485deaf200167ede550d9a1d49d6c3787f215fb24d88cbcb05f3e4ce179ab0c7d9576b
 DIST pushgateway-0.4.0.tar.gz 1140644 BLAKE2B ea82e2e7f6fd817de02044e5aafde724a4089e4f2961f0b581f90df7e04e65af5a3c3e044ef94bd600a92468a8aed791c838a8fdc64b05b7a91d6288e7e96fb3 SHA512 67f25e5f7fdc54143c5d10720f27bd256f22695ced93088cf2b72fe3197e45324d4353357ae40d7d3e92019480c0bec009e38ed3f583724d46411d76adbdc927
+DIST pushgateway-0.5.0.tar.gz 1566969 BLAKE2B 255592d172ba910cd4c031f33045ee92fa02b8ba04c69a844e1a81d0fb4c0425f4a71931c917cb70f90422e25ad8761892cde344acb3fa7465e682ff8671f31b SHA512 d0a96aa8b1a59266a8864ab760ad6fdbdc131c49b08aa3bf89f54ed9c6ced6a4b7ab2f8c70d15dad1605ec7b46c5e784dc77be10f26ebd56a3a0f16f7285d607
 EBUILD pushgateway-0.4.0.ebuild 1301 BLAKE2B 328b451698ceec2cd6f6020cadba897836c66513fcc25169be9e92ca7715e97e52fd245c51e7cb5f58a56967c486294f0164501dfbc9099d1d0144452f379c1a SHA512 81b652f6f3a78a39aa1604a7fa1209fd73595ea318736a735ddb00cd7d35ec48575eb4106c12efbacb3ac095c8280ec96fb9a0decc60631847079dcbf805bcec
+EBUILD pushgateway-0.5.0.ebuild 1291 BLAKE2B 267e67938461d4b8461822f9986ad1782ebb66e4e01fb623f265d07c9f47b4af7041ff07ba11660596ac6e3452c53eeed941679ab47690979173bf660a7ae822 SHA512 c2d44c055d5aa6f871f05ac459fa88c2f4321c4977ef07073b16ccbc72b5fc1199adaedffd0d5e70d4df05920596066282f8eb91cca4d0fd4f4a17f02b2ef16e
 MISC metadata.xml 437 BLAKE2B 904f35ea9287d25e5708e450715f8719004a5349ea871e9730fe36a98257cd0ba2417ec572f0d26a8d5d2de5629bca2d1b81f3e344bb8e4a52653175e8df2f3e SHA512 09284843912bc08aef77485911289fe1050f7d42e726e555650ad73b3ca51bcb62af90ccd69c3529bbdb7373b9ec317e0afd74687b84b123ac4fbbf2a3de9d7f
diff --git a/app-metrics/pushgateway/files/pushgateway-1.confd b/app-metrics/pushgateway/files/pushgateway-1.confd
new file mode 100644
index 000000000000..73149075bb4e
--- /dev/null
+++ b/app-metrics/pushgateway/files/pushgateway-1.confd
@@ -0,0 +1,14 @@
+# --log.format value
+#   	If set use a syslog logger or JSON logging. Example: logger:syslog?appname=bob&local=7 or logger:stdout?json=true. Defaults to stderr.
+# --log.level value
+#   	Only log messages with the given severity or above. Valid levels: [debug, info, warn, error, fatal].
+# --persistence.file string
+#   	File to persist metrics. If empty, metrics are only kept in memory.
+# --persistence.interval duration
+#   	The minimum interval at which to write out the persistence file. (default 5m0s)
+# --web.listen-address string
+#   	Address to listen on for the web interface, API, and telemetry. (default ":9091")
+# --web.telemetry-path string
+#   	Path under which to expose metrics. (default "/metrics")
+
+#command_args="--web.listen-address localhost:9091 --persistence.file=/var/lib/${RC_SVCNAME}/persistence.gob"
diff --git a/app-metrics/pushgateway/files/pushgateway-1.initd b/app-metrics/pushgateway/files/pushgateway-1.initd
new file mode 100644
index 000000000000..60f81c1f38a2
--- /dev/null
+++ b/app-metrics/pushgateway/files/pushgateway-1.initd
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Prometheus push acceptor for ephemeral and batch jobs"
+pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
+user=${user:-${RC_SVCNAME}}
+group=${group:-${RC_SVCNAME}}
+
+command="/usr/bin/pushgateway"
+command_args="${command_args:---web.listen-address localhost:9091 --persistence.file=/var/lib/${RC_SVCNAME}/persistence.gob}"
+command_background="true"
+start_stop_daemon_args="--user ${user} --group ${group} \
+	--stdout /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log \
+	--stderr /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log"
+
+depend() {
+	need net
+}
diff --git a/app-metrics/pushgateway/files/pushgateway-1.service b/app-metrics/pushgateway/files/pushgateway-1.service
new file mode 100644
index 000000000000..03ae0a442772
--- /dev/null
+++ b/app-metrics/pushgateway/files/pushgateway-1.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=Prometheus exporter for ephemereal jobs
+Documentation=https://prometheus.io/docs/instrumenting/pushing/
+After=network-online.target
+
+[Service]
+User=pushgateway
+Restart=on-failure
+Environment=PUSHGATEWAY_ARGS="--web.listen-address localhost:9091 --persistence.file=/var/lib/pushgateway/persistence.gob"
+ExecStart=/usr/bin/pushgateway $PUSHGATEWAY_ARGS
+ExecReload=/bin/kill -HUP $MAINPID
+TimeoutStopSec=20s
+SendSIGKILL=no
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-metrics/pushgateway/pushgateway-0.5.0.ebuild b/app-metrics/pushgateway/pushgateway-0.5.0.ebuild
new file mode 100644
index 000000000000..80fde6225b68
--- /dev/null
+++ b/app-metrics/pushgateway/pushgateway-0.5.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit user golang-build golang-vcs-snapshot systemd
+
+EGO_PN="github.com/prometheus/pushgateway"
+EGIT_COMMIT="v${PV/_rc/-rc.}"
+GIT_COMMIT="3965d2a"
+ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Prometheus push acceptor for ephemeral and batch jobs"
+HOMEPAGE="https://github.com/prometheus/pushgateway"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-util/promu"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+	default
+	sed -i -e "s/{{.Revision}}/${GIT_COMMIT}/" src/${EGO_PN}/.promu.yml || die
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	mkdir -p bin || die
+	GOPATH="${S}" promu build -v --prefix bin || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin bin/pushgateway
+	dodoc {README,CHANGELOG,CONTRIBUTING}.md
+	popd || die
+	keepdir /var/lib/${PN} /var/log/${PN}
+	fowners ${PN}:${PN} /var/lib/${PN} /var/log/${PN}
+	newinitd "${FILESDIR}"/${PN}-1.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}-1.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}-1.service"
+}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 410fbda15487..eddbf3415a15 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/beep/Manifest b/app-misc/beep/Manifest
index 238af9a6a3ea..0c3f934aec69 100644
--- a/app-misc/beep/Manifest
+++ b/app-misc/beep/Manifest
@@ -2,5 +2,5 @@ AUX beep-1.3-CVE-2018-0492.patch 3292 BLAKE2B fafed7dbe65438869adccf674b19c4e5b6
 AUX beep-1.3-Makefile.patch 516 BLAKE2B f69b5907e7a1342a574bedc273e609415e5853939aa694894c732333e482f2507462748cfb9ba1f0945f4778653d44c3fa04c4aca3eb78afb7152597beba759a SHA512 b21f788780a13bbef436b80ec020b8727b9c1a8ddac3552cb8bf05d7ab937851d05d72279b53b51dd0ae1f99e44f55caa494b7e61b59800d91dd186497b65009
 DIST beep-1.3.tar.gz 19344 BLAKE2B 4f9cf12f6983eeb53502fd85e5e1d428e1c1af481f8f424f6ae18cbe104462e8fdcc96670a72daa8a8a0d1430d00824d8795b4db53437e7bb7320cddfd84cfd3 SHA512 3f71146202208fa0c0cda360d125dd972ea003cf8cd62da21d67eb544c92f7b82640e7ce7c3835cbc65c75909a882edfa54dbd8d8b748d6f243711ea331477fd
 EBUILD beep-1.3-r2.ebuild 639 BLAKE2B dc9f0e4ce7d73941801fff7c7a872f1295c2b59aec1a076b3700aca6aa21520ac71a104e0e84c60545684120e6d619e82117e8e145e48c803a85887cb7f82c58 SHA512 8efda568f0faa4471f495c243ab64fa0fc360ad6e05fb7752b615a8ecd527a44667a2829eab35413cb0642805abd387e0033dedca05affc5269f68178fbbe485
-EBUILD beep-1.3-r3.ebuild 682 BLAKE2B 03940921b14519125b0226f1905f8b358a4f7ed2c378c0315c98b612e27c481f9aba5e62726fc06e6d5bff82b627ee95e24fa00d560e0dc82ae0e7aa2ad39a60 SHA512 a9633cd9f9ab41389a54805f690f1b3bdc525a94e228b94e77ef3e05194d2451559ad8bfad12f2cd019e1f30c476aa1943b62ead064a7d0f888a1f19ae3f0096
+EBUILD beep-1.3-r3.ebuild 680 BLAKE2B d9b7f48c566189b8eb6c35cc3bbc39824bd539d74b2f95072b4dbe5d28e5361bcc7d08d4575fdb6b0f9e3fd301186c84b251accd236b9f004a206f0a30ae8f11 SHA512 2069f3daff4130277d6b1062040aeda4c494e1425ba55eaf85ffb130859971cccc56bf1dd99239cbbe30f17870acd80777723eb1e90a67be8d6863f347d94dad
 MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b
diff --git a/app-misc/beep/beep-1.3-r3.ebuild b/app-misc/beep/beep-1.3-r3.ebuild
index 0222e746e1ca..a6c0024d4f55 100644
--- a/app-misc/beep/beep-1.3-r3.ebuild
+++ b/app-misc/beep/beep-1.3-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.johnath.com/beep/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ppc ppc64 sparc x86"
 IUSE="suid"
 
 PATCHES=(
diff --git a/app-misc/cadubi/Manifest b/app-misc/cadubi/Manifest
index c4148955f55b..f40ea4ad62a4 100644
--- a/app-misc/cadubi/Manifest
+++ b/app-misc/cadubi/Manifest
@@ -1,4 +1,4 @@
-AUX cadubi-1.3-helpfile.patch 347 BLAKE2B 5d04b86623bb7a66691d6dccaf20bb1b6c3480bf080ecba46eeead9fabe95900f789d37d990e6d150d30462179fc0254b8cb7a06b0f77d5582e11f1856a8a0f7 SHA512 2dbc3eaab66d57712c80344802701e354c9dc3602d02deaf19e19c352e398732a7a59ee671bc47159679f728e55ee17447c99edc51b6f54f6dca1dc3956eccae
+AUX cadubi-1.3-helpfile.patch 351 BLAKE2B 1dae10ad3b58bfc21b0c1ffcccbaec6c41de3433fad5657ed02273fb0f91e3e0ad3c15292c8bc5cca5850cbd0ad41d3fed8705f50f22431908565f5f66e27da6 SHA512 36c2af2d77a58d5091b7171495a8d788e219e65a664fe0bfd55800a2aacaac04db5e2d249c6bc8737336c43e2852687f7fee7da4510597d64b40abe4843cdac3
 DIST cadubi-1.3.tar.gz 12559 BLAKE2B d1a32d602c00d76717e8e6cdf8d376dca12f9f55f9375bb0b8ea781cf923cfb90789cc011a3ab33960339ced3c05c668f6c6ec6e5b33ca89f7eda27c47789639 SHA512 e3b5190850bd4d579934bd5825db2b8bde5a46158862ec66b8604999344138477c0fb3fad34dc186ed9dd67dfbdcacf12763f76adbdfbd0cc4dbf6b51ad53bc7
-EBUILD cadubi-1.3.ebuild 630 BLAKE2B 57659ea06503fa22adb9c3e72a8db7d2a1953021748333f5f685d55d6bf3ecd5dd4caee0c4d6643f6d15e5854152d8d59be284b00b862f2036be726dd138f269 SHA512 0fdc74fc37f9a01f6898103f24323c682e6df89d2e2e3a9a9f6afc30a34054ba666859ecc0e3c93c45e88f9244286a113a8d7088c33c85755991ca5d9768137b
+EBUILD cadubi-1.3.ebuild 574 BLAKE2B 690a332da44371b7fab741801b9cc0465962db1d5a6b2e51e53688a06f3a3c4ebfd70a4282921aa174839de0de3c05cbc81864b91d6f59fbd6d82dbb3a4342ba SHA512 804928407e3d0e042b1b1395720f373992a21c2037066771d1480b3cc3079c38e22ecad4101b55124f2c2a277e16e9f24bf741bb0df32f146d509b78bb303be0
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/cadubi/cadubi-1.3.ebuild b/app-misc/cadubi/cadubi-1.3.ebuild
index bbc15dfa8a7b..9e51a1ee8b47 100644
--- a/app-misc/cadubi/cadubi-1.3.ebuild
+++ b/app-misc/cadubi/cadubi-1.3.ebuild
@@ -1,11 +1,9 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=6
 
-inherit eutils multilib
-
-DESCRIPTION="CADUBI is an application that allows you to draw ASCII-Art images"
+DESCRIPTION="An application that allows you to draw ASCII-Art images"
 HOMEPAGE="http://langworth.com/CadubiProject"
 SRC_URI="http://langworth.com/downloads/${P}.tar.gz"
 
@@ -17,14 +15,13 @@ IUSE=""
 DEPEND="dev-lang/perl
 	>=dev-perl/TermReadKey-2.21"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-helpfile.patch
+src_prepare() {
+	default
+	eapply "${FILESDIR}"/${P}-helpfile.patch
 }
 
 src_install() {
-	dobin cadubi || die
+	dobin cadubi
 	insinto /usr/$(get_libdir)/${PN}
 	doins help.txt
 	dodoc README
diff --git a/app-misc/cadubi/files/cadubi-1.3-helpfile.patch b/app-misc/cadubi/files/cadubi-1.3-helpfile.patch
index 0d6a2e1fa5c9..fd54d5c8bfb1 100644
--- a/app-misc/cadubi/files/cadubi-1.3-helpfile.patch
+++ b/app-misc/cadubi/files/cadubi-1.3-helpfile.patch
@@ -1,5 +1,5 @@
---- cadubi.orig	2004-03-29 22:36:24.280138064 +0200
-+++ cadubi	2004-03-29 22:39:34.473224320 +0200
+--- a/cadubi.orig	2004-03-29 22:36:24.280138064 +0200
++++ b/cadubi	2004-03-29 22:39:34.473224320 +0200
 @@ -18,7 +18,7 @@
  # (sorry guys, i wrote this years before i had the remotest clue as to
  #  what the hell i was doing)
diff --git a/app-misc/calendar/Manifest b/app-misc/calendar/Manifest
index 39af75a89575..14737610d0bc 100644
--- a/app-misc/calendar/Manifest
+++ b/app-misc/calendar/Manifest
@@ -1,3 +1,3 @@
 DIST calendar-0.9.1.tar.bz2 65225 BLAKE2B b8ee591005d57fdb3e18412c9665ee3447f607224efad261ca0cf7a3dc88e94e8bfb8309b19996e38e7e18c26bafcaddc9ebf7d612ed25d7d1d159b63b7b6827 SHA512 c8f373ad06265720ab6ba1edb9066cb5474806d023bf0cb3a35876c5bad72de8bac8ab58c2b6d3a9f418d20d04b1811e256abce9296c9c8547c9b7f8005adfb3
-EBUILD calendar-0.9.1-r1.ebuild 630 BLAKE2B 69b097dbb7d9f7448fbb551cb4da14a486360c79bd2090ccb6276f40b21a0c5dbe6bf4e8f624c8a85ee0c898c5f4b59107cedcef0e9653b839b58b40abf5dca1 SHA512 722feb4737244abd9a11b37fae102d1b8c8b3153b9d8af1d0d4ce2b3ad0cc92f933c90ef44cc436d6e8c5834e64b7e8b3ada25fbbc762e93368612fac4fbef05
+EBUILD calendar-0.9.1-r1.ebuild 629 BLAKE2B a357c49d2db7065e887c29b898696bc097a26b77b775dbd8a56112a871d3ca1573009d3ad1ecbce3b954c99bc3d538e120ed2b6f47aadf5504dbbd51449ceffb SHA512 be43b9744c0936fc7498e6d9cda7b378dc665d6784720ef2dea424d360376b9df2f1abd1e5f4e0e1ee148257cf0bfd70bab7c09e317f95409a131b463b08e229
 MISC metadata.xml 346 BLAKE2B 365bbcf4fca5fb793b4b9499b021c028eb13d1634d21a1c1627cd528c0fe77c195f7f789ee7cce987297ed8e8e20cc9937e83f6d5292b3878a25426488a3d691 SHA512 9fb15d47c1b5ea5eba7614339ed44e8812550589416f8fdb5aa02dfc899c95b782526577f97a24e024c0298e09af634b8a3dc27474755728d81866100c8d066d
diff --git a/app-misc/calendar/calendar-0.9.1-r1.ebuild b/app-misc/calendar/calendar-0.9.1-r1.ebuild
index 0f07c38b7821..e4eb46e51434 100644
--- a/app-misc/calendar/calendar-0.9.1-r1.ebuild
+++ b/app-misc/calendar/calendar-0.9.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://bsdcalendar.sourceforge.net/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
 
 DOCS=( README )
 
diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest
index 53083af9674d..5841408e7424 100644
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@@ -1,19 +1,14 @@
 AUX elasticsearch-systemd-pre-exec 221 BLAKE2B 22176ca536032f7a7e3724a85100ed3ab5e15a7acacdacf185d733ff272d65712c9166f1d3123cd09a6e3de9a65a29340e0ca7ebb246d359a4d843eddd0ea25b SHA512 1dc41303da367122779759fc1967540357a21aac6df4f5d8761d36dc643673df660b47e5c1b595ecf9316265fe7684ddcb5290df8369379c1bdbc8c933726644
-AUX elasticsearch.conf 2077 BLAKE2B 1601e7850d88c90bd6ab1037f3b867b3e2bcfe6a8356f33984ac9d6041f8cb1dba06a59b8e62565e44b09fd3018e982d00a7b986be0a11ac0a9429bd60af3522 SHA512 d386f409e7c7d7e654b43ba42298d0c8d14f0973a656582c06e21dc5e1a93088367725c1ef1644d0bde553912297f1693fca9b461f51ac823be3140f56f9dd5a
 AUX elasticsearch.conf.2 2070 BLAKE2B b620bc7bddfb57c0d1c409c8af919c85fd28df79fe3329a770c7e5a46e7a6898b9b7f6b0340a19af6e5536856620aa5981e3df0c0c1fa50dd57a204d752ce248 SHA512 e10d7699046e7db71d822154be6e21785906977d991cae6709a4fd0439c262915ddbf5499b8dd501da86985644f402b96c92fa5d83feb9d0684d3eec766164f9
 AUX elasticsearch.conf.3 2196 BLAKE2B e711aa58eca0df5857fa48a4dc21f5dd144977f3cd0209a58c15868531a108175ecdd21ddc18e1daf1e83c0bbd26da7c00b260698b3ef87c938b6d18928df733 SHA512 36a98d788cff404ccfe0fdff7bbe358750df8db9e5a5f419991b90e257e97331ec93c5f9a84bed57099dd239abb572ef450a191582e7145d8d7517c242707e49
-AUX elasticsearch.init 2503 BLAKE2B 8208d09d6afba9e1f334ee958baa6a106eb7dc05abc69871146c7dfdcc15922454161b44f6ac754b1de6e5362c9e33a7137efa5de6bc0359685c4c8158889494 SHA512 55369ea6fc19979a722528afead2a4a19912fd212db450e4fb840c88d0a868faaa87ff8fe33a8a12370559f68b729771ee4b5fdbf066a263a97bb7944d68b9b6
-AUX elasticsearch.init.1 1996 BLAKE2B b61a8146f75c694234b8403286fccc4dd163cfb8ec9b1370e858b1457281038034c21dd57a6e43738fc3a3361425a9afdfcd9739966224178fd5283e29558869 SHA512 49270bdfa60d88f0004d38fe9fc23599cc692f07ab1542f3a2281b7bd3b7ec62d9571ecfc2cefbc9197c72733948d2a43db3d763d7202c8c957830409ead4563
 AUX elasticsearch.init.2 1830 BLAKE2B 57dea653c636c7ccb40fa6ab777f0713b245bf9d344b39de23aaaad753c229196cb81acd01c4ac1c9ae29c166b1dbfa38e829d60172106dbc384aeb6e21a544e SHA512 babc54a225f1ea5c98a6c2e0a680635a5af30305a869e35db65f5f6ddeb00577b3011f83b3190567646b7d67a314710c83212a233dc31a0fb78691eb1358b96a
-AUX elasticsearch.init.3 1816 BLAKE2B ad4a62479797fed8bfe9b5003586ad2813d8dfa26f6686331bcf9f7a673ffd8171f9b8839d00bd8cffad2e9cf850a924e96b9a2d151b8ddc9928ca36168370d2 SHA512 2e08b1675e7888187ad2a6e1d73f29e0534c079670602fb2057d661b04deaedf6cc365caea83fa7e4b4f527737239dba45964cd380c1f7f463d9c875cf13e4d0
+AUX elasticsearch.init.3 1873 BLAKE2B 58c1fa6be05b4fc28ee0b65bb5f95522b5dee4fed706f8a207a48279a5be135e841dc7228f851ed0f8318d1717b810eb4a6048de2590336f31d7de6f72193f57 SHA512 8b4738042882fdbab3979a48174aee2e389570e4fcf5c07b2d2ef990fe9f38097f29c424ff9a7a50bc2b9f2fb0612b0b5d160e31901d34f5b33e21d5fff99b0c
 AUX elasticsearch.service 1718 BLAKE2B 1d3df50f9b521a897f6f57c411265ce3d5da849c23a6d5274959739531ec1f1373f59adb9d0ac94318eefbe90cf10218b67aa47530bdd162ed306354fb9cf2db SHA512 98530c01f41a2d98254033a1a292075abc6086e0608062dfbe28385e4f57da390a9c43521bfce72193c2b710e58e590f08f514257b8150140dbb9ade40ef5470
 AUX elasticsearch.service.2 1544 BLAKE2B bb66a0e945df66f84937804461ed51216f8bc4585dbdfbd5e834aad0632cc7fbf1005322509183705b62fdfe0f0d105bcc238810056ec066102d8ea84dbb1020 SHA512 33dc3efc736501d6e04ab1aa1b13a4d5f5cb235f7d9ff9674715dd47afdf1e8da8db0a4b82ce46c8c6b71d8258917e8943613eff8a0371a82b5d2e490acefd77
 AUX elasticsearch.sysctl.d 24 BLAKE2B 4012fbdbc98a8b28df11aed33cb82c113790c44721eae1d69e19c595bfbf329618b9cb67be9528f1994c546233cffd31b20eee39edc142bc86f7a7cf5e08903e SHA512 9f3d8238edff6704bea06b6535ee8915f4a3c9bdc8389d9d4943bcfa49161b61f9a1ca49dbcc415580438f4396fbc3d58eef301554f9426287606a755ada715c
 AUX elasticsearch.tmpfiles.d 56 BLAKE2B 0c28c612fadfdd86321df797527399fa5073a7350de95ec2b32dfbe51cbf52fe5dcf68ebd4e3fba6cccba1cf252a16dee3b701c4c6692121745c41665cf3c972 SHA512 5cc722abcaae68afffde96e38b2c9572faf898178d3c291c945fe49fbf977e319322b99fb6fb5bf49cfb04e86f071dde0db621849288f712a56571b13af9a11a
-DIST elasticsearch-1.7.6.tar.gz 28488767 BLAKE2B 0dc4fb10355e2139ee3a7e7e65366e8aa533b9714bf0f00d2bd8f4ef0669ba9f8f10dc5255c8c7a62abc0362e08ab5fda3c8b6b6f2bacfe5cce7255973293162 SHA512 2746f09b66919912e785c8d25c50ae74dbb38a41d99d9c926550786f9c2d7953d1ae1a54a32dae59a7269e5fbfa74dfbc91c3d412e415efd01c391ef7d329ba7
 DIST elasticsearch-5.6.9.tar.gz 33794793 BLAKE2B a056443b1f71b3af773b5195147927017456e1c9a6517c549cfe7e4ec70f0ff4ec9363c9ef6376b7b942e82f811cd5927d44eb9f9eb8022a56e54a85b4ba7c46 SHA512 4e61a4c5f79d0439a414f1e9361f855cdb2f79322cf592bad43132605922fb8ded6368b01e05ef6bcbee49911943c2a3b6be5fd6d0900abddfe03c736cca96d6
 DIST elasticsearch-6.2.4.tar.gz 29056810 BLAKE2B 121be27ac1db4fa6bbe285161b3f2b2dd889859b50f46b57b68ed43514568c4aa9629b5ca32edcc2328a6e7245256d64901c8acc8b2dd91337f8ca97b87c46e1 SHA512 9e6c0de8ed0d9e27fdd18ef7bada376af5a8680bb7a4f4d805926da456b349cee731ba90328b5eda5f0e62fa3f00f34646bf1c2b6c662d055f4be338d0690941
-EBUILD elasticsearch-1.7.6.ebuild 1731 BLAKE2B f9f95530464bbb1fe79a3f4ffd0c9421caa4eab078ab3fa1743e7ecaeb7004bcba414fa4d4509ae12b37d8f83f4c96dc0c5d5c179acccaf8c20b15d5b534bbe8 SHA512 8012b00b8e90fb84ed7d75a9fb22ded1a7ca6a0ef820746fc2258fbdc576b73d0cb97d037c8ca5fa08408fc119d9801b73aff6b4785e257d8e4fb658cb5cc730
 EBUILD elasticsearch-5.6.9.ebuild 1689 BLAKE2B 7520b1676de4ded7fbb3691cca543c3a5c6de99cfa1ffff09e40ba55991d086f7004c372387e932213bbf5dbab42952266f4da9cbaf051c1795089c420949dbf SHA512 36d5128d2779abddd535e0918bbe4569c3d1414dbfc43e57fc037ca3056aabf73dbfd43b58811c5a4d0bc3d0e3edbf093ca458add2b90b87b62cb22416552fb0
 EBUILD elasticsearch-6.2.4.ebuild 1747 BLAKE2B 2e8ad76bb75a927499cb73a89ede57629db4426ee267a0721e65e8893cdff2799830f7cd136b7e82185effdac60ab8f0d9314edc0179fe2261066514f3c60519 SHA512 e7be527f28b482278376316dd3d6bc969e4d70a8d95a067ac1932f5be0dcffaaaa47064e463bb043665725f73d9605cd150128660ed923de7094f3eeb8af5a3c
 MISC metadata.xml 493 BLAKE2B 8149c45c1eb86d156ec0a32f016e8eed79d8e8fb7b6f0294ad606eebe9c63208e3d450796cdfc123fb7b2b2bcd10ff0cf23f2b6d2a99c177cb1e795965984892 SHA512 ce03769abc314d3bf561ff5820a8c8582196e9e6755e1e695dcf1224afbc04b609fdec7a1499d2d7a3aa0a350ad9fea94e0e3b46eff7c3c6150a524edd28d399
diff --git a/app-misc/elasticsearch/elasticsearch-1.7.6.ebuild b/app-misc/elasticsearch/elasticsearch-1.7.6.ebuild
deleted file mode 100644
index eca489c9bd2d..000000000000
--- a/app-misc/elasticsearch/elasticsearch-1.7.6.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils systemd user
-
-MY_PN="${PN%-bin}"
-DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
-HOMEPAGE="https://www.elastic.co/products/elasticsearch"
-SRC_URI="https://download.elastic.co/${MY_PN}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RESTRICT="strip"
-QA_PREBUILT="usr/share/elasticsearch/lib/sigar/libsigar-*.so"
-
-RDEPEND="|| ( virtual/jre:1.7 virtual/jre:1.8 )"
-
-pkg_setup() {
-	enewgroup ${MY_PN}
-	enewuser ${MY_PN} -1 /bin/bash /var/lib/${MY_PN} ${MY_PN}
-}
-
-src_prepare() {
-	rm -rf lib/sigar/*{solaris,winnt,freebsd,macosx}*
-	rm -rf bin/*.{bat,exe}
-	rm lib/sigar/libsigar-ia64-linux.so
-	rm LICENSE.txt
-
-	use amd64 && {
-		rm lib/sigar/libsigar-x86-linux.so
-	}
-
-	use x86 && {
-		rm lib/sigar/libsigar-amd64-linux.so
-	}
-	default
-}
-
-src_install() {
-	dodir /etc/${MY_PN}
-
-	insinto /usr/share/doc/${P}/examples
-	doins config/*
-	rm -rf config
-
-	insinto /usr/share/${MY_PN}
-	doins -r ./*
-	chmod +x "${D}"/usr/share/${MY_PN}/bin/*
-
-	keepdir /var/{lib,log}/${MY_PN}
-
-	newinitd "${FILESDIR}/elasticsearch.init.1" "${MY_PN}"
-	newconfd "${FILESDIR}/${MY_PN}.conf.3" "${MY_PN}"
-	systemd_newunit "${FILESDIR}"/${PN}.service.2 "${PN}.service"
-}
-
-pkg_postinst() {
-	elog
-	elog "You may create multiple instances of ${MY_PN} by"
-	elog "symlinking the init script:"
-	elog "ln -sf /etc/init.d/${MY_PN} /etc/init.d/${MY_PN}.instance"
-	elog
-	elog "Each of the example files in /usr/share/doc/${P}/examples"
-	elog "should be extracted to the proper configuration directory:"
-	elog "/etc/${MY_PN} (for standard init)"
-	elog "/etc/${MY_PN}/instance (for symlinked init)"
-	elog
-}
diff --git a/app-misc/elasticsearch/files/elasticsearch.conf b/app-misc/elasticsearch/files/elasticsearch.conf
deleted file mode 100644
index 444ec53ae335..000000000000
--- a/app-misc/elasticsearch/files/elasticsearch.conf
+++ /dev/null
@@ -1,60 +0,0 @@
-################################
-# Elasticsearch
-################################
-
-# Elasticsearch home directory
-#ES_HOME=/usr/share/elasticsearch
-
-# Elasticsearch Java path
-#JAVA_HOME=
-
-# Elasticsearch configuration directory
-#CONF_DIR=/etc/elasticsearch
-
-# Elasticsearch data directory
-#DATA_DIR=/var/lib/elasticsearch
-
-# Elasticsearch logs directory
-#LOG_DIR=/var/log/elasticsearch
-
-# Elasticsearch PID directory
-#PID_DIR=/run/elasticsearch
-
-# Additional Java OPTS
-#ES_JAVA_OPTS=
-
-################################
-# Elasticsearch service
-################################
-
-# When executing the init script, this user will be used to run the elasticsearch service.
-# The default value is 'elasticsearch' and is declared in the init.d file.
-# Note that this setting is only used by the init script. If changed, make sure that
-# the configured user can read and write into the data, work, plugins and log directories.
-# For systemd service, the user is usually configured in file /usr/lib/systemd/system/elasticsearch.service
-#ES_USER=elasticsearch
-#ES_GROUP=elasticsearch
-
-# The number of seconds to wait before checking if Elasticsearch started successfully as a daemon process
-#ES_STARTUP_SLEEP_TIME=5
-
-################################
-# System properties
-################################
-
-# Specifies the maximum file descriptor number that can be opened by this process
-# When using Systemd, this setting is ignored and the LimitNOFILE defined in
-# /usr/lib/systemd/system/elasticsearch.service takes precedence
-#MAX_OPEN_FILES=65536
-
-# The maximum number of bytes of memory that may be locked into RAM
-# Set to "unlimited" if you use the 'bootstrap.memory_lock: true' option
-# in elasticsearch.yml.
-# When using Systemd, the LimitMEMLOCK property must be set
-# in /usr/lib/systemd/system/elasticsearch.service
-#MAX_LOCKED_MEMORY=unlimited
-
-# Maximum number of VMA (Virtual Memory Areas) a process can own
-# When using Systemd, this setting is ignored and the 'vm.max_map_count'
-# property is set at boot time in /usr/lib/sysctl.d/elasticsearch.conf
-#MAX_MAP_COUNT=262144
diff --git a/app-misc/elasticsearch/files/elasticsearch.init b/app-misc/elasticsearch/files/elasticsearch.init
deleted file mode 100644
index a9200d58ca0b..000000000000
--- a/app-misc/elasticsearch/files/elasticsearch.init
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/sbin/openrc-run
-
-name="Elasticsearch"
-description="Elasticsearch Server"
-
-ES_INSTANCE=${SVCNAME#*.}
-PID_DIR=${PID_DIR:="/run/elasticsearch"}
-
-if [ -n "${ES_INSTANCE}" ] && [ ${SVCNAME} != "elasticsearch" ]; then
-	PIDFILE="${PID_DIR}/elasticsearch.${ES_INSTANCE}.pid"
-	ES_BASE_PATH="/var/lib/elasticsearch/${ES_INSTANCE}"
-	CONF_DIR="/etc/elasticsearch/${ES_INSTANCE}"
-	LOG_DIR="/var/log/elasticsearch/${ES_INSTANCE}"
-else
-	PIDFILE="${PID_DIR}/elasticsearch.pid"
-	ES_BASE_PATH="/var/lib/elasticsearch/_default"
-	CONF_DIR="/etc/elasticsearch"
-	LOG_DIR="/var/log/elasticsearch/_default"
-fi
-
-ES_HOME=${ES_HOME:="/usr/share/elasticsearch"}
-ES_USER=${ES_USER:="elasticsearch"}
-ES_GROUP=${ES_GROUP:="elasticsearch"}
-ES_STARTUP_SLEEP_TIME=${ES_STARTUP_TIME:=5}
-MAX_OPEN_FILES=${MAX_OPEN_FILES:=65536}
-MAX_MAP_COUNT=${MAX_MAP_COUNT:=262144}
-
-DATA_DIR=${DATA_DIR:="${ES_BASE_PATH}/data"}
-
-if [ -f "${CONF_DIR}/elasticsearch.in.sh" ]; then
-    ES_INCLUDE="${CONF_DIR}/elasticsearch.in.sh"
-fi
-
-export ES_INCLUDE
-export JAVA_HOME
-export JAVA_OPTS
-export ES_JVM_OPTIONS
-export ES_JAVA_OPTS
-export ES_STARTUP_SLEEP_TIME
-
-server_command="/usr/share/elasticsearch/bin/elasticsearch"
-server_args="-d -p ${PIDFILE} -Edefault.path.logs=${LOG_DIR} -Edefault.path.data=${DATA_DIR} -Edefault.path.conf=${CONF_DIR}"
-
-depend() {
-	use net
-}
-
-start() {
-	local conf
-	local conf_file
-	for conf in elasticsearch.yml; do
-		conf_file="${CONF_DIR}/${conf}"
-		if [ ! -f "${conf_file}" ]; then
-			eerror "${conf_file} must be copied into place"
-			return 1
-		fi
-	done
-
-	if [ -n "${MAX_MAP_COUNT}" -a -f /proc/sys/vm/max_map_count ]; then
-		sysctl -q -w vm.max_map_count=${MAX_MAP_COUNT}
-	fi
-
-	ebegin "Starting ${SVCNAME}"
-
-	if [ -n "${MAX_LOCKED_MEMORY}" ]; then
-		ulimit -l "${MAX_LOCKED_MEMORY}"
-	fi
-
-	if [ -n "${MAX_OPEN_FILES}" ]; then
-		ulimit -n "${MAX_OPEN_FILES}"
-	fi
-
-	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "/var/lib/elasticsearch"
-	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "/var/log/elasticsearch"
-	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "${PID_DIR}"
-	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "${ES_BASE_PATH}"
-	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "${LOG_DIR}"
-
-	start-stop-daemon --start \
-		--background \
-		--chdir "${ES_HOME}" \
-		--user="${ES_USER}" \
-		--pidfile="${PIDFILE}" \
-		--exec ${server_command} -- ${server_args}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop \
-		--pidfile=${PIDFILE} \
-		--user="${ES_USER}" \
-		--retry=TERM/20
-	eend $?
-}
diff --git a/app-misc/elasticsearch/files/elasticsearch.init.1 b/app-misc/elasticsearch/files/elasticsearch.init.1
deleted file mode 100644
index c44671c95d1b..000000000000
--- a/app-misc/elasticsearch/files/elasticsearch.init.1
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/sbin/openrc-run
-
-name="Elasticsearch"
-description="Elasticsearch Server"
-
-ES_INSTANCE=${SVCNAME#*.}
-
-if [ -n "${ES_INSTANCE}" ] && [ ${SVCNAME} != "elasticsearch" ]; then
-	ES_BASE_PATH="/var/lib/elasticsearch/${ES_INSTANCE}"
-	CONF_DIR="/etc/elasticsearch/${ES_INSTANCE}"
-	LOG_DIR="/var/log/elasticsearch/${ES_INSTANCE}"
-else
-	ES_BASE_PATH="/var/lib/elasticsearch/_default"
-	CONF_DIR="/etc/elasticsearch"
-	LOG_DIR="/var/log/elasticsearch/_default"
-fi
-
-ES_DATA_PATH="${ES_BASE_PATH}/data"
-ES_WORK_PATH="${ES_BASE_PATH}/work"
-
-ES_HOME=${ES_HOME:="/usr/share/elasticsearch"}
-ES_USER=${ES_USER:="elasticsearch"}
-ES_GROUP=${ES_GROUP:="elasticsearch"}
-ES_STARTUP_SLEEP_TIME=${ES_STARTUP_TIME:=5}
-MAX_OPEN_FILES=${MAX_OPEN_FILES:=65536}
-MAX_MAP_COUNT=${MAX_MAP_COUNT:=262144}
-
-DATA_DIR=${DATA_DIR:="${ES_BASE_PATH}/data"}
-
-if [ -f "${CONF_DIR}/elasticsearch.in.sh" ]; then
-    ES_INCLUDE="${CONF_DIR}/elasticsearch.in.sh"
-fi
-
-export ES_INCLUDE
-export JAVA_HOME
-export JAVA_OPTS
-export ES_JVM_OPTIONS
-export ES_JAVA_OPTS
-export ES_STARTUP_SLEEP_TIME
-export ES_PATH_CONF="${CONF_DIR}"
-
-pidfile="/run/elasticsearch/${RC_SVCNAME}.pid"
-
-command="/usr/share/elasticsearch/bin/elasticsearch"
-command_args="-d --pidfile=${pidfile} -Des.default.path.conf=\"${CONF_DIR}\" -Des.default.path.data=\"${ES_DATA_PATH}\" -Des.default.path.work=\"${ES_WORK_PATH}\" -Des.default.path.logs=\"${LOG_DIR}\""
-command_user="${ES_USER}:${ES_GROUP}"
-required_files="${CONF_DIR}/elasticsearch.yml"
-retry="TERM/30/KILL/30"
-
-depend() {
-	use net
-}
-
-start_pre() {
-	if [ -n "${MAX_MAP_COUNT}" -a -f /proc/sys/vm/max_map_count ]; then
-		sysctl -q -w vm.max_map_count=${MAX_MAP_COUNT}
-	fi
-
-	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "/var/lib/elasticsearch"
-	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "/var/log/elasticsearch"
-	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "/run/elasticsearch"
-	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "${ES_BASE_PATH}"
-	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "${LOG_DIR}"
-}
diff --git a/app-misc/elasticsearch/files/elasticsearch.init.3 b/app-misc/elasticsearch/files/elasticsearch.init.3
index ab086197ec91..cd89acd9f998 100644
--- a/app-misc/elasticsearch/files/elasticsearch.init.3
+++ b/app-misc/elasticsearch/files/elasticsearch.init.3
@@ -8,11 +8,11 @@ ES_INSTANCE=${SVCNAME#*.}
 if [ -n "${ES_INSTANCE}" ] && [ ${SVCNAME} != "elasticsearch" ]; then
 	ES_BASE_PATH="/var/lib/elasticsearch/${ES_INSTANCE}"
 	CONF_DIR="/etc/elasticsearch/${ES_INSTANCE}"
-	LOG_DIR="/var/log/elasticsearch/${ES_INSTANCE}"
+	DEFAULT_LOG_DIR="/var/log/elasticsearch/${ES_INSTANCE}"
 else
 	ES_BASE_PATH="/var/lib/elasticsearch/_default"
 	CONF_DIR="/etc/elasticsearch"
-	LOG_DIR="/var/log/elasticsearch/_default"
+	DEFAULT_LOG_DIR="/var/log/elasticsearch/_default"
 fi
 
 ES_HOME=${ES_HOME:="/usr/share/elasticsearch"}
@@ -23,6 +23,7 @@ MAX_OPEN_FILES=${MAX_OPEN_FILES:=65536}
 MAX_MAP_COUNT=${MAX_MAP_COUNT:=262144}
 
 DATA_DIR=${DATA_DIR:="${ES_BASE_PATH}/data"}
+LOG_DIR=${LOG_DIR:="${DEFAULT_LOG_DIR}"}
 
 if [ -f "${CONF_DIR}/elasticsearch.in.sh" ]; then
     ES_INCLUDE="${CONF_DIR}/elasticsearch.in.sh"
diff --git a/app-misc/regionset/Manifest b/app-misc/regionset/Manifest
index fcd33d7458ef..2a2705efb7a9 100644
--- a/app-misc/regionset/Manifest
+++ b/app-misc/regionset/Manifest
@@ -1,5 +1,5 @@
 DIST regionset-0.1.tar.gz 17095 BLAKE2B a72d73b921a5f93515462ae287766c75d5019663244569504ab29220c53804919c08a6120e24f6e9c06a01f304f8a4188129d199c1f0f028443f39e074c6c9d3 SHA512 19e1a681f6acc9f7da064432f893cd6736e3b54e5f0187025b9702a7301a982bc2f3948604e3bc9f7f15b20feb0dbc0424ad9727790cddb448b89189c1ce18c3
 DIST regionset-0.2.tar.gz 19063 BLAKE2B e96c014effa78d7c5f636d80edb7d74741107dd11728ca7f52c2d41919960986d37fd4245bb7975928605c6a06e7e2c31d050b847771e60af837e3f2286edb27 SHA512 7d7fa92a2031a1d18032ba0979fe0ee27ff84c02977dc03df394383a2d562925b38eedfd478ee08d60e84de60914278f7880c10a43552345fe36af0c0fee6431
 EBUILD regionset-0.1-r1.ebuild 945 BLAKE2B 6f6d7a8e00d64a19950a4c28c02360a3c70bd68799821479b90019b993101d61785e857f3cd38e493b081f8054e7d59057c1eaf871a9c0c1d590a5a36d65a341 SHA512 b41176ef36842aaa5bbeec7569a0232513c463cbc943f0a14bad7cdc7b0b007e4fa32fe1d8814185013f751ffa7bf77f89390133f58950a7faee2b6e6a08f0dd
-EBUILD regionset-0.2.ebuild 1014 BLAKE2B e6f6158da30270605e5cd3dbb695827c2b8d1ddb3446b9d6a7eda2839f1883ed944b95e198782e1de5b33f644f6f22c2abb227bce6d29ca16fce9246c141261b SHA512 f14cda65511f8413ba5c4e49be9b5102439674979ee8ab41548afbbdde097a6b40d2da84904f45b7aa4b28e1e6c34fd5b0b1e11a54a493c9e394f89f1c07d029
+EBUILD regionset-0.2.ebuild 1013 BLAKE2B 840e01afd9ab775c8265253c820ba522c904d97d2f1b1dedda86ee8076e648ae2a0bc2d45ef1b06ab4fddbf32a0efa7c555eafee8fc0970efc3d9efa09ffefd8 SHA512 18ea86944db5cc359b0ea8bcb27a47d4378f6b5d0e82473c7a639aec231527a826c7706f163e89ae5b06b696b927a3f6222cc2f9a577bec3c194ec9f3f982b4e
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/regionset/regionset-0.2.ebuild b/app-misc/regionset/regionset-0.2.ebuild
index 8c2dd9a2ba37..ccfb8796d511 100644
--- a/app-misc/regionset/regionset-0.2.ebuild
+++ b/app-misc/regionset/regionset-0.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://linvdr.org/download/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 src_prepare() {
diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest
index 45823f1a9268..c334d292394c 100644
--- a/app-misc/screen/Manifest
+++ b/app-misc/screen/Manifest
@@ -11,7 +11,7 @@ DIST screen-4.6.2.tar.gz 845210 BLAKE2B feea244e2e0c8f638442a524cd7cac93c6c5e576
 EBUILD screen-4.4.0.ebuild 3980 BLAKE2B 3077899f647e40c745c435215768819a8bb11a21d3f91ac86c45bc107e96f8d8cbb9d86328f5b7bd8295f1d80afa73fa67405bf37c1b8319466ce57aaa33af42 SHA512 95379c53082d4bd334550dce454c087fc9591cf96a625018e1856eb7073ce267f5885a382b54fd46e73a319b64304ecb92f779b1aeb80898262b8daff763bc13
 EBUILD screen-4.5.1.ebuild 4127 BLAKE2B d224ced4b2a18f213fb6d2d8c31fb466d6a4fb19c4fe1a8f24823b40a58abee084d4f6f7e8870bba4c016b198182e88f61beb7b86a9ec8bcacabbc4dda5bf9f2 SHA512 6db1227a0d8f4580a1603b85bc0ff8cdfe868ba58c735848e0dd37b6b989406bfbc9c3a8803c11f185f5f78802633bbaf90284356c66d364ea566768be2a07fe
 EBUILD screen-4.6.0.ebuild 4075 BLAKE2B 88b85d6cb3413354b8411c2f71fb3b17a7b8fe9b7989e06e823faad8d3328612b74c6e0846184ebd60aeaf2d94e6bdbb8e631170d3f339459a9a589e4362228e SHA512 ba1626a43f9cbb92e5abe099ed8f17524d9fcef21381fbdaf645830873bc06dbdf4e04326ae5af6f662e709393b1e3b48c4859f4136e90f02f57bd07c4eba431
-EBUILD screen-4.6.1.ebuild 4065 BLAKE2B 2a6716a96066552b470789cb06999dab29232fddd7de3c1eb773a0983e12b1d29e101deddc208377df593049de4d4b3ceab6711a954d2440c4490939e3d50d2f SHA512 469e386b23958f7a4d2cb2676940e78d1833001b0cce51ed1a2e198a2164373f11e13ad95223f203c3aa58bf56be8dda079ba95fa2ef8211f63baa41b09150bd
+EBUILD screen-4.6.1.ebuild 4062 BLAKE2B 87465fca1c1a8568c704fb5ca3f67fc12ed41c187f05ac95bd7dc95233821f7dc00830df40eec87934e5df5ead4055c94f80d3388b067893e8c4044311e183a4 SHA512 16e09d9b1e90915c4962b8d1840659d0c2b456fb38acea38bd809ff4416008ee4c13e73efaac3d562a034db20525efc7325b7fd400e04b37bd57904ae2be0be4
 EBUILD screen-4.6.2.ebuild 4111 BLAKE2B cc6b4b3eeb615f3e313f6ed779aba160058e5d31c1b05342945bba687d3ea6f73d8f71f08fefb5d7d0e2130c6f4370b5f798e1b4529318defb67fc72172fdd67 SHA512 bf1ab9c61d9d1c8087c08315aa732fcd1922913b446bfa3729219d52f7628f9aa8fb7c1001743bd4a77eae4936117fc4f108b8aacbd29e33d4efaf4e8adf4ce1
 EBUILD screen-9999.ebuild 3746 BLAKE2B c8bbcdc221e6e4e310aa161e4faad0a517579a1ee9d639957356eeac1cda6f437b33b7780877d87a2f25881a52b76f9e4e71d8760c55a92b2ef790c2af12aeb7 SHA512 07fee252dc398dc18edd4aceebc3ca9d0a86e4523593bb58983ff401fcb7cfffbb969d60563ec8e657e944b14952d462e1d9dc61e274ffff869421673a90f1ed
 MISC metadata.xml 1836 BLAKE2B c91b439cb8e6301a8e7ac000f58616a6a383180671dc721b3ab74d74c826a85ec9f3e5d0d70a450a3a46430b47eb6dfff329a0d2489f4dee861ea1575f08e9c5 SHA512 39618ae8527cf9744132eb2a0aefe5f0b4a400784288661e74b670b149bf729001c950408b765a6cec0330c0517063732c7e4b15270a2a2a5d971d2e0475f21d
diff --git a/app-misc/screen/screen-4.6.1.ebuild b/app-misc/screen/screen-4.6.1.ebuild
index a6a1ccd05e62..5ad1bf9cd4ee 100644
--- a/app-misc/screen/screen-4.6.1.ebuild
+++ b/app-misc/screen/screen-4.6.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/"
 
 if [[ "${PV}" != 9999 ]] ; then
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-	KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 else
 	EGIT_REPO_URI="git://git.savannah.gnu.org/screen.git"
 	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}" # needed for setting S later on
diff --git a/app-misc/tdfsb/Manifest b/app-misc/tdfsb/Manifest
index bef57c7ba79f..2bd47b08171d 100644
--- a/app-misc/tdfsb/Manifest
+++ b/app-misc/tdfsb/Manifest
@@ -2,6 +2,6 @@ AUX tdfsb-0.0.10-asneeded.patch 2009 BLAKE2B e4e496814fcd9aacbe4e51a14c8432d683f
 AUX tdfsb-0.0.10-debugging.patch 2106 BLAKE2B 27d00c7a5bfee66126417c336d43890c30b034530cc51fc38e57afbd5b3c0218d50a328cb1a8eac5a75c40f1c24c29afe555db06c96dfb9095e0a7b431666e5f SHA512 eda59ad82597f819ea6458c096dfdb2c27ae35be99961cd72135f98f189ee428aa5f198bc4098350cbd0690852f8693003a074fe73e904f16827be4b2ebe931a
 AUX tdfsb-0.0.10-format-security.patch 1398 BLAKE2B fc461e169ca717fa75b1220d606cf1bd6a2d8c7b15c928402ac1d9f1a37413beaec464b5da867d1ef9cfba35baf2b17f24a57c06b894c468b0e961481cb05e3b SHA512 17543c4edcc09adc21a1dd8787eef2c7e57803d2ea490e4d0f259275e40d8619009ca1f5bd22970d1461078f998d3334ce5af9667f00c31b40a7c41841b151ca
 DIST tdfsb-0.0.10.tar.gz 35630 BLAKE2B 6df88ac449c8c671921aabe0b429e9b5074328c6b5c47869e06001f2996583c483427f744ce64874c2f70705463d432e945e1946436ebee8300c33702a64dca1 SHA512 4bfde530761bbc8373f2a9cc8bc5a4ea721ac564e7440d67ebf0c8b019c553b2e1288db86e54aaf111253decdbd4df93ea812fd5a70fd95acf11ff702387a7eb
-EBUILD tdfsb-0.0.10-r1.ebuild 915 BLAKE2B 9a8f1aa513bddeffa69738fba5fd2c8319d1d0c5f63b412aab77a51beb3965a6c3ad8e7e66301f86dd18db896b52ebf4f5651a32685532c253f7cc63333b8489 SHA512 daf8f36efdc2e7c4379747ab15a5aa3eb1e29dbdc37eea67c9328fc1a9a42ad4a52cd58f6faeeb19dce4c00d57b0464b48053ac25eabf2924c3912a5b571f6ff
+EBUILD tdfsb-0.0.10-r1.ebuild 914 BLAKE2B 025a6278b386ccd288c72ea6a95c06958efd21fb01ae3076ef64319f9cd3f61c7337293944716d9f465b89f19192151c81147dc915a08e9f11bcef2e287c7723 SHA512 2307b4ea3739fdaad830787048da9f0d3eca7e5885486dfa18145038f42359fe4ef0bff574abadb9cb62a14991d2500181cf43401d8bfefc0811adbe6e0323a4
 EBUILD tdfsb-0.0.10.ebuild 869 BLAKE2B 82a15208cf84421bbdb2cf277a1bfd405bbe3a60525f781ab752e2fdc1268dc71963f93bcdfa4f093a1410b9cb1ab8505189b50f8424669451ab70f453600e26 SHA512 55c1b31d3fb421f2f5ddf6655a209eaa37bb5b201c3190bf4cbf7021d15891c8e3e32d14cf4e3d1c618092dcdce586c398abaa2a159cebb7a88ca1f5b9064da1
 MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
diff --git a/app-misc/tdfsb/tdfsb-0.0.10-r1.ebuild b/app-misc/tdfsb/tdfsb-0.0.10-r1.ebuild
index f85ac67b3cf7..6810b67461f3 100644
--- a/app-misc/tdfsb/tdfsb-0.0.10-r1.ebuild
+++ b/app-misc/tdfsb/tdfsb-0.0.10-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.determinate.net/webdata/data/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~ppc ~sparc x86"
+KEYWORDS="alpha amd64 ppc ~sparc x86"
 IUSE=""
 
 DEPEND="media-libs/freeglut
diff --git a/app-misc/vifm/Manifest b/app-misc/vifm/Manifest
index 01b5081dd6dc..b1b58650e294 100644
--- a/app-misc/vifm/Manifest
+++ b/app-misc/vifm/Manifest
@@ -1,6 +1,6 @@
 AUX vifm-0.9.1-fix-ncurses-linking.patch 1562 BLAKE2B 415cd5421a7bf74cc48ec77919181e0fb0b101b455dee470ceb8875c861b14a8835b5f912c517efd9f1f1a8b3db93d633b6b4b68462fae66ec7a2ff0ced2521b SHA512 4b6dc0945f5afd2d0395775ceef94c007e604b30184e86653bc8c2f306b7d726d1a1a7273c4601502e6602fdff86b8b3f596409cf2e55f2e4c2691d342e7088a
 DIST vifm-0.9.1.tar.bz2 1002758 BLAKE2B 8eb9cc4c299877485bb4a44d95fe2412e196686399a6246bc1b5036dbc34ecbcf1cd43d1d55bdacdcc099a65e03f589f360d39ee38da4e12bff0a4bfcbdd180b SHA512 a30457329bf9501efd7e9e0853107b5ecd653ab70e7081764677d035bd0f61876bc96b35bea5258153d68b7be075091168331be79d7398f94353f73bbf78933d
 DIST vifm-0.9.tar.bz2 971539 BLAKE2B 5d6dd8c399e38886ab3e2d548b93492bf31b464e5661c6f6d54504701bf1eab8338155a9ddc9b220c4cb2a67417d5622094e9ffb717ddf594984fe475214af60 SHA512 5ae2b03e672bd9a7f95a5c59141dabac8bc7946a4e307d6a3df70bdb52e1f7665b960a3d20709c811cbfbcf76f7836d23b5edb191968e5277fb705a291ab3a9a
-EBUILD vifm-0.9.1.ebuild 2174 BLAKE2B a492b40b76d029c62dab72a14fdfba7508c04d38a513ee0913f2b0ada8b74f2359865f8a3c5839d9f11ecff904b36c3e84b027c36ba087e3501096edb54c6153 SHA512 55d7d1755318427e3fd3d6020be3c0cdd5c2e77d2c1bdbd471e00a949db729b3dddeefbe575e5d21aa143f11670015b6b1865691a7bcd0c792ac384907a504ca
+EBUILD vifm-0.9.1.ebuild 2173 BLAKE2B 42ae6a417ea8ee4f687a0b8185b91be802b286a99cec28b8534a8fc567a53d21847ac7450f2ad7225beac057c8adaad2b6e4dffc6351a41e29c7eedc61fac9b7 SHA512 2e48d1ba2caf0d7c72dd4a43a69cb6cd6296b5b5612eb235b6c23c3927e32690eb5d191c5b41720d304ab5ba0fdef0f358b48723313e2375b53251ec32970866
 EBUILD vifm-0.9.ebuild 1975 BLAKE2B 109e5ed44f8297e6283ecb2443bbb89f8c4da9170e8e5d5cdb50d26d8bb44db2b84461c06cd8a5711271f76d405f5522a31ae86218a98878ee6083ded5bfd6d5 SHA512 f6e33c5c1fbc1990c0aab33a191071ae79de4ffc7034d1c8c0feab3ab0cb32476c8a826983319c677191f8e3713db7a5be6ff657a5cd85873fb33a8ef6250bb5
 MISC metadata.xml 1315 BLAKE2B 2e31d51dfdd5df5d84edbb860f2b981513490ff58d776d3c75669e961da6d8eceb55e9957f7ad65e428645e0d39983fbde164940a679f5931ade43397fcec1ea SHA512 09965612c0613b994ea1b5780fdf79d4eddbb2464225132375390980b8bf29e2a2622dc3dd2c43a8650d1f90f888db9d30e9449e37b0311d1abc1cf9fca82812
diff --git a/app-misc/vifm/vifm-0.9.1.ebuild b/app-misc/vifm/vifm-0.9.1.ebuild
index 45d4ab19e904..55fc501b520e 100644
--- a/app-misc/vifm/vifm-0.9.1.ebuild
+++ b/app-misc/vifm/vifm-0.9.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/vifm/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="X developer +extended-keys gtk +magic vim vim-syntax"
 
 DEPEND="
diff --git a/app-mobilephone/Manifest.gz b/app-mobilephone/Manifest.gz
index 0c19ff2e3de8..7bd9df52dd63 100644
--- a/app-mobilephone/Manifest.gz
+++ b/app-mobilephone/Manifest.gz
diff --git a/app-mobilephone/scmxx/Manifest b/app-mobilephone/scmxx/Manifest
index f5225d3c36d5..0970fad39db9 100644
--- a/app-mobilephone/scmxx/Manifest
+++ b/app-mobilephone/scmxx/Manifest
@@ -1,3 +1,3 @@
 DIST scmxx-0.9.0.tar.bz2 250681 BLAKE2B b9426df1a4c3a78eae17048490a7627b6cd49e91839fa254fc1a06174337ce532228a217c911b7743bf6d87ad986c3148056b63f4f1cc6f82be948315dfdf22c SHA512 755877badfc846fa33ea29a38c9f8408f62d5343e0927438640ac923e8fccfcc1a0ffeae82f707d5ac1632022a15eaa2d9816602420212f171e29505c109f20f
-EBUILD scmxx-0.9.0.ebuild 640 BLAKE2B 4a0f820a99fd5e093c0736947828b9b8fab0605b2669410d9b820bda1aba3fb1a0741353318c4dbcba76b44edb87d7b2c44cb35e35e48efe762f4d57e83c49c4 SHA512 2b59d037ed9f270575533c286d117a2d4c8cb1eeb51435de03b9764effaef730919f3b6a751b2ea3ebbf0c8986f368713126b8a4d3002fa10e0f88958ff49280
+EBUILD scmxx-0.9.0.ebuild 598 BLAKE2B 8f9dd65cca771acc7787f863407d0ceeca4fc4fd5907a44a49c9bcac9cf5418f0b2189d11d493f1999ba4df5cb42e133591dfc9e346fd37e6516b16d4dc91395 SHA512 6541bd9a4d4620b1ed373ec785ba208f436fc96b573d613ba4007cb944de5b05aa5cf6b501536fe92e5fb518653b43f910700418690f62be193611b77055aff6
 MISC metadata.xml 242 BLAKE2B 1a91514a9e6d19922b92abfd1e5594337c6d665c2e66d8679ff62adf411fa6bf7137f2159a822c89c76f55e23299a5a3e8c32af9e82c1d5b1afa23bafd3976fc SHA512 d0c351265118151d9fba7777f52e66caf64edd684b9b7262536a19e227acd994c7ca7188579ff7aac7a64bf3aed1faa476494c2873359db2be3031284899d7ef
diff --git a/app-mobilephone/scmxx/scmxx-0.9.0.ebuild b/app-mobilephone/scmxx/scmxx-0.9.0.ebuild
index f3a692ef9605..2df2b2dcf4ea 100644
--- a/app-mobilephone/scmxx/scmxx-0.9.0.ebuild
+++ b/app-mobilephone/scmxx/scmxx-0.9.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=6
 
 DESCRIPTION="Exchange data with Siemens phones"
 HOMEPAGE="http://www.hendrik-sattler.de/scmxx/"
@@ -17,13 +17,13 @@ DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+	default
 
 	exeinto /usr/lib/scmxx
 	doexe contrib/*
 
 	doman docs/*.1
 
-	rm docs/README_WIN32.txt
+	rm docs/README_WIN32.txt || die
 	dodoc AUTHORS BUGS CHANGELOG README TODO docs/*.txt
 }
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index ab4bbe8b9e92..b9029c565377 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/libreoffice-bin-debug/Manifest b/app-office/libreoffice-bin-debug/Manifest
index efd396c0ba93..11f1ba77279c 100644
--- a/app-office/libreoffice-bin-debug/Manifest
+++ b/app-office/libreoffice-bin-debug/Manifest
@@ -23,5 +23,5 @@ DIST x86-debug-libreoffice-kde-6.0.3.2.xd3 326143479 BLAKE2B f1e4a4804b0f5b9bd26
 DIST x86-debug-libreoffice-kde-java-5.4.5.1.xd3 529080140 BLAKE2B d6cc31c28189ce1dd1b1e085bf6317914c85abebb4dfad64c15bbdf90689701ba35105ea24692086e81fbe17d691761f1305b938d4256a7dd5857e6ccb13feb8 SHA512 d5e5ee39c102ec951b437611186577b2f2ea25a529d26c01b97dd2452f38a52a2a0649944494246255451efd65af6cdea2fd724aa27d8b295570eb4658c01e3b
 DIST x86-debug-libreoffice-kde-java-6.0.3.2.xd3 589281609 BLAKE2B 7446486d969b3672dee561b98360fdaaf4a8c61de6bec38c7de92716db5694641b6429b3aec025649a0970d30b70e8b6a168bad320571b7c72061985b14acf92 SHA512 aa25befbad574afa525477ff23ff77bc59edebdd7bd66bb20174bcce0a99164a149c572054ccc888fd0179bcb539f746b74201f01bdc35dc613b116a6b86bf49
 EBUILD libreoffice-bin-debug-5.4.5.1.ebuild 2679 BLAKE2B 5d8267d6479ed3e62533f4254f401ca2641ffa93989820a25c5a22425b3e905c2aa9b26d3c177cc5fbbc5cf4d424228e27f57de3080170b24d284aa57328e08c SHA512 89d8eeedc6b58113ebc47c943f970402d5f1465807376621ed09ac877df37e57529490ba60e6cd380e895fca0cb27e2fb4c5345af61c22acf467f13ee878dfb8
-EBUILD libreoffice-bin-debug-6.0.3.2.ebuild 2681 BLAKE2B 73589dfd4620496d985bdd9001da0a05c1dfc60f274c7664aaf8f26519ff8b7801ebd312fc3983e55a5fb5b4ad1e073274787cdbdd6d1d208fa122faa2e2fa5d SHA512 d8c7385cc98b929686cb9ced686391bee57907d983e6f262fff9db69c28ac33fb7361f68d155d5dc077acb61612591d56dd5c5cc60e6cb5d5ac1789a35f9b2d0
+EBUILD libreoffice-bin-debug-6.0.3.2.ebuild 2680 BLAKE2B 893152d9986f4e5fa00a785e02e8cc70ecefde802d7e0817eaa2ff72b6e622daae594855f47b28e1740a8cdcc251633625cec624420d0666ee71fd3cc000bfcf SHA512 b9ee24a38609037308ccca8f9d5aea5e7daa79820ac3725c7eb42d0ac9348ecfac95ce5c2cd9220c8cbc8b1373fb1e284e04c94a880dbc492b86762d1480ed7f
 MISC metadata.xml 481 BLAKE2B 2b7085b47722f20719ca5e219b52e4334c4819db8c61dcee1446ac28e70cd90a3ac7e1713a4e95a0d3952d931ebcc34b137294b1e17f79cea9f41ec31fb3cd55 SHA512 6c5698440da103c49a6a26c99d3af9ef88f79a74542bca66cc8adad77dd5412760630e5753f163e92cbe58b53c0fd899b9115ca3ae85627bbacdc01c6dd7bb63
diff --git a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-6.0.3.2.ebuild b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-6.0.3.2.ebuild
index aff7ec396b39..e634b05d6fe5 100644
--- a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-6.0.3.2.ebuild
+++ b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-6.0.3.2.ebuild
@@ -46,7 +46,7 @@ SRC_URI="
 IUSE="gnome java kde"
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 ~x86"
 
 RDEPEND="=app-office/${PN/-debug}-${PVR}[gnome=,java=,kde=]"
 
diff --git a/app-office/libreoffice-bin/Manifest b/app-office/libreoffice-bin/Manifest
index 02b4f01d7fb0..a3060e937467 100644
--- a/app-office/libreoffice-bin/Manifest
+++ b/app-office/libreoffice-bin/Manifest
@@ -24,5 +24,5 @@ DIST x86-bin-libreoffice-kde-6.0.3.2.xd3 14377062 BLAKE2B dfd9f68bb720ab03b13c3b
 DIST x86-bin-libreoffice-kde-java-5.4.5.1.xd3 22411985 BLAKE2B 6517ef3900e53d9b96ee41d68760de67a4b9f97d404eea0718efaba6e03771e1428002f1d2a2dd9d63712b9d0cf2c967a530f9579fee32bfe20622a2c5db7d94 SHA512 67eab09e4b46b52a587709244aba99ffa6414d6188340405d24d69abc6da194ccee8164b89a76be8a88c639dc4628322aaf18d2061e491681946201e4d0bca37
 DIST x86-bin-libreoffice-kde-java-6.0.3.2.xd3 26149695 BLAKE2B 7b8d349b888ca929472a519161ea915c3737cdbabbd4fdc7f850e326efa0cfb24890eb1c13e77ec600878bcd9ec22be87cfa1fa63bb692a739872e2264c28742 SHA512 3a3dbc2824afa8258ec546e500c6e232b8db49ddd489f63ed2d23d3492865bf7fc473518b115099ff68917e91d96188931b870d54f19602f3c8c3e37a5bf56cf
 EBUILD libreoffice-bin-5.4.5.1.ebuild 6515 BLAKE2B b743783a5642a24dc684ddeed4b0e5c7a0269a45342dc85c03004ba52815868dcc54c3c862108564dc537460fee102b9ec9f8e70e28eb005562f413ac548af09 SHA512 bb954b1beb92f7ac9ead79536b1c7a3b69aa7b780fb638a45bebef58ae7cc654878882d38e5335850cb81d3913529256e0a5215a68321e53bb6dcda4f7432985
-EBUILD libreoffice-bin-6.0.3.2.ebuild 6727 BLAKE2B a7e9c2750ceadf4d082154e76967b46a0a2f07e2129b5e5c0214ffeec2f2c66bb92fb96499f1145cca3a9696f82d88474c9863c80b3c2ebb255ccb362026947e SHA512 57f4576fda61fb8607a70b7b3b3b18eff6f7eb971c604a199357de928787af8d0c98ea47ed1830d2f6f0af403e1878a562674a40e9ddb1bdcc0e0666b12e926d
+EBUILD libreoffice-bin-6.0.3.2.ebuild 6726 BLAKE2B 7f7d7f1ec904221a8acf8f09f67360382ea001b71cbeeee2274c364f7c2fd5ad91d326c2749a17ef5bebb25d7b7612e4f730cd913eb20e8e7c412bca1ed22ada SHA512 c6bb77857ff685b17d702de9b58d58cd80ee50c1d090b656de48a0967265156aa37902d672c9d47b44e7690610d5cb8fb80b79d18e9be2c7b050299f433363b3
 MISC metadata.xml 510 BLAKE2B 3c08e88fbf4a981a3adde50ee62d59899f24f87b2aee7359bec6c337adde486096de536227d81b1e3eeb2a27e01c08ca1d91db6d9311e0d34211528f63aea23c SHA512 12331dfd1fe409ce5a65bcf1ce8bd2e23f2e789b7009216e987b861fde897b78b16487399338af0e94e9e40da70ba32624251d71de5aae7d5b23891f54a994f0
diff --git a/app-office/libreoffice-bin/libreoffice-bin-6.0.3.2.ebuild b/app-office/libreoffice-bin/libreoffice-bin-6.0.3.2.ebuild
index f4d56bb646c2..a74a787a4bca 100644
--- a/app-office/libreoffice-bin/libreoffice-bin-6.0.3.2.ebuild
+++ b/app-office/libreoffice-bin/libreoffice-bin-6.0.3.2.ebuild
@@ -51,7 +51,7 @@ SRC_URI="
 IUSE="gnome java kde"
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 ~x86"
 
 BIN_COMMON_DEPEND="
 	app-text/hunspell:0/1.6
diff --git a/app-office/libreoffice-l10n/Manifest b/app-office/libreoffice-l10n/Manifest
index 842f8207b3c2..dc4180e5d6d2 100644
--- a/app-office/libreoffice-l10n/Manifest
+++ b/app-office/libreoffice-l10n/Manifest
@@ -167,6 +167,174 @@ DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_xh.tar.gz 437472 BLAKE2B 8ee7530
 DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_zh-CN.tar.gz 516406 BLAKE2B 5a99d46e1c0ad6b33e9f8c5c3eb72ee52ddbc407d8bf0ae9d57416b471f41129c0af58125277f085bf281d66eb1f5f312ddce6ce10babd895a96390dd6a11e17 SHA512 e9401a7e5a5f9e298256970ebc83f94a580a3a7b2357a54e417b814ca7c9e989779b024f15ba19dad62981cb2b3cd91835013d82f7265609788f04db741ae284
 DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_zh-TW.tar.gz 513878 BLAKE2B 632532eb9cf75725015ccdeacc14278dd6f08b5fa97670e0f98e922ba6c5f242dcfae68e55405dcf682d44bcbd6531ecd653b51e284ed8ebf0cbcf5efcce49ae SHA512 c78d4ea18e81011a2c537b13c3d6fcdcea1758187da92855349a2016f0da82421d125893aefe13f93d3a97b7a1df152e467149ffcca6eb9a3b44c9d6af78e268
 DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_zu.tar.gz 440572 BLAKE2B 05a70ad0535d041843f0fb4f98652468195c9768d6d31f734e9bfb9284d066405a0508fc796a71a2d4a4b72a995115ebafc76e2d726064d5b321a5859c507457 SHA512 365600d8ddf721be0ed873b17bbe9ec03e5f59e490439163eec3e41aa328d1ab7335bb5ffe5b78ca0336988b51fbabf77f686c702db04bc08800c7a6fc648184
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_am.tar.gz 7942171 BLAKE2B 55fe01c6bde8688fb58dcf34bba5094c37abc8d7c5556db49d541fbab3ef45c680c5c8e15282605a0d5a24b3e6097bbc1e049d87aeb161567da15df47f944eb8 SHA512 0bca472a857562c22fa8d8bc9b26e3b1ed0677c7f94484891fa9a87ba488ca223a0009fc4f47fdc2af2046b79f8ae51c8701b88e151584b7ae62e29cb09dd5c7
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_ast.tar.gz 7872153 BLAKE2B 3a5c45223be61f178aa2e032be288006d3e55a535bf8ce3693ed1b15f83ac4cf4209465d00066652afbe1739c2e86a828921bf14eb3ab60ec099bd027fd2adb6 SHA512 e1a962cc358903b5c7653d076bfbbb170132e2684544cc8ecd43fc80755efb73a21cfc9861f18e651fec4585ad20afaa7a1cf5891444946b47d1c2e69c7a1e3c
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_bg.tar.gz 8413835 BLAKE2B 48c671460b8d97a881211d223d50fb0c486f95a5407ae81b2e97c527e14ebce854d67e8334f8655f52fad3c15c17c09d804c8f2ff7704e581ad0d054b6417bb5 SHA512 63fc31cd4f3f7f59c375e77f905af00a83e5e124466629a962c1d45d8e089516f8d7febb8be0084de7a134c87964fbc9298763a5660b0636e37dbd312717a777
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_bn-IN.tar.gz 9126777 BLAKE2B 9a1098e0efdb35129a4dce8e022fe677288b3d4079291f2334ee9ad0b3d173a0f634b526d31031bc9afb96b605aff4cb046d8b7937810f7c525009701e159277 SHA512 12a191b39080c8167268e3d67499e983d010b3f37d31465bb05f9959f7bd3ed419d6b0f41981ca9eb7e6eaee61695a172a753bdca65813bb8df0de3f990a3edc
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_bn.tar.gz 9126599 BLAKE2B 1d254a5db89dd8b31d07112c70c42aec33f996d8975c703e1d59fbe637db55539395d524d8cf2b9b2d3b84e601980975e7efb6f670e83126b438d48f520fbe0a SHA512 c40c6b51d4313fb3a37963ec60768f72df982a5d8372ad23f27dc98c88b69e50322311242c51c16d8c8da8c6088cb26224ae7eb5ef774274310cbb6931c9441d
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_bo.tar.gz 8872871 BLAKE2B 36d0707b0afd222df978590b16d7187d15608ac7d18e82291f066b5c5307d384195f71bbfce0896269e0fec4244306583149eb9e8311c1043c6dc88e3cf92a7f SHA512 1417a9168dd107ea3f3c7bbe0d783a917671b0cf2b1f03c0ca12f16655daf11b2f85e5edb401f6367c4bdcc7346a473ad08ca75f7746889bf3e8e2f9b801926c
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_bs.tar.gz 7174890 BLAKE2B b391dfbc2aee13dd82f9c818d5c68b83aa6ddb9360c03d1185f05e7477671c46499770b083ca6505bed91da35183f14c2923162ab6d3e6fd51ce8bbecc131e72 SHA512 12d5e265a11583c7354e3f6bff3aa757ec34eb43bc96f486a0bc2874e17ac28e115d16844059ef15bcbecc877960c74ed1f02f909b2ed63ae09296a7ab33fa2b
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_ca-valencia.tar.gz 8010326 BLAKE2B 284278d7ea6c7bb5b8facab5e7dcaeaad380b8ca88c7c796720b5500400335a17628e18661fc2bb48105be85f2f5ada2947d8d7de4b7d1497aa4c4cff6bf7f2b SHA512 72bbd27eaafa3aaa5647ed38c8db85d9a7e948140c42b5a358bcd640a05537213a3f239bb6938c2f76eb880978ae8cbd3cc3a2176a56180b171c78b5c88d29c5
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_ca.tar.gz 8047029 BLAKE2B d688b7d1691ecfef3bde171ffa741e38b818f6f0b86c6158b282254f4c2a6c82bae54027f8e802591e193275e17b0b07a68ff480eaed1599c24c3adbc0aa8f94 SHA512 fbbe88eded816d3a7b596303f20140ea7be51008368790fbb08bfae0c7fbda9869794d2b8bfdb4f971a25691a73bd6f2cf6895f98aa46cf8d21c23d772b7b335
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_cs.tar.gz 7734583 BLAKE2B d119d20a41efea3a36fa27b34967ad0d5dcfb20dee6214ee83489c38891e01d8d03d538dd3653cd3130b65d28a4c74a6801c3230298cfc56d0e54eb00d6551ff SHA512 0dafa2246057c542640b25ce520e521123d905998f3524a60e3073bfaa53b800486f218ecf933748caaddb2e0e474d61b04d600120fdd9a0dc7fd313ac00789e
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_da.tar.gz 7679027 BLAKE2B 60ce8ccc4da6a022cb0b3fc6a424081ab98db3f76c46e7b5387b5f573c802d7495116906602aa17d3de5e087bd5c81d620821cd53d33bf7cf8310d59e37dfd01 SHA512 818f78a5bf9c2a413f2ca2fa704f7c751cf9f3c0b27dfe592aae3d06b9090f026be3991891709196d2affded406a592805fb64bb0cbb153c5c2e770a6ae65b01
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_de.tar.gz 8188681 BLAKE2B 99ba1552f09d9ab5ceca476299b8d6c1eb23996f105746333f3804a46bed755a90f1f75c336adf1ec3be61ebeb6eff0383fcb392dc4dc6f8512fc2f1716542a5 SHA512 5e81c5afc4058a8fe7118393c180b843ea961f3758ad3aa2f1b425e2635cfc999ef34616c5f157bbfc06d55267c87312d9952bba5894d6395430902d419d62ad
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_dz.tar.gz 10258409 BLAKE2B 7210fee6fd84259946cc61bf10c3ea5dfa6c9725f6916dadf47b3628cd700c32959381d15e2e1fe7adf75fc53417991a91d6d1172bc8b40383fbe6cd3c28ac3f SHA512 033546668c4bcaae81dddc7926f2ab74e674371d33c167d3a7aa4c2df915fc2e4f0f8bcdeeb900f350b7d5c482343d0fa6d7c7d62fc01198f1a69fee150411cf
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_el.tar.gz 9061896 BLAKE2B 82897d1ec0336a45d05608c825e50bd4fc131f327705e1746063659c4ab6d3d279fd83e293df186209d9991bf0c0e910b365b9df8e8e1ccde9a25367662ae34c SHA512 85db76e28a03305bf3d630c936d7c000781e05711c623d4cd501b4d0c556eed01333a7459fc8a1ba5aa439b0c67aab90f903c0a1dad08f593345c830dca66efe
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_en-GB.tar.gz 6513058 BLAKE2B 80f114858d08310d9f397ade53ee0d2f091cd9daf0f469e9c18006734301968c2afd8d3181321f1e018c352f19fa46377b0750750441ac07cbc05379c8863957 SHA512 121911a796359a7bf74d285a308e505f2a31f71c5410bd66c63eac3465ad0eaa269614eb8df52c0a88435bcbf6ae129edb7fe2964997de124997c084c65090b3
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_en-US.tar.gz 6549858 BLAKE2B 110bab53270f759a4d617220135fc64484bfdb4c78e0578b756db6d2e9372a7227bbeb348228299fab7c2d5a5dd9ef61c9a7faf7bc011e77772b64c708d978ae SHA512 38ffb39e1c06c79fa855aefdbbd464482452520d6b8e7e2a98026afc0e3fd6296e3bbdad8f5c1df9543f6bbf08570b5276f07afe372d66e2a18bcec6c55ad215
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_en-ZA.tar.gz 6494985 BLAKE2B cd3d60a3f8605f433a1ee8dd9b9f072ab161d46f958fe9fd888a27dae843bcf5b7b9ded0adbcc1c3b9913210448f17ad53a8443cc084e09c83e7e8ae62f00a68 SHA512 d2b23951f8ad8a8969c79ce8c80acc3c63a15099f4e60ce6d099e7ed365ab38f94f829ce5694ca2a498d98ee16a8c4ead84367e4084040e310af24cbf67ba787
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_eo.tar.gz 7076836 BLAKE2B 20ae10872e6b1003c710ccd2ad9962e8325423effc2c4823cdf6d9df5a3d2a51d04680cbe43c7decc07c9af9a7c97231f9829cc700b1a82f46cd3a312514aff8 SHA512 cbb4429d4eff3aacc8747cba725780d70427700f2e1b9b78698ebc0af6e0555dbcd7ef6f2dfeb3276ed0329013f4903cb0b553b4c255c1df3d4a3972ccc75678
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_es.tar.gz 8092213 BLAKE2B 6ac267b4f5b4530386d7d8394147b823146d50d085a369158b8112c2955610a9c79df02e316aefafb5d527e6f6179ba0c52805140c99572c6228d397bb4e05ad SHA512 c182206919943ed55a74c40347f6ae75b158798806c1ba4915cbf19a952552e43e365d6144eb530b404acb6392f3ca29f7ed33ddd3896544c7668783b8454ccc
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_et.tar.gz 7604604 BLAKE2B 695a1b0ffd30ad870c05d40d8c77cc3010074b904c49c40c5a574b879e8022bc90fabc8737c99717928e61c9cbdb83ff77ab4bccc0afb2f4eb3619ce710abbf5 SHA512 015d6a1432d51a76bb98913b5552e63beaa1a1c431cc86b181c8ab9f8d8afa97d36c34bdab3b56c51f5b0f92b29d33e8c1b85e28a808b55c12d1298d6ecf398c
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_eu.tar.gz 7673005 BLAKE2B 9d67da90a698b135e72fcd6b8fd60fed4f36417683062155ea61f556aa4335c54684d34ec667653bdb839ca9a7bd44ad9af5f24b2bd5017a3ec3fc6b3ef85be3 SHA512 2da0e72a8368725c8989ff26b0386dc50c1dcf319a95b3e1d7b76e7e2b4c51ca67a41af91d745d0ec79bb4a9bdbc0dfc5df036ba31d7daed6b57ab0c364a9218
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_fi.tar.gz 7839404 BLAKE2B 19508767400041ab5893702261b05930603190b5ca9f70c467c77e3e44a342e6cea4452d4137f3732e9d1099c3aca858c339e4afbfaf00fe94edf0de81a560f9 SHA512 3a594cbe94d183c50c76ed46e41ebb135ac6b8ac7cd39b483a7f9a5e7eeedef02dea52f2bf128b9e489ab44ab2896be3238110d5412278892e2d2b54cfcbde7e
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_fr.tar.gz 8274265 BLAKE2B b7bba3e31e3cf7909b761a08a6c82b8f332b4ca0811a394c6fc6979de09ef38244bf91e7d7ff036a50c3280f05f2c360c71d39f6d0ba7d5c52a871c7f1618c68 SHA512 500120b14b6cd408d89b4cfc5b9a4f4d23c798d460688a8573109a73b7ea35068258ecdcde30a2290233900e499803ab61ca40d0f45a75027dfa63ffe68ec612
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_gl.tar.gz 7763056 BLAKE2B 19b9d21f8360043c67d1a39da356127fab82972e62455b9a7b97c8faadfa07e51607b2c2a6d354e49880867633fbab035c8b20414132f544bf5f28900a7f4a6f SHA512 4f99c1904d73c74f412ff93aa727f3f54f3425c200e2b9984c820a65fdf582d12ec79f3191c1afb800a7fc5472c3dea433aaa1015822138e6203e542170f003e
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_gu.tar.gz 6709179 BLAKE2B 563d6ae2daade46bb8d879fd864ddce744074a7243de6aa8e3b8a57224df16c80f99b57ad14caa46fa689e2e09686fd7ea19a46a76400c8e5090e9675b1afc73 SHA512 fc3ddd8e7a2c7a9bbb4a1c5cbca847e673794f17bee4a2553f4fd94f156c82cb681cfd1ad95b4fd321482c4bed07c742cf6aa8cb79fac234db359fb390ac123e
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_he.tar.gz 6321138 BLAKE2B f5032687d4040c60abaa8b88605d8c2524a1f9b82fcc878e747234cd129b8eaf4c6e5cef38aec2d86a95ba9d67df05420271f02a19dda47d8a26487972ece7cb SHA512 bbea25d7f2064dbeb49a9a065d6c9fecaffef8b437f45b71062e737fa32eba40a7c1fbbabe7aa997e66ce77e3fd6d7208963ca11f47ab2af634d581eb6b6cbb4
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_hi.tar.gz 7359956 BLAKE2B dc959da46a831217cf1144f15e7d7bd552fce0d356fd37520830b254aa417625bee71cce5278625580006ddd4851dc0e57ab2a0de8f9646620223731cbdefa56 SHA512 ed88cb1f13e7fcf4d5de53ec21b079e7eb3d88e3cd4f99774e337651048daed61f443aee7124fb1938ae3570992c9ee8c6c72c57ea3e068baa2027571518893b
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_hr.tar.gz 6863750 BLAKE2B bd911139054596fd514b79c8f3f7602247cd96f34144bab7e26f493d187e776ba665a6ecaab501d5c308ce6712e38d7779416bfff24140bb1d0b813ca7637b1a SHA512 52757b991484e184a0702fb4ef4e6c84c6e7f17d877a5370d548cde4445529e6f48101e85ecb942c85051e275b10f9edca33ba145d6a2d422ba90f10d2684783
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_hu.tar.gz 8152740 BLAKE2B a51c4ff95f1073fdac4f42fa9c73c34ed3369e66e24abc1492637fcfe4573b44edb6ed57b429f9342467fbccfda0457b899bf7300955b456e257efa9bdbe80a0 SHA512 233b42883aceee26a9f13c348d96812f438ba6107402a1ef87ec10b5fe1f589b87d20d0368c92b9ca354bfd605159f0d23356a7b56f70e37af1cc07246da9276
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_id.tar.gz 6916811 BLAKE2B 67198f3f7d4feb1cad7f60cd99aacd55542a0491c8ce878b76981d6f96c0e2a3d0d017f569044b2b3432b2aee652393b0c106a47543f08fdd1fb54337a92a732 SHA512 eaa9594ba8553ceb0ffc330f52f2955e317cd49ed4459ca29379c4dfdd606925d3ef34ae7868b34aa6d5fe863dffccb048f8213690aa05169a83c3e246bca37b
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_is.tar.gz 6994967 BLAKE2B 96823e4b4252169ae49ebdca5796cc3323beb7ff33c6691f2ce1eb54c87f5c6adabe533c4c152e95087135442fe8cf717246704b9f368cec700f2d1d78d643bc SHA512 bcb702c164e64f3c9e1c7b07c3ad35a4ad6748c1b9481aecb5f30344e1284723f3960dde620d190c900d20d8146780607f25d6572799a31ed7f3d85ac02bb67b
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_it.tar.gz 8031615 BLAKE2B aef293805da1478e429e59e579c2c1ceca479ad38231fac63381cca48059fe2f9f3b29c1ce67ee6c6458b4d84f29a05e5067fd880bf5f41cda9d25936390a5fe SHA512 4baf01a7026965f374329cd32b59d7466c110354e35e98ed874b7ca72e9f2181c9838d8c78032a03e5047084f71e767d3c6b923ac5c2e6d2d224ef63fa2560ac
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_ja.tar.gz 13187624 BLAKE2B 031a73ce000821992c67c7622c85746ec9ed650aaabb1990d864ca6b152108821a119d0c45e6dcc352758dc1941847e4d4a603c48b8d50d1ba4283f0746ac84e SHA512 ace3ccf6f5c460658c8e60f8651a5e75ce2e5b0c07f051781e8ed7eedb851ddea564a365a2fc54914d033baf0742e0f799a1aab8af4ddaa5139f9791859d07ce
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_ka.tar.gz 7158832 BLAKE2B 70928355fe0f2014aaf7567cdc58cb76fbbb12568036a9c3f707363ee36752922cc3506522ea05c90d9cf28865cae7f1ca9d8af765e3aea64d30d3a1adc0e07f SHA512 779db2ab5d6cb4b097f6f38383c11f65ee05743216621f209d83816f44d84fff039da631832f6cf6b637ea780ed49c60b24740cc7a8f3e7da29eb41e481fa6f3
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_km.tar.gz 10321040 BLAKE2B 097f0c3b5e1107455f621ea40cf61653192ed28ea882013945f3f67cf392b2f3ec499f922d169322784e59fad247e14434d0d6a54360f976097b3b0fc1a60cbf SHA512 aa66228bbe72744001199654f4b06fa8e6f05b6598324bc7c05328bd2f82e241257d8b5be45690d39bc80e88b9c9f1de81d93e781fdab5c4744305d986882cbb
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_ko.tar.gz 9396708 BLAKE2B f91cfb43a33cb7017534938aebd098f930126d63dd4e36f26b96c84c23b0461a47cf8899ada2b80a52d3bdf9a14dde8e53363312e5e4ed90acc64f5c6ab5f9f7 SHA512 53a14eeca01ca72c9976b1950b10cb9211b7c4dcc00cdafe98b430666ef45279bb23c6251a6f3189ca92d62113a23e5f1ad1926ea2683be68244c459e1d427cd
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_mk.tar.gz 7374004 BLAKE2B 1f752c5c3092267b9c1ab5554c0d841fb38d4cb547041652445cec794ea39eae867ca891e374077c56c6e8a9289d296e53956f1b3eafdac172b1efb6e6ca125d SHA512 751c8fd95b1657f501a3e864f93bf8ed9c9c8e6bf5dd434c0a7a7eabd74175211710e86ec6796d065539b7676d777fbed5a1540d9cb890dcf4bd6170c892d16a
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_nb.tar.gz 7728385 BLAKE2B 4961dc51f8b304b87b35307216c0b4d7459d17e580c905297df096c7c75acf753f6fa5d08528137ca18a5250f98fed61ae41279f412377dc3e565124edb0ea42 SHA512 5f7bb73a418f3e1919ed487efef8757e74545270121268c8369f0cc8ebcc4aa363b44fd8acd160ebdf8fc32f95b60d74523ee4615d81554e6635ed8305bb2a54
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_ne.tar.gz 9776739 BLAKE2B 7da96637ac99ab90b9b34ccde04ff2bfe4c7a7509f380bc1220dd2ac10367c0a771c14b2e7bfc85c277b271ea9f9909e681840a339f03609a3868b9a452485ea SHA512 bac3a94de28accccebbd1e57088a72cf2eb0b6a5dcb2de926b8fd92084696bb0a0c76d3a030b6224b14d83c270e3c06a1019d487d5a9f22b7c263cc8b1d7fb56
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_nl.tar.gz 7834191 BLAKE2B 3629df1bca227ece3f3acc402e4b436b9491dad5671d75bf88f0134dc6d7d83f45f98cf1c355e7e758e0350f2b0f38f15f101e1b63c2954a1f98d96a66c66f3e SHA512 40662d2ad96f3702883a545cc40cd4089a20b641b6eb5a9cf0db230123bf018ed888709560fae3bb613629763e13e4be81c037c4b058e11450cdf7d28b4e5993
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_nn.tar.gz 7708310 BLAKE2B 1bcab14d7782ddd9d2dc314932f16d8aaf74332acc817a9410513ab362cfff76c257f0aa92d078d61b7c8d7e7a5737058c949db2fdecfeaa00368f7659996b77 SHA512 4448cd3f98689af00a9c9afa43b65e9a23b841c072a3d8201923b2060e92138891c960334fa6cf42890ad46a65a7664331c3fa26fd1853dea055a3e03f0e9f5c
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_om.tar.gz 8028424 BLAKE2B 76fab64ada5520bf2305dba9b0475582008d4a76d74d56ead6195dc37a42e4b96e16a74ac6ddbf56647dc1f4893edd9f1fa814fe73db0ae4c444522e033245c3 SHA512 cb97a506eb23033777cfee1bfbbae8c1464736778374cd2340f17ffe90b90f47f1a2fc17413954abe34d72f18a01f6d826ac2edcad88441b40ad5a9e0cdff62c
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_pl.tar.gz 8169260 BLAKE2B ac3557d3e7219ef54fe8c58c08327472dfbbc7b330b47cb58ff589883de638545e7bd19687d469328202b6315a0c9e759e33d8d98114dfa1ba013bf00435668e SHA512 b4d653e1831b32c5dbb233ad00202a4ae00e709506496db50da1c73c3d2d191c7cde9c73b0b548d8c0019cca8463bcdb99d21bcf79813d7744b1b40cc09dc612
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_pt-BR.tar.gz 7842164 BLAKE2B 4f5a23b9cc8bf4099affe64ac48197b172ffdb20ed402fd509b015f924e700f1be1ed9eefa5c787d30ce21c34e931562fa6ae2e657ab15f097a27f57dd8bbc40 SHA512 aad7f712ded63c13ee6f4dca678d3ce5991b38b38d4afe0651f4ed6fdc829a91c6e416da7567d002038947e0c275aa90a90516e4d86c340b307bec94a0ec306c
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_pt.tar.gz 7811732 BLAKE2B 38ccdbaead53c6091d99976f8a66557d09519a5a2d30e01d0650cfc22aeb1acdd3feece1d6df1393a2cb11a77c2e6f86756c1c76dcf8e9dad2114f0cdbac780f SHA512 5e3042dd3c036d369ad550b96f92a021f9818e53c51a7e05d894ffbe2173e5c8a092d339cb20cb730fe000aef11cf4c5838439a0ba5ba1743f824325b299cd34
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_ru.tar.gz 8460954 BLAKE2B 9673409f5b6e52120b33acacaedc149b8abd6c14f9934d12ffd255ee4cb21c90d3f0423df3071e1c199555ff4c168397fe714001ea9de91143a83aec5f68e926 SHA512 a72aa05fcdea05c38878849a41fbdfc12d2ab6496a18a36e8d517e11e43d92f7a9f6105f9074f79edd9180f87a9f6f6bd56d20d9457f1bd6b9221b3db408937e
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_si.tar.gz 7249053 BLAKE2B 55af32c05fce0d6bf8a341031ecd8dfc9775a1e92d3d66769c4c3484b8665eb56df226421ca45e993a3335b32a231e6c638c9215d1bce63fc9b27ef1a173b664 SHA512 e56aaec88eee38a6002b620381f30200d1c463ae1d104f80a57b9a31119c5a79a7af70c467ee8261d0e20402f25afcc101a27458ecb261db3b53b4f93f889465
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_sk.tar.gz 7551148 BLAKE2B eac1e99a8ced838bf28e3b05fc9ceb14ac6c1457b233ede1cd45e16ddca901edbcae59e4380a63e6bf0242dab3b9364f24bd9e7912975aec824381d4a460fd85 SHA512 e09a7e3e293562d92b78ed69a7941bf029da483dbeee0262073bdb8099f9291b172e08d509618bd8d5c0a9fc358db424e0932c44816b84e0bbfb2d5f322b174a
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_sl.tar.gz 7852306 BLAKE2B dd12674a20c0fc9fbb17d3f5765289604d1ac47eb916af76200a8654115887901a053d6eea27b4b8a43fb7d93ccb9bf3e0c99d4edf1d52a4ed280e8f68a4722f SHA512 bf1a33804f683b5fc4150cf54f2a0249180099fef38000edc95082c8e65cd66a5e14ef73c6d8cf5968cd51b90ea771235483adf2a56fd95b3973302ac43eda5c
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_sq.tar.gz 6905293 BLAKE2B 0f98530fd6a85d5f5780497f3a3f1232fa267c3b647f0213026f239726e8f877247caf389bda5210bdc745da5e64f0f9b21cf334810ad48db210ef0e95c8fe63 SHA512 99a2531aaf15f9844f3d3cad4bfc10a00a28f85cc26d70b53101eef04092656fc6c351869610da3a7019991eecd3ea9d39861b2fe99ebbb4f37e61f19e2980b5
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_sv.tar.gz 7774183 BLAKE2B 6e4e676664dc74e05c3d7a50d3d50515d3598998ef2f43e3541a9b4f709762f867cba860b567a123e9fa1fe7c7652cced5de6c04ca5e7a3193435ad8182b6b8b SHA512 2877fa0a6f88a9fd1b04c1ddde50c622681c3e7dd52db941071a902750709ecb826d57548b75286e7730234c74596f6b08923d47d63f07260519670b8f9013bf
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_tg.tar.gz 7209842 BLAKE2B 2ec41cef8b0b689a36bbd98e9225b803e5227f14fa1322e53e2cde054640d7bff7afae623236dd8f3838c486de9002be52e4b87c6d2a5949339f75442ac96f0d SHA512 b60300c580f41855711b310b03a82b0a947f77e7ff9efaf8b730164263f422dfb5062f2442d7d49eff6891ac82147925d1ac32e2bea8e6cf6880ecb8233b8b8c
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_tr.tar.gz 7991417 BLAKE2B 7fc5cfef7f24b30515102159dad74380e5ed133f4dcdd638440cbe2d3c6bd4937f900c41e370b8dad588d5490bebb4641dbe6aa1c630ee0fd6acd3b6e48857b1 SHA512 509de586046d0b01a980396f75efa85b872f5df9d1f2522a78bb23e234763629e9493844c7a21898e1bda610e3354cfe2696c2f8125e2ddebbf026bab1d74f35
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_ug.tar.gz 6901135 BLAKE2B a764660786d81d7edd10fde46f8d306f6163a640f8a7667e980c6b71a9719045b55615d7385d8a2391b53457566ca683cbd39c504073d0d40b6424a2f1094c6a SHA512 f4f6bfce70d1df3edf3005243bd699d89c25676b2758592f81dad16b26435668b5dc2eee47e892f6dfecfe89eb8573f492ec00f757ed325a755d67d3d8e77ddb
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_uk.tar.gz 7914459 BLAKE2B c4b918037f7f9b84223a7de901ba3d2bbf531358b4b2b4bb45b7c8fc03025a3f95c867a52a0f9409ef55c16c80b73d490410ce1950f2ae97658b9706ae05e9e6 SHA512 a24108e20866a286717256221013477e8a34b79c646aab81e4418e672c2c5f43093a9c9881d2c3642e91b18e5fa084475ef7b2c5969eb1a48a125d0fc1524859
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_vi.tar.gz 8157447 BLAKE2B c7222dfe9f7692b795137f5b6a5021ab6a6559c2cf4d9b92d3e7e26123ce64b77d880847664776ec25a9bd3d2d0a29ffa6bc7c5e9b122195821e07d68e0e57d1 SHA512 a117216e5155fb500cd2d62549119258477aca553431d6c6a856b08b03f124ce8b02f9022d420179f5a872dc359a96954a99356d4190be07701002aa2c522166
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_zh-CN.tar.gz 10730455 BLAKE2B 97187b08f3c1e1bc6bc40844101ff33afd71d411db15b497b63a819988fc62766135ef9955e415ae7a98dc981f03a8763732bc6a2c70623de37932293b0876eb SHA512 17c97ecaa6515f3dd3a94542c80e4478ad8dde4c13da4752949527dd95a91f044f2b8ea1fc76bd97347a4225b00d4800e00c8b023c1a0a3b782858f07b590c47
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_zh-TW.tar.gz 10694968 BLAKE2B 934647764f2ec523a72f94afcb5109a5c0b2de2a56416c64b7f7d81e16e182d718967f1171447798d67922d0eff9d477f97dd22f814d21a174e223a6f1cade3d SHA512 45ee2eb80ccfc340d6a5ffd2a63dae390bd47945135e2240f7da690fe5f368264a528dc12a5d0876209b9689422f3b4d92fae3f43445e7074c90aac6c718f147
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_af.tar.gz 1055325 BLAKE2B 9e60b6d957fdd1d5d50ab288b73c5430d53bc833bca28f7c4f3de8c0bf318873c1cef647e2402704e05a03814e23f9fb2afc3e0582b1ad869908f64a577da08e SHA512 10aaa5a56efcea85a261c71f95150195e863ad3c018c23680fcb604d5601728805720617b0206d77e8a7419dc8d91aeeb971cc606d087f0873ffb3eb40b53003
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_am.tar.gz 465902 BLAKE2B 23b1cd7ac56eb513cae2e27996de8c1e007e46592c807eba6c8fb573c36490c8ec6f87bdb7750cb2e4111a9dd8ad8db857de74ecac5d6b7ef361a271074b2e7c SHA512 0d10eba06c9e4763e10f3da423e755f4b0372b5ed19c16ba0b10ab6e4e9b305e9a82fcc23700dfbb2f9428880145b71cdc6cebcce9c224009e6f259e61f48b44
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_ar.tar.gz 2205206 BLAKE2B a41084d73157c6fdf9a77226b414a3aaeb575377bc57df6144ce02df002d6f5a08b700831e8e0d699d6c0a86fba12f42d061a57a3355ebb183b60b18975d5dbc SHA512 54876b038b46bc931d99d7c02a038be771775b6bccc626c55164c7d767563ace86d74aa3b29e67540be734a8b8a3fd3304b027c74938dd1c861725b9c15836c6
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_as.tar.gz 482491 BLAKE2B d5407742a76df23183e8fded8e77baf36ae1814897b59863e40c109fa75df83375379838b2f16812c0adf4354d8d8acb791f93fedc4d1a110b99990e6f3cee81 SHA512 9c0d80a5b239f4ff25107f0f826c05a5055e36255553eb2907dfa1c6b88b425a62aa028ed383255f76c0be3268c7ad553576ae8cc999b2896e6d8e634f423e88
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_ast.tar.gz 443393 BLAKE2B 3ae69a3ba409b58f679045eae2b0e4c70d773d016192ee98b4afe49329cd2c6a3f2e5357c86f3786f46e58937f80ab72692627c1cfd73aa1752c6140278d8a97 SHA512 bcd5e2dd014cb5c57ad61ab106bdd254658998db6ecefdb80e6edb65aab12fc9f0c2a4db515f6f3c6a5e9cd88ff3f58fbc07ac87a076c3f758f7f74852872a2d
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_be.tar.gz 840387 BLAKE2B f1c3aeec6f72bdc75083bb90cd4ad116d24e864522824980a6b42a6c3df1635b8aadbcebc563a09fd6a827a02deb7bcd8ed00ebb7c9935254de461bae0b7ee7d SHA512 6e2ef2a334d4d2cbf0da2e1ab47e9debf86067f34ae01d4749f255cab3c86c68637b97e11955c24212ced6cc6cc4a4e3407ade843b2fedf34598763452be7a64
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_bg.tar.gz 1902874 BLAKE2B 4cc7cd410ea6b30674d29ad511e6ec6f9d2b10899dd538e21ce399b602e80973c84ef088d632490383a9f1813993e9cc0843c473b775c9a409e43eae89c7bc0b SHA512 1bf068711b13d8bd85a66a5dc0a619efb5b31da1fb8772c6497f265ec66bf53580222ac56535f8485c965099c432f9c991dd799d06d772dd936b527083834921
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_bn-IN.tar.gz 489957 BLAKE2B d3e53aa270bf90e7a2b12ebf48c77ddd3e29b98061da129ca9f622bf6c40b5a6f74cb994dceff2af2ead1087c5d216c098e0e70aaaee647a37a407be9f18787d SHA512 7d26d798ce4374504f8cf5d28102983c3af4154f5d0e72cec95a50c1102c54146a95d1f2ee50e9bed3d5acdd68879dbb03828e72c76349aee6dc9540f58d991d
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_bn.tar.gz 836131 BLAKE2B 63af377470a070adb9923390a6956e12ba760741700997b22e2b34eb47ce03237c4e615b610cdb037f4f61e6c5fbc6fc37b67a571b00507b165178c3629a38b7 SHA512 4c00593d2622d82ca2f770ad7f08b9635375d6a2e4fcb64afc6b41f88bffbbb9c3bbe25a56a685db67ba998e8f71cc2c7fa430c4eabad789fc4081d591a42813
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_bo.tar.gz 473387 BLAKE2B 4528adbefa8867904f96daae9e259dd64b89774b3ee1e8afcab75ce4852fdee2a3a4abe9baff43555d430477b1ef77f84e0766ec09e27a882b78077ba5bd5836 SHA512 1caca070cd0967394fae8a0e42c7d587f88c2516d08239df4979c03598bcdd61541ea2c53eb215bc5a329ae1ade0a31e189f5b7df494cc29eab3a1729f92cf18
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_br.tar.gz 1662837 BLAKE2B 87da7912c0113eed4d64371c8367a6cb3b6798a10d75a55aa27f05adb87b6b7b88415a082cc00989d80e39e9d1b826de5cc56998977644fc2cdbe58c82bcb582 SHA512 46f2d9cb4df853952bbdef24e662b8563eae133ae4fbfa102af097fd2433f5c0e5c5c885088deb273583446a802fb352fa8341edbf86f71170a0146ac85102f5
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_brx.tar.gz 450087 BLAKE2B 423d685f109002e2f8207fc93b0e9fe491c8318f4d626fbb8c32770f9f11b5843c9ee3d0a95cb42aa58e9688c6816ee83b9f737b2b93cd00f3d2245db18eb999 SHA512 0b3ee7c53567e3bfc53d8c67015f163d5a0a71347a7c164bd2546c4d4436ca92413c51df9015b910a1c30ae6370f2029cecdd9951eff8eddbaccf6983651a9a2
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_bs.tar.gz 557580 BLAKE2B 167840a27caaaba9c9bde12518751aa626d5aff3103108e9f11c192f0b49294ff96b05cb229efac4fd548f973160f8527eba82ab41f68c648482cb10478c3104 SHA512 82639ccfc3b67a8413a12945a2400055e51e1ab9cd4af4109ab5a53e1db1f6b6ad2eaa6c11d07880a0bef9af636a9c39aa9aa01f53f266d7d5a9c40f12bceff5
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_ca-valencia.tar.gz 1715025 BLAKE2B dc162ab503eca681881ad050984bb0dd53e16269d27f8ef662961a8df13e7207c4e54fe25f8f2ab8fda53e76ca980902c1dbf8aa4a35887ca35f3925c2ea90bc SHA512 4084efbb8a281bc8bc8225b3a48bb6e1a90430944eb642ac97d6faea11549a8ea993ea6fa9cfd407165762fbb8cd96568e4c4d47035d031f0554ab864bf04aba
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_ca.tar.gz 1715715 BLAKE2B 322b15147e1c7fff47da36ddf7e0b09fe3704210abad2feb41c21d4fba5633731adf1ef395f1872a859d1b715350d08baef66d131f4fbabde05454080cf5371f SHA512 28d7f6cbc43503ddcc612497bceae192b3d1be5e922f5bcb3cfd32748316e4e745ff60ae5e3c01b02f5ca0912676a756d312e203cdf66a59b5ab183045eeb8fe
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_cs.tar.gz 2884090 BLAKE2B bfa9034b62c2ac19410837da8e30d42f700c63ec7a51e22f0dcd9d872ec210cca56523f7caeb56e0295a9ad9d4e9729e0215cde4c63af7df539dc05085f1210f SHA512 f4389858d0145de4b5fbb83c84e6206a1e2a931221712e138272559d1f8472788943ddd54e1acb0e514269ed208eae39dd57fadd11f3927ec121a3baa0abaef1
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_cy.tar.gz 425522 BLAKE2B 4d97949fd90fac7a664404898b05aa8d85e8ae43bc5d8d8a682dbeb565d6a19caf7f3ee72f67b73eb2a32ee51af1bf936e3365fb488c12cfda305002e27e69c6 SHA512 678a589c6c1336a792a184149b21560339b1c4901a33aedb64e802e11c0fc4fb852bf8cf48adcc0e676ba6888e16f9bb9671455a66db49bfc28487a90a52fb8e
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_da.tar.gz 2329348 BLAKE2B 48945713528647d4745ef9fd71ee9ae9115ab61912266b7f6cd4cc119a73cae601b70b842c051e68d71bad37da4b9452eac840f559f5cfd7ac41e574dae64bb0 SHA512 52ef0b08167923ccb5c6b11a300435d1c7f5ab2abb2e80bc0e3b1c4ae6ffaac974ade9978c1e75f02c31e1335daa80cf96e5c5713f76ec18ddc917ce3056077a
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_de.tar.gz 21456797 BLAKE2B 21da48b4a8cd76293ac857203b9578fcd77296526a2f19e02dd154f953af05fe159b6bb048d16de42edb2bd40708fe95fe3fe5b34c4f98e113a04bebabae3ace SHA512 069ac724bf7f09a62cff8b582b54db81db45a0a2d9508ca7e7476ed6aa3601fda4928b0f00494979a25f97fc7a05bebfadc5f68845b0b5489bdaad3c9d3a644a
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_dgo.tar.gz 479123 BLAKE2B 0d1de2beffd06e16e451960bde852db3b684785f3c1607c1e28d0c6a38c3b5c961478a0a0990a3119783c7273a34b8551bded0971b95aac8064621ae3be293be SHA512 a81fd5ed57a1c0126db389a4a7ba7d007ffb3715ef668290290119537cdfe0ea6bc99fe76e1512f13c6cfa6bc054ee8e6542454ed8299c6591ffc75126f88681
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_dz.tar.gz 472197 BLAKE2B 96632dde498cd94aafe1982b3e7e24daa4738c8d29145080865f69e60edfc4cede94864b0430905d1bce1eeb1f2e66a1c310e18aeeda51422aab3bd7e59fce73 SHA512 480146c0c1836247133d9f864627bcdaea22c6d902cd2e4e18c29011d186c8d4eae4d58b66c4d28a89730b9eb4efe04e3a1af9c5fdbf3cfb2749283289c86d58
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_el.tar.gz 2520454 BLAKE2B f8c00a558f27f76ce16a71b48fd321b0ff5842cb2d513eb1ff23369c4ca15d0ce478f872bb25572a997a1934a91dc9aeb89fad143e805ee204362b9ef4454357 SHA512 aee7c17a76f0368c7f9375b7195ac052a11e3090b37aedf0751c99bc4bd31dd1aef6d72d0caa89242f8feb52d97e66641a2921c7937bb1f09e5cbc6c639648eb
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_en-GB.tar.gz 6962024 BLAKE2B c60f4ef2c4fe570b8750663d065831326bcb3bdebf8ad49fd7afd4938aea89b02e548cfd1c63e11c30d9e7ff09436be66734552cf701caca75c2118833a26dcc SHA512 9f2fb63ec00f443ff20b1f6052e4c2ea483d2fa5459098b4c544a30224a2e1aa99d225dcdd958fcf13b0363afb37ddaac0f8463198747dff5a67e6664b673a1d
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_en-ZA.tar.gz 6877526 BLAKE2B 29191a8e66aa9e5bd6a7ef446c92e21339d270d9480325d39cc12250f3cae865522e79933643b11ad42b2cb93478ebe1f0380de1340d8850b14e8568364e8d6e SHA512 c9d764c9b55c1b803f230f0f2f92d0406ee2d2dd42deaabebd0886745126aa99bfd82ef5d2421ac00e516033fd4ba6890451515fa4ff0134577b76e5f6e31bad
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_eo.tar.gz 421754 BLAKE2B f0f7c9af3a804b652050368a2fe39a028bcbfc0c360e01a1cb06729bfe1d1e5181f92ddf51adc378a2b32caca17628e482690e891e688b186267c7baf127ddc1 SHA512 15df80c6e06eaf6fa50d29277805b13084c001fec8f070aa48c4f65eb9f72f46da131adc61e59bf6f8bdee7eb0088ab668708c5d98cd6541391e2cf9e89d7e08
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_es.tar.gz 1922398 BLAKE2B 4f4373c167b535f21ceaa6f1372a595d26766315bae2c51ab5c33e03abf2984e113fd33f81725fbbeb4ecf182b489b10237c70e80f32595536de006e95eb8a6c SHA512 30d5916050f7897146401fc9170d91ec414cb29249568f770e228e8fd05873a660efbfa31c0cdca3b44e3ea73eb3f45ede8588cc309e1cde84f98c0052560020
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_et.tar.gz 1333137 BLAKE2B ff408c70e0e8fe0b6c9c74009f1e50a2c4f721ab0b943f9402d4b90e519e1843c53366f9110fff1f575b4dbb55ff18bba8571d8d142be1ccbc232cf5fcbe1e0f SHA512 02702f33d0fe4006a771df1f7a3479c72b44f3a604d3f043a22c9ce2d263ace5acc386283d62a0cb59f371bbe071684332de8e9e2cc451f7cd2afe3a72f186a0
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_eu.tar.gz 429511 BLAKE2B 22d28d8756e43cdf8f11c4866b482cf5c93d0e4f86783efa763258f9093a0b95cf0d422a122cf8d03865cdae42cbc78488cce0d3b287a0d45cc5163d83128381 SHA512 4d58abced7b8849cac117cc6fe924d1d9c0d355d00fa863c2782c9928cceec9f6926b471d6ef8f1c4dc3218cecd989c270a8912b877cc2d4bf6362b6bfa857a4
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_fa.tar.gz 448875 BLAKE2B 25ad6cba1b7da7d32d4ce40e382aac5d7d4b64e5ea8aef894bab3197891e6857b977e209e5c501cf79d1e4b31bc57140c64bedb54127a10bcd484c77d5cf2dcd SHA512 853eb97c7bc253ee09a121da35afe30fc2ffaba155719bc868d854cda3b65944ef414934413f44b92298e6217f6b7d2d100603fd12c434d6ae5f3f9eb59de5b3
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_fi.tar.gz 436253 BLAKE2B aa6e1376acba9239841211e6c596b82661714413274f6642a5c3759a39d6cd8f830b0b5f233a94ebad88027100ca1b804c5ac29cad500e8187571851666abb3d SHA512 128e01481b65b54e6331acc22b3a303175b282cc7f622863ba3bdd75ac299c179293ced23741607ccba78648ef6aef325681d3d6e5c5155f961343276d262a50
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_fr.tar.gz 2732239 BLAKE2B d15d987682bf0a183b96869723780d5158b057bbfe713340adf36c9586b608955c48dd744be65d77fab326a328211129d40cc9eee74a99db1784d30bc883abe2 SHA512 76a17ec7cc9dd8d7522f6fba36212cd37124c1af6370264a0785232c0f97b69315d0a0e38eeec1395346f12b06c3889903115ab05c805ca2260736f29e7e20e3
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_ga.tar.gz 448372 BLAKE2B baf705e1cbbe7ad43dc6e34737003a1a0c0413e39b35fc77a90b5a6aec7abd3a0ff36e3a46a4fed984c02882dda0d30f6e8fbb782e206118fd85f92f32f0fcbb SHA512 9bcf6dd8c34ff705f666bbb408129c357d8254cf02b826d2685c886c5dba02655cb362b4590d4cafdec7ec3e2266c2ae765cd07323518b01a05bb1598c1a773b
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_gd.tar.gz 1479823 BLAKE2B a5b00a62c3b8b807dae254944b37e3c55e028e6a9401c6f7c3bf116888c5ef3d50ff4746bce77561f4777a36bc57597e386655fe9f0169f528f7e15af7886260 SHA512 72fb8d0cadc53477a8eaa1b9ec10149908455b428d3ee0ab371379af804e0d4d12a448e9fb99280a2c1e78bef132ca2bf4433735a52a3f134095f1640176d61d
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_gl.tar.gz 994747 BLAKE2B 15d7b52d292fb07e3319daf0164c3e119a840d72a8ce7e01f815fc5296f3bb9747eaecadbb93a6fcfe202fc70ed54240c154edfa760d47fdf6207a77a6139942 SHA512 0e3c8b7f980c436b19461a15394e37dde704e05a46b862a2d16f2e4b01b1d78fd4a3a10adc8c017c048b8fa40c05c24a34162c4749ce03f530c5a7bbc7631015
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_gu.tar.gz 1127892 BLAKE2B e5db0f7a1595f250f199f52e0ed0e8abfab774811055eb3dbdee1f149002a84e81ceea8224cb7fb2e75c8c9555e3861c9d81de24a32507bf2aa01857f5fdd8be SHA512 3f7747c39cb0cdde169222ce5cc5da458ae441891a763b6d65aec951e1f27c5799cba6c83c8c2d9924148446f180a62769731bfe978fafae640767e5185f55f2
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_gug.tar.gz 445557 BLAKE2B fd3caae493dbaebff5f27827282931b2afbad94c9cf22bdad4b33aaa7881bdb6303447635411fe749df35823b55d198d36e7ccb31ff2f909f39c257954e6c486 SHA512 4c5f99976e9d63f46fe1c6b2dd53684b2e7995d6d95cd8cc3380444180ac32f4acdcef41393c8341cad5317c1a3848badcb20f14310aca6ffea587ea569ce111
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_he.tar.gz 1536464 BLAKE2B 8310e7aa58933191fde2de7da9327f2e6f933f4dc7cc701e8c8492735f312452d2bedf0cf1ff8cc13c892a0aa4de8f83502b23e404989e6e4eb988fa5592adb1 SHA512 1c9935b8a8028a2b4ad1a1fbf359bd00a106d0bab263f265d7d2b86a36be9b5843e70256ad15b85fd4626ec45b0ad3601f924ca68006a37a54cfebcbe99b5446
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_hi.tar.gz 547790 BLAKE2B 0ba30007932ce90b54bc90caa6d36dfb151f9c93a2b621e676fe1191c6c83bcd3415ac2224e9ba2a69b8fe8fdd81e3a75f345f57b930767c7d631883361c4400 SHA512 13977200b67aec0a80d4394753f7879d77fdfaf3e43b6cab03625954ff1caba116cee7312962cda1b0f4492b1ed200bffa103720bdd3e2beba349c2c9e9caac6
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_hr.tar.gz 677841 BLAKE2B a08c17152540255d64cf659fbea0692f309ce18dcfb390becb3399248d7ff918cd3fba23d13dd1c0e708b4494705be37843adf44061cdd17747691783737fe00 SHA512 d5f54d4339a63ef42126249c0f8aa50ba5544f24942891b34b3e039ef09141220eececb844752f7acecab281a7f607b476dee2b3056988751386cb4aac99e968
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_hu.tar.gz 2659273 BLAKE2B f7dc8fb3910cb57d76b79340302ef4179d3ff7b4ba31e119cc6cf0eb11b482c5df95ad92d6535dda7f56768f0e4ec70f2816bb688302fd23e4ad1dc5f91bce6f SHA512 8e6059223644a27f851fbf17de5178e4a3a0220206842468b364c59772107901e226fc80225d68e7ecaf955bfa0ee1630f021d1aaf4542bff4d7b8f638284176
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_id.tar.gz 422156 BLAKE2B eea778d8915cd625fa3c9cbdea156e91489045a66e2adba87ae60a7e49d1f4b9bf89eb66e1fbce985693951c641d2de1505c95c6f23a6a21e1b97990bcf9febd SHA512 493a11539082c4d4a8cbfe00950f04303aa323839c69c029314585389079fcb38b23e328b203cd3094a0ef292712275fc881fa3b883c8b194c3db0ae49e487d0
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_is.tar.gz 1232346 BLAKE2B 8a50b69744a7f1e9c3036184d22eaf9ccdb43e0729fc9a2cc39c9a76898f30eedb608952787e1be17a09fde1a36779cca98eb0fdf0b8511bc18dd44b2c93a57c SHA512 488eb9361e1b4a89679d53a0b2187c4427bad66d8f738edcb69bae611b1dc67b850b764ebe37d6d91df1fc6d6641e4c729e14a83b52c23ef768b746b4f88585a
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_it.tar.gz 1768229 BLAKE2B c57f1d2331b25844a8b1896875ac99fcef00994af0219d04de3b27cb609fc9ecb54b50a822e8f33e10045ec35397e7985a74740e0f934d9b524c3a9058e2a43d SHA512 2f61642ba53f6dcaad28b9c69731779c74daa1f169b938b3a8061a6553da8dc6c62900df4f5d4590d6e3e1b44ed5ea9bf6d70ca7c72e727e68fc9917f215963d
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_ja.tar.gz 531344 BLAKE2B 11df4f9c1f900d5fff7d1a73bf8a4263f4e03130c9d775015a0b26d604bbaa75bbbc8f160174caaacf929661b10f5ff5cd2c3667c6d6b08a0e42a6b7c5ee1265 SHA512 ce906d66516741d4d4b34b38cf716063b8bbd1282256c037fc66650e50ef9e07c138f2b6eaaf3eedf1591afb680598eb69936a0590426aba7a1b417a4f3fe767
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_ka.tar.gz 457543 BLAKE2B 4955c18697322692a7e2da24292a1090c266eb7cdca50ddb4cd5d1fd95d9f76a5e987abecc0d25cd742bf4c2e56b40a254b566a9e6f4c6c5c6bc99bcff685729 SHA512 f0154ec915cccb2cd08f6cdfefc57a80c38ccccd8ff8ee1e919e3577b4e5df6d5048211af6a26e9ef96b443ab3eea4dc126884669b5730e0ef75da00553cab85
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_kk.tar.gz 478338 BLAKE2B 3fb4fe1d2b34a59120330bb93408e1d08834eebf3360b341d1b0f82f4d98ea346f634b307d966f31b01e5ecb75a433113b39eb130df7f0ca3db7afc557915ebc SHA512 e879c3e50348105af15459f0855ea097ffaf5421e3aefafd4ccd782a77ebdfe79b47c38350a9e314fab8d7f1da16b56fa635bd70e5b61d77731d5ebc83b8de50
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_km.tar.gz 578518 BLAKE2B ee20e487fd84e0eaa6120b4c93f92b7faf68062986c4cd42c96024f17de8d0c9f5d0a21cec5612a553f0aa4c46a8eac59324ec3712f8192205e854fb78756fae SHA512 9354311f0fa483d20fee3005655c56dc34f5366a6b1ff8e9299818f244697bd05954f5b50df935885e04cb205b118fb4b181ad71632db179a092fcee3c98e946
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_kmr-Latn.tar.gz 433779 BLAKE2B 2b5da58affd4901ab5c115994e2d98ae1f629810dae5d53978fb615dffe79d66673bd033632805e228b3aeb8a96c7529f424f9f1e3b6c2e37003c340ad00dad3 SHA512 abc84dfdc51900549fa608bdf9524109c382ccceb317f2b15613659fba19036bd19d9aa7f291360196c6d2eab05a18d3045e64ea827558415fc4d9ec49c3be5d
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_kn.tar.gz 494314 BLAKE2B 472525bbfbab33711d8b79c45818c5bb5cba2995a32aa56f3e24ec94a631e187d5b7d43f319d52d933d713b64601137de335cbe58ca8aeca39d251ac9fe16557 SHA512 ea18d417ac0ad522965f31af1be63501109012485056702087d837fc27c564eb8a5e89dad42ae158d90b604fd38d0bd50292024269c314f592f1993eae0dc9e6
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_ko.tar.gz 528693 BLAKE2B 08922f8b85aae42b20bf6580d394f68aa7f69453fab8ef073ba829384db4f84bb5518da541807790c418a2786417f8dbbd6ed2336c060dfd2cb6bc73c7163d35 SHA512 4a8a700d6b35c474f07c6f5ae67b92f2dce96ef028a58696dea0111d7960a683dde500255ada3394bd2e61573d55bc81f9e433afcb95d25dbee9c9c6b16e3650
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_kok.tar.gz 472684 BLAKE2B 452c880e727bbc483bea04d8b530a76868f9c9a63c01d545a75bb29be0ed4a08c6903bfd21b8270cbe480e2e804c0e9daa7ec0a522f5181dda5e760495f248f6 SHA512 cd35a1014239b145ca6b0a71566601471546d5380620975930f00e4ff617bf411b250880dbb55a43d963fc74e5d97236f06813929ba208ad9f05eb56e23bd4fa
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_ks.tar.gz 450987 BLAKE2B 7b339754c6ce10a619ea31505d8e59699c789b69fc125b74239cd2f61114e191a1eeab4d23c35dc05084d8469f3d58dd456f9d906fe43a677626f4e8df83310b SHA512 411048630141e8ccfd5abdba6853e744c01c4756a2372b0d501bc7aea416ec2987ec32e4ac428b46c29b8caf295a9e7a13a4d07a4a3b3347c1e34ce86a8aef56
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_lb.tar.gz 412293 BLAKE2B e6daa6a269dbafa4323dbc66de8e44d2ca0abb22e12730e7e0e2de4c5dc176225f13b7f25302dd9a865dc37d73943eba352521afb1297f25c929c84da873f7d4 SHA512 93db13775d53d0627a56dfabbf731ed6fd649b9ad584dfcf55fd0d92174bcb1e6790c1685fdd6c896f2ef7638911dce048265a9599d65d75eccead0acbdd1413
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_lo.tar.gz 496084 BLAKE2B c380de8ecfc4a58f35cbd33b10f106a0f3f1cf648acae0ed42a131b63d14b15c0f6af43949d6763a608db795cfac7bfa2cdaf45511a99f6c0dfe3f8feb0dacf8 SHA512 2c2a403fa1e1da02d9255d326e6e9128badc4bb573440a494f666d44d5d04e47fbc8571e635b1a75acafb8683ce6f7a071d59d6232aa1d8d354690f01acf516f
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_lt.tar.gz 777549 BLAKE2B 8aab43a8f3b58cd77be0acd4f55f8d98d6320344885e631ca4411fb16fa7c67e423259fb269e732efb9c41ae15d6dd5295a0b8f8e6d0919ba0968ca96c22a178 SHA512 57f123d312a43122fb405266c53b9553295d31527d0ae5c44b03b4d9752b1d6c9c6d19824bc702b4e31cd40f2d4d64a8de4f872fcc3a05d4b0ccd1e0c0fc0d95
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_lv.tar.gz 1193749 BLAKE2B 623474111996d963e9d30ff58267762ecd7946cc914ddf968e2025b4b9713e86cb40b5ec54294f599a62d10410662e81171048965e02b21dbcc3258f272709ea SHA512 2d7ed79afabe67e8422194cf3aa4ed63a6cb0a94b164e835fe557db9b767db73df590e161584e2c07250590f476026d182eda443cd364e062fe17440cc17e20d
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_mai.tar.gz 452691 BLAKE2B e5a6d376dbe3dc071417a38fa86ac530778618c7aaffe0f92d1f595a09b535e9592864303389ec00aad888c43fc3b95a45826f5e218e0a866d8686a32b8be4f7 SHA512 0790412a73dc88f6a5a4143e99b0d2fe38390ed14e516a116ea5b41e762e2b57447b5974f2dca23704aaa8ef312e5c7b733ec47d6c07a6ff67332c3c95aebf26
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_mk.tar.gz 454817 BLAKE2B a0be2708b3da8f2ac4d3b1b6b530b294192d050eb71fc1312a6909bb00c2078c6310f4d4dc285b42f108c5a357336e9410ba5396f06c27c45642a9a2eea404b3 SHA512 f8fc6bb148262153d156a7e52c0d0540389158ebe19f864bc5755cc01eb10e70ae247467c8cecb94bf74e3305b0709e8f0f52b6f0111e604a2383ea33ad3192a
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_ml.tar.gz 494543 BLAKE2B 46d4fea5c315ed6986b30665b92d66482a9a10017d9d5070d7f5d3eb56d21aafe2302267b7d9c10c6173106a8200e049141e190975992a317fc5516b96265a06 SHA512 63f97cf14f15b5fc835f1a72d979143a441d1500fb62e3260101cbe3872ae1c8e06c03b9a177b4ab400668db2627d244bebe7060c79205e6f9d3f9e9f823646f
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_mn.tar.gz 545630 BLAKE2B 4079d767d7f897b1b4c45e0b2616a518f42c56f67f2c9766b29cbfe2fbfc1417c9c12da3842d637b9658c266034f71a2dcaede8b2e7b6a4978dc741be1065645 SHA512 96da08eca63e84dd8100fce313ae7c40826a1d9763e8198d6a98417017f21df3f2f80a564941cede1788a21b965da16c325b7a57980908fc0c619ce8f64e380b
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_mni.tar.gz 466877 BLAKE2B 3a27ab58d809c1b61b41932819e0a96173df66f681ceefae73dbeb7659feffedc4e2e4da9c1bf0a4c20c89634002ab71d22d859f12658f14f38823f260da28e3 SHA512 c715539c0a3f6004e9b9a8933ca691c50f06909d62e43f9fec4e1a15a5a147ec0222c266761115cb2b617fd475ab0d7c19891b003b548c16bb87f9d0d48fad2f
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_mr.tar.gz 489723 BLAKE2B 1e752f32936b92b6c45b8f7124e2299319377699142b2de150e85626ad7328d30a881ac76ddf9bafa626e47a32aa034f1df905aae34c015a83e15c7d5f6ec9a6 SHA512 7537f7e7598cf1626e5cef8f995e7333cd7d8d5c84a6e51b999fe57409d36f5d2419eb0acd642b66125d0fd608a9316628ea5483f6ec21f637fd5301ad983ec3
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_my.tar.gz 484869 BLAKE2B dac377788ce531061377c7aa3fc9397e6652f2afb92daddce7f8cd0c3a5a6873907778d0d8be64c5ca7118992acb831689d35eb67b6d09edfc96ccc10aa24886 SHA512 5b8d5d7928cf61c467a51ebd8cb15ba6f3aadc9f819c2a0f2f485cb0c499bf33cbd423d3d9e36e01dd4c3a49358bb5cd713cfd3c9f8289ffdb4f0cc8bd0d5135
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_nb.tar.gz 3426436 BLAKE2B f03ad0def0b5b1770f1edef75f2f4564836a289ab22716ca129c2901d16da26c7450dfb5e23b0cdbe93a6f8014d9821dcafd4e84368765ecf8f2ac126290fa49 SHA512 5e074626f1d57f94eda6ec5267db3ae53596a3ded344dfa59cdb72008b7ba7a1e77b52ac7cfbfcd17e9d49eb3b93c48de94e2b23005db69ffc22c31ca4b519a2
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_ne.tar.gz 857431 BLAKE2B 02ca7da293f7b9489df087110d76713ab4b416e9512a55f060089a10dc2d11e5be37e22a51e7a0c8c6aa3237b971d15f560ee0c17801ed4bbef4a8aeeba3bfaa SHA512 0be281c001dcbab23e7badac48aa075c096db58cc2c0fc89387143597efefb3b628aff4f6d5cdd8d86d398f8c0b127ac43d3ef682f2df5c5589c7d2830c6a3fb
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_nl.tar.gz 1225746 BLAKE2B eb0208bb2122aec1f613bd3e6a388d408a1aae5e6eaecce84befafa8aedba5e9833f042fb2ffb09a3ebface89f106e2c2f10d2d359c3ffa12d2f7dc1f6482659 SHA512 e3833194ecb2911992f1e595afbf07b4c07f2e89457e2d616084b476138b3c8b382a3cf474e80ec2242315d98f5a80e447e6a22a20b3be35b250ea7ee060f147
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_nn.tar.gz 3425784 BLAKE2B c8c6e6d854e8b86c792ef4b4b8884ed3d78ee5276473e746a89bc75030beb7c175481827fd9f7fd23ace97f47ee710d0c7ead7528213a9cff518db578a22a065 SHA512 f381d8c7c14dfae04f8a72c92835c1650f3c25741d67d1d708e2d4219c498e521686f6b2f26b55fd7ef17f78ec269fb04e722f9b617a0e92a498b49c42d4cf45
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_nr.tar.gz 432256 BLAKE2B c6d40b582008d7720d14325c072518220f4cb36cb7d2c4830cdb39dfbd2405b671c2785c3ed0ad6eece66afe6ce1713566fbc6af67bac362e49b3404e06893ca SHA512 81eed348826c6e961c4c9317d03ae2e03021e7d632c0aecfc293ee922a1b96934997dd57e4aaeb3ba09d0a529bbf57c0161a3d254a0a1c543994277094f550d1
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_nso.tar.gz 431425 BLAKE2B af13240b1a58b1f5d5bcc8933318f78e186ae5cd10c4008f576a35d5b57c9645f438a6d38f5daa469e810bdaf6314a8db4eda74e2641e7fa977da9bdb996fa34 SHA512 1347aed0cea5754322f6b4dfb5860202eff16763612269d8fec18dbdc8fe93b180d08df2f145ec73bcfc1c4ba9574d466f3d998c4fd202abd061c1e440a25bbd
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_oc.tar.gz 637879 BLAKE2B 2987dcb45f655bcbd1faf51704cbe9529cde9de7842078c323a40bcbf4a2ea4796b208841d4d471dff40644f9e8d0c62660e8eba8f4dd8a1f7102f877d70724e SHA512 4d80ede3e22b02107774a23ac50c11f9d73787767ee1f1770420730dd3000928745158bbc85fe4ebc206ca55ec9c8e4c9839e0c7380903658c78f6f81c89011b
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_om.tar.gz 425926 BLAKE2B bcc638bcffbb55d7644991c16c1a7f54cbdcae494e75a2253bfaa7fdc7456504a73da26bf4bae5340474a80205291f7408d448ad19b8f39e83b961bacdc0d3b4 SHA512 babaec26b2b238b0841482e3092dd98491323d7007450b4614dfadb1ff938e6db91e09c0d34e1bccd16dc8eb4956f790f4c78f22c616b70f26aac76f1da5174e
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_or.tar.gz 490717 BLAKE2B 9e7c9250092113e15df6a394ad1ef6a8d94e9906f81eb0aa7ca13017a8f37e436cd68d5a9ce1b2ce0a851d9840800abc61c9668feed78dc7a3c64607f7b014f1 SHA512 78d251452d5a4af0b9f2de04452ffe8737aeded771ee18917a20bd08b62a571f2db6dc3b314f922ade886e573f5972e2b428dc6a1f53092b573180bc7e70a016
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_pa-IN.tar.gz 462198 BLAKE2B afcc210c0ed0696e6cc1c889ff724a24c6cf855461fee6bb4e8d03345ca231b32cdc7636560dec3e71de1901b4060fac2bc55a967cf701b7b010224ffaf148c8 SHA512 25bff6372073637eb8b92c002a605cec48cdd1010aa9b00474b7d764985442575723acbd674c7e94e392738c8ed34d5304350abbc800968e25ea66247fa16c1e
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_pl.tar.gz 2794814 BLAKE2B cdb354ad91d17773ee837e58f96f13275aef0f22c67176cf97a6b408311906023f71166d37ac71e90f1682ebb07291eb830e75d3eaab5f0dadafb81ec5be85f4 SHA512 7a55d9d86db5e5dd2ae2319586f7c4b3c56d8e2433b2ad60f4c879c688ff26e8ef8abe359f6f5debcc54af01b663e35a8b622e2352b66e04922b884337cb37a6
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_pt-BR.tar.gz 2517807 BLAKE2B 62e09ce06cce37769855c90bf1bd9c175c83c2e07a8e1467d526e433b1de2b57b6fc61c7eaae346748a09542d9189345a780e6fdd7779bf7b4dcf3d9d46c5585 SHA512 e939a213079e39163c4182245fe5ca9f69802fc0785d6c9323b2a5b81415ed0a57d4478f603f089464b029a13bebd0781fa51a67fb7abfd93fe594e322068016
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_pt.tar.gz 2071056 BLAKE2B 0894c8a3da4c2a3b22f2215547c1e8f9727ba197fce3eb2db48488ce6722cefe2142452ee86c8935f8d59a2c9613f0a2e0b03c68ae3c6e08fc8e327dbaf6953a SHA512 78947f5f3c01f4b11fe3d29e4c08203ce6d5554435c07e85bf626fbc94a7f9833573a7387a2f25d46111d4c3e8d45fd60ed9259c2a7e98d3a6394efd56e3bc5e
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_ro.tar.gz 2304220 BLAKE2B a00438b2dc4e2a0cc659858461242470e6d8bace9ba6b40101cda165947faf9ede63434222aaed497936b52fd0853d1f3ce779eaa49953cdb9ffaf55fc9de158 SHA512 785c5b48ab541af9464f8a71827aaa0979055e510a7bf5453f961b8e8ac6fe6329c7e1a86416aff8e21acc64a2815f6ddf5e5f9576a7941a46bf8a4439d04dff
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_ru.tar.gz 1594260 BLAKE2B e56475635f1ed6880ee945f1cb69884eda726bc059bd24433501fb0f49425289bfe2d3b110201886999cf08e6c078ba3697e2250b97e9a617f502127f15c6ef1 SHA512 8c4aa79f31f515073cd602f43488391fc0b6b15857ca6507260111e5607f941cc2b5ab54563db0e3776f1abf9c188247abf1b646c572bf275b592a4e654e5373
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_rw.tar.gz 429127 BLAKE2B 089868603bc3e3ff3f9ad6407a88a84990a6f57d1046aa58d5173a5e099f328c80cedf77c64f92fa0cdeb35cf03dd71705bd735b396100e6f78333cc1e7de6e3 SHA512 3e24772ca2e9802c115711cbe2f564803f4fb07b20835310cb96a2d0762bab6b8d3bbc9147321b79eebbea86492a53b74e20c13a15a642be6b49e582cbbd9338
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_sa-IN.tar.gz 475335 BLAKE2B 6d504c47d116d4ca1a21d29aca8fbafb464568209c61803a232a1137d36b898c6a8fee698303cb6a57c4c2de25e5285d49f48851ae55f3d9aff5cb813bce9bb5 SHA512 35ff51803bc8f2d78a6dc45f74f744bd87a239e0a9dcdeecc79e9b2deff2493eb7467b5fce1690802c7ded53470d07b7e2b8a015035956ec3a55b7ed6d7a507e
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_sat.tar.gz 503989 BLAKE2B e66a430d2ff8a5b7ec94e76b33d1d3ffe58766c4750eff11438e347c186f16fb318fcfaf518c019acaaae02fc4133309cb8f886884bbdd97c644413b633db192 SHA512 64edda78e972efa9e16e03b064dc94abfd7f5376eb1ab4067d43ca5f02b69ab756634dca9ac581631c04bfab7c0dc3b49472393225aa8065c400c187d92d2a7e
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_sd.tar.gz 468748 BLAKE2B 0c78389d732da16ac0c3be3aebde80782ad984dbe2d6985d8df42fed46825b66348355a73f0834209b3f77278f3febd2e5b42cab83e37950ff9d757fd36d9954 SHA512 a65f397eeab1616f57a21becd6a5f24e40315964b269c34a70506654523736181bb439d1d7761bfd8f6a67d0f23e2da6be1ecd28f83dacf278f0317942524866
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_si.tar.gz 758751 BLAKE2B 6b7e8ee7a238fad824ace32af15f6738466e1684b4aa52c5619d2c0448e695fe0f3dadf215e3058e187b7c34fa25d2e585238d0f7a3ec4fd4367c195a3bb1c00 SHA512 b7278ad128e822c21ac1ae1408a90e576ac1e3c72cc85c14bb7c2873ca8f799416607114b26767f9b4c41a4e1ccd7fc08eb937957f93b5416bd512b29fcd8b70
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_sid.tar.gz 433732 BLAKE2B 13ddc195d216731b77d7b5edf6e7fb55564ae8284e827d6c84a9a85a3b1ac209fd4befe0ff6a193ea12e659672ad4a95ab92c5ded628a30791023a67a26f232b SHA512 4c8f2f8eb45677964a6742b96459fb30aadd67b14c41284657bc3f789aa460440d787729e86050bcef32019878861758280bfd0211827e6fdcc4cda3b2b9d6de
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_sk.tar.gz 1725227 BLAKE2B 9f6c02683519432c8f12791c34ddc11a908dce83fafbcbc94df00dcba1362d92b1238e5172dbc5e42a0410af39d35d3ee7dbed4e677f339042de62a85ed56f02 SHA512 366eded6170e2d9bba9d470989330e9b1c919091c5a6ca9699eac146f58781055ef99e32524783f5bd30bdd6b0d73bc6356fa2edd728706cfb74cc1771d0420b
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_sl.tar.gz 2104305 BLAKE2B 364a0a9deb4cc3e5e1c1232062fe9e31c8948eea15f9e49157a9e5d67590c1af6ec7eee6a7698b04e35b21db593d15ef1e4c36ae2266089ddec398d8c77fb938 SHA512 8ec1469c8988b2e533d8a92699a9add361479fcbe85cfdc7dbae300e93418611367c397ad5c750b16f60314fd501522f749062655b520e3fe1faa8fa672eccba
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_sq.tar.gz 446472 BLAKE2B 36233464e1870ea7de3ad70f337bf4273284ee63edbc5c0f8b5f475ba0a1c4a40b14acc31f1245da388ce9af3ac179a34c7cf066286a3f09a227e5de82508fc7 SHA512 bc582e9ba857d74a5f185306a74c868a81ecc20e6f87fc938909789fd605a6ce8f7c152dd804e81a7d27054f942da81e31a141cdb562547c3003f52e8586b505
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_sr-Latn.tar.gz 1597165 BLAKE2B 78e266f2d1322e2dbcf423e2e84f82f510809fa17a2dcc8ec28091f34636abacfe0fa88b678c6df7ed08dbce61cf6308ad877db39e76879c2d62c23c221d8151 SHA512 1184b6634ecc7953a7d1204657552056fd6c131a13a0616163178ae519e8c6fac602743f8dee88e78391194965302b5fd3f4e3acf26a60e353aee0116d389b2c
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_sr.tar.gz 1617063 BLAKE2B a553d99f7f57cae7f9c5a1093d3dbed293f974fe262a88872bc3498c6e5fbbe798ecc12f6a8672d07336f7c9a999a49640f50fdfd551bd38ec5e9ab797338fac SHA512 8cfc140f1a89f64f05da5d951aabcab531767c7d4d7c8df3e049fe0f5c92c7172ee3a380ffe61571296d904d4324b46b8bf884650c4d95886a8dcf2dbd16f447
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_ss.tar.gz 431152 BLAKE2B eb78d979ce08bb8f58a0726195ba0ad59e67fd5a897a3fc1c9e736f61cf9935da8e8f6646bc0202045932a93a27b7457bfc11f732f656b09570e8a0a15cbb2f4 SHA512 c3156fc3b6e94b961a8f61a5a1d88e306c9a2310e7818c6f9da14a108ed832a92ac3b490000de385345e0fed3e517801ce06f9746618b4ced46ddcae7b2daf4f
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_st.tar.gz 429252 BLAKE2B b21a2efa22f96704e2a21c49fb4663bcaf348c96e9437d892252b2331f4e7c962201d3804d0051b425b61506f9d4615bde172d4e2c616eaace7072e83c2de001 SHA512 51a8c3f9408a140be9d595130f2b4d4a576a08271a8cbc60e8d6637c1b1b6a971d87b1725fa77c2b4b025d9cf8fbb6e970fbac62ee9ed454eda1a99a15bd96bb
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_sv.tar.gz 2314029 BLAKE2B 9c7436d16c51523054892a6e08085a7acca1391bab68050c30e540ff3fa1a935d0c54b4a199c6aad05abefd1f27c4fb6075f91b7676b79e854a7c789df12a7dc SHA512 91336ce47ab7813a5b509df195a118af564f8a29d33feea5845311b612106d9a761f4e7a1719b0aaab0ba1b665c31905cb48e3d8be078f4f7cced0df1a1ab3ba
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_sw-TZ.tar.gz 420152 BLAKE2B d1a4ea3cc430308e6f939ebe228cca2db309ceca7ccbd198764927a9f68949fa428b2d66c48e4e1aa27c56065867d3bae7b322b62be1c282877b0513833dd8fe SHA512 ebbd864ff4a5049fdeeef8b6174ba19c41ef50d90f8cf97bde39f5d4416d25cb4316c80515c93ccf083e1d7edd15931550967ed1f523aa40ff0e4e133f6dcfe7
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_ta.tar.gz 489673 BLAKE2B e445e8cddd502844b2c81c4d3d89221671a9be987c6d3a5f9c3a6bda8de1c7ea8571ecc7f94a261fb7a4875a5ba7b3cd7dd4448676620944072458747b88626c SHA512 780b97d705a6e267012ae5e09649db330b865fe69bbcdc8af8a766dfc7ec6f907dc2aa1dc13b119c03a96526395dd759ac43306700dd3e58073907bc38b79a1a
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_te.tar.gz 1040132 BLAKE2B 0db2dace3562f33f57752239e0febb70d806eecb040580653feb8c78bb26ca95122f9e7f4270b37f6cb1ae8c3b1afd4c8bc285f762070902db888d149411ad8e SHA512 ec5ac3a4ad60382281dfd843133bd52465725df0670f153cdd92765e7e7f3c1c21e8aee84be2efe0580327cc48ba8bc6683327e26877e3ba0d629c16f60588c0
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_tg.tar.gz 446663 BLAKE2B 41526ab4aa392d61d66521c71c5bdef80c33308d7794097c66ada16c981cfd7c58cb48afe7a5c2b6c96941b099825e0299133339d9d947b1859c9a6ca39650b4 SHA512 b5bb67ac8e79f2b95172baf4f8a878971d78900572ab1d35e3d103d25efeb9f5ecf3f3bb2c91e1382de2e56d9512fff57e588b5da7a672b1b0ac4e15f1120cb8
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_th.tar.gz 625854 BLAKE2B 1e43fb90170085b3c86ddbacf6641d78265f18f0be1884f2e40e501300aef7e38530a850acae6a62e6be2ae290ad76c06c589d58a6b1fc141ca72cdae33a9eb0 SHA512 282da0fea9d8c75e22aecd862e1fc8daeb67900740994313e2763621b89dc744898cb7ce1c0791803aa4a8dc5e7a7ad496e786c68bb4839fa1cb19166f7620ac
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_tn.tar.gz 421903 BLAKE2B a4d982599e198762c53a099dfec7e24dc9c9357c1704b0d7001637ccd91bcc651f49f10b1e2b81f69fbd7c48ec9e7b63267b1112a485c4eee2846c455e60cd84 SHA512 f7f662e80297fd0cd2e477005ec6b637e592d55d08916c304742c23737cc079174ba058a3bd5c4904962ecef0c6ddf204bd760bb759f464b47f0f9733b75af73
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_tr.tar.gz 475397 BLAKE2B c87dfb19b35b00da05295768ac508800c873cfe62834a2fc0d4a68fd44a92be043cb373ce09c07f46d68b73af24cbb45a7315fb9ebe885a2523c7033defa36d1 SHA512 1688b06d8d4f060f68208a6731d7cf9319213e49eff88ef3293eb14b21063689abef3ca1e5071a592b5606bea6cd142c26ea47f9cd778f92243e0b2c69d9b81c
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_ts.tar.gz 430957 BLAKE2B e9d90524799d4092a3bd41ab43bc76808a5b15cdda8babff69efb47660b2e1e20a55849b5cdeb0e26f9d467f692910c0ea2e13b2e604d2e8acfae601094ecd29 SHA512 fea6c4fc86b17239451f86ca2899f26d9c622ae3ff473d1e77b63d98713a564930a84f4a40510b56995db3352eb5121f5936975da3337a4d0e25a6fe196e5a52
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_tt.tar.gz 428423 BLAKE2B 2b770b3a0f4c52e36195def5ffc0395ecc6cddb195981cf30490ae1c81c535607dd4d88681a20256c59837db26be34c1ced8c72ec249c16d5aecd0be6343d39b SHA512 7784a9342e8c9f1af2cee676d3717e1835afd7c1b04b2daab9985fc8d8165011f6c066f4873172c58062844853828d61a9fc6799d64d8e206c1e7102dc57b252
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_ug.tar.gz 464634 BLAKE2B 20e00f78a0f27192d5666cd91891a1ebcc4599f189c856f8ca27be251aeed618610f630e53560f6df6cd51821832b5b9092d0e8dff30a1ef994d93fd4f1e49fd SHA512 ab7d7e20c32ad3b4d8daef7cb337a9f041e24bbaadcf18f20e8f93e218aa84cc99413138f2ca933ca58cd7899f8133910358bc1970d03548b4b2defe3dfb6778
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_uk.tar.gz 1315320 BLAKE2B f548d837ec8d072edd243e3ed899772124e5f62da18c6fc878fb7a20fda604f72c093e69410563fa113fc3b651e7d9f18298027c82d1ea25dc99020fcc9cfbbc SHA512 50c1e1e2d1706b9b083bb08710e5af483188cdb1abfeb14021d23e6a71ba389563b8f3db0580d18f887bd9c917d1ff36673a4c6874fbfd0860e058e21ae6600c
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_uz.tar.gz 425410 BLAKE2B d7a748981bd18b13e3495110ab299178539c4beeb4d1226e72ad724d245d4214d5d7f8c3a40f54a2c82f783a2a7508876dd2e5fa19793b01ef25b4fa2037ca9e SHA512 b009e91852d1b1c2ad12f79c4026db3b0b2a107d3ba452365940e7139d0bad27fa394f7de91d91eff22e4b60bafd21cc263f2a8f7705bcd0b509e78df6f32794
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_ve.tar.gz 432762 BLAKE2B fa204cd64301411ae80d84d46704d8de6ca5001db1de69027579a8311adb31520ea548a20e63f572575753766f23c2e18a0f801d2f7e08a8e3ef1ab0ef9e2061 SHA512 0e8a38e266f7384fe31d9381d7e100a644d15e13fc8fa00e15f6ea7f065883aeb9f84ca5906828e029e52cf9d14469513ee5c377a78e117afe190622dc73b35e
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_vi.tar.gz 465383 BLAKE2B d44c99eb75e749919fdc6da9b665325e2eaf0743506ff35b39448bf9686a6334db5b399b35c2eff7ffb88763c3f3b027e8e9a9834eec8a7bb3d7e623d82a13ef SHA512 8c8ecc8d658a01df4aa3fd89c828037793a1b74dcc8449fd456e2e60ae7630a85ad83e5c7a1d22be96e9bbc4d0aa35d12c7c8b8cee3b4ea546789f5534e506a1
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_xh.tar.gz 437386 BLAKE2B e37dd965b94cb3e12bad97f703a5dfcbf74df401cd1e5c8a47e823cb69c608acb6ce7509ef8aeffb28c30c71d0e41cd8e03471f8ddff661902d2fb4b46f15979 SHA512 e60c68a1c613557aeeb3209e460c1c4ce1f7d4ea4163cd255d441eb664e90229688932189a99cba732d94fa54ba8be4f8f3cbc7a74186ffab836dd245e9a196b
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_zh-CN.tar.gz 515889 BLAKE2B ae945c3e8762c7115209da5c30f6fe64b374e692799afff5eea8e42a09a257883f1e89372964f6935655f6296620c25b17ba5a8ed91c7af2a5e004aeefeecb71 SHA512 f41d6cb173a9a01393cf09b5e1610d6dff308d22b750a0c283540e63d37e7b675edcb1df0507461dee7f63fa655a88344c5bb489efce0d3d8ba3e8b477f11d8b
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_zh-TW.tar.gz 513873 BLAKE2B 63b29287baec9e6e2403fa413995e39e950e900fdc3189d91d312763561951ee48c5c5ad60dc35ef8be58ccef5baa34e4b5c4a8289c1704d8ffae40b4c3734db SHA512 1ea3524029b2d4e83fff4dc7edfe07f5a131498c708f855660869a927027f1070f3be4980995beb5818d52675ffd5d593a5479bf227788bf08f394157752a379
+DIST LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_zu.tar.gz 440340 BLAKE2B 0db2f89f5157ac1a368bbf130a6758cebfeacf97ba8baaf0b615d6d90932e4def6bb09c1411cb423400be86bf98dcf64e90021ba52c004e9b3c8a9fe0f3c39c1 SHA512 5af177674df21e50b7db3885ad388eaab5956792e5c2cad392a1a575065d50a766aa878e00237f5dc38472481f86b36376dfad319072b5cf65040bdd5d1e4da6
 DIST LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_am.tar.gz 7989311 BLAKE2B 7ff6325d64d79df5c4a4785895a8124b694dbed8cf531ed0fc430a5eaeea5150d907649108523cb7307e76b8bba6667a1b387c69319a4f97fc89d0d0e1a04e01 SHA512 ed74a073453986b5b1ce9a10c661019f224e5e759a221b1a82dccafee346c686aaabecc76a10ee40f57c06840a5292099671cad6d76cc85ba7e579a13f0b2b1a
 DIST LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_ast.tar.gz 7905060 BLAKE2B 2276f2fbffb28de02fbbd6aaadca9f7e9e91f6469cabdcaba2774c47b71b4558c0b832d1dae196223b23781e67fb068dd3be37b4bcd4fb1e6cb2d9c35c456e54 SHA512 80d01b4fe97857de7a44cc2df14f2ec835a80ec1ba2b29f75f69590288aa496158654989b32bc678b528366171af4278125bdf0a48aa96539443124bfe443283
 DIST LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_bg.tar.gz 8465944 BLAKE2B 4c8b6f310b2cf804562df7718f9d9020f0fa06549136688e82aff2313a86f0bde314895417f04757b5da84e0f75e613f93c0344a62f0d5e7d44f8d6dd73f4c7c SHA512 308eb6d78746696456a91b80e95cbc10642d6594d47c180f85924457368755347bc9d949d5e8395175dc5acdfedd88b350211d18fbd61fcd99ed04d493fbdd93
@@ -504,6 +672,7 @@ DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_zh-CN.tar.gz 798834 BLAKE2B 17ed
 DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_zh-TW.tar.gz 796762 BLAKE2B 347d7e14c472b79f2bd24d43f36432f9be54d3d0b279d7c341dda655064ffdcb05c8396171a855985086a48ab5dfbf2978fb738a51378261fd3db9d4e9038c8f SHA512 59a7ed0157e7591323f428a6c0e2f5e05be954a1eb1783047b718fb20e687c4e03c5f54922af1247d3e0fc3469fdc87085a08af33ee1cc17e37e4f8ff33ffd0f
 DIST LibreOffice_6.0.4.2_Linux_x86_rpm_langpack_zu.tar.gz 325449 BLAKE2B d8b454b6ce1378e13ec7d3197897be29d8b53d55d788f70d2d6700b0b5018fabd3ba63ab20157dda025e2ec4bcf8e06bafc6e31891491cd8898d5080c2802c0c SHA512 6b45ebbc3771eb5dfc9774bfc1703b8301720aae409a39bcbc0e65d34c53f7841f740254b4d5c92ec976e508c60b2e8761db50911c826fe7b16e4c67040c76bc
 EBUILD libreoffice-l10n-5.4.5.1.ebuild 3365 BLAKE2B ac42e9f05e88133d0adb56e0c8e7288ea1d79c19a2359c8afa51620615f49d0921337242903ca134a8760030ed5a3c7a2171561dbcd6e7b3f04e58951825c165 SHA512 e7c0f037d6e9ffaa42d286fbebefdffe0f21d3f6937bb7d2b55cef9ef7e4c2557dc4b6f30bf9411740f3fabf4063b7b1dd5714148c5f2698419247448f2d95ea
-EBUILD libreoffice-l10n-6.0.3.2.ebuild 3367 BLAKE2B 6182f0d27145926bbac711586b7fe3eb6dfa41b4d4b9b0176ae983643db76f35911b43e286e7ec23fee5cfc20a9e6d93297b8dc3fd9789386074d579c19e6082 SHA512 99f77f3898305c0c9526bc983c1321093d9ca81aa261fbf9b8ae703eba2d625f367aad8987d2d5cc077da7468c1e77b15e8fd8b71b5b8e398b985cbd13821b78
+EBUILD libreoffice-l10n-5.4.7.2.ebuild 3325 BLAKE2B 9300825c46c619c23d03948033f247792337133829a2c335b62bae0e804e9e9c849b9906a3bacb9f0aa1a448615e8c105bda398d41791f343df8982864416992 SHA512 feed2226ac09e367fd5a97353ae70b4ff0fc0b1d318f9d2cd462ccd90ceb03d29025c5f746381c9c2cf68dd23cd28ea244eee82a497bdc5de71bf048bf06f6aa
+EBUILD libreoffice-l10n-6.0.3.2.ebuild 3366 BLAKE2B 105dbdb7604fd62c589678edc83e08caa81b84f1b4a709244122697bb7fbcfb2a1d48a73de55e1346479c3ce80be7fd2265dd8e7674fd37747a9a3322507dcff SHA512 4e294e2f9e89c10a14f595980d95be4591b64279b6ac0bd108594c118c16d274b589b652bcb435352494c7ff77c3f45dc231dbd3950396ea293e3183bef6a7ed
 EBUILD libreoffice-l10n-6.0.4.2.ebuild 3325 BLAKE2B 9300825c46c619c23d03948033f247792337133829a2c335b62bae0e804e9e9c849b9906a3bacb9f0aa1a448615e8c105bda398d41791f343df8982864416992 SHA512 feed2226ac09e367fd5a97353ae70b4ff0fc0b1d318f9d2cd462ccd90ceb03d29025c5f746381c9c2cf68dd23cd28ea244eee82a497bdc5de71bf048bf06f6aa
 MISC metadata.xml 369 BLAKE2B 7629064f409fe8ba7f0daa435ff56eaf0870f70b45961c635119725e9a78ca40bbdf77a39e70f83a31103944f579b13db5fb07f8dc9e7ecb77491d36220370e9 SHA512 8cc7592062150a5472a5b8cf4106d0c3fd7270c7e6d0d566852bbc6670a90be2c73e6c04f085e32b41f40dd1adf9800a53a1af8df5cb297c20394c55e3df45c6
diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-5.4.7.2.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-5.4.7.2.ebuild
new file mode 100644
index 000000000000..0a893cd1d293
--- /dev/null
+++ b/app-office/libreoffice-l10n/libreoffice-l10n-5.4.7.2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rpm eapi7-ver
+
+MY_PV=$(ver_cut 1-3)
+
+DESCRIPTION="Translations for the Libreoffice suite"
+HOMEPAGE="https://www.libreoffice.org"
+BASE_SRC_URI_TESTING="https://download.documentfoundation.org/${PN/-l10n/}/testing/${MY_PV}/rpm"
+BASE_SRC_URI_STABLE="https://download.documentfoundation.org/${PN/-l10n/}/stable/${MY_PV}/rpm"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="offlinehelp"
+
+#
+# when changing the language lists, please be careful to preserve the spaces (bug 491728)
+#
+# "en:en-US" for mapping from Gentoo "en" to upstream "en-US" etc.
+LANGUAGES_HELP=" am ast bg bn-IN bn bo bs ca-valencia ca cs da de dz el en-GB en:en-US en-ZA eo es et eu fi fr gl gu he hi hr hu id is it ja ka km ko mk nb ne nl nn om pl pt-BR pt ru si sk sl sq sv tg tr ug uk vi zh-CN zh-TW "
+LANGUAGES="${LANGUAGES_HELP}af ar as be br brx cy dgo fa ga gd gug kk kmr-Latn kn kok ks lb lo lt lv mai ml mn mni mr my nr nso oc or pa:pa-IN ro rw sa:sa-IN sat sd sid sr-Latn sr ss st sw-TZ ta te th tn ts tt uz ve xh zu "
+
+for lang in ${LANGUAGES_HELP}; do
+	helppack="offlinehelp? ( ${BASE_SRC_URI_STABLE}/x86/LibreOffice_${MY_PV}_Linux_x86_rpm_helppack_${lang#*:}.tar.gz -> LibreOffice_${PV}_Linux_x86_rpm_helppack_${lang#*:}.tar.gz ${BASE_SRC_URI_TESTING}/x86/LibreOffice_${PV}_Linux_x86_rpm_helppack_${lang#*:}.tar.gz )"
+	SRC_URI+=" l10n_${lang%:*}? ( ${helppack} )"
+done
+for lang in ${LANGUAGES}; do
+	if [[ ${lang%:*} != en ]]; then
+		langpack="${BASE_SRC_URI_STABLE}/x86/LibreOffice_${MY_PV}_Linux_x86_rpm_langpack_${lang#*:}.tar.gz -> LibreOffice_${PV}_Linux_x86_rpm_langpack_${lang#*:}.tar.gz ${BASE_SRC_URI_TESTING}/x86/LibreOffice_${PV}_Linux_x86_rpm_langpack_${lang#*:}.tar.gz"
+		SRC_URI+=" l10n_${lang%:*}? ( ${langpack} )"
+	fi
+	IUSE+=" l10n_${lang%:*}"
+done
+unset lang helppack langpack
+
+RDEPEND+="app-text/hunspell"
+
+RESTRICT="strip"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	default
+
+	local lang dir rpmdir
+
+	# First remove dictionaries, we want to use system ones.
+	find "${S}" -name *dict*.rpm -delete || die "Failed to remove dictionaries"
+
+	for lang in ${LANGUAGES}; do
+		# break away if not enabled
+		use l10n_${lang%:*} || continue
+
+		dir=${lang#*:}
+
+		# for english we provide just helppack, as translation is always there
+		if [[ ${lang%:*} != en ]]; then
+			rpmdir="LibreOffice_${PV}_Linux_x86_rpm_langpack_${dir}/RPMS/"
+			[[ -d ${rpmdir} ]] || die "Missing directory: ${rpmdir}"
+			rpm_unpack ./${rpmdir}/*.rpm
+		fi
+		if [[ "${LANGUAGES_HELP}" =~ " ${lang} " ]] && use offlinehelp; then
+			rpmdir="LibreOffice_${PV}_Linux_x86_rpm_helppack_${dir}/RPMS/"
+			[[ -d ${rpmdir} ]] || die "Missing directory: ${rpmdir}"
+			rpm_unpack ./${rpmdir}/*.rpm
+		fi
+	done
+}
+
+src_configure() { :; }
+src_compile() { :; }
+
+src_install() {
+	local dir="${S}"/opt/${PN/-l10n/}$(ver_cut 1-2)/
+	# Condition required for people that do not install anything eg no l10n
+	# or just english with no offlinehelp.
+	if [[ -d "${dir}" ]] ; then
+		insinto /usr/$(get_libdir)/${PN/-l10n/}/
+		doins -r "${dir}"/*
+	fi
+	# remove extensions that are in the l10n for some weird reason
+	rm -rf "${ED}"usr/$(get_libdir)/${PN/-l10n/}/share/extensions/ || \
+		die "Failed to remove extensions"
+}
diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-6.0.3.2.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-6.0.3.2.ebuild
index 969f07348c91..d69b5f0314df 100644
--- a/app-office/libreoffice-l10n/libreoffice-l10n-6.0.3.2.ebuild
+++ b/app-office/libreoffice-l10n/libreoffice-l10n-6.0.3.2.ebuild
@@ -14,7 +14,7 @@ BASE_SRC_URI_STABLE="https://download.documentfoundation.org/${PN/-l10n/}/stable
 
 LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="offlinehelp"
 
 #
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index b061852e274d..dc61b80dc0bc 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -12,15 +12,18 @@ DIST 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 555
 DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c180997055648a8b1a33cc89988b74628bad8aa012242e0c1afa5b5b8568323c107187072207ee69bd841ba4ca3bbfe27ef65223ddc729d1a1aa6590 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f
 DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
 DIST libreoffice-5.4.5.1.tar.xz 193846832 BLAKE2B 50e9afb84d6e1901c3a6c99d1a4d3e274894d001afce71a0ced6a3ba0682995adf75e21eed40cfbc6d159581bf152273fad85615030fee33ba63dbf1ca15148d SHA512 70ef595aab3ddc81a000c18f2f783e5a87d98326fd3b69923c43e94e832a7f4d89f0d7444073d9ec48590e9a90b9fcd049ba0c85d17ac7921cd022cb2d0bebd5
+DIST libreoffice-5.4.7.2.tar.xz 194486484 BLAKE2B 82c28025f20842dc6a1cf410e84953208ec36462e2018cc07edfcd9d1086c8e83ac93dcf75148df6b670c4b20cd8c1c7904851e3c7eb46c62c521781e013926e SHA512 712c66de9216b5b7fd48310610801b4f1f17465f8ff282cb7e070a50104ccdb4a5a71f6a58eedb828a7a58f7521b5c725745d5e0f6ece62596b7485161cf01f8
 DIST libreoffice-6.0.3.2-patchset-01.tar.xz 39268 BLAKE2B 0bf5ad04323cbd2cf157dacc96aa9d3344d683f3303e5c284a83c0f8783d23881402393f2361d4db1270cf75424ff6f12e5b16540b3f7ccb624c29ccc8c71416 SHA512 f6632afe1c7bcdfb1ca82059d299f808e5eee982c176aa2cc5d728e11b833c3fe921c9c627847bc12128ae5e32c901cbbdfec0b71a22bb9a4b5041b645ed934f
 DIST libreoffice-6.0.3.2.tar.xz 203747760 BLAKE2B 8a666aa2e3e880b050ac8eed93a1c55ddbfa7ce74364b0dff4f5be446cf64c4fe347b164716a7d226c6cfbac01dbd3f11b89ecff75460ccd902ac44fe93d5daa SHA512 d1ec8982f185926d3f3040bcdef737e7c74fcf5b360a12a91983eac92843510553759ffa84c7d244df13036fc32149ffe13dd6a56fb1bda6f64fd5a318fd7879
 DIST libreoffice-6.0.4.2.tar.xz 204556512 BLAKE2B 2131fb0f810c81803f9905bc1f3f9bfa04615deceb8eb443644a35d6b4226f6876ffdbb8ef00c9ffe8e5a677877513b3c2adb40b3f87ddcdb46946c5bf3d6183 SHA512 004cef88c1a6d908a519b8813562d4dd623c899608026aa603dd86012a3d0b9a5d776c05e0e2d7541c691f4a9fc6c4d62c278fe88627872a1c6f841bddc2736e
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
 DIST libreoffice-help-5.4.5.1.tar.xz 2343180 BLAKE2B bd36ecae88313b60e9ad220f8ce47185e070e275d873741e96a98fd6d2dbf546b579fc304c1931775de86734710d2b91542ee9c9749b6036fe8e443cfecb60ed SHA512 b3860dd592207f83b8c6613fdb42962a9e175f6e850282cef6380869add7fe81c7292fdd145f2e2616f8113e2c18f6ed60210d4a182c1be021d7a1db61c9d89d
+DIST libreoffice-help-5.4.7.2.tar.xz 2343112 BLAKE2B 690c147e8bfdea9d1860131ad8528e2e2eea64da7293c8b7c3a4ad07e771749573b69fb11bed8c8c171b5760ec67a0a3b30eab06e38e5a725ffc11d0959c71c6 SHA512 8abd0bbf70dcfd5cf0ad713c8d34be541ddd27cda98403cbb331b62a4099c08b14be784362b857a41b8b2c756d01e36f043b97bdd5062a2bddeae29b8b70f6a2
 DIST libreoffice-help-6.0.3.2.tar.xz 2972952 BLAKE2B 90b62af89bbdec436e8ca5ede3aa8aa57109e22136d454850a108fd4aac1eace166432be8152d623b06ba9e04001a579b3200bbbd20caa1ac6c3b97026319dd3 SHA512 cb538553efd94c7a6f9059b6fb74351adba5449d7f4555558fd0337950528be2bbb7ddf7aaef4992eb18f432c42133d17bf8f0af9d3fe29eddd9d620ab847a40
 DIST libreoffice-help-6.0.4.2.tar.xz 2972636 BLAKE2B 0528ad30fc754269a94a4b2a0c9eab26ecb707b1e9a230686a982a24215fbc91016813fecef687499ee4cfb49228febbfbaaaff7371053d130adefd705a1bb49 SHA512 ebdfc93e8dd5e44b6fc5baa087c86777b91bb18008809dc493dd0ddaf143b26c50349f99cc884678cb6db3f8d60b615c9a816872e73ceddeec8be126d65d2651
 EBUILD libreoffice-5.4.5.1.ebuild 17387 BLAKE2B 49447d04e804bb922dc23a0480c23b042feb8047ff8c3fd18ae1301e1eabf6776a9cd25718c8df8219ee2572cb6436900b7900edc59f5c945fab72e00f891102 SHA512 c5acb6351eb47e3c34dccc98c86f3eb146787a03aaf23aa195ad818719b102a26747b0de1e406845e134b27012830e8eed8abcf275e77d825225f828c67be248
-EBUILD libreoffice-6.0.3.2.ebuild 16731 BLAKE2B c48eba2a33c9ef9badd692c40b3bdfaa72f8f14f02c4d65c960a21db1bd054df50c2d0fa3dcfb8496b675a5bc73476f55c90ef2d6ccfd0c2f6fb8b0970043f2d SHA512 01b3403c57518a92f1bdf9bf97130d310de2c1d5db9560f2372d20a7d06add0e2e0a4d8556642bdff7d74033e72fdae27ec37427ef25e81d8bc11ed70a5762a6
+EBUILD libreoffice-5.4.7.2.ebuild 16222 BLAKE2B a118f9d518c571927f24dcfd5db2373984a0e2be9caacf50af6005677706e3bc8ae57f8771a89a57e748b2221f8b8eaa19b0901218e6ce181bb28d25d7e6af24 SHA512 21e37083c7facb66bfaf3403bf2935430f1a581b61ab4d56b7d689a1762f5d14b8178f50c3e33a0d81f33f9e0ea062241f2d3e3296dd327d53ef33f431b92047
+EBUILD libreoffice-6.0.3.2.ebuild 16730 BLAKE2B ec8fc56844b329af74d0b04c1bd0d4eaa4083c5f99b8e6fbbbf28ad586fb20498c0eebb76d83794ff02da18914e2ecdf0d14df94ae256c0156d872f1938bcdff SHA512 855d86b634ab4b05f8edb528dc3e0b2f2e20f14541972ba8cdbf56c540bf8a895cdeda3663f76c1385dcf8f4810282aa49a506dda068f4c84ff5a7021ebe207c
 EBUILD libreoffice-6.0.4.2.ebuild 16671 BLAKE2B a1754528bc47efb263348c840335556661e8d558eaa20a4712e8b11740a8b3f98dba8a6c6c0fd4e6287b1906ec1469716bd287331b258b942faebfe2728a69aa SHA512 9dbcc4b34d94dcb80dda4d0e8dd15f39481447a92e0d99331cd09449a2d9be9847e206079a5b52df0d7266aeb12918171d638853bddcdc7fe3b30d57dae1f0fb
 EBUILD libreoffice-6.0.9999.ebuild 16671 BLAKE2B a1754528bc47efb263348c840335556661e8d558eaa20a4712e8b11740a8b3f98dba8a6c6c0fd4e6287b1906ec1469716bd287331b258b942faebfe2728a69aa SHA512 9dbcc4b34d94dcb80dda4d0e8dd15f39481447a92e0d99331cd09449a2d9be9847e206079a5b52df0d7266aeb12918171d638853bddcdc7fe3b30d57dae1f0fb
 EBUILD libreoffice-9999.ebuild 16557 BLAKE2B f49927c376a1f325256ddefbd4bb7b7da135efa392bec073844470d5b7e1086fc31019786d740c2ed22ea97a26e5e5fef1cb2bec67f254a50d1a6b2950492a4d SHA512 518ce3280a8cd83a91488542083afab86f91d15c8ff384b22b7f4401ca21c111902ec7e85208d2edd1d33b7a45dd9d24424f543c90bbf0c7b2653b3644b85539
diff --git a/app-office/libreoffice/libreoffice-5.4.7.2.ebuild b/app-office/libreoffice/libreoffice-5.4.7.2.ebuild
new file mode 100644
index 000000000000..8b6c7e2e1ca2
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-5.4.7.2.ebuild
@@ -0,0 +1,547 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads,xml"
+
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make
+# everyone happy.
+DEV_URI="
+	https://dev-builds.libreoffice.org/pre-releases/src
+	https://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
+	https://downloadarchive.documentfoundation.org/libreoffice/old/${PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
+inherit multiprocessing autotools bash-completion-r1 check-reqs gnome2-utils java-pkg-opt-2 pax-utils python-single-r1 toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS}
+unset SCM_ECLASS
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
+
+# Split modules following git/tarballs
+# Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${PV} != *9999* ]]; then
+	for i in ${DEV_URI}; do
+		SRC_URI+=" ${i}/${P}.tar.xz"
+		SRC_URI+=" ${i}/${PN}-help-${PV}.tar.xz"
+	done
+	unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+	"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+	# no release for 8 years, should we package it?
+	"libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+	# Does not build with 1.6 rhino at all
+	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+	# requirement of rhino
+	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+	# not packageable
+	"odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+
+IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive
+gstreamer +gtk gtk3 jemalloc libressl mysql odk pdfimport postgres test vlc
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+[[ ${PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	app-arch/unzip
+	app-arch/zip
+	app-crypt/gpgme[cxx]
+	app-text/hunspell:=
+	>=app-text/libabw-0.1.0
+	>=app-text/libebook-0.1
+	>=app-text/libetonyek-0.1
+	app-text/libexttextcat
+	app-text/liblangtag
+	>=app-text/libmspub-0.1.0
+	>=app-text/libmwaw-0.3.1
+	>=app-text/libodfgen-0.1.0
+	app-text/libstaroffice
+	app-text/libwpd:0.10[tools]
+	app-text/libwpg:0.3
+	>=app-text/libwps-0.4
+	app-text/mythes
+	>=dev-cpp/clucene-2.3.3.4-r2
+	=dev-cpp/libcmis-0.5*
+	dev-db/unixODBC
+	dev-lang/perl
+	dev-libs/boost:=[nls]
+	dev-libs/expat
+	dev-libs/hyphen
+	dev-libs/icu:=
+	dev-libs/libassuan
+	dev-libs/libgpg-error
+	=dev-libs/liborcus-0.12*
+	dev-libs/librevenge
+	dev-libs/nspr
+	dev-libs/nss
+	!libressl? ( >=dev-libs/openssl-1.0.0d:0 )
+	libressl? ( dev-libs/libressl )
+	>=dev-libs/redland-1.0.16
+	>=dev-libs/xmlsec-1.2.24[nss]
+	media-gfx/graphite2
+	media-libs/fontconfig
+	media-libs/freetype:2
+	>=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+	media-libs/lcms:2
+	>=media-libs/libcdr-0.1.0
+	>=media-libs/libepoxy-1.3.1[X]
+	>=media-libs/libfreehand-0.1.0
+	media-libs/libpagemaker
+	>=media-libs/libpng-1.4:0=
+	>=media-libs/libvisio-0.1.0
+	media-libs/libzmf
+	net-libs/neon
+	net-misc/curl
+	net-nds/openldap
+	sci-mathematics/lpsolve
+	virtual/glu
+	virtual/jpeg:0
+	virtual/opengl
+	x11-libs/cairo[X]
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	bluetooth? ( net-wireless/bluez )
+	coinmp? ( sci-libs/coinor-mp )
+	cups? ( net-print/cups )
+	dbus? ( dev-libs/dbus-glib )
+	eds? (
+		dev-libs/glib:2
+		gnome-base/dconf
+		gnome-extra/evolution-data-server
+	)
+	firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	gtk? (
+		x11-libs/gdk-pixbuf
+		>=x11-libs/gtk+-2.24:2
+	)
+	gtk3? (
+		dev-libs/glib:2
+		dev-libs/gobject-introspection
+		gnome-base/dconf
+		x11-libs/gtk+:3
+	)
+	jemalloc? ( dev-libs/jemalloc )
+	libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+	libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+	mysql? ( dev-db/mysql-connector-c++ )
+	pdfimport? ( app-text/poppler:=[cxx] )
+	postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	!app-office/libreoffice-bin
+	!app-office/libreoffice-bin-debug
+	!app-office/openoffice
+	media-fonts/dejavu
+	media-fonts/liberation-fonts
+	media-fonts/libertine
+	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+	java? ( >=virtual/jre-1.6 )
+	vlc? ( media-video/vlc )
+"
+
+if [[ ${PV} != *9999* ]]; then
+	PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
+else
+	# Translations are not reliable on live ebuilds
+	# rather force people to use english only.
+	PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+# FIXME: cppunit should be moved to test conditional
+#        after everything upstream is under gbuild
+#        as dmake execute tests right away
+DEPEND="${COMMON_DEPEND}
+	!<sys-devel/make-3.82
+	>=dev-libs/libatomic_ops-7.2d
+	>=dev-libs/libxml2-2.7.8
+	dev-libs/libxslt
+	dev-perl/Archive-Zip
+	>=dev-util/cppunit-1.14.0
+	>=dev-util/gperf-3
+	dev-util/intltool
+	>=dev-util/mdds-1.2.2:1=
+	media-libs/glm
+	sys-devel/bison
+	sys-devel/flex
+	sys-devel/gettext
+	sys-devel/ucpp
+	sys-libs/zlib
+	virtual/pkgconfig
+	x11-base/xorg-proto
+	x11-libs/libXt
+	x11-libs/libXtst
+	java? (
+		dev-java/ant-core
+		>=virtual/jdk-1.6
+	)
+	odk? ( >=app-doc/doxygen-1.8.4 )
+	test? (
+		dev-util/cppunit
+		media-fonts/dejavu
+	)
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	bluetooth? ( dbus )
+	libreoffice_extensions_nlpsolver? ( java )
+	libreoffice_extensions_scripting-beanshell? ( java )
+	libreoffice_extensions_scripting-javascript? ( java )
+	libreoffice_extensions_wiki-publisher? ( java )
+"
+
+PATCHES=(
+	# not upstreamable stuff
+	"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
+	"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+	# 6.0 branch
+	"${FILESDIR}/${PN}-5.4.4.2-poppler-0.62.patch" # bug 642602
+	"${FILESDIR}/${PN}-6.0.3.2-poppler-0.64.patch" # bug 653478
+
+	# TODO: upstream
+	"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
+	"${FILESDIR}/${PN}-5.4.4.2-gtk3-no-gtk-build.patch" # bug 641812
+)
+
+pkg_pretend() {
+	use java || \
+		ewarn "If you plan to use Base application you should enable java or you will get various crashes."
+
+	if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
+		ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
+		ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
+		ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
+	fi
+
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		CHECKREQS_MEMORY="512M"
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			CHECKREQS_DISK_BUILD="22G"
+		else
+			CHECKREQS_DISK_BUILD="6G"
+		fi
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	python-single-r1_pkg_setup
+	xdg_environment_reset
+
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		CHECKREQS_MEMORY="512M"
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			CHECKREQS_DISK_BUILD="22G"
+		else
+			CHECKREQS_DISK_BUILD="6G"
+		fi
+		check-reqs_pkg_setup
+	fi
+}
+
+src_unpack() {
+	default
+
+	if [[ ${PV} = *9999* ]]; then
+		local base_uri branch mypv
+		base_uri="https://anongit.freedesktop.org/git"
+		branch="master"
+		mypv=${PV/.9999}
+		[[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
+		git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+		git-r3_checkout "${base_uri}/${PN}/core"
+
+		git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+		git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+	fi
+}
+
+src_prepare() {
+	default
+
+	AT_M4DIR="m4" eautoreconf
+	# hack in the autogen.sh
+	touch autogen.lastrun
+
+	# system pyuno mess
+	sed -i \
+		-e "s:%eprefix%:${EPREFIX}:g" \
+		-e "s:%libdir%:$(get_libdir):g" \
+		pyuno/source/module/uno.py \
+		pyuno/source/officehelper.py || die
+	# sed in the tests
+	sed -i \
+		-e "s#all : build unitcheck#all : build#g" \
+		solenv/gbuild/Module.mk || die
+	sed -i \
+		-e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+		-e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+		Makefile.in || die
+
+	sed -i \
+		-e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+		-e "s,\$INSTALLDIRNAME.sh,${PN}," \
+		bin/distro-install-desktop-integration || die
+
+	if use branding; then
+		# hack...
+		mv -v "${WORKDIR}/branding-intro.png" "icon-themes/galaxy/brand/intro.png" || die
+	fi
+
+	# Don't list pdfimport support in desktop when built with none, bug # 605464
+	if ! use pdfimport; then
+		sed -i \
+			-e ":MimeType: s:application/pdf;::" \
+			-e ":Keywords: s:pdf;::" \
+			sysui/desktop/menus/draw.desktop || die
+	fi
+}
+
+src_configure() {
+	# Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+	# Note: these are for Gentoo use ONLY. For your own distribution, please get
+	# your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+	local google_default_client_id="329227923882.apps.googleusercontent.com"
+	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+	# optimization flags
+	export GMAKE_OPTIONS="${MAKEOPTS}"
+	# System python enablement:
+	export PYTHON_CFLAGS=$(python_get_CFLAGS)
+	export PYTHON_LIBS=$(python_get_LIBS)
+
+	# system headers/libs/...: enforce using system packages
+	# --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+	# --enable-cairo: ensure that cairo is always required
+	# --enable-*-link: link to the library rather than just dlopen on runtime
+	# --enable-release-build: build the libreoffice as release
+	# --disable-fetch-external: prevent dowloading during compile phase
+	# --enable-extension-integration: enable any extension integration support
+	# --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+	# --disable-report-builder: too much java packages pulled in without pkgs
+	# --without-system-sane: just sane.h header that is used for scan in writer,
+	#   not linked or anything else, worthless to depend on
+	# --disable-pdfium: not yet packaged
+	local myeconfargs=(
+		--with-system-dicts
+		--with-system-epoxy
+		--with-system-headers
+		--with-system-jars
+		--with-system-libs
+		--enable-cairo-canvas
+		--enable-largefile
+		--enable-mergelibs
+		--enable-neon
+		--enable-python=system
+		--enable-randr
+		--enable-release-build
+		--disable-breakpad
+		--disable-ccache
+		--disable-collada
+		--disable-dependency-tracking
+		--disable-epm
+		--disable-fetch-external
+		--disable-gltf
+		--disable-gstreamer-0-10
+		--disable-kde4
+		--disable-online-update
+		--disable-pdfium
+		--disable-report-builder
+		--disable-systray
+		--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system")
+		--with-build-version="Gentoo official package"
+		--enable-extension-integration
+		--with-external-dict-dir="${EPREFIX}/usr/share/myspell"
+		--with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+		--with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+		--with-external-tar="${DISTDIR}"
+		--with-lang=""
+		--with-parallelism=$(makeopts_jobs)
+		--with-system-ucpp
+		--with-vendor="Gentoo Foundation"
+		--with-x
+		--without-fonts
+		--without-myspell-dicts
+		--without-help
+		--with-helppack-integration
+		--with-system-gpgmepp
+		--without-system-sane
+		$(use_enable bluetooth sdremote-bluetooth)
+		$(use_enable coinmp)
+		$(use_enable cups)
+		$(use_enable dbus)
+		$(use_enable debug)
+		$(use_enable eds evolution2)
+		$(use_enable firebird firebird-sdbc)
+		$(use_enable gstreamer gstreamer-1-0)
+		$(use_enable gtk)
+		$(use_enable gtk3)
+		$(use_enable mysql ext-mariadb-connector)
+		$(use_enable odk)
+		$(use_enable pdfimport)
+		$(use_enable postgres postgresql-sdbc)
+		$(use_enable vlc)
+		$(use_with coinmp system-coinmp)
+		$(use_with googledrive gdrive-client-id ${google_default_client_id})
+		$(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+		$(use_with java)
+		$(use_with mysql system-mysql-cppconn)
+		$(use_with odk doxygen)
+	)
+
+	if use eds || use gtk3; then
+		myeconfargs+=( --enable-dconf --enable-gio )
+	else
+		myeconfargs+=( --disable-dconf --disable-gio )
+	fi
+
+	# libreoffice extensions handling
+	for lo_xt in ${LO_EXTS}; do
+		if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+			myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+		else
+			myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+		fi
+	done
+
+	if use java; then
+		# hsqldb: system one is too new
+		myeconfargs+=(
+			--without-junit
+			--without-system-hsqldb
+			--with-ant-home="${ANT_HOME}"
+			--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+			--with-jvm-path="${EPREFIX}/usr/lib/"
+		)
+
+		use libreoffice_extensions_scripting-beanshell && \
+			myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+		use libreoffice_extensions_scripting-javascript && \
+			myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
+	fi
+
+	is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# more and more LO stuff tries to use OpenGL, including tests during build
+	# bug 501508, bug 540624, bug 545974 and probably more
+	addpredict /dev/dri
+	addpredict /dev/ati
+	addpredict /dev/nvidiactl
+
+	# hack for offlinehelp, this needs fixing upstream at some point
+	# it is broken because we send --without-help
+	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
+	(
+		grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
+		source "${T}/config_host.mk" 2&> /dev/null
+
+		local path="${WORKDIR}/helpcontent2/source/auxiliary/"
+		mkdir -p "${path}" || die
+
+		echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=helpcontent2/source/media/helpimg > \"${path}/helpimg.ilst\""
+		perl "${S}/helpcontent2/helpers/create_ilst.pl" \
+			-dir=helpcontent2/source/media/helpimg \
+			> "${path}/helpimg.ilst"
+		[[ -s "${path}/helpimg.ilst" ]] || \
+			ewarn "The help images list is empty, something is fishy, report a bug."
+	)
+
+	local target
+	use test && target="build" || target="build-nocheck"
+
+	# this is not a proper make script
+	make ${target} || die
+}
+
+src_test() {
+	make unitcheck || die
+	make slowcheck || die
+}
+
+src_install() {
+	# This is not Makefile so no buildserver
+	make DESTDIR="${D}" distro-pack-install -o build -o check || die
+
+	# bug 593514
+	if use gtk3; then
+		dosym libreoffice/program/liblibreofficekitgtk.so \
+			/usr/$(get_libdir)/liblibreofficekitgtk.so
+	fi
+
+	# bash completion aliases
+	bashcomp_alias \
+		libreoffice \
+		unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+	if use branding; then
+		insinto /usr/$(get_libdir)/${PN}/program
+		newins "${WORKDIR}/branding-sofficerc" sofficerc
+		dodir /etc/env.d
+		echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
+	fi
+
+	# Hack for offlinehelp, this needs fixing upstream at some point.
+	# It is broken because we send --without-help
+	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
+	insinto /usr/$(get_libdir)/libreoffice/help
+	doins xmlhelp/util/*.xsl
+
+	# Remove desktop files to support old installs that can't parse mime
+	rm -r "${ED}"usr/share/mimelnk/ || die
+
+	pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
+	pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-office/libreoffice/libreoffice-6.0.3.2.ebuild b/app-office/libreoffice/libreoffice-6.0.3.2.ebuild
index e149e834e18e..f2f3c1674e61 100644
--- a/app-office/libreoffice/libreoffice-6.0.3.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.3.2.ebuild
@@ -70,7 +70,7 @@ $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
 LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"
 [[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 
 COMMON_DEPEND="${PYTHON_DEPS}
 	app-arch/unzip
diff --git a/app-pda/Manifest.gz b/app-pda/Manifest.gz
index 1a4f142b8cc3..1472ea0cd127 100644
--- a/app-pda/Manifest.gz
+++ b/app-pda/Manifest.gz
diff --git a/app-pda/iripdb/Manifest b/app-pda/iripdb/Manifest
index 466e4fd53343..2ee9c5b3e00b 100644
--- a/app-pda/iripdb/Manifest
+++ b/app-pda/iripdb/Manifest
@@ -1,3 +1,3 @@
 DIST iRipDB-0.1.3b.zip 32000 BLAKE2B 139affccb8545756c0d0e2652b7b1851b588aad3fcbcad04a88ccb517bcb10bd7aa4d46bc87885a6b32b0d27564bb98cde2bf21846140eb572f9c1953dba4d8a SHA512 7d3811e12a8570a07d2381bf6e97c9818b0da5b38dca95fc66441635343d827395d16fcdc7cea49179c062888ecbd88722f379ed59664919e10050618e66e8d5
-EBUILD iripdb-0.1.3b.ebuild 905 BLAKE2B ea9c3235a6ffb2a6fb3715bf03800d720112c7e7e19794d78b9874c7ab18e2c194747b92cfb45d129973d1118a5195a70325694f1ded65320dbef63ad8a077e5 SHA512 a89dece408039eb946b0c90a783b72c33a9ffa15827a5de98825e408e85dd8e109cc5969fff98f43c0d432be5ad3119c0dacf861e5fbf81f5ba4c60e4dfb2ddf
+EBUILD iripdb-0.1.3b.ebuild 887 BLAKE2B d78a18e257191ccd806246d15eaf126c6fb5068a8d4ccb3661a4c8391500e95c79b587c0970d39fabb5a2cde09f851c5b59f6d3db2f703eea96a1eee8b8ba80c SHA512 fe166c0d0beb43a1ace147acf86ecbb9d2a25646152ec62bdc603f718afcf73134b5aa82ddead10b68ca5e458f74f9bd55f661119d03e533366c90f444056e69
 MISC metadata.xml 579 BLAKE2B 264497ce16f001b7fb8c86880829d553ca82bdea0e6f6d41910b850369471dac9b41c9d8e937ff5abe278f1e1758d2541e0814db8937da195ebddb837ac3efa6 SHA512 b3c40a10ecbb9a7d700b37172c9ce5917554a89a5e3d0c88f1b7032f08b7187f0cb09bcb91288330715d3d4f19078ec639e3e56ac1f33c334ec16dc59a59e011
diff --git a/app-pda/iripdb/iripdb-0.1.3b.ebuild b/app-pda/iripdb/iripdb-0.1.3b.ebuild
index a5b9d46edd14..f2d2e3a24e2e 100644
--- a/app-pda/iripdb/iripdb-0.1.3b.ebuild
+++ b/app-pda/iripdb/iripdb-0.1.3b.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=6
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 MY_P=${P/iripdb/iRipDB}
-S=${WORKDIR}/${PN}
 
 DESCRIPTION="Allows generating the DB files necessary for the iRiver iHP-1xx"
 HOMEPAGE="http://www.fataltourist.com/iripdb/"
@@ -22,6 +21,8 @@ RDEPEND="media-libs/taglib
 DEPEND="${RDEPEND}
 	app-arch/unzip"
 
+S=${WORKDIR}/${MY_P}
+
 src_compile() {
 	echo "$(tc-getCXX) ${CXXFLAGS} -c -o main.o main.cpp"
 	$(tc-getCXX) ${CXXFLAGS} -c -o main.o -I/usr/include/taglib main.cpp
@@ -30,6 +31,6 @@ src_compile() {
 }
 
 src_install() {
-	dobin iripdb || die
-	dodoc AUTHORS README doc/iRivDB_structure || die
+	dobin iripdb
+	dodoc AUTHORS README doc/iRivDB_structure
 }
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 03cf661accb8..12e44b9e9c09 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/gentoolkit/Manifest b/app-portage/gentoolkit/Manifest
index 99af562b45d2..9b7d5b4bc620 100644
--- a/app-portage/gentoolkit/Manifest
+++ b/app-portage/gentoolkit/Manifest
@@ -5,6 +5,6 @@ DIST gentoolkit-0.4.2.tar.gz 3215652 BLAKE2B 97b4dcac7293b50161169a6c777623cb1c5
 EBUILD gentoolkit-0.3.3.ebuild 2190 BLAKE2B 14e659c8159365d4d1317952cff7241f5629571b7264018b082dd4aee393a4414b3d97b101f26a252a3dfd8f372e2711c9857033e5e0c68f675cf33996104b0b SHA512 6f95f1af8e2ae139ef6058b3798f75e331890bc05efb8abb4cc3c0e4014176424a424e9663f748f3cbae510186d8a7dce1b9d11e0813aa5e65ac9e4ee6d3aaa8
 EBUILD gentoolkit-0.4.0.ebuild 2164 BLAKE2B 7a4d91380523e5355a68e4320907375e49b69acd3f48a549a46576277da776c5be47113828f757affe0439b6803a2a0ebef7c7f6a7c4438f1800584e4439d321 SHA512 aa0fe594f28562a24ee73cb2eae52f1797758ec4c80d0db24f52de3f81aac7a64de5f59b6b273ce4f84d88a88b058f0f880b5498fc118e4b2f4572c459b99fca
 EBUILD gentoolkit-0.4.1.ebuild 2180 BLAKE2B f141489aaf43bf65d686166a4fc66f1acb58c16d4eab35566d323077ad8730b413f11beed94af79f03f30b1daf7bf6954d2b0ef791504c7f47c3c90e222e506c SHA512 92016e7cab3aa9c2a2fcdc42d9958f47a1bb41da5c88664128aeb0c9a86fa00ff79c99cb100be03f056df23a506e2e52b6b4068b828885ee08173a4ef4404726
-EBUILD gentoolkit-0.4.2-r1.ebuild 2219 BLAKE2B ffea1f1091baca733452321ae072345969b914d5536ef03532160415eafc23dd242f5f62858475acdcf6581b7551eeae2ee8c967ca10e9c29567677b6bd830fd SHA512 e67c0c0b7d1ebcddd922f2af1fe0a8934db7ee119d86a4d7a39e51772cb56470cd2457caefe357e8536228aaf2b3e3ceca7442107a8415f5b74b90f085619185
+EBUILD gentoolkit-0.4.2-r1.ebuild 2217 BLAKE2B 4f2702930b38cba570b739c0c632814c4e403fee361cc9044096119445210b9d5011cb56c765d1dc65af360606e0adc1bc1b673b0549de5d92ca39b6a7bcc078 SHA512 08ee7bd0c6fa6ff7b7e22714e06dcb3d446b0ec682560411fdae87371ae8e99db6cdfa5cc1379db8326ee3374582357bd5e381ecd376575f17dbdbf9e5e1928e
 EBUILD gentoolkit-9999.ebuild 2038 BLAKE2B b73ca2d3af0a6d7adf65e489cceb6bd4ff29c61e2e657dd28c0ab17e3050cc1031d0db237ff9467dc80f3c463ad0c1f3efdd9ec5d13f35ca0983a435c61329d0 SHA512 d0110f470a871858b3ffad3617714db71b1b015c72fc9f3c39921f3c4b6ab80192c1b060f2de3fdc673a8a8ccca7b5be92a43fb52b5dfe664d832ae093bec7f2
 MISC metadata.xml 558 BLAKE2B 2ede18c080565469ba0be5ac6f2e34ab02f9367947ef1e380deed006c5ca2900468e142ee1d7c8664d62ed49caeb64069726f0426251a00d48a848af745128b4 SHA512 8e57275ae720065361529af42999f9bfe871007e45592ee6f539eec4ce61e6b141f44c65316ee10798bfaecc86a814fa18353becbb31ffc5e2c38df100ac3704
diff --git a/app-portage/gentoolkit/gentoolkit-0.4.2-r1.ebuild b/app-portage/gentoolkit/gentoolkit-0.4.2-r1.ebuild
index 9307a8289711..397ca68d4220 100644
--- a/app-portage/gentoolkit/gentoolkit-0.4.2-r1.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.4.2-r1.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="
 	|| (
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index f2afad0da974..b36dc0162199 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/gentoo-bashcomp/Manifest b/app-shells/gentoo-bashcomp/Manifest
index 64a3acf0ce7d..7ae3c2f0fa64 100644
--- a/app-shells/gentoo-bashcomp/Manifest
+++ b/app-shells/gentoo-bashcomp/Manifest
@@ -1,4 +1,3 @@
-AUX gentoo-bashcomp-20101217-make_globals.patch 312 BLAKE2B f925ccb9d618200d4922c78ebe14e7ab5abd4bf22657e4d6b6f0ef4a943c59b2337e18e4f103b017c0be037bacb4d0027dd37a58c24d378a20a536a92a26b88f SHA512 52c57defde061ab2c28521a601e840cc6e00f4be3ea438edee7089a9ca98e6c540148c5da51744fd6108742b3d219997c93810bfc6f42ade29629ccb90b09af6
 DIST gentoo-bashcomp-20140911.tar.bz2 30258 BLAKE2B c41814a51b74b169dc0e92e4af0630a152145f9d8fd81afb29c5c6e28d9c80caf3a57450a02a7f653762a0c91c8e1639f101e7749761b68e75482dad8e303467 SHA512 cacd1c3353bce7e67d00758a714829860111932ab7addd0a84a06cae9218ff18aff4ea562e0682ca4db859408ca15817edd81548d54144223ed5016667549f7f
 DIST gentoo-bashcomp-20180302.tar.bz2 21485 BLAKE2B 887ac5cfa8c6ba431a6aa5f5918b8bdfbe6a1ae9a2e7ac21b3c06ec2062b448d924f928b1372e81749ece6d4aa673bbbaaa364ca744124c842e3819349917169 SHA512 6b4551b078505e6348cb10ca2d67faab4d323a0f0ddefc872145314303d6f95fe31f9706d43d9f20c0139610ce47e4cf70ba7516d911dc4927cfbf5d863bc063
 EBUILD gentoo-bashcomp-20140911-r1.ebuild 867 BLAKE2B 2aad70a398381b631162623f63b178ab0a73b07d9aa2689e45acdf3ed3fab6e06b974e20f76c9ee20a5ee3247b6adaf1dd412957d6719149fbe4232ca32ac6e0 SHA512 d3ad74a641ece757a9431aff9d541a7178d53e6b30f79a6325548412eba958e42eea178c413e6eb80d6cecf04fb864dd0ed5622e91b20bb5e602e162ae52341b
diff --git a/app-shells/gentoo-bashcomp/files/gentoo-bashcomp-20101217-make_globals.patch b/app-shells/gentoo-bashcomp/files/gentoo-bashcomp-20101217-make_globals.patch
deleted file mode 100644
index ff5262cdabf2..000000000000
--- a/app-shells/gentoo-bashcomp/files/gentoo-bashcomp-20101217-make_globals.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/gentoo
-+++ b/gentoo
-@@ -21,7 +21,7 @@ have()
- _portdir()
- {
-     (
--    source @GENTOO_PORTAGE_EPREFIX@/etc/make.globals 2>/dev/null
-+    source @GENTOO_PORTAGE_EPREFIX@/usr/share/portage/config/make.globals 2>/dev/null
-     source @GENTOO_PORTAGE_EPREFIX@/etc/make.conf 2>/dev/null
- 
-     echo ${PORTDIR}
diff --git a/app-shells/thefuck/Manifest b/app-shells/thefuck/Manifest
index 3999d77c4f4f..5ce61e2a6f36 100644
--- a/app-shells/thefuck/Manifest
+++ b/app-shells/thefuck/Manifest
@@ -1,7 +1,3 @@
-DIST thefuck-3.24.tar.gz 1360450 BLAKE2B 38a4a0484220eb92e75d164958f7a1db9d3828268a352da7a99ea79487869a39c88cdb65a315a49f71cd70a8d3ce488b1b692c241dff7329fc27c16ba33ce81f SHA512 d4949ea723cf3b080f2fbe269d0cafe3d0266089fa8cc515b3b9376b2004c045be82716cd219741a60a0e99c20575adb92339a879467f709f7ca03dcc71a5c2d
-DIST thefuck-3.25.tar.gz 1362279 BLAKE2B 52b3f1c8756b6981c0528fd77c18256957dd5d628ea37801b9c9abf6114e1cef8af53d9d1dd50fc7c88fad7bd628dc8373aa70dbc6933c07c63b7da31eb5d95a SHA512 c7b215358c09e1fa5e6aae519e7d6c3fd50027b4c72bb1c128786cd2cff707196f2b9b2a23dfed34d841874caab9463791e82c9083f6aac9c90f26d12a4d4598
-DIST thefuck-3.26.tar.gz 1365778 BLAKE2B 3266fc5a1e351df1ccd13bfb6def6254194a05a94c7bf2bdcafb9c75414fce23b479eb1ac866333e8aef7d51bc609fc00aad8508e4cf0f0d959632744330e734 SHA512 2dbcc7ba0adb24b3f7d80d0c575a4ed515508e0ab5bc2fc4eb9ba82ad36325af1784eb9c241794ce0e038ed8e99042eb21cc3b29eeaa273517aebc7205ab787f
-EBUILD thefuck-3.24.ebuild 933 BLAKE2B 64618609cb8d25f97c5b71405095930c70e60ea3294f2242a1e9a08e23a921e97df858b516fe4aa9f3c033e9559272a9e5a0310e040d51ae4eb81f72b05b582d SHA512 5c8c06a1ddc030a158a8234f4434c23748255ce8573d99e77ffe40489ed43d9a16a78aab0aa97c1cb0f4699ab4e7adaec14a361b120ca3e665e28a06ba992e65
-EBUILD thefuck-3.25.ebuild 956 BLAKE2B ff08de5123ca03f5bc19ac1e064a142d889a6f4879737dd2df8e1b30e16ab171421a94072c72d9842a0b4007c3f113d7df179af2bc2ea97c3bda95fb64852749 SHA512 0bfa52d5e7177176708a7435c3fb701022b9acefca1a72a211436748e55f2127d7613bffdc167c9083223ce47e175cfd7970bc1febb5a1fd6e74f03ec2461d34
-EBUILD thefuck-3.26.ebuild 956 BLAKE2B 6e48c054c7c811cb41f13b3504b09aae95ca1a99767d586432c31a3b55afbffdd7d23614e47656c760ebd8aa844f907244beb4dd1ee543513f5dd565d4aa4ce1 SHA512 f6fb58aa9d7fb25e16049eb6659079a2c6d786d62d381aa7b63807eebe778d1125ee0aab7bf676c722ec2fc9ced932d2f84d26d930cc79bd89afae0af5c4d911
+DIST thefuck-3.27.tar.gz 1367120 BLAKE2B a840ac3e8f6807df632948e2fe2789a47bdcfececfd4a9bb0f1836bbaa641501e13c559221b9a2f25bbd93505c8b03db102636e480ece116a42c46f341d5cd35 SHA512 766c589f0e99a9773e74094e91c6a74d00e5be8b7241680ad664ecc3f549b597416bc7a4d289f399ed3a0d9ccad629ed78bb983edc809664c303c687ea1eec1a
+EBUILD thefuck-3.27.ebuild 956 BLAKE2B e75778707fb78994849b97f7f76c561795815583362b86b605ab78c39315916b9eab7610e9f1d2cd2681a5615cfae7ccf8e9602a32fea7d8536e79fc9e7306d5 SHA512 323bfdd7279ef3a4bf7660d74f9c03bdef4aceb011d442c35ecc7f779c9c14bb5bf1ee4d0f518740b21932ddb4de3d4d8146de18eca6d73eca955059b2a742ab
 MISC metadata.xml 443 BLAKE2B e698b6282592adbd65ea14725b58f32ac24ae0549e6b937b26084d043bcb74204c89f409ae32af0078ac073765a69e5f585e4ad1225a01d39defc1a54ff86798 SHA512 809474eff24118e6ae74bcefac2cd653cb9aa04a06fbe59e430bc291e2fc7ee87d0463967d1c1382ea8b69853c455f680a858d837b68ea8206a66739903b1452
diff --git a/app-shells/thefuck/thefuck-3.24.ebuild b/app-shells/thefuck/thefuck-3.24.ebuild
deleted file mode 100644
index 59434fe1c280..000000000000
--- a/app-shells/thefuck/thefuck-3.24.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=(python{3_4,3_5,3_6})
-
-inherit distutils-r1
-
-DESCRIPTION="Magnificent app which corrects your previous console command"
-HOMEPAGE="https://github.com/nvbn/thefuck"
-SRC_URI="https://github.com/nvbn/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/pyte[${PYTHON_USEDEP}]"
-DEPEND="test? ( ${RDEPEND}
-	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/pytest-mock[${PYTHON_USEDEP}] )
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	sed -i -e "/import pip/s/^/#/" -e "/pip.__version__/,+3 s/^/#/" setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	py.test || die
-}
diff --git a/app-shells/thefuck/thefuck-3.25.ebuild b/app-shells/thefuck/thefuck-3.25.ebuild
deleted file mode 100644
index 7c1efbcfc504..000000000000
--- a/app-shells/thefuck/thefuck-3.25.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Magnificent app which corrects your previous console command"
-HOMEPAGE="https://github.com/nvbn/thefuck"
-SRC_URI="https://github.com/nvbn/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/pyte[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	sed -i -e "/import pip/s/^/#/" -e "/pip.__version__/,+3 s/^/#/" setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	py.test || die
-}
diff --git a/app-shells/thefuck/thefuck-3.26.ebuild b/app-shells/thefuck/thefuck-3.27.ebuild
index 09a7b70b6e7e..9216446f6ddc 100644
--- a/app-shells/thefuck/thefuck-3.26.ebuild
+++ b/app-shells/thefuck/thefuck-3.27.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python3_{4,5,6} )
 
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 173a1c1ad689..3bab3f710f41 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/convertlit/Manifest b/app-text/convertlit/Manifest
index b37c2cb3aeb3..5dd4ee06cd3c 100644
--- a/app-text/convertlit/Manifest
+++ b/app-text/convertlit/Manifest
@@ -4,5 +4,5 @@ AUX fix-Wformat-security-warnings.patch 936 BLAKE2B 636599eb3840f5ea084dd60fd96f
 AUX support-ar-variable.patch 408 BLAKE2B d3649dcc362cb54a67eba34b9b6bfc6a52a22cd0ed33de95aad3cd5dad75729c35c45b8817e9c64040b3ea4baee876b456121a7e55094f0ceb01aabf4d6a2a8b SHA512 8d807507cccc58979092becb1725d4871f62746f06b3d4ac8740a0704019d3900cd60098497a0d770fcb9bab68e9bf34dc50219afda0995209ea88a71b084ce6
 DIST clit18src.zip 135120 BLAKE2B b2c47c03df2cee8779f50eee1a19f46907fa966165629d17fb25c66e5bf7b68b6ada6efa1790d36deb6a10f69c17ec7ef2cc66551796cbba04a3f2f7e5e3294d SHA512 0d4b7d525f5164a73a47a00e1c4e93ff50e738a4e6c541ded283c4779e6a67138f601c23a41344517ca5d7f8c9141b25cc6edc7f3967fbf9042e99f647354f36
 EBUILD convertlit-1.8-r1.ebuild 890 BLAKE2B ac2ce2273bbf2a05fbc2499ddf6a2216e8e2810dfa212f93a7e5f0796c107eb6ff259ad05e08d300eb3d7054c569615c3abfe5d17f0cd5a7cb84761da689e33d SHA512 61059c578fa28ddd7b3ecbac807f36f7ca2b58d662a233fa80c4645ec81c928011b8c1a4a7a4d53598cf1d76bef42da06d6eb901b713eb70ca04d0632cfefc9b
-EBUILD convertlit-1.8-r3.ebuild 952 BLAKE2B 4a3e691a0661c929deb00b4bdac01b084d2886d789352365ec45837ba2173285681be0db3359353a6608d88331a8a419918d63141805682ce4f544c7776e8ae4 SHA512 0a5be146651d106f70741ee66b32c6365689456b83f07e01dd19f393b68890cb5c80364ec135568c962560796cf97b722172dcf3aa32504eb492b197db2fe273
+EBUILD convertlit-1.8-r3.ebuild 951 BLAKE2B 710d2cea0762a47128c8ab78b49ff4d7d3000d986d83f8a14fc5bd9b7aaf2fc029017f5ee7c546cd9100230a2cade1dc4a885af41af85983747bbe601d892a9b SHA512 b95136ce98aeb00b1bcd455984bcc1f2605afac35364e6b7c17558aac169f99eceee28ac1bf1c755ccde14057a42dbdade005fd8a77e26c876baf0fb00e9c196
 MISC metadata.xml 562 BLAKE2B 65f7b124b050f42c8c6f800e2e05d2e9404869c42a1217e0d280895d52d8f2588f37bbb4a696cffb58129f080580aee9cbca83740e888ccf9d272a8162a053ef SHA512 1264f1669bece35fbd465ebf7911c7d416d85d092aa6e1601b240728fc2a0cb521d913e3bae08962fc5e70c2b70ee17989191e0bc21f04c9c1ed30592ff4820e
diff --git a/app-text/convertlit/convertlit-1.8-r3.ebuild b/app-text/convertlit/convertlit-1.8-r3.ebuild
index 40bbd4f65e5b..7befeb7eb306 100644
--- a/app-text/convertlit/convertlit-1.8-r3.ebuild
+++ b/app-text/convertlit/convertlit-1.8-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.convertlit.com/${MY_P}src.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 RDEPEND=">=dev-libs/libtommath-0.36-r1"
diff --git a/app-text/coolreader/Manifest b/app-text/coolreader/Manifest
index f655328d0979..801284577731 100644
--- a/app-text/coolreader/Manifest
+++ b/app-text/coolreader/Manifest
@@ -1,6 +1,7 @@
 AUX cr3.1.2.71-r1_qt5_wx.diff 10066 BLAKE2B 8b1ecc7765735608e9651f23d1d9882186766e34c0ac5f9cac1312da68345d7a9028abaf9792f4ee85a4ddb5490fa1521d220b751eeeda84aa5ac79d92d33e88 SHA512 9f7a82964d1f5c308ad5124433dd0ed7debd715f1c0c2431bc84c9bf71d1d5dbbfb82a669b1c6ee114196c5e8ba1b745b07cc2195d4198c664ea15cf82182384
 AUX cr3ini.diff 1535 BLAKE2B 1eb5908bedf2a706d461ed84a60ed3232a4c98bee5d4b29c55e63d780d54785a1e3f77e9eb85d0675ac0efeb1652d505e9cef93b9c7dce39086c3b0a3f765c6b SHA512 efd7bfda3617168bda2bfad9e561b7bf3de89f141cf4155618bc6864fa5497d5b0e08ea583b302f4e9e3f60442472c7e5358313dd49549dce3fe078d58ee4ee5
 DIST coolreader-3.1.2.71.tar.bz2 10141514 BLAKE2B 143a69082a2dcabbb7a246df575e7ed2fddb4b11c542910faa2f6d44155f0de8ba6d7e0fd321b53fc0eda47c8d2867bfec02af3b95edbcb623f6a15fa6c4bc72 SHA512 2859eabfc8ba603d1cb09b07358887135b6968268a5f2fa7f874a1e8613d1b5ebe69d9b133f16e84321d1a460eae5088a7947433c6fb340a47bde9ceee415735
-EBUILD coolreader-3.1.2.71-r3.ebuild 1661 BLAKE2B 00ff6e9c7a6e73f09e1c7a7197c2476545fe3424d7325e4a1d5cec3bdebdc505c146890303738d406c4c82bc16173ab510713ef5e7400c5a43b5b84d92433791 SHA512 72c1a9b718ce1b165e410b40907c45c826d04b2cb5fe87c6c215de46dc6dc5dd8f32740297abccd226477621b31a8d4270616e938d994f8e67248f39566b4365
+DIST coolreader-3.2.2.1.tar.gz 12463566 BLAKE2B 208026a87b36a06cd0a2e83b60bb506174b2edec4e3f4d1663c9d630cf316afd54aa0dbd0fdf0d3e44e03277d39692bbada8b03376a22970321928e594632997 SHA512 c2e3ea139ff3969c16985a56a9605a59ae31c59f9dc962abcc4aae5d87b8c48c8d7ed716a7077dd9da93cefc0d9ba0fe8a43c50e33e3d58acbcdfc35b73b3538
 EBUILD coolreader-3.1.2.71-r4.ebuild 2366 BLAKE2B 94049adc28a85bbba7648a992ae1975307816f477d15fbd48343314a99504889ed22e1d4ebd7379620b295a1e378675c0a331f41a144045ee6cd060caeb08628 SHA512 21be4a384808ca943d2278fe592c3acbbce7ea6951000efe107cb744b937c8b68c32fe2f8824abcf32c41343e835265bed865e7c5a01bef7d0d77a83093d7f43
+EBUILD coolreader-3.2.2.1.ebuild 2020 BLAKE2B 17bc4cfc083d7bb30ea67b98a0dc700695823b8a39e0fc20ff4b4ae80178c5207c60838874a80a23cbbf99430d7b1b26e39b430b94d4e870b981eefed46ec961 SHA512 f8b5daa8dc76471bce823563f53e9e3810c9530a58dde042400996b73ba636b8a726115b72b2666b561a9f419865e5e56c227d94034292c5aa7edd557451fc27
 MISC metadata.xml 624 BLAKE2B fa86114594d823c9b73b590ebfa0ffe74955550f1d66b5f1197672484d4095be484f5f8f754acef06e34f9d69d658609653109bf8499235439bb1f3ad95b7be5 SHA512 33e57dbe75c3e2efaf1d793dad06b534fac861b3ffd25e4d441af91b8d6a8cae96b8d5c19bbf0845aa78ff404eee167998e09f948009b4ce1902a2f38625f9a8
diff --git a/app-text/coolreader/coolreader-3.1.2.71-r3.ebuild b/app-text/coolreader/coolreader-3.1.2.71-r3.ebuild
deleted file mode 100644
index 9c7e43e5f3f1..000000000000
--- a/app-text/coolreader/coolreader-3.1.2.71-r3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WX_GTK_VER="3.0"
-
-inherit cmake-utils wxwidgets
-
-if [ "${PV}" == 9999 ]
-then
-	inherit git-r3
-	# github mirror has some new commits to fix page margins settings
-	# sourceforge mirror saved as backup
-	#EGIT_REPO_URI="git://git.code.sf.net/p/crengine/crengine"
-	EGIT_REPO_URI="https://github.com/buggins/coolreader.git"
-	SRC_URI=""
-else
-	# git tag cr3.1.2-71
-	SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.bz2"
-fi
-
-DESCRIPTION="CoolReader - reader of eBook files (fb2,epub,htm,rtf,txt)"
-HOMEPAGE="https://sourceforge.net/projects/crengine/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="wxwidgets"
-
-DEPEND="sys-libs/zlib
-	media-libs/libpng:0
-	virtual/jpeg:0
-	media-libs/freetype
-	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} )
-	!wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )"
-RDEPEND="${DEPEND}
-	wxwidgets? ( || ( media-fonts/liberation-fonts media-fonts/corefonts ) )"
-
-# 1st patch: To save cr3.ini to ~homedir.
-# 2nd patch: To build QT5 and WX GUI version of coolreader3;
-# setting correct vesrion number and years of cr3qt/cr3wx;
-# internal switching between wxGTK 2.8 or 3.0 version;
-# show wxWidgets version in "About" dialog window;
-# disabling "iCCP: known incorrect sRGB profile" warning popup window for wxwidgets GUI
-
-PATCHES=( "${FILESDIR}/cr3ini.diff" "${FILESDIR}/cr3.1.2.71-r1_qt5_wx.diff" )
-
-src_configure() {
-	CMAKE_USE_DIR="${S}"
-	CMAKE_BUILD_TYPE="Release"
-	if use wxwidgets; then
-		setup-wxwidgets
-		local mycmakeargs=(-D GUI=WX)
-	else
-		local mycmakeargs=(-D GUI=QT5)
-	fi
-	cmake-utils_src_configure
-}
diff --git a/app-text/coolreader/coolreader-3.2.2.1.ebuild b/app-text/coolreader/coolreader-3.2.2.1.ebuild
new file mode 100644
index 000000000000..3d97d3b6b4e7
--- /dev/null
+++ b/app-text/coolreader/coolreader-3.2.2.1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+WX_GTK_VER="3.0"
+PLOCALES="bg cs de es hu pl ru uk"
+inherit cmake-utils wxwidgets l10n xdg-utils gnome2-utils eapi7-ver
+
+CR_PV=$(ver_rs 3 '-')
+
+if [ "${PV}" != 9999 ]
+then
+	# git tag cr3.2.2-1
+	SRC_URI="https://github.com/buggins/${PN}/archive/cr${CR_PV}.tar.gz -> ${P}.tar.gz"
+else
+	inherit git-r3
+	# github mirror has some new commits to fix page margins settings
+	# sourceforge mirror saved as backup
+	#EGIT_REPO_URI="git://git.code.sf.net/p/crengine/crengine"
+	EGIT_REPO_URI="https://github.com/buggins/${PN}.git"
+	SRC_URI=""
+fi
+
+DESCRIPTION="CoolReader - reader of eBook files (fb2,epub,htm,rtf,txt)"
+HOMEPAGE="https://sourceforge.net/projects/crengine/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="wxwidgets"
+
+DEPEND="sys-libs/zlib
+	media-libs/libpng:0
+	virtual/jpeg:0
+	media-libs/freetype
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} )
+	!wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )"
+RDEPEND="${DEPEND}
+	wxwidgets? ( || ( media-fonts/liberation-fonts media-fonts/corefonts ) )"
+
+S="${WORKDIR}/${PN}-cr${CR_PV}"
+
+for lang in ${PLOCALES}; do
+	IUSE="${IUSE} l10n_${lang}"
+done
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# locales
+	l10n_find_plocales_changes "${S}"/cr3qt/src/i18n 'cr3_' '.ts'
+	local lang langs
+	langs=""
+	for lang in ${PLOCALES}; do
+		if use l10n_${lang}; then
+			langs="${langs} ${lang}"
+		fi
+	done
+	sed -e "s|SET(LANGUAGES .*)|SET(LANGUAGES ${langs})|" \
+		-i "${S}"/cr3qt/CMakeLists.txt \
+		|| die "sed CMakeLists.txt failed"
+}
+
+src_configure() {
+	CMAKE_USE_DIR="${S}"
+	CMAKE_BUILD_TYPE="Release"
+	if use wxwidgets; then
+		setup-wxwidgets
+		local mycmakeargs=(-D GUI=WX)
+	else
+		local mycmakeargs=(-D GUI=QT5)
+	fi
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
diff --git a/app-text/libabw/Manifest b/app-text/libabw/Manifest
index b5b56bd2fdcf..d7884301bb99 100644
--- a/app-text/libabw/Manifest
+++ b/app-text/libabw/Manifest
@@ -4,5 +4,5 @@ AUX libabw-0.1.1-do-not-let-AbiDocument_parse-throw.patch 1308 BLAKE2B 9e368b07d
 DIST libabw-0.1.1.tar.xz 287628 BLAKE2B c8873512d7bb4c6594330dd35f044a6d6fb7bd07f4b915b5f0d0752ae36c9c6d2c8a5e7e7f66947fb5c27256e0701214b3fe171e1f52c09cfd42bbf106bc689e SHA512 853dd86ecc79e8590d3163e05e145ad66240ae3cf12d206d021775a94bfb33d70aa5acdcdd193ac747baeae1ba0eed18099ea6f4515be23bdd70b431e96c4b1a
 DIST libabw-0.1.2.tar.xz 318400 BLAKE2B ba25542da0d6568530241892dbdba72d2b0dcf667b50e0c1a4e656e0facf82bf77ca8eff8db4d6e57ab699f12d8dad511d32aee291541ffe6460b2ee98590b68 SHA512 a365c1aa047a97a86eee6bce8463646bdf248a51013139ee288402a832fd545586e072d7c7fc11a56f42e3637de9e922197be20d0587e53c51fd80ced409a6cd
 EBUILD libabw-0.1.1.ebuild 1058 BLAKE2B ceee966d4dd894802d115d3c7ae7c2bc40c2c2656666c274005c056fcfd932ff03422dd6da0874a9ed6eb6d0174fc9b0dbd53f38fb9c0db58639b487608c6338 SHA512 3fefdbbd95e93c934c634798f0dc6a00eacee90f0fc53967d3a3b1685cdd49f37787c903192b9e0ede7e160e5fe9fe70183107c0a6a114e970b92fd79b7c95d8
-EBUILD libabw-0.1.2.ebuild 853 BLAKE2B 16b75b057b34b7f75737e476ed5d31dad97e68540ff3e5955a9a8a1a0bd675e7ade5833c380149710de925d44250f5f77f42535dfbc8469a0011e5c62a265d25 SHA512 a0330285444077fceb262c242de4ca30c7edd8a12bd3e674be1243605156f5463e75a966ff9a1e60d7f5911bb11daa2764736f4907ea3fd195861481593ad1cc
+EBUILD libabw-0.1.2.ebuild 852 BLAKE2B 94986c5e7647b8a7950d4a3f585b061dba492ac1009d59bfce03e8e5dd5fab09bce7a86c738ac1924a85db88675655aaba5b2fae1e888bdb9a777408edc1d937 SHA512 d31164f1070df9c60e38dbc06b87786d4fe94a5913b3aed776d007fc899633d48bcef3a9df97ce7355d3183d077c768464aed74adf0769b34f222c16c55c0849
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libabw/libabw-0.1.2.ebuild b/app-text/libabw/libabw-0.1.2.ebuild
index b9c4771fff78..93e138cf1a8e 100644
--- a/app-text/libabw/libabw-0.1.2.ebuild
+++ b/app-text/libabw/libabw-0.1.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="doc static-libs"
 
 RDEPEND="
diff --git a/app-text/libepubgen/Manifest b/app-text/libepubgen/Manifest
index ac769485786c..a014671ca342 100644
--- a/app-text/libepubgen/Manifest
+++ b/app-text/libepubgen/Manifest
@@ -1,3 +1,3 @@
 DIST libepubgen-0.1.0.tar.xz 319652 BLAKE2B e6573e0a680711380ac3d2ef742413e38030e76dc50639f9659544e7410f7d7f987cdf1aa20cf2f2afa924bbcbecaf7141225d387fc509d0db6387cd144cb16e SHA512 6be431d06321807991048567aebd7111359f8aa364fe33e651c991553f832c03ad3bb3520b9f7e8d72a861a9ebd84483587becb9062e226bcd1d8ade1819b4a9
-EBUILD libepubgen-0.1.0.ebuild 675 BLAKE2B 87ee7ffe4da10a26de7aa11a25f794b5cd1cddc200dcd011df9ef09928a68ab90905380723c1b75fc168280258fb46ed1c6c88b6bb1ca4bb0230c95b575fa26e SHA512 550f45e446f2ae7f197da486701d1bd3a7248c223619adbe1c6a6ad854f7428805365ddb7499db54deffbeb56479d1a00741a394c3e996bbc09867a8b5a0c3c0
+EBUILD libepubgen-0.1.0.ebuild 674 BLAKE2B 563971c76c09a53136e140609726687a71ecdd2008a109b2a3ed4a502569ef9341955ee6136ca2815aca46cc1baaa9fa6930ba96bc178c1f473932031ef9912c SHA512 5b849eff3bd74fd9897ab7f6c910c228af46a22a2eee55497a79107b8109c9a44ee3c0c4d2075aa92a7e4ac2047231e462b14a2d9394e79c17c016d09ffbfac8
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libepubgen/libepubgen-0.1.0.ebuild b/app-text/libepubgen/libepubgen-0.1.0.ebuild
index 0a3637ac432a..5b922895aa50 100644
--- a/app-text/libepubgen/libepubgen-0.1.0.ebuild
+++ b/app-text/libepubgen/libepubgen-0.1.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="debug doc test"
 
 RDEPEND="
diff --git a/app-text/libmspub/Manifest b/app-text/libmspub/Manifest
index 6a320f706ffd..a267933e8b27 100644
--- a/app-text/libmspub/Manifest
+++ b/app-text/libmspub/Manifest
@@ -1,6 +1,6 @@
 DIST libmspub-0.1.2.tar.xz 345556 BLAKE2B a3b47fb188fc859abf54e3375514d31a1fafa21fb57fe0ac4a20013741a223a7011adf8ce7784b61346b49e9f4c0b6c353138dc12a5035f7bcc24576a508aa50 SHA512 c19025a2b887c33f5966b0972204ab2a8ae841b82df38eaf53c0cdc8f99d93cccab5e1c78143a79d5aef9c7a7387bd6f2cf34833a00861058e0e4687f48be714
 DIST libmspub-0.1.4.tar.xz 377472 BLAKE2B 89bd994a5aa2b3a22681dfe78fcea19561ea6057210e61630fa904ded12cca4694d715dd8f2fe8f687a91951bfa2f7aec1ff11d0b978a517476545bb07f654dd SHA512 7275f890645961b3fd56df4584788962e8c064fe3f99f5834c6ba6177ce76d00d544fbe9a25b7ab2f4180d2f3a90c609fe0bb68d61ea24e95b086190390fff31
 EBUILD libmspub-0.1.2.ebuild 1167 BLAKE2B 41b323d700a9a2096a7b5f265df9d6511605b8bc0940f0ef47380a27125ae07f32deac57dad92ace14beebe211cea81b1350e5a74d866fe9ef826dda69d8552e SHA512 523d3d1660341335b2b5e6995c84e794bff2920f18ba2cd36400ffdeb69c83718c42296422527e225cef9e6b86ad6dea1f613947936c7601aaee429d0bb8252f
-EBUILD libmspub-0.1.4.ebuild 1171 BLAKE2B b9df1f08071dfb36cd24e62e3e6e120b47c7f3a252a5921533357706a5eda7139e3f6e8720d6401c3259bd941ba326ac044de2772cb8a5bd86c86453d1f110ee SHA512 c6b9f035c794632f6e4ba273ea8ec31d23dc3067ba531bb4365ec6b945039b7ea59ab1f3e89934f3d2600b2b9147d6cc4889a858561e350accab32219e9afad3
+EBUILD libmspub-0.1.4.ebuild 1170 BLAKE2B bdccdac1722a3e33441eb452b7e4a7c92d058e04190cedbc3676fc8e8dc756ad76734841611d89bee5a0fe33069454316d95f1303a3da1f6c55c20f6ebdb4b3e SHA512 61f95c0a605fd50cba557dce4ae248d3043f7ccda1a55097e75a72b7468b4cdddfdbae0cae8a11df10a5884686ee328af5282d4c8ab9bccb47a0f7e907268ed3
 EBUILD libmspub-9999.ebuild 1171 BLAKE2B b9df1f08071dfb36cd24e62e3e6e120b47c7f3a252a5921533357706a5eda7139e3f6e8720d6401c3259bd941ba326ac044de2772cb8a5bd86c86453d1f110ee SHA512 c6b9f035c794632f6e4ba273ea8ec31d23dc3067ba531bb4365ec6b945039b7ea59ab1f3e89934f3d2600b2b9147d6cc4889a858561e350accab32219e9afad3
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libmspub/libmspub-0.1.4.ebuild b/app-text/libmspub/libmspub-0.1.4.ebuild
index c627cd0bee6f..358bec7b7081 100644
--- a/app-text/libmspub/libmspub-0.1.4.ebuild
+++ b/app-text/libmspub/libmspub-0.1.4.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
 
 # Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 
 IUSE="doc static-libs"
 
diff --git a/app-text/libqxp/Manifest b/app-text/libqxp/Manifest
index e27904f44501..bc19c1967ec2 100644
--- a/app-text/libqxp/Manifest
+++ b/app-text/libqxp/Manifest
@@ -1,3 +1,3 @@
 DIST libqxp-0.0.1.tar.xz 340184 BLAKE2B 759e5d0fb5886485f4ebe4a6caa34d1d98dc623c0ae124c6666a1be5ce7fb73686fc83360712d59d020e4788b39aa57d32149b7641d71b73dde917df46617f17 SHA512 a03a9ada658a92f4d985cad91d467b3916334c74dc26c1e4de89e3929e0135ca0e9c7e7e18ce616ef56a67863ec19c2638494400785849017f9a4776df07c607
-EBUILD libqxp-0.0.1.ebuild 734 BLAKE2B ade0c24b5f483d27e9aaefbb0d35276359ef385acf92b956e09fca45bbd8d6d94963781039302bb2418163813c9abcf9117dc306c7fd16fdadd315f1d29f6611 SHA512 1524692021d5fbf9b7c93427dbcdd86845091af2089085cb70ec5f42a0c33fe9c4f6e9b84d89556b7fc3fe96026a2ecafd53a56e96d212c243495cbe9357d863
+EBUILD libqxp-0.0.1.ebuild 733 BLAKE2B 500a3976587919cdc6e658b5212ae4e3a99b0febe1ee7b349d77ec6ba82d62434605eb0850436727fcffa17d0b70ec27e89054b163f1985c504a2cb746b880e3 SHA512 47e159553f3ca54c2c002e88fa1f76aa016ecd04e846b7a149d33fb45dcfe3d66aebc03f111a4e6bc6a9eaeec5619eb397097030deb2d5defc2192ae9602d9b8
 MISC metadata.xml 326 BLAKE2B 2058d5aa3fb12800596e894b6415bbb01df4d3b72efd60cb7cfc26d75f60d1de9ac3190aa4e82145fcfffbd3a48a80f8f2d0f984662160b82c6201aac48e3261 SHA512 97b3e21efde5b88155863552b56e196d2349d761106177deb84e587d3bd0c08cf4e91ec779caf1db86970ddd3f6ce7ce76ded2e08a8a763e93428a9042605e6e
diff --git a/app-text/libqxp/libqxp-0.0.1.ebuild b/app-text/libqxp/libqxp-0.0.1.ebuild
index c3bf1d28a4c8..d0769c66950d 100644
--- a/app-text/libqxp/libqxp-0.0.1.ebuild
+++ b/app-text/libqxp/libqxp-0.0.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="debug doc test tools"
 
 RDEPEND="
diff --git a/app-text/odt2txt/Manifest b/app-text/odt2txt/Manifest
index 17a04d6f839c..7b9182635a82 100644
--- a/app-text/odt2txt/Manifest
+++ b/app-text/odt2txt/Manifest
@@ -3,5 +3,5 @@ AUX odt2txt-0.5-darwin_iconv.patch 366 BLAKE2B 37fa3b5710de1df1760960ffc4b4e0077
 DIST odt2txt-0.4.tar.gz 23997 BLAKE2B ffa2ac915c1c239cfa7a498fa1597a2462bc7ecd2fb08a90ab50f21a60dbde8abffa52f4b4c40591732f7d497f08774555b36d880214a7708f2c05b692a18908 SHA512 65642dccdb08408e34d484d78be9777aa374cdabbcadd2ab54f43df29db506b136f13e5af720b9b6b6cfdb8508e4fab44159302d35fc002a22979efabf69bfc4
 DIST odt2txt-0.5.tar.gz 24460 BLAKE2B 703dd48447aa38a9a8bc0989231adf6f3dcf2796cb730feef6649cd14bff0265b12d6dba258a2779911f908a8ec322c5543b43222676e78ff12246daa3753b40 SHA512 95d782a088908518191dd0dcd294676fff25c95a2f23a2b8577b8e3adcce2f9d6d5ccaa2a02c7d36be19d05687a4d7a43bed36056c044af0934af810363c7ce0
 EBUILD odt2txt-0.4-r1.ebuild 726 BLAKE2B 03a906d6431d1dda4f291c6be4d961dd235bebda7cc72885292d74eb3ef6897ac68408709c0ac818668d5ce53c3a3a28833a150be5a7d05154644bed7c3f6e21 SHA512 832fffdd8c1f62f71215d804541fe0e041726acc8a1964f3733afad1ad30d08f7fc7075c28ea8d7764225c1dea7cd086343e1b40e345040b9d45594d1911d877
-EBUILD odt2txt-0.5.ebuild 739 BLAKE2B 5e275f35a641d8ffa0bc7056b018d2aff01333d8f9753cdb1862343610f6fb2124f17ebdb60ee4bb927b461a50b98bb1babd1761864f01b22c2cbd7270f0ce0d SHA512 85de6ac5290f69c68383511aed82a9740e32fb959db04cbc3e33079e9812e13e0119ddabc9176c99ffa3d8533064b4b3c9af5eef085497db995b97dd1ba296db
+EBUILD odt2txt-0.5.ebuild 737 BLAKE2B 6db11f6bf00aabc6bb29443fc6d1da60a638614c475e500148bc3fcc23d55e10a96afd169d07ba6ed2c24973fd543fdc85479cf8668de596baccad222390f8ac SHA512 066dcf6332365681d9cdcf64612e2997dec3b731445394a9187e62869588f48c51fbb2e013ce53cf38540400a1aebc8214c40ca2d320c2a2676fd3f7b8ca5817
 MISC metadata.xml 371 BLAKE2B 4d1aead738a47efd7e138ee8fa85db08b5aa64dafe7d06d64f8fcd093b741808a62fa541920a60fa120233f88dc5a5a92380e848db5ddc54be7152d813e4d174 SHA512 1fe5f8d199becebd4dc33c017d8e6f608f47f5770abde2424cc0517da49502624a8eeca6522d125bedef31c3f7aaefa6ce3a2a871ea46d28d2314bf0dededa35
diff --git a/app-text/odt2txt/odt2txt-0.5.ebuild b/app-text/odt2txt/odt2txt-0.5.ebuild
index 71f794e3cdf1..1e9be393bda1 100644
--- a/app-text/odt2txt/odt2txt-0.5.ebuild
+++ b/app-text/odt2txt/odt2txt-0.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/dstosberg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc64 ~sparc ~x86 ~x86-macos"
+KEYWORDS="~alpha amd64 ia64 ~ppc64 ~sparc ~x86 ~x86-macos"
 IUSE=""
 
 RDEPEND="
diff --git a/app-text/qpdfview/Manifest b/app-text/qpdfview/Manifest
index cbdd0374ddb3..98b0b884d426 100644
--- a/app-text/qpdfview/Manifest
+++ b/app-text/qpdfview/Manifest
@@ -1,7 +1,9 @@
 DIST qpdfview-0.4.16.tar.gz 636095 BLAKE2B b25da3ed1b4bacc02701f6cd2c4e282fd1c7b1fcac8faa1687c5089baefa328854c520ba803a333ea107e7b423a004f6476eb9a7adf67287d4d0807146094fed SHA512 d3ac05fc51d48533e44e58cd19e5d222a8bfbc9da4df02ece6a405d2fdd3346eb4614816ae91e89facf28e107b920ff3ce7b2ccc8c9b7832ae2595ef70d65584
 DIST qpdfview-0.4.17beta1.tar.gz 658978 BLAKE2B 7f0ba945cf7903cae7bb11ac1d3baa08fc5f70e9e5a20a9f265cf8de4f0ce0f847f34852b2ce4374e2736542c8fc1e07c15e6bd4ae54d5147d14524e076f312f SHA512 803bd9a1165fc84302fb3c7734127eaab754bd2bf23083a1bcf340810fa617800f3d0069eae7b1f43fb528ebe17a6a32a652efbb902d525a95efc31efeb1e10a
 DIST qpdfview-0.4.18_pre.tar.gz 667869 BLAKE2B ed729b6aa1104ca1525877242bc3f2c630d8ee563005ab35854d775197c24352f0a39be13bf4808e4544c50072619da9cd5c36cdbdcbae33fa2fc2016b80ce18 SHA512 3a7a2cc474078dc742fccba2c87710c1e05cec76f0bd66650fa6cb4d6d8e2103241474689d4798da28ae1aeb2caa6e09dd8d1e9d0433c2eba21b202166aa3051
+DIST qpdfview-0.4.18_pre2.tar.gz 668677 BLAKE2B 1c79a7f9f9d67c533660457ca74d27c1cb389224910d0c8482c2e1d6a0843787e588a40ae7f4e02268392c15aa19b54b6383c2422cc60b20e521d26133c10a3e SHA512 ad19dd6a2bfeb3c5f26488619688ad96653ed50821203b7e5cb2817a4f9957510ce238804b48bf3b21d965ceed25ad1b0386e0bb5e9d0bc5e5c95e6fe10ef811
 EBUILD qpdfview-0.4.16.ebuild 2137 BLAKE2B d0ce86840680b56afd8b925b820d0641a0754776d4054b469c691f5da10db072febd5b04b34b80394bc08f47d6b5b7b58390332c30d445116528cbc238fe2144 SHA512 2d89740ee569287794935eb369c8a035a3ceeceb3e428e740f0b0adbe808f532a336dae9739c789bd4ee71b1a7f87af222ce91c19028bb179275184607489549
 EBUILD qpdfview-0.4.17_beta1.ebuild 2169 BLAKE2B 61d969d7af89373d0d657c00049c7a86a6cb67d2cea7d436f1052e21c0a02ebe7d06024851a6e956b8227d41b90df2cfb862804a09a7f817307f5b2185a88d33 SHA512 14fe234d15e1f6a38a8ba2c744c5f9061c21969f43bab039227636eb69f25fea5f1a91ffb15afe84c3eb92de25ef1c0db693b02a074f365e9069af5ae145ad24
 EBUILD qpdfview-0.4.18_pre.ebuild 2351 BLAKE2B 64beca033eb45d715185360ff9ea653de2f444e0fdfa5bc58e5e37f46fa2e8f03e5674837121e2c61b2f5781281de70bc960d85ff10e763a0467c292f88bd4cc SHA512 560b54fc310413fc34e24f441eb438db5221d211cb57fc318018e27b7913588e3361b056f4102cf922d6f79d955993ab40182158e6ce00ac5394bd82d98f56f0
+EBUILD qpdfview-0.4.18_pre2.ebuild 2351 BLAKE2B aa38b631649b7d03be1a6e1df550cce81f44fe721d8b874b225ce6414a749a96dedc585b4d4482224d23c56cb2176c530e02bd47dc74ebdc45718642c8c39f28 SHA512 1c49e2ce7d9fedbbed5ea45b550403a11c68035d5943361d901b9df33c357c730d1b46ab66de6783576bcb562f64eeee61a9ca3857a93aa9759d4c756d98dbf6
 MISC metadata.xml 534 BLAKE2B db66db041dd0875c8d4e36e3223d7f82263555f2d6a1dcc5270279b3fc8bc77499712253d43b56e278187f163af0495ca9e7e6aa0ba0dc8e9a5fe9cf7f2daf99 SHA512 e086f5e92c5ad9058f13c23c814a5cdc988a09cdbebecb1018b59d32a756dc2766b13ee1c3e09966cc7e221cc1c4ee26f9bf11c50610f94b28c20a34c316f133
diff --git a/app-text/qpdfview/qpdfview-0.4.18_pre2.ebuild b/app-text/qpdfview/qpdfview-0.4.18_pre2.ebuild
new file mode 100644
index 000000000000..b9dbaeb26ae5
--- /dev/null
+++ b/app-text/qpdfview/qpdfview-0.4.18_pre2.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PLOCALES="ast az be bg bs ca cs da de el en_GB eo es eu fi fr gl he hr hu id it ja kk ko ky lt ms my pl pt pt_BR ro ru sk sv th tr ug uk vi zh_CN"
+
+inherit l10n qmake-utils xdg-utils gnome2-utils
+
+DESCRIPTION="A tabbed document viewer"
+HOMEPAGE="https://launchpad.net/qpdfview"
+SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="cups +dbus djvu fitz +pdf postscript +sqlite +svg synctex"
+
+REQUIRED_USE="?? ( fitz pdf )"
+
+RDEPEND="
+	cups? ( net-print/cups )
+	djvu? ( app-text/djvu )
+	fitz? ( >=app-text/mupdf-1.7:= )
+	postscript? ( app-text/libspectre )
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+	dbus? ( dev-qt/qtdbus:5 )
+	pdf? ( >=app-text/poppler-0.35[qt5]
+		dev-qt/qtxml:5 )
+	sqlite? ( dev-qt/qtsql:5[sqlite] )
+	svg? ( dev-qt/qtsvg:5 )
+	!svg? ( virtual/freedesktop-icon-theme )
+	synctex? ( app-text/texlive-core )"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig"
+
+DOCS=( CHANGES CONTRIBUTORS README TODO )
+
+src_prepare() {
+	local mylrelease="$(qt5_get_bindir)"/lrelease
+
+	prepare_locale() {
+		"${mylrelease}" "translations/${PN}_${1}.ts" || die "preparing ${1} locale failed"
+	}
+
+	rm_help() {
+		rm -f "help/help_${1}.html" || die "removing ${1} help file failed"
+	}
+
+	l10n_find_plocales_changes translations ${PN}_ .ts
+	l10n_for_each_locale_do prepare_locale
+	l10n_for_each_disabled_locale_do rm_help
+
+	# adapt for prefix
+	sed -i -e "s:/usr:${EPREFIX}/usr:g" qpdfview.pri || die
+
+	default
+}
+
+src_configure() {
+	local myconfig=() i=
+	for i in cups dbus djvu pdf svg synctex; do
+		use ${i} || myconfig+=(without_${i})
+	done
+	use fitz && myconfig+=(with_fitz)
+	use postscript || myconfig+=(without_ps)
+	use sqlite || myconfig+=(without_sql)
+
+	local myqmakeargs=(
+		qpdfview.pro
+		CONFIG+="${myconfig[@]}"
+		PLUGIN_INSTALL_PATH="${EPREFIX}/usr/$(get_libdir)/${PN}"
+	)
+	eqmake5 "${myqmakeargs[@]}"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	einstalldocs
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
diff --git a/app-text/sgrep/Manifest b/app-text/sgrep/Manifest
index 4c0e9f75e66a..c44668845b5c 100644
--- a/app-text/sgrep/Manifest
+++ b/app-text/sgrep/Manifest
@@ -1,3 +1,3 @@
 DIST sgrep-1.94a.tar.gz 193267 BLAKE2B fe37f62e2cb5c2ccad88df8ee3000d937357b5801ac6c55938a575f77735db7f94c0475e2eaa2521dfbae194132dcda4efe009db32e23b50c13acbc359b9abaf SHA512 8d2571a738c6a87cc34aea3a0692d15aea1d4a0439401b97368da2a021992ef8d0754e91e10409c1c059712bfe69ac4188e3be856211e48f8e6d528b5684283a
-EBUILD sgrep-1.94a.ebuild 704 BLAKE2B 8e93795de18f1cc16868c6f4462b0eb9b6dfbf1c93067842c9e4c9c6597e0371c504b0fb7d3e5b831ad236901cfa5c849453d07b4ce3dda7b7cb394171e46765 SHA512 aff8595657db0cf5fc6186fa58feda22dee88cbae4f65e45825b0e20c529126bd7c51df99aef4200fa6629d9e6396a248303a5fc30308635fa141552cf6d64a8
+EBUILD sgrep-1.94a.ebuild 721 BLAKE2B 18ece2417c18c5f3578222d2a2aa5cce21307213c46e9fdb06170b70148b6679d3ee34bd80a22c84ac89c47141eaa7c3888a1af9512d825560a59f4a3a999265 SHA512 64fa85b4e830e83694a516c1760f612078e0fe6d5ac5c256ebddc20f2a0cafa24220d1929b6e3561c8d52cfe3abcc7a57a11ec97b4eea0b67e25d8b654e2fa87
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/sgrep/sgrep-1.94a.ebuild b/app-text/sgrep/sgrep-1.94a.ebuild
index 6e31bd750619..2f7bae2fad40 100644
--- a/app-text/sgrep/sgrep-1.94a.ebuild
+++ b/app-text/sgrep/sgrep-1.94a.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=6
 
 DESCRIPTION="Use structural criteria to grep and index text, SGML, XML and HTML and filter"
 SRC_URI="ftp://ftp.cs.helsinki.fi/pub/Software/Local/Sgrep/${P}.tar.gz"
-HOMEPAGE="http://www.cs.helsinki.fi/u/jjaakkol/sgrep.html"
+HOMEPAGE="https://www.cs.helsinki.fi/u/jjaakkol/sgrep.html"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -13,7 +13,8 @@ KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 src_prepare() {
-	sed -i -e "s:/usr/lib:/etc:g" sgrep.1
+	default
+	sed -i -e "s:/usr/lib:/etc:g" sgrep.1 || die
 }
 
 src_configure() {
diff --git a/app-text/wgetpaste/Manifest b/app-text/wgetpaste/Manifest
index 2c82b7347050..d6b08bb7742a 100644
--- a/app-text/wgetpaste/Manifest
+++ b/app-text/wgetpaste/Manifest
@@ -6,4 +6,4 @@ DIST wgetpaste-2.28.tar.bz2 12448 BLAKE2B 231b6d00ecf9c355f45683d56537c0fe6a5d65
 EBUILD wgetpaste-2.25-r3.ebuild 919 BLAKE2B a6b04fa999c708d990d074e5e40465e6bf518b6728423a1ee2c125911d7124fd466696f9c048b1c55ffc521c50767a95145f102a97ceb4eefdc8b8fc08bfd387 SHA512 749f899f89c0f1ba27b2fd937297fb2b27e4d749a7c232b8274fe89d530aa03082da70019bb120a8fb58fa74ee8180f437c0dcab4f427d487d3b16eb8408ffe6
 EBUILD wgetpaste-2.28-r1.ebuild 734 BLAKE2B 9728c2dbbe50713b394897d292e42e5971e3070ec229bd8612438a0b9656ab03f7c0db071b15cb8d7e3420e88adb0c787b554c9ef6bb6f8094a606fea98dae18 SHA512 c67fbd0e5dbf8963525af996e74f9b2f17d3aaeef741c5e924a5f319d217b86cac61ef3f9b1098912bb5fbc8ea1c3c968aaabfc2e135877aad843ef2bdb4c05f
 EBUILD wgetpaste-2.28.ebuild 706 BLAKE2B 69fce5b98143b44c27536b84e2d09f71d742dd39394cc57d0d4f40250cce44506326edc5f93c603fdbd09460147e953e38afecc31f6ae0afa0f4be7d50b9f124 SHA512 8eebb90528664d16898c6161ec38a5b10e09e81b4531693fc50b5af5265014fe8917f13b96f9b39eb3eaee2bac45337dc8af6536ec740840a6168a27a127fb41
-MISC metadata.xml 249 BLAKE2B 210caabfc49730fad6228e8c34b09d11554fece8f3f754a26c6239b3b0de845ea128507b2c17d6e97343f9e6e2ae01272eb024992c3c64d3903794fbf73a66ed SHA512 c13d64a0d3034eeb4c9567f5e1236ecd6f3c3cbdec69b805627298cdb7050ae01a19a3cb075ec905de9497079a3e855bdccef2f37f65540b6ae184439f01cdae
+MISC metadata.xml 355 BLAKE2B cfb82b6309e5508319685ccad6757d701ad60ca2c9b015bf04cd500348a1c43e951876917d60e118e4008088a40761cd57b0f08a220cf1e97b9f638a4efe086a SHA512 04699e3fb3122aa304bcb525a1130732c949473086ed946ae9051928e7e84edd5347cab006e6a31f0ad854c7d8f51f07c3e77f6e3a7dac450619f4decb52f2f5
diff --git a/app-text/wgetpaste/metadata.xml b/app-text/wgetpaste/metadata.xml
index ceeed1534bdd..23d91c3c4034 100644
--- a/app-text/wgetpaste/metadata.xml
+++ b/app-text/wgetpaste/metadata.xml
@@ -5,4 +5,8 @@
 		<email>maksbotan@gentoo.org</email>
 		<name>Maxim Koltsov</name>
 	</maintainer>
+	<maintainer type="person">
+	<email>zlogene@gentoo.org</email>
+	<name>Mikle Kolyada</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index a5700c624eb5..e2204b51b842 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/glibmm/Manifest b/dev-cpp/glibmm/Manifest
index c67b9c62003c..3d9bf3ec6c0e 100644
--- a/dev-cpp/glibmm/Manifest
+++ b/dev-cpp/glibmm/Manifest
@@ -1,5 +1,6 @@
+AUX glibmm-fix-threads-gobject.patch 933 BLAKE2B 83d9e91db00b4de81615733e557281cdc191b2662aa016799b3e72bc3f4e738a997d3ca084a3d36e1212406cedfde5c7f6ca2975fbef3ea34d1ee3c8e941728a SHA512 b4fbfdafe7198ddf7c40513e1b490880a1fd2013fa221231d6605bde0b3757d6a8820c540f417281853939efdc7c5f13656e7f6b8c8302d318aa28e10dfac4a9
 DIST glibmm-2.50.1.tar.xz 6444576 BLAKE2B dbbdb79d8de9510f9bec770523ca7f4c93d287cbd9890b2fbc08712f6a2815186ee792f6339820a14aa9e4d49c9d1735c6c6651994cc4e03549f0d96b33f87ad SHA512 4f25c75c1628ca2f4db1c29cebc63187d372603066b06aa6a66c6da792f9e02cb4a413e41f058a81e2d5a2b38d625de13df76115b278f010ce2fc493fe6e6bbb
 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.1.ebuild 1637 BLAKE2B 435a139bc6042f957b6bed37c3901f1a0a45806e02eeaa2cfae1a1453105694c44a016980a3d7b12c3fab14ceabeeb14be256e57491e35ed7f28044ff78929c4 SHA512 a5a8d73b29c590a5691284b296b1ad05e9914f27c79db0ec6b7455880a17ae11c631f3a2fefaf5e54138fc468e5eb1fa7c795cd5540891b87aee207bf7423ce4
+EBUILD glibmm-2.52.1.ebuild 1755 BLAKE2B ddf4532a95e8302604b56f15b8f32395959a0e2afeda1af2d88579fc0d8bbd610e70a601e5a1a85ecb784f274170eb0d4cddd44576130ecd689166b0e2dd4c59 SHA512 656b51cec372a71babba2ff9d2e04d3e5813cf76b78536afe038b7de508f5801adafdf968d48aed3eea59efa7577c7020f37d6e7284f69f86b5d7eef2e0edcab
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-cpp/glibmm/files/glibmm-fix-threads-gobject.patch b/dev-cpp/glibmm/files/glibmm-fix-threads-gobject.patch
new file mode 100644
index 000000000000..2da4a5621992
--- /dev/null
+++ b/dev-cpp/glibmm/files/glibmm-fix-threads-gobject.patch
@@ -0,0 +1,34 @@
+From 37d57ae9572b7d74aa385a30313eceae7f2d3fce Mon Sep 17 00:00:00 2001
+From: Kjell Ahlstedt <kjellahlstedt@gmail.com>
+Date: Wed, 20 Dec 2017 20:00:32 +0100
+Subject: [PATCH] Glib::Threads::Private: Fix gobj()
+
+Bug 791711
+---
+ glib/src/threads.hg | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/glib/src/threads.hg b/glib/src/threads.hg
+index 86d7a17b..c82a6130 100644
+--- a/glib/src/threads.hg
++++ b/glib/src/threads.hg
+@@ -628,7 +628,7 @@ public:
+    */
+   inline void replace(T* data);
+ 
+-  GPrivate* gobj() { return gobject_; }
++  GPrivate* gobj() { return &gobject_; }
+ 
+ private:
+   GPrivate gobject_;
+--- a/glib/glibmm/threads.h	2017-09-04 15:27:31.000000000 +0200
++++ b/glib/glibmm/threads.h	2018-05-05 10:53:44.339288554 +0200
+@@ -657,7 +657,7 @@
+    */
+   inline void replace(T* data);
+ 
+-  GPrivate* gobj() { return gobject_; }
++  GPrivate* gobj() { return &gobject_; }
+ 
+ private:
+   GPrivate gobject_;
diff --git a/dev-cpp/glibmm/glibmm-2.52.1.ebuild b/dev-cpp/glibmm/glibmm-2.52.1.ebuild
index 925442a83aeb..18a948873dbe 100644
--- a/dev-cpp/glibmm/glibmm-2.52.1.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.52.1.ebuild
@@ -22,6 +22,12 @@ DEPEND="${RDEPEND}
 "
 # dev-cpp/mm-common needed for eautoreconf
 
+PATCHES=(
+	# Fix build with GCC-8
+	# https://bugs.gentoo.org/654776
+	"${FILESDIR}"/${PN}-fix-threads-gobject.patch
+)
+
 src_prepare() {
 	if ! use test; then
 		# don't waste time building tests
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index fa0449b01d14..6105075dbc53 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/aerospike-server-community/Manifest b/dev-db/aerospike-server-community/Manifest
index 4c3e99495136..cab83d5e5bb1 100644
--- a/dev-db/aerospike-server-community/Manifest
+++ b/dev-db/aerospike-server-community/Manifest
@@ -10,11 +10,13 @@ DIST aerospike-server-community-3.15.1.4-debian7.tgz 9775381 BLAKE2B 4f7fe86d99c
 DIST aerospike-server-community-3.16.0.6-debian7.tgz 11106496 BLAKE2B b4d9e4856e7d30f537685ed6f924bae8ba953e8aab363f0fa0ba1e5522719f4a521f757944693c46af2933f9ce4e7f10d60808ef76cb78523347cac38cd0608b SHA512 0e32c73881f29d634b67f1c46cdd608ad306fb164753ae3a113761adc806dba72fbd8d8022f7c5fb1b84171f145113b6659092a23e283e147d292931c5befde7
 DIST aerospike-server-community-4.0.0.1-debian7.tgz 16352955 BLAKE2B e6dd6295a71b4c6edf13a52c4f1be9e8fcea0c94078559b13be456ca714c9c38952a96385003391484bf7d24e3d52745806935c249f0f3cc96a154264a10c2a3 SHA512 896783c0cbe4b136605f17601317c6d62e8791adac6c6bebb8f80be1d33cf2f425a431af7e3fe8e5e7771a196bd4baa9db32dc11b030850c1eb3db755767934a
 DIST aerospike-server-community-4.0.0.4-debian7.tgz 16355017 BLAKE2B ad88330e7cc2a3b6c13a8a5ac2c1aa1bd7cf68ed4c9c2669e366cda153aca7b0bdfce35df47269b42222ec5699e06bafbb9f7098abae9b83d259c1c259da2c1a SHA512 b3ca3e882d543dfb5fd6293c6d6e95689c31f3c5e8cd77b3611d36c6981f3350b771eebc41d536b0a1e272bd16614354979d7d6a04c10004dd80bb5973b4c6be
+DIST aerospike-server-community-4.1.0.1-debian7.tgz 16538371 BLAKE2B b879fa134d932dd5c5f3432abd6902e3a1bfd071b7753a78b4d2fdd1cc58e6b875c6793285dbfa18612f9ccd98af4f8ae3a16e7178a30d03715a4d38dc369b1c SHA512 f3954f209a3aab446c193b07fe6c045de89af115f29815a886c99b5648da1e3ff1b348cb1ec4299ce772d7619918e2340de6c25393e04c3bf4b9f1760646625d
 EBUILD aerospike-server-community-3.13.0.9.ebuild 1638 BLAKE2B 67efcc3e85ebeb249e9929d815c48b8f98930879e4341ef2382bd22d95a24ec83dae61624a28132b9373f8a5caf2cca30e76cb20e38a2b8baf4c5ca98c76146f SHA512 875b7394d88e1e6a50924202ff71fbbb3af14fdcfdc15c27125ce323d56fee3ffc5773ee796bde1b6990acbeeef421666408299f225016d33e34d515a1c5a5e9
 EBUILD aerospike-server-community-3.14.1.8.ebuild 1638 BLAKE2B 67efcc3e85ebeb249e9929d815c48b8f98930879e4341ef2382bd22d95a24ec83dae61624a28132b9373f8a5caf2cca30e76cb20e38a2b8baf4c5ca98c76146f SHA512 875b7394d88e1e6a50924202ff71fbbb3af14fdcfdc15c27125ce323d56fee3ffc5773ee796bde1b6990acbeeef421666408299f225016d33e34d515a1c5a5e9
 EBUILD aerospike-server-community-3.15.1.4.ebuild 1638 BLAKE2B 3d082543b0a601e6620e41790b2eca111cb68fff04916bbfcee461c4e6611f309e64c33d623a0048f422e8bb4f96158b53220e21a8959a96d278a35c20fc5c36 SHA512 def3d4526e089225dee5d3a96a692536ca0611ca6dd0d1476e6ce55b18cc215464dc35fd52f0a2fd3a21776999ccf714435515b6f7a9f30b1da9d1f160a66a8f
 EBUILD aerospike-server-community-3.16.0.6.ebuild 1638 BLAKE2B 1ce48fbefbc7b5232ab2449042ca013200b2da2c083fadbab5e12bc42b3d052fe15078886359b133248a39ec0350e9902a6bf54c08402905f1d7212432e6f398 SHA512 935895faaad66c0051cc9945862e0c54f6427e6b59fc664c921c06fa59f529f63e6cbc46514cd73ffe5dbfb2fb160a3a191e5fcee5db60b7b570cf12f36d0198
 EBUILD aerospike-server-community-4.0.0.1.ebuild 1638 BLAKE2B 7572376d50c39edcb444d35b3b006c3f79d41c1138cd22d221182ccdf549dabf26c7ae876c0128dda245fbeb2c3ca6a2d96672d816147a591ce60b4d9ace09b4 SHA512 8e3ccb10b5daf85fab5e23412884cbcfc4db93a0cf2e49d55f5948c59dfabfeafba61f3e8f8aa82603764bc7a3f232458a96147b2987c33a767d0ce9f29f26ac
 EBUILD aerospike-server-community-4.0.0.4.ebuild 1638 BLAKE2B 7572376d50c39edcb444d35b3b006c3f79d41c1138cd22d221182ccdf549dabf26c7ae876c0128dda245fbeb2c3ca6a2d96672d816147a591ce60b4d9ace09b4 SHA512 8e3ccb10b5daf85fab5e23412884cbcfc4db93a0cf2e49d55f5948c59dfabfeafba61f3e8f8aa82603764bc7a3f232458a96147b2987c33a767d0ce9f29f26ac
+EBUILD aerospike-server-community-4.1.0.1.ebuild 1638 BLAKE2B 751741ae79b6700d6233106c6d47daab9ed2d998fafa1162ad19612a4e2ad6865d7a06f698d56aaf52f61ad06203bd6551657a68c0c6d7dd6c027f3a8cd0fd96 SHA512 44c44e9aa4781b43d74d2a2e397c724916ee02da62899525436d6b8eb0b2ac20a9507f3cb2b24cadcf4168859a3b61b6e1dc78ed2c9b9c3bf104f17f10c359c3
 EBUILD aerospike-server-community-9999.ebuild 1937 BLAKE2B c94acd0bacf3d04f0cfe679ebd53202e65cbd85b3874c8f91fa06b761f4b8318e1e21760fc4651e10b06d07df63094df5ee16b6594519c62bae9d608ef60ecfe SHA512 5eb93fafa4380da81697360accd88c4c6c5c40588b5ee7fee41b678dbefada15aa518e7f80ccc4da9c98e98f5715c46011cf4a300733b1212300d7a3b683cb1c
 MISC metadata.xml 281 BLAKE2B c83365afa5d87cf5b8d65ed299e16797d54a0c5f8632ad69c7449edcd52b32f150bc7f933a9e3662d45c37fc64dfcd97b09b3d265a328cdc3ca6cc609a2311f2 SHA512 d3a33c339bb7409528ddca6187790b842150e273bd7630a610c0be08be50e26278ed7b4d42305bfd1a796544c6be251301c938b15d70e609b9d91bd22161aee6
diff --git a/dev-db/aerospike-server-community/aerospike-server-community-4.1.0.1.ebuild b/dev-db/aerospike-server-community/aerospike-server-community-4.1.0.1.ebuild
new file mode 100644
index 000000000000..a69846b1bc8b
--- /dev/null
+++ b/dev-db/aerospike-server-community/aerospike-server-community-4.1.0.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils user
+
+DESCRIPTION="Flash-optimized, in-memory, nosql database"
+HOMEPAGE="http://www.aerospike.com"
+SRC_URI="http://www.aerospike.com/artifacts/${PN}/${PV}/${P}-debian7.tgz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="sys-libs/readline:0
+	sys-libs/zlib
+	dev-libs/openssl:0
+	"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${P}-debian7"
+
+pkg_setup() {
+	enewgroup aerospike
+	enewuser aerospike -1 /bin/bash /opt/aerospike aerospike
+}
+
+src_prepare() {
+	local server_deb="${P}.debian7.x86_64.deb"
+	local tools_deb="aerospike-tools-3.15.3.6.debian7.x86_64.deb"
+
+	ar x "${server_deb}" || die
+	tar xzf data.tar.gz && rm data.tar.gz || die
+
+	ar x "${tools_deb}" || die
+	tar xzf data.tar.gz && rm data.tar.gz || die
+
+	rm *.deb asinstall control.tar.gz debian-binary LICENSE SHA256SUMS
+	rm usr/bin/{asfixownership,asmigrate2to3}
+}
+
+src_install() {
+	insinto /opt/
+	doins -r opt/aerospike
+
+	fperms +x -R /opt/aerospike/bin/
+	fperms +x -R /opt/aerospike/lib/python/
+
+	for dir in '/etc' '/var/log'; do
+		keepdir "${dir}/aerospike"
+	done
+
+	insinto /etc/aerospike
+	for conf in 'aerospike.conf' 'aerospike_mesh.conf' 'aerospike_ssd.conf'; do
+		doins "${FILESDIR}/${conf}"
+	done
+
+	insinto /usr/bin
+	doins usr/bin/*
+	fperms +x -R /usr/bin/asd
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/aerospike.logrotate aerospike
+
+	newinitd "${FILESDIR}"/aerospike.init aerospike
+
+	fowners -R aerospike:aerospike /opt/aerospike/
+	fowners aerospike:aerospike /usr/bin/asd
+	fowners -R aerospike:aerospike /var/log/aerospike
+}
diff --git a/dev-db/mariadb-galera/Manifest b/dev-db/mariadb-galera/Manifest
index 9716fe40ea82..486caf610236 100644
--- a/dev-db/mariadb-galera/Manifest
+++ b/dev-db/mariadb-galera/Manifest
@@ -1,4 +1,3 @@
-AUX my.cnf-5.5 5244 BLAKE2B f6e22850e34454d7b48566b3e3e1731940933e00611cf5c3c79ab8107603ccea8ef9b5d1c08a1dbfb076f517afe4d11dd5ec44c9b3d64c4934ff4e8d08b11408 SHA512 c20420fb498ba2c3db7973848fe8cf715815e15ccc315a57e4ab9cea3c8778def0e66cef8253870dc94c92903e04dd0c7037c12894b37e8cfd70f0c3822ee65e
 AUX my.cnf-5.6 5144 BLAKE2B 2f977b6a92524cfabbdd19058430c62dd4d03a0587036f49057eff69fda04c148a4dca8e58abe418a2bdc0fe1ef3c780cf53d7214fb51f13d5a4b2a4f7a3b8e9 SHA512 db4bdde6f82d9bd33026477d89d8191ddc4099586273ca4aa3f2dcd09572f887d03f79c2ce00bf74d01c21a18384b05516982bdcf31a6c458631315ea75c4cab
 DIST mariadb-galera-10.0.35.tar.gz 66950519 BLAKE2B a0b48de41234d1800c1734782bd604d30512e3d33d1937cd3e79f68ec804089166223ba53450ef630779d2b74bc4ace611dc748b4ceca7ed4e4151f97d693655 SHA512 e0160ef74d45c332edf49f21bb673b926008cba9ba650f97a47d7631260b2517db19e1730b76be77af4ee384aa5cc9b3453a24da57c48ab5f062f937494aee87
 DIST mysql-extras-20180515-1334Z.tar.bz2 321462 BLAKE2B 48fc1e0058fa824e6234b0f3319d261997e99f334c8583c0def4cdac4b59f2380d7153ab0fa2ca9a6ab15e35899c2a7586e3b61f4044c4c949110cc8ab9fb0e6 SHA512 de3000f0c65eed9595b52d53205cdcac60cb4a06a5aca27057c8beca6a7890f453aeeda0bb8487b8de75cfb4caa48682b7706273574876c5cefd0d03988c4f7e
diff --git a/dev-db/mariadb-galera/files/my.cnf-5.5 b/dev-db/mariadb-galera/files/my.cnf-5.5
deleted file mode 100644
index e9a4bcded277..000000000000
--- a/dev-db/mariadb-galera/files/my.cnf-5.5
+++ /dev/null
@@ -1,158 +0,0 @@
-# @GENTOO_PORTAGE_EPREFIX@/etc/mysql/my.cnf: The global mysql configuration file.
-
-# The following options will be passed to all MySQL clients
-[client]
-#password					= your_password
-port						= 3306
-socket						= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
-
-[mysql]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqladmin]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqlcheck]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqldump]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqlimport]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqlshow]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[myisamchk]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-
-[myisampack]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-
-# use [safe_mysqld] with mysql-3
-[mysqld_safe]
-err-log						= @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysql.err
-
-# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations
-[mysqld]
-character-set-server		= utf8
-user 						= mysql
-port 						= 3306
-socket 						= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
-pid-file 					= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.pid
-log-error 					= @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysqld.err
-basedir 					= @GENTOO_PORTAGE_EPREFIX@/usr
-datadir 					= @DATADIR@
-skip-external-locking
-key_buffer_size				= 16M
-max_allowed_packet 			= 1M
-table_open_cache 			= 64
-sort_buffer_size 			= 512K
-net_buffer_length 			= 8K
-read_buffer_size 			= 256K
-read_rnd_buffer_size 		= 512K
-myisam_sort_buffer_size 	= 8M
-lc_messages_dir			= @GENTOO_PORTAGE_EPREFIX@/usr/share/mysql
-#Set this to your desired error message language
-lc_messages			= en_US
-
-log-bin
-server-id 					= 1
-
-# point the following paths to different dedicated disks
-tmpdir 						= @GENTOO_PORTAGE_EPREFIX@/tmp/
-#log-update 				= @GENTOO_PORTAGE_EPREFIX@/path-to-dedicated-directory/hostname
-
-# you need the debug USE flag enabled to use the following directives,
-# if needed, uncomment them, start the server and issue 
-# #tail -f @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.trace
-# this will show you *exactly* what's happening in your server ;)
-
-#log						= @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql
-#gdb
-#debug						= d:t:i:o,/tmp/mysqld.trace
-#one-thread
-
-# the following is the InnoDB configuration
-# if you wish to disable innodb instead
-# uncomment just the next line
-#skip-innodb
-#
-# the rest of the innodb config follows:
-# don't eat too much memory, we're trying to be safe on 64Mb boxes
-# you might want to bump this up a bit on boxes with more RAM
-innodb_buffer_pool_size = 16M
-# this is the default, increase it if you have lots of tables
-innodb_additional_mem_pool_size = 2M
-#
-# i'd like to use @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/innodb, but that is seen as a database :-(
-# and upstream wants things to be under @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/, so that's the route
-# we have to take for the moment
-#innodb_data_home_dir		= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
-#innodb_log_arch_dir		= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
-#innodb_log_group_home_dir	= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
-# you may wish to change this size to be more suitable for your system
-# the max is there to avoid run-away growth on your machine
-innodb_data_file_path = ibdata1:10M:autoextend:max:128M
-# we keep this at around 25% of of innodb_buffer_pool_size
-# sensible values range from 1MB to (1/innodb_log_files_in_group*innodb_buffer_pool_size)
-innodb_log_file_size = 5M
-# this is the default, increase it if you have very large transactions going on
-innodb_log_buffer_size = 8M
-# this is the default and won't hurt you
-# you shouldn't need to tweak it
-innodb_log_files_in_group=2
-# see the innodb config docs, the other options are not always safe
-innodb_flush_log_at_trx_commit = 1
-innodb_lock_wait_timeout = 50
-innodb_file_per_table
-
-# Uncomment this to get FEDERATED engine support
-#plugin-load=federated=ha_federated.so
-loose-federated
-
-# These settings are required for Galera clustering
-#mysql settings
-binlog_format=ROW
-default-storage-engine=innodb
-innodb_autoinc_lock_mode=2
-query_cache_size=0
-query_cache_type=0
-bind-address=0.0.0.0
-# Uncomment this section to activate Galera clustering
-#wsrep_provider=@GENTOO_PORTAGE_EPREFIX@/usr/lib/galera/libgalera_smm.so
-# You should change this name to something meaningful
-#wsrep_cluster_name="my_wsrep_cluster"
-# List all nodes of the cluster including this one
-#wsrep_cluster_address="gcomm://172.16.8.5,172.16.8.6,172.16.8.4"
-#wsrep_sst_method=rsync
-
-[mysqldump]
-quick
-max_allowed_packet 			= 16M
-
-[mysql]
-# uncomment the next directive if you are not familiar with SQL
-#safe-updates
-
-[isamchk]
-key_buffer_size				= 20M
-sort_buffer_size 			= 20M
-read_buffer 				= 2M
-write_buffer 				= 2M
-
-[myisamchk]
-key_buffer_size				= 20M
-sort_buffer_size 			= 20M
-read_buffer_size			= 2M
-write_buffer_size			= 2M
-
-[mysqlhotcopy]
-interactive-timeout
diff --git a/dev-db/mydumper/Manifest b/dev-db/mydumper/Manifest
index f9e647b177ad..e597f188c9c4 100644
--- a/dev-db/mydumper/Manifest
+++ b/dev-db/mydumper/Manifest
@@ -1,6 +1,7 @@
+AUX mydumper-atomic.patch 948 BLAKE2B 78bc073083a44ad21346e419de6f76195d3e9c16877a7851db6cea6e738ddeee06ff8ce255d067a9321c8a687c2e99c3f36caa84d9a3ef017a045261f81d4f13 SHA512 6c9a9a8378aec435431ac84cc530b880616e5e1df823525eebe4f813c6e0e73eeb0408bff4379b295a1fb095c91a4b1eaea83aa4d8a7bb2e159143ce7a579a90
 AUX mydumper-mariadb-define.patch 766 BLAKE2B 26d8b037de5362bb456f19ed85d5b20cb901c63ed307b2377d58931d5fa8940bd3bb97632d3f9976bcb1723a36b8cebdc0a74723a555abc54800b3afe5fea673 SHA512 839061da9fcfc16d0729bf8ba62a5c22a03aba1c089006efd600020a8d618af0f8d962f6a3a92c5ff3acb9847d3a7944d865c035df93a567d7f21bb184e9dc53
-DIST mydumper-0.6.2.tar.gz 40165 BLAKE2B a5acfaad96874cb078dda1e2f73a2b73c03c051889eee0607efb6b36ce05e2ce468b58e66688e711e1f8814b5221da1132d545cc6965b10a24f38be6291910fa SHA512 ef9e48cc481f2674456659c061c45f3cb056180ab5576805e75d458658e94998758b894e45ddc06fb716c1d37fedefb644158f07cf6e77f4b5477663e954eb83
 DIST mydumper-0.9.3.tar.gz 45320 BLAKE2B 6e6d4420ced29d4ea77aa257ee155ce0810fe7d0ac3bf22c22156dfcfba35a3c461e4115d5814b5e0050331151a5b0c3bd819c1ecc534b6644972bf76de5d004 SHA512 3bc2c85dbedf234aecca3b66f445e42bb7ddff83f914d5cc231f6a5755d1c2bf300ae9bf4bdea0717b45ea5338c6c336ec44f375dbf29570ed785ffddda53898
-EBUILD mydumper-0.6.2.ebuild 949 BLAKE2B 38d86cb8cf7adbb52055c801d7ab1914b77bf147c491c52f3ecdd759cf37b6737e74fab1e7517b342cda1fc1a5c6c729a3c99417090a033039da1bc12aa8d6fa SHA512 4b5078ef47b20819915e187121d1ff42e31d910e515ab1ec70289fdc775b48ff2da50bd549cb9fbe526dd453b9d09bd5631da12206bb254613a6ed4c0f5d7818
+DIST mydumper-0.9.5.tar.gz 60010 BLAKE2B f74a949712526b3fc3b1957c9f9dc5c5f820d88f781926331e751eb99e6315b37bd8f38ac8a0e1943485cc74fe9b14a7e74e955c77ceba6b10bb1e18a7720d75 SHA512 5b72234c88fd22c103afb9fa5a7c3c99d6585cb450b8cc7385cfd23ae2ce09c0848d15767a5957a7b8f87a7614bdb058dea8990f1a2a12300c2c74fc9da2de75
 EBUILD mydumper-0.9.3-r1.ebuild 1025 BLAKE2B bbaf77ab28323c82103b68aeee4222bf218554e45e05ae07467c18dc69e25f43ab2b1e70ddafa69cb8f2045d85c361511016de81c8d6aa20db7cdd25ffdbe614 SHA512 5b1a7b6669e4cfc85d0e32a9a5474de7dc00c27931c72219c1cd212139f616eaf492c76e749ea3cf94f88aa31d35455783b3ceb65943f9f82f34288dc037d64a
+EBUILD mydumper-0.9.5.ebuild 1026 BLAKE2B 6ded4d30e464888593beb8bf4d06441c02e17b28ff59ddb3aa9142b42dde1ccf00b05dac0977fe514d23e1be06099c217df778976a799451982bf9ac2948985c SHA512 37776222d7cc3cbcc5b520f1731d445841028aec63899a6bbfb2c1a931b78aef3987555404955f1c2742782cd599065eefbe04b6739460fc5642d4e0e606ba84
 MISC metadata.xml 448 BLAKE2B 141a4303111433ea46ec427dcf7942fae3165ea27b90c1d92f1fd4e4a82bbdea0476a7f5380250684ca763feb7ba7045bae9443329c260b0732452b3e639c5ea SHA512 192415f225533e6195856255483cb80c5da21f496bfe048518dbfccf8cdc049339ab5322d125e627a3a84fcdfb052012fd57cbe2083118917b35796f7a9e9353
diff --git a/dev-db/mydumper/files/mydumper-atomic.patch b/dev-db/mydumper/files/mydumper-atomic.patch
new file mode 100644
index 000000000000..405e6883fbcb
--- /dev/null
+++ b/dev-db/mydumper/files/mydumper-atomic.patch
@@ -0,0 +1,27 @@
+diff --git a/cmake/modules/FindMySQL.cmake b/cmake/modules/FindMySQL.cmake
+index 23470a8..2b8ae63 100644
+--- a/cmake/modules/FindMySQL.cmake
++++ b/cmake/modules/FindMySQL.cmake
+@@ -85,20 +85,8 @@ find_path(MYSQL_INCLUDE_DIR mysql.h
+ 
+ set(TMP_MYSQL_LIBRARIES "")
+ set(CMAKE_FIND_LIBRARY_SUFFIXES .so .a .lib .so.1)
+-foreach(MY_LIB ${MYSQL_ADD_LIBRARIES})
+-    find_library("MYSQL_LIBRARIES_${MY_LIB}" NAMES ${MY_LIB}
+-        HINTS
+-        ${MYSQL_ADD_LIBRARY_PATH}
+-        /usr/lib/mysql
+-	/usr/lib
+-        /usr/local/lib
+-        /usr/local/lib/mysql
+-        /usr/local/mysql/lib
+-    )
+-    list(APPEND TMP_MYSQL_LIBRARIES "${MYSQL_LIBRARIES_${MY_LIB}}")
+-endforeach(MY_LIB ${MYSQL_ADD_LIBRARIES})
+-
+-set(MYSQL_LIBRARIES ${TMP_MYSQL_LIBRARIES} CACHE FILEPATH INTERNAL)
++
++set(MYSQL_LIBRARIES ${MYSQL_ADD_LIBRARIES} CACHE FILEPATH INTERNAL)
+ 
+ if(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES)
+     set(MYSQL_FOUND TRUE CACHE INTERNAL "MySQL found")
diff --git a/dev-db/mydumper/mydumper-0.6.2.ebuild b/dev-db/mydumper/mydumper-0.6.2.ebuild
deleted file mode 100644
index 8e098e7167e4..000000000000
--- a/dev-db/mydumper/mydumper-0.6.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils versionator
-
-DESCRIPTION="A high-performance multi-threaded backup toolset for MySQL and Drizzle"
-HOMEPAGE="https://launchpad.net/mydumper"
-SRC_URI="https://launchpad.net/mydumper/$(get_version_component_range 1-2)/${PV}/+download/${P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND="dev-libs/libpcre
-	virtual/mysql
-	dev-libs/glib:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( <dev-python/sphinx-1.3 )"
-
-DOCS=( README )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# respect user cflags; do not expand ${CMAKE_C_FLAGS} (!)
-	sed -i -e 's:-Werror -O3 -g:${CMAKE_C_FLAGS}:' CMakeLists.txt
-	# fix doc install path
-	sed -i -e "s:share/doc/mydumper:share/doc/${PF}:" docs/CMakeLists.txt
-}
-
-src_configure() {
-	mycmakeargs=( $(cmake-utils_use doc BUILD_DOCS) )
-
-	cmake-utils_src_configure
-}
diff --git a/dev-db/mydumper/mydumper-0.9.5.ebuild b/dev-db/mydumper/mydumper-0.9.5.ebuild
new file mode 100644
index 000000000000..1bdc840bd0b9
--- /dev/null
+++ b/dev-db/mydumper/mydumper-0.9.5.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="A high-performance multi-threaded backup (and restore) toolset for MySQL"
+HOMEPAGE="https://github.com/maxbube/mydumper"
+SRC_URI="https://github.com/maxbube/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+CDEPEND="dev-libs/glib:=
+	dev-libs/libpcre:=
+	dev-libs/openssl:=
+	sys-libs/zlib:=
+	virtual/mysql"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? ( dev-python/sphinx )"
+RDEPEND="${CDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-atomic.patch" #654314
+)
+
+src_prepare() {
+	# respect user cflags; do not expand ${CMAKE_C_FLAGS} (!)
+	sed -i -e 's:-Werror -O3 -g:${CMAKE_C_FLAGS}:' CMakeLists.txt || die
+
+	# fix doc install path
+	sed -i -e "s:share/doc/mydumper:share/doc/${PF}:" docs/CMakeLists.txt || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=("-DBUILD_DOCS=$(usex doc)")
+
+	cmake-utils_src_configure
+}
diff --git a/dev-db/percona-toolkit/Manifest b/dev-db/percona-toolkit/Manifest
index e487f8616080..e854974d2e87 100644
--- a/dev-db/percona-toolkit/Manifest
+++ b/dev-db/percona-toolkit/Manifest
@@ -8,6 +8,7 @@ DIST percona-toolkit-2.2.11.tar.gz 1389718 BLAKE2B 3d8c1207cda30aefc710ab5329aa9
 DIST percona-toolkit-2.2.17.tar.gz 1420968 BLAKE2B 886634cb4f1ed196595c0ebe9d2d53bea898a41d81e6881173949181fbdbc752be671a22344e4e5b142d22e724e86389bf2885273a67222feb28511e1de429b0 SHA512 a6ac84db9fc77b57fffd4f18b1e6c147fa39821a8b8db128af15bac6884a2937f973aa59adb05b738c3a15d9006c71db49276207c5b321acbefd8bd3a6130b76
 DIST percona-toolkit-2.2.19.tar.gz 1425623 BLAKE2B fe9b363ec924b1af9110ea7e7dab70ad4471ddf30868391f9e02a2f6d5a5698a2cb0238dd1cca81428adcac2f21262f10ea2da272ffd881dee1b8b88be1405e0 SHA512 8da35e2ee4d81465131623e5b423c2c49c0bf0faf01862952dd5ca72c2ffea64fabcaf88dda883e633e23de8ae4a6c75a095a751708bac6a8136fc8daaae2383
 DIST percona-toolkit-2.2.20.tar.gz 1431840 BLAKE2B 76565662b4037010f7e8de98316f568c2994f55d042ae3a21b80dc3b839444a11014b61db675cc21c149f26c3b7df52013d7b06c9c1127ec325dae2942a4e4c0 SHA512 f7a5f47e9ca05c43dcb80866a1eacd13066e1f036f4f58d51145fc6354ddc86dd6515a9aa33c8f736029800bf4c80f7ba5fcb9f1e6ac41653b3351597885f679
+DIST percona-toolkit-3.0.10.tar.gz 17335242 BLAKE2B c24103576c537eb9afbdcedc6acf51671853c8e0764092f76d3ee4a1de338a521d91b956b13665ca92a06a70726b92cb9d530ab04b50ed30990868305bd0a7a0 SHA512 e9477f908bbcc5c975f11d42fe9b2b61adebe823657e23a2c74c639767c73f3f71ebdf2bec1d839ad14f2d5080c5f1f9620db07c6bf9694bd7623e86f390e902
 DIST percona-toolkit-3.0.7.tar.gz 79294306 BLAKE2B e3a556c823d355e5af504210dfb360e6fcf217ca6bfb7ba729e83e66cfdd09231c09d05fb51df1eac6bee0c6615620ac96ffce47c4f0473394d9c008ce8bdabe SHA512 e5a23ce6f4fd74f0956187679810de23a9d60f8073609289d641411c9f397f49b02c05cbcd0a68d78992849f17b70fb3ae411ac967e25c7be45f95ec374414fe
 DIST percona-toolkit-3.0.8.tar.gz 79316265 BLAKE2B 5d6efdbaa4fd3ac914c059c9240f6dcd0de89c6b2ea444c407b115b380bb676c51266f907f6e37a62a40032fd5aa6e1816752c8ec08150dddf71c7568f42c739 SHA512 d5380395b052aebe651806649ff22f259d1af9401112b7ffe86b10664b87f917fecfe91bdc72b401d00471fc9c141391006cd322c9464fca1343f704ecaa8623
 DIST percona-toolkit-3.0.9.tar.gz 15197340 BLAKE2B 095d8c0b26853caa6d2515de1d8fb8ff13b3084caa46498c8c789cd4e7b18473d41992701e393ad91cd7fdda8b3e56a099600285aeb4ba788110d36a028f76b6 SHA512 56a8732cfdbd58d0602e482d7bf049d2049104b7ae203d756db81a052cd837f16d2a35f75def4f23748534d0d2eb6441cb9fe49175a931fbcdbb6adeb42f1c53
@@ -15,6 +16,7 @@ EBUILD percona-toolkit-2.2.11.ebuild 1262 BLAKE2B 8d33c609579606aac77a67c5d568a7
 EBUILD percona-toolkit-2.2.17.ebuild 1213 BLAKE2B 8602c2ac1859da4fbefa52c5714e07a9e44c3b148b35555e4977c1c4604fdf35de3a95a658065533e9f894f01a19f7b57b0eb2c537446622ab98ab59a7b13b6e SHA512 78b956efbe27586145cee31f784cb143cec4c40ef9f06efb315367178db085f2767f8b29180be0549ab407ad77ddc20527588102354eee23d3a328fc46f8a892
 EBUILD percona-toolkit-2.2.19.ebuild 1213 BLAKE2B 784c406e8b359b1c75c49725ee670c16d4e3ea91d845d83b9b5f032cbebcf455074fa7423f42102f257df571ad7b4cd9a21bbc318175c446867047c90d1cce95 SHA512 21caa33395129da3a11c2bd3bac9eff2a722bfc473d4e1065c9baa123542239531755b4b16965c5c470e7851027ce81b9a17b35bf6ba16cd922ca34a600f8fa2
 EBUILD percona-toolkit-2.2.20.ebuild 1213 BLAKE2B 2bcc433599d64b15225e508fa16c50634b34c9963c38fae7d8ac412e730c9566751bfa1c784254018e40b5a6d8fcb6b4e52c2f85df7362d43bcf153282f7766b SHA512 f1b0b8a48e99d616d9a54a5bf6c39a06ef5e6f48992fe3e0584d464d7ed1abc5f6f08a14488cbffd4fcf4d8afe8791112094438baf06a5a4b788a953d539288b
+EBUILD percona-toolkit-3.0.10.ebuild 1249 BLAKE2B bd743a722e60cade6307bd04c774a77d0e01b2272e82974be486b47d0462120910c1182ba6fc3f7cf268f4ebfa04d432e456f62079010621aeaf6b325c743b54 SHA512 988d423c3125592608caa659543b508dcea2048b0c905a24c924e75894ca7c93924908e49f5c6c2c5d660a7b90a242e558e874849f0793d58a82abec1ad38982
 EBUILD percona-toolkit-3.0.7.ebuild 1167 BLAKE2B f61aaf597895efa1b68a04f889e93fef6207d4e2cc9f14e986aee81cccb6ca7888d7479bc01bf11bea554bb9f860615ebfb95111420c641ad7e8b16808121a24 SHA512 940474cb8cf56cff984dffc33c3848808d184c33f6d31a4bcafdc2ee16feecbe6f4084c80e243d18eb62c9f09759f274144aff2c3f45d465bc01c8f82d1e5ac1
 EBUILD percona-toolkit-3.0.8.ebuild 1249 BLAKE2B bd743a722e60cade6307bd04c774a77d0e01b2272e82974be486b47d0462120910c1182ba6fc3f7cf268f4ebfa04d432e456f62079010621aeaf6b325c743b54 SHA512 988d423c3125592608caa659543b508dcea2048b0c905a24c924e75894ca7c93924908e49f5c6c2c5d660a7b90a242e558e874849f0793d58a82abec1ad38982
 EBUILD percona-toolkit-3.0.9.ebuild 1249 BLAKE2B bd743a722e60cade6307bd04c774a77d0e01b2272e82974be486b47d0462120910c1182ba6fc3f7cf268f4ebfa04d432e456f62079010621aeaf6b325c743b54 SHA512 988d423c3125592608caa659543b508dcea2048b0c905a24c924e75894ca7c93924908e49f5c6c2c5d660a7b90a242e558e874849f0793d58a82abec1ad38982
diff --git a/dev-db/percona-toolkit/percona-toolkit-3.0.10.ebuild b/dev-db/percona-toolkit/percona-toolkit-3.0.10.ebuild
new file mode 100644
index 000000000000..8cb91309b313
--- /dev/null
+++ b/dev-db/percona-toolkit/percona-toolkit-3.0.10.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit perl-module
+
+DESCRIPTION="Advanced command-line tools to perform a variety of MySQL and system tasks"
+HOMEPAGE="https://www.percona.com/software/mysql-tools/percona-toolkit"
+SRC_URI="https://www.percona.com/downloads/${PN}/${PV}/source/tarball/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 Artistic )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+# Package warrants IUSE doc
+IUSE=""
+
+COMMON_DEPEND="dev-perl/DBI
+	dev-perl/DBD-mysql
+	virtual/perl-Time-HiRes"
+RDEPEND="${COMMON_DEPEND}
+	dev-perl/JSON
+	dev-perl/libwww-perl
+	dev-perl/Role-Tiny
+	virtual/perl-File-Path
+	virtual/perl-Getopt-Long
+	virtual/perl-Time-Local
+	virtual/perl-Digest-MD5
+	virtual/perl-IO-Compress
+	virtual/perl-File-Temp
+	virtual/perl-File-Spec
+	virtual/perl-Scalar-List-Utils
+	dev-perl/TermReadKey"
+DEPEND="${COMMON_DEPEND}
+	virtual/perl-ExtUtils-MakeMaker"
+
+# Bug #501904 - CVE-2014-2029
+# sed -i -e '/^=item --\[no\]version-check/,/^default: yes/{/^default: yes/d}' bin/*
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.7-no-versioncheck.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "s/=> 'percona-toolkit',/=> 'Percona::Toolkit',/g" \
+		Makefile.PL || die
+}
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index 9e00888fdcfc..2d422b6a720a 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -26,5 +26,5 @@ DIST sqlite-src-3230100.zip 10849436 BLAKE2B 6bed0a45c83ddb51d665835d174f623b30b
 EBUILD sqlite-3.20.1-r1.ebuild 8072 BLAKE2B 0b1c72b1efd206d11ddddea689032b7680b1909ffc1f0b46a1819dba8d62a7ee44674a124c4c529d47cc11cd378510436b1333a4d0ecb88a718a896cc047a1e8 SHA512 e819cbf0aff755be74c04b096495b909cd43d50162e7c243a67936169e42db5113880fc47e5d2da26aa0ff84a87d71bb9007eb87a026dd302d58deb5db0409ac
 EBUILD sqlite-3.21.0.ebuild 8454 BLAKE2B 87a6fcf651090d1440710bf253252ecd81164f91da4a6c2dd2a5dbc9b8e8db22f4569ddb48c7ad10efb1f930f91b37f1ac8b49621ec671c4ba64f394a3e53326 SHA512 a9d711fd29747bfa9829d6ad0c78d50fc08044e31011b2be746e2857bf8dc2969ba64c4fe80de8c9f928ca677ae105eda46b48d89ee2e9e13622fc26dabfa72f
 EBUILD sqlite-3.22.0.ebuild 9312 BLAKE2B cdeedf176f05d9e42f4b608f090a5c6c2d4f8dc6e5b36fb67114ee3a0d3f795e1303ffa4968622a5313d126911fc92daaed43084587078534afe0f51c96e734c SHA512 74115a4e493e8ba91b59ba8b866412a23779bc9246c9394e1ce3971304ae51583161211efdeb92a05787bd4985f8f6e1fd6b3d4e0a1d60194b06e7ac45348a00
-EBUILD sqlite-3.23.1.ebuild 9713 BLAKE2B 8536cb6fcc3bddc56945dd02b804c5342a92aad1e48562b460074226c904b9c2cead3742b7ef62269613c7a1adcda4dfa33cc796ca2f824bc84baaa8d6b7fb01 SHA512 ef631c527e720fbfa2ad447f96222fc1e0a1e1a90dbe3b7ea2f99e0d6127fe379ebab8740c7c8bc9279a6596837ce52ddc2116bc0a6acf2697fc6a0c30262485
+EBUILD sqlite-3.23.1.ebuild 9711 BLAKE2B abfb1c7ea84f892add4111a8b34ca6857da5b12c2394f2066bab4dd3b601870b01ccb06ef32411943dc8ce272311b80eb69b6d86875f4a0d38cc50b6de52bd77 SHA512 761e925a29f1e40f747fb79181ec52ac49cc0187d317c8df7a3135d2ec4a079dc57be53628204986e5dd2d3e1dc0f565d52fabc6d765c0fb02b257721ad1a6fa
 MISC metadata.xml 723 BLAKE2B 8866fbde770e7b8582de27303c72df047db80e0d70b1a1ceca0951a05b51bb704452071ceb6c29ecf3704d523888351615d1798aaab092e6b7505d4c6e3698ad SHA512 40616710b1d4edd3e24b5ac0797c1c9b606aeacac9f9543722bc9529e7c2c704a0c10b0ca68a5ba6e0a0ee8bc605212e8a49a050c8687afbdd7dbf28d6d4506a
diff --git a/dev-db/sqlite/sqlite-3.23.1.ebuild b/dev-db/sqlite/sqlite-3.23.1.ebuild
index 1f72b5dd3888..a27bec035fef 100644
--- a/dev-db/sqlite/sqlite-3.23.1.ebuild
+++ b/dev-db/sqlite/sqlite-3.23.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="doc? ( https://sqlite.org/2018/${PN}-doc-${DOC_PV}.zip )
 
 LICENSE="public-domain"
 SLOT="3"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
 
 RDEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}]
diff --git a/dev-go/Manifest.gz b/dev-go/Manifest.gz
index 457faaa644fb..6dc85fe6d0e3 100644
--- a/dev-go/Manifest.gz
+++ b/dev-go/Manifest.gz
diff --git a/dev-go/goptlib/Manifest b/dev-go/goptlib/Manifest
index 9ef3350f74b8..20f73215b99a 100644
--- a/dev-go/goptlib/Manifest
+++ b/dev-go/goptlib/Manifest
@@ -1,5 +1,3 @@
-DIST goptlib-0.5.tar.gz 22487 BLAKE2B a847efe4871701a9ecfbd629eaf5702f96ed7804f6dcd022f5d03fb37dab6f6c9116376f34c566fed351c6d6ee967347cb1197cd1057fd22de7387667b31871f SHA512 98443e06dbed3cdcc2652dd176e4ef89ba34b042c7886f7342a18ce319c91cf8004f2dd1eb58984685f03d25db272d23d2a9c5d872b28953f62c0b2f04be2c92
 DIST goptlib-0.6.tar.gz 25544 BLAKE2B a313981c968847337bfa9e784d964fb145aaf82348980563b374e590267ef211fc54013a6a4d9494165d9bcfbf6cc9ce1b329637fafb8baaed0a6183c2a87662 SHA512 233aa4434559d64e5d5ec5a8e243ab44157e5e467a3d473adf65f9002440d2584c8cb6cd4b69a2224b33e21703835755e2a91eb3e959acbfad5052f64ad7bfbf
-EBUILD goptlib-0.5.ebuild 638 BLAKE2B 260a17d20fbe56ac1f7fd532a2f91cd2af7ae09caa65f31b7d625273c9008eda4cc6271fde82c5ae476be1629a8fd404ca3b0c2f6fc039cec58898f7f0a24902 SHA512 44c60af772970bb40b87565afeb445ed68c2e5e70fb4fa3ee00a10fea6fb63bcb4a2334ca1b582f5ce37d7ee9d4dd1db61e3e0d06b5aafd191fd2c3ad7261a0b
 EBUILD goptlib-0.6.ebuild 648 BLAKE2B 420a5f9d2cf77b799c37fb9c2fc24a356cb88ed1e0f65098e56cd5e47188d16b1840b79b9156e6f944a8ce57835f74c46d22baad603e343cd9defafe666b74be SHA512 593e397a5f30da50d3d265343a749d4f21e2bdb8f718e04ce296cf88619d8746cff9e85a56ff0dd96b3c07bf930192d3670d26a549b8aa573e09473cc0e2727d
 MISC metadata.xml 358 BLAKE2B 330c914b403f0d5a41e538c333484f974330039b62d2ac7df08b1871a0ceb63edb391f38dd67b9286f054c6e26ada560405c92ea48433dccafb4d71b84fbb9a2 SHA512 e4ff5460265f6df156ded881294e4755b34fe2bcb0ba57836a137dfe80606a58b7c79943e46e4b4eef4197422512b06590ec041dbb451ba9b8de705417cd0253
diff --git a/dev-go/goptlib/goptlib-0.5.ebuild b/dev-go/goptlib/goptlib-0.5.ebuild
deleted file mode 100644
index 83e9e0befd8b..000000000000
--- a/dev-go/goptlib/goptlib-0.5.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit golang-build golang-vcs-snapshot
-
-EGO_SRC=git.torproject.org/pluggable-transports/goptlib.git
-EGO_PN=${EGO_SRC}/...
-EGIT_COMMIT="${PV}"
-
-DESCRIPTION="Go Tor pluggable transports library"
-HOMEPAGE="https://gitweb.torproject.org/pluggable-transports/goptlib.git"
-# No official tarballs; see https://trac.torproject.org/projects/tor/ticket/18504
-SRC_URI="mirror://debian/pool/main/g/golang-${PN}/golang-${P/-/_}.orig.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64"
-
-LICENSE="CC0-1.0"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
diff --git a/dev-go/siphash/Manifest b/dev-go/siphash/Manifest
index 5f04fade24d8..651a8cb59ae0 100644
--- a/dev-go/siphash/Manifest
+++ b/dev-go/siphash/Manifest
@@ -1,3 +1,5 @@
 DIST siphash-1.0.0.tar.gz 4462 BLAKE2B 2939eee829189db0939e2a0ff15701e7bc20b34213a5ea7b0e268a19d8eeb4618b26c11c537fd2902ce7bf3d573845a899f002155274a5172b67472879768cc5 SHA512 e52dc9857974ab362f2d7b2f7389644fbc07e7bb5507a93f138b3f692c1065303846611bb51b3d9c637d851a4d20cc20af146719a553801a8f7e17ec900a736a
+DIST siphash-1.1.0.tar.gz 10543 BLAKE2B 50f1125024d37c0692616271c60d48c10584fbf1ea52cd6a7d48fba127d0d34561898ef0c507d62570112419265daf98c893eafd93f0c4f19de04a4facabe469 SHA512 f8892d5638417c610a1e06a4f3417438a4cc87f9ed8b432540a1b2fca8fe2a2feed395538f8cfc2b9663b5870a0f91c645aaa68119db603fc05e769d5f3e102b
 EBUILD siphash-1.0.0.ebuild 493 BLAKE2B de02b406f85f9ecabad4b53c49df28cc246ea3ff407ab4c83ac9079440277ff6ea313db2bd98deb73a6ee32674cedbe6b3ad04dd122c3123a309901b48794a1e SHA512 0271de702cf368f63a0e99362822528ee7a1dae3ad2cf791dbc52e69079321d0a4dc2558aea5e4108ee3ec112c7f5d52fb8fc38cb15c50889a0a6529c2e970f1
+EBUILD siphash-1.1.0.ebuild 496 BLAKE2B 0bd5f36e0b21af7921d70ff74a6e182599e29543db3929dfee2f8c3244c62fc57aaa4846b57c80892b616d707cc874c9430c1b5dd3fd46aafc3ce1399331b833 SHA512 116266ce836ae52dffc1931cd4ff55af65a8da19a2891155e3def3e3de31abc038350c201356fc27dc8b34c02dce7705c30495316afa88f0e751691047643347
 MISC metadata.xml 437 BLAKE2B 9591ad8a9a8e98166576492945dd18bb0888975ecab6d9841a6095f9463886192c05d90d72ef3dd19d0c816c85daafef0c9878b248244197ac7cd06dfa091718 SHA512 078b666523821ec3231d88835c2416e52c7da6fc5f07ba80d04b8cff7fc3208fb97851146d7f529c85f8d7f9562e2b6cced73dc7571983bd3dee0a4b45ad883a
diff --git a/dev-go/siphash/siphash-1.1.0.ebuild b/dev-go/siphash/siphash-1.1.0.ebuild
new file mode 100644
index 000000000000..65b8737b5014
--- /dev/null
+++ b/dev-go/siphash/siphash-1.1.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-build golang-vcs-snapshot
+
+EGO_SRC=github.com/dchest/siphash
+EGO_PN=${EGO_SRC}/...
+EGIT_COMMIT="v${PV}"
+SRC_URI="https://github.com/dchest/siphash/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+DESCRIPTION="Go implementation of SipHash-2.4"
+HOMEPAGE="https://github.com/dchest/siphash"
+
+KEYWORDS="~amd64 ~arm ~x86"
+
+LICENSE="CC0-1.0"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 171ca5906377..746f807cd732 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/julia/Manifest b/dev-lang/julia/Manifest
index e59009cbc349..51990780f68e 100644
--- a/dev-lang/julia/Manifest
+++ b/dev-lang/julia/Manifest
@@ -2,6 +2,6 @@ AUX julia-0.6.0-fix_build_system.patch 3221 BLAKE2B a12ff55fd99444dfbdee5e1e0ead
 AUX julia-9999-fix_build_system.patch 2562 BLAKE2B 6300c91745656c47beff2f201376cb5ade9bc504fd416fe0c50867b4e3dffb5edd9295aebd1b8d43b1c1ecbeaa7382864c61604191f3df2b7162556ffd2499c4 SHA512 cdf084881f70890f523690eaae3e059ed09688156851dbf0c19878e8d6b76aee8a7144a9d604087c61c5db30634db530dfeba943ad170003439c8696715f677d
 DIST julia-0.6.2-bundled.tar.gz 3508868 BLAKE2B b5b3f52d8036e5603b62606cd096f22f8a975f9cab2f9baad902c0208a81868359005e82a17e513a7705ec717750702cdc12ab476ffac3c1c38158f06d80ae99 SHA512 3a9a6cc43aab2eae6c57812287958e3a1ac1718d6fdf08e5ce7c8e8e8a62231fb4d7b6f064e2d6941ac750d8924f5cb37ae3ac4e2d18f366a82c94bdc9e6abe4
 DIST julia-0.6.2.tar.gz 5592907 BLAKE2B d6d25f43cd650f6a079c4ba6fe533e6bdbf6a1123255d7651460e297ed3d35a832688e19efddf41c780fbda2eb861bc8ed5f7c59ea7efb5fdf490eb2e7a47f5d SHA512 679050463ed5825d34c477bd44cd91cfecc7d1735a2f52cc70b509afd9883cb60902861643266ecac5ba6cbb03f8fcdd12fc2e87dc41b9ed0eef813fa40610f1
-EBUILD julia-0.6.2.ebuild 5011 BLAKE2B 188b13404d5640ed201f3bd1b4906dbc223312fa1e027c1d8d8d3c0196311c8eebe0190c5083534a78f257f0fa5f7fa6d68ed7165d4699e441805e7ade37b354 SHA512 7741f561b551654993ec10b3353e39efc20e214f6c7eaca3844c0e74afddde66746fb898022b63cacff39529f0bcddb72ae77455f89c53a5ab28f6c8fc05bb8a
-EBUILD julia-9999.ebuild 3971 BLAKE2B f0308fce5dce9ff8a875a68d25a4b6bebd12d74cd834b2fcbd9f4fc525a0b2b23bf4b75789d1b03e7ba62a303ea6c7d8f44dbcfd9f6536305444426c616dddfe SHA512 7c2d033552ad94456fd90fc3eb2e825b4b03da90b24e9034f29b2bbe02fbe1eb5f1ef3ef8145831649211a7b193997f5c4ac5155a81745b55736cdbd3b87cc95
+EBUILD julia-0.6.2.ebuild 5039 BLAKE2B ccc6ede277e571ca67ca945c8b98da5171dfe0c195ca9d834b04b9c636d32f61912740614fa6d439f8a3e7e5675a13b97c7dc9538db3e473d6bba030522c0afa SHA512 cf91d5f8b249cce1e5ff7e7af8e6bb187785a5ea5c53aa35f0dc4dedd10b0cd31ca88a34cdf432a14e5f3a61beac4c86288fe0168434511082575b389c626506
+EBUILD julia-9999.ebuild 3999 BLAKE2B 2a043ca0fa70101b807f625cc3a77bff45bf3e04467047cc48e84099750c6cf4bb2add100d3da4845c945c5f93fafe8efe18200aed180b4bf84e49180c538276 SHA512 0ba4882a6abd0413e250901eac9476c7e97c9079635151df3957079e120f7c19a9cfba4a44a8e16d63e2e0b0b7faad933260e278b3824b3e694503f508b338f6
 MISC metadata.xml 1177 BLAKE2B ef735dbeb4067f98e71bbd22c16f43eab7c5507fb99815eba4a61370593bdf2d778ff6c18301b73869117e56014c93b61a42d5467539ee2ceac9307595cb0eb2 SHA512 1ed4c6477da40c7a79ee1f9efe1a33eb0ea61ee150a5a50b0c0e0241b0177541d7953d4043d159036f68d116aa41fa9413caa01b36c688fcdfb874e6627f234d
diff --git a/dev-lang/julia/julia-0.6.2.ebuild b/dev-lang/julia/julia-0.6.2.ebuild
index 397cd144fe2d..d1600435e50c 100644
--- a/dev-lang/julia/julia-0.6.2.ebuild
+++ b/dev-lang/julia/julia-0.6.2.ebuild
@@ -153,7 +153,8 @@ src_compile() {
 
 	emake cleanall
 	emake VERBOSE=1 julia-release \
-		prefix="/usr" DESTDIR="${D}" CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+		prefix="${EPREFIX}/usr" DESTDIR="${D}" \
+		CC="$(tc-getCC)" CXX="$(tc-getCXX)"
 	pax-mark m $(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')
 	emake
 }
@@ -172,7 +173,8 @@ src_install() {
 		git commit -a --allow-empty -m "initial" || die "git failed"
 
 	emake install \
-		prefix="/usr" DESTDIR="${D}" CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+		prefix="${EPREFIX}/usr" DESTDIR="${D}" \
+		CC="$(tc-getCC)" CXX="$(tc-getCXX)"
 	cat > 99julia <<-EOF
 		LDPATH=${EROOT%/}/usr/$(get_libdir)/julia
 	EOF
diff --git a/dev-lang/julia/julia-9999.ebuild b/dev-lang/julia/julia-9999.ebuild
index 86d5657b25d8..8e0c10fd4268 100644
--- a/dev-lang/julia/julia-9999.ebuild
+++ b/dev-lang/julia/julia-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -138,7 +138,8 @@ src_compile() {
 
 	emake cleanall
 	emake VERBOSE=1 julia-release \
-		prefix="/usr" DESTDIR="${D}" CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+		prefix="${EPREFIX}/usr" DESTDIR="${D}" \
+		CC="$(tc-getCC)" CXX="$(tc-getCXX)"
 	pax-mark m $(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')
 	emake
 }
@@ -149,7 +150,8 @@ src_test() {
 
 src_install() {
 	emake install \
-		prefix="/usr" DESTDIR="${D}" CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+		prefix="${EPREFIX}/usr" DESTDIR="${D}" \
+		CC="$(tc-getCC)" CXX="$(tc-getCXX)"
 	cat > 99julia <<-EOF
 		LDPATH=${EROOT%/}/usr/$(get_libdir)/julia
 	EOF
diff --git a/dev-lang/micropython/Manifest b/dev-lang/micropython/Manifest
index 1deee78b872d..24b92f1aab2a 100644
--- a/dev-lang/micropython/Manifest
+++ b/dev-lang/micropython/Manifest
@@ -1,4 +1,7 @@
 AUX micropython-1.9.3-prevent-stripping.patch 787 BLAKE2B c050420f5dae60edb93c63b504fdbe047a8c9ed56c543ffde817c86a6fd9a53efeb8561c69823186121a5727fbf29b8474eac223398fa7ee43c825e50745c6fd SHA512 5e7fa7481f4bfab15a041bbccf452d5d6fe5a5c1cd8cfae2e5ec3475d84decacc0b9c0631766582173fc4cda82d78e2370e402f95d5989e13bf3adbdaf39add4
+AUX micropython-1.9.4-prevent-stripping.patch 787 BLAKE2B 6e92c4fdfd44b89d1fad69c056dbab1493d9dc45c4223cfd2f011254db72400c6ac9a62afe84f54c301a86abd92deb56866dc25e2f1bf8af74edf308b15eb29f SHA512 8f994394f42d7fed5fa35b62c01c37ebea3b487c029d659134a263ef8d65e1ec17bec755fdf57cde2f234969bc4f7f4ab30858562d7f8cdb2bc6cb819ba2ae0d
 DIST micropython-1.9.3.tar.gz 17311734 BLAKE2B 31ebdedc402af53b205a854aa61b59c694cc893c7f80e4b84196c5d44527545f442628938b7dd923ed9086a79e00ff899682548115224613e888eb8a37dd5ae3 SHA512 1b4358913ed78df66314c9a62636c7b8d086c731459e3bee1fab8695286dc03b6ec7594b2f9b8105e2a6d62190d95c6ad5351fb64c666c1ea54b9535193ee8a8
+DIST micropython-1.9.4.tar.gz 18957648 BLAKE2B bc4dc4ef6623adbda64c9e03137860a7b9ce7d2d181434cb993438752ec39a4ea7cf7cf7a14736c57bdc2ea9c3f856b0dbe2d92fc0e1cbef99112427583ad665 SHA512 9995c983c93fb1280e60d7c52a10930a6a3de8d589a0f4264a9a4a4fede7c37e27ed4871c4c9092aec3fb33028064beb8c5eb19b7956e8f0c5d3b2a82ffa9932
 EBUILD micropython-1.9.3.ebuild 1158 BLAKE2B 1d452bdf85783135f6bb2c4e0d2f6cd297d863d00eef8003dcc9f5710e0b03194828df751a205b1c6069506c509685189a66083b27324c3f1ca9c64a06297596 SHA512 1eef495d618817b0023c13b4bd7606ddec09f4ad32e6beffe3bc418549781b53d92340af90a39e3995f8decc9454b9221b2b048ec713e01fec7c1fc058ca8744
+EBUILD micropython-1.9.4.ebuild 1161 BLAKE2B 9bc660c6e4e93cf30ec20a9ca1758a13024ec2c16cfcf442f406912e59a3bf3009dfda29dbc0947d0dc966538fd802d551728019abd9212fa851153224a56713 SHA512 d22375deb3c95e317b8a8cde81f0366b1d83a90ffddd3f52b253b78313e96cc93b5e8e07c4efb4f997ac3f204cfbbca159d698136c4cbfe0151433246335e9d6
 MISC metadata.xml 1347 BLAKE2B c121e2eafde4ab3c49a352ab96ffbcc042ecddb5a765f3192589a41f5b3bc5f92e6a6f1a58df21ef2812424aac94e6cd579cfe1d29b4dd16983048768f1694ed SHA512 e8dd8f7cc3d0c570da6b9982596e39891e78e302581dbc0601d622831f976f16b9e9f78d7e0b55ae58ed3c81c3e7113a4217ca1671cdd8929f0b34b4647efc3a
diff --git a/dev-lang/micropython/files/micropython-1.9.4-prevent-stripping.patch b/dev-lang/micropython/files/micropython-1.9.4-prevent-stripping.patch
new file mode 100644
index 000000000000..a130b72b6131
--- /dev/null
+++ b/dev-lang/micropython/files/micropython-1.9.4-prevent-stripping.patch
@@ -0,0 +1,22 @@
+--- a/py/mkenv.mk	2017-11-25 09:52:30.921836372 +0000
++++ a/py/mkenv.mk	2017-11-25 09:52:35.257861233 +0000
+@@ -50,7 +50,6 @@
+ LD = $(CROSS_COMPILE)ld
+ OBJCOPY = $(CROSS_COMPILE)objcopy
+ SIZE = $(CROSS_COMPILE)size
+-STRIP = $(CROSS_COMPILE)strip
+ AR = $(CROSS_COMPILE)ar
+ ifeq ($(MICROPY_FORCE_32BIT),1)
+ CC += -m32
+--- a/py/mkrules.mk	2017-11-25 09:53:13.107078063 +0000
++++ a/py/mkrules.mk	2017-11-25 09:53:31.898185592 +0000
+@@ -129,9 +129,6 @@
+ # Do not pass COPT here - it's *C* compiler optimizations. For example,
+ # we may want to compile using Thumb, but link with non-Thumb libc.
+ 	$(Q)$(CC) -o $@ $^ $(LIB) $(LDFLAGS)
+-ifndef DEBUG
+-	$(Q)$(STRIP) $(STRIPFLAGS_EXTRA) $(PROG)
+-endif
+ 	$(Q)$(SIZE) $$(find $(BUILD) -path "$(BUILD)/build/frozen*.o") $(PROG)
+ 
+ clean: clean-prog
diff --git a/dev-lang/micropython/micropython-1.9.4.ebuild b/dev-lang/micropython/micropython-1.9.4.ebuild
new file mode 100644
index 000000000000..95899e4fd9b4
--- /dev/null
+++ b/dev-lang/micropython/micropython-1.9.4.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Python implementation for microcontrollers"
+HOMEPAGE="https://github.com/micropython/micropython"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+
+DEPEND="
+	virtual/libffi
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/${P}-prevent-stripping.patch" )
+
+src_compile() {
+	cd ports/unix || die
+
+	# 1) don't die on compiler warnings
+	# 2) remove /usr/local prefix references in favour of /usr
+	sed -i \
+		-e 's#-Werror##g;' \
+		-e 's#\/usr\/local#\/usr#g;' \
+		Makefile || die
+	emake CC="$(tc-getCC)" axtls
+	emake CC="$(tc-getCC)"
+}
+
+src_test() {
+	# TODO: find out why these tests fail
+	rm -v tests/stress/recursive_iternext* || die
+
+	cd ports/unix || die
+	emake test
+}
+
+src_install() {
+	pushd ports/unix > /dev/null || die
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" DESTDIR="${D}" install
+	popd > /dev/null || die
+
+	# remove .git files
+	find tools -type f -name '.git*' -exec rm {} \; || die
+
+	dodoc -r tools
+	einstalldocs
+}
diff --git a/dev-lang/orc/Manifest b/dev-lang/orc/Manifest
index f3b6d56f2183..0c2142cc1698 100644
--- a/dev-lang/orc/Manifest
+++ b/dev-lang/orc/Manifest
@@ -1,5 +1,5 @@
 DIST orc-0.4.27.tar.xz 465116 BLAKE2B 1289867c84371797350847e1ae71a002ec250abc56611fe6ec8d263ff64e17ed8d990f45adfbf6d1a0c7e98c2e6ec30c3135e433f00e9fa53cecce359f5b2d72 SHA512 5ca0b4553e370ea7c95acfc8248d9d568dafc9577041d47f52c7d0945456c534e18e0e80d28df9301d6deac1ea4f8ea6a51ca373b32927c8724846d8ec1f73e8
 DIST orc-0.4.28.tar.xz 469460 BLAKE2B 86fa2d10a33fbffbb2b96827adbddaa81d0baa8135fe21fba338cbcd25a1c1e853873ec1c4ef5c0a32d66ba95f855f1f16ddbc32f68a89e5a98c75b9b0261aa7 SHA512 2ae3100e7d0c03eba9a8a10a8924da4d729e1967b63e5dfdf88c4aee907d7ece82c782d74f4cb7e28a366dd74ce5e1ddc6e2b971e5a2f879b0501cc313b93410
 EBUILD orc-0.4.27.ebuild 1832 BLAKE2B e0e0f1df95102719f9f079efdb27760192acb8b3b27232a27984cef94bf03587d16424234d368583200f9e6e4183f7068cd322b55d3d9d559d57d87c5b00d438 SHA512 3a66189a789f995069dc8869fb33846306f4a0e5ff3419bae1e921c26b1187615e17ca6c6f4647eed8e4fc0ab4f5e03a6df0a3dfe762a9090aa409912cfe4497
-EBUILD orc-0.4.28-r1.ebuild 2194 BLAKE2B f092b45b64594e9d896680c9a78368855ef395f0383d7042488eabd0a0418fd426b7379c2ff462245cf1d805ae44a0250de0144de0c50764c1f73c26fcdb7bd1 SHA512 5a809385529fc2ae03fe8a242f71785fc7eb84e1861af2432697f1707c33bf470a86bd4dd28bd613f0d17e1d19776b4f2c9856adf9d2579c1c1236e85b53c60c
+EBUILD orc-0.4.28-r1.ebuild 2193 BLAKE2B bac3f7d982f8b488c4668963bcd98cf5d079792c7814e28681072f909da2ebcf553243b206bacff7d777c859d787f5eeaeb8017fbe206066dc3352845f73c705 SHA512 5c975b44e2e2933eb5945336dffbc8ec06f9f0ef65ef89af61ea188bc7029273f8b5ab70b3c2559ea9712c1b5bfcc4878bda2853a5c9f72cdd5a3e1c5681fd03
 MISC metadata.xml 354 BLAKE2B b24bce431d7ad10e9231e89b522e67de16192ee4e48281b8a17f002692632449ab676cb9df6ff5a22563d6f9657ee6be11e452bac41f8a537c598822efab85d1 SHA512 4f17c4c3faa3f2c5feaefe4727b3500360f7cc5486c794e9a34608c3e437b4e2cc266bc9e0e2b3824952a8da62421fda59e9bc5140ee88898f8f7bdde402762f
diff --git a/dev-lang/orc/orc-0.4.28-r1.ebuild b/dev-lang/orc/orc-0.4.28-r1.ebuild
index 7bc99c46d181..f3c0d8f6779d 100644
--- a/dev-lang/orc/orc-0.4.28-r1.ebuild
+++ b/dev-lang/orc/orc-0.4.28-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="BSD BSD-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ppc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm ~arm64 ~hppa ppc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples pax_kernel static-libs"
 
 RDEPEND=""
diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest
index 775d2eb350d9..006b5eec5f7b 100644
--- a/dev-lang/rust/Manifest
+++ b/dev-lang/rust/Manifest
@@ -7,5 +7,6 @@ DIST rust-1.25.0-x86_64-unknown-linux-gnu.tar.xz 111059260 BLAKE2B ae982976a735c
 DIST rustc-1.25.0-src.tar.gz 98639156 BLAKE2B 1408d5dd0611d4830de3b6b3d00e3fad4198a47599b639d0ac0bd05aaba401f743056a942e9df04a4d192c6b12e8cfe9a9cdf8cd26e48b72104ce9b423df049e SHA512 7d8886f4d5a621eb794e814deb60be681fa38cf086f87ffa14e5a3500c640b237c549a632de1331a0f1b71963de41f6d31a4df3866b7e597424002316fed81ce
 DIST rustc-1.26.0-src.tar.xz 54613664 BLAKE2B 798985e4060c28828066118f39fc296e52b3796ae02f3917912680154047eb6f91806b3d45f3a0e9afcef55d95cea3079debae12d2ddf2d9c46f992e12519094 SHA512 563b910ecf4b2a0d798a1201177f733333e64efad49e5aceec5adc66a8c6903df391c9afc0fdd8284348c08082e0c4de1e5cb68efe6797594de43ca93e4ad7a2
 EBUILD rust-1.25.0.ebuild 4601 BLAKE2B fd0f6cfd9c480b1a6ce19cc02a66233a5acbca045d66955fe4263b66456145f5602de2878b739d99fb42d09c92ec99e7311402cea863e415fe2bdcd6ee0d88e3 SHA512 8928dbf17abbdd5b484dccc6d2fee12e1f653b0e37d2b4a2750cee0c64dea749102baa2ef13c46aa46a40d88fcea364730ad35f1ca72a017f00e60943f9470e4
+EBUILD rust-1.26.0-r2.ebuild 6130 BLAKE2B e2819e23de7ef609f8671faa5fd631e4330d87822d870c172dad8728695610cc2388852c08c4a143e4cf3137040d03183698e09ef00613d601f909aeee8dcce3 SHA512 3b7273d6d3e91812ebf8fb3233ee45dac139cd0d1a22979ffd939092af63bc1b16a7b1d99e3aad0827361830e4faeacb46670306e1b9794e2952bf675c1b7201
 EBUILD rust-1.26.0.ebuild 4927 BLAKE2B 7e78c4897053f80fb47c91ab83aaac3fcb772ab75796112aa035781663a962d052ff7486c4baafb2b809e6b22ed10f18ec495aa063a76065d3f45d69b603b80c SHA512 62197eb7b7e0be13f547b49b15491a71689c9076d8805fc53771e9b57e7aac3fbc0197ba6a087958e6be788c57885fa4b5cdc22767f57f318235c91ac40a4c3e
 MISC metadata.xml 482 BLAKE2B c75f5749d7c3b17c9ea4c811809448dbaea4723e74da9e0a9ba4e492c3275875c95ae4d209a0129c24f3e692c00c77e36f16b23e2b3d6ea22c05f50b0de7d054 SHA512 5e9ea6d3db22676701c132298ea8b03453a53aa3b79f564f2cc021735b60329f1201c871541dde362315e938543e89afc6f0c3629218744ddca75d95deeb4a88
diff --git a/dev-lang/rust/rust-1.26.0-r2.ebuild b/dev-lang/rust/rust-1.26.0-r2.ebuild
new file mode 100644
index 000000000000..4a0bbfdb7ec6
--- /dev/null
+++ b/dev-lang/rust/rust-1.26.0-r2.ebuild
@@ -0,0 +1,220 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+
+inherit multiprocessing multilib-build python-any-r1 versionator toolchain-funcs
+
+if [[ ${PV} = *beta* ]]; then
+	betaver=${PV//*beta}
+	BETA_SNAPSHOT="${betaver:0:4}-${betaver:4:2}-${betaver:6:2}"
+	MY_P="rustc-beta"
+	SLOT="beta/${PV}"
+	SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.xz"
+	KEYWORDS=""
+else
+	ABI_VER="$(get_version_component_range 1-2)"
+	SLOT="stable/${ABI_VER}"
+	MY_P="rustc-${PV}"
+	SRC="${MY_P}-src.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+CHOST_amd64=x86_64-unknown-linux-gnu
+CHOST_x86=i686-unknown-linux-gnu
+CHOST_arm64=aarch64-unknown-linux-gnu
+
+RUST_STAGE0_VERSION="1.$(($(get_version_component_range 2) - 1)).0"
+RUST_STAGE0_amd64="rust-${RUST_STAGE0_VERSION}-${CHOST_amd64}"
+RUST_STAGE0_x86="rust-${RUST_STAGE0_VERSION}-${CHOST_x86}"
+RUST_STAGE0_arm64="rust-${RUST_STAGE0_VERSION}-${CHOST_arm64}"
+
+CARGO_DEPEND_VERSION="0.$(($(get_version_component_range 2) + 1)).0"
+
+DESCRIPTION="Systems programming language from Mozilla"
+HOMEPAGE="http://www.rust-lang.org/"
+
+SRC_URI="https://static.rust-lang.org/dist/${SRC} -> rustc-${PV}-src.tar.xz
+	amd64? ( https://static.rust-lang.org/dist/${RUST_STAGE0_amd64}.tar.xz )
+	x86? ( https://static.rust-lang.org/dist/${RUST_STAGE0_x86}.tar.xz )
+	arm64? ( https://static.rust-lang.org/dist/${RUST_STAGE0_arm64}.tar.xz )
+"
+
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
+	NVPTX PowerPC Sparc SystemZ X86 XCore )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
+
+LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
+
+IUSE="debug doc extended +jemalloc ${ALL_LLVM_TARGETS[*]}"
+
+RDEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
+		jemalloc? ( dev-libs/jemalloc )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	|| (
+		>=sys-devel/gcc-4.7
+		>=sys-devel/clang-3.5
+	)
+	dev-util/cmake
+"
+PDEPEND="!extended? ( >=dev-util/cargo-${CARGO_DEPEND_VERSION} )"
+
+REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
+
+S="${WORKDIR}/${MY_P}-src"
+
+toml_usex() {
+	usex "$1" true false
+}
+
+src_prepare() {
+	local rust_stage0_root="${WORKDIR}"/rust-stage0
+
+	local rust_stage0_name="RUST_STAGE0_${ARCH}"
+	local rust_stage0="${!rust_stage0_name}"
+
+	"${WORKDIR}/${rust_stage0}"/install.sh --disable-ldconfig --destdir="${rust_stage0_root}" --prefix=/ || die
+
+	default
+}
+
+src_configure() {
+	local rust_target="" rust_targets="" rust_target_name arch_cflags
+
+	# Collect rust target names to compile standard libs for all ABIs.
+	for v in $(multilib_get_enabled_abi_pairs); do
+		rust_target_name="CHOST_${v##*.}"
+		rust_targets="${rust_targets},\"${!rust_target_name}\""
+	done
+	rust_targets="${rust_targets#,}"
+
+	local rust_stage0_root="${WORKDIR}"/rust-stage0
+
+	rust_target_name="CHOST_${ARCH}"
+	rust_target="${!rust_target_name}"
+
+	cat <<- EOF > "${S}"/config.toml
+		[llvm]
+		optimize = $(toml_usex !debug)
+		release-debuginfo = $(toml_usex debug)
+		assertions = $(toml_usex debug)
+		[build]
+		build = "${rust_target}"
+		host = ["${rust_target}"]
+		target = [${rust_targets}]
+		cargo = "${rust_stage0_root}/bin/cargo"
+		rustc = "${rust_stage0_root}/bin/rustc"
+		docs = $(toml_usex doc)
+		submodules = false
+		python = "${EPYTHON}"
+		locked-deps = true
+		vendor = true
+		verbose = 2
+		extended = $(toml_usex extended)
+		[install]
+		prefix = "${EPREFIX}/usr"
+		libdir = "$(get_libdir)"
+		docdir = "share/doc/${P}"
+		mandir = "share/${P}/man"
+		[rust]
+		optimize = $(toml_usex !debug)
+		debuginfo = $(toml_usex debug)
+		debug-assertions = $(toml_usex debug)
+		use-jemalloc = $(toml_usex jemalloc)
+		default-linker = "$(tc-getCC)"
+		rpath = false
+	EOF
+
+	for v in $(multilib_get_enabled_abi_pairs); do
+		rust_target=$(get_abi_CHOST ${v##*.})
+		arch_cflags="$(get_abi_CFLAGS ${v##*.})"
+
+		cat <<- EOF >> "${S}"/config.env
+			CFLAGS_${rust_target}=${arch_cflags}
+		EOF
+
+		cat <<- EOF >> "${S}"/config.toml
+			[target.${rust_target}]
+			cc = "$(tc-getBUILD_CC)"
+			cxx = "$(tc-getBUILD_CXX)"
+			linker = "$(tc-getCC)"
+			ar = "$(tc-getAR)"
+		EOF
+	done
+}
+
+src_compile() {
+	env $(cat "${S}"/config.env)\
+		./x.py build --verbose --config="${S}"/config.toml -j$(makeopts_jobs) || die
+}
+
+src_install() {
+	local rust_target abi_libdir
+
+	env DESTDIR="${D}" ./x.py install || die
+
+	mv "${D}/usr/bin/rustc" "${D}/usr/bin/rustc-${PV}" || die
+	mv "${D}/usr/bin/rustdoc" "${D}/usr/bin/rustdoc-${PV}" || die
+	mv "${D}/usr/bin/rust-gdb" "${D}/usr/bin/rust-gdb-${PV}" || die
+	mv "${D}/usr/bin/rust-lldb" "${D}/usr/bin/rust-lldb-${PV}" || die
+
+	# Copy shared library versions of standard libraries for all targets
+	# into the system's abi-dependent lib directories because the rust
+	# installer only does so for the native ABI.
+	for v in $(multilib_get_enabled_abi_pairs); do
+		if [ ${v##*.} = ${DEFAULT_ABI} ]; then
+			continue
+		fi
+		abi_libdir=$(get_abi_LIBDIR ${v##*.})
+		rust_target=$(get_abi_CHOST ${v##*.})
+		mkdir -p ${D}/usr/${abi_libdir}
+		cp ${D}/usr/$(get_libdir)/rustlib/${rust_target}/lib/*.so \
+		   ${D}/usr/${abi_libdir} || die
+	done
+
+	dodoc COPYRIGHT
+
+	# FIXME:
+	# Really not sure if that env is needed, specailly LDPATH
+	cat <<-EOF > "${T}"/50${P}
+		LDPATH="/usr/$(get_libdir)/${P}"
+		MANPATH="/usr/share/${P}/man"
+	EOF
+	doenvd "${T}"/50${P}
+
+	cat <<-EOF > "${T}/provider-${P}"
+		/usr/bin/rustdoc
+		/usr/bin/rust-gdb
+		/usr/bin/rust-lldb
+	EOF
+	dodir /etc/env.d/rust
+	insinto /etc/env.d/rust
+	doins "${T}/provider-${P}"
+}
+
+pkg_postinst() {
+	eselect rust update --if-unset
+
+	elog "Rust installs a helper script for calling GDB and LLDB,"
+	elog "for your convenience it is installed under /usr/bin/rust-{gdb,lldb}-${PV}."
+
+	if has_version app-editors/emacs || has_version app-editors/emacs-vcs; then
+		elog "install app-emacs/rust-mode to get emacs support for rust."
+	fi
+
+	if has_version app-editors/gvim || has_version app-editors/vim; then
+		elog "install app-vim/rust-vim to get vim support for rust."
+	fi
+
+	if has_version 'app-shells/zsh'; then
+		elog "install app-shells/rust-zshcomp to get zsh completion for rust."
+	fi
+}
+
+pkg_postrm() {
+	eselect rust unset --if-invalid
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 0d5842e95326..f362b4bc1279 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/amdgpu-pro-opencl/Manifest b/dev-libs/amdgpu-pro-opencl/Manifest
index 2949c2f447e0..cd92aa940874 100644
--- a/dev-libs/amdgpu-pro-opencl/Manifest
+++ b/dev-libs/amdgpu-pro-opencl/Manifest
@@ -1,5 +1,3 @@
-DIST amdgpu-pro-17.40-492261.tar.xz 361491288 BLAKE2B 72093e803ad163724d9708dab0085d18a6dfd994588005b7a49da6e0e94a892ac479c87cafb7a9c848996d1db0860ae591d1cced2137ca71be4966705d5413b3 SHA512 b10d67f4fc7bfbf8f1de46e5202fabc3443e969759817d497449d911d4c591256cfdf73372013fdc67bd89c44ffe389c021c9f77ba27f55cbb5257af550bd148
 DIST amdgpu-pro-17.50-511655.tar.xz 547875548 BLAKE2B c3e396d9846ca15297ecbfd8ff1c9ca3aae6352080f280dc13f2ad4d32da7b84a6d069fd4b64c6e4d9814459cc5cca1ab838295a83ede953a9df6cdcd1387f91 SHA512 d4d995eb596f94656d2fb6e43a2db29bcbfe28e09f75e19e23d1d446de899dbb6e4597ef833955a8b1788055fa848bc14e45a32c820ed8e97c667a784cf816cc
-EBUILD amdgpu-pro-opencl-17.40.492261.ebuild 2355 BLAKE2B 55b988522b486e9fe049d15fc6af3c7346a052b337ed86c3f104e924d42dc69884a21c33fab145b7bfbc8fce4444880241f81fdf55e28988c1947677a46ddce5 SHA512 f3d5cd29520939d1127efd8a30bf2922092fba1b085416b61f8cd0c950db490c2074407dfab317a2facb72a89c4b4cb0a898eef3bc904c84813016b6184da8be
-EBUILD amdgpu-pro-opencl-17.50.511655.ebuild 2379 BLAKE2B cf51192119d1095c7fa84a9ba13e170be736376712d39150890f89075ea68a0d288382a6c200938f3164b086f327fa574388ce90dd31ec48d628cc2bb6de5eca SHA512 f4bddb55a6c8a285faa7fabf8599d0267202b89fd86f67fffc18deace742cb317c032f1f1549aac85ff3430a06c821ecb8b7b2948d3860d9e63bc436ec5bd246
+EBUILD amdgpu-pro-opencl-17.50.511655.ebuild 2318 BLAKE2B 3e10a4c7175cee812461c34520ccd0c387e4982534d0d87596564662cf80677603c7cc7c472f5bf6d3cdb400d41a425c5cc53afc0fc8d68cbc1cba9353beb0a3 SHA512 17ac8d30044a2ba5c875b7ff828a61e16a303074f4fc2f84ea0b844138dcbb4fce210daf9f0b40bbded180f4b3e2ef8302a4b34289e8ff82a9c98fc2b7147fd9
 MISC metadata.xml 656 BLAKE2B 5af3c00c551e7fd2b0de6d8c24421a58986ef20c24b7f2799a428dc7e07e2da4841ce93ade51edae33c0ba79dc55ed6df3452c0b5a610499e7e79e09c31b22de SHA512 5f6933f6ff6dd222a54e4c3609b888182ffd136bb0b58c905624cc9b404091b4e46917cf20d4d24585fa3ed710fb9881f3b6437e015371743d23d07fab488fb0
diff --git a/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-17.40.492261.ebuild b/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-17.40.492261.ebuild
deleted file mode 100644
index 88731bbbc217..000000000000
--- a/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-17.40.492261.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 unpacker versionator
-
-SUPER_PN='amdgpu-pro'
-MY_PV=$(replace_version_separator 2 '-')
-
-DESCRIPTION="Proprietary OpenCL implementation for AMD GPUs"
-HOMEPAGE="https://support.amd.com/en-us/kb-articles/Pages/AMDGPU-PRO-Driver-for-Linux-Release-Notes.aspx"
-SRC_URI="${SUPER_PN}-${MY_PV}.tar.xz"
-
-LICENSE="AMD-GPU-PRO-EULA"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RESTRICT="mirror fetch strip"
-
-DEPEND="dev-util/patchelf"
-RDEPEND="dev-libs/ocl-icd"
-
-QA_PREBUILT="/opt/${SUPER_PN}/lib*/*"
-
-S="${WORKDIR}/${SUPER_PN}-${MY_PV}"
-
-pkg_nofetch() {
-	local pkgver=$(get_version_component_range 1-2)
-	einfo "Please download the AMDGPU-Pro Driver ${pkgver} for Ubuntu from"
-	einfo "    ${HOMEPAGE}"
-	einfo "The archive should then be placed into ${DISTDIR}."
-}
-
-src_unpack() {
-	default
-
-	local ids_ver="1.0.0"
-	local libdrm_ver="2.4.82"
-	local patchlevel=$(get_version_component_range 3)
-	cd "${S}" || die
-	unpack_deb opencl-${SUPER_PN}-icd_${MY_PV}_amd64.deb
-	unpack_deb libdrm-${SUPER_PN}-amdgpu1_${libdrm_ver}-${patchlevel}_amd64.deb
-	unpack_deb ids-${SUPER_PN}_${ids_ver}-${patchlevel}_all.deb
-}
-
-src_prepare() {
-	default
-
-	cd "${S}/opt/${SUPER_PN}/lib/x86_64-linux-gnu" || die
-	patchelf --set-rpath '$ORIGIN' libamdocl64.so || die "Failed to fix library rpath"
-}
-
-src_install() {
-	into "/opt/${SUPER_PN}"
-	dolib opt/${SUPER_PN}/lib/x86_64-linux-gnu/*
-	insinto "/opt/${SUPER_PN}"
-	doins -r opt/${SUPER_PN}/share
-
-	insinto /etc/OpenCL/vendors/
-	echo "/opt/${SUPER_PN}/$(get_libdir)/libamdocl64.so" > "${SUPER_PN}.icd" || die "Failed to generate ICD file"
-	doins "${SUPER_PN}.icd"
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		ewarn "Please note that using proprietary OpenCL libraries together with the"
-		ewarn "Open Source amdgpu stack is not officially supported by AMD. Do not ask them"
-		ewarn "for support in case of problems with this package."
-		ewarn ""
-		ewarn "Furthermore, if you have the whole AMDGPU-Pro stack installed this package"
-		ewarn "will almost certainly conflict with it. This might change once AMDGPU-Pro"
-		ewarn "has become officially supported by Gentoo."
-	fi
-
-	elog "AMD OpenCL driver relies on dev-libs/ocl-icd to work. To enable it, please run"
-	elog ""
-	elog "    eselect opencl set ocl-icd"
-	elog ""
-}
diff --git a/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-17.50.511655.ebuild b/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-17.50.511655.ebuild
index a8eb4c59e2aa..e822eb2d141e 100644
--- a/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-17.50.511655.ebuild
+++ b/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-17.50.511655.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit unpacker versionator
+inherit unpacker eapi7-ver
 
 SUPER_PN='amdgpu-pro'
-MY_PV=$(replace_version_separator 2 '-')
+MY_PV=$(ver_rs 2 '-')
 
 DESCRIPTION="Proprietary OpenCL implementation for AMD GPUs"
 HOMEPAGE="https://support.amd.com/en-us/kb-articles/Pages/Radeon-Software-for-Linux-Release-Notes.aspx"
@@ -26,7 +26,7 @@ QA_PREBUILT="/opt/${SUPER_PN}/lib*/*"
 S="${WORKDIR}/${SUPER_PN}-${MY_PV}"
 
 pkg_nofetch() {
-	local pkgver=$(get_version_component_range 1-2)
+	local pkgver=$(ver_cut 1-2)
 	einfo "Please download the Radeon Software for Linux Driver ${pkgver} for Ubuntu from"
 	einfo "    ${HOMEPAGE}"
 	einfo "The archive should then be placed into ${DISTDIR}."
@@ -37,7 +37,7 @@ src_unpack() {
 
 	local ids_ver="1.0.0"
 	local libdrm_ver="2.4.82"
-	local patchlevel=$(get_version_component_range 3)
+	local patchlevel=$(ver_cut 3)
 	cd "${S}" || die
 	unpack_deb opencl-${SUPER_PN}-icd_${MY_PV}_amd64.deb
 	unpack_deb libdrm-amdgpu-amdgpu1_${libdrm_ver}-${patchlevel}_amd64.deb
diff --git a/dev-libs/libbsd/Manifest b/dev-libs/libbsd/Manifest
index 359d90e4a18b..1e2b67869490 100644
--- a/dev-libs/libbsd/Manifest
+++ b/dev-libs/libbsd/Manifest
@@ -1,6 +1,8 @@
 AUX libbsd-0.8.6-sparc.patch 832 BLAKE2B d02e16c7d338239ab56c6a1ce88cbf0e0c6736208ac40bf2272fbae5ddf16f10f89701515c69d81d541286012b3b9ce8fe0322197331f9c9b6293aa8454e53c1 SHA512 5b476340a35a02a15706ab7704f4e78b5f78f87e471a0749624ad4f37f9459e2d90c35fbe7984a226f247f26a4809c6a79d1c792e6c1ed64d2a9b4b984513055
 DIST libbsd-0.8.6.tar.xz 371112 BLAKE2B adab6c17267e0cff128351efccf5c1225b7dd85dc61dd8168bf212ba5aff8d726fa5be687c041821af9a427ddad9dfcd3630cac9134b9e81c86ab2599e43aef9 SHA512 ece01ced324f840c2cee6321c7dcf97ff123d55ea9f203c1ce35e1b46643dc7b34ef6dc6c8d128252b36848624850b40823411cc96b99a66a401eb1e9d8cea6b
 DIST libbsd-0.8.7.tar.xz 371772 BLAKE2B aa4aa1c19872edf9e7e6ed270275199366345531a48ee28c25e209f17c5403a22269b91ab1c806cb1b54ba33a8464f4b035fe7ee2bc5dddd0a4fda09c540b058 SHA512 605a14eb5d33c0e45c3bd29e585ebc15832e2ed1efa9356291a0562622168da96db1a20766e9dae8910ea0c1516429f43905edc8d4f2a40a5a341a689d08fcc3
+DIST libbsd-0.9.1.tar.xz 387180 BLAKE2B 40dd82ca1088ee7aae8b3d7685e8514eec702bf7ada7ef98f7177cad92b7e0fccc22a953b35f0f27202eb56833b31a81bef1324d43864d1b80887ba7c58684d5 SHA512 435822b8f2495a5e2705e5ab5c834a4f0f3a177b3e5c46a7c6162924507ca984e957e94a512b5ebd0067ecb413bac458fade357709ef199e9b75edf0315de91c
 EBUILD libbsd-0.8.6.ebuild 1222 BLAKE2B 35e69a9e63aa708d91771a6c61c445d7845fd2210674b9a65ad3a57ae03d25e341815cdc12ee55c35dd08946ab5ce5d047bd2bb81461485dc9e426fa931bbc71 SHA512 2749abfd46ea431b13dd18678b124d1bf8d320957ec6d757f0671c0cfb0d2811418b798bae20efca7eb86bb2cfd5adf568995657b931032a6d8cb61850729110
 EBUILD libbsd-0.8.7.ebuild 1232 BLAKE2B d30cbbad96b19726f36e83d9fb8c69d14f53702c74f0401ce9abee5b7f7cddbd0f90da75d02833535e12fc1d9f4dbf202305466d8ef712fe892c08c707b94fc3 SHA512 1967086f1067249a65c99a6c68fe0e3238b120ad15d6dc5d6a9ebed7105ae3e4cd86b6c51aa4e1bfbd2ce5b3b0597ae20cfd6326c14d6a06f38d6406e1ad30f2
+EBUILD libbsd-0.9.1.ebuild 1180 BLAKE2B 485f9f85395b785633baa62ba88741c30737e36f190f9fe20ea2093d924c64963296c10f1de5852418a2a1c697f2c463baf7ae963449300130d58bacf6cb3db0 SHA512 6f44e592dcfd2d71bd65bedf7107dd71d8eb0ee76b1f0ac20a1e386fa1abc296bde0381e4757e1b7c2f981134f0b59bb30e4f96a9fada6fa74187a6bb2cef063
 MISC metadata.xml 276 BLAKE2B 889856a4e8b234e03eb27d32a4bce748a561f98ca0faa36de124e58e3832d804d1492f59db1154c4ec0e2e0e46c7d9cf38d9911ee83dd0863699581000610f31 SHA512 673180ba375ea401c0a8f197d516417b3f9361b11943c71bac88b0d0b1407b0bc657f5763c6fb6e429cc6ee112869a2247083fe56743e9ce918855c0ea929e59
diff --git a/dev-libs/libbsd/libbsd-0.9.1.ebuild b/dev-libs/libbsd/libbsd-0.9.1.ebuild
new file mode 100644
index 000000000000..bde7f808bf8b
--- /dev/null
+++ b/dev-libs/libbsd/libbsd-0.9.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit multilib-minimal
+
+DESCRIPTION="An library to provide useful functions commonly found on BSD systems"
+HOMEPAGE="https://libbsd.freedesktop.org/wiki/"
+SRC_URI="https://${PN}.freedesktop.org/releases/${P}.tar.xz"
+
+LICENSE="BSD BSD-2 BSD-4 ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="static-libs"
+
+DEPEND=">=sys-kernel/linux-headers-3.17"
+RDEPEND=""
+
+pkg_setup() {
+	local f="${EROOT}/usr/$(get_libdir)/${PN}.a"
+	local m="You need to remove ${f} by hand or re-emerge sys-libs/glibc first."
+	if ! has_version ${CATEGORY}/${PN}; then
+		if [[ -e ${f} ]]; then
+			eerror "${m}"
+			die "${m}"
+		fi
+	fi
+}
+
+multilib_src_configure() {
+	# The build system will install libbsd-ctor.a despite of USE="-static-libs"
+	# which is correct, see:
+	# https://cgit.freedesktop.org/libbsd/commit/?id=c5b959028734ca2281250c85773d9b5e1d259bc8
+	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/dev-libs/libfmt/Manifest b/dev-libs/libfmt/Manifest
index 856b0ec9070e..617b9ecb57e7 100644
--- a/dev-libs/libfmt/Manifest
+++ b/dev-libs/libfmt/Manifest
@@ -2,9 +2,11 @@ DIST libfmt-3.0.1.tar.gz 606603 BLAKE2B faba3f2e1ab6677403141d7eb9a217857f1a1866
 DIST libfmt-3.0.2.tar.gz 608369 BLAKE2B abc4634a8f3da9eed68e5f52497503a34a25e8cd3141819bfb8c08c4dd9eb47edac1e263d81d997d1465a221fa1958c6a5c40a8bdd06017430922a25716b1c34 SHA512 50f5a25d1a10fd5b265f3811fa11886b9efdae2952f2aefc9f22c87c1a748128369f4d530b320e5e9c67c745cdab4607d1cb08940f4cf968300dee22e1150117
 DIST libfmt-4.0.0.tar.gz 617818 BLAKE2B 0cbbbb86bb6ff488226786c40cdf919fa2004c25a3da7a11ec69b81b08ca58a6a721c4e11f42a684d790c61b6ba0012d04f3af8b75f38ff2fd80332e80795a82 SHA512 8b9f7ce4720c3caef6de4a75b8d4b0fd7db4f1638edca98d5ea95f4a5157aef8faefbac68438236691bd373111ca089b4d3864f7352f3fba1fe44392e9644f8b
 DIST libfmt-4.1.0.tar.gz 620863 BLAKE2B ff3a7db5a1eed3a6fc936be16caf2dd153d9452df16c07d6e0dc718bcfb9f51f52146498cb3f49591f1ad96d36a9561de2a78426d3bb8a0907b772e8be5a6f7f SHA512 8daaa4a61bfe63345a12df0a9bca0b1cd6a162d0f4e97d2d2978ae19a1a1357ec4d4cce948ce726cdbe9403e51ad995950a2a99de28f9b9085c02ce845540b22
+DIST libfmt-5.0.0.tar.gz 634165 BLAKE2B 32ef9f655e4864ef6decd6e8545260996834103cc7cbf0df7bce00afe88c15a9821fe2d46d3f6f1e3a729b45916c515e088e3a04a4e46e709e7c74fe3e04f34c SHA512 1ce93648ab7aca6082767ff009d5836e226fa42f183852ca15230f371ef0a34878110ca63d8669a68de7f115c137fdaa11de998986a9440f08d50f0f214ebb90
 EBUILD libfmt-3.0.1.ebuild 649 BLAKE2B 516deac5abf6212aa6e5f76a1b407c12444209cbc1393f488cf544c8849143ce976283177f7b0d79198b1d9b76abfd5e10eeb2e6d1880aa4dd2df5e916e1afdd SHA512 11e31c4ba76f2ee6ec3ba96ffcc74af496b93f565598fef7090ab2695a2ff884ceec5e1110a6eeb8ac5f91b7698efef02c44b3a98cce4d4d57e9fc0235318be8
 EBUILD libfmt-3.0.2.ebuild 737 BLAKE2B 0022cf34771a888150bd9e5eee091d26f158036b21ecb6f2952d2a06c43281e55a1ea5743999a50c4214bcc0df07ea2c0a5f00cca7b484e446ddc6f8218c08a9 SHA512 5fae3765dcfa750b08d4e366f6306219250b70e9d7c508e3bc01976d4038135ccc5cde6dc12ea65255eb250ac56dbc0143f0637fba8b414f68102cf479f49a71
 EBUILD libfmt-4.0.0.ebuild 770 BLAKE2B f9b87f63ec9b107adbc8fb079be9bd0d8f8ac496abb58076acdc2100f50a159ceb6dcd3a34771d4235f8d5c979ed42f6d31455231984d4fa08e543d7749febf5 SHA512 506b735d656546d3ba2114fad8099a364e7ae22b6ce08254dce879680d8284013f258054692f9a876da363d8147aff06e2245c6cadb8edf0483c4a046853ff44
 EBUILD libfmt-4.1.0.ebuild 770 BLAKE2B f9b87f63ec9b107adbc8fb079be9bd0d8f8ac496abb58076acdc2100f50a159ceb6dcd3a34771d4235f8d5c979ed42f6d31455231984d4fa08e543d7749febf5 SHA512 506b735d656546d3ba2114fad8099a364e7ae22b6ce08254dce879680d8284013f258054692f9a876da363d8147aff06e2245c6cadb8edf0483c4a046853ff44
+EBUILD libfmt-5.0.0.ebuild 770 BLAKE2B d629242c9a6109b42955a371589ad62ab163efa8b8b1ddbec61fd126af1368e704e2dc310bd48f9c829d81a56781d3610b63f0831c0879944788231293c00daf SHA512 b0962102dcc508761ea630c58e2e124fb0d2470f6b63fc527901ca8d5b80d3478c327dd1b4980055b295833aac85c2fc7801e87409842f7b7f17781782f037ae
 EBUILD libfmt-9999.ebuild 770 BLAKE2B f9b87f63ec9b107adbc8fb079be9bd0d8f8ac496abb58076acdc2100f50a159ceb6dcd3a34771d4235f8d5c979ed42f6d31455231984d4fa08e543d7749febf5 SHA512 506b735d656546d3ba2114fad8099a364e7ae22b6ce08254dce879680d8284013f258054692f9a876da363d8147aff06e2245c6cadb8edf0483c4a046853ff44
 MISC metadata.xml 381 BLAKE2B f38f6a7691ef81c18b1170b7ca29264dac3c621f8de446d065d65b6e022e21fbb2475c4e2d3210e00254339d09681030c7e7b8fc41cec5549663b4086bb0c983 SHA512 200bb79fc448f40acf8a1be9a907a51461d82db3b5e6e92df1cef4b96418fa6217ebe1e5c8d4228d34bd9bc633022a34f399521a875c92232fb2254350a7605c
diff --git a/dev-libs/libfmt/libfmt-5.0.0.ebuild b/dev-libs/libfmt/libfmt-5.0.0.ebuild
new file mode 100644
index 000000000000..205d52c52e72
--- /dev/null
+++ b/dev-libs/libfmt/libfmt-5.0.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-multilib versionator
+
+DESCRIPTION="Small, safe and fast formatting library"
+HOMEPAGE="https://github.com/fmtlib/fmt"
+
+LICENSE="BSD-2"
+IUSE="test"
+SLOT="0/$(get_major_version)"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/fmtlib/fmt.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/fmt-${PV}"
+fi
+
+DEPEND=""
+RDEPEND=""
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DFMT_CMAKE_DIR="$(get_libdir)/cmake/fmt"
+		-DFMT_LIB_DIR="$(get_libdir)"
+		-DFMT_TEST=$(usex test)
+		-DBUILD_SHARED_LIBS=ON
+	)
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/libixion/Manifest b/dev-libs/libixion/Manifest
index 8c73ff941136..1c0aba2b163f 100644
--- a/dev-libs/libixion/Manifest
+++ b/dev-libs/libixion/Manifest
@@ -1,6 +1,6 @@
 DIST libixion-0.12.2.tar.xz 407280 BLAKE2B f8a9307758f1005bd8dedb7aab9fed7478c963e3fd235c3d1efc29dbc51a3e9c6e92ff6972c8b06b2b90122a400d1f907bb39c67c2c20aa55c46a93e0c783edc SHA512 0a85120a08c79c73a252a997c8b3df461fe1f8ce8b2334aee0e50bfd887a440a220b44922edd18fbd402b1c8ea8be629e6181493bc618eda198f35159813ddcd
 DIST libixion-0.13.0.tar.xz 413756 BLAKE2B 04aef61a1cc691bb159d7e8131e2e47fe2590634adc93f2e5771ed106316eb1c92ee7c4aa05ba753a1751cb5e7c55cba9263515671a26f9bc9983a1cfcacceff SHA512 15784e947164d106e677c59ece53b3cd401d4f9433cc5331a35d3be8332ae4f20a469ca73b30b253433c86da4afde886dfb4ac23e46ed46376a7349e0276c3a0
 EBUILD libixion-0.12.2.ebuild 1141 BLAKE2B fba5cb475f161d3c40f04fff8899fc2911d6533a373927c17339da905446f89a61693407c739b31f1ce77f34267af97506f4df99e145fe158a8b4bfc5ebefff7 SHA512 993232ee16cf3682214bf7b36f1af69354578c0e398ab2e269bb0f511e91ecd622da69ccbdf82187d0bec94bf01f9edad968abdbeedb15202433ab36d756b822
-EBUILD libixion-0.13.0.ebuild 1150 BLAKE2B 4484da28a8517c76d373ac787c17394f1f237b3affcf80f45d79e3238b414c00a2664ce86a1af2b19918e3f93a781accb027eacc4785eebc2477a758ebf395c8 SHA512 ea3d4ce8a8cc9b504eed1bf47359fadd7dc850b6c2e3a0f037455b9763b265523b4299fffa99ec4cff2c91faef27b825b5490dbbe0b4a4693ea09a3d637f7a48
+EBUILD libixion-0.13.0.ebuild 1149 BLAKE2B a07e549beeccc1decfe00af41706b01de0875ee23d1c310d210c6695e4d57158aa0267b6d88fa5154b1d190b438fdecf8fea5d1a0cd946e36dda78e6e895840e SHA512 c321862bb86d70214ae6c073fd9d3eb748daf14ad112cb0bc88608ccb3190c5b903a45934b04781345324d58f476a942f4f78a3935cf7260fdaeb991301a480a
 EBUILD libixion-9999.ebuild 1150 BLAKE2B d4d57ba89107e6a3c81ce172ec28a10cf11b133e1423862160ac587fe2de19aca6e216fb8bbfba5620b905856ffcfb73431b15aa9d4af1c31e1fe63145ff4c4d SHA512 46d1e9174374413fa3a9bec611d202420efbfe3e1d6da0da3772775d6a486739cfcc0177c0bf76c13f3a8bc983584a81e3b32c83dd8db102aa67755470d989a5
 MISC metadata.xml 397 BLAKE2B f586541f39dbba914dbeac46a03879649b394183dc117093dd1cac33d506dfb5cd0193a322761c3aebe5801a9851cfebc674e2487c86f03a5f6a53fdac059876 SHA512 558a3f9911ec5f5404e709f634595a4001adab07488e9da379b4936fd4d6742e40490aa1290f2e88716d2e5732462b1d63d52b8cdea4c58c77e1fbff17439312
diff --git a/dev-libs/libixion/libixion-0.13.0.ebuild b/dev-libs/libixion/libixion-0.13.0.ebuild
index b814fbb37ad3..aa2431360549 100644
--- a/dev-libs/libixion/libixion-0.13.0.ebuild
+++ b/dev-libs/libixion/libixion-0.13.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://gitlab.com/ixion/ixion"
 LICENSE="MIT"
 SLOT="0/0.13" # based on SONAME of libixion.so
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~x86"
 IUSE="debug python static-libs +threads"
 
 RDEPEND="
diff --git a/dev-libs/liborcus/Manifest b/dev-libs/liborcus/Manifest
index 35d6de2e1cdb..e6dcfa9f4c82 100644
--- a/dev-libs/liborcus/Manifest
+++ b/dev-libs/liborcus/Manifest
@@ -1,6 +1,6 @@
 DIST liborcus-0.12.1.tar.xz 1673880 BLAKE2B 6f85f1ce04bd7c797f8fccc9b4d860189b6fa9f51623587a668c343e8897bf17a3e62a5465354776044fabe9347ec35913eb1433dc551e4e509ce260ba92c3b9 SHA512 294b24ad7fccae77070edd9d8e6e1a370f609ec8af9a2c58567431e641fc0f3f27c4cd4b6ac1825a8179a22a1d1a81d84827859eb631d2625194f9e59ca1a8c3
 DIST liborcus-0.13.4.tar.xz 1816340 BLAKE2B f8e7251c8688f82604d5ac1212938890e42f23ce45edb09eba9ab26a810e5fd4215a23dd20e86ddf9100db67818fc73fbbee7357642a6390f8f60dc28596be31 SHA512 f00b49c41eb1898c37d8d42e59f9004f46b5f849b9d60ac9c5033232d1e5065ff3de160e79f5a88983bf64f86e283b6d1d406a24e776aa6ff7b8acec324ccd4b
 EBUILD liborcus-0.12.1.ebuild 1294 BLAKE2B d5fa81bd750f1376f09116ae40f68c5449ecacc894908bb3e706defbcb3cefe0b0866946e55eab79098d7dba5dbb8feaa39efaed741ea6567609e3f78bd38448 SHA512 86b0e04d7223f2932e913013cff0e42c6c22d1540bbe873a90e59c4828f9a528c3942444a993983aad113e75d4f887160dcd8791a6167e0e750851a37e303df2
-EBUILD liborcus-0.13.4.ebuild 1299 BLAKE2B 02f09dddd6907115bc5a70523b48e5768b33ef3582b9fe9ca39e23104fbf0aa5f47070df81786ad9857a8049514ec52b91aff527a372c0e60101cb7343bff2b7 SHA512 7db1b63103cae486e1be74992c1094bee3948d86898725d475625e5502987648992441ffdfc25bc796e772fd07a190826023141b863f76a39c51e27229846440
+EBUILD liborcus-0.13.4.ebuild 1298 BLAKE2B 1a28ac19e603aa91b330c1216f307197f4bc27dadb64a1b6d3751e7ffefad3c1b4e0b439e23e1f41750a39170b92b0322a69ad0ce11d3181b3cf0f65f2d039ca SHA512 c9c809daab6b7ce50ada5f8950ec4d86ac8d380d1acc2039c10add6e46272da0924151bd88465c3634ee7d795fae7fa0c261855a0de81c4ccbb691d336b7e97d
 EBUILD liborcus-9999.ebuild 1299 BLAKE2B 02f09dddd6907115bc5a70523b48e5768b33ef3582b9fe9ca39e23104fbf0aa5f47070df81786ad9857a8049514ec52b91aff527a372c0e60101cb7343bff2b7 SHA512 7db1b63103cae486e1be74992c1094bee3948d86898725d475625e5502987648992441ffdfc25bc796e772fd07a190826023141b863f76a39c51e27229846440
 MISC metadata.xml 556 BLAKE2B f60b17901e0ac564d2d495122a673c6c397e8ca78cc5035b53be81e48d6653d9804fbd337a5e308fb993a28f39aec13f0b8da85bc8e3bf213f0411e08f977a60 SHA512 c16a1b111116eddfdf0095b3b8c6e44e3dd60ec9049907459eef7906cc3f9673ee099651bdec081efe86abf2afc0340afcf204b7439481201188ac682eb11bf2
diff --git a/dev-libs/liborcus/liborcus-0.13.4.ebuild b/dev-libs/liborcus/liborcus-0.13.4.ebuild
index 2f6e8414b8d3..a3396f03cd5e 100644
--- a/dev-libs/liborcus/liborcus-0.13.4.ebuild
+++ b/dev-libs/liborcus/liborcus-0.13.4.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://gitlab.com/orcus/orcus/blob/master/README.md"
 LICENSE="MIT"
 SLOT="0/0.13" # based on SONAME of liborcus.so
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~x86"
 IUSE="python +spreadsheet-model static-libs tools"
 
 RDEPEND="
diff --git a/dev-libs/libratbag/Manifest b/dev-libs/libratbag/Manifest
index 61724168f7d1..3a488b904d66 100644
--- a/dev-libs/libratbag/Manifest
+++ b/dev-libs/libratbag/Manifest
@@ -1,3 +1,3 @@
 DIST libratbag-0.9.tar.gz 238225 BLAKE2B 74efbed2840103018195a73c11760a2022e42db5e81ba2e9d63a21bc5eb4c1dfed107382b657d2dc208101dfb53eb1926aaccc116ae66e3bf83e1218239dc1a2 SHA512 36215f534f9429c3b182f5502a2bbe16905492a634e327a845d65b638d7dd5ebb5c4eb1700a5196d6b5caac68e500603ced60c3c83f6d0c8e3c776e0161f657b
 EBUILD libratbag-0.9.ebuild 737 BLAKE2B b49fe41fe9b904ba659983458178a7b6a1d61da9a78eccb7523d419c77cc329a818846ed53f538c3f421df8744f61d10cbbd3ebdd9bacafc344d8486976713b9 SHA512 8c69c7e1f3e956a321cce92cc2f4ea6fd76071e06635abece620b974dea3f128925e9e99c6c955c09b6da384c0df856d58f7d23592839eb6470461169ed91e75
-MISC metadata.xml 345 BLAKE2B cdc812cc16ce58f8a9b5b9657d1230dadff722a34e52cdd09876467cca35037ee28ea4daf60151d543ffc3cc514388c2f1cb25fc231cc5b8628567bae0901e0a SHA512 417197edddcb1b15b7d82852676c9b20f2ee1c31a59668bb173ad75ea2cb56ac5a76a94187945673cb5ec772a4cb8d2ec6a584c60529eba7bc76d5d3a5859908
+MISC metadata.xml 256 BLAKE2B a030f2474a9f408d5d4f7dafe102c8a5d1c671d034f394e3873c9bde141d549f37a17a7fb7b980a22fa66bdd354c6056888eff66b990654748cbd9d767d19b94 SHA512 3b6006efac4a727d576e6ed0d0a075642526e74812a7f8a764d0b46bb0c070a1c27e974587a4416bedd9c598954c5f897cedce86fc3a2ef9ab0fdc2f2ca0b71c
diff --git a/dev-libs/libratbag/metadata.xml b/dev-libs/libratbag/metadata.xml
index 6a272e5195d4..eedfe43f0083 100644
--- a/dev-libs/libratbag/metadata.xml
+++ b/dev-libs/libratbag/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>polynomial-c@gentoo.org</email>
-    <name>Lars Wendler</name>
-  </maintainer>
+  <!-- maintainer needed -->
   <upstream>
     <remote-id type="github">libratbag/libratbag</remote-id>
   </upstream>
diff --git a/dev-libs/libreport/Manifest b/dev-libs/libreport/Manifest
index 772e39a6c3de..d17a5d32d318 100644
--- a/dev-libs/libreport/Manifest
+++ b/dev-libs/libreport/Manifest
@@ -4,5 +4,7 @@ AUX libreport-2.0.13-json-c-0.11-pc.patch 1780 BLAKE2B bce31a7535097d11d26a36afb
 AUX libreport-2.0.13-json-c-0.11.patch 1145 BLAKE2B 2e4bd653b4c378875ffe846f8cfb84f6feabb9e571079fee873c064a092a97a89b4cc7a82e53c57a34a8a9b7510ddac24f907f4dc92cbc3cb6563247dbbad46a SHA512 fd07c360d599d71fddb6766860203052fb390cde6cb795779e75a2d2a826affd6f03c6977eb99237caffdc41ac9f0e1c600a9414f72629ff5fc2102c70d8ca67
 AUX libreport-2.0.7-uploader_event-syntax.patch 610 BLAKE2B 5bdd1835310125c3adddef9e338928505e204668ef5448d4991fb67cb9742740dd802caf67d3be3616bcc17c1022f48a4f3d1db9989e171ba30054985b53d0a6 SHA512 b0ae2617a013fd8cb3475e5a51073677f2ea965a57169c760e542474351293e70f70e678a66beeb3b3fa163589aaf7f79f0883fa55ff524e62b5fcd3ae919bf0
 DIST libreport-2.0.13.tar.gz 1190147 BLAKE2B fe79d924fbf7bd11cc3fd23956a137fb296baf9c40f12f3ecfefe68c82281f62299887511a096196b4fdcdc9245ab268592dace4e728c2c34af47581e52f5132 SHA512 cfe963db8091b245f8ceb7d8501466f4f9464c28d298faeafc9f6e57deafdfdc6501d468bf5ffd83703adb67bc1e05e06c56b5c0e0028bb2e0134788ddbb2181
+DIST libreport-2.9.5.tar.gz 2271742 BLAKE2B e74d694c0012e984aab8044e99fee8e12a197c0a2edb933e78f045260043d40557509056b1093bc13cbe983976d5525cde1f7596a942760df10c857e99d6b56e SHA512 f207710d88f39870d08e3a5fdfa3e1d5a808625bd36b1dcce363cefd39e582bad6be6dc4224db5e1df4404734c3dd69c437c377303fe978ae21b608fceb833ce
 EBUILD libreport-2.0.13-r1.ebuild 2141 BLAKE2B b49f76f03adeaefd952003d1e7bb561b10d7af1b7b399748f0209cd33ea9a40f49e3861e95500a781eaa940735b6d387cb6d168411672d234173e15edd4b8979 SHA512 c0666dd82fcec73ef563886376a6d1449e505239308417e8145e2ce5b394dcc9b4811e9cc3f166a61898b6c7877831b66a1c0d8ef8c76d39e4b5024a54ac4ce7
+EBUILD libreport-2.9.5.ebuild 1942 BLAKE2B 77208961ecd909a18a95cec2ab1ae5468370a93397083b9bb15bde1637b0855eade8a27219f277f0683a7560258a0ad46580925b4b4c2fd7c06ad87e16fb6542 SHA512 fea36a756e7e50ae20aa67f9c8a9a168f3bd15779f663a08b9cd04852fd9fe4ad626117223bfa0156f7aa4961235c27ac5c6ba64f868c80c97afb9fc92841b15
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/libreport/libreport-2.9.5.ebuild b/dev-libs/libreport/libreport-2.9.5.ebuild
new file mode 100644
index 000000000000..9d1da641fb02
--- /dev/null
+++ b/dev-libs/libreport/libreport-2.9.5.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit autotools python-r1 user
+
+DESCRIPTION="Generic library for reporting software bugs"
+HOMEPAGE="https://github.com/abrt/libreport"
+SRC_URI="https://github.com/abrt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="+gtk python"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	app-admin/augeas
+	>=dev-libs/glib-2.43:2
+	dev-libs/satyr
+	dev-libs/json-c:=
+	dev-libs/libtar
+	dev-libs/libxml2:2
+	dev-libs/newt:=
+	dev-libs/xmlrpc-c:=
+	net-libs/libproxy:=
+	net-misc/curl:=[ssl]
+	sys-apps/dbus
+	sys-apps/systemd
+	gtk? ( >=x11-libs/gtk+-3.3.12:3 )
+	python? ( ${PYTHON_DEPS} )
+	x11-misc/xdg-utils
+"
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/asciidoc
+	app-text/xmlto
+	>=dev-util/intltool-0.3.50
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+"
+
+# Tests require python-meh, which is highly redhat-specific.
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup abrt
+	enewuser abrt -1 -1 -1 abrt
+}
+
+src_prepare() {
+	default
+	./gen-version || die # Needed to be run before autoreconf
+	eautoreconf
+	use python && python_copy_sources
+}
+
+src_configure() {
+	local myargs=(
+		--localstatedir="${EPREFIX}/var"
+		--without-bugzilla
+		# Fixes "syntax error in VERSION script" and we aren't supporting Python2 anyway
+		--without-python2
+		$(usex python "--with-python3" "--without-python3")
+	)
+	if use python; then
+		python_foreach_impl run_in_build_dir \
+			econf "${myargs[@]}"
+	else
+		econf "${myargs[@]}"
+	fi
+}
+
+src_compile() {
+	use python && python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	use python && python_foreach_impl run_in_build_dir default
+	# Need to set correct ownership for use by app-admin/abrt
+	diropts -o abrt -g abrt
+	keepdir /var/spool/abrt
+
+	find "${D}" -name '*.la' -exec rm -f {} + || die
+}
diff --git a/dev-libs/libressl/Manifest b/dev-libs/libressl/Manifest
index 0152a5452bb7..3beccc2f5596 100644
--- a/dev-libs/libressl/Manifest
+++ b/dev-libs/libressl/Manifest
@@ -1,5 +1,5 @@
 DIST libressl-2.6.4.tar.gz 3227935 BLAKE2B 48e865448a9e5b0b604b06060091073276aebd376506de73773a5eb9cb0bb4c5b93aa16353b4892abaee97ec933ad77e89775c3f52263d77bb17c68e481b4f70 SHA512 181761da573ff392aaee17dd3dde416d7cbb299ab3e07b49c97e279ceb3f619e78d1dc9ec4c59b0af024f0a8270ff31fe37f8282d0392be34c3143c9647cd246
 DIST libressl-2.7.3.tar.gz 3364724 BLAKE2B e245cd0e3c4819e12f3f05898429c10894959d9bbe27bfca38543ec304a84abc8edda7c968eb8d25e5c589011c5482060d05bd1e5aef71c13708ec804cd05a72 SHA512 5fafff32bc4effa98c00278206f0aeca92652c6a8101b2c5da3904a5a3deead2d1e3ce979c644b8dc6060ec216eb878a5069324a0396c0b1d7b6f8169d509e9b
-EBUILD libressl-2.6.4.ebuild 1352 BLAKE2B 0f668e823133a6ca603056574a56de5397f068f041b8ba564fbc15ec181d721d706b281588eb59c86eb832ab5afcd90181dab6609566431cc63b254da415a29d SHA512 c09043f0de7ace4f1034d6a38af383447ea5ed65ec7c1e8bee4b6153c1e85630c8401238d5266dc9323ff40cc8394b7b33625590a23baccc342f9d0cd87ba7e9
-EBUILD libressl-2.7.3.ebuild 1358 BLAKE2B 55a2f05f0042d113c2bbf0c01831e41dc08960d34a8aebd00b15b9c866581a928d9a1ef02bf7f2fea67b3a7f6eadd9cebcfe92a52ca28707efe18fdf2e49c330 SHA512 45499b0db8205bcb7f3d7d1cd0b2aca1cc6433918af9d94016c96d5b95ce9308615571221882ba9e6d0717ca6a6ce8a6c360e5f3de0e34e0d08e922f359ee70e
+EBUILD libressl-2.6.4.ebuild 1373 BLAKE2B 3cc04437cab6d3550d82a345b71f4f2019459392dd88f7f5948ca5a9fca99fb5747ee9b09de06357a955517c67296152503c3274d9c7e9042c474d9dd6e0ac8d SHA512 3c5db45ed3bdb9df4220ba773889c95c04a741f8761e677df7a067caa322594af1b90120b4945fb03c9387fd291b81aef0e8c545ab37dc63123ca47800503ade
+EBUILD libressl-2.7.3.ebuild 1379 BLAKE2B 4dbc0ff4d02d607898501321824554e92a228b91530940c2a13fa0e2368f4487ba9518a2dbc53da8d82c5b09fddcfa54ff7c81b6dde86a52ad51b76694520f3e SHA512 48b1a5d6a5a739ed3041085d46cff281d9af05761523465e7e0ac6934939cd2d726fe9264d5f30a8074a003f58b16e17dad873dae63c2169b0413552bddb6219
 MISC metadata.xml 986 BLAKE2B 1c3f46d2694b17352ec02e1f2c331aae79c677ea638ed6290c51076961ac81f1b472576000fc162115f0ea1f037ac1c6ed0ea80c4603ef6a283e0ac4915fadad SHA512 bd38bf852aebe8dbac58fa324524f2fbbc0da5d22a673f5fa83dafeeee599f4022a46687d10f3d159b0953a0d4b0f1ea88156f7d04c2f1db864569dd29f3e4fe
diff --git a/dev-libs/libressl/libressl-2.6.4.ebuild b/dev-libs/libressl/libressl-2.6.4.ebuild
index 152d3751d355..9aaf4681a71e 100644
--- a/dev-libs/libressl/libressl-2.6.4.ebuild
+++ b/dev-libs/libressl/libressl-2.6.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit ltprune multilib-minimal
+inherit multilib-minimal
 
 DESCRIPTION="Free version of the SSL/TLS protocol forked from OpenSSL"
 HOMEPAGE="https://www.libressl.org/"
@@ -49,5 +49,5 @@ multilib_src_test() {
 
 multilib_src_install_all() {
 	einstalldocs
-	prune_libtool_files
+	find "${D}" -name '*.la' -exec rm -f {} + || die
 }
diff --git a/dev-libs/libressl/libressl-2.7.3.ebuild b/dev-libs/libressl/libressl-2.7.3.ebuild
index b9bfe8bd72d6..1c15a09a5faa 100644
--- a/dev-libs/libressl/libressl-2.7.3.ebuild
+++ b/dev-libs/libressl/libressl-2.7.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit ltprune multilib-minimal
+inherit multilib-minimal
 
 DESCRIPTION="Free version of the SSL/TLS protocol forked from OpenSSL"
 HOMEPAGE="https://www.libressl.org/"
@@ -49,5 +49,5 @@ multilib_src_test() {
 
 multilib_src_install_all() {
 	einstalldocs
-	prune_libtool_files
+	find "${D}" -name '*.la' -exec rm -f {} + || die
 }
diff --git a/dev-libs/libsigsegv/Manifest b/dev-libs/libsigsegv/Manifest
index ee6822f35b55..72c01138a0e5 100644
--- a/dev-libs/libsigsegv/Manifest
+++ b/dev-libs/libsigsegv/Manifest
@@ -3,5 +3,5 @@ DIST libsigsegv-2.11.tar.gz 448744 BLAKE2B 3fdf79efd9ce392887e1b133d5ea546375874
 DIST libsigsegv-2.12.tar.gz 451408 BLAKE2B 3f2f37965dfdd5f8a7db3d5baff975003200e7ab157498524f8c99c60c285a5a8a1cf978ff3a69977d52604dc44493ac6d6d00476fca3380b285282b35873f99 SHA512 27986e8aaf4357ed131032aa7c281a5a28c5759530c62bb76f034aea33959547dcaae805e06347a1f532f0488b72fbbbdac4400f74e8d3f2128511526e8a5913
 EBUILD libsigsegv-2.11.ebuild 873 BLAKE2B b002a1adfc3c2d26211758114ec9ddfef9288e10083b7fe1f4663bfb357078df8b4d5b6a416b86981cf8bca5da3cc3e6c37c4fcc2876f207d8dd6b1d25d9a78e SHA512 70dc26ea9d120835ce750b60405ca296342203da4078319c02700734f226786f5a01defb5fab42718fa1e3b2791fd5d6ab120d9c66cae4ec61a2874632235024
 EBUILD libsigsegv-2.12-r1.ebuild 785 BLAKE2B 416f8283d883011129322ff7a5ae6e8a4c439db4a919cb39e5303228bf4fbc18ebc3145905ea25d03ad3c2d6f9e0a3dec0d4d245abd8287017cb25d645d4fbfe SHA512 9738ac3adf8778723e2482430f3452e71fd925ad0c69ae81ffe2f9110ce630d9a419ee4511e86dd8d79934e8a799382d9f03efa91ab6f8bab02430eca80a3fd0
-EBUILD libsigsegv-2.12.ebuild 791 BLAKE2B 9de7a21a5af5f12c490f10e316e541259dd47d2a19c4b48a5a12f73f3f484035a2bdcffcec1c5fd2d53f3cf7487127a60d7b8a02fe636219324d031d86b7db30 SHA512 3d75cfe02fa5962f7ea667fe0bd9bfe00f85e89920b7818d1043461d088ab88894993e6ea2c342a109a1ca5b57b89f90914befcd0fb160edfe4962f8bc834c6d
+EBUILD libsigsegv-2.12.ebuild 789 BLAKE2B 71fee301710353c326e2903a7209de5d3b5642ea2683584ee46e301f5504757360ef84e7c3d798bb81803a03c5dcafc974db1e564ba827ab08afc6184abdeee0 SHA512 b7ba322748ebc4b9b7a5dcd678fa53fcfb3da531d30a881f51b1bc106b61cf00619b7f7c4dbc28bc9b86c0253d80c336c74e2527b1aa8deefbd98d86081cf632
 MISC metadata.xml 811 BLAKE2B 648cadc6a317684a62fcdeceb885b3bb153841d57928e19a84ee20a0c0dbd8626343fecb6cf2367ef195cab26b9909c6c129a4a2afc999353300b48911317711 SHA512 7f985e3e2e50e351fc14e4932f30ceab0989346183ba87c0dd16a3dc874dd0e5534984e4bcc327dc1a4c0d15e78c89aeb8491b5a8c8789b6ae42dfdb89c18fb2
diff --git a/dev-libs/libsigsegv/libsigsegv-2.12.ebuild b/dev-libs/libsigsegv/libsigsegv-2.12.ebuild
index b259f294fcda..c17e565a5c63 100644
--- a/dev-libs/libsigsegv/libsigsegv-2.12.ebuild
+++ b/dev-libs/libsigsegv/libsigsegv-2.12.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/libsigsegv/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 src_configure () {
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 41c8f722f90d..1f50cd3f641f 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -3,6 +3,7 @@ AUX nss-3.21-gentoo-fixup-warnings.patch 178 BLAKE2B b51f80310db3db416d8aeaf9117
 AUX nss-3.23-hppa-byte_order.patch 460 BLAKE2B 97358cc8fbea0b0d3beee0697833e48ef01039ceb08fd00792a7f7ef68409eb076022c03764ab079fdaa971a0358130002fa11c0c182ebeb33dcdf660be26408 SHA512 ad0097bb6cf409d61eb28202d7460c87e983d6db977aba38ff9ef2749b3f7bb8fdadce4174f5bf806350ae33733097a1f444792d31cc43574b28341893642e5a
 AUX nss-3.28-gentoo-fixups.patch 5310 BLAKE2B 5f173bc4bba374c8233945293e8e944c5fc9068c71d1242bcfbac37d0c020a09cb6a0ef3f54994003fc58364285f86f08017762c0c196aa6ab03fca91ea6c631 SHA512 22fe711d4e59c41f8208b4e85eb101eb6cdd4ad43d83438841b94a57219eeb182c527be1a97bf58df25672fe027aaebeab7458da2bebafef7254c68b94c7b98c
 AUX nss-3.32-gentoo-fixups.patch 6443 BLAKE2B cfe0380832776b7e51f95f800e70436622332d90f61b6b75fcd5474faaf722342ab157694be26881acfae3baceb6d2fdcfabc0c7673101abedfe1667d3821e6f SHA512 36a6db836ab9210e8201a3987229cf18a6b1fe5adeb0d82037f9641da72e6280807123b18fc74d344c680751b04f883bc402cd1c505783c77f00f9962338da03
+AUX nss-3.37-fix-fstar-missing-symbols.patch 1156 BLAKE2B aedabb564c11b99bf4ee48e9cba0c2f29c3a7cd716828e12ada032ace08f507574b2b68f1a08db9a2575df031067e7e262196df1836db1c4a93058b673434200 SHA512 89c858fb6a7575b79170c0567b6bbde7c857c1dd803dc4a0a19d8c3ede77b8eff3ce41f473b8e292202d4b0b3e9c9687a2c503ae9b3dca7ba3700e91e50a3e43
 DIST nss-3.29.5.tar.gz 7480246 BLAKE2B 9ab16cbbd95aa31358b5b686bee64cd81c8343524dad8aac084f7c86883f1eaead78912dc1021b0461d027b0085356c4b7156f1d80010c3a0ece29d542deef50 SHA512 ce18bc7e793d2b3698db412b2e5fcabbfd9862eca3def120d5e44bc67276526bff6b33ffa84b8128f8af6d35101000e6f7bb24194f63a55461b3c245fac11faa
 DIST nss-3.36.1.tar.gz 23026430 BLAKE2B 76eaf5b24f8954a4e14cf556912250a3ddb7b333054a2ea4ee3d218493a8f12c77a37455aae354ef6ddd9bd55c33a269dad515806d70ef38727fa8a382d47fd4 SHA512 096fe4360b6d584a746ac6156830f8cff821fd173bd889d7a396238919328a227fa4ebb46f738970a4001773046f3dd4f4675b85ff6de8420a4a7657b3ba0c65
 DIST nss-3.37.tar.gz 23027581 BLAKE2B 0ce7190a029321d5620dc8b9aedf1f4252c53dbef57149afbad432b6bc4b590db026505d23f5c766827d5c0179ab931b8a0435a2e9785eff3db515ed7211e512 SHA512 ad5175f126705f57092ac80421ac005bcc32bb18a4a44a527df25994fa90b3bc18af08506683564f619a22076f71232e2b3c9e6e25d6312d0bfed63684139103
@@ -10,5 +11,5 @@ DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a941944
 DIST nss-pem-20160329.tar.xz 27732 BLAKE2B 7c23133a7bfb969d8eac98fb6311e76ab60c5d6601c7329f3c492da30c017e66d64a1f8bc827dd36e52e65c1a1ec02b58816442aaf410345c5ed759a02264b84 SHA512 5834b06e4c64205447573d4f4c8989e20986ae67ee00eebce3817eb73794a6355a404143ba1c676ec302ceefaf9df103cb879b1d4ff14ba4e3790dbee3e40eb2
 EBUILD nss-3.29.5.ebuild 9188 BLAKE2B 75e8a0508e7355b4ed624f5b003ebbe99d8b170055aa1f2de2564762a35ca2afe836bf9313a8ad35e26b793c786cf4b98c3e49bed77385c2b35547e4c45d03d9 SHA512 fc184b2babae5168d02cbd78bf81298d616c149a5870f320ac36c8e4973851b943de7a6641bbcfee1f1153bfafa6a4832c0dcd7d47ee2a6b13facf118ce9e0e3
 EBUILD nss-3.36.1.ebuild 9430 BLAKE2B df5002039f14bbddec5f0ee8fcf36e4cbdbe3b5e7ac3b5e7b48e8df65de339dd8db7ccebf68cfcb9699caaefbdad78d8f20965135e20f43faf5537bd5db29e5c SHA512 356e735118784a06ac4be499df2888d41b7a16cca4ab015a7ef7a21363c578a0acbdf495e2a07cd408721800e57f0e005cad61f9b000e75679e1a3c9e6db8ef3
-EBUILD nss-3.37.ebuild 9430 BLAKE2B df5002039f14bbddec5f0ee8fcf36e4cbdbe3b5e7ac3b5e7b48e8df65de339dd8db7ccebf68cfcb9699caaefbdad78d8f20965135e20f43faf5537bd5db29e5c SHA512 356e735118784a06ac4be499df2888d41b7a16cca4ab015a7ef7a21363c578a0acbdf495e2a07cd408721800e57f0e005cad61f9b000e75679e1a3c9e6db8ef3
+EBUILD nss-3.37.ebuild 9482 BLAKE2B 0660abfa6e53798f357a560e96aa23251ca3898d9f3ceb60d8ea536014c00601b90d85b97b3ef0d3be369c31c2e68d582ca8bec51261b5392033c00475437e5d SHA512 5bb3a418e77e69f77c006c1b562746be250606002f4362140aa214794f0f3b6bf9b56120e274b4c842a0512c47c823bba2097108ac3ab77e99815300be8bcabf
 MISC metadata.xml 571 BLAKE2B 8c1d2f92910d9170240f17b28ac806d3c083fce45637526d0846ddcf0e957483fc458a4de14f239c433990f91a8996ea0be51f445a54a1a1f6a14c1f711654a3 SHA512 f6a7de1614f3bdbdea2d5ae627d82519c59e3703f293daefd9dc4692f84c3f0bc3000654b6a4fe595de95b433e698aaf1d3358897e22da283eb63b74a48d95b0
diff --git a/dev-libs/nss/files/nss-3.37-fix-fstar-missing-symbols.patch b/dev-libs/nss/files/nss-3.37-fix-fstar-missing-symbols.patch
new file mode 100644
index 000000000000..4a6be4e90cd8
--- /dev/null
+++ b/dev-libs/nss/files/nss-3.37-fix-fstar-missing-symbols.patch
@@ -0,0 +1,34 @@
+# HG changeset patch
+# User Jan Beich <jbeich@FreeBSD.org>
+# Date 1525728934 0
+# Node ID 259444458a1a7f2ce1813ebe88d924173d5daf0c
+# Parent  5db9e969c74a2a02c4b1d918792827014d1a9d5e
+Bug 1459739 - Build FStar.o on 32-bit ARM even with make. r=fkiefer
+
+
+diff --git a/lib/freebl/Makefile b/lib/freebl/Makefile
+--- a/lib/freebl/Makefile
++++ b/lib/freebl/Makefile
+@@ -534,16 +534,19 @@ endif # NSS_DISABLE_CHACHAPOLY
+ ifeq (,$(filter-out i386 x386 x86 x86_64 aarch64,$(CPU_ARCH)))
+     # All intel architectures get the 64 bit version
+     # With custom uint128 if necessary (faster than generic 32 bit version).
+     ECL_SRCS += curve25519_64.c
+     VERIFIED_SRCS += Hacl_Curve25519.c FStar.c
+ else
+     # All non intel architectures get the generic 32 bit implementation (slow!)
+     ECL_SRCS += curve25519_32.c
++ifndef NSS_DISABLE_CHACHAPOLY
++        VERIFIED_SRCS += FStar.c
++endif
+ endif
+ 
+ #######################################################################
+ # (5) Execute "global" rules. (OPTIONAL)                              #
+ #######################################################################
+ 
+ include $(CORE_DEPTH)/coreconf/rules.mk
+ 
+
+
+
diff --git a/dev-libs/nss/nss-3.37.ebuild b/dev-libs/nss/nss-3.37.ebuild
index 3a343d29931e..0a8ca3ede492 100644
--- a/dev-libs/nss/nss-3.37.ebuild
+++ b/dev-libs/nss/nss-3.37.ebuild
@@ -43,6 +43,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-3.32-gentoo-fixups.patch"
 	"${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
 	"${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
+	"${FILESDIR}/${P}-fix-fstar-missing-symbols.patch"
 )
 
 src_unpack() {
diff --git a/dev-libs/qjson/Manifest b/dev-libs/qjson/Manifest
deleted file mode 100644
index c7a70476f639..000000000000
--- a/dev-libs/qjson/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX qjson-0.9.0-featuresummary.patch 2491 BLAKE2B b08466358992ca3f39f46998ba2a0365f9371e41c9453e0f8900f5c86e8b07c25c6c0ea9c1184aef7303398044bddfad9f3d3995ead7be85def45c5807911ecf SHA512 c4899dba9936cafb86dcb3458e60db049f7d766efea8e187b773128fee8c4315d1be5f855a087e32b4d0e8d9d8fbec72f2d904356ec2125e7d222f117ba4afbf
-AUX qjson-0.9.0-gnuinstalldirs.patch 4768 BLAKE2B 0349603c7c68eda4190ddb2347c194a1edd5a80d70448f5e1e2c47eb1f72103930d26088c61ba2f77c95f9a5bb6f95254ba8ec17cdffb307df96c4e07a848bde SHA512 71d8183fb492667cb0fbf274820fff5a5f1ab698037eb4dec07d5e39d73e12793048e7292cd76bc09e49158046869fc9e96d3fdef390cb0f3e9432c6c52e00c9
-DIST qjson-0.9.0.tar.gz 98300 BLAKE2B 9c8624f9bfe9f88d0b4c48ec90ac5d57631a1468a1dbd4845907b94d63d94a0bad8fec7b511fc8ae024a7e1c2d6bf04aeff02251af7df3c037c1b438e3a2e985 SHA512 ff0674f32abc6c88f9c535a58931f60baafa355655b043009a2574dadb822f10ec25017b78f2911f897a554a34733d7332c94cf4290dec16a631e22070c15e61
-EBUILD qjson-0.9.0.ebuild 1073 BLAKE2B 9a27d30a23eeb51a433ac643b23055d40e2c6d67667bcba13274a8e80fa108ed626060b07feb6537b83902b51f371d394272c10252cbeae3303afda51546c185 SHA512 2c537044535ea125b41cdc406559943dac8e5c02d276a4d8826f1cabbca4193d8955a80b3046f142ca45f65662e5479a511db71e146784efb7e6a63bea8b265a
-MISC metadata.xml 434 BLAKE2B 679090eea9ba8989598373bef6e05a08547528dceb3081dc66b8f705e47d6873d7b591356d48a135b896faa2cc890d8755b35d52afabf06374f7bbc3b438e4cb SHA512 53076f290efbe638220c49c9be70359d0b2d615fc9a2df272df61e2385cb8add39a0a796bdd7e5def048e194f1756747d305ef8863489131297a305bb90460b5
diff --git a/dev-libs/qjson/files/qjson-0.9.0-featuresummary.patch b/dev-libs/qjson/files/qjson-0.9.0-featuresummary.patch
deleted file mode 100644
index 6613410fabf5..000000000000
--- a/dev-libs/qjson/files/qjson-0.9.0-featuresummary.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 7288382029f30b5e6ba7ac91b3b2e5d7f96d239a Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun, 9 Apr 2017 18:41:15 +0200
-Subject: [PATCH 2/2] Use FeatureSummary and simplify by requiring Qt-4.8
-
----
- CMakeLists.txt | 26 ++++++++++----------------
- 1 file changed, 10 insertions(+), 16 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d0c44bb..5f1305e 100755
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -12,6 +12,7 @@ if(POLICY CMP0020)
- endif()
- 
- include(GNUInstallDirs)
-+include(FeatureSummary)
- 
- set(CMAKE_INSTALL_NAME_DIR ${CMAKE_INSTALL_LIBDIR})
- 
-@@ -42,14 +43,14 @@ SET(FRAMEWORK_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/Library/Frameworks"
- # (This will have no effect with CMake < 2.8)
- SET(QT_USE_IMPORTED_TARGETS TRUE)
- 
--option(QT4_BUILD "Force building with Qt4 even if Qt5 is found")
-+option(QT4_BUILD "Force building with Qt4 even if Qt5 is found" OFF)
- IF (NOT QT4_BUILD)
--  FIND_PACKAGE( Qt5Core QUIET )
-+  FIND_PACKAGE( Qt5Core )
-+ELSE()
-+  MESSAGE ("Forced build with Qt4")
- ENDIF()
- 
- IF (Qt5Core_FOUND)
--  MESSAGE ("Qt5 found")
--
-   INCLUDE_DIRECTORIES(${Qt5Core_INCLUDE_DIRS})
-   ADD_DEFINITIONS(${Qt5Core_DEFINITIONS})
-   SET(PC_Requires "Qt5Core")
-@@ -59,20 +60,11 @@ IF (Qt5Core_FOUND)
-   # As moc files are generated in the binary dir, tell CMake
-   # to always look for includes there:
-   set(CMAKE_INCLUDE_CURRENT_DIR ON)
--  set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQT_USE_QSTRINGBUILDER" )
--  MESSAGE ("Enable QStringBuilder")
-+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQT_USE_QSTRINGBUILDER" )
- ELSE()
--  MESSAGE ("Qt5 not found, searching for Qt4")
-   # Find Qt4
--  FIND_PACKAGE( Qt4 4.5 REQUIRED )
--  # QStringBuilder is supported since Qt 4.8 for both QString and QByteArray
--  IF (NOT (${QT_VERSION_MINOR} STRLESS "8"))
--    MESSAGE ("Enable QStringBuilder")
--    set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQT_USE_QSTRINGBUILDER" )
--  ELSE()
--    MESSAGE ("Disable QStringBuilder")
--  ENDIF()
--
-+  FIND_PACKAGE( Qt4 4.8 REQUIRED QtCore)
-+  set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQT_USE_QSTRINGBUILDER" )
-   # Include the cmake file needed to use qt4
-   INCLUDE( ${QT_USE_FILE} )
-   SET(PC_Requires "QtCore")
-@@ -131,3 +123,5 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/QJSON${QJSON_SUFFIX}Config.cmake
- 
- ADD_CUSTOM_TARGET(uninstall
-   "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
-+
-+FEATURE_SUMMARY(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
--- 
-2.12.2
-
diff --git a/dev-libs/qjson/files/qjson-0.9.0-gnuinstalldirs.patch b/dev-libs/qjson/files/qjson-0.9.0-gnuinstalldirs.patch
deleted file mode 100644
index f51c2600129d..000000000000
--- a/dev-libs/qjson/files/qjson-0.9.0-gnuinstalldirs.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-From bec00c5c1b0a3da65de82e38bdd633ce8f284ec4 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun, 9 Apr 2017 18:36:24 +0200
-Subject: [PATCH 1/2] Use GNUInstallDirs
-
----
- CMakeLists.txt       | 15 +++++----------
- QJSONConfig.cmake.in |  2 +-
- QJson.pc.in          |  6 +++---
- src/CMakeLists.txt   | 12 ++++++------
- 4 files changed, 15 insertions(+), 20 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2fde79f..d0c44bb 100755
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -11,7 +11,9 @@ if(POLICY CMP0020)
- 	cmake_policy(SET CMP0020 OLD)
- endif()
- 
--set(CMAKE_INSTALL_NAME_DIR ${LIB_INSTALL_DIR})
-+include(GNUInstallDirs)
-+
-+set(CMAKE_INSTALL_NAME_DIR ${CMAKE_INSTALL_LIBDIR})
- 
- IF("${CMAKE_BUILD_TYPE}" MATCHES "^Rel.*")
-   ADD_DEFINITIONS("-DQT_NO_DEBUG_OUTPUT")
-@@ -80,12 +82,7 @@ IF (NOT WIN32)
-   SET( QT_DONT_USE_QTGUI TRUE )
- ENDIF()
- 
--
--#add extra search paths for libraries and includes
--SET (LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" )
--SET (LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE STRING "Directory where lib will install")
--SET (INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "The directory the headers are installed in")
--SET (CMAKECONFIG_INSTALL_DIR "${LIB_INSTALL_DIR}/cmake/${CMAKE_PROJECT_NAME}${QJSON_SUFFIX}" CACHE PATH "Directory where to install QJSONConfig.cmake")
-+SET (CMAKECONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${CMAKE_PROJECT_NAME}${QJSON_SUFFIX}" CACHE PATH "Directory where to install QJSONConfig.cmake")
- 
- set(QJSON_LIB_MAJOR_VERSION "0")
- set(QJSON_LIB_MINOR_VERSION "9")
-@@ -93,15 +90,13 @@ set(QJSON_LIB_PATCH_VERSION "0")
- 
- set(QJSON_LIB_VERSION_STRING "${QJSON_LIB_MAJOR_VERSION}.${QJSON_LIB_MINOR_VERSION}.${QJSON_LIB_PATCH_VERSION}")
- 
--set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" )
--
- # pkg-config
- IF (NOT WIN32)
-   CONFIGURE_FILE (${CMAKE_CURRENT_SOURCE_DIR}/QJson.pc.in
-                   ${CMAKE_CURRENT_BINARY_DIR}/QJson${QJSON_SUFFIX}.pc
-                   @ONLY)
-   INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/QJson${QJSON_SUFFIX}.pc
--           DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
-+           DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
- ENDIF (NOT WIN32)
- 
- # Subdirs
-diff --git a/QJSONConfig.cmake.in b/QJSONConfig.cmake.in
-index 0c4a1e6..22394cb 100644
---- a/QJSONConfig.cmake.in
-+++ b/QJSONConfig.cmake.in
-@@ -1,6 +1,6 @@
- GET_FILENAME_COMPONENT(myDir ${CMAKE_CURRENT_LIST_FILE} PATH)
- 
- SET(QJSON_LIBRARIES qjson)
--SET(QJSON_INCLUDE_DIR "@INCLUDE_INSTALL_DIR@")
-+SET(QJSON_INCLUDE_DIR "@CMAKE_INSTALL_INCLUDEDIR@")
- 
- include(${myDir}/QJSON@QJSON_SUFFIX@Targets.cmake)
-diff --git a/QJson.pc.in b/QJson.pc.in
-index 55abc28..4cb3de8 100644
---- a/QJson.pc.in
-+++ b/QJson.pc.in
-@@ -1,11 +1,11 @@
- prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=${prefix}
--libdir=@LIB_INSTALL_DIR@
--includedir=@INCLUDE_INSTALL_DIR@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
- 
- Name: QJson
- Description: QJson is a qt-based library that maps JSON data to QVariant objects
- Version: @QJSON_LIB_MAJOR_VERSION@.@QJSON_LIB_MINOR_VERSION@.@QJSON_LIB_PATCH_VERSION@
- Requires: @PC_Requires@
- Libs: -L${libdir} -lqjson
--Cflags: -I${includedir}
-\ No newline at end of file
-+Cflags: -I${includedir}
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 0ae7c40..0e461f7 100755
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -55,19 +55,19 @@ set_target_properties(qjson${QJSON_SUFFIX} PROPERTIES
-                       )
- 
- INSTALL(TARGETS qjson${QJSON_SUFFIX} EXPORT qjson-export
--   LIBRARY DESTINATION ${LIB_INSTALL_DIR}
--   RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
--   ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
-+   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-+   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    FRAMEWORK DESTINATION ${FRAMEWORK_INSTALL_DIR}
--   PUBLIC_HEADER DESTINATION ${INCLUDE_INSTALL_DIR}/qjson${QJSON_SUFFIX}
-+   PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/qjson${QJSON_SUFFIX}
- )
- 
- if(MSVC)
-   get_target_property(LOCATION qjson LOCATION_DEBUG)
-   string(REGEX REPLACE "\\.[^.]*$" ".pdb" LOCATION "${LOCATION}")
--  install(FILES ${LOCATION} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin CONFIGURATIONS Debug)
-+  install(FILES ${LOCATION} DESTINATION ${CMAKE_INSTALL_BINDIR} CONFIGURATIONS Debug)
- 
-   get_target_property(LOCATION qjson LOCATION_RELWITHDEBINFO)
-   string(REGEX REPLACE "\\.[^.]*$" ".pdb" LOCATION "${LOCATION}")
--  install(FILES ${LOCATION} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin CONFIGURATIONS RelWithDebInfo)
-+  install(FILES ${LOCATION} DESTINATION ${CMAKE_INSTALL_BINDIR} CONFIGURATIONS RelWithDebInfo)
- endif(MSVC)
--- 
-2.12.2
-
diff --git a/dev-libs/qjson/metadata.xml b/dev-libs/qjson/metadata.xml
deleted file mode 100644
index 7289596d0cf1..000000000000
--- a/dev-libs/qjson/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>qt@gentoo.org</email>
-		<name>Gentoo Qt Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">flavio/qjson</remote-id>
-		<bugs-to>https://github.com/flavio/qjson/issues</bugs-to>
-		<remote-id type="sourceforge">qjson</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-libs/qjson/qjson-0.9.0.ebuild b/dev-libs/qjson/qjson-0.9.0.ebuild
deleted file mode 100644
index 44e00e0bd520..000000000000
--- a/dev-libs/qjson/qjson-0.9.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib
-
-DESCRIPTION="Library for mapping JSON data to QVariant objects"
-HOMEPAGE="http://qjson.sourceforge.net"
-SRC_URI="https://github.com/flavio/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="debug doc test"
-
-RDEPEND="
-	dev-qt/qtcore:4[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	test? ( dev-qt/qttest:4[${MULTILIB_USEDEP}] )
-"
-
-DOCS=( ChangeLog README.md )
-
-PATCHES=(
-	"${FILESDIR}/${P}-gnuinstalldirs.patch"
-	"${FILESDIR}/${P}-featuresummary.patch"
-)
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DQT4_BUILD=ON
-		-DQJSON_BUILD_TESTS=$(usex test)
-	)
-
-	cmake-utils_src_configure
-}
-
-multilib_src_install_all() {
-	if use doc && is_final_abi; then
-		pushd doc > /dev/null || die
-			doxygen Doxyfile || die "Generating documentation failed"
-			HTML_DOCS=( doc/html/. )
-		popd > /dev/null || die
-		einstalldocs
-	fi
-}
diff --git a/dev-libs/satyr/Manifest b/dev-libs/satyr/Manifest
new file mode 100644
index 000000000000..67ca6c8c9f05
--- /dev/null
+++ b/dev-libs/satyr/Manifest
@@ -0,0 +1,3 @@
+DIST satyr-0.26.tar.gz 434820 BLAKE2B 4463c69e6ac2eb8237f599bfeed308265a906c6e3efa154b14eb6ee7acdc65580da9baf5ecb99e4efa4f8c00f7656ff2a747e607f2293b12a513ed680986fe08 SHA512 45dfc42e05e93fa0417c8c5d6811097cabaa0f4dcfb79df13d3840d789cfd41c84382ae84882ca120b1a3120987123a306656324cf39f306046a5d30547db656
+EBUILD satyr-0.26.ebuild 1009 BLAKE2B b90d8ad64db0a0547e2cba96fab7a7ced1173efe729b002c24758f15c8b9622e0a7496df37c9fa9ecc9f51f6730e4e68342067353f805d1d6c8ac8e72d1d6bae SHA512 71e35c0ae1e4b085b4032450a75ee5e0ea80b55e4db22dfc9c955a71baf382be491dd56424e518d9db13a123962bcd95f91db510a61778ae0806410e248eb3f6
+MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/satyr/metadata.xml b/dev-libs/satyr/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/dev-libs/satyr/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>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-libs/satyr/satyr-0.26.ebuild b/dev-libs/satyr/satyr-0.26.ebuild
new file mode 100644
index 000000000000..400a2a442d4a
--- /dev/null
+++ b/dev-libs/satyr/satyr-0.26.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit autotools python-r1 toolchain-funcs
+
+DESCRIPTION="Satyr is a collection of low-level algorithms for program failure processing"
+HOMEPAGE="https://github.com/abrt/satyr"
+SRC_URI="https://github.com/abrt/${PN}/archive/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0/3"
+
+IUSE="python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )
+	>=dev-libs/elfutils-0.158
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	./gen-version || die # Needs to be run before full autoreconf
+	eautoreconf
+	use python && python_copy_sources
+}
+
+src_configure() {
+	local myargs=(
+		--localstatedir="${EPREFIX}/var"
+		--without-rpm
+		# Build breaks without and we aren't supporting Python2 anyway
+		--without-python2
+		$(usex python "--with-python3" "--without-python3")
+	)
+
+	econf "${myargs[@]}"
+}
diff --git a/dev-libs/volume_key/Manifest b/dev-libs/volume_key/Manifest
index ba9f61f66242..963ca7589a0d 100644
--- a/dev-libs/volume_key/Manifest
+++ b/dev-libs/volume_key/Manifest
@@ -1,6 +1,9 @@
+AUX volume_key-0.3.10-find_python.patch 1879 BLAKE2B 378cd77c94abaac606f22f6569843f01cf30f8f59cf1e25e224c67e0709fa13101ff7636598e833367fd15e17aaadc3271afb7cb3ffd077a0bbd9dcba02c99c2 SHA512 3b3ce019f9c3ff04f3193c07fbcf8881296e2f3717f405f9a0db57aec8903e34c763f6a2c177aec816a88922db64f3041033f9d4315b3b805a283bcd1baa8401
 AUX volume_key-0.3.9-config.h.diff 819 BLAKE2B ad442b6cff8468e49172d4216125b59b957a565bf05a136e1cd2f652f70c93f8eb8a2770d83da536faee4bf0d6200b8fcc19102e5fae9cf60961c9e0313bd4c4 SHA512 ce8fd4fd60baacda3bfd88de86f5251bd9394f4b13dbb0ece494a07c3510429c458cef051cf56d9ef04b97e7120898ab62585fd1966a93724ea0476a9d465c04
 AUX volume_key-0.3.9-cryptsetup2.patch 11118 BLAKE2B a271091011046c5765f1202a655a591a9dde6732997a39760a792c12caba5eff31c130247a33866d8d7cb47ef91c515d28375729d06f321bd0502063d7793e8a SHA512 154e8c2860ffb07f367696ed23309910162c23a445e7c46411f63f6a46e65aaf5285559a51320edf3a424d98300058356ef058689c06719e00616f211ac4164a
 AUX volume_key-0.3.9-find_python.patch 1845 BLAKE2B 0924bdd416f4eab70648964a1ad76263db76a3c7c62819146d200c6a88ef65ed24aa90c3dcd426e5cd137e07ddf04ddfd95474f6204f4e76b0c2a3b746e16dfb SHA512 5b2de4c5c18bb17fbf2a7e5de8adc36d919c5e98aafc33bbd3464ab60ce520ee0b4da0447f7e55ae262c9f6243936badd20f8ce5f9f3367188d80ba28932d0d7
+DIST volume_key-0.3.10.tar.xz 474720 BLAKE2B 726252263976b63c3e73dc42bd0166aa1c05df7a61715ca19921e9cd92abf1f8c84347127c94f724e385e0a36411ffae92341d91d06d679c052c83edb5ab6c49 SHA512 b050d333e021bc3721f5e72c1d2498adea3265afe7f702e1b1e859546755745ac70dcffc194739a4833d4b0b77168506f7fe90fde382d8aab4df2af7b635932b
 DIST volume_key-0.3.9.tar.xz 445092 BLAKE2B b9cec52ca02e331501d378482484535413f3ef7675b6592b9f26f272d36448a2ffee1a0ca1c7a552764324ab20cd6dac98447914faafbea96e4c526796bec587 SHA512 bc0e690997b9fa1c9fff361d04e7eddcac4cac09779d7a1f9e161be117f5c589a7e444ac16dab25fb3e3ce201591f7dc937595ddf2745d7daa625d4ab0a255e0
+EBUILD volume_key-0.3.10.ebuild 892 BLAKE2B f1698f22f16aa35276bc2b2eb4aee7a5fa3916b45c9bef3eaf2743d1c51dd6ddc8af059d47acdd64aec74f8304f50011a577b53ac112a2929d13f641a3f287f6 SHA512 76e10dd531efbf4f685fc0f5ae13c7548b20be8d80f232d128d07ac3aab57662bb90d10112b79b8ec417386f98b32ff342f5f7614ef9d053c28424ae53dd8a1d
 EBUILD volume_key-0.3.9.ebuild 1030 BLAKE2B 4eb58cce79277f652acda134685f10db2c61093d8418cd7d5c550b0aa3f4acd5739a17bf45bbc2b9b707954ffa8179119ab9c41c3e752d5e958fe2ffdb76d33e SHA512 421e9f70ecc487ca8e8db52ff20deb6503d8106443e14f3781a5c4bc338b722ff2c453a0311a8b46f346986b31c4709f0d1b30e2df70f7fa6d7e166474dad455
 MISC metadata.xml 257 BLAKE2B 35c1b06807230338ceb9de70f79760d55e93dcdba508da3c663e785ab3966781edc2098abd8df084b2ecabbf40ff8e8e4a0d0a6e131daf648ff58e101cf27587 SHA512 ff078cacb115b8f3624b45d883d8ed72701e3d2fccae06c04c633eb60821b23681cc151e00689d1b6035c94570535e7ac0de51a55dae99f606886164883185ea
diff --git a/dev-libs/volume_key/files/volume_key-0.3.10-find_python.patch b/dev-libs/volume_key/files/volume_key-0.3.10-find_python.patch
new file mode 100644
index 000000000000..2e76c1d937d6
--- /dev/null
+++ b/dev-libs/volume_key/files/volume_key-0.3.10-find_python.patch
@@ -0,0 +1,55 @@
+From ab21d82bc0186627451d16be45568fcf2b590817 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Tue, 22 May 2018 15:08:44 +0200
+Subject: [PATCH] Use pkgconfig to find python
+
+otherwise linkage and include of python fails if python is not in
+default (python$(PYTHON_VERSION)) location.
+---
+ Makefile.am  | 4 ++--
+ configure.ac | 7 +++++--
+ 2 files changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 68560b1..0bc1a5b 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -20,7 +20,7 @@ ACLOCAL_AMFLAGS = -I m4
+ AM_CPPFLAGS = $(blkid_CFLAGS) $(glib_CFLAGS) $(GPGME_CFLAGS) \
+ 	$(libcryptsetup_CFLAGS) $(nss_CFLAGS)
+ LOCALEDIR_CPPFLAGS = -DLOCALEDIR='"$(localedir)"'
+-PYTHON_CPPFLAGS = -I/usr/include/python$(PYTHON_VERSION)
++PYTHON_CPPFLAGS = $(PYTHON_CFLAGS)
+ 
+ ## Targets
+ SUBDIRS = po
+@@ -65,7 +65,7 @@ lib_libvolume_key_la_LIBADD = $(blkid_LIBS) $(glib_LIBS) $(GPGME_LIBS) \
+ python__volume_key_la_SOURCES = python/volume_key_wrap.c
+ python__volume_key_la_CPPFLAGS = $(AM_CPPFLAGS) $(PYTHON_CPPFLAGS)
+ python__volume_key_la_LDFLAGS = -module -avoid-version $(glib_LIBS)
+-python__volume_key_la_LIBADD = lib/libvolume_key.la -lpython$(PYTHON_VERSION) \
++python__volume_key_la_LIBADD = lib/libvolume_key.la $(PYTHON_LIBS) \
+ 	$(glib_LIBS) $(nss_LIBS)
+ 
+ src_volume_key_SOURCES = src/volume_key.c
+diff --git a/configure.ac b/configure.ac
+index 40c3906..c9680e4 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -28,8 +28,11 @@ AC_PROG_CC
+ AM_PROG_CC_C_O
+ AM_PROG_AR
+ LT_INIT([disable-static])
+-AC_PATH_PROGS(PYTHON, python2.7 python2.6 python2 python, [Python is required])
+-AM_PATH_PYTHON([2.6], [], AC_MSG_ERROR([Python 2.6 or 2.7 is required]))
++PKG_PROG_PKG_CONFIG
++PKG_CHECK_MODULES(PYTHON, [python], [
++	AM_PATH_PYTHON
++	], AC_MSG_ERROR([Python is required])
++)
+ 
+ AC_PATH_PROG([GPG], [gpg2])
+ AC_ARG_VAR([GPG])
+-- 
+2.17.0
+
diff --git a/dev-libs/volume_key/volume_key-0.3.10.ebuild b/dev-libs/volume_key/volume_key-0.3.10.ebuild
new file mode 100644
index 000000000000..6b38bad452ec
--- /dev/null
+++ b/dev-libs/volume_key/volume_key-0.3.10.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit autotools python-single-r1
+
+DESCRIPTION="Library for manipulating and storing storage volume encryption keys"
+HOMEPAGE="https://pagure.io/volume_key"
+SRC_URI="http://releases.pagure.org/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	app-crypt/gpgme
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	sys-apps/util-linux
+	sys-fs/cryptsetup:=
+"
+DEPEND="
+	${RDEPEND}
+	sys-devel/gettext
+	test? ( dev-libs/nss[utils] )
+	"
+
+RESTRICT="test" # possible gpgme issue
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.10-find_python.patch
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/dev-libs/xmlsec/Manifest b/dev-libs/xmlsec/Manifest
index 39566cd7a2f6..78c7961fcb4f 100644
--- a/dev-libs/xmlsec/Manifest
+++ b/dev-libs/xmlsec/Manifest
@@ -1,5 +1,3 @@
-DIST xmlsec1-1.2.24.tar.gz 1835762 BLAKE2B 78a2e1c7a324596ef34e111cba62ffcc26ad78d25823820b03753ec6449d44bfea792abbf3168728f2a117af0982a999bad918db72d1cac70a38e6e894852284 SHA512 a01feb9af8f85e77f2c5d2d7f596fba3ef58bc593cb9a7c3e883deb38f8292598ba5aa09fa59897fe303f10336a10b0bb0f27171f2b6e6251e694f37f0b9b7d4
 DIST xmlsec1-1.2.25.tar.gz 1839160 BLAKE2B af480affa84c47c5656889c8114f147e1d9a5ad0f9a494c8913fd180aa5e2cba4773451c4a5f41781026e7617cccf329057182fc3fc3f2bd4e6f007cbe8ac190 SHA512 ac61547a1cbf9016d7f75be3dc5249d6bc8a526bc51715e53ede13f056c1c72c57433a6be200c886000a25826c3e473954ded3ae988f25d37ac4ef4d777c66a6
-EBUILD xmlsec-1.2.24-r1.ebuild 1478 BLAKE2B 07d4179c4f5e50b156f059f53ef84937226ff75bd71d04ee18fb4a48ade98288e97be7fbfe3fa5fb0af6ccc54458a32ba735de15e22e601a62ee0d0f6af24fea SHA512 3e24d2236ab4820d0684a18eebe0ef991c181c950668b57d087b5b33fcd987d189057cc1783fd50f9eff68f39e544a48ce321ee8a98348d4accac4e805d8ec6d
-EBUILD xmlsec-1.2.25.ebuild 1481 BLAKE2B 679399a9bb324b39bbf4ff2b25ac8a9f6d0b578ab5979ef3e29b0dcb6fe8ca6e6035c155770af26b922903797ac4851fc038d75c1a67726cc5a448b622cb79c4 SHA512 7e1451562601c17391bdec755f83fcf26c3e7fefe9ff75259bfbb8ac1e0ce9f368baf69d163e0da09ddf8dc36c5725e0b7fc4d334b21eec3ada31e37f071bae4
+EBUILD xmlsec-1.2.25.ebuild 1480 BLAKE2B 9bd318bfcc77816da5daa4b1fb0ad6171be99fcf9d25e0b3efb25b961f8f80b7fe633dc359e686688c9a947d460ac4b54642573c4f2d14c2862a97748add2d88 SHA512 76395779c179b42bd9f86fed6efcf8c849c0e76297158f8cd5883fe034bdf94a7ff54c1ea88bd4bfa52d495be3960c0b36e1cac0b52fa6b817d7074551dfa1af
 MISC metadata.xml 487 BLAKE2B 0e191be30487c618789a7eaf8c2ca9ba0e801649213674adc85e76a5402853055d384efb9d6b534099683de4b2935dafa613ac029fd810125993d039cf9caec8 SHA512 1be5c6aa74ba9542e7b4b85adb8dd743fbeb72b4fee345996ee1b5bc662d9455d910f00ca37b16e644f53039a346ef44afc5e49abba19c5f8d4d00cbdf37d660
diff --git a/dev-libs/xmlsec/xmlsec-1.2.24-r1.ebuild b/dev-libs/xmlsec/xmlsec-1.2.24-r1.ebuild
deleted file mode 100644
index 1944f78b719c..000000000000
--- a/dev-libs/xmlsec/xmlsec-1.2.24-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools ltprune
-
-DESCRIPTION="Command line tool for signing, verifying, encrypting and decrypting XML"
-HOMEPAGE="https://www.aleksey.com/xmlsec"
-SRC_URI="https://www.aleksey.com/xmlsec/download/${PN}1-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~sparc x86"
-IUSE="doc gcrypt gnutls libressl nss +openssl static-libs"
-REQUIRED_USE="|| ( gcrypt gnutls nss openssl )
-	gnutls? ( gcrypt )"
-
-RDEPEND=">=dev-libs/libxml2-2.7.4
-	>=dev-libs/libxslt-1.0.20
-	gcrypt? ( >=dev-libs/libgcrypt-1.4.0:0 )
-	gnutls? ( >=net-libs/gnutls-2.8.0 )
-	nss? (
-		>=dev-libs/nspr-4.4.1
-		>=dev-libs/nss-3.9
-	)
-	openssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${PN}1-${PV}
-
-src_prepare() {
-	default
-	# conditionally install extra documentation
-	if ! use doc ; then
-		sed -i '/^SUBDIRS/s/docs//' Makefile.am || die
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	econf \
-		--enable-pkgconfig \
-		--with-html-dir=/usr/share/doc/${PF}/html \
-		$(use_enable static-libs static) \
-		$(use_with gcrypt gcrypt "") \
-		$(use_with gnutls gnutls "") \
-		$(use_with nss nspr "") \
-		$(use_with nss nss "") \
-		$(use_with openssl openssl "") \
-		$(use_enable openssl aes)
-}
-
-src_test() {
-	emake TMPFOLDER="${T}" check
-}
-
-src_install() {
-	default
-	prune_libtool_files --all
-}
diff --git a/dev-libs/xmlsec/xmlsec-1.2.25.ebuild b/dev-libs/xmlsec/xmlsec-1.2.25.ebuild
index 7e85bca44a1e..e4393747d0bd 100644
--- a/dev-libs/xmlsec/xmlsec-1.2.25.ebuild
+++ b/dev-libs/xmlsec/xmlsec-1.2.25.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.aleksey.com/xmlsec/download/${PN}1-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~sparc x86"
 IUSE="doc gcrypt gnutls libressl nss +openssl static-libs"
 REQUIRED_USE="|| ( gcrypt gnutls nss openssl )
 	gnutls? ( gcrypt )"
diff --git a/dev-lisp/Manifest.gz b/dev-lisp/Manifest.gz
index 82fca5f9e180..96250de83271 100644
--- a/dev-lisp/Manifest.gz
+++ b/dev-lisp/Manifest.gz
diff --git a/dev-lisp/ecls/Manifest b/dev-lisp/ecls/Manifest
index d880a0f1c1ec..9a80db063e88 100644
--- a/dev-lisp/ecls/Manifest
+++ b/dev-lisp/ecls/Manifest
@@ -6,5 +6,5 @@ AUX ecls-16.1.3-headers-gentoo.patch 446 BLAKE2B db2adc332867435e799e2779fbad5eb
 DIST ecl-13.5.1.tgz 9401163 BLAKE2B 441f2ed429f9f508d12fec333aeed7178aedab0e2011c57fbf0c6695747de95e5db6818c5cfc6acd1097804a4cd7bf1dd0ec3e79c04a5b4399d61cefb5179ba7 SHA512 a09f8b824aa78e461d700eefb1a8b68b876e15d49124a397e0b5b58ad73b80f818133a7b8e48ddb83505eea2f9c5fb024de8701b527524004e336e456eb07c84
 DIST ecl-16.1.3.tgz 7459212 BLAKE2B 4f9d6ad2bd92ede4b5b20857b95a48bad5002049e83611865d9cf13e7131adfaad147a31f22f9a3f6a2c06e46db1996aa98135c28b97bf5ef16e17b5eba0dc4b SHA512 5d743f422f6bc24671abf4c739cde8273d08f056906a1ef8aed5145c703b6d52c7fa4b5e0be8c125f32240c20ce053007786bb3ae81cc34d47791f6fae0819c1
 EBUILD ecls-13.5.1-r1.ebuild 2231 BLAKE2B 7bb19af668e153b496feffba346c7cb8829d2c82d230f149c24d42a2800ae9ac9df75c1616b01e5c772c3c442070e83c020c870af98dd89c06b8585094f41d5d SHA512 8542ca9bad0122153931dd949006928d63475669b81c3a17f148c3be1ffe8874586965c0a43fa294b492ff210bdae7f302aa92d2cca9e3fef19a6ceef91c0ed7
-EBUILD ecls-16.1.3.ebuild 2408 BLAKE2B d5ce468821fdeefe27cdee16ed148b96db3d5983bf0b680d145a5459a40cac84316b4ef4e084a546d5dd93eead348628850b9fae0315384ffa65d6315c5b40d9 SHA512 60d53473e1b56f23905c2e705be99e0e4d7b92d81fce9b941c8e6e8367274d5ac01465fd2d90dc498a672e2276cc0c5ed49d3676312030b155762406ee15fcb9
+EBUILD ecls-16.1.3.ebuild 2407 BLAKE2B 0c576e31849f4f9f774a7e76d6c954899a6a13afcadedc40150ff6dfe844c560a34eb4f5dc7d5f6386dfe62531b9db870979e738fcc536a427f8b095b19a8460 SHA512 c4c4a0da74d12260415ed24f9178b5b62c1b0a0ab9451a8ab2b0409aa6dd00597dcaa4e63f3446ba13ddeab5c4fa01d3908d28b12f0c379da4f56110694cdfdf
 MISC metadata.xml 901 BLAKE2B 96892af45b0d5c6b7c0e0ee20010ce7ac068a25d024d31f2dae1acd730aaa62f7589f322d7ad0ade27a03cdae7eeef5297adcd9fb821ca67d4e1ba88de1c2a17 SHA512 15403f25533646601eb454946599d1d97353038286df0d075f923b598fe44047e525745a33f7e3dbc15fee717d6311abbe546371ecbc4c9df347771dd5c007e9
diff --git a/dev-lisp/ecls/ecls-16.1.3.ebuild b/dev-lisp/ecls/ecls-16.1.3.ebuild
index c854c57688a5..6df0adb3ed2e 100644
--- a/dev-lisp/ecls/ecls-16.1.3.ebuild
+++ b/dev-lisp/ecls/ecls-16.1.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://common-lisp.net/project/ecl/static/files/release/${MY_P}.tgz"
 
 LICENSE="BSD-2 LGPL-2.1+"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc ~x86"
 IUSE="cxx debug emacs gengc precisegc cpu_flags_x86_sse +threads +unicode +libatomic X"
 
 CDEPEND="dev-libs/gmp:0
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index fe09564ef51d..5ec2318b6a94 100644
--- a/dev-perl/Manifest.gz
+++ b/dev-perl/Manifest.gz
diff --git a/dev-perl/XML-TreePP/Manifest b/dev-perl/XML-TreePP/Manifest
index 2590b909cc33..99b2dc43cd90 100644
--- a/dev-perl/XML-TreePP/Manifest
+++ b/dev-perl/XML-TreePP/Manifest
@@ -1,3 +1,3 @@
 DIST XML-TreePP-0.43.tar.gz 91382 BLAKE2B 2a7d89d6d5e3bcf965b001cf8e18465b1cdfdeb94cd96c77008beb16b559fc072bd24a5c954a12965e2a03d9707c372c779ac7ca1e2938807055e64f9e7ed077 SHA512 4289a0a8100ef15f62f0e303f13094371ac6f1b54d887be1ed7e2ea31d7f1f6fc28d4234cf96458074137f756db3fe452ded170d3ee576f7eb2cfc9996cc31d1
-EBUILD XML-TreePP-0.430.0-r1.ebuild 418 BLAKE2B a08d89157ae6e2611fee26b04f123624ceb2d14ff6f34235772a975bb935370659b6bfc7bf127726ddc533358c384aacc89e17cddb8f7bfc607134cf5e050b96 SHA512 adb44b281469e4d488c698ab4516afeb0ba776481ab30abfced465ba28214fc5d942bdc87cf6c94d8ebddfd0d18f1c95be9641a45eab4f1bf51a29efb9e9ae3e
+EBUILD XML-TreePP-0.430.0-r1.ebuild 417 BLAKE2B 0377500e84919a5f1c55aad4072e2a43c044852ca26e0ce32f286d045b6c431e402eb4e8d06076d5eb78b32837ac3866f57002446fc8ab7f5f40cbd955742a9e SHA512 36fc5cc5a64a87bc031a5510ee350390816c963199abd679020700f3253d081e850e7bd2957071d31743b05ad7e3e7b69572ed92eecd0afec70f19547ea59874
 MISC metadata.xml 464 BLAKE2B 08cb87d6a9682641c50be91f1d89cbc7bfb5f114f799bce0aaeff908675a7b3f2f559070597242bf9c2bc58408391be543adcb281999e8d159046312c54a743c SHA512 d5aeaa43384401788f7d1aa589615a31e6ce678a54b6bf960b7fb6740fa548cb0bfa69928ca6ff19c956920a83729409060b2c42dbb576bc7ce58fdc30134350
diff --git a/dev-perl/XML-TreePP/XML-TreePP-0.430.0-r1.ebuild b/dev-perl/XML-TreePP/XML-TreePP-0.430.0-r1.ebuild
index 865e1264cdd2..1c2332884792 100644
--- a/dev-perl/XML-TreePP/XML-TreePP-0.430.0-r1.ebuild
+++ b/dev-perl/XML-TreePP/XML-TreePP-0.430.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Pure Perl implementation for parsing/writing XML documents"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86"
+KEYWORDS="amd64 ~arm ppc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 1da58372dda9..b7934bf34a33 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/certifi/Manifest b/dev-python/certifi/Manifest
index 65a1069ab2ff..6bbe0f1ddb6b 100644
--- a/dev-python/certifi/Manifest
+++ b/dev-python/certifi/Manifest
@@ -12,5 +12,5 @@ EBUILD certifi-2017.11.5.ebuild 745 BLAKE2B c067c15c4e240e20d9d592bb3352aa470928
 EBUILD certifi-2017.4.17.ebuild 733 BLAKE2B cf5b9f064b89763ffad166f0edc94ffa1d683eee7d22fd2a6892c770038c40eee32332b6c61ff57e5cd42a1bb842a54e49e9b434e49160a77248115e01e54c93 SHA512 51140472f336d9cef4030ed5e26badcccdec2362de0074e07da6de5ce3e6ed72c1efa8502806130060f111ca5b67d206c44e00ee248625a0275a365236744841
 EBUILD certifi-2017.7.27.1.ebuild 745 BLAKE2B c067c15c4e240e20d9d592bb3352aa470928d70b779d87ea37af2ef798dbaabdc8b6ba808d53d2cc7ec471b8063e0e200cb6b30c53465bef4867d0783503f789 SHA512 306df9d0c88d47f995e8858da82f541fc9015d9271fb90527fbb7a5c4f0fe5ddb9ef3c5aeb32b8cd848749c2599e828f0e6dcbd6056791d8a1391ee9b1ebe87c
 EBUILD certifi-2018.1.18.ebuild 744 BLAKE2B fb5b7327661894ecf1406dd34ec7e9853492211308947cd5f22af7bb7fc607572fe5b623e0da89d3cf8db5f020b7ff0ce42133aa275fa4e6ba7064c2af536552 SHA512 93a9b753950036f35a026428521fef8ecb0afd9f2b0ff347250e7706567a68203dfe10bd3da31b771a9bdbb5c5ccafa2cffd9785959094a38306010b36e13fc4
-EBUILD certifi-2018.4.16.ebuild 1443 BLAKE2B 58a18f1a58ba6224c8e51163bff0f73212f5097e87b16097b5e14185a0b597decf581167853d4380c0ec1e5f6fa23ded535485081b8813f46ddb442574f47f27 SHA512 6306937bbb950ce8e5aad89f75e833877f402a81a4b1061f931433503bd8a6c97f137d4e6dafcb3d17ab3c77009a7f4b176b0c415815c23ccbf41cac56c99b26
+EBUILD certifi-2018.4.16.ebuild 1440 BLAKE2B c81effda0ed28a469ba33ba60bb6c0f3fbe69535a2257f0916d038d1a3c6b1a6d1b6216dd841d67f5428bcd11332a690d1e4757f3a360780575c817841c875e4 SHA512 9bb415d9ace43f0b4c138496ad8743c9f6e7a6fdcf97e8eabc3769ea16b3db9c9fa05cecaf6a646a250aac0377d88cb7abcecf71236a9c1e7e5d9e5615fda27a
 MISC metadata.xml 320 BLAKE2B ba5c3c1018c5cba293969a523ab6c388f5bc0d0cfdfc69a4b143f1c966aad036df449bb091eacdeae2335a6bdc722da85882caad2a447bf87b600da2ed7c5309 SHA512 0e99564887f0a0b314056b2e1f4b6e3afcaf908de6824a2cc87deab9d1832566e97b8ba88cc7d2bdc5d11e7f1c8532830fc59602efd8c2f1a6061c0ad4853fdd
diff --git a/dev-python/certifi/certifi-2018.4.16.ebuild b/dev-python/certifi/certifi-2018.4.16.ebuild
index bc9a884dd33c..9d4a2580e896 100644
--- a/dev-python/certifi/certifi-2018.4.16.ebuild
+++ b/dev-python/certifi/certifi-2018.4.16.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="app-misc/ca-certificates"
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index 7eb82f8f3cc4..471b619f636a 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -7,6 +7,7 @@ DIST cryptography-2.1.4.tar.gz 441557 BLAKE2B 66aa07930ee54469328977e27096e65b7a
 EBUILD cryptography-1.7.1-r1.ebuild 1725 BLAKE2B 3327c2607caa9f5fe09f617091dcb21ec637cc5621aa10dcfdb07c82af71a7663a603ae2b7a1597ede0895221c2cf57fb5eacb8883ceb10f89fc36e9c1ef2900 SHA512 9e31689524057c73cf174c8ec4621b57777f20e75295748c91c58eeec8a058ac5067d996aaeb5508d87b07b58c3484e8a5a09c9f4585cadd10009cdc7899e79d
 EBUILD cryptography-1.7.1.ebuild 1662 BLAKE2B e93ee9089ba409dcc50f7a09aed35fe63706c0c08feda1413c1127fccdbedbe5de857b9f4980d2348125bfab11879b71b48e12c2d187f0ed8db6f5b083466e90 SHA512 33688e944e9b4a46f8a49b643fb5f8203716aca424ae6fb84d0b9351310efe4f7941eb2c329a8b4f11c159511aca7e8ee94bcbd25d89d3da919f943a591eda34
 EBUILD cryptography-2.0.2-r1.ebuild 1624 BLAKE2B 7bc96039e6e97bb471124fbc1d1a669a94b6b95a1066fc3a06e5adf84514efcb5651fb9a8c837942ed649e910fdb86ea86b4d92c4dca2177d81bc41ebc6800de SHA512 a65cda871f652ff1e903226396c238185e01a666b84bf1fd15a41707989b5848e4b442bce23c3bbc78a49bd64bfd27eb4d75274b2cb99be6c6ec5710d82df896
-EBUILD cryptography-2.1.4-r1.ebuild 2169 BLAKE2B dc679a33280d4799f2acb8f6a9488d31bbd32625db0fc65499f1bb92ffb8689c45b062f73bf5a541499d871ee0256ca28c6bd02c6a665eb5db4d8339de93ae2d SHA512 d3fd28d936a30804d427d226a17a40fc6a419a89fb685670feffa48be6e35786ffb335bae1fac1ff4687693f14c3ae0bc2919c32503925ce018949480c92d0fb
+EBUILD cryptography-2.1.4-r1.ebuild 2167 BLAKE2B 88d88d008ac9e992437eb0a5614e3c235b0a77040510f1a775388452b24d2dad2ede1e68cc52fb315d20ceaf520576bd3294a58b7bddc97e787f3a38fcabe672 SHA512 049faaca8acb3c5c7d70b19a4342dcb82478a9953f8f93f5eddc8341c08d73f7355e058e4e1916eec2747757658af6925e44e074894ce940b16d6f1c16b7b1df
+EBUILD cryptography-2.1.4-r2.ebuild 2176 BLAKE2B b968ca511a87e4b7a72385f939bbde3c046c3b8100696c2b2b71cb1fc4c9585d26856b683fc493c22e5f8fc8a2c328eca55643d0758589d988725c65b7d12f83 SHA512 1fab8535615be14b8d11f9f690dce40359e9e6e3885d6a195ec531f3bbd13668300f5e3ec85256d5467173310c09597923fedc5fc54692d6b9f5d1f51dc65735
 EBUILD cryptography-2.1.4.ebuild 2044 BLAKE2B 2dd3ba08232364b585e92ed6fd83a204f9d1192ca016a796275a200b995c9e3244c687c042600be62a7245f327813ac6d95f6fb8fd1682c0b861cd106a5d2e72 SHA512 43cb90a1de0f0501cbff6385bff0e80eb1fe412479dbfca2bf8ac3d15e93b2c4621b80ca45c7482852620de97eab249cca0e7d2a050856cf4147c22d0523b2bb
 MISC metadata.xml 384 BLAKE2B 6dbfdd39bb24b2df61454716e308605ae1d35c3babd01f16556bbbab240e425434315cb2b80a2c3e8e9b18b237899b5fb96566a7ffefde2af3af1dcc2e08362b SHA512 c2806f846608bdd0720b589494e13f57ab2d64026747f2b13f412c9a0e9d2bef6b16fc357e4d16b74ad7a2a2af8daa5e28d0b6bfe4d2141ce68881c724fd24c7
diff --git a/dev-python/cryptography/cryptography-2.1.4-r1.ebuild b/dev-python/cryptography/cryptography-2.1.4-r1.ebuild
index 9738b3e7e2a7..6f274fee00f9 100644
--- a/dev-python/cryptography/cryptography-2.1.4-r1.ebuild
+++ b/dev-python/cryptography/cryptography-2.1.4-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE="libressl test"
 
 # the openssl 1.0.2l-r1 needs to be updated again :(
diff --git a/dev-python/cryptography/cryptography-2.1.4-r2.ebuild b/dev-python/cryptography/cryptography-2.1.4-r2.ebuild
new file mode 100644
index 000000000000..c20ec519e1cf
--- /dev/null
+++ b/dev-python/cryptography/cryptography-2.1.4-r2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Library providing cryptographic recipes and primitives"
+HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.org/project/cryptography/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 BSD )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+IUSE="libressl test"
+
+# the openssl 1.0.2l-r1 needs to be updated again :(
+# It'd theb be able to go into the || section again
+#=dev-libs/openssl-1.0.2l-r1:0
+# the following is the original section, disallowing bindist entirely
+#!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-)] )
+RDEPEND="
+	!libressl? (
+		dev-libs/openssl:0= (
+			|| (
+				dev-libs/openssl:0[-bindist(-)]
+				>=dev-libs/openssl-1.0.2o-r2:0
+			)
+		)
+	)
+	libressl? ( dev-libs/libressl:0= )
+	$(python_gen_cond_dep '>=dev-python/cffi-1.7:=[${PYTHON_USEDEP}]' 'python*')
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 pypy{,3})
+	>=dev-python/idna-2.1[${PYTHON_USEDEP}]
+	>=dev-python/asn1crypto-0.21.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
+	virtual/python-ipaddress[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
+	test? (
+		~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/iso8601[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.9.0[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)"
+
+DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.4-libressl-2.7-x509.patch
+	"${FILESDIR}"/${PN}-2.1.4-libressl-2.7-x509_vfy.patch
+)
+
+python_configure_all() {
+	append-cflags $(test-flags-CC -pthread)
+}
+
+python_test() {
+	py.test -v -v -x || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/dulwich/Manifest b/dev-python/dulwich/Manifest
index 077727ac8d85..05a223964c2f 100644
--- a/dev-python/dulwich/Manifest
+++ b/dev-python/dulwich/Manifest
@@ -3,4 +3,4 @@ DIST dulwich-0.18.5.tar.gz 330097 BLAKE2B c29f3016ab63082051c8c4fc42301c12ca7520
 DIST dulwich-0.18.6.tar.gz 331325 BLAKE2B 781227bf91d8df8f941dd2eddb1682fb8c358d37f35671b08334ef197355e33dbbd09d18b43a179f9200cd6abca563a2fc833da68bd860859a52d951fe679ac0 SHA512 2d2120e23dd4bc2c9dcfe601f21ac757ee3fe2a343923c50b32c067f4d329ac89cdf0894bff450bf52c69e99759bb8692f0f14ed73d01be6bc3b0402d58d1148
 EBUILD dulwich-0.18.5.ebuild 1326 BLAKE2B 14c458bc4309065c3aa4cb92ff058a1077aa3345c6709c302e3abd5334c7617f57496efd3cac225ee5aac1a5bd42e7cd93c86dd8fe8f8500ce8075860aa93ede SHA512 370695ccfaea526cb0eb259ebddf559d3ca8cd6118a63778583caa3e5581132ac2e6a7b13a87b5f6c2c408020cd73476985058feeb7a60dadfe1aaa08e953ddb
 EBUILD dulwich-0.18.6.ebuild 1327 BLAKE2B 45d2bf54b482a513d2b0ab84bfefcb70897d6d3c7ae76e4dc6e3e3cf68f2a26380f46b979e4bf6f2710c4a0960b5178b44d87837508ec72a0ef63100a38a9ef0 SHA512 5e77058029cb530aa303474e2c2566378c515d64f3ec68b9ea6d151c3f5c652baa345620afe8ee7985bc0bab1cd8ba518629c2c3b952a1f52e0c8ece2e44c83b
-MISC metadata.xml 555 BLAKE2B 4487eec512ac72ee6be5bc357b6eca9a51046d8ca108611fa0160ee84e433232b96547b161fdf1469cc726030e490fde677561c63deba754fe62bede1f96efeb SHA512 1f48222049a8ada15172ca0868c6b3f2eda4f465409cd1058ab6b9e498a521ac52d14f1bc2f2265c588f0afb9d874f4a45e6effef40e022f9bf8f6c7e4e38353
+MISC metadata.xml 448 BLAKE2B 15b62d6a9a252067a63c02db94a906b0da6b72cf8287997252e8fab9cc6f52059ea966d915449a9bd4c64a5bf045e0725d62ff14baf6864cd5212c1765cb5738 SHA512 3a490b46094e92d66e7e0f8e2d0282b75cb33ee2a7a21e4f89029b0a454909466ff5ab4732193480203da9d2481c6134494ccef95953906f6a9da66cc9834830
diff --git a/dev-python/dulwich/metadata.xml b/dev-python/dulwich/metadata.xml
index 989b825f1436..3b63ee79f5a8 100644
--- a/dev-python/dulwich/metadata.xml
+++ b/dev-python/dulwich/metadata.xml
@@ -5,10 +5,6 @@
     <email>grobian@gentoo.org</email>
     <name>Fabian Groffen</name>
   </maintainer>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
   <upstream>
     <remote-id type="pypi">dulwich</remote-id>
     <remote-id type="github">jelmer/dulwich</remote-id>
diff --git a/dev-python/google-auth/Manifest b/dev-python/google-auth/Manifest
index 48d663b5dd9a..ca8ae2324610 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -1,5 +1,7 @@
 DIST google-auth-1.0.1.tar.gz 133903 BLAKE2B 0a99dcdb37a195f24077162ea8191e2eb12aac0eec8e08d06f0b17aba9c4f5ed44f19ca41c737a249611ce02b98e03474d1e995909c5755222605e004d11fb1d SHA512 c10822c6b75700503a06a4b3a43a123d57605a043eb494bcb0232cc3941fc039d0803ed75be26d0da72fd4df613135c290fb3fdf82b0fa47d4fe0729462d80f4
 DIST google-auth-1.1.0.tar.gz 290602 BLAKE2B efc1ae38b29693f035ea9d19af83bd0e098dacb143192d77140ea1548a17dd051b344b6b34044f6d02e5bea631fe4026dda4ba7c1053535641f34aed08cdd48e SHA512 03b4021f5bc3c60671e1e528642af4682828e3a83a07aa9dea8a28b3f97c4020ac47f325c8a952f366d45196e6a9a78a78e1abcfc8d7f878f7b6369434a0b79f
+DIST google-auth-1.4.1.tar.gz 74272 BLAKE2B 8b9c8f59979688bc8a28d3f6c32eb06aa527b3cf9a515ceca51aa346d70622786292f5be5a4bdb2ca266b777d5d5fd41061af3afd4a2608a6673192ad643ed8f SHA512 cba174049a331c8c0ea5b82da0096641d975f59f1f2c3237c32b1730b4c9f9d12f3bfdcb6cc9b9f9c87109d509dcd423d0a4a4d98200e707052760c253f3ee45
 EBUILD google-auth-1.0.1.ebuild 1352 BLAKE2B 4bc86f85500285bea12e07f09cb6c64a66d53a0bd5d6964f8eda995255eb4fa6a2e283bfb0337e9d914d771345e56c9d9997e73b8661ce3d5de1dc4ae86beafd SHA512 2f9984d4b3757109c34f32b3fc65f0ec013a4dd4c8a0e4cc969373f79c89c817c8ac4846ed1595b6fe96cb9317eaf9f4e5a869bc0845d1d57c2c7b0c83ae44a0
 EBUILD google-auth-1.1.0.ebuild 1408 BLAKE2B 875a6041b147966846677fb20aabac8e6b770c029957ea6541718e65f00356acee84843d2bdcaf24870a607786281a817e112a92ebfcee5145160b3e24d6f739 SHA512 5ecb50909393bd8eed6232785b0addd3d016dded8f056e479e79438d49c9a93069c1c8706266c0fb6d5b587320af81b6cde4bfdec923d2c25efce60d8b212363
+EBUILD google-auth-1.4.1.ebuild 1227 BLAKE2B 5a471bac1110592fa6f155774bc8024886721cf819fb82f8e6367dc740b932b521cd8af2a3109bfc21aced7d5bc6d22720c113b231fa20ac6a52122dbd1a81a5 SHA512 15ee5dedf521d870ca9664fd040e671c7fb4c426d90f606980399d3dfb1d93d5921defa7b7a2b2b9bc5d941561433387f78dea4b7b4ebd2c44643dce88819914
 MISC metadata.xml 404 BLAKE2B 5a7234bdd9c08a076980997db1c4fa12d2d2ee37945ccf2308e5bbd92bd01b5cbccb195a1a567f3ab82b71a1d64bf63453b4dffb2e2d7e93fdacc322f8612896 SHA512 ba3c9a09c5bc382da4c8594011872eca305111afa671adffbd3d4c04f8d772cc37d43d83385183f38311e9549c12ccff14f44f85352c49f778766134075ff32b
diff --git a/dev-python/google-auth/google-auth-1.4.1.ebuild b/dev-python/google-auth/google-auth-1.4.1.ebuild
new file mode 100644
index 000000000000..6ae35798ebd8
--- /dev/null
+++ b/dev-python/google-auth/google-auth-1.4.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Google Authentication Library"
+HOMEPAGE="https://github.com/GoogleCloudPlatform/google-auth-library-python https://pypi.org/project/google-auth/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/namespace-google[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-modules-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/cachetools-2.0.0[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	# delete stray files included in the tarball
+	find "${S}"/tests -name '*.pyc' -delete || die
+	py.test || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index 2c1ffc5190f2..5468dab25492 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -1,8 +1,6 @@
 AUX matplotlib-2.1.2-doc-make.patch 363 BLAKE2B 043318c6a584427497f284d1e770b7a7e2cff2fb40b12c4a1a684336ddede6967c01392b722d128b4b4138b2833968f8ed67a3a412c4cbb4fb23f167b4f28851 SHA512 043a4d00c69db6f3c5473514d103c1beb0685eb329ece5596caf80740f64e0c2bcb114f889c11782a7913b9d3f86614f7bb8aedcf902c41f9d1cc7a2f6ac8e51
 AUX matplotlib-2.2.2-doc-make.patch 363 BLAKE2B 043318c6a584427497f284d1e770b7a7e2cff2fb40b12c4a1a684336ddede6967c01392b722d128b4b4138b2833968f8ed67a3a412c4cbb4fb23f167b4f28851 SHA512 043a4d00c69db6f3c5473514d103c1beb0685eb329ece5596caf80740f64e0c2bcb114f889c11782a7913b9d3f86614f7bb8aedcf902c41f9d1cc7a2f6ac8e51
-DIST matplotlib-2.1.2.tar.bz2 33422388 BLAKE2B cb4826b563e9820a17e568de78044cb81af6fbe86221505fe9cfbab7e06fb95cc3a4eff8772443197cdddf6e49b4b59d204fab39054e627b95f0169b74f630a4 SHA512 861354363f625a45f40ce7b31263088c950c8664b8ef13f8019da222ba4a8df7d0a8ee048a1bd84102e472ec48318cfea9df905d58a28efb788ba59cd5348061
 DIST matplotlib-2.2.2.tar.gz 37317332 BLAKE2B 4120265263c5b1e4ab57f7c0eb7a477b4071a5f219d1d6328d6ed51d44460217c7c4da82a4b7d13c6ba9f80308406a217f2dbcfa310f3137cbe8bc56a9ef0eef SHA512 1d21ef821190f22354098f8f0db6449f237acbf3c1419ab3815ecd4e9c6922fd3f00c4a8f60858e319b55b6fb2e8fe2922c0bf8e72b204e7edff0b409cf76320
-EBUILD matplotlib-2.1.2-r1.ebuild 6334 BLAKE2B 16f4f9037563e799c5ba9108f090afa1a713ae532646a9ed9a65ae0b810df0e4915b7433901c622c92663f2955db7ba1ebfe025b1bb0668106e99ae958b983b3 SHA512 d171321fade8193ab2d4a4c858400c150ef0eba95ef81f497996be828555015438f7762baf94720cdcf4045d244d2e2db6a88434b758d2f6e9c05f76e328c44a
 EBUILD matplotlib-2.2.2-r1.ebuild 6349 BLAKE2B 3fbe4a41761a0c6c4ba3b79469815cb342b05c6e74bb26041877927fcf7e662e2e7a46d321b43fdcf48ae610b835083049731fe317a3057780e73b4a302a533d SHA512 cfdab393703c6b1106970619ab90d83896fdfaa96e3073cb6b41b430ff93eee46fbf2191cb54c993cef3869f581bc050e4507c849f713761a190a0c0725c1b5b
 EBUILD matplotlib-9999.ebuild 6302 BLAKE2B 7f9c15979be0366406fbe3f0b20ebb1b22d9daa45b451b5fc0bcd09abca6d4016aba9ba5a5c04bc59d0eaef619673c59da949ecf369cb172ed7f661315d2f1dd SHA512 2eeedb9851175d1f77ffb817ebf541904fd3abc3a8d2ae159c556f85ff5bdd316d07c37bb1566d2565aab4ef823b51cf4a23e6e2cee2506fcf276340f1609d2f
-MISC metadata.xml 1063 BLAKE2B 396b976a60c89ae2b6bb9d365a8234663994f561a99ac0d59385a15245ae245fc09cdb6626b79a63cae53651c39d2df97ea8825016be0ec3bce7d6ad60cd15d5 SHA512 25344a9f8d7ae73f1ec9f493cef17925c94fc4cd44486a9928debbd18ba53010455393e3e97fc70e67a9afae9d6c15b12688af16e5e9f7e090748481969eac4d
+MISC metadata.xml 990 BLAKE2B c5e7256de7565d910a32ab9d48e39b49d3868d345e16cf893cf135dd114b20032c7794dfec3c832768172b7a8437e76e2807b7027bb2a9e392473054bfc7f000 SHA512 6c47f53ce41e4cae3f58f0abbe0a8b369670a0eefddf6eead266a530589398b7d212dab9627d6b8c6ec0970717d3220e09522f63f587cfdd2613113ac896aa7b
diff --git a/dev-python/matplotlib/matplotlib-2.1.2-r1.ebuild b/dev-python/matplotlib/matplotlib-2.1.2-r1.ebuild
deleted file mode 100644
index 8e97e04dfa11..000000000000
--- a/dev-python/matplotlib/matplotlib-2.1.2-r1.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE='tk?,threads(+)'
-
-inherit distutils-r1 flag-o-matic virtualx toolchain-funcs prefix
-
-DESCRIPTION="Pure python plotting library with matlab like syntax"
-HOMEPAGE="https://matplotlib.org/"
-SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.bz2"
-
-SLOT="0"
-# Main license: matplotlib
-# Some modules: BSD
-# matplotlib/backends/qt4_editor: MIT
-# Fonts: BitstreamVera, OFL-1.1
-LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86"
-IUSE="cairo doc excel examples gtk2 gtk3 latex pyside qt5 test tk wxwidgets"
-
-PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )"
-REQUIRED_USE="
-	doc? ( ${PY2_FLAGS} )
-	excel? ( ${PY2_FLAGS} )
-	gtk2? ( ${PY2_FLAGS} )
-	wxwidgets? ( ${PY2_FLAGS} )
-	test? (
-		cairo latex qt5 tk wxwidgets
-		|| ( gtk2 gtk3 )
-		)"
-
-# #456704 -- a lot of py2-only deps
-PY2_USEDEP=$(python_gen_usedep python2_7)
-PY2_DEPEND="
-	$(python_gen_cond_dep 'dev-python/functools32[${PYTHON_USEDEP}]' python2_7)
-	$(python_gen_cond_dep 'dev-python/subprocess32[${PYTHON_USEDEP}]' python2_7)
-	$(python_gen_cond_dep 'dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]' python2_7)"
-COMMON_DEPEND="
-	dev-python/cycler[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.7.1[${PYTHON_USEDEP}]
-	dev-python/python-dateutil:0[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10[${PYTHON_USEDEP}]
-	media-fonts/stix-fonts
-	media-libs/freetype:2
-	media-libs/libpng:0
-	>=media-libs/qhull-2013
-	cairo? ( dev-python/cairocffi[${PYTHON_USEDEP}] )
-	gtk2? (
-		dev-libs/glib:2=
-		x11-libs/gdk-pixbuf
-		x11-libs/gtk+:2
-		dev-python/pygtk[${PY2_USEDEP}] )
-	wxwidgets? ( >=dev-python/wxpython-2.8:*[${PY2_USEDEP}] )"
-
-# internal copy of pycxx highly patched
-#	dev-python/pycxx
-
-DEPEND="${COMMON_DEPEND}
-	${PY2_DEPEND}
-	dev-python/versioneer[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	doc? (
-		app-text/dvipng
-		dev-python/colorspacious[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/mock[${PY2_USEDEP}]
-		dev-python/numpydoc[${PYTHON_USEDEP}]
-		sci-libs/scipy[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-gallery-0.1.12[${PYTHON_USEDEP}]
-		dev-python/xlwt[${PYTHON_USEDEP}]
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-latexrecommended
-		media-gfx/graphviz[cairo]
-	)
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		>=dev-python/nose-0.11.1[${PYTHON_USEDEP}]
-		)"
-
-RDEPEND="${COMMON_DEPEND}
-	${PY2_DEPEND}
-	>=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}]
-	excel? ( dev-python/xlwt[${PYTHON_USEDEP}] )
-	gtk3? (
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		x11-libs/gtk+:3[introspection] )
-	latex? (
-		virtual/latex-base
-		app-text/ghostscript-gpl
-		app-text/dvipng
-		app-text/poppler[utils]
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-xetex
-	)
-	pyside? ( dev-python/pyside[X,${PYTHON_USEDEP}] )
-	qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] )
-	"
-
-# A few C++ source files are written to srcdir.
-# Other than that, the ebuild shall be fit for out-of-source build.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-pkg_setup() {
-	unset DISPLAY # bug #278524
-}
-
-use_setup() {
-	local uword="${2:-${1}}"
-	if use ${1}; then
-		echo "${uword} = True"
-		echo "${uword}agg = True"
-	else
-		echo "${uword} = False"
-		echo "${uword}agg = False"
-	fi
-}
-
-python_prepare_all() {
-# Generates test failures, but fedora does it
-#	local PATCHES=(
-#		"${FILESDIR}"/${P}-unbundle-pycxx.patch
-#		"${FILESDIR}"/${P}-unbundle-agg.patch
-#	)
-#	rm -r agg24 CXX || die
-#	rm -r agg24 || die
-
-#	cat > lib/${PN}/externals/six.py <<-EOF
-#	from __future__ import absolute_import
-#	from six import *
-#	EOF
-
-	local PATCHES=( "${FILESDIR}"/${P}-doc-make.patch )
-
-	sed \
-		-e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
-		-i lib/matplotlib/{mathtext,fontconfig_pattern}.py \
-		|| die "sed pyparsing failed"
-
-	hprefixify setupext.py
-
-	export XDG_RUNTIME_DIR="${T}/runtime-dir"
-	mkdir "${XDG_RUNTIME_DIR}" || die
-	chmod 0700 "${XDG_RUNTIME_DIR}" || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	append-flags -fno-strict-aliasing
-	append-cppflags -DNDEBUG  # or get old trying to do triangulation
-	tc-export PKG_CONFIG
-}
-
-python_configure() {
-	mkdir -p "${BUILD_DIR}" || die
-
-	# create setup.cfg (see setup.cfg.template for any changes).
-
-	# common switches.
-	cat > "${BUILD_DIR}"/setup.cfg <<- EOF || die
-		[directories]
-		basedirlist = ${EPREFIX}/usr
-		[provide_packages]
-		pytz = False
-		dateutil = False
-		[packages]
-		tests = $(usex test True False)
-		[gui_support]
-		agg = True
-		qt4 = False
-		qt4agg = False
-		$(use_setup cairo)
-		$(use_setup gtk3)
-		$(use_setup pyside)
-		$(use_setup qt5)
-		$(use_setup tk)
-	EOF
-
-	if use gtk3 && use cairo; then
-		echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die
-	else
-		echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die
-	fi
-
-	if python_is_python3; then
-		cat >> "${BUILD_DIR}"/setup.cfg <<- EOF || die
-			gtk = False
-			gtkagg = False
-			wx = False
-			wxagg = False
-		EOF
-	else
-		cat >> "${BUILD_DIR}"/setup.cfg <<-EOF || die
-			$(use_setup gtk2 gtk)
-			$(use_setup wxwidgets wx)
-		EOF
-	fi
-}
-
-wrap_setup() {
-	local -x MPLSETUPCFG=${BUILD_DIR}/setup.cfg
-	unset DISPLAY
-	"$@"
-}
-
-python_compile() {
-	wrap_setup distutils-r1_python_compile --build-lib="${BUILD_DIR}"/lib
-}
-
-python_compile_all() {
-	if use doc; then
-		cd doc || die
-
-		# necessary for in-source build
-		local -x PYTHONPATH="${BUILD_DIR}"/build/lib:${PYTHONPATH}
-
-		VARTEXFONTS="${T}"/fonts \
-		"${EPYTHON}" ./make.py --small html || die
-	fi
-}
-
-python_test() {
-	wrap_setup distutils_install_for_testing
-
-	virtx "${EPYTHON}" -c "import sys, matplotlib as m; sys.exit(0 if m.test(verbosity=2) else 1)"
-}
-
-python_install() {
-	wrap_setup distutils-r1_python_install
-
-	# mpl_toolkits namespace
-	python_moduleinto mpl_toolkits
-	python_domodule lib/mpl_toolkits/__init__.py
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/matplotlib/metadata.xml b/dev-python/matplotlib/metadata.xml
index 5dd5a6634838..d238bedf5ab2 100644
--- a/dev-python/matplotlib/metadata.xml
+++ b/dev-python/matplotlib/metadata.xml
@@ -19,7 +19,6 @@
 		<flag name="excel">Pull <pkg>dev-python/xlwt</pkg> for the exceltools toolkit</flag>
 		<flag name="gtk2">Enable <pkg>x11-libs/gtk+</pkg>:2 support</flag>
 		<flag name="gtk3">Enable <pkg>x11-libs/gtk+</pkg>:3 support</flag>
-		<flag name="pyside">Qt support via <pkg>dev-python/pyside</pkg></flag>
 	</use>
 	<upstream>
 		<remote-id type="pypi">matplotlib</remote-id>
diff --git a/dev-python/miniupnpc/Manifest b/dev-python/miniupnpc/Manifest
index ef230e6c8294..5ea110ff3959 100644
--- a/dev-python/miniupnpc/Manifest
+++ b/dev-python/miniupnpc/Manifest
@@ -1,6 +1,6 @@
 AUX miniupnpc-2.0.20171102-shared-lib.patch 1220 BLAKE2B 97fa99582f7992587e5f13e7569b7d6709cef8cc627d984c6a3ddef3265a6d069e3ae4a371e35804982ff9e5cd41b795a69576223b3a4ec8c591032f2f2f99f4 SHA512 bb099cee440b318ac12f68d810e2a7848df0150ecce01ba05e8f60cdff8fa0efb61ddc958586ffecf1bd9b0c15ea41954a6170e59028a24eb5a225e8fffdea33
 DIST miniupnpc-2.0.20180222.tar.gz 87018 BLAKE2B 656ae02ac6e462084252d95e579972d2bbaec24cf44b5910d4fc1a956723a8ed8fecaa428aea361a7ec8a3ff60b82e0d9468ac21d251c16ac8c2b52eafec6ab3 SHA512 0cceeedff6c584d2d7037ff91fbba0fe580fabfda810b9a9ed7c8d8495445339e3ff115d63d4429bcd3eff2b13b123e1bd5855ff1bc9dcd986b968a82c368591
 DIST miniupnpc-2.0.20180503.tar.gz 88207 BLAKE2B 1d6c6396e805eae3c53263a6856cc119033a645da29471b31705fdee8465808361057804496821f845112fb8490d351f67a5d5c9e1fef522fc6e6df8d4ac34c1 SHA512 68dcf76fe62223de80610afd392f14f46af2465796c3d4d46daa0c6f1f7e99034368b2484e260e718d42eef480644a684e83d4c0f32a6108fdd544cfc48443a3
-EBUILD miniupnpc-2.0.20180222.ebuild 756 BLAKE2B 56fffa8b370768c2d0ec74a744a79e522dbe5ae5eadf0c58c1e21b39772941323d3f8b35d37c2f33e7b91ea94acdcdad800c00c4bb1ee07b0805bb7c8cae5047 SHA512 285f2327fbc98a1408e59ca0263e9eae46021f9ae47f4c176142594018fc70b337c1eee3cafde5f3dc32cd56e7e10e70504fd740c692aa48644b0e6ae0e3597c
+EBUILD miniupnpc-2.0.20180222.ebuild 755 BLAKE2B 09f856aa3c72074d75a01e1b1d15d48da5d2dc82f05a1167cbf0f04667db97f8688c6b7f54f3286743b12caa861490201d0d0727a21bb0fad8e2739bdf90234d SHA512 a4f28b3223ce19f6c6cacc4b299bb667865b60979095737577fdca1b94dd9d72184db42a076450607309dfc90344905e521aead19f99d82382089c39322c4cee
 EBUILD miniupnpc-2.0.20180503.ebuild 759 BLAKE2B a7eb0f7a95739c12bc7d598af88739fbb8ea89b653880f90ff93b4512270caea1beff3db54b364458ee899f533f2fd30d508bed7d1e626306735b46f48418850 SHA512 21446a2e52a00e5671cf7270d07eff3a797b14afc97573dd06caedb123d1b825e31e269f3144fb1004ea69c73fcf6cbb85d499c37420801467442b6e3577ad71
 MISC metadata.xml 243 BLAKE2B 997913e51bb9c2ba601c78673246d3845d1078f5be11ff209532c5afc9f433d4cfe7a0066ba23677d23ffe368d7ee718df71d28301d45c0473f50e931f674165 SHA512 ded2bb7e056d9081e11b0470aa2874fbe9b5e63f0178bec611291f639763a9bd85a076dbc526e01df1403dea4d0eb28913addb346b676084e690e063b68eca28
diff --git a/dev-python/miniupnpc/miniupnpc-2.0.20180222.ebuild b/dev-python/miniupnpc/miniupnpc-2.0.20180222.ebuild
index 5fe306d34f23..1fc60e04a6a8 100644
--- a/dev-python/miniupnpc/miniupnpc-2.0.20180222.ebuild
+++ b/dev-python/miniupnpc/miniupnpc-2.0.20180222.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 
 RDEPEND=">=net-libs/miniupnpc-${PV}:0="
diff --git a/dev-python/pyasn1-modules/Manifest b/dev-python/pyasn1-modules/Manifest
index ebbe99dc27b4..da6f54f6b292 100644
--- a/dev-python/pyasn1-modules/Manifest
+++ b/dev-python/pyasn1-modules/Manifest
@@ -3,9 +3,11 @@ DIST pyasn1-modules-0.0.5.tar.gz 38710 BLAKE2B 31340c5453a1678346ff383dddf151e1c
 DIST pyasn1-modules-0.0.8.tar.gz 38776 BLAKE2B fafa28d577932df010f9f62d156d47d4103234d424d22342926702dafe63b6843eaedfec4cf24d4015e1769b86ca8540216ba064a4c1d859179cc204b8bb0c32 SHA512 6040d4f83c6b00f7a0e6ba0e1264090d0fa96fc39e97b04d624721cef200b6cf4dabfe550127ade4edc181187ca1b4219fb46a95082a39e6291d0e2e08f36d78
 DIST pyasn1-modules-0.1.4.tar.gz 65552 BLAKE2B 5eb087cc4d930f39a651e3b8765ee8c4157d8d12c07134cd1297d7b2828052f7c32a7e3bc26702bc51792c2a51f1dcb9a59f7075a7352b94eb8ad582eac7fc22 SHA512 29467aa9fff15b7a7ef999389db01fe696350e29910397f0c867685689a9fa8e5df8128a7703ae0de095804ae20c3759b24656467cec8d086d07a1014ccf5d65
 DIST pyasn1-modules-0.1.5.tar.gz 65690 BLAKE2B 74f3de59a8388527e885e04e4eee56c3d4587e697c980e1f9c23604101f367956bff12dd72a34cd4135b49c968f22b69ed70bbac9989259c1dcbc5bf711a96d1 SHA512 0d7f631fdbcb4c89ccf65b91c106483f536daadd099f5b3fb9b144bbcfcb0619bf818fa18715b8f61baf10699421a1af80f003781a5ebac28ebb4f4e7f677c1a
+DIST pyasn1-modules-0.2.1.tar.gz 65808 BLAKE2B 7c1490926078682dd4392bd6c6dd73f944f55e8b5623fde07a3bbc1f62dcfdd1ea8b5217232cd7e2709997424fd61e276cd5786ba618cebd11cbf8ddb695dc53 SHA512 2d8b6bee59434fee41747625236c1d7eb5081a1cef66aa0a0e9e75869c3641a418d21544edafe65f1808ad0dacd9cf1047dd036ff5ce668bb3bf1f6e662e4a5e
 EBUILD pyasn1-modules-0.0.10.ebuild 902 BLAKE2B 5a44907b5239bd3676fd814731eaa09330f7532bd3239232aa58d34f5078e27702d945f41042362698a24c2917a80397ca12e0087ba803de7daa7738749955b8 SHA512 b908c7f48e77f9cfd8a3e29a25b3de450fb052ea96829abaf8185e63380d53cf578a0f4099e9614e348a9c071daa393e567f5d4159b2502725cb28ddfc57e895
 EBUILD pyasn1-modules-0.0.5-r1.ebuild 908 BLAKE2B 488da022066fcf25cab9df7333b0e9c2d1bf9ca20e9cfe62133d0a542955896fed6d4d7199a02092623fd468e7adc7e56d308c8219e74490386db23e504a261a SHA512 f7b4d0e20fe54732c7e4fe9caf3d22b7530734841ded3f663fe972c5422c535dd1235c538f0f26dc1e3fcc4b9841c83de56861e6250797bb212d8fe33f00fdaa
 EBUILD pyasn1-modules-0.0.8.ebuild 892 BLAKE2B 299cebff6027f0ba5caa5648d238b8ed5feb3217eb9e301c3e0ceb22b2fac18d6b1c355732b484d06c542abb1a5ad87ff95739037d2be8588a41eba3105d81f9 SHA512 abb1072d75da7f8fd1dfdb2301c21cdc1dcd21fba2ff40cb79bbbc69cd42317750e44ba6f06a0ca8c330a57d76e54f51e418463d34d7d5f0f17b0ab22cd072e5
 EBUILD pyasn1-modules-0.1.4.ebuild 902 BLAKE2B 5a44907b5239bd3676fd814731eaa09330f7532bd3239232aa58d34f5078e27702d945f41042362698a24c2917a80397ca12e0087ba803de7daa7738749955b8 SHA512 b908c7f48e77f9cfd8a3e29a25b3de450fb052ea96829abaf8185e63380d53cf578a0f4099e9614e348a9c071daa393e567f5d4159b2502725cb28ddfc57e895
 EBUILD pyasn1-modules-0.1.5.ebuild 822 BLAKE2B 78239b7086acf41aaf807817296d0b8765718647d01b0312eac03da80814c90c48616a7a9a64288181a0461e6c3754fa892027513a457f8d42aba34796819497 SHA512 d32d9b4015ccaa10d311e333e61b9d92886a003d71e7aebc8e369e6c7f60fee32e389eb7efb28cfeb519667e18373db4e78d11675ce914bf3fab1adcf98abe0e
+EBUILD pyasn1-modules-0.2.1.ebuild 823 BLAKE2B 5d2c5f920bf9a30c55e69c04443807ff69c45af10cfad69f063ec4569d65ac656dbf5106fcfc5ac971043772befd646b7c6c7b3f34d480766a304b16b6979df3 SHA512 29bb5cc5e821c3296f358189b000f0617534f1115efb7e5f39a50b56d09194832017e7c96bc4f6a9de2ecbf868bdd63df66df5e9548a7d71a4d8066d1505575b
 MISC metadata.xml 380 BLAKE2B 0f3336d6484687fbe0a61cc0c88110e51ae40a8905bb0d5d5b166ed6f8c49964f9abedeb7539cea85118a3d2ab548444680bb89ea57d5e44ff52298e95f557e3 SHA512 0122261838e5789fc995c1e07fd2f8d59fb470d2f525126adb971d7e991e7b7cd76c3fe37ce21949d6ec3fb79af8ccc2d5ce02aab4afda842809916a5c609f15
diff --git a/dev-python/pyasn1-modules/pyasn1-modules-0.2.1.ebuild b/dev-python/pyasn1-modules/pyasn1-modules-0.2.1.ebuild
new file mode 100644
index 000000000000..1a6083076c7d
--- /dev/null
+++ b/dev-python/pyasn1-modules/pyasn1-modules-0.2.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="pyasn1 modules"
+HOMEPAGE="http://snmplabs.com/pyasn1/ https://github.com/etingof/pyasn1-modules/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux"
+IUSE="test"
+
+RDEPEND=">=dev-python/pyasn1-0.4.1[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	insinto /usr/share/${P}
+	doins -r tools
+}
diff --git a/dev-python/pyasn1/Manifest b/dev-python/pyasn1/Manifest
index 7a68d0f3324c..6afa62a61fc3 100644
--- a/dev-python/pyasn1/Manifest
+++ b/dev-python/pyasn1/Manifest
@@ -1,5 +1,7 @@
 DIST pyasn1-0.2.3.tar.gz 100099 BLAKE2B 32e6fa765fc5c217f66ca5618acc132c96fd8adc3649e5323696ac8dcd2cc11fcbd0a362e53575465da79feb422452b9f964e4972ab7f581571e5cbfc14a8945 SHA512 c55b95c1995f2fc36ec28f35837ca456a2fac06e90edc6491a3335ae949e4eacbbeb14f6289a17e994b49d4dc60870bba3e79344c44496d5547c38ab1ef183ab
 DIST pyasn1-0.3.7.tar.gz 117643 BLAKE2B 66e4987a63139c7af06d6bcdb125ef6f0f46ea5885bbbefae6c76252bd96296abf71a59f6ddc6f196ef78077a62649963c4d9419546f631d93e723dca30bf9b2 SHA512 85735ecb5b83979e51c9f663e2e0dcfbc317ba7e22474d78998f97c40a3487fd06ade9a259d1a4a8de5f4e70e5521a060af127799b92931ceb26abd384ec5807
+DIST pyasn1-0.4.2.tar.gz 118404 BLAKE2B b96135b10eb9b79ac02b21d35df19ee1078a51586eb37832004a1891db0cce305fe3fb65c34f4b05fd1c854f1d708aa59b3e85908df39d54ebb051a2f021ca60 SHA512 30e7cdfd2f7b182081f951bd94169a300a577f95fbfcb4ddb6dc288617b2776265018d246ae0adb649650ee94aab9122a428313d7a61559f97ed7f02b9670709
 EBUILD pyasn1-0.2.3.ebuild 1133 BLAKE2B a1a9ed96972d7cfc37943a5ed9a51ce8dd3196244170ad65045037352384c09704f8ba5f03bcd31edda719589517bbfcf7ed0793e4e3a2b8a4458536410be3f4 SHA512 0a296f4f058aff4f2aa40c50a1f0343af2cb3d073b689ec680e6241170ec9f960bcf35789b885b2437f586c313fe74256576c35c024efe79ee1f3522bd859a46
 EBUILD pyasn1-0.3.7.ebuild 1159 BLAKE2B 3ad0a6f5d46c42055b3bb83e3f8e0b5eca5c96fcfae004d39d4173ab7de0a6d9064f03410ce1b9bf42049ca2a4d170ab8ce999b5de0f8a46728b274cf8bbebb8 SHA512 aff7e3a767503d7c1d499f9b1221fece180f23a5719d70d1175428f73fca1e161197c32251738c7ca9a7ddb49305048a5be216b360255a45844c81ba522b0973
+EBUILD pyasn1-0.4.2.ebuild 932 BLAKE2B 1a374927d61dc9b6721b5347fa05d3ace35da52b582e9c3922aff8627a30868c67a9915eb30e03c66829a8599f498d5d4b8412b126a7ab5feab7759f69c416aa SHA512 e5ec86881d261711fe8169b1bdbfa6f6e05bba496137a94690fea636df99610b1bfbca6592d0c104f6e79c4e7fba8e8e29cdbfead016aaef59f5800fdb585c74
 MISC metadata.xml 428 BLAKE2B d98ed2c4f984efff51e45c7b57c7decacbde65d59311776fa432b1e771f1bfb97abc6b588b75fd4faca7a3a0bd93aac3504532ef0b4569f8cf9099fa1f69b548 SHA512 b2d4bf181128f2724c450387fd51d971f85fc25ca293b8ebe4029e0559f660a5f5d207db40d683b8d80a6233986a885069ae4e7d82507901151a71f19c6a75ee
diff --git a/dev-python/pyasn1/pyasn1-0.4.2.ebuild b/dev-python/pyasn1/pyasn1-0.4.2.ebuild
new file mode 100644
index 000000000000..b5db7d606457
--- /dev/null
+++ b/dev-python/pyasn1/pyasn1-0.4.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="ASN.1 library for Python"
+HOMEPAGE="http://snmplabs.com/pyasn1/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="doc"
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+python_test() {
+	esetup.py test || die "Tests fail with ${EPYTHON}"
+}
+
+src_compile() {
+	if use doc; then
+		python_setup
+		esetup.py build_sphinx
+	fi
+	distutils-r1_src_compile
+}
+
+src_install() {
+	local HTML_DOCS
+	use doc && HTML_DOCS=( build/sphinx/html/. )
+
+	distutils-r1_src_install
+}
diff --git a/dev-python/pyicu/Manifest b/dev-python/pyicu/Manifest
index 517a8d1f8df8..e2944e41c365 100644
--- a/dev-python/pyicu/Manifest
+++ b/dev-python/pyicu/Manifest
@@ -1,9 +1,5 @@
-DIST PyICU-1.9.5.tar.gz 181878 BLAKE2B 519f507ef44ae7dead0b88ae048eb6bc47c0acd069590185cf72e558e3bd9712574e20319c3a5246c1cf0400bc6ccff1a6c7df7ffa4f94d7194f08069440e2cc SHA512 19fb3222a68cc67e92ea4171257d00c9a322f993f1303a4432b5c3c4efda32ff4c2372027cf9f3fd31d3dc3cf3bcbcb957dfa420039591044812f0213684e885
-DIST PyICU-1.9.8.tar.gz 183432 BLAKE2B c2e28a123e56ea99ed90160c1bf91f6e779481929e968b5ed1e692fa1f66045225dfad09aa0b88980d4c9417e462bafa334e4957dce3d73e947ec4a6640e44ac SHA512 87a539168ef89c0b77219e9373fb304e95088a5410c64f7939c382d840bc021af0edfffce89d3212cc9642c31cff7e508b7f70ee83466bc84793287a8661f4e1
 DIST PyICU-2.0.2.tar.gz 194525 BLAKE2B 9ef0c5defdebfd65760c6de5782308eac5433fd8474b9802ed1a79db494a259c88f22286b0a98b25bdcec22cbf78a3a7e411d8a9a7a81b07a2112204d6b44141 SHA512 b3715a0f88227a41b56988ee98e795fe398867c2788b2929e0d4f83bfe9519ff01648eb23cfe8d1d9073930a4d7220c0ad5ebcf2652d8fa3ec43e4c4a4bcf091
 DIST PyICU-2.0.3.tar.gz 201076 BLAKE2B cb388e4e6d6df2417312820cbe8482a8b02c5cfd639950b32d5ab5e1b1815f85e8fc870a2808042f085bee6ec93c6cb6dbea4466e745e93166714421d7d4ef25 SHA512 a08a34772fc8205660320d7ea1bea52cd9c21ff9edf0aef1059c9439406d4b69ab434b35347dce8928cff8051600d55cb71bcc74eb89f203037be629d83e044e
-EBUILD pyicu-1.9.5.ebuild 1257 BLAKE2B 72b335e3842b3bf99c397f3aea2e9e4a9c84d61c9aefd82648a74a6cea3e779f92384c74ae9a62d1351cf54cea06fd628996dbdd9bdbc4143eaabb1f2b657116 SHA512 3a90ca2a55c0a0c9dc2f6de4b03b146604a3cf2343f258101c28801498215abc274807851ca6da52b21b8b5d899096c02cbc3ecc83582d3721ced65561bebee5
-EBUILD pyicu-1.9.8.ebuild 669 BLAKE2B 63694b24ad73b8ac5e1eeffc4a338d6d4cad4c1bcf7f46a1c034c536ef9c7ac14423418fdfd3b694fe5e165447da13abd9b1baba2d8ec0d53f23cd230fc5456f SHA512 6bf242216967d27bcb6fc4b54f1cf63b68dfeede3c398225a84db064159e7a6c0f769bacec4f6a87e1c61f57a9d842e262a06f374ec1b2beb9b2372169d8eee8
 EBUILD pyicu-2.0.2.ebuild 805 BLAKE2B 50c8cc5a9eb124140f9a8bce4c545f512901aa52259bd110197f9575a3c440f0c10efbbef20f395851bc1268b08ca014e3a7a50148b7ab20a08da403f5928ae7 SHA512 a2a39ed9d33840ebf2db72847623ce2fc0b74909e1741c3f0cbe8a145e0989202db2b0a7f0727c82841a1f76ed0d353fb496b402226b57973d15e6981d2b6df5
 EBUILD pyicu-2.0.3.ebuild 807 BLAKE2B 2f934c2d50eb185e37ef969978dd34deb4f52b79874d26774c67e800c8819587c56d5409a0a02a776a1dcf48ff74a7f5cfaeaf90eaf8a602bbed488df72ae873 SHA512 61687a7c54d95143770b31b4c14e2728dc820e3a2880c25c0f9a4be0fbe60d9cbde1826148c5412e5b8941013d49bdef9c8bd5970d0cbd3fd70a63dbb9097ab0
 MISC metadata.xml 358 BLAKE2B d35d487a8be34ecff1465171ee9fd9381c35da622401faebce3d55f160a36b6dc94f8ec109e74e01571fc91694bc932fce7cacfa60dfa33a0615daf00fb1f762 SHA512 b2e487bd32ab89cf1d5f0aa5ff10b394560b2415fe5b5c433c78a551324a17bb25603115020216706e775a9eedcabab431255032486d7b8c1a5f1296a2ff8835
diff --git a/dev-python/pyicu/pyicu-1.9.5.ebuild b/dev-python/pyicu/pyicu-1.9.5.ebuild
deleted file mode 100644
index df826c4fe4c9..000000000000
--- a/dev-python/pyicu/pyicu-1.9.5.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-DISTUTILS_IN_SOURCE_BUILD=1 # setup.py applies 2to3 to tests
-
-inherit distutils-r1
-
-MY_PN="PyICU"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python bindings for dev-libs/icu"
-HOMEPAGE="https://github.com/ovalhub/pyicu"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-RDEPEND="${PYTHON_DEPS}
-	<dev-libs/icu-59
-"
-# epydoc supports only python2*
-DEPEND="${RDEPEND}
-	doc? ( dev-python/epydoc[$(python_gen_usedep 'python2*')] )"
-REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=(CHANGES CREDITS README.md)
-
-# we need an exact version match for epydoc to work on a binary module
-pkg_setup() {
-	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
-}
-
-python_compile_all() {
-	if use doc; then
-		mkdir -p doc/html || die
-		epydoc --html --verbose -o doc/html \
-			--url="${HOMEPAGE}" --name="${MY_P}" \
-			icu.py || die "Making the docs failed!"
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	if use doc; then
-		local HTML_DOCS=( doc/html/. )
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyicu/pyicu-1.9.8.ebuild b/dev-python/pyicu/pyicu-1.9.8.ebuild
deleted file mode 100644
index 887fb5aa2957..000000000000
--- a/dev-python/pyicu/pyicu-1.9.8.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-DISTUTILS_IN_SOURCE_BUILD=1 # setup.py applies 2to3 to tests
-
-inherit distutils-r1
-
-MY_PN="PyICU"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python bindings for dev-libs/icu"
-HOMEPAGE="https://github.com/ovalhub/pyicu"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/icu"
-DEPEND="${RDEPEND}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=(CHANGES CREDITS README.md)
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/pytest-qt/Manifest b/dev-python/pytest-qt/Manifest
index e7eb894425df..4b1cc51e681b 100644
--- a/dev-python/pytest-qt/Manifest
+++ b/dev-python/pytest-qt/Manifest
@@ -1,4 +1,3 @@
 DIST pytest-qt-2.3.0.tar.gz 106707 BLAKE2B cf02aed42481cbcadfaaa15c883f3055337f6f32e33b7dfbce986ecd9936218ee5bfe9f21e1a910aa970e7adf88dd24415d63f40655e8417863e96a4285fd466 SHA512 2bda4b5f60ba68b151ce62972661cd704e40f4cadaef2583882099e96100b5c5b9398de796e851579e026e9736e07539c4db8c10eef16929ce729c4dd7a22940
-EBUILD pytest-qt-2.3.0-r2.ebuild 898 BLAKE2B 93896676ce2eae8c92c0723a0ed17abc5111472b9adccd9aff9ec2ff5b7bd5a930fee13f230f16b9b1c7dd585da9184d2e36f0c3b2fc493d0f81cb17c03f216e SHA512 d5629a1ae9fd63c4ca68a39920ff8bc09bfb5eb2809eb7e8e5ad944125da43d1c25103f5bb19ece5d6df114de18db411bf967592ae534953ef5c632b5ecf4eb2
-EBUILD pytest-qt-2.3.0.ebuild 895 BLAKE2B 85e2e6be2549fc346a269d94843d9236005a475a82111f0b56ff1c95c9a3d87d8ea4be993336dd922950e3a5cd3439dbe761807b0b2ffa5b241f397f1ea28abd SHA512 1d55f16fe7cb6d8080043a2c3636271bba15ddf6a5224d4d5ededdda90a82622afdd18a55289c6f9b7f17fc87fb38ec2201d243cd95411bd14b9a52aa96e7689
+EBUILD pytest-qt-2.3.0-r2.ebuild 896 BLAKE2B b0a17c21a33f7d2a87aa4c42870f2659303e7a2b61226910aa05b87ff71368e9313f630cbb1fc3adf4f24369531d79797f6e6f35bdd1fdc63a1efc02aa4ef347 SHA512 f7d3d485faa99852554b5a05ffc4b1fd08adf6aa60fff2203ea35a4b2bf74545cf1563313caea7ee6b576d3ef3dee08c3fe951609e8b2087c065cb4f109cffc2
 MISC metadata.xml 396 BLAKE2B f4d5cdd1823e62b7b0443623b9f34ffbd2f5f7944ddca44dacbeba2b4a3daa438203483b96f113ab821d4e5dccdc6e9cde8faa3a6a4a53d190b567af07cb9b61 SHA512 c5c3149a783a4d72eb7f0582d416b0f6c408d86878892a0ccde2aa5ec672a55c0c2658af31cffdd8f66500420fa3ee43dbda98397a1efb3cc06697e9e1af84ac
diff --git a/dev-python/pytest-qt/pytest-qt-2.3.0-r2.ebuild b/dev-python/pytest-qt/pytest-qt-2.3.0-r2.ebuild
index 068bf8e7c463..faf751eebf8a 100644
--- a/dev-python/pytest-qt/pytest-qt-2.3.0-r2.ebuild
+++ b/dev-python/pytest-qt/pytest-qt-2.3.0-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/pytest-qt/pytest-qt-2.3.0.ebuild b/dev-python/pytest-qt/pytest-qt-2.3.0.ebuild
deleted file mode 100644
index 846360f394a6..000000000000
--- a/dev-python/pytest-qt/pytest-qt-2.3.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_5 )
-inherit distutils-r1
-
-DESCRIPTION="pytest plugin for PyQt4 or PyQt5 applications"
-HOMEPAGE="https://pypi.org/project/pytest-qt/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-RDEPEND="
-	>=dev-python/pytest-2.7.0[${PYTHON_USEDEP}]
-	|| (
-		dev-python/PyQt4
-		dev-python/PyQt5
-	)
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx-py3doc-enhanced-theme[${PYTHON_USEDEP}]
-	)
-"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-# Test make assumptions about Qt environment
-RESTRICT="test"
-
-python_compile_all() {
-	use doc && sphinx-build -b html docs _build/html
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( _build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-novaclient/Manifest b/dev-python/python-novaclient/Manifest
index 92727cfad62a..3f50280170d6 100644
--- a/dev-python/python-novaclient/Manifest
+++ b/dev-python/python-novaclient/Manifest
@@ -1,9 +1,5 @@
-DIST python-novaclient-6.0.1.tar.gz 288613 BLAKE2B b31b8a6b0ca136db396318513bd9fe6ba6c85517935c1f74654145cdc1a4a4b93cbae289126444ed1fd8ac0afb41b1952da20b7ebc5b55d73dc64c8a1567d8bd SHA512 20bbd40bed2328c6bceba6e0057b541e949d1ea1f7c37190d2ef07bed164a2cf20927b2e7a1b26c349038fca625873e189dad150b4a3e801f9211388ab3996c7
 DIST python-novaclient-7.1.2.tar.gz 284152 BLAKE2B d632444db1393d69c9e87c2f487babe8931492c339e2838d4f024e01d78a2d1b2958feb0c9f22637311dbc5a6c51e052b241798a7507914f56ec10c3962ff27b SHA512 6b7e4bc80e07b09756f61624d2cf7b81dccd1d102f22cb9609b7e1de6f091061c513691095467e293b742c40a62c8cabc2d3ff8cbc5492d07763655de4d6c516
-DIST python-novaclient-9.1.1.tar.gz 277784 BLAKE2B f05186c4ea6a539987b828386232eb20526e869e0933679ec530b1001edf78e72b6567dd600bdeeb8e0cc7986ff68daf4f1690c6e7e21721c9c21d65eba2be3a SHA512 ceb60a1e88c6ef7b9cc9fba9a192bd781b4404e4cc500b902cc2b4a8cf2f8917f1066df5349d2e421dfaa9fd6b791452872a30440cdec604bad3bee85cd6cd82
 DIST python-novaclient-9.1.2.tar.gz 279803 BLAKE2B a26e80085200de4eb1da97a37feeb3da0a70fdfc4adcd837ce0e18a275ed819457e140aa94e74e7d07003d2607a245aa0a263bed954c7252f4f28092cc7b74c0 SHA512 d71008a32b022d452b43babef6b600f5ee2b2ad3a4e1a473731966f08132c5de813d9387982e4111c055d0266be6527cca3da5d58ec8b7bda8d628bb8189ca1b
-EBUILD python-novaclient-6.0.1.ebuild 2791 BLAKE2B 8d8dbbb5ceee5cb1f64a0c10d8ace398eac9aa536c11a85fbbd42001d4a0f442e932f0976f994bb34e0c14909f9428149a2c6e57090357d67e8bf82a157309b5 SHA512 a3a6565cc64c8ea9b05b48f435c93508cc9fd2cdd829b5c855835491513275dbb60f5f32bc8168dbca5ad7ab1a54b0c3423c480a52c36aeba25a64b02dc7195b
 EBUILD python-novaclient-7.1.2.ebuild 2403 BLAKE2B f64248509516a0c34b91736e9dff75f1fc723fa1edfa2e8242d46e715bb20307b6245c5c9ef234f33b45c00b354562b6108ed39052b282f6a3d2e15c280d393e SHA512 dd865239d2c2333151a0f0c7a89f48f2a91a2ce1b7539589741fbedf5cf49145e20f25c2a70ff5b6f7ee034af3a68a832f9aa792afb6a7123341cec7a7c60bf6
-EBUILD python-novaclient-9.1.1.ebuild 2576 BLAKE2B d26cf2ed64b94e49789b2e2c431f87e6dfa87c1cad668b5db899903f08cd3a603cdea99ca76f4b5fc46dcaba7ce4e13fcacf5c3ee20fc30cd97cb8b7c61bb242 SHA512 d4b97b506f7404def6a7ed5a6267d326d28687d9392c959c68eece85586ecad6a712ff65430644780e7b34ceadfe6f0acee772cecec60bcdc2629a8ab01ada32
-EBUILD python-novaclient-9.1.2.ebuild 2578 BLAKE2B 1d68e4e4c403bafad4578b2b63fdfaa25ae8b2753e55eddba9fc3a4c365f65e6231cc36668c082eeca089aad91b4fd1a79d968668f383a563708794cc9f1a82a SHA512 cb9299e316989bb331ed7c7817ec265799761d9fbf869275955690db67894f8ff9e6d87226ee8aaeaeeb64024d5d2b0b799f0421cdb0615b4b9cd2e5b7b4e4f8
+EBUILD python-novaclient-9.1.2.ebuild 2576 BLAKE2B dbf57546cc9d7b929c68bb096ae90d5e9dc9a42e643f939d81b755b8c989c9d2026f1910f48c1fb0dfeb50a344c7d1d77e301d31d3297696c28148fb900b55a6 SHA512 d94f6e79f187260ac500982e5badb4c208383e9ed038967676d5512292f40962dcb357f9b210995065453a0bc14c74625f453e2dbea85c3ed98902082a9c8073
 MISC metadata.xml 760 BLAKE2B da041e2d4a5118a32574fd39fb38e5a4b417562e90f345f731b5bb9d1109c760044eb3d18b6c82c440f5a121791f1315213e58ac657be61518aab440e6a359df SHA512 51fd4adfa2bfeaa4f5a6507d31ad45a5d42df8fb702d629a516766bd25c6f5cc0d1eceeb1d4efe3ff21d51ef0507847f6b24828c017e9200759565be09cf66c1
diff --git a/dev-python/python-novaclient/python-novaclient-6.0.1.ebuild b/dev-python/python-novaclient/python-novaclient-6.0.1.ebuild
deleted file mode 100644
index 3255bc30b60c..000000000000
--- a/dev-python/python-novaclient/python-novaclient-6.0.1.ebuild
+++ /dev/null
@@ -1,73 +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 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Nova API"
-HOMEPAGE="https://github.com/openstack/python-novaclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]
-	<dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/keyring-5.5.1[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/python-keystoneclient-2.0.0[${PYTHON_USEDEP}]
-		!~dev-python/python-keystoneclient-2.1.0[${PYTHON_USEDEP}]
-		>=dev-python/python-cinderclient-1.6.0[${PYTHON_USEDEP}]
-		!~dev-python/python-cinderclient-1.7.0[${PYTHON_USEDEP}]
-		!~dev-python/python-cinderclient-1.7.1[${PYTHON_USEDEP}]
-		>=dev-python/python-glanceclient-2.3.0[${PYTHON_USEDEP}]
-		!~dev-python/python-glanceclient-2.4.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		>=dev-python/os-client-config-1.13.1[${PYTHON_USEDEP}]
-		!~dev-python/os-client-config-1.19.0[${PYTHON_USEDEP}]
-		!~dev-python/os-client-config-1.19.1[${PYTHON_USEDEP}]
-		!~dev-python/os-client-config-1.20.0[${PYTHON_USEDEP}]
-		!~dev-python/os-client-config-1.20.1[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		!~dev-python/oslo-sphinx-3.4.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	>=dev-python/keystoneauth-2.10.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# built in...
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	testr init
-	testr run --parallel || die "testsuite failed under python2.7"
-}
diff --git a/dev-python/python-novaclient/python-novaclient-9.1.1.ebuild b/dev-python/python-novaclient/python-novaclient-9.1.1.ebuild
deleted file mode 100644
index ece49317acb5..000000000000
--- a/dev-python/python-novaclient/python-novaclient-9.1.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Nova API"
-HOMEPAGE="https://github.com/openstack/python-novaclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/keyring-5.5.1[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-		>=dev-python/python-cinderclient-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/python-glanceclient-2.7.0[${PYTHON_USEDEP}]
-		>=dev-python/python-neutronclient-6.3.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.1[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
-		>=dev-python/os-client-config-1.28.0[${PYTHON_USEDEP}]
-		>=dev-python/openstackdocstheme-1.11.0[${PYTHON_USEDEP}]
-		>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
-		>=dev-python/reno-2.3.1[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	>=dev-python/keystoneauth-3.0.1[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-i18n-3.15.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.4.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# built in...
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	testr init
-	testr run --parallel || die "testsuite failed under python2.7"
-}
diff --git a/dev-python/python-novaclient/python-novaclient-9.1.2.ebuild b/dev-python/python-novaclient/python-novaclient-9.1.2.ebuild
index e95c2a4e8fda..3391cf266cf8 100644
--- a/dev-python/python-novaclient/python-novaclient-9.1.2.ebuild
+++ b/dev-python/python-novaclient/python-novaclient-9.1.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index eee55458e9e3..3b8639eb7d0d 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/addressable/Manifest b/dev-ruby/addressable/Manifest
index 7703a64f4b57..6dbc349370a1 100644
--- a/dev-ruby/addressable/Manifest
+++ b/dev-ruby/addressable/Manifest
@@ -1,5 +1,5 @@
 DIST addressable-2.4.0.gem 102400 BLAKE2B b03ab532b2c761b877973381d023c882d4d1e66372bb68425f45debfab3c546845b3535045f6b47d4f7be88c1a2e539b2c1429312147cb4fe3ebdaf90330c86b SHA512 b81fa48e7c4188827c03ac93960b6fd6fb9f5a438f5243cddea39d6820ef756ee7c0086ec330dc4a3538008b3b254757af7d30248624127649cc006a2793eda8
 DIST addressable-2.5.2.gem 103936 BLAKE2B c6677a2b5e9a7a1b279b2e3f1816cda40c0797254970ecaed2350d4d4739dee5a51580a8e2f94fc6bb87b9fe2a535d0a68b62eb672f8e91ff4da02e15e8dffcc SHA512 ddd5aeb4b241efa897a636fd85bd227bd5c6a8ae56129b6bbbdfaad85cdbb74e3d0db4bb6693f7df148b66f68ca1f557ac17a1fb0ea7698d25d883ab0b690bc4
 EBUILD addressable-2.4.0-r1.ebuild 1326 BLAKE2B f6d9e7d1d0c1788ef93c1871eadccf43b2db7628e1606cd0f79f1ac54647d4770425b1bc32579280a7a3de70c93357e56ab4e60b5b14772b1b10f54f491493f6 SHA512 314eeced17e5ed33f52ac50b6326a2eac68c2335e65d9bf2bef4fd14fa7997ab42902d50bc2d8645210a11185dd16f4e3b06ffe07a6bfb23caeafe6584e6aaae
-EBUILD addressable-2.5.2.ebuild 1352 BLAKE2B 3a4bb004a3ec70cbfa250d441241950f3b1178a30f987cb504e7b8dc40ec2219bdc6d2c0cca25e2812d7cf6aa76095465712ec98ee14560c55899d2d5051bc5c SHA512 fb1e4b3f872cb2adbbb9f0806eacf45bdebbb7c265840615dc7bb37074ede7b1e98744458b226011a73768d3f1e8084bda57311bb2aa60dad6d1d28aaa1f3f7e
+EBUILD addressable-2.5.2.ebuild 1351 BLAKE2B 7c004e30c67295fbadb17ea837c515f9a5e1326b2ea07b101088ad0608d8cb91c34d932a64fb80db3a67ca6940b709e847d6c72386c7c6b4dcd0f03683b2ce9e SHA512 ab2c1ce70be563fbbde7d9abb90947084325f126f7a33000db099560b90fed875aa2e1d4b72ec1f17ec54dff29bc59fcddc0be97b7221c9010ab76e4d2b70b65
 MISC metadata.xml 404 BLAKE2B 4362f3592286dd6cffae99340e1b4437af10ab4dbbe44585d3370b0970e7d02a881853329c9412bfc881c3f040995a204b758aead2c34cba4f9df8104f858479 SHA512 c335566562492b85e491233d4f908fe18c2713ed9ac3afe2cb4d9537d71bdfa1a10bf58f1ca9f29e5a695fde9a4ba0ff9b3c57122afe78907cc0b00b5c307351
diff --git a/dev-ruby/addressable/addressable-2.5.2.ebuild b/dev-ruby/addressable/addressable-2.5.2.ebuild
index 9d973d98a3a9..f26ca7dfe402 100644
--- a/dev-ruby/addressable/addressable-2.5.2.ebuild
+++ b/dev-ruby/addressable/addressable-2.5.2.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://rubygems.org/gems/addressable https://github.com/sporkmonger/a
 LICENSE="Apache-2.0"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 ruby_add_rdepend ">=dev-ruby/public_suffix-2.0.2:* <dev-ruby/public_suffix-4:*"
diff --git a/dev-ruby/commander/Manifest b/dev-ruby/commander/Manifest
index 9001c03cebd6..6ea6583b7340 100644
--- a/dev-ruby/commander/Manifest
+++ b/dev-ruby/commander/Manifest
@@ -1,5 +1,7 @@
 DIST commander-4.4.3.gem 36352 BLAKE2B 4849e3940762c2686258938590aad28292ff6d5c4cda0e14caf688b5d0177b1061318cc185071991e667f38efb132b9b4ea7bb9646731c18a30014b9f8d49b13 SHA512 9831ab6983359ebd112223f72991d09a79c04488d578973430920c399249b5071678b86190f9bc63f0303f479336a332b8e83e4f4ac9322e9630fa4d3863d4a5
 DIST commander-4.4.4.gem 36864 BLAKE2B 66a391c3d25ecc79308b9da8010c8d3a8b26902a72e7e96558a9c2690f6a8735093c9a218097b52610d8dc49316c0469e47e05539a3b01beb9310894ce313bde SHA512 d4b7912f03f9c78c6bd5b63221b334391b0788a579d2dd20b389c6a34024ad7b5057631426e48befc9d5c02f35921cb31b530b38cee93817f2383dac113f2b82
+DIST commander-4.4.5.gem 36864 BLAKE2B c4bfcfdd01c09bafa98497aac028054e910e077b38a23f0aa46898d6153560d41d6ccf0e36f46c2702cbd480da892195b7d28840448fb7f8d64ecb6c6e3b1962 SHA512 d2ed3abe7c054054a8442a76bd006684d26908d9ce92a7314d7acffc21dbc16e46144927dc795a69eb195ae04b8d84fa7bc6601c7f682ee188fcbc93ed5a9be2
 EBUILD commander-4.4.3.ebuild 622 BLAKE2B b1e369d3d96008856640d984f0a91548494c2780de51e07280d22f2dd46f498f4adbf691deca17e5b3fd89f9307354205acb592dbcdb049b084cedb3edb9408d SHA512 614cee7b18dd6d885d3dafea2e78c2353575a7f754143d933e918369fd6d40317108e730a6e783bf069f19086ea2344583ca33e62d4bfbb8fd82a63b508e5595
 EBUILD commander-4.4.4.ebuild 615 BLAKE2B b6a4606f6d23bb137843f791c6611bbc5311e318d344c9f15cc7602001afee1fa3bbc1d9a007dc28926cfbc27f2c55d08ce34e14a87ee29a882cf74f9090313b SHA512 223808451dd2a1353329cf8347458d8b458d0ee5082f9c38e87eb09a79c0b3f72490f964571c908f7d00b760dd38864b6fd5062763831459407bb093bd2da6d8
+EBUILD commander-4.4.5.ebuild 615 BLAKE2B 469cb266239f3eee9d7ad0a65a5bcceb081218344c1b3f66d507894fb7b84d5b19027e49d6063651578de31b71c7c121ae5b33e56033ef83a92c4c814d6f9031 SHA512 f68a0748e8bd8f9bd20354dbe21c2dc07191d2854515f439a0abd15243cca4d598b6934cfc9e355361d80045f18969a32641bb1c339152bf3e87087553a804d6
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/commander/commander-4.4.5.ebuild b/dev-ruby/commander/commander-4.4.5.ebuild
new file mode 100644
index 000000000000..84709c9eacf2
--- /dev/null
+++ b/dev-ruby/commander/commander-4.4.5.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_EXTRADOC="History.rdoc README.md"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="The complete solution for Ruby command-line executables"
+HOMEPAGE="https://visionmedia.github.com/commander/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/highline-1.7.2 =dev-ruby/highline-1.7*"
+
+all_ruby_prepare() {
+	sed -i -e "/simplecov/,/end/ s:^:#:" spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/connection_pool/Manifest b/dev-ruby/connection_pool/Manifest
index d04b85748938..1e69a6312cab 100644
--- a/dev-ruby/connection_pool/Manifest
+++ b/dev-ruby/connection_pool/Manifest
@@ -1,3 +1,5 @@
 DIST connection_pool-2.2.1.gem 13824 BLAKE2B 2328a86f9d625d245f3e74d41fd615d95ea68a6fb8b1d17a9a0f9dc4ff8b772eb2942fd9103b12875a4ea2f3b6d922227a4da79fc61bd348d4bae5aa50b442a2 SHA512 74167b200fcc02d3a60fdc0e71b44c80f1c72db75b5f604a442bd5fb55138fe1750a2db095e0283104fda35fd9024cb71c7ddb614c3d472f814d686b686b6ef0
+DIST connection_pool-2.2.2.gem 13824 BLAKE2B 2f52bb3451dec5916d5797596f7bc3dbf39845321ee83736d679c433e96f154db852469b1f6d0d3b7c7f48262f7840087d89cdd40ece22b67a29c20ff77274dd SHA512 74cb64aa3f183ee4e41f438133f60581e9f99a1d5b5daf61607cff2329bfb1fbd8810d87c35d709418a22ad925049e3e9403a602107452414a67aee1c6eecfe9
 EBUILD connection_pool-2.2.1.ebuild 735 BLAKE2B 1efc20a9184b374fce25b62928a1aedd3ad6cde7ee066507d5c8c98293973abc99658d5ff9621c97c6da8dfa0ad6e93e675977950e3a86096fc43b814bca47d5 SHA512 245fc30a43eade01a1f72701a7f55ad33c98d92a0dd43018289f7ef6ff511818ff3490e2560bb64e0952a2acf864737bd8ede8566fa3185e2f5ee11d222a7763
+EBUILD connection_pool-2.2.2.ebuild 729 BLAKE2B 4e6937573dfd1fa17d4bf7e7ccf17eab67a0d3a6e69a980ef539aed26eff70684680de678f5aeee7b677f51783e9620494fa8372e36ed7890dc21febed675695 SHA512 9c641bdadafbc297c7f7fabb0589ab45ff9a02198002ab27401c64cd313bcc2cecef6b56f7ecdbf5b3c190274f423a08f930c5aba4023e77ad0c53b7f08408a6
 MISC metadata.xml 349 BLAKE2B 7ffc13174f2f47522a66c48922952798d03fbbb15419d9a52e183c633b56d863e85fab4682420aa9fffeb16d474f52de30799489a99221f25438524dbc569303 SHA512 18245f101f862c5880a42121eac9947a22fac206823d85ba650f5766af334208a64f97e7ea44e298f4f3c1191eb6bbf0e37949974c737060dd66434e1963b41c
diff --git a/dev-ruby/connection_pool/connection_pool-2.2.2.ebuild b/dev-ruby/connection_pool/connection_pool-2.2.2.ebuild
new file mode 100644
index 000000000000..97a8f019f2a1
--- /dev/null
+++ b/dev-ruby/connection_pool/connection_pool-2.2.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_TEST="rake"
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="Changes.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Generic connection pooling for Ruby"
+HOMEPAGE="https://github.com/mperham/connection_pool"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( >=dev-ruby/minitest-5 )"
+
+all_ruby_prepare() {
+	sed -i -e '/git ls-files/d' connection_pool.gemspec || die
+	sed -i -e '/bundler/d' Rakefile || die
+	sed -i -e "s/gem 'minitest'/gem 'minitest', '~> 5.0'/" test/helper.rb || die
+}
diff --git a/dev-ruby/dbf/Manifest b/dev-ruby/dbf/Manifest
index cd59f165ad1b..9dfd96f1eaa0 100644
--- a/dev-ruby/dbf/Manifest
+++ b/dev-ruby/dbf/Manifest
@@ -2,6 +2,6 @@ DIST dbf-3.1.0.gem 126976 BLAKE2B 1ab65d152d7dfcb84a857c21fccc7162a0e35e51cff50f
 DIST dbf-3.1.1.gem 126976 BLAKE2B 449b70abaa0bdcdf579ee78facbac46d2f97fb99e983b99ef7487c6a78f5d6f8f1c5257e1a490a169b8cb8e9581fb56827d86844d2d2ee9bc0b3326998206f6e SHA512 88aedb43858702ef2f24a2a751ceaeceba7d75ad58a6abdb314219cbb83551165aa7a1973a68e6b4c0da87c9f35c80b2e0650b25f570a76821bbdccb3dbaafb5
 DIST dbf-3.1.2.gem 127488 BLAKE2B c71089220f7b2d57b99ab27881c5f094a753c1a7c5378074f18d4a9fccba26d4ac7e8e563b84c0556aa50db7f39d03697957c10e6528ddaed8bef812cac662f5 SHA512 1e9c809cc03d4ecadaadd5cc754e4fa85961cf675465f950cda1c084e80c32e0a62223494f76b4ba8e26cde61eea8e43414d1b03c95fd36e8994222c3ffcab11
 EBUILD dbf-3.1.0.ebuild 489 BLAKE2B 1a5af7d1f9a99b112dba2f7730148ae8e23f6a348690c78a514f4a141b8aadaa4ef15f064029aad85083372434f7984e99ab9ab72680956b75e80d60ef4254d2 SHA512 06260e05926a1318440c173e76493f0c22d7d72f90ff8852af11b8d40f5f7c7d2bdb09eedba3860e434b2011d48cec8ccff36cb44823abb9690bf289dd9736c9
-EBUILD dbf-3.1.1.ebuild 484 BLAKE2B 51e1da411c6216ca678771c03f04d14cada1144ef79b6ccffc9c06554184906bff07b4aba16996a2d65e00ff754b133c90675efbc2cd32c155fdeb38a2fb634c SHA512 5ded71be147e6909f1c4dde67027e9f2410b997da26da017aa9572dfbc3339befce7f15e8829ac7a21a796c1774bc77fe61d979039daaaa809fac6e9c8d8bc3a
+EBUILD dbf-3.1.1.ebuild 483 BLAKE2B 85f7aceb311d3ff4871e040f0ffd6cb12f65065aadc1c9a6af4da60e64a8156d1e10e12e886ac0731bddc49320b15af01475ca49c8f456044aed91829ae30edd SHA512 de2caa190d9108fd321b3bdd6eb2dff9e20097e63ea0fb3e43853fae5a4d7faa2b7ce52d5c41c6d897ab1e2686056e32a99145e87f3afd5897b690e169c4e0d1
 EBUILD dbf-3.1.2.ebuild 491 BLAKE2B 99af868e61c34c2025a82e6b751888cf31505c892804b1f3af8e3675fb37fb57a84bd91ff2132d6cfe54db426299541186d65cc8b28df1f4675a660468605030 SHA512 ffe6b107766e9abfe7eb4cc705836ba3e42d85e7c6d1c54e631b4cb82131026ceee3cc1dfe38ed8f50fd4cd5af7d73872a4229cb7688e704f30f894343ffeb56
 MISC metadata.xml 473 BLAKE2B d563d50bcc5286aec5a86a72bd5224e9a08d3369030fcdaae80fd3380462cd00e93c613d17552aa35ccf23440e5fbb78ed8ceb9c4f9b3b97af8591a514d5ce9d SHA512 5e46d9be66b6236bacb4089909d40de9b2124dc5fd1e026807c4e6fdbb70e25aa32bfc3fd150b92168bfd7764fa8ff74314e48fa3bad897b34276d7f12722f90
diff --git a/dev-ruby/dbf/dbf-3.1.1.ebuild b/dev-ruby/dbf/dbf-3.1.1.ebuild
index 1d812c3076b7..9b14a043b84a 100644
--- a/dev-ruby/dbf/dbf-3.1.1.ebuild
+++ b/dev-ruby/dbf/dbf-3.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,5 +18,5 @@ HOMEPAGE="https://github.com/infused/dbf"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
diff --git a/dev-ruby/haml/Manifest b/dev-ruby/haml/Manifest
index cd1408165763..9debbcd6bab7 100644
--- a/dev-ruby/haml/Manifest
+++ b/dev-ruby/haml/Manifest
@@ -3,5 +3,5 @@ DIST haml-5.0.2.tar.gz 124000 BLAKE2B 852a674d0519ca785fdd448295c402f203d21e627e
 DIST haml-5.0.4.tar.gz 124580 BLAKE2B c22e464be26f65bd94b202b21604bb9fe3d740865832c9299d93606293794316a5262504e15583fdc2628a3015ea58f9924a9b3aab2f46340b305ad5af7968ac SHA512 125ae514f800b2dd58f7f339ef3bf8c15114c5738813d911985182d4e4b1e8551c92a89149427aa8bf3326f45c8f71f4f13f37ecb7e2bee5cb75163538f6a3a8
 EBUILD haml-4.0.7-r1.ebuild 1243 BLAKE2B 58a5b3eb31abf8a1d7587f42a2f2b1eef5a4f82bfb3c92d524b77bc29caccb571cf01495c688dc6cfe5bfa942d2e8fea344e07c8d5e6bd53852fd3116c803e54 SHA512 6d3187990262735c7ad65c2fec793f5b9faa347e9c2233e389632c7263a4a7853de261da820056488cf9d227efae6e5af4c41a6449f0581b10271a5f938ab805
 EBUILD haml-5.0.2.ebuild 1575 BLAKE2B efa40e6be7a11f7640d7a25a5b67b72131809e91f51cc918992aad4c0f50596d1231e83316041bff2c1abe49932a956edc9eb2ded785bff9aa49c230a66c22e7 SHA512 2e94b46ec7568a777ebb0f868b03aca76bf4fde9a9e1765188b0805829fc8d4896821b5de4d501b4333e38874ab6963c3752f0a2746fbf481982ad83da7a378e
-EBUILD haml-5.0.4.ebuild 1595 BLAKE2B a605eb11ee910e654c8e54c2afb6cc26c3ee755e346801a57b8b173cbc1835de107092023c75692185b5bde534b6308554e3bfdef19b11648794060a26ba353d SHA512 f79db1b94355b04637be52140eff00071e714a24d846e8d9437e456ed48076e936d922340f324bff3bbd39fcff027814c3bedccb46ccda5f99942f864c7f075f
+EBUILD haml-5.0.4.ebuild 1602 BLAKE2B eb733f77db4d3e03a894e48a3536182dec41c5b59e6fcd808422a7bd8e00297289ffe091368377667da75278c4d77e1188f17db2c95578e8dd6beade8285551a SHA512 2e4b920a9a38ab95731be6e070f1a949fd23dff162da76638135abd2c02dbc98cd6ec16247d2ecb109ca0349fa491f436f27f8f555f3d354d7a3ca98a03be3b8
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/haml/haml-5.0.4.ebuild b/dev-ruby/haml/haml-5.0.4.ebuild
index ce8c9daeef31..5edf17354124 100644
--- a/dev-ruby/haml/haml-5.0.4.ebuild
+++ b/dev-ruby/haml/haml-5.0.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-USE_RUBY="ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_TASK_TEST="MT_NO_PLUGINS=true test"
 RUBY_FAKEGEM_TASK_DOC="-Ilib doc"
@@ -33,9 +33,9 @@ ruby_add_bdepend "
 	test? (
 		dev-ruby/minitest:5
 		dev-ruby/nokogiri
-		dev-ruby/railties:4.2
-		dev-ruby/activemodel:4.2
-		dev-ruby/actionpack:4.2
+		dev-ruby/railties:5.2
+		dev-ruby/activemodel:5.2
+		dev-ruby/actionpack:5.2
 	)
 	doc? (
 		dev-ruby/yard
@@ -47,9 +47,9 @@ all_ruby_prepare() {
 
 	sed -i -e '/bundler/I s:^:#:' \
 		-e 's/gem "minitest"/gem "minitest", "~>5.0"/'\
-		-e '1igem "actionpack", "~>4.2"'\
-		-e '1igem "activesupport", "~>4.2"; gem "activemodel", "~>4.2"'\
-		-e '1igem "railties", "~>4.2"'\
+		-e '1igem "actionpack", "~>5.2"'\
+		-e '1igem "activesupport", "~>5.2"; gem "activemodel", "~>5.2"'\
+		-e '1igem "railties", "~>5.2"'\
 		test/test_helper.rb || die
 	# Remove test that fails when RedCloth is available
 	sed -i -e "/should raise error when a Tilt filters dependencies are unavailable for extension/,/^  end/ s/^/#/"\
diff --git a/dev-ruby/hiera-eyaml-plaintext/Manifest b/dev-ruby/hiera-eyaml-plaintext/Manifest
index 78c7b8bca63c..c4ef976172b5 100644
--- a/dev-ruby/hiera-eyaml-plaintext/Manifest
+++ b/dev-ruby/hiera-eyaml-plaintext/Manifest
@@ -1,3 +1,3 @@
 DIST hiera-eyaml-plaintext-0.6.gem 5632 BLAKE2B cb9c721615ac68ea5a6ea823246b5d0234a4b0d4496d89f345956109d8bba2f0977f65af14d628f22f4457e710fe603e0cc1447d386c2bf8a47d6a5844d05365 SHA512 a6f1ccc5fb7249ae973aac0920b2eb14aa2b3472921cba50f4e9b791107cd5b2245b7d0f7533c66a84caa0a3f4bc1fb044983ba0b0dadd9cc514686dfd62b32c
-EBUILD hiera-eyaml-plaintext-0.6-r1.ebuild 439 BLAKE2B a0c89b63e22a7307cf040266add38f2f3cd95bbd2d0e813cc2ff45a7b119b6f62c77b40180c0057df81657ba9d0a4cb8f66acf4f3f5ff3d4db1e112b74f19732 SHA512 c83fb343031ea0f08412488e38982f7202dba7f84cf8213ba53b02f1ccad256c369c3b7f3e955e3eb3bd4034744097111ea0c408ce5fbecbd0942c677b716e04
+EBUILD hiera-eyaml-plaintext-0.6-r1.ebuild 425 BLAKE2B 3c061e6520cfb4e24ab2ec057c901e7c84bfc006eb4ccd45344deddd6b6131ced21b87ddb7a58765808a520a2f87de4aa4b237c23e659c45875bad2e460ee92c SHA512 fec1a01cc5c369987d250ecb236d980c68446744850ee452bdc7d0eb420a3434ae3c6f6e4cebc2f3185f0563d0da01c53da0c60876e0f88a400ce1ed42f1491b
 MISC metadata.xml 484 BLAKE2B fd47877f3ca990e923842f8392c590b2469e73a2b709a16729b49314f7887d9ade58e68b96096d55cdf043ce1fd35be437b8ae56ff32974fe5d1dd2f048000aa SHA512 6f1b9003ae433d669b44a581b35af9f4fc6de6f27ddffa8c193dec349c72c05cbeb07bf2f97d99b2154535404337e5e361f2cd61ad5026639baa0a9477febb28
diff --git a/dev-ruby/hiera-eyaml-plaintext/hiera-eyaml-plaintext-0.6-r1.ebuild b/dev-ruby/hiera-eyaml-plaintext/hiera-eyaml-plaintext-0.6-r1.ebuild
index a4a5ee2fdd19..c344e2a09a2c 100644
--- a/dev-ruby/hiera-eyaml-plaintext/hiera-eyaml-plaintext-0.6-r1.ebuild
+++ b/dev-ruby/hiera-eyaml-plaintext/hiera-eyaml-plaintext-0.6-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_TASK_TEST=""
 
diff --git a/dev-ruby/http/Manifest b/dev-ruby/http/Manifest
index 0ddd9ae2775d..79b25bcd9b82 100644
--- a/dev-ruby/http/Manifest
+++ b/dev-ruby/http/Manifest
@@ -11,5 +11,5 @@ EBUILD http-1.0.2.ebuild 1066 BLAKE2B 8254d2606eefeb6f3088fbcd8a3b40bf5c81f19b8e
 EBUILD http-2.2.2.ebuild 1232 BLAKE2B c15bb91342baa306872e609cae8546b30ebedaa8c0388859f94c597b3a3fdfb08f50cb60e14cbe8df34cb8c0389a283f60a0beaf303068fc38417e62ef2e7222 SHA512 e24e112a1ab81d744c8046561c1314b57439c67654250542cae7921e7fefbf716610e1bd3775936fdcfe8db0c9c72b56c8b12a4229c5ae342d1a916675c3d3a6
 EBUILD http-3.0.0.ebuild 1228 BLAKE2B 581bea6ff67449d0bacb2eb8038b38405ed97cebae6be2108a8194eec267932ee9f6014743eddfcc9138076bf507a36f0eca4d64577dda7100f83146697d3f52 SHA512 4ab960efe6d5b79b49af267d9a26e233d49d278fb3f839a9c9052ffe74bbfb96976bcdd5c00302b0c7cc4399a78c25867f4c7a548b8ad903c4700387d7ecc97d
 EBUILD http-3.2.0.ebuild 1232 BLAKE2B 09cd0bdc0adc6926e7f82a83886bad44fa04a51b726cf22e9a32a8ec9caae0c7d3e1d3a4007a125e08da6e8cbe6a382a2f391a11e9222d2b16f9de211c5176b7 SHA512 48910a29b81c2c2e3f608076823f3f76cc0eef2b910f36564a5466bf33e69975ac47a0b388fdd9930b2111993bdc1deb0af1e04e98f791990188bd3b8236193e
-EBUILD http-3.3.0.ebuild 1225 BLAKE2B 807e39fb714feb685fdac6920fe232706c915ef6ba5176cc7a46f29fc43950e9a7981bdda11114981e6f042f78106a0144e36ca41c97e200d070c82210d652e4 SHA512 6a8d7ad05c3126aed3d97db2f1c76253f463ac369d78f614f24b13028728ade06ebc01c317a6c0bf24720e4a45993d0e8a2a259acd70d87a581c3a3cb856c0a8
+EBUILD http-3.3.0.ebuild 1222 BLAKE2B dd511f94e713b5974f0302cc41ab6f430d95e57bb55fd212bd8d8350739f9c4c9448dc0cd7784f01de3ba966a6f7d0c7b2e1a583f46f2456255f5920815fec55 SHA512 edd2b91ce30508a694a4442d603280974c52ef3472cbb013b242568bf6001e7bc31ea61e329dbf386d30bb81693dd8bf64eeee718c4700464ce399a123c9104b
 MISC metadata.xml 339 BLAKE2B 2508769568914caafa01e9e8e6517a7cf9c1733c772b3c605c8dbb056efb8dca3be9525e1ba2ac610bd6d5b5dc02b7625f3569dce0597444240bc2ed8d8449c2 SHA512 9b43a2f61eea32941c251429694bcfe432f284527c332efdaf4187c9ad8c6f53cd924421ca9d56cefce75cbaff104d4f7579790fe09b45a4cced06bedc44d1c1
diff --git a/dev-ruby/http/http-3.3.0.ebuild b/dev-ruby/http/http-3.3.0.ebuild
index 99051aa01e39..935b12a363df 100644
--- a/dev-ruby/http/http-3.3.0.ebuild
+++ b/dev-ruby/http/http-3.3.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
@@ -22,7 +22,7 @@ IUSE=""
 ruby_add_rdepend "
 	>=dev-ruby/addressable-2.3:0
 	>=dev-ruby/http-cookie-1.0:0
-	>=dev-ruby/http-form_data-1.0.1:1.0
+	dev-ruby/http-form_data:2
 	>=dev-ruby/http_parser_rb-0.6.0 =dev-ruby/http_parser_rb-0.6*"
 
 ruby_add_bdepend "
diff --git a/dev-ruby/instantiator/Manifest b/dev-ruby/instantiator/Manifest
index 0a49ad140c77..dbff89629154 100644
--- a/dev-ruby/instantiator/Manifest
+++ b/dev-ruby/instantiator/Manifest
@@ -1,5 +1,5 @@
 DIST instantiator-0.0.6.gem 6144 BLAKE2B 6add4d12cce98be209ac3d1073c17163c10c6c015eb40c9d8efcf3c4521e56c736618d11c4a06f52a0d16ffdf2b6815fb6e04ce823fc79febf997dec30aa1904 SHA512 0d24c804dd048c071e5ddd021a1adcb907eb642df16ce841fdca2efdfd5604f73d065ad4496cf6d63bdff73e7488391d7226bdc0d918d2813502ca3d4fc615a1
 DIST instantiator-0.0.7.gem 8192 BLAKE2B c1cc0bf4a3f2aaf9afd522e33fdd2b32d78ca114fc7b113f6ae297e825177827cb6aa5398917d6d05523f912bebf22e43709e53c0dfe4e1a941ebda4350d3098 SHA512 b37a9380d787252244d2b85bb99365f4a4ecdab58f76caf5e59df00b239f4981119eb5c2eb2fe6ddcf810bb0fb43695f8926370a101f4223fa28811953e6731d
 EBUILD instantiator-0.0.6.ebuild 572 BLAKE2B fa02578109dd6b75d2b729c55d1c5b1210b9e1467fb1460326177889b7e40f68e36dc7c09dc77469e3893ce9d160c09ec7e35adfde71a8d0f0ce1f5674f38f94 SHA512 e93542390c4e270377f28d9fa59a33d21396f3137128d23ffe909035e8adb6933e84342a1d8efe9c99703e26be1daf0e29c6ad1b63cdae0ed30ea6d7e7625284
-EBUILD instantiator-0.0.7.ebuild 573 BLAKE2B f66ac1d2a1851bd3efea4d55edf1fb36d7f3775ad079cca52af0992fccb7b217a0cd400e82aa510a400e064171bda4a5ec7a44b56e4aad38a5f2dcc03dd91040 SHA512 f02c6b38c04f27171dfd04b728cc94defff8b4904abf1978b3760f4aea02a6adb8f2be926eefa82670e5e8d765acb474334a6435fc4472c8027031473bb49088
+EBUILD instantiator-0.0.7.ebuild 571 BLAKE2B 54ec9b1288eea8bd6da55a671b73838ce50e889dc2f072192ebdfb86af7dba47c588d50f4fbc823e2dfcfd66f50226294b044e473405e0976d8da36b31ba0865 SHA512 acd5e6365e0928a9566e985c83be3973693fb988af58fa6c49f0772608e50bcec33f1cff76ca0454251c8e1e477fb4575fdc003855a0134ef3af020584cea732
 MISC metadata.xml 350 BLAKE2B 3a675060e310b02ef2d6408b7b7114651555ae65ed76f6311947a7c6b01e18c638775ae71c504892845b5f9fde2bf5560c3e267fa478bc105c3732a2ee821fc8 SHA512 48661d17e8297087c541040534f2c19ef983be797cd9feb5a9e7d80f8bfcfba027e8c2e42d8625a0a0f76bc60247372b2ae0f984b6ae8f635f28bac33156fe1d
diff --git a/dev-ruby/instantiator/instantiator-0.0.7.ebuild b/dev-ruby/instantiator/instantiator-0.0.7.ebuild
index 37edee42c999..41c9c4b429a2 100644
--- a/dev-ruby/instantiator/instantiator-0.0.7.ebuild
+++ b/dev-ruby/instantiator/instantiator-0.0.7.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/floehopper/introspection"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 ruby_add_rdepend "dev-ruby/blankslate:*"
diff --git a/dev-ruby/introspection/Manifest b/dev-ruby/introspection/Manifest
index 9827fed1f529..c4648339edb4 100644
--- a/dev-ruby/introspection/Manifest
+++ b/dev-ruby/introspection/Manifest
@@ -1,5 +1,5 @@
 DIST introspection-0.0.3.gem 9216 BLAKE2B ecc019bdace30aaf0a1357fbdaf56f19722b9ada0e61b335ffadf1ceac3340a664245d177a8ffe9caace9cab1b81d203578f8b914165309be17b6d6734966055 SHA512 423722f402a8a5cb5f415c498cf754a2b5084b0a89ada48b982a97e3951d9af4bcd675d5dc4a2eacdd0673bf08facaba845e767e3e248e0a8ec922eddbc53c37
 DIST introspection-0.0.4.gem 9216 BLAKE2B c97279576a60dfd74453d16a6eb0885326dad18748bd182fe3b5c2a73121553cd3ea66690841df6554fd105e50f5f6df075afb94795b94dbd7caf4615ca67764 SHA512 c228827ac9d8a82a104e78daadf038c674cd464bf726fc3bd1efa82e9d9cab37f6ee909f578585e7846378f0b755ed4d60fa119fd699f6c40188ea2de4ac7084
 EBUILD introspection-0.0.3.ebuild 642 BLAKE2B fe9e420e8a8741735cbc5db7a39c5c624fc173675153ef56dc603147a33d3f0eeda65435fcdfdaef7ee33042f8c294c0cce0436087203b2c4ed751c852551fe0 SHA512 d0725e51a36ae20b5649c5c61e76457734a71c8512017336751a275a624c23a1b537dae60a6c7b509d8458e35205f6f1d1ef0d1860e54181f9789e6e4958a6bf
-EBUILD introspection-0.0.4.ebuild 677 BLAKE2B 2ef5626bda9f3d4829b65add44d4316377b5188724ee71cfdf459f5459d5922ed7cd7cf6da35d465d7d524bc215d742d121e6ff4c718b8c0d0279d62aa74b0be SHA512 20369820ec0ed2e4a72d3202400feff5b0e77c7a9a96cbf12d5d74d5781925b82616a8d4ad3379ff1a63e6022981671867e716605b99a6424da19f456b5f68fb
+EBUILD introspection-0.0.4.ebuild 675 BLAKE2B 4434cc26da0e3dcc2afdff8ec495ce3fb955228e6738dc150dd8d10bf8e6ac0110e6da02de3452632e6cb06d6035257ca3bb2126e9dab05d19d708de93ec8b39 SHA512 149eb5c2523fc96415e5288a733ba11d78de22ab0d222158ed179c5f39dfed98c2b24f23bd315a4200b587c46057690b2ecadc7971c1b1d937b159bffe00e327
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/introspection/introspection-0.0.4.ebuild b/dev-ruby/introspection/introspection-0.0.4.ebuild
index c9f7ef29b7f8..61335595af16 100644
--- a/dev-ruby/introspection/introspection-0.0.4.ebuild
+++ b/dev-ruby/introspection/introspection-0.0.4.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="http://jamesmead.org/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/metaclass-0.0.1"
diff --git a/dev-ruby/logue/Manifest b/dev-ruby/logue/Manifest
index 72d0c30ea580..a4b65140c3fa 100644
--- a/dev-ruby/logue/Manifest
+++ b/dev-ruby/logue/Manifest
@@ -1,7 +1,7 @@
 DIST logue-git-1.0.11.tgz 11535 BLAKE2B 6515efab4cb42fa7a787bded637ea6d21ff9d4f99acbc6f14334a0aa6b49c6b93b48f57c78e38b52761cd9e59e722b94b4992a0c585bad601a70b425d0abb165 SHA512 8a5793967eeed4df21439f55bb1bc33037d7c18e8b5f543bef7d6bb9e54e6c5acfb6302f754c7454ef0d8ddf5717563e136b45ee3c5e0c08d92fad15028220b9
 DIST logue-git-1.0.13.tgz 14389 BLAKE2B a6886989e561124904e6e6016c84b53abd1ea5be2f92958dffdc9b5ce9741728b9760034a9a7517ff35dfe0ebf10d6a6937aee426b85de3e71690098e9eec0ad SHA512 677ef2a8fecc50cb923dcf85ab0bdd984ea5806c31e11df9438af92912b94a4ce227837fac4baee05595f894f6a0fd4167f2984357628eb3e8036479103340c4
 DIST logue-git-1.0.4.tgz 17797 BLAKE2B be99a6c9ecc8bbde25d9a485d83b1d485e7afbe3e5fb8954dd6140881bff496c48185e15ad4596bcf7abba3a19e556da9ac6d44623be33887e32590cb35abd0f SHA512 e3d6ec6a8b302fbdf7a2b7842b31f88af4f0576166b632dd356a40902dc816bbfdaf18a170d5c8066fbfa97643d38d6c8137d4f435f478f04badae4a0120184b
-EBUILD logue-1.0.11.ebuild 642 BLAKE2B f70c610772e261497ef83ad0d4c58ef401a37bf28a89f8ec5c6d0657e1fb14ce4465b45e59d9a651f82b3c97ed82719dd9555f642f15e2cef6d2f98b79508cfc SHA512 7876127df6fa1327008985202da4452cd1753aad82d4f5d457f9745038c35bfa25b509493e1e558de3e571d5c22e92839b2f451881596c4ffec41485a26771fa
+EBUILD logue-1.0.11.ebuild 641 BLAKE2B 268a65af2a5250319bdbdf3c72f28a8a213e16a5a020aa3dc656e5420141788fab4226ac99a10871216c80242b1b7d27854ecede4bdc9f3dc5501e06704e5083 SHA512 49763d1cede8d908ef5b86a47e07e200bda2d7be3e62d276a793643e3da26b863a101b5f1ca7046af8c74d460ee6cf673c90c70358936e20afb05ea98b739ab8
 EBUILD logue-1.0.13.ebuild 744 BLAKE2B e7df279983c71b4d2b61f58cf33bd488263545eccd10ec4e715816b684366db24c5530901db6ba52d3d950adb4d4627f619cc331f49b29be19ca830dfb9946ae SHA512 721482f9aa82592cb7624e38f459e455cca7f075d02ff5c29eb5ef62838cc9e28f4dd46713db40546b78e59d946628427c26a2dd034fd9c0cfd0264275375dfc
 EBUILD logue-1.0.4.ebuild 601 BLAKE2B ce2b1f04851d4e26bff1a1bcc2385786c7ed3cf6bf3afad51bd4b6f7a451f322a7c89e37de17fd404ae14eaee066b99d959185dea984831c6483b663b1c4ffd5 SHA512 f3800e592f379b269bb25a2c6ab8ecf64fdbeedc91e7712989a2021181c3081231445c906f3303f0add37cc230e97227f44c8349e6afefa0d3ebf171e03d9770
 MISC metadata.xml 337 BLAKE2B 045c92dadbdfb3a0c0506734134b5c62b6fc842e12cfbae746a6d9cf07dc65dd5d240575639ef8563baf4d201a43d1b3aed0f3ebf54f88a85e7cf8305926d29d SHA512 2d11804bc1d4e53888e62609677d7bc0c20882ed3cc779dfdf5733adf9cc94ba671af7e901724fe30159ebea1cdcb1039e5c83ead45ebff75b9ce64018bbc1f6
diff --git a/dev-ruby/logue/logue-1.0.11.ebuild b/dev-ruby/logue/logue-1.0.11.ebuild
index df7c5ab66489..0de7dea4707a 100644
--- a/dev-ruby/logue/logue-1.0.11.ebuild
+++ b/dev-ruby/logue/logue-1.0.11.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/jpace/logue/archive/v${PV}.tar.gz -> ${PN}-git-${PV}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ~sparc ~x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/rainbow-2.0.0:*"
diff --git a/dev-ruby/maruku/Manifest b/dev-ruby/maruku/Manifest
index 0a22f57e6207..fe06a651456c 100644
--- a/dev-ruby/maruku/Manifest
+++ b/dev-ruby/maruku/Manifest
@@ -1,5 +1,5 @@
 DIST maruku-0.7.2.gem 142336 BLAKE2B 54b65ae0db7d7b6f97521408b056ce520382fb9fa5ec8c9c74806ac31ec9f2dbe7af3a366fa962147d47c28e58289839b62c515d5b767481b9e13a2b3140a96a SHA512 45eaec7ba721499acbfed97cac4eddfe50c2200a70394e06dc6dd4c6c642b0c58d126c48dabfc4b9697423dd99ecf8691e223125a44d59a382a76e051f2af622
 DIST maruku-0.7.3.gem 140288 BLAKE2B 31da6bf63272a2e5a77aa6f3cdc1462f0039751424bd0888d69f2f2660534cab8868238cbde37d184c2ddbe50b76dbfa5305a450fc27b9995f74284a1f962724 SHA512 efef3eea7451e32c06c0820834cb98eb5424f6837b2e66e44482679d73d958e1e2c59e790a3e5ba26e0c91ece0a5c17f91877a7797d9a15a73b5344b0d444507
 EBUILD maruku-0.7.2-r1.ebuild 1242 BLAKE2B 9a68041c9ae854021b70b4bdb91801d95e71e23bb270f163fccc9d560e3c3a8210b07a7fd148fc993937499cff3c5a636e6b903e8fc9a475529090b60fc3d412 SHA512 f129257e9206c59112dcc28aa4b6b95118b43b63ea732eec7294745a0fc376cee8627e9ee42c38e80025c9cbd5f2d883e98dd70c4faab179c4667a3c0e2b7c6b
-EBUILD maruku-0.7.3.ebuild 1261 BLAKE2B a26db3d3484ce15f20812441dc60c4ad7369f5b794dd75b9af9028ceec3b7bd8374f9ad78f477a2b83a88512a2f4064c34b016a25807d1b17f5fb005625eb19a SHA512 d31f083198d38521d42ec89279830ec8cd6543641b2de739fb0f72107cc6fb269174d577893763a25d2797092c8a52fb22b1d3e2c299fa12d2737e0a3647ae19
+EBUILD maruku-0.7.3.ebuild 1261 BLAKE2B 9658b548a28104b1a043dd293d3650052fb7acc45856e84a260bfbc0f5bd44da4a3103a0417ea91c8f3ef864d46bdfe3776a11f83da96ffd3a2450464b435462 SHA512 b3105f4dd5578c8aba9f1e3d33ff369c51baa125e2f9206c537c688acb0a49ecc3004b1e956d248ab2d02edd9e636d31c0800173cedfc89bb8681e9f1ca9e93d
 MISC metadata.xml 454 BLAKE2B 543ededb4beb16959617c700295d7c7517c3969b482ee0e0ea71cab8c412ba09480b4503024dc23d1f419c9bc621a66cc23a589d240577554a36a712f4d1892e SHA512 b58d0a08843b11dd0ce0fc68d347f16aa2e6fd6530a3f7a54ece40c6076cc64544857081d9ff889a816ac545e68973f709c168378fdd756bca286e4b874a2084
diff --git a/dev-ruby/maruku/maruku-0.7.3.ebuild b/dev-ruby/maruku/maruku-0.7.3.ebuild
index 112d9e7f248a..44191c4aa2c9 100644
--- a/dev-ruby/maruku/maruku-0.7.3.ebuild
+++ b/dev-ruby/maruku/maruku-0.7.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/mocha/Manifest b/dev-ruby/mocha/Manifest
index 4ce8ce5b0cbc..3ce1553be7b1 100644
--- a/dev-ruby/mocha/Manifest
+++ b/dev-ruby/mocha/Manifest
@@ -6,6 +6,6 @@ DIST mocha-1.5.0.gem 93184 BLAKE2B fe29eab462db2283449587324fa7c607c84bdc6cf8106
 EBUILD mocha-0.10.5-r2.ebuild 1189 BLAKE2B e2f7ad7e9a1427076462906dd1a56dbca10d2de77aa5092a2249301319ed29b6fac9f563f5549dcdbafb82d1d062c1d25a9f25813f8006a24f75639551cea219 SHA512 6e2e346028954787b176dc3de5188c852cfa0231bc442b902059d014780011b52bf7d079b63e826d3da76efc87669b2cc74df9a983ad45417f153bbaa7e67bf3
 EBUILD mocha-0.14.0.ebuild 891 BLAKE2B b985c2344c88447f1ea966e5ba5d979acfb23bf754565476709b8ae2c46400d3f7beb86f6feaf05d8ce21d3e5577702bdc86c6ea762b5799e461f3822f0217c5 SHA512 d6020b9bd76a59d65d517a5abb52bf1502f05528255905c4d7ab29c544399f03efbc0365ac2ffb9b2801be579892f3e434242738487cf1d1c7cfcf5f861ad8d9
 EBUILD mocha-1.1.0.ebuild 853 BLAKE2B 1e239f2abd34221cee9af37f775c07ed22285c3db09695e6a175a86bbbec786046e80efdaa490959144ca5e5853ffd40faae3e1743991de9df1636da153314f5 SHA512 a1f48fa4bb83754b1d6af4e5d50ed63c404c6b1e788a4d83ec2c190813b72916d73de541ad97cedf14073444aeb4bdf4174411be1fa6aa66eaf28b124b9a67ab
-EBUILD mocha-1.4.0.ebuild 868 BLAKE2B a3f08dcec677979fc2fc3daeaa93e15ccf712b6d9e72959ce5f6f5fec7bbb0ff3fa40fcdca9214f9b8df64c8cce6e3bb14cd9eb0a9fbe9ba9ec6232288c498d5 SHA512 2140cabf3e252fbdf6a15817130c5876ab4bab69a79097af5de290ff36d9381616e3e995a9e21867c36d95d2afce788f3e417d20370655fddb29fe1a2057cdc8
+EBUILD mocha-1.4.0.ebuild 866 BLAKE2B eb46df8dda01df0b35e7ba9afef7ffeb671f1e63b09c9466ef455e0fce8e98914af4e2328033fceb3b03e7c82f54d28b14b3d3badcf2354564caf326ba8ba3ed SHA512 f964bf399abfcec5928a618e7a0517a9700d7ee281cc77979f61a36643f63bf561129dcd1a1dd812c7cef38aa9939e2ee1bff3f7a13e3e9322c6b67176637b98
 EBUILD mocha-1.5.0.ebuild 868 BLAKE2B a3f08dcec677979fc2fc3daeaa93e15ccf712b6d9e72959ce5f6f5fec7bbb0ff3fa40fcdca9214f9b8df64c8cce6e3bb14cd9eb0a9fbe9ba9ec6232288c498d5 SHA512 2140cabf3e252fbdf6a15817130c5876ab4bab69a79097af5de290ff36d9381616e3e995a9e21867c36d95d2afce788f3e417d20370655fddb29fe1a2057cdc8
 MISC metadata.xml 251 BLAKE2B e8bf2b70161d425791d65052583fd8be03b19ef3bb2a2cde34605bc93224fea9d8c6a91f0f2d630a00094ef54c0871e210da0e0134f52401bc80cb6b2358c13d SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea
diff --git a/dev-ruby/mocha/mocha-1.4.0.ebuild b/dev-ruby/mocha/mocha-1.4.0.ebuild
index b70f4f07791b..34d978e3fd34 100644
--- a/dev-ruby/mocha/mocha-1.4.0.ebuild
+++ b/dev-ruby/mocha/mocha-1.4.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="http://gofreerange.com/mocha/docs/"
 
 LICENSE="MIT"
 SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 ruby_add_bdepend "
diff --git a/dev-ruby/net-http-digest_auth/Manifest b/dev-ruby/net-http-digest_auth/Manifest
index 92998107112e..51092938ff4c 100644
--- a/dev-ruby/net-http-digest_auth/Manifest
+++ b/dev-ruby/net-http-digest_auth/Manifest
@@ -1,5 +1,5 @@
 DIST net-http-digest_auth-1.4.1.gem 13824 BLAKE2B 537688c7d83408052d3d5d16d625a51434dbdc452cf36ec5738917b862eab305a85d3f3933d79d878356a76ae698d6eded24249b70e507b2d7131d71b5dcc482 SHA512 db62d49815a96cabde5836b00a1df58d6277f9efafae78e27296b1e2f4410ea613aed2181f8e39f08af5bbf6f5f758d682e1250d0afd4fe8243fb0d5c7fe78b7
 DIST net-http-digest_auth-1.4.gem 13312 BLAKE2B a78d626cc25243d0a1f760aa2ded0071e15ed0ff763f24e9584e31db8087ac24096468de14abc0d10330c6cdfd5d32a99df0a6c5bfb72a0295e6d178b2b91700 SHA512 a743b278bba44541835f28ed86f94a907f7b48e8f314f0cbe6e14888a1d723c0d60cd4bbde5ac02cd263d91a5803021d9fa073d55077ac2b4c2767ebb65624cd
 EBUILD net-http-digest_auth-1.4-r2.ebuild 607 BLAKE2B 6ea53d5e2518e390cd3acdbfe8e0379f94f52498c04a948abe5663bd2e2f24df3f6114f32f05b19a7ed26afbca221b3ede4672be02d41a596346410a8bfbcdbe SHA512 c7c580d783a7e07c47280bc61f5422f07afa745d41a7472fb1ab5458da41618d1ca0589159c6604bd95e81f6ef4130405267934926d7a33a37aabb154f0dbc4b
-EBUILD net-http-digest_auth-1.4.1.ebuild 609 BLAKE2B d61a6521657d1b681a9b8811da3e1f51afa2f4d87d4bc9c211cd1d7048b38d30bb3ccced96de4e035378cd3eb09d74d79cc88ef143c9809be30cc84507755a06 SHA512 a1fcf68649da59f264e571d16590c74511f5d3a421860725b48d07c65fbebe8eaa2d37ce47f60be7fc37b3265ddb099d0672b328dc4a3e5a27ac412d6c393866
+EBUILD net-http-digest_auth-1.4.1.ebuild 608 BLAKE2B e8fbbe1fb2c582271ec0f80c23d7c4729ec44f8febc6c3242d94fe5920d3ae1cf4908b790983d0af17deb9455a6cb44f411aaaadbd6bf29641a789e244c6bfdf SHA512 6a6eaa74fdecddd9e4da115bf0508416cab553bed2e8e4736013056555e33d90601be3432b8244253ecaa1486c2e7907f73b1895e574fad59f87ba5fb17dc760
 MISC metadata.xml 354 BLAKE2B 912fe468f23b89ed8692e3978fd9de52071db9870ca8dce72c595bc2058bbbc36fd5913c07c54c816d8633e6ac013d02f73b67f8d29e38dd6265fd1ec537ef88 SHA512 d7ddea8f222b8d515bc33b627acb53d18c54ecd8a1fdf44e5d1c51f0ef633d63e607cd9dccf36cdd94fda819a27785235b43152ddfb94fff615c884013a3f53b
diff --git a/dev-ruby/net-http-digest_auth/net-http-digest_auth-1.4.1.ebuild b/dev-ruby/net-http-digest_auth/net-http-digest_auth-1.4.1.ebuild
index ce598cd4ddfb..08d276fbcdf4 100644
--- a/dev-ruby/net-http-digest_auth/net-http-digest_auth-1.4.1.ebuild
+++ b/dev-ruby/net-http-digest_auth/net-http-digest_auth-1.4.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/drbrain/net-http-digest_auth"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? ( dev-ruby/hoe dev-ruby/minitest )"
diff --git a/dev-ruby/nokogiri-diff/Manifest b/dev-ruby/nokogiri-diff/Manifest
index 9489a356a476..c377c70cc6c1 100644
--- a/dev-ruby/nokogiri-diff/Manifest
+++ b/dev-ruby/nokogiri-diff/Manifest
@@ -1,3 +1,3 @@
 DIST nokogiri-diff-0.2.0.gem 8704 BLAKE2B e1df47db2e6e7fcd29eb229245cb9a9a7b31fded319a6fe28d04722f457f0ea7bc19e13ee49b2233f3c072eedf3c83c7e38cd8b19d5ecbc4937f709a9f4cf3a7 SHA512 9b2b6f266c9c7d01153c345567086b4cd1092a5984e6867ea81d15e00467936f296fd5e2c3ab7dc18e44d1dd2af022d250234fb4311a9be80fd3ca32b3d201ca
-EBUILD nokogiri-diff-0.2.0-r2.ebuild 665 BLAKE2B a1886c54e5c3cb06612d144e7ace68c53864ccddccff75fdfc1c1dad0109646751438b8bb03ab98919f9411edd68283749ed3c98651e9591bb676ddcb8c5225a SHA512 25df16c638cc1e6375ed81c3f555faa55ce783629e07d63d8bafb7ada078814ead7370dca277c1ef5f69ed06bfbb9a8f6fc61bd5b0bfc665e904ac7a6fdb81b6
+EBUILD nokogiri-diff-0.2.0-r2.ebuild 658 BLAKE2B 7e638100f4c2848c2587fa6bfc022fbacd454c8659cbf36496120430efe4ea8e47d5aa09a374e92077d4e72264f0bc20d5ac9d5b6e0d18b6ad3513c857322604 SHA512 7a4de1a912611344813c12bd707adf03d600c7fca9e3091890a9e78f8f6a0013d42ecc95b1d366e7095f9b579eedca7c96270603a815aa92f8199819eb371071
 MISC metadata.xml 350 BLAKE2B 9c24289e33dec214608deb733950e5eb9e5c382fb2333b63d3553f93e0cebc0028f3427fc07f39086e2cbbcdd2dbfeb704a0f01c75d19b57d922e9931ed012e2 SHA512 191219269e4b972ea2f1be612b29580cff0bd2a19a45bda36444194027ee365036b09b825c1c522f57d93a998ad8b6b268c3a7ba1c57d74c0087f4feda466d56
diff --git a/dev-ruby/nokogiri-diff/nokogiri-diff-0.2.0-r2.ebuild b/dev-ruby/nokogiri-diff/nokogiri-diff-0.2.0-r2.ebuild
index ee3cf89cd0f8..c5ac79357dab 100644
--- a/dev-ruby/nokogiri-diff/nokogiri-diff-0.2.0-r2.ebuild
+++ b/dev-ruby/nokogiri-diff/nokogiri-diff-0.2.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 RUBY_FAKEGEM_RECIPE_DOC="yard"
diff --git a/dev-ruby/parallel/Manifest b/dev-ruby/parallel/Manifest
index 53f4bbf594d2..c75407b8a3b0 100644
--- a/dev-ruby/parallel/Manifest
+++ b/dev-ruby/parallel/Manifest
@@ -1,3 +1,3 @@
 DIST parallel-1.12.1.tar.gz 20499 BLAKE2B f0fa25b9fe65e44804854f703dd2d80e53572e64c2072c418d0462922bd04f89cff0e023caf4293d8a1504ad66a2a29ebbdd01920fc6fe400837859da0f0eb78 SHA512 f0ab332dfa60bb3190bba8275dbdf7b54d3de205ab76099d11f0a64e1fc28e1ba7e72d1a242bd615015c2d09a3f08df01c382869fd6990b854b01fe182245857
-EBUILD parallel-1.12.1.ebuild 1704 BLAKE2B 8b686ca1ce60df0b706f20e425b27693b8c1b93b0065bcbc4eb580e0527f35d9b6a9ce981d4ecf3a8a9f1c23e1200b5758ee9a817f66529780b8cc7b15615677 SHA512 c8496b23a1c7a6945d82eaf9e85cec0f36bf95c8e9d4b7f1178dae58f24e9d8046288b11cc9182fb8331a0caaa5fa812dfd91be5c907dbf3d4af507bcf168e01
+EBUILD parallel-1.12.1.ebuild 1704 BLAKE2B aa611882ab0f456cb396e5fb9ed4f343dd305d0ac863931fff605a095ac4d906b9dce2e82abdad675809bfb2b3247e0b217dfbe7aa7491d0ce091805d19e6da5 SHA512 e83fdf5fcf0f5fdf80d3e8e8aace77935171e17ab0a315d8eab5c0e2c383cc0ed026d528450f93529862c38968aa19218239441f9a4e990336ed647c53d5c865
 MISC metadata.xml 342 BLAKE2B 0860273d70423cb92207369335e1f684ea623e1217d7aaf4d016d9aff9c02b0b8dc9af3654b523f77cbd8d92f7043887a97ff87abb79d3c65b66b0e6b40082fb SHA512 805eaecfea071b1d632ade7da42ed63717d2f829c4c99e29a4600b26a81e87c4032d7ee441b865d86f37faa13f455c9f2888dc8099178cf6211ae13d3e3e1835
diff --git a/dev-ruby/parallel/parallel-1.12.1.ebuild b/dev-ruby/parallel/parallel-1.12.1.ebuild
index db82a8f90f7a..05fc01153dbe 100644
--- a/dev-ruby/parallel/parallel-1.12.1.ebuild
+++ b/dev-ruby/parallel/parallel-1.12.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
@@ -25,7 +25,7 @@ IUSE="test"
 DEPEND+="test? ( sys-process/lsof )"
 
 ruby_add_bdepend "
-	test? ( dev-ruby/ruby-progressbar dev-ruby/activerecord:4.2 dev-ruby/sqlite3 )"
+	test? ( dev-ruby/ruby-progressbar dev-ruby/activerecord:5.2 dev-ruby/sqlite3 )"
 
 each_ruby_prepare() {
 	# Make sure the correct ruby is used for testing
@@ -34,7 +34,7 @@ each_ruby_prepare() {
 
 all_ruby_prepare() {
 	sed -i -e '/bundler/ s:^:#:' \
-		-e '1i require "tempfile"; gem "activerecord", "~>4.2.0"' spec/cases/helper.rb || die
+		-e '1i require "tempfile"; gem "activerecord", "~>5.2.0"' spec/cases/helper.rb || die
 	sed -i -e '3irequire "timeout"' spec/spec_helper.rb || die
 
 	# Avoid a failing spec regarding to pipes. The spec seems like it
diff --git a/dev-ruby/public_suffix/Manifest b/dev-ruby/public_suffix/Manifest
index b8aa0bd4b987..b42cb773345a 100644
--- a/dev-ruby/public_suffix/Manifest
+++ b/dev-ruby/public_suffix/Manifest
@@ -1,5 +1,5 @@
 DIST public_suffix-2.0.5.gem 89600 BLAKE2B c561b32a26c4b605821eff66ae2afef17988c45d954a15b04a7174b202851e6dd0012df32981146a0cbaadfd0358b1f67be359b5526a65de2a3b0f7061ee7beb SHA512 d261dec44c11803631e267f36d82a59278d90dceb2811233ca511e895c5f1a58005b6afea980bd1bbd78bbfc7a3a4e02f9f1fbe351fded38be340ecc235da383
 DIST public_suffix-3.0.2.gem 95744 BLAKE2B 5c06af572214760f7d2a176e1b6603ea9bf0f45c91633cdead841ef8289b7c9ae7ae5b0400d5248d3df4c3bc81d9bb357de622fb85a9c3a67f4973872bdee94a SHA512 eafab08d0114212798390b4b5e9472fab98c91b38ea836c76254673e48bd068afeeb5ec4a2685bdb030ea78e4e5ea0be10dc3b742ed30352e11ec7a7cc1e7bc2
 EBUILD public_suffix-2.0.5.ebuild 793 BLAKE2B 63883d1db9db91b8e76c756889813a48eda032776895d67ccfe07eb7077f61a0bb1f3916d6ce0425b246ceb8a04068adc03be92689a4a0b68de9fd5920198746 SHA512 47f42be38e0d4ebb1c84ae66230f70bec51ad872e664d9acfb1ba62f13008513fe438f47ce8be13464e7308c2466bb10eba85e10c0ef300b433e1080106f8b2e
-EBUILD public_suffix-3.0.2.ebuild 836 BLAKE2B 871f779ad3806f2a50516998e8dc229265d7ab9452d03588cf78f8b0495b552c20d44f6f9279c37d3d553f6abdf6219dcf089ac5c348d0801748f55788e7bd49 SHA512 af2a6a67a44a83f1cc65833c61061295ffa38af203648011e956bd76fc1bd7efbfa560b33b8e11fc16b1dd2b1fc9109e709cddc73707915a44d423c6ef0ef8ec
+EBUILD public_suffix-3.0.2.ebuild 835 BLAKE2B 23533a5bc706261a3c48a4c0d2a1e49c6d6bdc5cd026559af679f9974f9e7b2289ca003883514066e2472b318f50faddc6ac65fcf9e14b7965738c35d2417a9c SHA512 c4cd86f5bbde381e8f2c59ab3a54321f52fc2172388d8e57cdde8091e4c083512f3adb88b88c88d6baf509209f517eafa1b0d96f6dea261000b7605932aa3486
 MISC metadata.xml 340 BLAKE2B e5ff0b06a3e6205a270389a1aaec9cb8902fad8e9b815e650b9be53276545b401565d8f7b1167ac415766a809fa2358289811196001e840d9d8641bbe2ff281a SHA512 e5091bcfca152fb1301ce5969cb5ce1e65db3452926c5b75db5afb284e28f44655495663fcce3ba5718b9817d1e3f6db491fe8da96732181926ccd58b36d7f20
diff --git a/dev-ruby/public_suffix/public_suffix-3.0.2.ebuild b/dev-ruby/public_suffix/public_suffix-3.0.2.ebuild
index 6d100fd96684..dc427cd7b9d8 100644
--- a/dev-ruby/public_suffix/public_suffix-3.0.2.ebuild
+++ b/dev-ruby/public_suffix/public_suffix-3.0.2.ebuild
@@ -15,7 +15,7 @@ inherit ruby-fakegem
 DESCRIPTION="Parse and decompose a domain name into top level domain, domain and subdomains"
 HOMEPAGE="https://simonecarletti.com/code/publicsuffix-ruby/"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 LICENSE="MIT"
 SLOT="3"
 IUSE=""
diff --git a/dev-ruby/rspec-json_expectations/Manifest b/dev-ruby/rspec-json_expectations/Manifest
index b6cd375f107c..17297e84a5b1 100644
--- a/dev-ruby/rspec-json_expectations/Manifest
+++ b/dev-ruby/rspec-json_expectations/Manifest
@@ -1,3 +1,3 @@
 DIST rspec-json_expectations-2.1.0.gem 14848 BLAKE2B 2c359351ba457297f7d561059183a8e32fa5762dbdc97c8ddb2432acb00c092fcc14a45e8f7625812420b926c4f177afdf4ff124f9b35d15b60fb58861c1f46a SHA512 1b09b959d6ecbc76c13b37fbf89cba381feb00505ce3a5701ad87ef1ed2ee178ea760508af809ac7dc8285c24d86dd7e33a7fb903a7f74472ca59d59f8df0daf
-EBUILD rspec-json_expectations-2.1.0.ebuild 687 BLAKE2B 8370046680248c23e053537174bdf41972e962107c6665048b5a049e20b446f4841f113480fa615b54cc1027c022232fe804595f6065fc7dcc653a25139b644f SHA512 40fc3eca561b4ba36c18bed8203a34e2360be02459c46035785a251ccc1ab288941002a5972df012ae703e9aaf2f20124d28b4212af0a63a1d07940605df9d8d
+EBUILD rspec-json_expectations-2.1.0.ebuild 687 BLAKE2B 7e61ceb76148fedfe598952ec6eb92672e4cf345c5213f154dcbbdf1193d29bb02e875ceea8deb4cbf5c2cfc2f70a049f368d5b5aef3a7b7c5984eb5103c80c2 SHA512 6889754bfbf1c52657782e7f17cceef88f55e677b6417c4a2c66c16a1cce685ef7e7754bd647e1197a19b34a44c0532735aea5a681469641b218f2d9d6234db7
 MISC metadata.xml 359 BLAKE2B 7c62397e3d1ccb0bc72c162d533f024c1ed8ef77af4ed2460350a05731db31b66fad74356d8d025c3a2e8f7206a2f18d506e1d6af3ffbbadca8ae973deaa291d SHA512 70d5b53c0b741113a09ae01b215e3e9397db63e484010a57c681a5cbd121589daf140eeaf691392cb046c1b3a001046c07c8caaf37de6855f5c437b479a02a6b
diff --git a/dev-ruby/rspec-json_expectations/rspec-json_expectations-2.1.0.ebuild b/dev-ruby/rspec-json_expectations/rspec-json_expectations-2.1.0.ebuild
index 67a63c05b9b8..e7d2d403f5b2 100644
--- a/dev-ruby/rspec-json_expectations/rspec-json_expectations-2.1.0.ebuild
+++ b/dev-ruby/rspec-json_expectations/rspec-json_expectations-2.1.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 
diff --git a/dev-ruby/ruby-termios/Manifest b/dev-ruby/ruby-termios/Manifest
index 4f21a42f4ddc..ec20e1887c85 100644
--- a/dev-ruby/ruby-termios/Manifest
+++ b/dev-ruby/ruby-termios/Manifest
@@ -1,5 +1,5 @@
 DIST ruby-termios-1.0.0.tar.gz 14738 BLAKE2B 61beda48d956a3fb9aa9aad118d1a28576b420e37528c5bf3d8516e0112fd0b648ec2987c8b47048feb50c694ecba6ad0ac27711ea1216b481dffa759b291eda SHA512 16d71a8cf84391da2dc8b138ff381751f5a72d61ce37d2215960d389285dee14862b50cf770d4648b298df093a85005df460ba951c5d7e6fb38e69d8d686599a
 DIST ruby-termios-1.0.2.gem 17408 BLAKE2B f85877dc3c9beb5c8d20e044ef7dfde6a12d540157228c1fdff365f3b662f8c84b9e7460ede985f0d402ec76a1d248fa41d336ac7bd9333222543c6d01748c83 SHA512 e32e899e917eb04e382a02484accf9fea0369de8c1942b445e48e71e9c836305e2d54221c9a044d27ede44a7d5c14f976a8ffda79f79f71b5a121474e759f45d
 EBUILD ruby-termios-1.0.0-r1.ebuild 975 BLAKE2B 1604516e23a132e11decbb53f1ab521b0ed3394dd35b64acb46bfe43efd95959313f7d62d03ad4aa9cee7183de3f3c657a1e117d6b792a7c93837dc4271cd0ab SHA512 bd78505df91239e8a0bf638652537daf075c388ad969dfba80dca5310b9c5d092ec7ac8d93570dcc86f6996661badcfd47405976637fa722b87c7a95fc229887
-EBUILD ruby-termios-1.0.2-r1.ebuild 730 BLAKE2B 120f391b859ac71d93a548627da2b177d5c8751af8a0e4b12ea32bdec6395144c093c721a10e97be34a90b2f44e9a8d445c0806d71355e5885679dd31d2b1a2f SHA512 a26b61b5d4a53df538f598cd7f922c8adb654dd713950fa2cff8b32d5f136685125a63f67f5f23f5ef77ef2fe3eb6f697e449fd6b20895f6ccffd15aa547d295
+EBUILD ruby-termios-1.0.2-r1.ebuild 729 BLAKE2B ab5ba2579674fd6212163a76e7314f3e58fb9c125c7461e7725c1a82d3b0011bc4a484fd46378d215b49baa23a67512e76c166eac57a8a6d8c3fd90bc5004b68 SHA512 014c18df60c33e7439191bfb4dffc007e50dd1665bcb6791860d9ba7107bdaf158e7632537c382d84457fd4f0246c5735805db8b9da29fc8e69aaa41a126913a
 MISC metadata.xml 344 BLAKE2B bea737f016d7562c237c3cd1da976866362b52c33fed4f356becc724318f0d73129d6d67cb1202658495cd3ca337625f218cf3739dcdb19fab7fbf7df87df8bc SHA512 3c6d07c1fb48f63b2e3b11eaa84b24b6f57e1b7ad4146327950c294e0d49521a7dce7cb63c99bd0641c7b330d64b6c85d91ba6feb150282f35902fce8602806c
diff --git a/dev-ruby/ruby-termios/ruby-termios-1.0.2-r1.ebuild b/dev-ruby/ruby-termios/ruby-termios-1.0.2-r1.ebuild
index f57424c99900..281202b989eb 100644
--- a/dev-ruby/ruby-termios/ruby-termios-1.0.2-r1.ebuild
+++ b/dev-ruby/ruby-termios/ruby-termios-1.0.2-r1.ebuild
@@ -19,7 +19,7 @@ DESCRIPTION="A Ruby interface to termios"
 HOMEPAGE="http://arika.org/ruby/termios"
 LICENSE="Ruby"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~mips ~ppc ~x86 ~x86-macos"
+KEYWORDS="amd64 ~hppa ~mips ~ppc ~x86 ~x86-macos"
 IUSE=""
 
 each_ruby_configure() {
diff --git a/dev-ruby/rubypants/Manifest b/dev-ruby/rubypants/Manifest
index 14f7f6f8033c..7b8cfb3b6ca4 100644
--- a/dev-ruby/rubypants/Manifest
+++ b/dev-ruby/rubypants/Manifest
@@ -1,5 +1,5 @@
 DIST rubypants-0.2.0.gem 11264 BLAKE2B cb5e995a6739ea27c94173fc1fb5c525098d71a17a92d09c924cce6803b156a78097def230c9e935bb17d8dac35e86ccfcbbea0e94349804eec170b3646ae8e7 SHA512 f7efe237860e15b2ce164749973d5ef133dce1a6bc5e9429357703b321fb0af8ef4e849f8ed19ed498b6fff13e29da036bb8d379c1220d939c862aba0138a5d6
 DIST rubypants-0.7.0.gem 13824 BLAKE2B c132b3c60390b712c08ec54b10a14255e21d9622399b9ddba8d2359915411c604052569e5713fdb4b1a3fefcc3416f4d5af16baca19063a0b79203838b8f3066 SHA512 cacd05e0cc87389b5513c83fe085db39202c2789b882b564caaded6b84b1ecb1acbde8232462dadf501c68c1c881ee7b7f4e640feec47c9c0f7a08758b5f5724
 EBUILD rubypants-0.2.0-r5.ebuild 827 BLAKE2B 25ce25c6074acdb86a673517ffaa7f4a6f37d2cd7a11698b75b067d8f8fc6f8689397a1fe1ce417ba1ab0d4b7d238279b7fb15d21085196aaf1710e127b9e9ab SHA512 5096c7df18d37d5c95a2c67ea9e3ba676567925e539fae047cee752c2aa5ecd767b4d856756881c0535985f8bc613a5097f9b2b37483a45c04a22d816b033d96
-EBUILD rubypants-0.7.0.ebuild 598 BLAKE2B fc2fde176947749ccdfc47c73ad19755490f791831964b92d14eecc27c31739deacdb47a70343062f80aa6664d34c5501261a55c4f23c57681e30b5e49f998c6 SHA512 7a0e6f7ed831623b871450725c6573b9860b85e69b3759e72a85840b8a26e05ebacbaeea84e2ad57a260070b33e0165dee0eb5fe80dd6cba823e899d4dbe72ca
+EBUILD rubypants-0.7.0.ebuild 597 BLAKE2B c46a1f9111ed3eec58ac9692b9d93741ce7192e24a3a041e946d776d6fadc887dca7f1266f6de12ea755fbd212a6acc9af58ed034021516493b56ad8ef53ff9e SHA512 631d00a0d3cdc1ad447c69d1509eac50e772c41ab08d5c3d38d5df580b6c0da017d9947d5bed52674769748bbb310192dfe2859d0b32f210001cbe9dee62551e
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/rubypants/rubypants-0.7.0.ebuild b/dev-ruby/rubypants/rubypants-0.7.0.ebuild
index f9412779f74f..ccd713e6eb2c 100644
--- a/dev-ruby/rubypants/rubypants-0.7.0.ebuild
+++ b/dev-ruby/rubypants/rubypants-0.7.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="http://chneukirchen.org/repos/rubypants/README"
 
 LICENSE="Ruby"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/slim/Manifest b/dev-ruby/slim/Manifest
index 782fbef0c9a7..209b36d12499 100644
--- a/dev-ruby/slim/Manifest
+++ b/dev-ruby/slim/Manifest
@@ -3,5 +3,5 @@ DIST slim-3.0.8.gem 99328 BLAKE2B a63191186223e32f36cc19b9513b22b2312c9d848aa390
 DIST slim-3.0.9.gem 99840 BLAKE2B e449585fe5642c1980b4d8fb0c93979d8c16020c331f1bc2993c6f7b5bb3e55c1b85595711bf3acdc369c6a3fbfdc6873a8208c59aedaa49dead1cd9166347d4 SHA512 220dbcde230aab05e294022924346fbb02a1bf813a7c97910c2f60d7b3a7dd498d04f6f4f2883b895d2a3e6e9f526331914e3ab4560e748de2bd991358cca90d
 EBUILD slim-3.0.7-r1.ebuild 1689 BLAKE2B 0e89951b909fb7db81b261d78e88798f4f3f7e493ef80973bbc9a55db9fb4813a14a8555cfc2a438467648e1777cd8acd59340682164d1a3f1f9ed6e967cbb6a SHA512 35305de1f03ebc7b1eaefae992bbb73d41e6f3938bfe670a045c810b71e92a6c741fdfdc35b9e67288543701ac0b10bcc48d0b6317ac0752dfbfe69d160538c9
 EBUILD slim-3.0.8.ebuild 1594 BLAKE2B 2a7b23003db0cd991730ca467c371ca9afc951c5c797333fd537d83b67156b84f1cc51af715e8c669e974f2d913a91ae889c2063ab9c75c1ea5da2e59a1addfd SHA512 6f8166253b01ab0a4ef73f3601195bfa492441a33e52ab0ad4c09bfb75bf2bcbea7a1513573a1f875de5889cf05b3487e0d33a60a6d0a76ddeb8d8ddf6a69448
-EBUILD slim-3.0.9.ebuild 1587 BLAKE2B 6d0a67dbdab09f4c5314b97b88a9791d0f0fdb8483c95fd716cbb2e91cc8c6cddbc58b0f07e17b5229b3f7927bc250c741da7f22c1b74d354e4925eb408a0995 SHA512 430774367168fa8987ff98ab013b6419076eb9b8f9eb85221fdfe22be23f0b24754d09932f80b464c69bea557fa59292d0d31c3f450e53cc80fe095b5b0943f7
+EBUILD slim-3.0.9.ebuild 1587 BLAKE2B f8c027c77dee7090bf65b2bbc8d5df4f0a22ca4ce7e567033d774288b0b92570d82cd783e033064c58b7b86da0b53944cd8a3748010164b806a7f2a22dbd39bc SHA512 8cc683062ffbeca3ef89c5a545b4d34653a7000ccb8f01e89a53a285e5e96a37eeac1d4ac55a6da5d695103604ae0df9c41f13830e0f25dbb267e39b1d52bbdb
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/slim/slim-3.0.9.ebuild b/dev-ruby/slim/slim-3.0.9.ebuild
index 2668609f6825..b7d9add59740 100644
--- a/dev-ruby/slim/slim-3.0.9.ebuild
+++ b/dev-ruby/slim/slim-3.0.9.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
 
diff --git a/dev-ruby/websocket/Manifest b/dev-ruby/websocket/Manifest
index ae54a330ed6b..8d507ed8d0bf 100644
--- a/dev-ruby/websocket/Manifest
+++ b/dev-ruby/websocket/Manifest
@@ -1,5 +1,7 @@
 DIST websocket-1.2.4.gem 27648 BLAKE2B b90391dfb836cd700f76da83ec85c8a3d9bfac008fbe798f2a78de7c72ae8390b4b193bd2a7302b636f9f84786fc073befc813111af7db819440ee86eb0dc3ab SHA512 dd3a67adadaf45850d666dbb6a152aaeba581e751fe4bfa32a286946b71b7129e0f18d56ab458a489f0665347483c18d73c2fb232de7204ab3434a2574c685c9
 DIST websocket-1.2.5.gem 27648 BLAKE2B baeae7755ae9efb2e6b07196925501c67d3d0a41c1ee882a2a1309a9685830b5a5327a20d8716b27ff2c0d5dee34bbb66e1fa70666b89e4a3423c14465fdc7b4 SHA512 0cf0c2a049416faa66241cfeb40ff8771c6cc12f2653139b0dd8541450e4b705e747e025ec1aab0e3ff57e777b31ff99a2bec1f3a11a2afbfa69ad48d45b77e3
+DIST websocket-1.2.7.gem 28160 BLAKE2B 11890ed86379a1d19dca142794ff2161c02566d46a00c77d534c708cd689662801cd3ee9ebae39c6622783873bfe00985c7ed303e0ed886d837f4f322ee5c3c3 SHA512 3200ee562a59e9ce064189cafabea8c8fe8bfd87ded452f1fd9b2498cb1a2108ccd685107b8848efa21f7bc9934942e366dce2ccb3783e974570682374553dbf
 EBUILD websocket-1.2.4.ebuild 461 BLAKE2B 50902cb782b1ef7039ff618bf713f582b8b8f203f3a1ccb811192d8881d6873a6cd1ce138bcb419b5ed51c8805b82acab15283d4e160d544deeec8ae8532405b SHA512 afa34443d2fd7a078e24621122e7400831a1ec900ef468c8343e9e9d185f2c1a860df75a336d34d3b5d1e79b99fe34407a974ccafa72c23c5c1eb26372cc044d
 EBUILD websocket-1.2.5.ebuild 454 BLAKE2B f02f418e480eb75018bb0c86dcde0f65ae258395532cd9eef4256e8f87f1fd0ac4d0bdd54873d61eadb37634fdbcc414c4e4cd8c1c1b1ccd12d6f8f68ac95413 SHA512 13e72ac96273dcef1d0545bb330956dc510c936f133b8ae03d4fe57558d14cfd84eb99491bc883fa93e4d879d95b00907d06c90d8a83f75d2aa8d623fcac9859
+EBUILD websocket-1.2.7.ebuild 454 BLAKE2B 3b0ac47d0c8e097f9036dcf130dbfd80a9ca4067f27e03a54ed4f159ee620ac034ee66f03c1366410c83a1cab271d09d8ce961591c29862a79c91620a03aeb02 SHA512 a7281d32b6c0d78e7feb1e841c143c72564b745f72b1bfb79404e7266cc83ffc3f270ef13a78161c56bbf045e41acc0926f9a530c3bfca34858b2b6ac1deb1c5
 MISC metadata.xml 347 BLAKE2B 8592ff0cdeffa4dbd1206e33f7d4ef8f79effbebd99936a8498f898da908254f10656505e61d6495cece6a91633ef10ca055ff4a6d118c1ce1ec8b8b258352f5 SHA512 2fa469898a71bb5a922605eee46ee6f9a1460492d7098c2ad4f656bd89ab9ab3d4fd9314c0b65f283a2eddd670b40adb54b3be0a2669b5e347a19283a678f1d3
diff --git a/dev-ruby/websocket/websocket-1.2.7.ebuild b/dev-ruby/websocket/websocket-1.2.7.ebuild
new file mode 100644
index 000000000000..e29d617a82e7
--- /dev/null
+++ b/dev-ruby/websocket/websocket-1.2.7.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Universal Ruby library to handle WebSocket protocol"
+HOMEPAGE="https://github.com/imanel/websocket-ruby"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/rspec-its )"
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 3fafa54c60e6..c299ced2c327 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/aruba/Manifest b/dev-util/aruba/Manifest
index 930dcf13155d..0d7196858d11 100644
--- a/dev-util/aruba/Manifest
+++ b/dev-util/aruba/Manifest
@@ -3,5 +3,6 @@ DIST aruba-0.6.2.gem 75776 BLAKE2B 569af009cc20b644878fda25b5e7f79bd2f7c6f5fa9ef
 DIST aruba-0.8.1.gem 121344 BLAKE2B 0b601a4d4bcd19159bb23b22b7975d1275ed2ab9c06e9ab550e11a151e953eba9ec4cc05280e69685a54b82996b4863b485a74f91d64270cc058f43272f6df6d SHA512 9d65778828ac1915c56862acb1db0faf6214b102eb892317b390f451aab55750067519fb6cf6e08c55f58b865eaaa78921402d745addf2d3b0038527eb5d898f
 EBUILD aruba-0.5.4-r1.ebuild 978 BLAKE2B 87b1c5200542713b1e1aff8c42146bdc3cfa5984f9d44a358444a24554b88388b84d60ecb4abdb63198e64af0c6d7f3c462c2e39c11a54152936cb9af039ffae SHA512 6064116cef51005229e016cba328b1b63c96e5279c52f09ca76a89c1a62bb0e2e134d5cdc10a484ea37d849ac34d98763bf0fbf9a1b8f82ae53bfec364e5b1cd
 EBUILD aruba-0.6.2-r1.ebuild 992 BLAKE2B 44400b3953d5f6b4ff34d1a8878249238c9b64c9142ade8b6ec182ac6cc2ad4192e2e48f7e515932e01d1a1acb771d2edba7c99e047b92f965c6b11afe4abfbf SHA512 cade3518b27a5935b40276c6adb7a8f339d0dcdd147e7b90857959c8b2889c82b28a450e81ef459483e15639a9d40736d289ee5031764cc576e90e217f105100
+EBUILD aruba-0.6.2-r2.ebuild 985 BLAKE2B 157b93d1d0e018a7c58f07a839d06d4386392cc36df235880009ffc409b5c0dd9d17c78486f7512f4febf33000a33e6f9ddc6edbc08bda152655cbeccdac6d15 SHA512 5cee45c56b5118a10e681828d9e72fb3c81f4f9e67abf300b5b62210b9a456a0a9ea5264b47ee110060c5db1aacea7a6464a20ac5f96f43b3f0eaa20b9aac618
 EBUILD aruba-0.8.1.ebuild 1666 BLAKE2B 9aff62c204cd99a32b631cd3765d07fbe7a9751bdf2460085ad08102145159be2a5b5923c85aecc69c54584a8519f4cb046ff7639ccf3f623a7bfeab9aa55608 SHA512 738cbf69940544392993e84fdfa1d5f34423818e34e7fc301ae4c2378d03a5641c6783e83b6f71951e667f050f6c24c84e6075b30959e463508733004db9bdb9
 MISC metadata.xml 296 BLAKE2B 5d13c2f0fdb1a3a5e8278e93124af9b7f8e069ccca8ac9327132e8aea862aaee163d778260bd0ba6cd0d6488372b04b4330cc2838447fe2d075ec5fdcb28cadc SHA512 6add4a1a905857c1d96e347089fa8f47643f990a153f6457c4d424978bcf76b89607c89f60d3e312365525b1d0dbd17db62b4baf48ee3da9a0f2ab77435d68b4
diff --git a/dev-util/aruba/aruba-0.6.2-r2.ebuild b/dev-util/aruba/aruba-0.6.2-r2.ebuild
new file mode 100644
index 000000000000..ad124494699c
--- /dev/null
+++ b/dev-util/aruba/aruba-0.6.2-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_RECIPE_TEST="cucumber"
+RUBY_FAKEGEM_EXTRADOC="History.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="aruba.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Cucumber steps for driving out command line applications"
+HOMEPAGE="https://github.com/cucumber/aruba"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+SLOT="0"
+IUSE=""
+
+DEPEND="${DEPEND} test? ( sys-devel/bc )"
+RDEPEND="${RDEPEND}"
+
+ruby_add_rdepend "
+	>=dev-ruby/childprocess-0.3.6
+	>=dev-ruby/rspec-expectations-2.7:2
+	>=dev-util/cucumber-1.1.1"
+
+ruby_add_bdepend "test? ( >=dev-ruby/rspec-2.11:2 >=dev-ruby/bcat-0.6.1 )"
+
+all_ruby_prepare() {
+	# Remove bundler-related code.
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+	rm Gemfile || die
+
+	# Remove references to git ls-files.
+	sed -i -e '/git ls-files/d' aruba.gemspec || die
+}
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 4e88ebbcdfa5..1bf9135f3802 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -4,6 +4,6 @@ AUX ccache-config-3 2147 BLAKE2B 6e703e12b6a2f83b838f8b1d1e534de3366b6e2994990b3
 DIST ccache-3.2.4.tar.xz 302548 BLAKE2B 7d642dc3f944183660e79cfdfd68948528aa3ea4ef8162a4d04837c85ccace35107e663ec81a15438dab133fca2e8bf100fecd483f33c9b0aa52c68989ae8122 SHA512 d048b70804c81dece97f3ba511b3c109ec0d14e7dca69bc68faeeb61a4a7b5639c03e3e5ad7dad4e42b4bd198d7a7fffa4e3b7ef99590dfd4df0805db6c25db7
 DIST ccache-3.3.4.tar.xz 314468 BLAKE2B 6e465598df428979a2c821a698afef25c05d09045cbb54ec54cc3b65b8ce6416b6eb46fae0cf5d60f766129cef11eb01410b522318c67416fdf47f6e8fceae66 SHA512 891bcf11b27fa20a250bc86d182663e46af450a3a807b6cab502f202cd57123ce93bcb1fe5e48866feecda76912a5f742efa5869df9117d81624ba185dd4e02c
 EBUILD ccache-3.2.4.ebuild 2068 BLAKE2B 8fb9e15fe1787760e878ac9c13f9c97e9e9e87e3046ec700266ccd3a1d44240e7a5cf0e24deaef38bad30f66d823488e8979ebe79a9668ff55c6a417ec048229 SHA512 965dcf43bd7999352de8aa6097e90418160cf4f51e4016113c05dc37d023518e22d001a2415ad7948c07e55ab57ae044021e7e4f044df127b81a12ad2bd37653
-EBUILD ccache-3.3.4-r1.ebuild 1909 BLAKE2B 6d4a21108cc21d62131f7a4461ee40c2b6898767470c330b25d1aadab7d3c4195dbd26fe0f5d085f239214d68f277285d960f0771cd46f3c29d1bc384832a948 SHA512 d0eda3a5b0b4ec4cea5a7288cc14eafe24e05e9bfe9b4f9df2674acef7657fb1ada1e80507617d48cfd1a0fbc54eb85e4ad2c3b173eb21519a65c621c5439dd0
+EBUILD ccache-3.3.4-r1.ebuild 1907 BLAKE2B eb985796e32759c421dc13c1eed2d42af1b487eaed3a7765ec67ca1c909d9244f5eb14d6d643ba4f357645336ffa69b2e0fef01a6d9c8f20a984b046e541ec4e SHA512 2ee7fa571a5daa9649ee24fb7027da366181d0ca38ff3e2bf61358b5b461742625c80554575a55634f12fcbf515d7745bbf638b9ae38405499eb81039d4d199e
 EBUILD ccache-3.3.4.ebuild 2083 BLAKE2B c9ab28add0fd4b71ce98d2e5d6ad8fe6383c9d097438925f37cb7a61e6668e6ef9f517fa73ab7e69fed483948408bf9f782281ecc439eb14641f30193ac86798 SHA512 3e48057216c5618b26cdf5361fea268caae0814d7ee7cc5abfd54be4adfb3cfca7da171acda1f17ab2794478ba4c9b2721403023cc04fd468239e7a3a737378f
 MISC metadata.xml 445 BLAKE2B 8ef8f120989420428ea85108180c659c72a7553f3f20ab96597d26aa04b059f491aeae8c887697a214c437f2dba30fbb934cb47c1db93821eda7dd489e6cb693 SHA512 41ffcad23c9f0274c48a058090d6404cd782dea6674b81615a6b3b7fa272ff5df4c68404fb4dcdb9d2275c13fb137f21f0f65232d5fb1ef6152cc25213893249
diff --git a/dev-util/ccache/ccache-3.3.4-r1.ebuild b/dev-util/ccache/ccache-3.3.4-r1.ebuild
index 96656cba50c3..af319cc7c431 100644
--- a/dev-util/ccache/ccache-3.3.4-r1.ebuild
+++ b/dev-util/ccache/ccache-3.3.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.samba.org/ftp/ccache/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
 IUSE=""
 
 DEPEND="app-arch/xz-utils
diff --git a/dev-util/colm/Manifest b/dev-util/colm/Manifest
index d1af956a3580..97a23bdb2791 100644
--- a/dev-util/colm/Manifest
+++ b/dev-util/colm/Manifest
@@ -1,5 +1,7 @@
 DIST colm-0.13.0.4.tar.gz 707983 BLAKE2B a6b03f24ebe8bf44dbb17b6bd3f545a33b58883fae403d927cd30a81dd2376ae0fd4271c308008d64865697e63cb7cc988465c28b22e56c2136cbd533b32e999 SHA512 4684a315f3fef7cd6ff0982e357b59b110c02dfc2ce00a207d5d16dd9475f41790f3cfec9ddb5347d20da879cb0beebc03d3c56c325ce2ef22438555fcf60402
 DIST colm-0.13.0.5.tar.gz 736026 BLAKE2B 75fb1748495ead2ac5527ce040efb76de264e10b6562c4af734735f5aa25f53fc12260cbe52f019ff04c5117155aeb96358771f20b3e02012639a08527a54d98 SHA512 c5a1228260327d65c2cb5821fbc583608e2a308927b04cb0e7dbc84bced60d0d62892b4e30aa2228fee0d08f6828dc58d88788340433bc5bba9d503977883fc9
+DIST colm-0.13.0.6.tar.gz 739981 BLAKE2B e5b00bc276fa3414cc9ec557a6e4ca93194f86cd6b3b1ad11611352962da1ef68aa1acd4aa62d47495ba04313dcc52e2a17588fefabf51572d19826c7bb70fe8 SHA512 5bcf2d7ff78e523385294f338a8c057807b416b2922e002311fcd8027132504f1aa99bc4dde2c4ea7ddbbc8806fddefda57f8a16f6d5c91a9c47566f86339c81
 EBUILD colm-0.13.0.4.ebuild 372 BLAKE2B 789e470189b8c31dce2145bd696f762569d5a8021090d3d09a0c300f63488e2de8412d1e250a16a9e37bafae61530d5ccc61a56e1998a5d485345f292d5bb3a5 SHA512 d1240148c5b89cdcff5750859b8bd920782f907f53d736f775def15c259e443d044900cd19d65445ff55ba6ab62a15b3a084a9a0734ddb1151a0f887a24a68b0
 EBUILD colm-0.13.0.5.ebuild 369 BLAKE2B d0ba7775c5790ee755ee02bea5116ecdeeb7384921bf3cf6efb961411f1b390e5aa5a35a862a9b32b281b8c9a41eeb02020c0f40f08bd66e34a5670c006e147d SHA512 8841033b07afc3493ffb138a0dfce6ff9db8eb9ba365c5936e342ca6a2857c70df06061b897d09fb6b17216edcc675110aef53b3e531d9174d4e99c186f00910
+EBUILD colm-0.13.0.6.ebuild 369 BLAKE2B 23312cc0f9f5bfc5ef8f6b2c2701b82be5c6f5d12b851e32d43f860543b2c3b90b54ae992254ecd9e0dff76eb2a3bf6ee04d2c090724b94a02bdf7a1db4369d5 SHA512 e73724fff948cbceb33155ef6737503fac5e21ccbb6a1b7cf7f6f61dd94e67d1403724829f12c7dbc0e62e84226bf3d27a5523425abc5a4b0e321a007e1856ec
 MISC metadata.xml 253 BLAKE2B 7dac7f77dcc8de31f439cc6d7770a503f95be9c2f8ae57df9e725df941e2b31a90a43664a485a5fad9510b9ae060ba7aaaddba29324338dd9eb07d88a63c7dce SHA512 303268e1f46e337e32c64b544c0962ecbe8de1799c42736b3c3515b6f31954a655830c402317bd0534cac12059e17eeb5f360d010432dff795a136662a5c10f1
diff --git a/dev-util/colm/colm-0.13.0.6.ebuild b/dev-util/colm/colm-0.13.0.6.ebuild
new file mode 100644
index 000000000000..fab1897a2181
--- /dev/null
+++ b/dev-util/colm/colm-0.13.0.6.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="COmputer Language Manipulation"
+HOMEPAGE="https://www.colm.net/open-source/colm/"
+SRC_URI="https://www.colm.net/files/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86"
+IUSE=""
+
+DEPEND="app-text/asciidoc"
diff --git a/dev-util/cucumber-wire/Manifest b/dev-util/cucumber-wire/Manifest
index e5882a02cf52..6fa74840ff40 100644
--- a/dev-util/cucumber-wire/Manifest
+++ b/dev-util/cucumber-wire/Manifest
@@ -1,3 +1,4 @@
 DIST cucumber-wire-0.0.1.gem 16384 BLAKE2B c35f478bbc8a8bccfbe1022d5b687a85c087bcadd5f494b807fa530d20b7e14f327ca2ab377c3f9abc28df60c7986576b59a246e5fb7537daadb016bb21420b7 SHA512 c6bae727814f6a2d1dfa8cfee9bc9e63e3bfa755f6bb070f907a24d52009dd29652ab21ea7719527a5423ddf4471208f91a388ec53555d7021abac7769b2109a
+EBUILD cucumber-wire-0.0.1-r1.ebuild 516 BLAKE2B aecf7b1742435703fb954a08a33f06ba9dc580cda3dd81a16b3535a360855b3f97a4f221de200d8b31c696bddcb1d0d9fa2a11fed60de09d8300633408c5722f SHA512 fc57e20e5776f624fba2521da9b5b484f07066f0cf7e6f2d95dd6b5a5ce082330908fa9f01fae613416f43d6a708d5a7efd61a6ab3ed6af6bb3eacbf1458aa45
 EBUILD cucumber-wire-0.0.1.ebuild 523 BLAKE2B 60a9fcbc7f151d12204327b1a13647d9e8b0e8816c7809cc89b674e29670e326ca05fc5adf104ab485966ee53abe89f87c3565253ccadbe2585a25c5b17b2169 SHA512 8776e1f33e135aea2b4af64948647a13bff2a861df8029a9b3419ff04a37cec0174b210f3bfb3477f6b3f885b054fd50f16c5232e66691163a6217e3cabf5708
 MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber-wire/cucumber-wire-0.0.1-r1.ebuild b/dev-util/cucumber-wire/cucumber-wire-0.0.1-r1.ebuild
new file mode 100644
index 000000000000..be85573610b5
--- /dev/null
+++ b/dev-util/cucumber-wire/cucumber-wire-0.0.1-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Executable feature scenarios"
+HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
+LICENSE="Ruby"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+SLOT="0"
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-util/cucumber )"
diff --git a/dev-util/cucumber/Manifest b/dev-util/cucumber/Manifest
index 4e0c69341345..11009dca9859 100644
--- a/dev-util/cucumber/Manifest
+++ b/dev-util/cucumber/Manifest
@@ -5,5 +5,5 @@ DIST cucumber-3.1.0.tar.gz 267954 BLAKE2B e309c20a63621859375549d85cd85a89ec3998
 EBUILD cucumber-1.3.20-r1.ebuild 2165 BLAKE2B 1030d687efe56f2e7dc3b8dc9f3869ab89d7ea3fd79dd33fc06a9495425f22d9b5979467c2875a41bcb4ec43d41db486ec2c0da752ae8a6e9e409f7cc177b76b SHA512 7d468eaee8facf0cf1e1a1272e12e55ba14a927a0611de734f9c4e328dab9b12b6211239b6112883d36769352f216d48e0e253548227b4b80723a8dd544b7831
 EBUILD cucumber-2.4.0-r1.ebuild 2473 BLAKE2B c2af659c58de223eacfee53adeeeaf69095aa1a84b062b5fd9f2de7797941d499e3a88cd79e99cc72e42a15d3e02fcd1e31e024114da8ade82f325d1be2992b9 SHA512 e7087af641078b13fe9bddcfadd09c03bb521a1d2473ce5a29931c923efd58d11292e4e0c97fb1365dd32be699ab6317b6cbbf69742e0377ea41dbf09f5f8321
 EBUILD cucumber-3.0.2.ebuild 2640 BLAKE2B 575206b7bbee67cb9a3e3d0ce269784fe08eb3698ea1ac18ec3a24ab86a65c856c55804f7ce134d4ff634b5f31f24d74b7cab6a59fc629cda81a15ce627f550a SHA512 66d405edd35ff7de97b9ed05994d602e0363d2d92c2370259336fc162a3d91c5aaec4e59e3efecd7be17d075e82c620f972c31aeb85a70d17f19df8566ab4784
-EBUILD cucumber-3.1.0.ebuild 2640 BLAKE2B a2a2e324bf54915821fe9bcc3e46976bb93774cf8e685b50fc9cb56513989cfe46912978a543211e3614cb547c7f038be79c77ab4a400f27d3373552e6cf3ecb SHA512 8ea1f237fb1838e3f36a224e2ea9b64e1c649eb711ce0c625bc2cb6d497afcbef53236302175773c799b38f401c5420b8cfb5c761a9d7ea682ca9b27560bf80b
+EBUILD cucumber-3.1.0.ebuild 2640 BLAKE2B 73ed0d1eef2e67fcac273f1c616af5666e5c06791b37690d01e59a79cea8bdc1536b7ba4eb29accba2d6966aa65dda500b8271f4f193b8b805fe2f2b0ce3ca6d SHA512 6317b921eb64ff878fadbb48dcccceae1fbbbd7867afa85839af7d3cf7031a210fbfbe1763530bdd00f3978722ef327d478b8fcf25bc9049c543693b9a206cd9
 MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber/cucumber-3.1.0.ebuild b/dev-util/cucumber/cucumber-3.1.0.ebuild
index 0afe87a4d6d2..23e5ff16e71a 100644
--- a/dev-util/cucumber/cucumber-3.1.0.ebuild
+++ b/dev-util/cucumber/cucumber-3.1.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 # Documentation task depends on sdoc which we currently don't have.
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-util/kdevelop-php/Manifest b/dev-util/kdevelop-php/Manifest
index 6edf200d1254..bdfff365cb20 100644
--- a/dev-util/kdevelop-php/Manifest
+++ b/dev-util/kdevelop-php/Manifest
@@ -1,3 +1,5 @@
 DIST kdev-php-5.2.1.tar.xz 683244 BLAKE2B b0418049ac8eeda1a57c7e5a863c91feda3f84638a69d018f4d5141815ebe2f34b94fcc166632c6146c4110015e8c42069ce3c129fb8c346a36f123ae682babf SHA512 4f2a0f08ff8f341d5b65c28d7392e794a20182d5f898a6723c6a9cd34bf1ce81ed2f8e505cad5a920a6d2a2c50210b0836b7718a892b61a27e8cf6c4d7f30f52
+DIST kdev-php-5.2.3.tar.xz 685364 BLAKE2B 02a00a5565bbb21a00a75231168f27a78cc3c7411430fc46e1c9b796fd378417e65369ff95fdb045a52d8c9aa1207b5b425e7c63de701d0805ee92db343e3ed4 SHA512 43ac063f38ae0f7fd222415f9327b9f738e9a450daa8a1cb6a83a1abe9c4e8adcb03628d8e62d1d93bdc85548ee36123347c39b702e7b44d4513ec54f67a5692
 EBUILD kdevelop-php-5.2.1.ebuild 1062 BLAKE2B cdf8d324b3c9cdf1d8242edef0fbcc55becf96c86f5871246beaf55083e1270312535a04ec7d821d39f62205c25b0a976d0a8a1571a2e5c3b0f3ead196d3fb73 SHA512 7415d13081b485f1aba68f71ff1be86673c1c4a396c9dcbd5349707f985e54f07621cb19473f2af4c2795754fa1e843fce197623fc5593302603c9c0a94a16d3
+EBUILD kdevelop-php-5.2.3.ebuild 1064 BLAKE2B 6028d0cd7f826a155d43e3f75213ac529887b2d6811c2f28a7351e585ae092882e11968a602b0cb29c7e3008ef45caf86c44bc058d97a755da7127558ba9c8ab SHA512 26362b65b610320d874c7fefbdf382379fa8b75a93f66f4765061de99e14f73d97401dfdabac981b5b9bea3f0a7b7571dc51ac778b0335bdd554f84aaa48b138
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-php/kdevelop-php-5.2.3.ebuild b/dev-util/kdevelop-php/kdevelop-php-5.2.3.ebuild
new file mode 100644
index 000000000000..6d325d26a497
--- /dev/null
+++ b/dev-util/kdevelop-php/kdevelop-php-5.2.3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_BRANCH="5.2"
+KDEBASE="kdevelop"
+KDE_DOC_DIR="docs"
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+KMNAME="kdev-php"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="PHP plugin for KDevelop"
+LICENSE="GPL-2 LGPL-2"
+IUSE=""
+[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep threadweaver)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	dev-util/kdevelop-pg-qt:5
+	dev-util/kdevelop:5
+"
+RDEPEND="${COMMON_DEPEND}
+	!dev-util/kdevelop-php-docs
+"
+DEPEND="${COMMON_DEPEND}
+	test? ( dev-util/kdevelop:5[test] )
+"
+
+RESTRICT+=" test"
diff --git a/dev-util/kdevelop-python/Manifest b/dev-util/kdevelop-python/Manifest
index 33da217b9e09..1c55db9ad5ac 100644
--- a/dev-util/kdevelop-python/Manifest
+++ b/dev-util/kdevelop-python/Manifest
@@ -1,4 +1,6 @@
 AUX kdevelop-python-5.2.1-qt-5.11.patch 715 BLAKE2B f2b8b9c3bdcefaedae0c3865abb55486f2c071ac3d6a4ba69361f34878dd2e84908cab8fbd02cfd4793b45eeec1f1ab07191799b341c537bce4d4a9eb22e1deb SHA512 ab06b40d1ff846ef5e48ce1f28834e96b406f740e125d5a4fa2ef56c69f6ce632f5d2a2db1b1100c836c722943de2bd94959b3e27626037ad417c1dbc52281ae
 DIST kdev-python-5.2.1.tar.xz 1070708 BLAKE2B c1381e2a692446ac544e5e837236d90d5250c5b854f982374ff3c195d6d42d6534f6f81b118e872fbe4bea3f15e81b5396f3b581d6a64bf224e1a5ec631b9a89 SHA512 e65317a7da59cfaa5c14f0c10f965b1d7167e1e4e1b553f4c5f2ad9bce6d0ddbd93267cd9707a81a63117016fbc4dff77bca4ff2b2680ae585eb0f7354f3cf23
+DIST kdev-python-5.2.3.tar.xz 1071116 BLAKE2B 5d271c98d3d516a2fa9dda8995b4f3215dee5803417d95bab1c811a73c18becce779d0d3185584eb2116b1152ce3020a3704d7b71bc801712c35154531447ab6 SHA512 fd869ec93d544f2c16883bf95fb694fe75582dec3bb55d661de3f5fe9dc2d692439ef9cae9039bffb0e1a85d645eef228da869694110323b3ba56d78df2def61
 EBUILD kdevelop-python-5.2.1.ebuild 1214 BLAKE2B b2b0c1d64e5e394ce7f8f443e8acd4966bc68bf23145ff8fa155ba74ea33562017fdebd3699b254a36d7aaed74b8b75a74a0f68f67205f7e9d57ff5dab245143 SHA512 311770f9efee7128aec66cbd7473eb0877c329c3a6e0c016cf0128da875e0dfd7edb527ed9b8a442655b11ace67469f5efc3691d7a6221813f92b8ed12b52d58
+EBUILD kdevelop-python-5.2.3.ebuild 1170 BLAKE2B b3d26171ff01de428c3bc5f0f805a6e5c83ad02beb368756af08b733dd1f3d226f353e70469ba9f1726bd21ce50cf587c0df66dd362d226c2ba4a15972fb123d SHA512 5ed32d3f49b61ed7812dbba36d519d7c102c6c823dcc36dd623ef60ff8fdce0c938fa03008c3ec7711b478f3c865c818a7a463f52f5e824cc30208913a540584
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-python/kdevelop-python-5.2.3.ebuild b/dev-util/kdevelop-python/kdevelop-python-5.2.3.ebuild
new file mode 100644
index 000000000000..f62599c11d97
--- /dev/null
+++ b/dev-util/kdevelop-python/kdevelop-python-5.2.3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_BRANCH="5.2"
+KDE_TEST="forceoptional"
+KDEBASE="kdevelop"
+KMNAME="kdev-python"
+PYTHON_COMPAT=( python3_{4,5,6} )
+inherit kde5 python-single-r1
+
+DESCRIPTION="Python plugin for KDevelop"
+IUSE=""
+[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep threadweaver)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	dev-util/kdevelop:5
+"
+RDEPEND="${DEPEND}
+	dev-python/pycodestyle[${PYTHON_USEDEP}]
+"
+
+RESTRICT+=" test"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	kde5_pkg_setup
+}
+
+src_compile() {
+	pushd "${WORKDIR}"/${P}_build > /dev/null || die
+	emake parser
+	popd > /dev/null || die
+
+	kde5_src_compile
+}
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index 1f85da02a21b..0e87406d6f23 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,4 +1,6 @@
 AUX kdevelop-5.2.1-qt-5.11.patch 1581 BLAKE2B 83ef207fb434b3faa7c73752e9b48d7d52182b7cb2bee0f7ad840a124066b72431cd4b69601ea866bb79de483cca2ddfa6fb4d6ad6bcba8cefa0d2833e5067bd SHA512 d4adbcb6c1a26e9198d7997b84ee059216094b1b8d518bb39d1ddafbd968de6f40123e4495b8f2b3a649524247796fcd026545b09b62e9d544e0fd6b1ec74a69
 DIST kdevelop-5.2.1.tar.xz 6653576 BLAKE2B 800ab50b62ca70e54d66bc7956b257e6d14f5a2c2fda7c7720aa0ddf1dad1dd2d7f993103c7f4caed0fc78734643a89f2710cb598319695d9ea6d79f62fd6305 SHA512 ee4a7f93c4f5168e6c63ca415a1f757cb7d2615370201700db16abdf1799e5c12421e382f5937be4a65af026a00df679b745fc4dab4d73974275d95d53173cd0
+DIST kdevelop-5.2.3.tar.xz 6643364 BLAKE2B a08d5cc786a603b3e23d1d9bf9d362a35f2280436072df239ff6becbd9f0ecc370b35a8e95d3443475218eb5a27e044d76f3d34cd41f082fc65650ce05c499f7 SHA512 5a7f514f24725ab1dbb33d63fd365159c3a8831c400aeef4f1e463acc60d81e9db1a23d320b5be215597884fbf0cc6ec8aed4f69e1fd60f68328b5a052b39c3d
 EBUILD kdevelop-5.2.1.ebuild 3861 BLAKE2B a1d47f34a8dbf9a1cf00de8b8abee636450ddb7850f413806b7d82e11d27ff138a81be8a7f825676608df7019ced76de5226e0476b4221a3ad9ce3a1f4aa5f40 SHA512 5da724760ff0ea0e82de7208c6622436f01b12f32464dd20382d20eedc36cc6fa1371240ea1f579c1d534f2bc41549c90e8a21900c3191325cd867ceb64bc1bf
+EBUILD kdevelop-5.2.3.ebuild 3817 BLAKE2B 5f0feb86df96ec85382eb49169b392dde349175968eb29d9e0e652757ba3fa6389b3deea3cf11ec2ebbac12f1f8566ec06a21f2b37e83fd41062e6de1d420dbc SHA512 d174a6ca2f89445fad19fe4cc36c44cfe2a31ad4c59a9f0479e787f5542f433d9e414c205ae8342fb798c9578ffca091cefd4095d7abd15ece56282d16c754e6
 MISC metadata.xml 794 BLAKE2B 765d868d9ca5ac71ee71a7c22d85beb02951dd7a601c2d52da87b1d49686494e8ce17c9e7e0f5f2767e0cb02625d74bcc6a95cfe3ae6793298150fcb651fcae4 SHA512 4d96ffa2a718e987a2d61531fe4a194c3fca3e863ab9cf8ac59d3b187a526c841066936f0a92591475672c6c22b57bd04a798908932f839644025b615ce8b417
diff --git a/dev-util/kdevelop/kdevelop-5.2.3.ebuild b/dev-util/kdevelop/kdevelop-5.2.3.ebuild
new file mode 100644
index 000000000000..22af01b752e7
--- /dev/null
+++ b/dev-util/kdevelop/kdevelop-5.2.3.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_BRANCH="5.2"
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="true"
+VIRTUALDBUS_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
+LICENSE="GPL-2 LGPL-2"
+IUSE="cvs +gdbui okteta +plasma +qmake reviewboard subversion webkit +welcomepage"
+[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86"
+
+REQUIRED_USE="test? ( welcomepage )"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep sonnet)
+	$(add_frameworks_dep threadweaver)
+	$(add_kdeapps_dep libkomparediff2)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qthelp)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qttest)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	dev-libs/grantlee:5
+	>=sys-devel/clang-3.8.0:=
+	x11-misc/shared-mime-info
+	gdbui? ( $(add_plasma_dep libksysguard) )
+	okteta? ( $(add_kdeapps_dep okteta) )
+	plasma? (
+		$(add_frameworks_dep krunner)
+		$(add_frameworks_dep plasma)
+	)
+	qmake? ( dev-util/kdevelop-pg-qt:5 )
+	reviewboard? ( kde-frameworks/purpose )
+	subversion? (
+		dev-libs/apr:1
+		dev-libs/apr-util:1
+		dev-vcs/subversion
+	)
+	webkit? ( $(add_qt_dep qtwebkit) )
+	!webkit? ( $(add_qt_dep qtwebengine 'widgets') )
+	welcomepage? ( $(add_qt_dep qtdeclarative 'widgets') )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	$(add_qt_dep qtconcurrent)
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_kdeapps_dep kapptemplate)
+	$(add_kdeapps_dep kio-extras)
+	dev-util/ninja
+	>=sys-devel/gdb-7.0[python]
+	cvs? ( dev-vcs/cvs )
+	reviewboard? ( $(add_kdeapps_dep ktp-accounts-kcm) )
+	!dev-util/kdevelop:4
+	!dev-util/kdevelop-clang
+	!dev-util/kdevelop-cppcheck
+	!dev-util/kdevelop-qmake
+	!dev-util/kdevelop-qmljs
+	!dev-util/kdevplatform
+	!<kde-apps/kapptemplate-16.04.0
+"
+
+RESTRICT+=" test"
+# see bug 366471
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_cvs=$(usex cvs)
+		$(cmake-utils_use_find_package gdbui KF5SysGuard)
+		-DBUILD_executeplasmoid=$(usex plasma)
+		$(cmake-utils_use_find_package plasma KF5Plasma)
+		$(cmake-utils_use_find_package okteta OktetaKastenControllers)
+		$(cmake-utils_use_find_package qmake KDevelop-PG-Qt)
+		$(cmake-utils_use_find_package reviewboard KDEExperimentalPurpose)
+		$(cmake-utils_use_find_package subversion SubversionLibrary)
+		$(cmake-utils_use_find_package !webkit Qt5WebEngineWidgets)
+		$(cmake-utils_use_find_package welcomepage Qt5QuickWidgets)
+	)
+
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if ! has_version "kde-apps/konsole" ; then
+		elog "For konsole view, please install kde-apps/konsole"
+	fi
+
+	if ! has_version "dev-util/cppcheck" ; then
+		elog "For static C/C++ code analysis support, please install dev-util/cppcheck"
+	fi
+
+	if ! has_version "dev-util/heaptrack[qt5]" ; then
+		elog "For heap memory profiling support, please install dev-util/heaptrack"
+	fi
+}
diff --git a/dev-util/qstlink2/Manifest b/dev-util/qstlink2/Manifest
index 2370312ad92b..c95e236d8e04 100644
--- a/dev-util/qstlink2/Manifest
+++ b/dev-util/qstlink2/Manifest
@@ -2,5 +2,5 @@ DIST qstlink2-1.0.3.tar.gz 661197 BLAKE2B 222b1c4b467ce0b745752ce76cc7978ce6af42
 DIST qstlink2-1.2.3.tar.gz 681169 BLAKE2B e1ebf6a30de3724eedcc5fa00f8a9a79e6fd038b6276dfc424a7d78f8b55b99173037c47fbdba85bbb69a7530682bd3616e185a1bb9882c686b8c3ee34105a7c SHA512 13c06a53f44acc99e620c89052fc2f128076e3aec1cac76ddcee76a49ed473d5ef816d77fc5be23d125bbb16306c176f54c2d611c88d2b9c6e7954752a96c7e8
 DIST qtusb-0.2.1.tar.gz 47928 BLAKE2B 5215e726c111d1835033848ee9d5e3d85c4a1d47be20d04423f5c1582251f75b0cf0272028d307a7a37df1f4533f04189f9660f62a0c5461c9ac803ee8d33aac SHA512 76e6df81d9bbd5725a113932506bd6541d0bb32301ead03d92faf1f0fa4dc68749e2728d8bf3fe8efefd00a3774b46f0c8f81be8028a2c5ceb6bc1b6d36da38d
 EBUILD qstlink2-1.0.3.ebuild 496 BLAKE2B 6281611b2b87e4cbe52d2fc875cfd35e5219d78e5efea63125839dc43a5688fad48dc8c3d020ad2165df3453b53cbd5b67228c1ca49a6de91876e0475be0e9fc SHA512 b23d8241e1c78908a02b98b63cfcc5b8c032ddae3bf18f0fd7150d66db4f1cd6d24d52685aa136b7cb7c69e45b4666e70539ca947a7416dc6a1a5e86b4b860b4
-EBUILD qstlink2-1.2.3.ebuild 901 BLAKE2B e638f422c7a4507c932bfa62ac5b317b05201bd738fd02aee2e40cc0dfcb6692bbad8784022bdd895ab73cad812f5c7815c7d68450f7e700a47ee759d1312889 SHA512 f99777deb69dc7a15dd1493cc790517f64171bb6216f1d1f89475ee08546111330ca08f7e43f5a66db1d3bf41a35b2444bf166e778e5ea7ca9a38ed2fec0c840
+EBUILD qstlink2-1.2.3.ebuild 900 BLAKE2B 9438e350bb4ae517daf21fc08d1d0aacedc6e31464828187c45fa1781bce384af09b4a18f148ee2a304b53b5ffde1f4c21ea9dd5ac5c0c8b3abca5d9df062c14 SHA512 63cff17e0575979e30a418a96a01460875e9b263cacd07cda730e05ce3cc50924b42452da93ff9c887e20dcb33c4832ee4c0102c5d36e81ff44b3f660936862a
 MISC metadata.xml 626 BLAKE2B ba349e967f446ed21c1df37f7433be4e009f28a161745fbc3b886544820f17b4e0c3fce00f411b2e0308106d0c19f821ef3ce83e0c44b8e522640b13081131a4 SHA512 5b086323c16218c71c03a9dff91e7c95a3be54c82a871ce3e653a5208876c08d18e4292e9126e49224e65b93315ec2e3ae82a09eede155c5f705e432ac8603a1
diff --git a/dev-util/qstlink2/qstlink2-1.2.3.ebuild b/dev-util/qstlink2/qstlink2-1.2.3.ebuild
index f9dfe560686a..7899e17f8d8c 100644
--- a/dev-util/qstlink2/qstlink2-1.2.3.ebuild
+++ b/dev-util/qstlink2/qstlink2-1.2.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/fpoussin/QStlink2/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest
index aa7478954b0f..9a78768d8d27 100644
--- a/dev-util/radare2/Manifest
+++ b/dev-util/radare2/Manifest
@@ -1,4 +1,7 @@
+AUX radare2-fix-syscapstone-2.6.patch 954 BLAKE2B 9dd8ebb65f8830643a46c2302e769018ea78045eb18da7ca98adff00ebba63975b5c97eb2398d0eb33970a4102090fdee19734115170f4cbb0c4cd3863c74bbc SHA512 4412c99facdcf15bb6f3202c15e7c0a581df6eda67e5476b70f95e21540d253fdd2dd5518009c139cc7723d589f0d903a2a98f3d6ed33578b0bed2e5c2bf4242
 DIST radare2-2.5.0.tar.gz 6272646 BLAKE2B 44c88327b544d03bd464f1ecb72a51b7e3fa86602aeae9055b6f2d41763be9ed9d63be4c7b959e1f920605feeed998c1f56ef0ed3a6a7213b4d5265c057b1213 SHA512 a29e0e61aeee6e08a99a1ed8a8bc428ec8b0474b3781475db3091232353d03d39d8750f774a266e01bb7565049269ee5f43b666b3b69bfadafb75cdb35f6cc4b
+DIST radare2-2.6.0.tar.gz 6306317 BLAKE2B 213ed0ac92f5b4b9cfc2ba93c5cda9168746cffb0016e1368c4c3939d694bffccf689764c60e0e59a52b70b6b7d49407516c9ecd6e62c59ed0db37c6f72867f5 SHA512 44e7d0c10e17b40d4d71af851cf462c159b03b3242dfccd786bd54d3cf9f92441084f26694166dd1385e84c00626f45dbe09d1fe713595721723c468ac47b01b
 EBUILD radare2-2.5.0.ebuild 1128 BLAKE2B 1d1afb7c82e61eca36fb9ec37bf3efe5569c2812c86040982b020dce996db8c9eed5fcbc9d80c6d819cf82df37bd0e3bba3a8414df8be513ebde955490d2a622 SHA512 60b78abd86656f51d5b4fcc89ef7594c0b9007f012bc8fd50446895f55b7ddcbb8e81eac73c3bdbeafc6bfd83ee13fba7d13e0cf21006bf3dbd63f6ae4fb16b3
+EBUILD radare2-2.6.0.ebuild 1187 BLAKE2B bc87ba5b9e174de19a2588bcd567ecfacd53cf8c3852242d9eaf23258369f4fee7484647c3753eb52b026117b596c2cd261f164d93b647bdb486bbb26955067e SHA512 c22851603eff958ad681d981631a58ca28dc3f4ed704d0c516c542d43a2d09a47509fee62055da4e864c2b5d258cda5c31368f52137fd7b3d7653ea49e8fe79d
 EBUILD radare2-9999.ebuild 1187 BLAKE2B f526fc8a5b74fd80de3291aebe2a3805bbf7bceda29552772b50fb1ce3a3dab0dbdbbbe2c1895f596dbf79f52ce27445efa43bffcc18a333951b2367db1510a6 SHA512 358c0f8116b15555cb34aec3ccc4ddccfd6c6211a1b9b882242c779f6ea0ac358c7e5dc946bd4d82ed871bfc7a01d45c621eb59ded303ad6a3cb23c1b18c8f56
 MISC metadata.xml 472 BLAKE2B 9eac8a52ecd7dae41e0cd32ff13bc02d7c936d0d36bf52309d28b9d03168ec55655ce3588df2c330c08f0779fc8c1a095c972cd6ee3deecb68a9c333d4811421 SHA512 110f9ec2d6dddd20703b9cf6ec8cd77e2459f67aca74065211dc30888cea9c9154128da8a2f15810063de9c4867e3e1a31658d3c5cb27be44824342784b67365
diff --git a/dev-util/radare2/files/radare2-fix-syscapstone-2.6.patch b/dev-util/radare2/files/radare2-fix-syscapstone-2.6.patch
new file mode 100644
index 000000000000..4eb3c053f07a
--- /dev/null
+++ b/dev-util/radare2/files/radare2-fix-syscapstone-2.6.patch
@@ -0,0 +1,34 @@
+From 3752d992f3140806ea1d513739b6f23addf52df1 Mon Sep 17 00:00:00 2001
+From: cc <longlene@gmail.com>
+Date: Tue, 22 May 2018 12:52:12 +0800
+Subject: [PATCH] fix for build with syscapstone
+
+---
+ libr/Makefile | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/libr/Makefile b/libr/Makefile
+index 05cb40fec7..0b39b48c02 100644
+--- a/libr/Makefile
++++ b/libr/Makefile
+@@ -84,13 +84,18 @@ E+=../shlr/bochs/lib/libbochs.${EXT_AR}
+ #E+=../shlr/sdb/src/libsdb.${EXT_AR}
+ #endif
+ 
++ifeq ($(USE_CAPSTONE),1)
++E+=$(CAPSTONE_LDFLAGS)
++else
++E+=../shlr/capstone/libcapstone.${EXT_AR}
++endif
++
+ libr.${EXT_SO}: .libr
+ 	$(CC) -fvisibility=hidden $(MLFLAGS) -shared -dynamiclib -o libr.${EXT_SO}  \
+ 		.libr/*.o \
+ 		../shlr/gdb/lib/libgdbr.${EXT_AR} ../shlr/java/libr_java.${EXT_AR} \
+ 		../shlr/zip/librz.${EXT_AR} \
+-		../shlr/libr_shlr.${EXT_AR} $(E)\
+-		../shlr/capstone/libcapstone.${EXT_AR}
++		../shlr/libr_shlr.${EXT_AR} $(E)
+ 
+ else
+ 
diff --git a/dev-util/radare2/radare2-2.6.0.ebuild b/dev-util/radare2/radare2-2.6.0.ebuild
new file mode 100644
index 000000000000..74ac2faaaf52
--- /dev/null
+++ b/dev-util/radare2/radare2-2.6.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1 eutils
+
+DESCRIPTION="unix-like reverse engineering framework and commandline tools"
+HOMEPAGE="http://www.radare.org"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/radare/radare2"
+else
+	SRC_URI="https://github.com/radare/radare2/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~arm ~arm64"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ssl libressl"
+
+RDEPEND="
+	dev-libs/capstone:0=
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}/${PN}-fix-syscapstone-2.6.patch" )
+
+src_configure() {
+	econf \
+		--with-syscapstone \
+		$(use_with ssl openssl)
+}
+
+src_install() {
+	default
+
+	insinto /usr/share/zsh/site-functions
+	doins doc/zsh/_*
+
+	newbashcomp doc/bash_autocompletion.sh "${PN}"
+	bashcomp_alias "${PN}" rafind2 r2 rabin2 rasm2 radiff2
+
+	# a workaround for unstable $(INSTALL) call, bug #574866
+	local d
+	for d in doc/*; do
+		if [[ -d $d ]]; then
+			rm -rfv "$d" || die "failed to delete '$d'"
+		fi
+	done
+}
diff --git a/dev-util/shadowman/Manifest b/dev-util/shadowman/Manifest
index ecd92c2420c3..ac9c2283c58c 100644
--- a/dev-util/shadowman/Manifest
+++ b/dev-util/shadowman/Manifest
@@ -1,4 +1,4 @@
 DIST shadowman-2.tar.gz 3349 BLAKE2B 2881c0487205c00114967be7600ef5483cc64c7ad5ed5cac60fe8bf2ca17e5b06d5df6e39148d90ff68a51d3e918ca616d0c5eedf11366df90c788a07e4c63b0 SHA512 eeb10248c7f76116352bffa671ab7c761b2f79cb943de20dba327b0d7bf1126d15021508c9e9389b9f0c37cf5049ad2c67bad93f6a03340fcfd27e03c4969110
-EBUILD shadowman-2.ebuild 667 BLAKE2B 42cedbd17a16837ad150f5f949c9433fa12f21c1cef24edafec92764306e3007cdfdf76bdfd9eaaa43497cf19522593ba05a424d038fbb231a71afbd457f4fa8 SHA512 ac7f6af37da17ec0dc5481478cf260bf92da730828f0396a56bce90b378b30449a05f75f8d665db2dfa26c215edb657653de38c10d584459ab7010ca4b9b692f
+EBUILD shadowman-2.ebuild 665 BLAKE2B c023ebb13da96d711a171d2cb3e93701217b656b0079f1fd5450c270e97009796471c7b5016bcd3704e6a3f23ae3a9629bf26b2f2b86aaeb3d90d3f3ed4c1989 SHA512 cdf5732204eba4e67fc783544001623f2e2d6dd3a7b97d0bfc951a041647ac3b71d60289e745c1671f023e586aaf3c7c036ec8e3a78b869782b876a563ee4e95
 EBUILD shadowman-9999.ebuild 568 BLAKE2B 199779d69123dae88d3024a00370b24a898f40ce7aca43257e0dfd3a9747f5b969133cffce9aa70ff1fa0555a18442e4170829df7d27d397ea10b96136a76524 SHA512 4325db35429e59387690b10c09e86268e79e3a4a5e968075f36155fbcd5af7e0ec0a79b6a08b6e9e74ea5cad6727be0697abebcc63ba48c7449cd54141edd794
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-util/shadowman/shadowman-2.ebuild b/dev-util/shadowman/shadowman-2.ebuild
index 74b99ec8dd0d..6887f9b6e0f8 100644
--- a/dev-util/shadowman/shadowman-2.ebuild
+++ b/dev-util/shadowman/shadowman-2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/mgorny/shadowman/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND="app-admin/eselect"
diff --git a/dev-util/umockdev/Manifest b/dev-util/umockdev/Manifest
index 9eae2fd1ec58..09dcb0a4be14 100644
--- a/dev-util/umockdev/Manifest
+++ b/dev-util/umockdev/Manifest
@@ -1,4 +1,3 @@
-AUX umockdev-0.8.11-sysmacros.patch 1132 BLAKE2B 80068108d9a63f31b22fcf8f2c0b4dafb87855544677a2e243093abe8e6d3e509a2da35b191132610e79a74d1ed19b8b01ffff8bbf3601dd4779af400c953c61 SHA512 43cd12d94dc4f1370b15a33c1b551332eb67d1a7be4318b9a844eba66aaa25f9bcd3b50eab4b2f2af12c0296bafb8433959e2417bd531bf9c28406c58dcf0ea1
 AUX umockdev-0.9.4-sysmacros.patch 599 BLAKE2B fa261c73cc873ff2aadfc721cdd24dbae9ee9c84c52a02fe16aaa86a94c4b84bcdad6782be590b0f163f679281764595b2679ff0898f502621ea6c2427533138 SHA512 3deb38bb44ea4bb2cf7f4b2dc88db0c0d71045ccaae48acecd3fde9e0006262111202c8e3ae490a5fccd610abf0c24ca11699720872998dfc55bc29f58f923b6
 DIST umockdev-0.11.3.tar.xz 753152 BLAKE2B 9f78d160a653ba2c56e97d1b331dfeecd4dd8f6642744849ec3eb85866e4cbce6399679a873b730beddfac2f4bd7572937df4a3db2440ec1bf929849f928bdc6 SHA512 e9086777bb13dbd79b629dc68555d19fb8799720dfc4548926b87d032d94212814cb9e1de10e26f5940a9b5db9a15f62a594f3baf0050ffb9ea30f1563db6d6c
 DIST umockdev-0.9.4.tar.xz 754856 BLAKE2B 92182ee856e9432f02cf3a739c7af6f2220394eb4dd81ef6e2949380d124f70d9e34c3d3e49053af43794dd0f2ce0feed8be7366df2c9a06bebee9c52d24ba53 SHA512 c291d3f40a0ab366f14021aa0960852de049f4299a0207d93cec28d5961f3bc7f89448add6f7b35c1262d805d1d638837d4d5e6b734879ffb5910da50019e1cd
diff --git a/dev-util/umockdev/files/umockdev-0.8.11-sysmacros.patch b/dev-util/umockdev/files/umockdev-0.8.11-sysmacros.patch
deleted file mode 100644
index 17ee6b23759a..000000000000
--- a/dev-util/umockdev/files/umockdev-0.8.11-sysmacros.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-https://github.com/martinpitt/umockdev/pull/52
-https://bugs.gentoo.org/579988
-
---- a/src/libumockdev-preload.c
-+++ b/src/libumockdev-preload.c
-@@ -39,6 +39,7 @@
- #include <inttypes.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <sys/sysmacros.h>
- #include <sys/inotify.h>
- #include <sys/socket.h>
- #include <sys/ioctl.h>
---- a/src/umockdev-record.c
-+++ b/src/umockdev-record.c
-@@ -31,6 +31,7 @@
- #include <stdarg.h>
- #include <sys/stat.h>
- #include <errno.h>
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- #include <glib/gstdio.h>
- #include <fcntl.h>
---- a/tests/test-umockdev-vala.c
-+++ b/tests/test-umockdev-vala.c
-@@ -36,6 +36,7 @@
- #include <unistd.h>
- #include <glib/gstdio.h>
- #include <sys/stat.h>
-+#include <sys/sysmacros.h>
- #include <gobject/gvaluecollector.h>
- 
- #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
---- a/tests/test-umockdev.c
-+++ b/tests/test-umockdev.c
-@@ -29,6 +29,7 @@
- #include <errno.h>
- #include <sys/ioctl.h>
- #include <sys/socket.h>
-+#include <sys/sysmacros.h>
- #include <sys/un.h>
- #include <linux/usbdevice_fs.h>
- #include <linux/input.h>
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 9ead72cbda5d..7146d64f85f8 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/meson.eclass b/eclass/meson.eclass
index f493bab2d019..d15e3ff58795 100644
--- a/eclass/meson.eclass
+++ b/eclass/meson.eclass
@@ -166,13 +166,16 @@ _meson_create_cross_file() {
 	strip = '$(tc-getSTRIP)'
 
 	[properties]
-	c_args = $(_meson_env_array "${CFLAGS}")
-	c_link_args = $(_meson_env_array "${LDFLAGS}")
-	cpp_args = $(_meson_env_array "${CXXFLAGS}")
-	cpp_link_args = $(_meson_env_array "${LDFLAGS}")
+	c_args = $(_meson_env_array "${CFLAGS} ${CPPFLAGS}")
+	c_link_args = $(_meson_env_array "${CFLAGS} ${LDFLAGS}")
+	cpp_args = $(_meson_env_array "${CXXFLAGS} ${CPPFLAGS}")
+	cpp_link_args = $(_meson_env_array "${CXXFLAGS} ${LDFLAGS}")
 	fortran_args = $(_meson_env_array "${FCFLAGS}")
-	objc_args = $(_meson_env_array "${OBJCFLAGS}")
-	objcpp_args = $(_meson_env_array "${OBJCXXFLAGS}")
+	fortran_link_args = $(_meson_env_array "${FCFLAGS} ${LDFLAGS}")
+	objc_args = $(_meson_env_array "${OBJCFLAGS} ${CPPFLAGS}")
+	objc_link_args = $(_meson_env_array "${OBJCFLAGS} ${LDFLAGS}")
+	objcpp_args = $(_meson_env_array "${OBJCXXFLAGS} ${CPPFLAGS}")
+	objcpp_link_args = $(_meson_env_array "${OBJCXXFLAGS} ${LDFLAGS}")
 
 	[host_machine]
 	system = '${system}'
@@ -195,6 +198,25 @@ meson_use() {
 	usex "$1" "-D${2-$1}=true" "-D${2-$1}=false"
 }
 
+# @FUNCTION: _meson_move_flags
+# @INTERNAL
+# @USAGE: PROG FLAGS
+# @DESCRIPTION:
+# Moves extra arguments from PROG to FLAGS.
+# For example:
+# CC="gcc -m32" -> CC="gcc" CFLAGS="-m32"
+_meson_move_flags() {
+	local prog=${1}
+	local flags=${2}
+	local x=( ${!prog} )
+	if [[ -n ${x[0]} ]]; then
+		export ${prog}=${x[0]}
+	fi
+	if [[ -n ${x[1]} ]]; then
+		export ${flags}="${x[@]:1}${!flags:+ }${!flags}"
+	fi
+}
+
 # @FUNCTION: meson_src_configure
 # @DESCRIPTION:
 # This is the meson_src_configure function.
@@ -211,6 +233,18 @@ meson_src_configure() {
 		--wrap-mode nodownload
 		)
 
+	# Prevent multilib flags from leaking across ABIs
+	local -x BUILD_CFLAGS=${BUILD_CFLAGS}
+	local -x BUILD_CXXFLAGS=${BUILD_CXXFLAGS}
+
+	# Move multilib flags from CC to CFLAGS
+	local -x CC=$(tc-getCC) CFLAGS=${CFLAGS}
+	_meson_move_flags CC CFLAGS
+
+	# Move multilib flags from CXX to CXXFLAGS
+	local -x CXX=$(tc-getCXX) CXXFLAGS=${CXXFLAGS}
+	_meson_move_flags CXX CXXFLAGS
+
 	if tc-is-cross-compiler; then
 		_meson_create_cross_file || die "unable to write meson cross file"
 		mesonargs+=( --cross-file "${T}/meson.${CHOST}" )
diff --git a/eclass/mozconfig-v6.60.eclass b/eclass/mozconfig-v6.60.eclass
index 8208305a778f..ac0652a82301 100644
--- a/eclass/mozconfig-v6.60.eclass
+++ b/eclass/mozconfig-v6.60.eclass
@@ -165,11 +165,14 @@ DEPEND="app-arch/zip
 	>=sys-devel/binutils-2.16.1
 	sys-apps/findutils
 	pulseaudio? ( media-sound/pulseaudio )
-	|| (
+	elibc_glibc? ( || (
 		( >=dev-lang/rust-1.24.0[-extended(-)] >=dev-util/cargo-0.25.0 )
 		>=dev-lang/rust-1.24.0[extended]
 		( >=dev-lang/rust-bin-1.24.0 >=dev-util/cargo-0.25.0 )
-	)
+	) )
+	elibc_musl? ( || ( >=dev-lang/rust-1.24.0
+		>=dev-util/cargo-0.25.0
+	) )
 	${RDEPEND}"
 
 RDEPEND+="
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 0669b2d5aeef..cd54f3ecbf26 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/mastergear-bin/Manifest b/games-emulation/mastergear-bin/Manifest
index fb6a471f2117..e566a8493899 100644
--- a/games-emulation/mastergear-bin/Manifest
+++ b/games-emulation/mastergear-bin/Manifest
@@ -1,3 +1,3 @@
-DIST MG42-Ubuntu-x86-bin.tgz 169020 BLAKE2B 8c554e1be2e01ea922a67de86d6d8eafdd7ee0f1f991ace095d36a7bd949371e0ad7dd22ee14ef2e8eed0da13b0aa5cbef45ae18316bd0661a5e450f3a9e5700 SHA512 25a88cc13c6baf336732f3ad77d2ab3c0c1097ed79b081f9f1b904477e2f362ba56e1797330dedad2df5d4fdb405ddc38ed76b19d53f4e4e74dbeded30d05b47
-EBUILD mastergear-bin-4.2.ebuild 573 BLAKE2B 0ea3f09fa2af2f479b53fe8c2456ce1f3c3036e9223c4afda88f35e051944d8266dc0d3428e5ca4d6fa7600f355843b3783fd1f4166d1af2f251845f6ef4ffb7 SHA512 2e2f2b376a1cb72bacc5e6210685fc0689ef6a3c8a69e8b928d10b2f3448d06946e5efbc54f7d5ccea67dc7cf7a04cc98acd4804a3240202805e71ea6c927571
+DIST MG43-Ubuntu-x86-bin.tgz 169112 BLAKE2B d54ad5ce84b02e1ff870510fce71447420a27d90b77101280b131f8862e4549767db5a375142e7eb3293465c5da805acc93f5ee737b3c56df66e1cba9d9420e9 SHA512 b39f03902d5046e8d8a64cd45d5d4fc1522a70d97d812dfa859d315a381181ba3c05a3292e24a92662ee4a95b501e6cb3c516eb1dea9d1d5b7e74abe8a2b3dda
+EBUILD mastergear-bin-4.3.ebuild 585 BLAKE2B 202c653a577b2009a89c320dc54eb6bd304b990a15b5c26472d0a66e6a65cd9fb2e0c6804a02dc2670c89c105873615da08bb90aaca21a2c9b48ddfae2ed4718 SHA512 355eebe6427871fb2ddd9c4153193a21454fe38fbc74200fad652c79d0f321d373a254dd23207ed1454f5301d8f067310ba4409b3de2a3689a0deb88b623f684
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-emulation/mastergear-bin/mastergear-bin-4.2.ebuild b/games-emulation/mastergear-bin/mastergear-bin-4.3.ebuild
index 0a972400ab11..da157fcf3639 100644
--- a/games-emulation/mastergear-bin/mastergear-bin-4.2.ebuild
+++ b/games-emulation/mastergear-bin/mastergear-bin-4.3.ebuild
@@ -21,7 +21,7 @@ RDEPEND=">=sys-libs/glibc-2.15
 S="${WORKDIR}"
 
 src_install() {
-	dobin mg
+	newbin mg mastergear
 	docinto html
 	dodoc MG.html
 }
diff --git a/games-simulation/Manifest.gz b/games-simulation/Manifest.gz
index a177b82db212..7e6ee115de1d 100644
--- a/games-simulation/Manifest.gz
+++ b/games-simulation/Manifest.gz
diff --git a/games-simulation/flightgear/Manifest b/games-simulation/flightgear/Manifest
index 56a4c11c3e54..5ce45f9ae6f6 100644
--- a/games-simulation/flightgear/Manifest
+++ b/games-simulation/flightgear/Manifest
@@ -1,6 +1,6 @@
 AUX ac3d.vim 45 BLAKE2B 04a6e4c70a8be0f7d996f1192289cc05012d4b4cc82a56a14b5d6d2dd7aae8f23f1cd853d29d071a0b9691cf5b8e8b262355b40752f43bccaa318065992d709b SHA512 b691585c6772222525b7f2d67ed41431663400930d9c7deed843a6abe50f67b517bd3180026a0cfe949df29036a49bcaf33ab759dd958ae64d550c271150a7da
 AUX nasal.vim 47 BLAKE2B c3809ad7297d5811ff0b4a004295cd8e7a0984d30acc5790e5c05f5aa400c4c0723e480256e26627f67969a85e9ed91706fae9d9807e19e0566b32339a41031b SHA512 1edfa24fabbaae5037c8c521052d7013f3b29d2933d79a8381593121115229df6764219614d8d06b4058eb93cf84d9cc75773fd0864fd7a6e2aebd811e9d1afb
 DIST flightgear-2018.1.1.tar.bz2 8158999 BLAKE2B 5d7ca65c0b2627c7b34681e0af8e060f67cbed80d7e313c056fb92f026bc2355af66bbb6b377573db32f5101c63f1fa04521ba7fdffd584a56ae1049d1bcce83 SHA512 962be602a8c294081109ee1893383ac22dd83a0511fdb600d24d5dc9eca24d19687eaeed545695259502431e6d8c8bcdafe26846636ad40be28f5c2e4b0cfe93
-EBUILD flightgear-2018.1.1.ebuild 3670 BLAKE2B 5427589054a34825e63b44a3fcf99d785bee99e611544aa3cc2104bcac6992bb01c1275b452754bd840e7fe74de04903cbf81faee5922e10701fee4f9334b1b9 SHA512 01ef93c320576c7b7cb8a5db1de9617e7d635eb996768f7bf0fa12a39f6d13e1f5fb5ce8763877bfb874a756bf9818f523dc1b668e695c1c5ce88324102ec538
-EBUILD flightgear-9999.ebuild 3720 BLAKE2B 0532e7fad5eaea1ba5b0f21401b575b05ccefece7e906ce279fd3cab5817390c29631fa999e0907e8e126f6f578b45d3e2107667572bf30ddc069b7b2a524c58 SHA512 a8a5446ec877679767f978c0a1299dd8cc4a09f4b4aa8f5f879ee4653403205bc8bfbcd8331972af0ab8c2fff0850d288f7bb7f4702d4fe5548efe420eff720c
+EBUILD flightgear-2018.1.1.ebuild 3675 BLAKE2B 3b5f1278f9d30def22ce34477f0a014de7aded6c8065758f518040211ddb5df5d834d4eeec3eb70c34705117cc8cd4541e80b37781d6e5fcc27932aec4c476a4 SHA512 b6854ea8183ff5674935a33c223c881e181fc71999e0af93d3af5a9104bc03630b25cb50d7dc019360efb70056fd53f5a2debfb507bff59d2ca08d094eee7c3b
+EBUILD flightgear-9999.ebuild 3725 BLAKE2B 433c07af5de569f1add5ed24527745d40b2f65bdf1e9e9fc611f1bd22159559c778b7b6b4181acd2055ebf4b3c6d6c27298f55979b03f42466ad4ea1435d4c90 SHA512 88412936aa8b2a16fb9501952345185f66d8952c8727422250f17868a3b70639e23da2cb82d2640d80d6183bcc30c1d9cf6baf782cf6da0a8cc1a048c97e3066
 MISC metadata.xml 867 BLAKE2B b6bb892bffffec9fa00677768455fc49dd49164fae26b1c6ae70ac905feeaca79d670f4041294fb94e7c11d741a68bc6e3205e34aba5caf36da77fc808fdff8c SHA512 645a952785a101a8400be7a2608e7c71007c093c8f7cdbd0fab36f21b64ea1bbeb67e8f30404ab63841d41e5709a30570223732ebb586c780727ab0cfed0d943
diff --git a/games-simulation/flightgear/flightgear-2018.1.1.ebuild b/games-simulation/flightgear/flightgear-2018.1.1.ebuild
index 35f1c3291934..f32f93c30b98 100644
--- a/games-simulation/flightgear/flightgear-2018.1.1.ebuild
+++ b/games-simulation/flightgear/flightgear-2018.1.1.ebuild
@@ -17,7 +17,7 @@ IUSE="dbus debug examples gdal openmp qt5 test +udev +utils vim-syntax"
 # zlib is some strange auto-dep from simgear
 COMMON_DEPEND="
 	dev-db/sqlite:3
-	>=dev-games/openscenegraph-3.2.0[png]
+	>=dev-games/openscenegraph-3.2.0[jpeg,png]
 	~dev-games/simgear-${PV}[gdal=]
 	media-libs/openal
 	>=media-libs/speex-1.2.0:0
diff --git a/games-simulation/flightgear/flightgear-9999.ebuild b/games-simulation/flightgear/flightgear-9999.ebuild
index 3807c996da08..10e2e7113b34 100644
--- a/games-simulation/flightgear/flightgear-9999.ebuild
+++ b/games-simulation/flightgear/flightgear-9999.ebuild
@@ -19,7 +19,7 @@ IUSE="dbus debug examples gdal openmp qt5 test +udev +utils vim-syntax"
 # zlib is some strange auto-dep from simgear
 COMMON_DEPEND="
 	dev-db/sqlite:3
-	>=dev-games/openscenegraph-3.2.0[png]
+	>=dev-games/openscenegraph-3.2.0[jpeg,png]
 	~dev-games/simgear-${PV}[gdal=]
 	media-libs/openal
 	>=media-libs/speex-1.2.0:0
diff --git a/games-strategy/0ad-data/0ad-data-0.0.23_alpha.ebuild b/games-strategy/0ad-data/0ad-data-0.0.23_alpha.ebuild
new file mode 100644
index 000000000000..9b33e87f7945
--- /dev/null
+++ b/games-strategy/0ad-data/0ad-data-0.0.23_alpha.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P="0ad-${PV/_/-}"
+DESCRIPTION="Data files for 0ad"
+HOMEPAGE="https://play0ad.com/"
+SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-data.tar.xz"
+
+LICENSE="GPL-2 CC-BY-SA-3.0 LPPL-1.3c BitstreamVera"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	rm binaries/data/tools/fontbuilder/fonts/*.txt
+}
+
+src_install() {
+	insinto /usr/share/0ad
+	doins -r binaries/data/*
+}
diff --git a/games-strategy/0ad-data/Manifest b/games-strategy/0ad-data/Manifest
index 706814012c95..64e4b07e2854 100644
--- a/games-strategy/0ad-data/Manifest
+++ b/games-strategy/0ad-data/Manifest
@@ -1,3 +1,5 @@
 DIST 0ad-0.0.22-alpha-unix-data.tar.xz 632555792 BLAKE2B 2b3fd05919e344136114903706d5ec452d432e1fb839e9324b23a627bd740e1994dd10db0d4345447950807908d0f299c745c7f0b6c3cb3215f5a23147ab3e51 SHA512 ff9928a59b461d4a6082227dce11b7a497e9e518b6cd3a58723963bed9241f7afc2b228e7728a3d03bd2a8c3708f756639b87abd6520d09dab01309c8444ff1d
+DIST 0ad-0.0.23-alpha-unix-data.tar.xz 691973492 BLAKE2B 7dcd36d21ea2c12f314f5a185a0fce57cec33754fbd26ad34c376fb9c7725fe5487e79a3da54249981fe58bf03c39350a871198a4cfb98c3a40eb878c6cc39b6 SHA512 9eae8bbdf83f609a0775261d691435c2924b505499fdf36ac0922b5f0c1d605dae49f257a872153c718d8bad018f6635320ec376418761c0d650bf165765e062
 EBUILD 0ad-data-0.0.22_alpha.ebuild 532 BLAKE2B ff7e7ac49fd99928ea0f0c67046db9b480a75af2dff228a6db4da328b5862260fb5372bf242b2dbc8d46969c46b3a917b57b1c80f37b444683810c159bad04f0 SHA512 6ab42ff53c6c0f97bc137c7f453a5a341839c02aef5bcd5ae30b31110e318ee3b8cd6731a2686ecb9e4ba08f4eb9083b3166bea4f17691e1ee55a50f0fa7e040
+EBUILD 0ad-data-0.0.23_alpha.ebuild 534 BLAKE2B 3517c0dc476b363aab702a25ef2bc4d19c2fd162b0c6c9ea41995b190215c8ff859d630700db8760cd80514d4197a4d4583cacf991d0b98118b755da1dc55e30 SHA512 d6d9d5de0fa84a76ca80d701de2e0d8340ac8990c83bd6238e66a180a02820112a3c1e20c2c75fa1e03b4fe4671cdde716092841bbe76c71db060b7ceb3452a3
 MISC metadata.xml 330 BLAKE2B 9f9fa8d997d33a71d11d118396fd718f8109e3e44410d5c8c2aeb54cc48b4c979e88922be7e5e9b0009e330b67ce85696fd747c52b2a23b51dc3e8d475c24254 SHA512 55b1c876bea472fc72321364ac95e97c950c675c68e9a32862eb6135b96f7bf7da5c0b787ddd28685b322a33c60dd51dafe1d382eb46e066a5cf8bd15fb5347f
diff --git a/games-strategy/0ad/0ad-0.0.23_alpha.ebuild b/games-strategy/0ad/0ad-0.0.23_alpha.ebuild
new file mode 100644
index 000000000000..0e44c4e36fb1
--- /dev/null
+++ b/games-strategy/0ad/0ad-0.0.23_alpha.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WX_GTK_VER="3.0"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads,ssl"
+
+inherit eutils wxwidgets toolchain-funcs gnome2-utils python-any-r1
+
+MY_P=0ad-${PV/_/-}
+DESCRIPTION="A free, real-time strategy game"
+HOMEPAGE="https://play0ad.com/"
+SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1 MIT CC-BY-SA-3.0 ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="editor +lobby nvtt pch test"
+RESTRICT="test"
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/icu:=
+	dev-libs/libsodium
+	dev-libs/libxml2
+	dev-libs/nspr
+	~games-strategy/0ad-data-${PV}
+	media-libs/libpng:0
+	media-libs/libsdl2[X,opengl,video]
+	media-libs/libvorbis
+	media-libs/openal
+	net-libs/enet:1.3
+	net-libs/miniupnpc:=
+	net-misc/curl
+	sys-libs/zlib
+	virtual/jpeg:0
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXcursor
+	editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
+	lobby? ( >=net-libs/gloox-1.0.20 )
+	nvtt? ( media-gfx/nvidia-texture-tools )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	test? ( dev-lang/perl )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	use editor && setup-wxwidgets
+}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.0.21_alpha-gentoo.patch
+)
+
+src_configure() {
+	local myconf=(
+		--with-system-nvtt
+		--with-system-miniupnpc
+		--minimal-flags
+		$(usex nvtt "" "--without-nvtt")
+		$(usex pch "" "--without-pch")
+		$(usex test "" "--without-tests")
+		$(usex editor "--atlas" "")
+		$(usex lobby "" "--without-lobby")
+		--collada
+		--bindir="/usr/bin"
+		--libdir="/usr/$(get_libdir)"/${PN}
+		--datadir="/usr/share/${PN}"
+		)
+
+	# stock premake4 does not work, use the shipped one
+	emake -C "${S}"/build/premake/premake4/build/gmake.unix
+
+	# regenerate scripts.c so our patch applies
+	cd "${S}"/build/premake/premake4 || die
+	"${S}"/build/premake/premake4/bin/release/premake4 embed || die
+
+	# rebuild premake again... this is the most stupid build system
+	emake -C "${S}"/build/premake/premake4/build/gmake.unix clean
+	emake -C "${S}"/build/premake/premake4/build/gmake.unix
+
+	# run premake to create build scripts
+	cd "${S}"/build/premake || die
+	"${S}"/build/premake/premake4/bin/release/premake4 \
+		--file="premake4.lua" \
+		--outpath="../workspaces/gcc/" \
+		--platform=$(usex amd64 "x64" "x32") \
+		--os=linux \
+		"${myconf[@]}" \
+		gmake || die "Premake failed"
+}
+
+src_compile() {
+	tc-export AR
+
+	# build bundled and patched spidermonkey
+	cd libraries/source/spidermonkey || die
+	JOBS="${MAKEOPTS}" ./build.sh || die
+	cd "${S}" || die
+
+	# build 3rd party fcollada
+	emake -C libraries/source/fcollada/src
+
+	# build 0ad
+	emake -C build/workspaces/gcc verbose=1
+}
+
+src_test() {
+	cd binaries/system || die
+	./test -libdir "${S}/binaries/system" || die "test phase failed"
+}
+
+src_install() {
+	newbin binaries/system/pyrogenesis 0ad
+	use editor && newbin binaries/system/ActorEditor 0ad-ActorEditor
+
+	insinto /usr/share/${PN}
+	doins -r binaries/data/l10n
+
+	exeinto /usr/$(get_libdir)/${PN}
+	doexe binaries/system/libCollada.so
+	doexe libraries/source/spidermonkey/lib/*.so
+	use editor && doexe binaries/system/libAtlasUI.so
+
+	dodoc binaries/system/readme.txt
+	doicon -s 128 build/resources/${PN}.png
+	make_desktop_entry ${PN}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-strategy/0ad/Manifest b/games-strategy/0ad/Manifest
index 5d730a297308..0ec270713ead 100644
--- a/games-strategy/0ad/Manifest
+++ b/games-strategy/0ad/Manifest
@@ -1,4 +1,6 @@
 AUX 0ad-0.0.21_alpha-gentoo.patch 3905 BLAKE2B 265020af1e1df234d0932c6294e0cda9c0f48bc1b311d6770c8347431c17e5e99c68f4c52cf6e1277ffb2e57431a6c237d2dc4f452e563eb343b06f62ab1eede SHA512 592e9fdff6ef6d88efc9c4a5c856e41240845187cc4a4b3d9d6b5c616eb1f664fdf702b7b0a30cdfeedd6d87ac0fab913df477567b84d42e13d2cf2761cfdec8
 DIST 0ad-0.0.22-alpha-unix-build.tar.xz 29199308 BLAKE2B a9204949e4dd669228b2a0e2c2dc5d2ccd4f18767e32c4f772714c61314ca0fb283d41201cb9f0547588a6dbdc20fd9d7d14ff153bc3087003c27f4ec2f6fef9 SHA512 3f917e77c6cc1d3fb585c98950db6eab3f5895ba3db41a8737f8172c769b5582689b436cab31eeafecce0e9639ee456afc7b78ebb03435b06512eb9fe7393771
+DIST 0ad-0.0.23-alpha-unix-build.tar.xz 31907988 BLAKE2B 567b9e1b5cd653206194e042f4f0859cd4f9afe75d52d3f480a328b76fdcdd746254502fbf284f790b4932c912ff31453bbc8c986c879ad76baa3d2a5db802c9 SHA512 4a1c86b19e0d8ec7d9b8bf75428df0255f95e7f991f419734f9b6ddc288a537405a34c5d7081f1a97475155c49013af85dee5c0265c35c7dbc003b46637a03d7
 EBUILD 0ad-0.0.22_alpha.ebuild 3388 BLAKE2B 527f19ac8a3dd38ee3f2d6005223ea45b76a01739640bae7456427c6687518a7a5fe60dd7cc77a13861c0bfd381e59fad8d81084a6245b84566dffa459035e2f SHA512 c7d221e6ee1c8e68686e82c245ba90878acb9a7fe64b1916fefdbba381e479f98419bbe06b0f4f7d3c8308d515ab0f88c97f5d29a299eadbd0d734511e6c1b34
+EBUILD 0ad-0.0.23_alpha.ebuild 3408 BLAKE2B bb6fbd77a2e9a0b27f086b33bb347ac5c5a8c76277b967359dfd8b4c7b6ea4b3f296aa150bacc3b3dd9a1460e5ebda436ad1429c5c1eaefe826a64403417ac1c SHA512 99db5ad39c1e0fe4ec9762df7c27e5ae12a1234007cd5d6e229110471affa705373015bb6e42e23b1f8ace93c5a3bae4afc204d966c5940f810415cd255186bc
 MISC metadata.xml 668 BLAKE2B 9bfa86da2d6e1631217082f88905d8d8be7a2c91248839b9a0f5da9d0c214552b11f4af861eb04072e4645b47505d83d0b93c1313f7a3857b1006f94a699b3b2 SHA512 7aab21c31587f1cce5b4635ace0fbbb5bcdc2a6d811df68494ac1fb251fbfc75911cfa3a9e1a60c28f684f64a919164c6e3504fd3fbba3b0ec05afe8278ae343
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 6bfd222f5ac4..22ab44d500b9 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/seven-kingdoms/Manifest b/games-strategy/seven-kingdoms/Manifest
index 87e041ab6bf4..32b874b17bde 100644
--- a/games-strategy/seven-kingdoms/Manifest
+++ b/games-strategy/seven-kingdoms/Manifest
@@ -1,6 +1,4 @@
 DIST 7kaa-2.14.7.tar.xz 31342092 BLAKE2B 1e2456ff8e40eace3185f842aad1d436e7e336eb4489a1a23022c89e7695ef1fc6f632d884d5d992c63f8b67f8b045fbda37e2fa3a07e9be13b9801d959b1e93 SHA512 5c2067a842af18f2eaa21267ee0c48064eecfc6b967eb2abf967f2bf782a9699186b038d87de03fad71b5d88ec9fc1cfddd7521cb90c255a3a8d2aa586d3f2c1
-DIST 7kaa-source-2.14.4.tar.bz2 27366752 BLAKE2B d80c5dcf0982cc2dddf29559c4f096392d88b916701e1fa21d2885aba254c8214920dd1be45a7ea6931e8f025647946d19b4158a22b824aa18e75c18ace8fe99 SHA512 7ee39aba89993d9f0041ab991e053069e0c3ab4298f74c0ec95e3f30f49a71731ef37d8870b1ab9afd97b1c4618a879492976006b8a513bfc4bc44dfac591bf0
 DIST 7kaa.png 559 BLAKE2B 0379e60a5355c93cddf2a5f30b5e84711f77df073db4e85eee13d51654180572cd73dc96e8a9b954101e8b0ecacd879d6fa9e57feb70b66d1bdd043d07a40113 SHA512 0ec1ba67107a7823943704879efaf12297c5441c43b54f49684550927b10dc40c657fe93eb7c4cc85208d08194f179c9602fd8df6545776f3e1b4481803b16e6
-EBUILD seven-kingdoms-2.14.4.ebuild 1415 BLAKE2B 737f051f651e20eb55317ba3201d57fbd1f4a38f798e5da4274ed3f291930050a3bbb6b21b9f4a492190bb2f7e5493b4d667ae51fd53d4d2b644a81475153ead SHA512 c5d8ed264a9e8e200fae0160f55f560e38e9b9f4118b1fb14a09dfa5c618f60b450568bf5d507c41542a6b4d9ad9123f14f961df19b0b300de573a19ef9caea0
 EBUILD seven-kingdoms-2.14.7.ebuild 783 BLAKE2B 88eb5caf7fad23b0924878a177f4dc4c7da78e928752ff6082350bc44635ab8b2e0c5286d14d5e36562eb23c6bff40e6e52d2b3d6b7bcbb298cf3df578f1ccf7 SHA512 f360b0580feefb5e53f0639e56aa206af62ac20932c0e624bff9865e449c31fe72d735cc7b204eb073252c6509872f2ce487a5ff00164ce4a79910d3bf3fefcc
-MISC metadata.xml 433 BLAKE2B a88d674bc0b6dc9e2c905743f5c3c1dd02bb8e5d885108da63d68895540a1df0c224ed9365f7ada6550e1c33643f1918d84904ee6bbe338dc7574e61cd179267 SHA512 5f83ff52f28bcd4ea5e54556ab408ef1a635ce20cec2b56a1424697309d97f4a6402f6c8d5c5b194017487c00ec2eeeb215a3e1e538914afb9a3ae94e390140b
+MISC metadata.xml 323 BLAKE2B d6893eaaa3f0dd7c230028000f15ed2964a7e7f4b2e5c710c61e2735aa27dafd4c2cff4deaec887854a68e7102f6df772fa8c1ae9c1286df68f115704e608049 SHA512 09f1b34120c01f3dd5f367a2b4ba99b7b89ef06362843e18bc320c7ce7eaea02cbc6c8a0d33541630758d77c6482bc88138d7cdfa1c4fa6dac7ca559d0feeff8
diff --git a/games-strategy/seven-kingdoms/metadata.xml b/games-strategy/seven-kingdoms/metadata.xml
index 2010db746631..4a1da05f9526 100644
--- a/games-strategy/seven-kingdoms/metadata.xml
+++ b/games-strategy/seven-kingdoms/metadata.xml
@@ -5,9 +5,6 @@
 		<email>pinkbyte@gentoo.org</email>
 		<name>Sergey Popov</name>
 	</maintainer>
-	<use>
-		<flag name="network">Enable support for multiplayer via <pkg>media-libs/sdl-net</pkg></flag>
-	</use>
 	<upstream>
 		<remote-id type="sourceforge">skfans</remote-id>
 	</upstream>
diff --git a/games-strategy/seven-kingdoms/seven-kingdoms-2.14.4.ebuild b/games-strategy/seven-kingdoms/seven-kingdoms-2.14.4.ebuild
deleted file mode 100644
index b82832b94681..000000000000
--- a/games-strategy/seven-kingdoms/seven-kingdoms-2.14.4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit autotools-utils games
-
-MY_PN="7kaa"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Seven Kingdoms: Ancient Adversaries"
-HOMEPAGE="http://7kfans.com/"
-SRC_URI="mirror://sourceforge/skfans/${MY_PN}-source-${PV}.tar.bz2
-	https://dev.gentoo.org/~pinkbyte/distfiles/${MY_PN}.png"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="network"
-
-DEPEND="media-libs/libsdl[X,video]
-	media-libs/openal
-	network? ( media-libs/sdl-net )
-	!games-strategy/seven-kingdoms-data"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( README )
-
-src_prepare() {
-	sed -i -e '/#include <player_desc.h>/a\#include <string.h>' src/multiplayer/common/player_desc.cpp || die 'sed failed'
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	# In current state debugging works only on Windows :-/
-	egamesconf \
-		$(use_enable network) \
-		--disable-debug \
-		--without-directx \
-		--without-wine \
-		--datadir="${GAMES_DATADIR}/${MY_PN}"
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	newgamesbin "src/client/${MY_PN}" "${MY_PN}.bin"
-	doicon "${DISTDIR}/${MY_PN}.png"
-	games_make_wrapper "${MY_PN}" "${GAMES_BINDIR}/${MY_PN}.bin" "${GAMES_DATADIR}/${MY_PN}"
-	make_desktop_entry "${MY_PN}" "Seven Kingdoms: Ancient Adversaries" "${MY_PN}" "Game;StrategyGame"
-
-	prepgamesdirs
-}
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index 673b438e8e5b..433f30c3a23e 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/ark/Manifest b/kde-apps/ark/Manifest
index 25ceeb82248c..d19318c264c5 100644
--- a/kde-apps/ark/Manifest
+++ b/kde-apps/ark/Manifest
@@ -1,5 +1,5 @@
 DIST ark-17.12.3.tar.xz 1970120 BLAKE2B b8e14f6b5f541c514107cf76b612edd99d6e0d97dfbe7600349bdcf2bd5afbfd1fcaf256d0358ff0c8838d8334a14ddd1ac5d29ce9befebe960444e0828aba5e SHA512 2f32f0107afa20ef115caddaf3c7ce6be37a575c72ea440f571312309d945a0e0491a4327db379e8ca7622a2b5016c5b2bbbfb3377d3b4272430f85b23fbb911
 DIST ark-18.04.1.tar.xz 1971344 BLAKE2B c1778e8777b6772f9ff72a23296b29daab9179c3ddc83297e46695f8e9b6c64490b3dad716104a5c9cbe936562481174a69d8356032caf901c0e8b91ae732ec2 SHA512 0a6a390f3771c4dc1d6386fcb17eac0416bc7494f6517d60a8007a676322b1986f6ff526ba8514a9f68913bd67f2105dfe9bfd1aa24feb2f19f67b442b1d1f8e
-EBUILD ark-17.12.3.ebuild 1834 BLAKE2B 89c23fab134592a27905dd66a4598b20df701ff11e9d2716b6015c85ee789779b90ac04077c4894544fd9e9cf92a878dd0cfa24f131d13075079aa29ff4cef37 SHA512 4577863a920fb488b2f275a78e74427176e4c2680ab604b6fe96c3e96ecacf692b1c757e09c787fb4a9a4b386094db4e1687d3fe61118ba570e9908201e06ff8
-EBUILD ark-18.04.1.ebuild 1836 BLAKE2B 0dbb76a934c833060023797c380d8bc57bec858c0ecaccae9eff606278c1e7a849788b4cd5f04ad26493e3b336e52ad27319152cdc8986c1cf48509700c1776b SHA512 669204c448e23da0fe05365dfefa81de2e88d5cfbad74d41944b21b0ef933b01f661e6e95529059008dd9f839cd3f0df51683866e5ceab625dcd19b95d8a15eb
+EBUILD ark-17.12.3.ebuild 1942 BLAKE2B 33c6fa57d3e3fca99e18c2cef0c2505ff239ea66f2f5bbc9fb177b293344c2b16360021902046fcbafc5ec6e71496fc47a96a07a849ae0a9cb75085d142bab9e SHA512 05f9578df0799c444409bac6ef1c7ac1824493a7080af68d9f908ef0a7bd6348722d2c2c2fdfd9e1e57296d7b5823416869cf57438def2e58942857db267e78a
+EBUILD ark-18.04.1.ebuild 1944 BLAKE2B 3f014c4d6621f7d41dbc11852b11b513ec6844bf73548e22461e503b7afaa2eba1e00a75a3286b4a355c473bd50c988a039c49b8195da3fbf92a2304fd5bacb4 SHA512 2aa41369da96eb37e926d8e8cced96313e30a9356fb96011aee678c29e4afde5b0e32d62734dd88e57fe6f6b32d9f699dac9429cee34a2333c519e639dd4fab5
 MISC metadata.xml 348 BLAKE2B 89cd42a24774f85082d025bc18402e0d4a36e07ab62155b67474a14c7294de3875d078167521f6cc4496f97f311de9264ff8c41e78477101a80d0ae2a034dcaf SHA512 447d60adfaec4e52c25d7a61a281b8b044c9a786a0600b8a8260a150f6842047f45b981aabb75e56255d05a918370113f6d2552fec1b88f661141453e003c472
diff --git a/kde-apps/ark/ark-17.12.3.ebuild b/kde-apps/ark/ark-17.12.3.ebuild
index e749e2732df5..cdcdabb24632 100644
--- a/kde-apps/ark/ark-17.12.3.ebuild
+++ b/kde-apps/ark/ark-17.12.3.ebuild
@@ -60,16 +60,16 @@ src_configure() {
 pkg_postinst() {
 	kde5_pkg_postinst
 
-	# not a typo, app-arch/unar is a real package
-	if ! has_version app-arch/unar ; then
-		elog "For handling rar archives, install app-arch/unar"
+	if ! has_version app-arch/unar && ! has_version app-arch/unrar; then
+		elog "For extracting rar archives, install app-arch/unar (free) or app-arch/unrar (non-free)."
 	fi
 
-	if ! has_version app-arch/p7zip ; then
-		elog "For handling 7-Zip archives, install app-arch/p7zip"
-	fi
+	has_version app-arch/rar || \
+		elog "For creating rar archives, installing app-arch/rar is required."
 
-	if ! has_version app-arch/lrzip ; then
-		elog "For handling lrz archives, install app-arch/lrzip"
-	fi
+	has_version app-arch/p7zip || \
+		elog "For handling 7-Zip archives, install app-arch/p7zip."
+
+	has_version app-arch/lrzip || \
+		elog "For handling lrz archives, install app-arch/lrzip."
 }
diff --git a/kde-apps/ark/ark-18.04.1.ebuild b/kde-apps/ark/ark-18.04.1.ebuild
index eb5ba8737873..7a5bb558b1c2 100644
--- a/kde-apps/ark/ark-18.04.1.ebuild
+++ b/kde-apps/ark/ark-18.04.1.ebuild
@@ -60,16 +60,16 @@ src_configure() {
 pkg_postinst() {
 	kde5_pkg_postinst
 
-	# not a typo, app-arch/unar is a real package
-	if ! has_version app-arch/unar ; then
-		elog "For handling rar archives, install app-arch/unar"
+	if ! has_version app-arch/unar && ! has_version app-arch/unrar; then
+		elog "For extracting rar archives, install app-arch/unar (free) or app-arch/unrar (non-free)."
 	fi
 
-	if ! has_version app-arch/p7zip ; then
-		elog "For handling 7-Zip archives, install app-arch/p7zip"
-	fi
+	has_version app-arch/rar || \
+		elog "For creating rar archives, installing app-arch/rar is required."
 
-	if ! has_version app-arch/lrzip ; then
-		elog "For handling lrz archives, install app-arch/lrzip"
-	fi
+	has_version app-arch/p7zip || \
+		elog "For handling 7-Zip archives, install app-arch/p7zip."
+
+	has_version app-arch/lrzip || \
+		elog "For handling lrz archives, install app-arch/lrzip."
 }
diff --git a/kde-apps/dolphin/Manifest b/kde-apps/dolphin/Manifest
index 15b66ef8d825..7da44b71c61c 100644
--- a/kde-apps/dolphin/Manifest
+++ b/kde-apps/dolphin/Manifest
@@ -1,5 +1,6 @@
+AUX dolphin-18.04.1-flto.patch 3061 BLAKE2B d24d99f9cebd2979d6e0b6c8edb30b552601ba502937313395dae35e9c21c2ec6b1978eaf949cb87c5846ea6a12fe535b4fc849b3d7547c6c95c5b75c0cfc2d9 SHA512 7af21ea15381a460b08c02d5dee0bc1702a2a30c0b86b2b8f1b937783a199fb3b3cc1f76ee827ac15ca934d0e975ad2e702053369477afa35990423abe7e9d63
 DIST dolphin-17.12.3.tar.xz 4841752 BLAKE2B 1f58cb0f1663e131a1b8dc58fc47d40a8a68bcb998fd3c6191f99176263523d40c1d9057b569c10c14e2a6b0be91b2eaaf07a54acdd386984d0da167cb84fabd SHA512 44cf8baaeead69dd5529ce7da96d78f507029fa47ac9ac50de9d77cb15335dd0b0e0c916f2cdd0d5cadc465e461115dbfd02c51af38d03da985d66bd22456136
 DIST dolphin-18.04.1.tar.xz 4849868 BLAKE2B 3335ced611590b51200135207b5bc5e2266504c7d556e8a903b6f3f63131547369d1fcccce8f13f93f4f15c84e695827ef4deb6088e5ec6219c15f85c140313f SHA512 13c9f45282168a4ae68b9d0977b1734918c662028043167ab36bc67b7b7f1756930a613e7bbd25bafc6db7e1591524f2ec3002247838ddbf0dc49037d4c7a0fd
 EBUILD dolphin-17.12.3.ebuild 2230 BLAKE2B 8e3d435eac7d521830bbd13122d7616bc5c54b786eef8386dad3c9b97447058a843d61c060308518c84e776787cdeb0e1b3399fc099f69faa6b7f055eae79c58 SHA512 b3999175d7bf0672fce3b697104b9fb024c9d0487dad8a40d1f37405ca7d611b2981a76629c024eb06cf7503c900a2a2d70c365d718fd8b173562103f1db975b
-EBUILD dolphin-18.04.1.ebuild 2232 BLAKE2B b4f046f19a528c78bf029e0a7834c4bee8759c053fdafb3c7cc199f527981090eb670b70fcff76854071a7fd656bc30da75b96cc60661724a0a54f0d3774a62f SHA512 d1fe6680f462eb3ee58bd6e12d13d0cf9594dbf14b8a4521d241c62e3a2a7d46e74b9a61120450a5037a9f9c61d349b0a0975c208fa0759e667788d4495b7fa5
-MISC metadata.xml 331 BLAKE2B a91c4bcb2198a9547445e94220760e327f2cfd2225e4189b4d5ec23ade31bd0c2560403cd085d91430fcde303df0cf25477b840aeda3010f332a3f053aa5aeaf SHA512 2946556cf6d92f1d2c33c44b4b261003d6e26f2829944082422afceab77f7a504dac7cc945fddaa0539953884b57a41dcc8f2f8b972b48fb4dca502b8a92d367
+EBUILD dolphin-18.04.1.ebuild 2275 BLAKE2B 13fc14e37471e745d503ef2fb3bd56bb9ba8369f652baef4be81336344ae69b80836adc02b64b9cb3c921a4df74586b12de84cc4e843524d85ac8d051d8769a8 SHA512 43d99858981bd3adeb81552a5563b6772a8cda7412c69fc51647a0be6ffee6dda93686c43bff6e8a2c84bc0f626d940ac9dd7d98bb694bca2f80fbd749e2cff2
+MISC metadata.xml 325 BLAKE2B 2526d5a76392c6c3ba96998586cab48d43c3bf87422c698fbfe009c398d2f84b13193f4cebd06e87b3f7856a83824e3ed3a34b902a437671fb9302de2af44674 SHA512 8a728d296c68f8046b32871bb185a467b1b03a25af3c026647d76b40d83d1f8ee959fac135b26ed1fdb3ec15cdb6c58c75d9fd128122331181530637e2d69169
diff --git a/kde-apps/dolphin/dolphin-18.04.1.ebuild b/kde-apps/dolphin/dolphin-18.04.1.ebuild
index 256cdd947622..6814ee4e99cb 100644
--- a/kde-apps/dolphin/dolphin-18.04.1.ebuild
+++ b/kde-apps/dolphin/dolphin-18.04.1.ebuild
@@ -62,6 +62,8 @@ RDEPEND="${DEPEND}
 
 RESTRICT+=" test"
 
+PATCHES=( "${FILESDIR}/${P}-flto.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
diff --git a/kde-apps/dolphin/files/dolphin-18.04.1-flto.patch b/kde-apps/dolphin/files/dolphin-18.04.1-flto.patch
new file mode 100644
index 000000000000..8edef6b36013
--- /dev/null
+++ b/kde-apps/dolphin/files/dolphin-18.04.1-flto.patch
@@ -0,0 +1,96 @@
+From b607091c3982f6b84732fcf0c23c1c3f0054f203 Mon Sep 17 00:00:00 2001
+From: Alexander Miller <alex.miller@gmx.de>
+Date: Fri, 18 May 2018 22:43:25 +0200
+Subject: [PATCH 1/2] Remove main.cpp from dolphinstatic_SRCS
+
+Summary:
+The file main.cpp is already in dolphin_SRCS and doesn't
+belong in dolphinstatic_SRCS.
+
+Normally the duplicate object is simply ignored, but with
+link time optimization (LTO), linking dolphin can fail.
+Apparently, the compiler tries to inline inline kdemain()
+in this case. That is undesirable anyway and it ultimately
+fails because the DBusInterface definition is not available:
+
+.../ccHEv6cl.ltrans0.ltrans.o: In function `DBusInterface::~DBusInterface()':
+<artificial>:(.text+0x2583): undefined reference to `vtable for DBusInterface'
+.../ccHEv6cl.ltrans0.ltrans.o: In function `DBusInterface::~DBusInterface()':
+<artificial>:(.text+0x5aa3): undefined reference to `vtable for DBusInterface'
+.../ccHEv6cl.ltrans0.ltrans.o: In function `kdemain':
+<artificial>:(.text+0x7686): undefined reference to `DBusInterface::DBusInterface()'
+<artificial>:(.text+0x7b64): undefined reference to `vtable for DBusInterface'
+collect2: error: ld returned 1 exit status
+
+See also <https://bugs.gentoo.org/655710>.
+
+Reviewers: #dolphin, elvisangelaccio
+
+Reviewed By: elvisangelaccio
+
+Subscribers: elvisangelaccio, asturmlechner, kfm-devel
+
+Tags: #dolphin
+
+Differential Revision: https://phabricator.kde.org/D12929
+---
+ src/CMakeLists.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 263b3ff0c..e8fe719a4 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -207,7 +207,6 @@ set(dolphinstatic_SRCS
+     dolphintabwidget.cpp
+     trash/dolphintrash.cpp
+     filterbar/filterbar.cpp
+-    main.cpp
+     panels/information/filemetadataconfigurationdialog.cpp
+     panels/information/informationpanel.cpp
+     panels/information/informationpanelcontent.cpp
+-- 
+2.17.0
+
+
+From 8e6f4eecd318041d2e4e6386d1660742dd4ddd89 Mon Sep 17 00:00:00 2001
+From: Alexander Miller <alex.miller@gmx.de>
+Date: Fri, 18 May 2018 22:44:52 +0200
+Subject: [PATCH 2/2] Make target_link_libraries for kdeinit_dolphin PRIVATE
+
+Summary:
+There is no need to add all of kdeinit_dolphin's
+dependencies (including the static archive) when
+linking dolphin; kdemain is the only needed symbol.
+Mark the link libraries PRIVATE to simplify the
+link command for dolphin.
+
+Reviewers: #dolphin, elvisangelaccio
+
+Reviewed By: elvisangelaccio
+
+Subscribers: asturmlechner, kfm-devel
+
+Tags: #dolphin
+
+Differential Revision: https://phabricator.kde.org/D12931
+---
+ src/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index e8fe719a4..beaa0ec50 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -299,7 +299,7 @@ ecm_add_app_icon(dolphin_SRCS ICONS ${ICONS_SRCS})
+ kf5_add_kdeinit_executable(dolphin ${dolphin_SRCS})
+ 
+ 
+-target_link_libraries(kdeinit_dolphin
++target_link_libraries(kdeinit_dolphin PRIVATE
+     dolphinstatic
+     dolphinprivate
+ )
+-- 
+2.17.0
+
diff --git a/kde-apps/dolphin/metadata.xml b/kde-apps/dolphin/metadata.xml
index b3bd92dee775..6038ccc85636 100644
--- a/kde-apps/dolphin/metadata.xml
+++ b/kde-apps/dolphin/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<use>
-		<flag name="thumbnail">Enables video thumbnail generation</flag>
+		<flag name="thumbnail">Enables thumbnail generation</flag>
 	</use>
 	<maintainer type="project">
 		<email>kde@gentoo.org</email>
diff --git a/kde-apps/kio-extras/Manifest b/kde-apps/kio-extras/Manifest
index fd8834f390e2..0c1b8b35116b 100644
--- a/kde-apps/kio-extras/Manifest
+++ b/kde-apps/kio-extras/Manifest
@@ -2,4 +2,4 @@ DIST kio-extras-17.12.3.tar.xz 555544 BLAKE2B f8821e0ce5c3f6a7a28ae6a5d672227697
 DIST kio-extras-18.04.1.tar.xz 549832 BLAKE2B 5771114528fbdd65a909d8a9674df1bf4160e3d7f5716245d5aa9cc5a6dbbb31bf07f45c22106316bd090bf48934fb7d866a4d97fa192a962cb5d398d82b4c08 SHA512 7a08fabf8ff3cc03b02e88f38e889798489e1997c6678635c07c7597bbd9142450030e28958d4ccfd5e1aabc2ba0b213faa981fc30256d7edb76217ae99e40bc
 EBUILD kio-extras-17.12.3.ebuild 2296 BLAKE2B 765a560c155d84d38e9b2112ffc9bbb8c24b25fbf77e45a82b263c4a84ef0931b3d42f75f37416b685ce630e0988bcde065c513ba70e16cfb76dc380b34781b6 SHA512 6d7d7f1f347b11b038d6d0c224f26762068b495b90447d82f2ca4b9e54f45529ffd37250d60a1c273e5e8e95fc3e97e819d7381e0ebcf3ce003a238276d42bae
 EBUILD kio-extras-18.04.1.ebuild 2225 BLAKE2B 1fee0b466ed3ff3feb108bcbfdac696749c94b550bf17d9b5e86f86359926c8b0404c29341192a4ee1a1bea14fa5fe400b0355cf63ebe370690d150e396aa42d SHA512 67b691874315de0d52cadab2f404d54d63b1677f660c80cf2cd8ee966ff2967f83bf46080a74c2b3e03ca600af93ebd652b61c3f5240b1010487659d96acd818
-MISC metadata.xml 679 BLAKE2B d5e3be772a13920bb093a4314931eac48f5a398582794ef769869d4f1e7c0d8136a12ebd1ce2fecccaaae99001194533b6c08b34a7f1a1e33c711e233428997a SHA512 018a5237fe9ace1ffba82c4dd5d3a4ce6228244476a163fb01ab5f914262cb20ff77d58e8dcc99713071ceb1764b9bc24fb61a8713001059b057963a9620abf3
+MISC metadata.xml 765 BLAKE2B dc7954f6adcbf433e73a70b1e352c0522d61a9dbcd09894584407d5bad621788b36eb8e9f5f79c83b923baf11b14dea8372244d06f005220c282549a7d8f3dd6 SHA512 63acedc06b541f4150c89fc289ce05b86fab57de253e33626fbe9b02ca0511e9d34cdc1169c1559945ee1621f46aad09fd526c7fa647ffd1cc04e09509516378
diff --git a/kde-apps/kio-extras/metadata.xml b/kde-apps/kio-extras/metadata.xml
index c32c83220788..eb1ddeffa305 100644
--- a/kde-apps/kio-extras/metadata.xml
+++ b/kde-apps/kio-extras/metadata.xml
@@ -11,5 +11,6 @@
 		<flag name="man">Enable manpages kioslave</flag>
 		<flag name="phonon">Enable file audio preview plugin using <pkg>media-libs/phonon</pkg></flag>
 		<flag name="sftp">Enable SFTP protocol support using <pkg>net-libs/libssh</pkg></flag>
+		<flag name="taglib">Enable audio thumbnails via <pkg>media-libs/taglib</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/kde-apps/kopete/Manifest b/kde-apps/kopete/Manifest
index cde794836346..3c0a4d37a4ec 100644
--- a/kde-apps/kopete/Manifest
+++ b/kde-apps/kopete/Manifest
@@ -1,3 +1,3 @@
 DIST kopete-18.04.1.tar.xz 9733608 BLAKE2B 33879b2d95c47f1d21e50b0577c82ce8a619d2967b8b6389cac11b0bd3b1235c9789b28e318f89387496639669cbebaa1e109d479b6365622bef74cb9d127d04 SHA512 2b503ba717d4b64823a64eb093bc4ddbdeb7cb7ae0a73827eaa4a8ae4ad3a5aacf33c4d9e3cc28d88bc4f915418135ddb6b236e5c9d8227e14c802f8b9385e6a
 EBUILD kopete-18.04.1.ebuild 4615 BLAKE2B b6d483eb30ee85504a8ff917549d13354be4b907827d61c398303ce594086c536a8570561fd0bf1e4dd5e719ccad49ad4281d3727c283f06381e59e1a0720fc7 SHA512 c56282f80044aa835bec79c03b0e4b03b54641c41e262cf02fa1bc0f56c52de09f2cd5fa5c6bca01f8ae7ecdcde4f13a2c481530e01ed3078948f7e68cedb799
-MISC metadata.xml 2351 BLAKE2B 0f8ef4e3906f98a4be58f252fe1beb8ff8a9bb872584e5be9432d63a4932872a81c3036a9cd0d72d98a1ce961ef79194b613b5115e19970e352d5b832bcb6b44 SHA512 2b0350f15c75e45326fc0a6c16f875a2b923726de45ff8558e55c7a592c3c033c0f518f85f9cb4dea3bf54b9c182ec0ea083f3b11b878d398df6d7429a3f75d1
+MISC metadata.xml 2090 BLAKE2B 33e9e9e73f5140e7775f5e8b00ba6c96b66e99457fcd460a84d3f191b65b2af1c99d18526c2b43e2f71cdf58c1f6668c23e00e65d38aa2417bd9d48ae1e55f92 SHA512 24e7bd54aacee76798f9182a145c4bd271effcc624aa9283bed05e5fb156feabd73d5d29143034158fda85feef2f43100c5d9ded586a8136ca63438560dc7136
diff --git a/kde-apps/kopete/metadata.xml b/kde-apps/kopete/metadata.xml
index 64e9226784bf..0cefd8509a69 100644
--- a/kde-apps/kopete/metadata.xml
+++ b/kde-apps/kopete/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<!-- PLUGINS -->
 		<flag name="addbookmarks">Automatically add incoming urls to bookmarks.</flag>
@@ -21,20 +25,10 @@
 		<!-- PROTOCOLS -->
 		<flag name="gadu">Enable the Gadu protocol handler.</flag>
 		<flag name="groupwise">Enable the Groupwise protocol handler.</flag>
-		<!-- uncomment this when enabled in ebuild
-		<flag name="irc">Enable the IRC protocol handler.</flag>
-		-->
 		<flag name="meanwhile">Enable the Sametime protocol handler.</flag>
-		<!-- uncomment this when enabled in ebuild
-		<flag name="telepathy">Enable support for the real-time communication framework telepathy.</flag>
-		-->
 		<flag name="testbed">Enable the testbed protocol.</flag>
 		<flag name="winpopup">Enable pop-up messages sending on windows. (same as good old "net send" messages ;])</flag>
 		<flag name="yahoo">Enable yahoo protocol support.</flag>
 		<flag name="zeroconf">Enable Link-Local Messaging via the bonjour protocol.</flag>
 	</use>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/libkipi/Manifest b/kde-apps/libkipi/Manifest
index 6ef8c14e9dad..35d44715ae61 100644
--- a/kde-apps/libkipi/Manifest
+++ b/kde-apps/libkipi/Manifest
@@ -2,4 +2,4 @@ DIST libkipi-17.12.3.tar.xz 103492 BLAKE2B c1833e63fad20cff775d9e047dff4df5ef98d
 DIST libkipi-18.04.1.tar.xz 103640 BLAKE2B 7cb5f87ea59495517b689eda819603766d78e58d463cbb5d1bc7f30c2bb3be1dfaf5061ca57c0f42907d35c7eece6b766198663ee14be01900195dfe650af07d SHA512 b495ad4db5a29da2cf7d05d35e4abad2ded1b3b7497d601ab074b3604d14eef9c2c5e04ebcae0afcc53bdaa91f8522a4e4e601cfc2b298f49b6dfcf7d594704b
 EBUILD libkipi-17.12.3.ebuild 565 BLAKE2B acee4da04f26efc545d222e1c19f89798033e9490457538e053b9d2d454a705aca5afa45525db0fd9f46bd79a9f5a5acb3c2ab78f47e63904d3e26d94c345886 SHA512 cd81c2e285559058b0cf2f400cca5ce4ed7ee59f95d695ec92d378e5c1c10d69a25dcd3d23ade4f6ee77fb0c31ccfc92bc4ebe1fd401b7cd10fe0cef63995113
 EBUILD libkipi-18.04.1.ebuild 567 BLAKE2B 82932dbb414788179a2e99d71892d55fa392831a5048cea801876c439fab5bfc30c3295d9f04aaa5f26ea5b66cea662d10a7e44a8c84373271aa84d59fad20cf SHA512 f6a8e5b46a04e01c44d6cab1e0317f744a4b3e8306caf7e9c05855cbcf308be9de1fd3d40ffcdf1bc326045789d0281320695a48eb6db9b107b847bd2bebf753
-MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
+MISC metadata.xml 335 BLAKE2B 5c247ec0a28d838467da7959769e291841df01349fac42c6565236f00d0c20a0f577c3595516ee28f2910ba7b35748accf740ca25004bf299e73220551805a88 SHA512 52f1ab2e6580181b506efe3c169d0697c00fdcbbf12fa711f6affac5bbdb065aefec398bd806c6f75ba9464e2559a371332e35ab33b90bf8cb6d245f220d7d33
diff --git a/kde-apps/libkipi/metadata.xml b/kde-apps/libkipi/metadata.xml
index 2fdbf33d963d..acef20363a48 100644
--- a/kde-apps/libkipi/metadata.xml
+++ b/kde-apps/libkipi/metadata.xml
@@ -5,4 +5,7 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
+	<slots>
+		<subslots>Reflects ABI compatibility of libKF5Kipi.so</subslots>
+	</slots>
 </pkgmetadata>
diff --git a/kde-apps/step/Manifest b/kde-apps/step/Manifest
index 93a069604655..dc4c4f2f1d91 100644
--- a/kde-apps/step/Manifest
+++ b/kde-apps/step/Manifest
@@ -2,4 +2,4 @@ DIST step-17.12.3.tar.xz 862236 BLAKE2B b931d732c54467fefbf217326776b4ca664c93f3
 DIST step-18.04.1.tar.xz 862508 BLAKE2B abf2aa2f6f56fa35d4750c96304a85c36d4ccc22c382fb2bb222ffac4d011823884b59c7214fc4f1d856509e442deef6105e6b22ed8dcddf3c866aee543e2791 SHA512 cc790b66ba845bcc97820c3a81d9a5899a3977c99108dd286d09f06b0b8e6f91e2f92440bd8404af584f026e8e3c32ff14b7b7b8acada604ea39fa4261a3c5f3
 EBUILD step-17.12.3.ebuild 1578 BLAKE2B 154226cbb51fc9a345ab059ce1af8c7a7d3cf3dc868f7f3992ee644041ed2010bf16579703c2f83bd1cc7b5fe28de727cd76a19f829796b8ef35da2ced0b5d53 SHA512 7d9dea75d6d531c4c649f059f3fd268b8107b9f57c4cf4ed6de11bb245a312e9892566ec07f1d99e41eb2bc3796f96312da4e2c82e35417cb9cb0b1719ba6e5e
 EBUILD step-18.04.1.ebuild 1489 BLAKE2B b3856e1ce092d3485e1cec6932a64809c17f989fa94673639561fe065c963a6c07a06fd14a2b75b7bc707c37d548dd8c58b1bd817f448531911dc91df0e089cd SHA512 4e42856ed4796035fc4fd318c42310eef2d3fb496ef4a69f3fdc4ef2043a281c4decfedac7095f5cae56a0f7ae9d2ad684d125850359c61228df2efa5e45957d
-MISC metadata.xml 348 BLAKE2B e238f960586796416f3a60ab5c9fab8df0d88b79c76530be5243c3b2f4dedc98c87c343aae8e950a40a9876d75622fb6da96b6c697a3ff55fb6bede25fe160a5 SHA512 58a3225b3993d3bd5db5d5cc5b0660fd42034e593e8fb4d657f8e6ed86e4db57df66b99a6edafc6aebf356542edcb7516cd6fe70cda6b7c8ce9a002455531b70
+MISC metadata.xml 348 BLAKE2B 2272eeeaddfebea19cd0eb32819f025ac5ded6b7b9b7958a88a0305cfda2913f8eed8075ad4990d6a30dd256e45badc36fc2f59c844c62d506e9d0fff1cd5078 SHA512 7e79f2809e7ce64f797e87c45a84fdae86a535e95df724521e5e5c5c7c152d6426fc09fdbdc2b863fdd646b673637abb4cde531d7f203242c6ba82814881e830
diff --git a/kde-apps/step/metadata.xml b/kde-apps/step/metadata.xml
index 4db78025bcce..f6287bcadeb7 100644
--- a/kde-apps/step/metadata.xml
+++ b/kde-apps/step/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<use>
-		<flag name="qalculate">Enable the libqalculate library for unit conversion</flag>
-	</use>
 	<maintainer type="project">
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
+	<use>
+		<flag name="qalculate">Enable the libqalculate library for unit conversion</flag>
+	</use>
 </pkgmetadata>
diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index 197340e546ec..df734c28489d 100644
--- a/kde-misc/Manifest.gz
+++ b/kde-misc/Manifest.gz
diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index bf0780664db4..79fdbdf8e220 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,4 +1,4 @@
 AUX kdiff3-0.9.98_p20170219-cli-args.patch 3620 BLAKE2B c85c377a8c5898a15233f5f4a1260dbd24c50f53869e673979c9d5ac42c2729a7cad39d066e0f4b6ae2f31687aa246c9420f1803c003168eb8e9b3bd7d43ed1b SHA512 5231791c4147a6e54d784fbb39d0088dedd22d15c77c91e293bccb42046417bb32d6354a5032f5da1daa60b3ef9a46800932092b0891c58bdbc0dd9592be7a41
 DIST kdiff3-0.9.98_p20170219.tar.xz 798588 BLAKE2B 6b9604f0f5cececa586fc2fadb7da1bdf060c114d1f644d95ace5d898eb3c62e3addc5c53a6b2e7b959411742b1f13b07bf05667dc32f793fa5faf16f52c4927 SHA512 847410bb6eb9ba19f4dab2d2a8c46c78a6c3c90a578df22bedad8d471902c8bf393c91d77050b68ad0f4e4a4cc1f7898ef11b66c1ddcb34e182506a43932df64
 EBUILD kdiff3-0.9.98_p20170219-r1.ebuild 914 BLAKE2B 2575524af4656ebad0ca450a2ebf7039a3bd76128b14a6e9b0e9e08707ba79b4a7b328a9026ab5ebb5ac589f8539e750ce12a3a302d23e61334ba793618396ab SHA512 65821bcbcdec147a55c9b989cde2c45ea68bbf947436c890aaf3b3affc4dc0f293183f5036ac81b12e5d41e9e86cb6815edac3aff235eebaa5afa4ca93007d0c
-MISC metadata.xml 328 BLAKE2B da7a613bf8937e195addb013693837d70374e3b404c7c0573683d1d121b2ab5e6feb0b8be398d358d4298ff70ed8c03f0a878c2f454f11adc6d21758b02fe45b SHA512 440377f9aafbfb2b51e3ded2651cf638c918805328cf43474b62662d32a80592a30af92ed90a230a5306e3b05eb441bc72a8f14461282b8231cf68b08dc5cf34
+MISC metadata.xml 252 BLAKE2B f7125c07f7cb9fe1a8d301f198091320ba83ef3547e579b9825298715066ba3506be216900b5317106da011f95df9411b99b100f14f741832ab500fda6acb788 SHA512 6a56c24e3731dd9512fa264d3dce1fe36ace891a17394c483586e0be1fffd153e901228d3ee9c471a226b04cec27d3f78ed2de491e46238de4b06538dab7e724
diff --git a/kde-misc/kdiff3/metadata.xml b/kde-misc/kdiff3/metadata.xml
index d87d3af8d717..7d273a80ff68 100644
--- a/kde-misc/kdiff3/metadata.xml
+++ b/kde-misc/kdiff3/metadata.xml
@@ -5,7 +5,4 @@
 		<email>voyageur@gentoo.org</email>
 		<name>Bernard Cafarelli</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">kdiff3</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/kde-misc/krename/Manifest b/kde-misc/krename/Manifest
index 9a5969be8f25..5c7925a452de 100644
--- a/kde-misc/krename/Manifest
+++ b/kde-misc/krename/Manifest
@@ -1,3 +1,3 @@
 DIST krename-5.0.0.tar.xz 279968 BLAKE2B fefbcb4ba1bac3f505db9392c3407af780ae7669f6bf105dd9faca32b0527e64b0a9a8590ac7df429d2cdbc2fe0028eca1215c056f895038f1c02685e42636a6 SHA512 9a52d921342f81990236aecb260beebca04f65578b34704c338f94214117d0e18d8b39e9832ddb5fed39a8f1d9f58f05a445e7dec3631e7cac062f30fce09597
 EBUILD krename-5.0.0.ebuild 1330 BLAKE2B 97c1d917a35a9fdbbb3942ba18d38369fc3a30c63f01d1a29a7fb6006f4d87e28d8d07e9407354adb645af0df44fda34f65812f374362a0402910e07beae85f0 SHA512 b13a603b11173fa252b9bb3b04d5c4298a75c4432d12cf8a82d8562b478d4a3ad3342d39fb4f72dcb56aef02446b29971b822cc865ddfc657048b6fe07a2c007
-MISC metadata.xml 326 BLAKE2B 162b6b74c0a5c56f67fdf92c854a4b4b76103283cfce1116fd87d55d8c6ae8f43af099069d332dfa39c8342fc080e453c24bf82e74559fe8f3a41ab902257d00 SHA512 fe1996efa870db723392ce776238f79112dae876116d156cd0a9017050709e435ff3d864178472a772f268a12c185a3696ca2d1876232e8da993cfa099c71ff8
+MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-misc/krename/metadata.xml b/kde-misc/krename/metadata.xml
index 5ccbf652e8f0..2fdbf33d963d 100644
--- a/kde-misc/krename/metadata.xml
+++ b/kde-misc/krename/metadata.xml
@@ -5,7 +5,4 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">krename</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/kde-misc/krusader/Manifest b/kde-misc/krusader/Manifest
index 29a8537f85a1..ec5cc4168c97 100644
--- a/kde-misc/krusader/Manifest
+++ b/kde-misc/krusader/Manifest
@@ -2,4 +2,4 @@ DIST krusader-2.6.0.tar.xz 2726928 BLAKE2B dd631feec2f82657bd3e66130feebc6db1cd5
 DIST krusader-2.7.0.tar.xz 2875080 BLAKE2B 503e40f7c617779b64b2f5600ae99063d0727ed6781b4b86dcc52b57c56589107ca6bed5fdcbfc37f4d4c682e23a926afb6dc3d758d8e573d019d687dbfe76be SHA512 254b1a0a68fca010dfe79d8364ca745dacc2b5899c9b99d6c576b95e9ac8a564a59a291568158ec1f114b0e2c0137e2a9e7a9b4c01497539e6a9a9d5b7411b1d
 EBUILD krusader-2.6.0.ebuild 1889 BLAKE2B fa95883981266414121c72c14a6c98099ea6b3ae50f0a237cdca4923db0a8604069f511fbb952a16298683bc9fcfb1079e2fc509c133a008b2e85578e2120532 SHA512 f8243710647156d0acfb46294bff31aa3f43f42de08c9b0a6aa5cb86899339e366e6a2ba03ca2e6a3a64ba537ba601c4f88d57108e52d4d00acc034947792640
 EBUILD krusader-2.7.0.ebuild 1891 BLAKE2B 1c0ddaa10de32a5ca101beeeb22f919ee87988b5fce246c47fba1fb0396763c34626830175e6b045b4526cf741e7c98182ca80efef221f458ac3695d5bd01b33 SHA512 3f3c029b8b36a2f54ff75873d6067431cb69b541e9492a3164379d6966ec33d186962cdb7283db6d94e6c8e671468fe9a79b8b40390571fb2cd61ea257326216
-MISC metadata.xml 327 BLAKE2B 48b8492cf40044c2ee042dac394fe06622372393f9c084c9a913762ac168883acbfedf6adf9e3474e5aabad12008d8c1c2da590c0f3554a5753a122711f18137 SHA512 ebce7608c6cc9b9665506f97f20bc6c34c5ab4e6203deddd46975dc6001696563c66896383c04b0d3d729a9d5469c76f8bee0f410b8a25ec24db7afa9351d9d2
+MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-misc/krusader/metadata.xml b/kde-misc/krusader/metadata.xml
index 13bd40c43a24..2fdbf33d963d 100644
--- a/kde-misc/krusader/metadata.xml
+++ b/kde-misc/krusader/metadata.xml
@@ -5,7 +5,4 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">krusader</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index 819fa358e6e3..33fef4795d05 100644
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
diff --git a/kde-plasma/libkscreen/Manifest b/kde-plasma/libkscreen/Manifest
index 4304c7ca4565..d5b8cf8011de 100644
--- a/kde-plasma/libkscreen/Manifest
+++ b/kde-plasma/libkscreen/Manifest
@@ -2,4 +2,4 @@ DIST libkscreen-5.11.5.tar.xz 96556 BLAKE2B e0744934eab4e8f906000ba61ccb0bd8dadd
 DIST libkscreen-5.12.5.tar.xz 94848 BLAKE2B b5d50776596cbbcb3b2bb93e00041fe385f98eab04bacb556077c91dd9ab7a191449f051be17d78b60bc207843afe2b4edbf33c9e72a828e2cd35787438908da SHA512 67d74a8b422559099bbaa55b547bc4de05952512dfb76ad73cfe209b8f3e13ba09e23b64f4fc4f2a992dd04e47d99f8dced9a24583349067fde8d9949dfb1ad3
 EBUILD libkscreen-5.11.5.ebuild 501 BLAKE2B 315265c1c6421fce51b41f6a6d108b5ecac4ff1d43bd8a19a3f87e246b6834b8a54ff4810a0d789424037ea43d67781229daaea1947927b13edeb48a67069448 SHA512 bfd421bd2e8a96688fa0ae0673954f7a115d2443e2aff066ed3d4a4f9cc5b4d5537f80d1fe7f323dfe847303bc65196bd45130d59e25efc9769d35474c06aba5
 EBUILD libkscreen-5.12.5.ebuild 502 BLAKE2B 145ca07dde8ea9188c0ef50a231e03a62d127fe645404539678ec2108dfa5ecdd922184d6aaa95658f42b6f49ffaac706d2abe5d43035bf1464856f25df36d77 SHA512 53a63d71fb170a9af44c694a2ff0a631a85d70ca4966a9791bd341e79e23c315450332df4b937ae41a71c0cd1135e2c1fa911e56bc9859b128fe9e56e373a774
-MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
+MISC metadata.xml 337 BLAKE2B 9be36b63c5f53824f31a72360abc64456d7ac99fc2e798ec0653876215bea6faaf31490bb9ad775c4f38a548e7c32a61c425e301f53d6bf38a6b3cd99d100dcf SHA512 d515a27ce1085555a5268218a4db0ca594acab5210e2bb5e307c2e488fe69df1f5b5816123afb8e220ad435397e5ac89a9daa6dba94559ac0b9412e9756e3cdc
diff --git a/kde-plasma/libkscreen/metadata.xml b/kde-plasma/libkscreen/metadata.xml
index 2fdbf33d963d..850a6ce4f918 100644
--- a/kde-plasma/libkscreen/metadata.xml
+++ b/kde-plasma/libkscreen/metadata.xml
@@ -5,4 +5,7 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
+	<slots>
+		<subslots>Reflects ABI compatibility of libKF5Screen.so</subslots>
+	</slots>
 </pkgmetadata>
diff --git a/kde-plasma/plasma-meta/Manifest b/kde-plasma/plasma-meta/Manifest
index 9ab69633d8d4..83267b1d3492 100644
--- a/kde-plasma/plasma-meta/Manifest
+++ b/kde-plasma/plasma-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD plasma-meta-5.11.5.ebuild 2000 BLAKE2B bb5660a59599dd6d868010aa62a21baffeaee05667c921864a0cea0a6ae52bd6ecea67693d8a91498e6c3c73ccbaf13745a602425913766f004666828a799343 SHA512 ff0cce1055e377dfcd256a2bd26aa53d7ea6c2342bc4b1ad7bc6a07e5a0db809a003ba1bc37c31d2d6bc7cfd576e751dd41c7a38b8ed800a06c8e940186696b8
 EBUILD plasma-meta-5.12.5.ebuild 2140 BLAKE2B 3932e79c7eea9c113beab08d9e2ca75b613cf9d9799def9f53db789cb39948f3827ab902a949110fb57f540af2e98fe817343fc1a62dd010c1ad435fc2cbbc90 SHA512 978d7faf30a752770ff8296a64532e29e0771594cb5edf7ef72f2cb15f14a6506c5d1844987f8eee3939aad57d166ce8b4c4bad9abb9c925632127449f01e6a5
-MISC metadata.xml 1224 BLAKE2B f36ed48ffc55a03d4a79349eeb85cb36811d10e6ab2ca993f254b803a8fb2b320320985fb773e2734282f2210ebb9cc8220b1b78114f3622e3bf089ff10b0909 SHA512 cf8ac08d51562b13cd4158e4ea09aa63918947b8fbfea1dec5e23f33748b28b310c110283318b796f04a27f3a9c86524990cd991ace46c1f9e1ccc0f49c94ebf
+MISC metadata.xml 1199 BLAKE2B a5c21c8b9bedcf1ff127c79779ce8cc0b8afd6c88d4ad71890a621400abad2896b55c11942373cafb16347b8afe572c67ada4e33cdc553ac4efb8f126f5ca5e9 SHA512 de4cf365354410f2ecc83ed1cd3f8adf35e08ecb54fba4eb267b31dfbebe43b893c28642ab7760b66bc3de1cf06990850db799f03e15ea5cc86c902be4e5dfd2
diff --git a/kde-plasma/plasma-meta/metadata.xml b/kde-plasma/plasma-meta/metadata.xml
index 7b92b86c3430..cdf1585f9f20 100644
--- a/kde-plasma/plasma-meta/metadata.xml
+++ b/kde-plasma/plasma-meta/metadata.xml
@@ -10,7 +10,7 @@
 		<flag name="display-manager">Pull in a graphical display manager</flag>
 		<flag name="grub">Pull in Breeze theme for <pkg>sys-boot/grub</pkg></flag>
 		<flag name="gtk">Enable Breeze widget style and KCM for GTK2 and GTK3</flag>
-		<flag name="legacy-systray">Add support for applications using legacy xembed systray icons, depending on USE qt4 or gtk.</flag>
+		<flag name="legacy-systray">Add support for GTK+ applications using legacy xembed systray icons</flag>
 		<flag name="pam">Enable support for kwallet auto-unlocking</flag>
 		<flag name="plymouth">Pull in Breeze theme for <pkg>sys-boot/plymouth</pkg></flag>
 		<flag name="pulseaudio">Install Plasma applet for PulseAudio volume management</flag>
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 1b5bd3b6b481..c6594efa5190 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 41fc2920da88..300bd00cd82b 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,12 +1,15 @@
 AUX Muttrc 667 BLAKE2B 49aaefba7ceeefde9d727ad88574fc599a48bcd334ac8e99d8d5e555f2317f4595c480f1903df4b82854bfd272b8aee86a02369769f38a3cadf35f6a6348bf14 SHA512 b64d6e857f0c7de2e2e5b23cecd869f8a9807aa827ad6221e3c5864b2a31fb0136aeaf09ffdb2549645507fe92f724774a80395b6ab2345068903f5ee1269f29
 AUX Muttrc.mbox 486 BLAKE2B dd7f15b08f185800b2a7d26545e5a1b0f7b21f8f7cff2b4fce39fb58d8e336bec6fd500b88c0b14d026c9578d12cd1e4bca45c0d2f3d286d2c9d132b2b5e137e SHA512 aece9a734d292b6f638d2a0dd39f20d9894b4bb6e6888da606a49274faef9c1864e98eec907ffa7742af58d46456e46b8945d2d47c8b89fc95daa2a8833d3e90
+DIST mutt-1.10.0.tar.gz 4249980 BLAKE2B eed788b0d0105d232cd0fbc50320fe4a3ef36635131e03cc477f0cf003c299b5d78994cb6467fcb6d45ca46a073c8997fdc42a669a3fa7662ac21ae70ae082c2 SHA512 4cade7f17e157c8c2184c96d596d9dbfab704d300074eca66c567f2dab055caa9b828080cce92e2616176000219288630c33542ab83a98db0160cd085b937530
 DIST mutt-1.7.2.tar.gz 4025880 BLAKE2B ab0430ffb10d03e3e904d54540db6c0aecb4590daa8a1d1add710a9e485b2e7e80f707e6649ff0674d53d3578eb75e4ed5c39f1036b3fa43c00bb5c4f2d15cc5 SHA512 5f13cbdf802bca80668b2f54bc66201d01bfe34c7f377b1bad88f8fa0e0c695264ff0bf6b64ae9bb6f5a3e22b6f096d2dd99fa36724937609f6f46e6a74da74e
 DIST mutt-1.9.4.tar.gz 4197655 BLAKE2B b34224622f590f2cb528644c636e6f5ddc39215f8e0b348c2444cfb8563636ceff52e5a0981e8279bb2d6e48814493ffdbb1122ba6d3e78a9904e8cc2e407398 SHA512 b8266af8b487f5be238d03f717ddd69b3dc2eeb4e3ada2c2651c9ad7e0558b92f2c256361a4f688cf80c500c490d47c0e3ef5972bdf1208693da7868a58aca6b
 DIST mutt-1.9.5.tar.gz 4207937 BLAKE2B 0ea5473995e48bbe957506a1e66eb4be234ab9b79c94aee53dbe261baf4b396096648448662ecc17a926ab16369505beda3dd93d2df35397d445d542f53be663 SHA512 08ceeb7b212f74e4e2b18fedfe15c5ac46a22449f4e75038485748a742727ad6a2d00c1cfee99e1e195e720d83a6320ae38a3f4f94cd92667f22270f3cf6637b
+DIST mutt-gentoo-1.10.0-patches-r0.tar.xz 108556 BLAKE2B 9e8176816525c26922a6a8c0aa6efe9ce818e5a1fec8955ad5ac055fa7300d17401b41e56aa9b1366405c5ad13d2aa2e958bd48e9c6d0fc5ced40c162ae14818 SHA512 52d58aa50b289711487655cbf691b15f76e03d69fcfc655202126d94c57b574d643a3293408e930989a42c3b1e56ef398a32049e10a9ffc0331cffb57fde98e3
 DIST mutt-gentoo-1.7.2-patches-r1.tar.xz 143816 BLAKE2B ecc845983dc00e388c25ced0ca0c253d9fdfa813e9df6a4f166f4ccbb05cc26b5522fa84ccdfd1f92d5cce7291ac3d70ddefaeac3e13dafc892f924236a62f11 SHA512 21703bc808ae510e26ede38e1dda5d7c74cad15823154584a83209e9dbf68bf6350961e66729cf2ede78bde003f3b92567d42f9f8f89ed53643dcfa536625b7e
 DIST mutt-gentoo-1.9.4-patches-r1.tar.xz 114212 BLAKE2B bb14bb8ce8c2088dd32d6528f60e666d213aa557ce3f830f8ccf6e9199ea2083ea8b6605bee7aba6e96a40d127c076a581de656eabc257a00aa584fba6263fbd SHA512 c011c24767ad8b4a096a91c8531f923057e98e4439f0d0e00e70d761b434fec8c8bb1394e765b3f1be16212df76f99abdaa4f3347299c88f4c73e9b6d13525e3
 DIST mutt-gentoo-1.9.5-patches-r0.tar.xz 113924 BLAKE2B d04ef58a310b913eef783814d608dc495d449baf8efcc43ab3203ef9fc136d26afcfa9261e8ba74d20a9abaa8f672a93aadd7e197478fecb970745a8cc610f65 SHA512 3740c66cffa356501538b16be51575391146c8bb2d0a04fa1f391e781fae52d8fc97d096a543fff3237da83c83b7c219319c7902a91af1d89d3515d5debc3a5f
+EBUILD mutt-1.10.0.ebuild 9194 BLAKE2B 28db1a529867bccf2493aa8f9290df78abc25697553caaf0a5759e44fb51eea7c9a4a04e1d339f23c4c2df61e01bac29ad977cfeb3dd6f74eab753dfadc80a16 SHA512 74a21faabf171916386c8e1862e6478848304290b39d47032f180e4ac9501ab4034b182330d5d853961c7edb98abc208439a6ae1edd494ece44ea44e5316f9b6
 EBUILD mutt-1.7.2.ebuild 7597 BLAKE2B 293f44f17fcac1ef39c1a02adeafa4096b57ebf62d4000ce64f2dce89c241cd87f83f7dd96e42b0ce245e5f1e1eae016025187d785c08ec5e2639494b820709e SHA512 4316b6c10d5b70071cc8e0d2185d89056763210bacf626d11c8632ce93e8638cdef2c59d87806b588551db590d8c0bcaebf6b487bb2eaa5c6556d57b51aeb2ef
-EBUILD mutt-1.9.4-r1.ebuild 9169 BLAKE2B 6bf591e0d74fbc8b8d8c630fd01fd3069c53491c31e9bff9a5d3c897b48063159f933f2b2402ea5c61f2e3cef2de77b42fbbda41addec4a370a941c7616f2faa SHA512 b61786b752f9676a6c0dfcf2a9d5a34b6295011dce74238553fccf5568a8cf738f03f70d50b8cb22cfc40a27dcb867b58d4399bf5ec766dcd04a3292b77dbf59
+EBUILD mutt-1.9.4-r1.ebuild 9167 BLAKE2B 6a4d5caea9682471e41f4fc66d63486b5110e1677048b7e6db8e0c622ba76f9f9d85de2aecb7d60c0fb0633b70937a20938e9531537e23ca9b311a6944c7f155 SHA512 d4699a67185750447df9fd1d3b02abba60abf5a41323c27bd056020237c567fc729e4b65ad10a4cc7c4461b127d9eb2360f87b9a84c7e0fdee640856f352a92f
 EBUILD mutt-1.9.5.ebuild 9187 BLAKE2B 87fb00b9b056b6bc4d36f243221468d3e70867cc7e41bd29ad18d7597f166ba78dcc51b958fe1a66c24127f7f564e72f6496f8fda16b893c3e93e4637d020c8c SHA512 496b3a025566ea72335baead232f1af785797389937e79d3cf4b3b4325ca1b65e48b060b5ca2828ce22ab9858be63eb24b3622d23cf03323abd0e2f6b6ebbc64
 MISC metadata.xml 1866 BLAKE2B 4ce87ce0025fdf35622e7029d1200e0e4ad0cc66dd8bb40e1830d2fbcbc2d2de6e22c46ef86579c50224e17df42efcb349a1df55bb836eb5649110440aba17bc SHA512 1c494d1b5a628417d19d836473da2ba99e1d0f1e6f5a453f03ef84f9c601d2f31f53edf03bd242abfa8cb2a7f84de9385014828b607c1fbd6de38acdba228b82
diff --git a/mail-client/mutt/mutt-1.10.0.ebuild b/mail-client/mutt/mutt-1.10.0.ebuild
new file mode 100644
index 000000000000..ad7fa6ac20cf
--- /dev/null
+++ b/mail-client/mutt/mutt-1.10.0.ebuild
@@ -0,0 +1,282 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils flag-o-matic autotools
+
+PATCHREV="r0"
+PATCHSET="gentoo-${PVR}/${PATCHREV}"
+
+DESCRIPTION="A small but very powerful text-based mail client"
+HOMEPAGE="http://www.mutt.org/"
+MUTT_G_PATCHES="mutt-gentoo-${PV}-patches-${PATCHREV}.tar.xz"
+SRC_URI="ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz
+	https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz
+	https://dev.gentoo.org/~grobian/distfiles/${MUTT_G_PATCHES}"
+IUSE="berkdb crypt debug doc gdbm gnutls gpg gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls nntp notmuch pgp_classic pop qdbm +sasl selinux slang smime smime_classic +smtp +ssl tokyocabinet vanilla prefix"
+# hcache: allow multiple, bug #607360
+REQUIRED_USE="
+	hcache?           ( || ( berkdb gdbm lmdb qdbm tokyocabinet ) )
+	imap?             ( ssl )
+	pop?              ( ssl )
+	nntp?             ( ssl )
+	smime?            ( ssl !gnutls )
+	smime_classic?    ( ssl !gnutls )
+	smtp?             ( ssl sasl )
+	sasl?             ( || ( imap pop smtp nntp ) )
+	kerberos?         ( || ( imap pop smtp nntp ) )"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+# yes, we overdepend on the backend impls here, hopefully one day we can
+# have REQUIRED_USE do what it is made for again. bug #607360
+CDEPEND="
+	app-misc/mime-types
+
+	berkdb?        ( >=sys-libs/db-4:= )
+	gdbm?          ( sys-libs/gdbm )
+	lmdb?          ( dev-db/lmdb:= )
+	qdbm?          ( dev-db/qdbm )
+	tokyocabinet?  ( dev-db/tokyocabinet )
+
+	ssl? (
+		gnutls?    ( >=net-libs/gnutls-1.0.17:= )
+		!gnutls? (
+			libressl? ( dev-libs/libressl:= )
+			!libressl? ( >=dev-libs/openssl-0.9.6:0= )
+		)
+	)
+
+	nls?           ( virtual/libintl )
+	sasl?          ( >=dev-libs/cyrus-sasl-2 )
+	kerberos?      ( virtual/krb5 )
+	idn?           ( net-dns/libidn2 )
+	gpg?           ( >=app-crypt/gpgme-0.9.0:= )
+	gpgme?         ( >=app-crypt/gpgme-0.9.0:= )
+	notmuch?       ( net-mail/notmuch:= )
+	slang?         ( sys-libs/slang )
+	!slang?        ( >=sys-libs/ncurses-5.2:0= )
+"
+DEPEND="${CDEPEND}
+	net-mail/mailbase
+	doc? (
+		dev-libs/libxml2
+		dev-libs/libxslt
+		app-text/docbook-xsl-stylesheets
+		|| ( www-client/lynx www-client/w3m www-client/elinks )
+	)"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-mutt )
+	smime? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) )
+	smime_classic? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) )
+	crypt? ( app-crypt/gnupg )
+	pgp_classic? ( app-crypt/gnupg )
+"
+
+src_prepare() {
+	local PATCHDIR="${WORKDIR}"/mutt-gentoo-${PV}-patches-${PATCHREV}
+
+	if use !vanilla ; then
+		# apply patches
+		export EPATCH_FORCE="yes"
+		export EPATCH_SUFFIX="patch"
+		# http://hg.code.sf.net/p/gentoomuttpatches/code/file/mutt-1.10
+		local patches=(
+			patches-mutt
+			bugs-gentoo
+			features-common
+			features-extra
+			gentoo
+		)
+		local patchset
+		for patchset in "${patches[@]}" ; do
+			[[ -d "${PATCHDIR}/${patchset}" ]] || continue
+			einfo "Patches for ${PATCHSET} patchset ${patchset}"
+			EPATCH_SOURCE="${PATCHDIR}"/${patchset} epatch \
+				|| die "patchset ${patchset} failed"
+		done
+		# add some explanation as to why not to go upstream
+		sed -i \
+			-e '/ReachingUs = N_(/aThis release of Mutt is heavily enriched with patches.\\nFor this reason, any bugs are better reported at https://bugs.gentoo.org/\\nor re-emerge with USE=vanilla and try to reproduce your problem.\\n\\' \
+			main.c || die "Failed to add bug instructions"
+	fi
+
+	local upatches=
+	# allow user patches
+	eapply_user && upatches=" with user patches"
+
+	# patch version string for bug reports
+	local patchset=
+	use vanilla || patchset=", ${PATCHSET}"
+	sed -i -e 's|"Mutt %s (%s)"|"Mutt %s (%s'"${patchset}${upatches}"')"|' \
+		muttlib.c || die "failed patching in Gentoo version"
+
+	# many patches touch the buildsystem, we always need this
+	AT_M4DIR="m4" eautoreconf
+
+	# the configure script contains some "cleverness" whether or not to setgid
+	# the dotlock program, resulting in bugs like #278332
+	sed -i -e 's/@DOTLOCK_GROUP@//' Makefile.in || die "sed failed"
+}
+
+src_configure() {
+	local myconf=(
+		# signing and encryption
+		# clumpsy blocks for transition period of USE-flag renames
+		$(use crypt         && use_enable crypt pgp)
+		$(use pgp_classic   && use_enable pgp_classic pgp)
+		$(use !crypt && use !pgp_classic && echo "--disable-pgp")
+
+		$(use smime         && use_enable smime)
+		$(use smime_classic && use_enable smime_classic smime)
+		$(use !smime && use !smime_classic && echo "--disable-smime")
+
+		$(use gpg           && use_enable gpg gpgme)
+		$(use gpgme         && use_enable gpgme)
+		$(use !gpg && use !gpgme && echo "--disable-gpgme")
+
+		# features
+		$(use_enable debug)
+		$(use_enable doc)
+		$(use_enable nls)
+		$(use_enable notmuch)
+
+		# protocols
+		$(use_enable imap)
+		$(use_enable pop)
+		$(use_enable nntp)
+		$(use_enable smtp)
+
+		$(use  ssl && use  gnutls && echo --with-gnutls    --without-ssl)
+		$(use  ssl && use !gnutls && echo --without-gnutls --with-ssl   )
+		$(use !ssl &&                echo --without-gnutls --without-ssl)
+
+		$(use_with sasl)
+		$(use_with idn)
+		$(use_with kerberos gss)
+		"$(use slang && echo --with-slang="${EPREFIX}"/usr || echo a=b)"
+		"$(use_with !slang curses "${EPREFIX}"/usr)"
+
+		"--enable-compressed"
+		"--enable-external-dotlock"
+		"--enable-nfs-fix"
+		"--enable-sidebar"
+		"--sysconfdir=${EPREFIX}/etc/${PN}"
+		"--with-docdir=${EPREFIX}/usr/share/doc/${PN}-${PVR}"
+		"--with-regex"
+		"--with-exec-shell=${EPREFIX}/bin/sh"
+	)
+
+	if [[ ${CHOST} == *-solaris2.* && ${CHOST#*-solaris2.} -le 10 ]] ; then
+		# arrows in index view do not show when using wchar_t
+		# or misalign due to wrong computations
+		myconf+=( "--without-wc-funcs" )
+	fi
+
+	# note: REQUIRED_USE should have selected only one of these, but for
+	# bug #607360 we're forced to allow multiple.  For that reason, this
+	# list is ordered to preference, and only the first is taken.
+	local hcaches=(
+		"lmdb"
+		"qdbm"
+		"tokyocabinet"
+		"gdbm"
+		"berkdb:bdb"
+	)
+	local ucache hcache lcache
+	for hcache in "${hcaches[@]}" ; do
+		if use ${hcache%%:*} ; then
+			ucache=${hcache}
+			break
+		fi
+	done
+	if [[ -n ${ucache} ]] ; then
+		myconf+=( "--enable-hcache" )
+	else
+		myconf+=( "--disable-hcache" )
+	fi
+	for hcache in "${hcaches[@]}" ; do
+		[[ ${hcache} == ${ucache} ]] \
+			&& myconf+=( "--with-${hcache#*:}" ) \
+			|| myconf+=( "--without-${hcache#*:}" )
+	done
+
+	if use mbox; then
+		myconf+=( "--with-mailpath=${EPREFIX}/var/spool/mail" )
+	else
+		myconf+=( "--with-homespool=Maildir" )
+	fi
+
+	econf "${myconf[@]}" || die "configure failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+	if use mbox; then
+		insinto /etc/mutt
+		newins "${FILESDIR}"/Muttrc.mbox Muttrc
+	else
+		insinto /etc/mutt
+		doins "${FILESDIR}"/Muttrc
+	fi
+
+	# A newer file is provided by app-misc/mime-types. So we link it.
+	rm "${ED}"/etc/${PN}/mime.types
+	dosym "${EPREFIX}"/etc/mime.types /etc/${PN}/mime.types
+
+	# A man-page is always handy, so fake one
+	if use !doc; then
+		emake -C doc DESTDIR="${D}" muttrc.man || die
+		# make the fake slightly better, bug #413405
+		sed -e 's#@docdir@/manual.txt#http://www.mutt.org/doc/devel/manual.html#' \
+			-e 's#in @docdir@,#at http://www.mutt.org/,#' \
+			-e "s#@sysconfdir@#${EPREFIX}/etc/${PN}#" \
+			-e "s#@bindir@#${EPREFIX}/usr/bin#" \
+			doc/mutt.man > mutt.1 || die
+		cp doc/muttrc.man muttrc.5 || die
+		doman mutt.1 muttrc.5
+	else
+		# nuke manpages that should be provided by an MTA, bug #177605
+		rm "${ED}"/usr/share/man/man5/{mbox,mmdf}.5 \
+			|| ewarn "failed to remove files, please file a bug"
+	fi
+
+	if use !prefix ; then
+		fowners root:mail /usr/bin/mutt_dotlock
+		fperms g+s /usr/bin/mutt_dotlock
+	fi
+
+	dodoc BEWARE COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		echo
+		elog "If you are new to mutt you may want to take a look at"
+		elog "the Gentoo QuickStart Guide to Mutt E-Mail:"
+		elog "   https://wiki.gentoo.org/wiki/Mutt"
+		echo
+	fi
+	if use crypt || use gpg || use smime ; then
+		ewarn "Please note that the crypto related USE-flags of mutt have changed."
+		ewarn "To remove some unclarity, the following USE-flags are renamed:"
+		ewarn "(see https://bugs.gentoo.org/637176)"
+		ewarn "  crypt -> pgp_classic"
+		ewarn "  gpg   -> gpgme"
+		ewarn "  smime -> smime_classic"
+		ewarn "The old USE flags still work but their use is deprecated and will"
+		ewarn "be removed in a future release.  Please update your package.use"
+		if use gpg && ( use crypt || use smime ) ; then
+			ewarn "  Note that gpgme (old gpg) includes both pgp and smime"
+			ewarn "  support.  You can probably remove pgp_classic (old crypt)"
+			ewarn "  and smime_classic (old smime) from your USE-flags and"
+			ewarn "  only enable gpgme."
+		fi
+	fi
+	if use gpgme ; then
+		ewarn "Note: in order for Mutt to actually use the gpgme backend"
+		ewarn "      you MUST include 'set crypt_use_gpgme=yes' in .muttrc"
+		ewarn "      https://dev.mutt.org/doc/manual.html#crypt-use-gpgme"
+	fi
+}
diff --git a/mail-client/mutt/mutt-1.9.4-r1.ebuild b/mail-client/mutt/mutt-1.9.4-r1.ebuild
index b9615782bfd8..54254b5b37a0 100644
--- a/mail-client/mutt/mutt-1.9.4-r1.ebuild
+++ b/mail-client/mutt/mutt-1.9.4-r1.ebuild
@@ -28,7 +28,7 @@ REQUIRED_USE="
 	kerberos?         ( || ( imap pop smtp nntp ) )"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 # yes, we overdepend on the backend impls here, hopefully one day we can
 # have REQUIRED_USE do what it is made for again. bug #607360
 CDEPEND="
diff --git a/mail-client/thunderbird-bin/Manifest b/mail-client/thunderbird-bin/Manifest
index 34c5ee85dfb6..eb5a87ebe091 100644
--- a/mail-client/thunderbird-bin/Manifest
+++ b/mail-client/thunderbird-bin/Manifest
@@ -1,64 +1,64 @@
 AUX 10thunderbird-bin 36 BLAKE2B 4a1c1d5ff170a7f3a15402e5f52761dacb02e9afc518c9a850355fabf7d1a167f73f51c86fb77ef4ec651fa48cea3010752836feb51dc71c1ba787c95fe4deef SHA512 d65275c671277af884c5de99131dd785754fc68d222029fe2e863f08e821afb98e4b614ae0509b9b0aa7501ef72c52ae469f98806024ec661e09a684e2796d0f
 AUX icon/thunderbird-bin.desktop 229 BLAKE2B 2f9ec11f54483bb5c648a6fab4b95fd0c9b31a645c82f568263fd2b461b43921ea3a8261119ca210a531ca01955050f430fc881ab68a0c463d043953d9d0b02d SHA512 12906325b92fc3c336dc5d083f0b3ff56fd9892dd234abb9fa1a98ff51b718816b1ad50eb4063e718a86341e710e5410bc216bb398feff163eefff434ecaeccd
 AUX thunderbird-gentoo-default-prefs.js 404 BLAKE2B 488c7fa7faea76726e01c459ef41629a946ecc23c4034ec9326be0f124c17d2f39b7e0d6f70a4639d60910035c8af744c169185b1dd04ee21c44ae599f8f949e SHA512 7163d09a6e5760327b4fad5e5ef8402640a1b1bbb173a78101275a245248c2c406a5e5e0ca675b7e7281f07d6d272a8586f007bec39c73621f3261862da93d81
-DIST lightning-5.4.5.tar.xz 1898160 BLAKE2B ed8c2f54140444610fdcc91e375636d53d7ede9e70e114e072a55867278130e09bf54bb4e04cec789efa47ed8e92586b2217b53663e6057d6556df1a5a25f48f SHA512 621d21c20bd74271f83ce9eb89b1f65cb43ab6182793bb7b9b3ca04799644f6700d15a59c6b312459d0471f5f243c3b9f534d1adf4bc72c36c2bd04f2937e3d3
-DIST thunderbird-52.7.0-ar.xpi 604236 BLAKE2B 9b0f94a0e934b4a34b2ce8cfa7415969132af062f9251f628052a43ce78c5792acc839268fa946f408fc7caed62517019d23176a40d07b648cefee4e02496392 SHA512 5adfff22e8f42f1927e467d4912b46558d8db72b7ab34783824e1ce374861000a49922eab3d46fdbe9b64582c186887b491489af4ff9371243fc97344caa1350
-DIST thunderbird-52.7.0-ast.xpi 541174 BLAKE2B 0056c2c36bc9f9196e607a0c0f91387fc48bda6e8d8d728b7ff57d152852267c28af5a31cab3867630b9d0ec29b55e77880bae39301f9ac1b7bde4381fd7981b SHA512 5c67a7573e70fb8fc66cbb0c3180ab00387905b7f4b1d03139ba876074a963b96e04c5bd6dc0ee1c6fd35e9ba014220179533e876dd9558351f148bd7cc5bc6b
-DIST thunderbird-52.7.0-be.xpi 570932 BLAKE2B 1f4d1dc2b486797a500f2c3327710ff43edcac3dcf3a74aab29234b72167b8e65c343457799b2a571c0f9f4d3e23b24dfe8481573429c25d9df256ca441bfa44 SHA512 918fed7ea14d50d04fb375e3e550ca6beb167f5a92ef4cb535c04f1a73d49ccd404a5dcd3d724b07767e073fa5c78ef7a86744d06eab37f5221d73a369f9ca77
-DIST thunderbird-52.7.0-bg.xpi 634897 BLAKE2B 3b3e4984fd995098705089dc579cc4885cbfcf2637ce54cbacb6bc005bbb33850cd265a85cf0769966e19158647df20e99f99093ede5b3ff2e80f306ebcc656a SHA512 1abe8cde30a787a8167050b6309e576906c7049c019281ea900acfa0199038eb736f7643f963256d1158820435f24f2c814a3e893e32a2db6b826b8022df9019
-DIST thunderbird-52.7.0-bn-BD.xpi 676901 BLAKE2B fe41f7a21247b97fe636fb3434e5f39eeb9b99e1166671d88492925fcee6c796ec9e135fc2bf5ad3b2c792d956ac36683ec76736f699ef981c589ab3f0d98c43 SHA512 ec9d98fcb0f587a6c2dd19ade3017ba1210e55cae62d6499182944dd7cced262dd8b3808719a425953f46ad0f7d8d3a7b8d54e889bee0d8878b87172a6db592d
-DIST thunderbird-52.7.0-br.xpi 559381 BLAKE2B 5dd5e0b0ff3fb8341eab27c55074b9c9503e669eb96e024548a97e6380f0ec7935f990df8275a72982cd826e6c892f50bb99f3fe0e6aae33f99159962112b7c3 SHA512 c8c96e418f87d7ea31cfc596301233f28a178b34e19a7d6185f2ee8ecf04280e78f728fc408b948bd5daff3a34173f4240305cc742e275d9655311be02d31d33
-DIST thunderbird-52.7.0-ca.xpi 569910 BLAKE2B f763578d971eefe70fd22eb1abc76864b1a50c9431275286ceff236fbfca846174f92bb23abd3dbefc766ce7229c2dbb04946a1fc63983a33a28474f688bfb74 SHA512 58d42989075e4ca8165de7d50eafc4b2a7f59849bfa726d945367699f1e08ecd22a5461b386c46a1678e7628a78e90281f55ea4b30a147b5d48acc0869679298
-DIST thunderbird-52.7.0-cs.xpi 579150 BLAKE2B 38a93335376aa17ce3c210bea976d602d99d422831923257b6e6f3ea4ba8c661cdbd0de70002d5a2f811327d09a2e0c630e5e7e97452f8e532130c0ab58fb92e SHA512 2ac3759661c2e2007f9797ec83ae9b38cc5eacf9a7f3489a56f50fcadc6294e1a32458a5f5f5155fc60b749be17e2f2ab8f1907770bd3b7761be8c22bf0d1f9f
-DIST thunderbird-52.7.0-cy.xpi 554858 BLAKE2B 91b2c17c7eb328f9f25c16ed078e01b719f32e040c11352506cc98d86fca09837bcb702b566c82a1eb77f1bff6e0cbf725f950007cb812887b12011a5c37d2b6 SHA512 c20a359639b6f4e6369fce17008c6b9a86567e451ec14cc0cb0fa3c4cf1ddbba700e06186907b8995b12ac748711b13a3d39e7b1875c56e5eae3803a5acbf19d
-DIST thunderbird-52.7.0-da.xpi 543336 BLAKE2B f5c56cdeb5865e70a5b0d652697d821502205e2ebfa11fee58b5da82ca90031c9834248bc89eb6f9040dce469691c29693bb6aa06e9ce4b9c4cd2f7694eca9ac SHA512 4ca0f6bee5daaa96fc7f3c2a9dce76cff408c7893c8fd5164237468b913f2585944b909cf581cc72d05999a8bd1d5030eca1d4e727bfa8b5bc2aa491083444ac
-DIST thunderbird-52.7.0-de.xpi 555744 BLAKE2B cd780d98bf052117d80316fe4b4e510a06207f761a4ee92ae2437a4cea75a2ea990a07071ca33e740eefb7a68881bf0dee63af8fcbc6e9d48bb9143cc971ea1a SHA512 0f07f2306b3366025a4cb08ab7e3992a6f9fc52e61f028ec81b40d494df80a06d3ac7acf9023f7c615af8020912203ce560c5cac35c79c327c7452ed0cf49935
-DIST thunderbird-52.7.0-el.xpi 662965 BLAKE2B 089c02be214dd37bb6f9156c46c53cf51f048539554da0acd6f04c41240aed8e0d3205c130447b5259822d14e7b543af701759342700d9f8828e74deb6fbd57b SHA512 4e244532c36b3d471923ef9a8483667b030970bd067247cde1dedb335978137f9556e611541236e4cfbaf860589666f89a4d8301c5ba864a3edf8908e4731e0f
-DIST thunderbird-52.7.0-en-GB.xpi 531234 BLAKE2B 856b71a0b1005b7d1eff9f65659d24c80322f6183baaac15985f155ff39042e7068560ef1c7e86db5dd57a78be78c93966592e101d6afedb339d7c6649a1b3bd SHA512 9103b73468c1a7f1bb99cf7d22257bbc06f3fa191f1da4ab5041efaaa18f5bb413f8856a78ac0a97bd9bae89f6364bfedd4d3cbf7a5a2e28e489046485a980b4
-DIST thunderbird-52.7.0-es-AR.xpi 565995 BLAKE2B 5c28c9bc9e68387f6de9beffc680ed39839135eb470030a36100f7f6608f10fbd5c361d8beff15ca9723734a9d1eeb9b86a4b2e77ac14a1c0d2a1f54336ec435 SHA512 43b25cccc0dfa4f91bfe73de0dcf25f1ed97fd012b63d531a0a45c7fcbd06533ad61ccc6dc8c8af97f94f0626587d8d0c90f7f8bef2ff619ce4cd9d26905c556
-DIST thunderbird-52.7.0-es-ES.xpi 445464 BLAKE2B d87fb2187c2ead9cd171a4b3e0b7b3c3d915ca712e495467a98ebcd6570973837e731a7b0fc911883753106b6fb752675b384c538924fa5294d9d2749c143ace SHA512 308b706ab3159d926ceda44b37f69d59ed125e736d11905fc16e168d6a169a26fcd621a7b52bbf66116f16287511aa5984a0452cf509227db5f38bea6ff09ced
-DIST thunderbird-52.7.0-et.xpi 551661 BLAKE2B cc2a1792659b162ac25118f553e8f990919cc5dd75544d503fa0bc3f5508f48e631ee46d8e433d428b428a3a1359204a60ac7e61c1b04a8fb9a34186731ca7e7 SHA512 ae4c9da0672def6378ab103f68625e181cfbd456f8dd6096debdac9674711946e10eb81d06148d57fb3b3edd3efb12981e06b8ed18cb2a9259654610e2510300
-DIST thunderbird-52.7.0-eu.xpi 555536 BLAKE2B 0bae546daf4dad10d85d966b14ca90c21fa6613758f7fd329da7625ce561354be4fa6f1399799ce31c55c56fce0f43cbb5bd9db51cd4ff7fee22240465ee8ad2 SHA512 5840b4ca35daee13781aac1beca3be0404daedba85773375131c5cacc431655ee946981373dd8be016bba411886fcd04e2d6cf5c031c7bf16db94743eb6dc54b
-DIST thunderbird-52.7.0-fi.xpi 550669 BLAKE2B 715e72bdf9307efdd98f7e6d97789f1ce4aceede42975c1009341e5a428f754c082ebf8e90caeb20784c564543a5f0a435602121639e8900f05fd06716be32a4 SHA512 76bb8215405eefa83b9e3fe69337f5f3b5365c79cc1bc3d8599bbf8e1018c67f31c2963d28ab3817a79d831174a10d6e4cf369637abb9da52272715f3aeac466
-DIST thunderbird-52.7.0-fr.xpi 577561 BLAKE2B e38845a6202a199589340aeb0f2e907c0d1e212d8017d5a0b172b6ca1e503f6ca61eceb0d8d3045cb593e381749aa017f70ac13fe1c4663bfe1716ed25d7df20 SHA512 fd9856a0d3378adce66c6b1e54604cafbe7fd34f4c9486ff19d78c694b30ba792c74a8c18cbdaa4284f20831a5fd61a00d620f562208ba2ade9d1f34deb0f919
-DIST thunderbird-52.7.0-fy-NL.xpi 563633 BLAKE2B 2101645341bf82acc32a9dc2e18f0667ecc8272c44c41fd51230b78f7175b588ead3f9bed3465cdb95d9518bf76741226ec4f26a26e42ec35da5e2bac926fab6 SHA512 5c3b0e4e43abd511fe8963a8ffe5979126638383146fa5f53c44859eb9ae11ef8a87ed141fcea5afc55f5f729dae7e3b704dc341985eb18cb8cacbd07e6976ed
-DIST thunderbird-52.7.0-ga-IE.xpi 583557 BLAKE2B 26e63330902682a1c1c9026a6d5b52d992845057866b3cabd3db31105e4d3669a7ceb3b28a5b2ec2c1be18659c2e7cfd7339585e248cddb71ae65f100d90a896 SHA512 5c389c03648c232fd272cfecefd820fc892c787c2eefa5786074b50131facedab62c98eb4ca3303c399b975119249882b696827d8ee2c698ee828342a95e1577
-DIST thunderbird-52.7.0-gd.xpi 574065 BLAKE2B c5fc6cf8d0da281574533293f67c007ab8e9483285e68e6e9c8d66552f86a326bb484ef9d7494244bc529843f61074b9fc9fecd46e547e8f5703042a2482f3a7 SHA512 16fc42019d146efe2cbaf59cc575862056a41547b9e9bf8e4151f0b66f9e925ccae33bfd373b37395ddcba7229a8235fc42219b6cbb525291fa3526acb41e35b
-DIST thunderbird-52.7.0-gl.xpi 575150 BLAKE2B 6ced1a99f903a776f5771979c98e13cb4b3c5bea848ab608d17a517b90a44ac0315cb81e1c29d5d100b765f1e0606a34dcc9dd4ff29830da827700ae29d1ffa4 SHA512 7be2b56fd616b1145188bf03a4125d4d30e978f6c3bae6fad7bf716c73043a2a6bbedf5dd0dff844f1d27a2753f12b2043dcf8369e052ad643137c728a0c9f00
-DIST thunderbird-52.7.0-he.xpi 592566 BLAKE2B e1a2dd0a6cc9c75c5073cf3d1341ad72752bb9000066f876421cebccc652b73020636e8191e7a480ba09419631aa11331bb8aed14de9f8dcedc4c76a78e863ad SHA512 81d5c978b874d69f5d416d008f206ff95e6689663a1aa2895071bb717a1a035eb4682596e4b71a4f74eff444a571313c2f23157d5bf1d8af1658a63d9f4bf5a9
-DIST thunderbird-52.7.0-hr.xpi 564780 BLAKE2B 6d03d1f0874f0ebbac5b88b671dcf323c7a61b02f5fbd697adad3799989e8e76a7d9ff7d0f576aba3147b91a742f962e31a31c17af5b445d1e70943e5f35e5e5 SHA512 15bd315924b4d97f7fed528d5a170057faf7f3a9f205bbb1dd1a48c8098647c485e4dd9f134fbde62313250f065f222b3138dee6b2e66e96c6c8a7468ae22bbb
-DIST thunderbird-52.7.0-hsb.xpi 582242 BLAKE2B ca8de136bf8837c55398e760737bae14d30034151562efd51743dd6bf01285657dba218b9ed2f931af0df0bebab911bf170ba12f81e437b20ca0d50003bed309 SHA512 d9a0407500e0f42f18b5927612f8edf55f9261aff83d47f30c2e9a394c93b24eee39e0a7bc6686e27f4723914c89902c7ec08fbb5b6e2ab0ee8277f78d0dd5b6
-DIST thunderbird-52.7.0-hu.xpi 586446 BLAKE2B 89a28d08a74496430eab99660307c898fd5495026b74240e3e1d5c6bb411ccc5f00cf2ab220ff858d358f5302aa9a82bc871e77ed5ff0dd01b10a0cd2d6568b2 SHA512 20b729ad9e74a6bd55904568404619fd27c938313e2b119859233ff33407a7c5f744ece12e75eb335bcc4a861afb432f5a16fac6582bb47b3e855ea156bb5d1b
-DIST thunderbird-52.7.0-hy-AM.xpi 629880 BLAKE2B 8afea83cf66f885b6f722c8bccbcdf71ea7d3e9c2b52670fb7d060a2ca901402ba9c5c09146c67f621fcab8025b607685c96e4ce502e0c2dac5feaf11088feff SHA512 7abf492dcd070a6df511177f2b76cd8a1b6ca46ed0d8b5a0263bc15477774354ab91e42e34715915bcbba6fe3017d8c3aa177e00c56c5139cd0a201afbd2d2fa
-DIST thunderbird-52.7.0-id.xpi 546527 BLAKE2B b7c2fdae6e93029f27bd6241b1a165ae477a382862e2b28c4f19a3daae4a4a67e50bc9682c225332433c16db2b8e5d6e6c0dafcb63799292e5b6f1f745221d47 SHA512 36b29a38b5773c8f9d25d272a6a46a34efd76c26861b6d8c64fd3a3d77326a72415d971eb7937ed90c5be787060cbe2e6ea725e2a10248061173a93378b2b364
-DIST thunderbird-52.7.0-is.xpi 555713 BLAKE2B e221947a38e8a1d6a5cd6e03e0f6b3642c5473552032d1687fba9afac116c5b666813dabdfd975ce83074a461822ec1210fe7b660b51cf6f85fb0a05e724f717 SHA512 d25dc5fa4c499c9362f19d4c38492f0bd3e9d86cdcdce21c875f5e235b22433de176fa0ff3af8b202620541742e16f4d3f5d2394254471979ce2ca333a8ff9cc
-DIST thunderbird-52.7.0-it.xpi 455408 BLAKE2B da5dc81863a8ec83002c384f08be49acc1d613d139d2787c5ba74a996c0f66d43194b180a6078ed013dd0c1e872a0b1f5317296bebc017f8fa8f9d9caa9bd1f3 SHA512 a5e841c37ff17a6039c378ce2bcf57f62cf5d6df89634471139d7f97906800ee3f8a6ce492b293e8a868cb18c3f928429d394c4a36ed84b69b164391ff2ae564
-DIST thunderbird-52.7.0-ja.xpi 630053 BLAKE2B 94aaf82fcd4a17bf54570f4e7e7c15e64fd685ca50e8b3d9b94b6309c67ea737e16d92905a6f3934bba0cfe9d799dc1aeed2528770687b760f6f4620d8dc77a2 SHA512 726e80ea09fe34993f9975eb76d752d06f2b982802c48acef7941184363d213f9a7f6b4819462c2a652b78d743e816c1b3a0825089c0dfc42fe302e5f372f925
-DIST thunderbird-52.7.0-ko.xpi 595517 BLAKE2B b85828c902136a4789486e406048d669adda432bc0829a1b6c524412558340f21b91286f1f33c3512f867678bcf05ce5f9f432dfdf43da06977c6c63867b3cb1 SHA512 bf909e5f3051f50339f71ebe82233c49f39ceb858ba481f6874547b19a2d119e7ad57fe6b611949a38acee16380805a959375fcfa793ae1f4dcd892f0d14b280
-DIST thunderbird-52.7.0-lt.xpi 580598 BLAKE2B 139b7aa466c8fdd441b72b41cfc25632b80c6804fb46d1f7e78cfa80fa59f4b7124bc4b1698f475a06de59e9b2da16d8b11d92a783cb7b9fc063cb7af96f3786 SHA512 fcadc3e84d91c6e746f27f0889c8d0ddf9b4d68865a8324c750b0a842aca64f84924d24d72628eae68a9a571b7c5f990a3027b02b428dad9c073be9cb8f17f9d
-DIST thunderbird-52.7.0-nb-NO.xpi 551104 BLAKE2B b2752a70a915378f5e53fc52196aa6da7c22e0630a5aa04177552a758f5565eb911d9532d1dad81b4d8ce12893ef5cfba3822304890b72915eb175190d5a024a SHA512 ee49979f1c2e3ad8f14864edaeaece215ae15ca212a144b4425db190a3d14c726a7e5648000c634985a911d35a23fa8f9007e0cc6a3d7bd5ec61f9fb8f78c2ef
-DIST thunderbird-52.7.0-nl.xpi 557957 BLAKE2B 883724ee67c2e5e4ceb5bd2a08e599a84a4149078e23058fe63c78f98be8c5711b326d8dc3f6a595acb7d97a147db9b080f75d8f106dd593c3eb945b75d60ddf SHA512 9f277f1fb1af40a77cf4a7ceea3508fff170e897c6882a77c40a3405e596a4cb32e94e07bf9057ddd42f6f16fc94d553f033c69a7d25f2d369d29671812b50f4
-DIST thunderbird-52.7.0-nn-NO.xpi 551892 BLAKE2B 0b9472581591c176cb20f037271c70bebc2b4370bd7217087aabf8cbb35ddef66f3c4a8eca5fcbeaa4c064164e865f507ab7ac648ca24d01c669572711c3892b SHA512 a148709005133fbd51fb0659f06142494e62c217faea7d16939ff3abae95e9544da6e907fd0d4a231e7cf499863c62aae929000e5714a33ac167cfaf0432351c
-DIST thunderbird-52.7.0-pa-IN.xpi 646569 BLAKE2B b4251d0e8c6402601b4ec3ae0e8c4c971c64810a693db28ce00232b3daa7be94e8f649562c68d1a568cec81758c39e9c5a3f184a0d89ac7b37e87ea50c6afe42 SHA512 c3a133acc7d7f82a94b79403f6be465976e414c2176d08b67a3b8a8339548b08a513db2c405d99deca13c4130e204e354717f86409b013be00e72d0f216b6c6f
-DIST thunderbird-52.7.0-pl.xpi 469902 BLAKE2B 2e26eb35985810a68569451d915dbc6f1603b837cac1b4e2a8d6e4412ccd3c8ef79c737652e5c4f01d33e09d65ed9839339703e6d136000abaa240bade1634b1 SHA512 d60d0a25db3ef8fce81241191811afff4b8c23e1578c6954c29346dd52a69236c5907ff31179ef204e92ee9f3ed958518cace777eed5814be4f1131a4e18ffe2
-DIST thunderbird-52.7.0-pt-BR.xpi 558224 BLAKE2B f0a068f9f41f0e121d17dfed8abc837d5e06bf05fc625737da1308801f2fee59fd201c91bfd965f0dc6632caa4fdfc15faca1c8660743bc6af4706604071dd0c SHA512 e97444703049d97beb96a9cc0538c72feba772ba365c5e49f05e11d82a32edff1492f9e4109995d241df09b2b8fa5520a306da7c4ce86b5a79cf9e2fddd62819
-DIST thunderbird-52.7.0-pt-PT.xpi 565624 BLAKE2B 5e1b602db29cfd18b3b9e772c0afd41c45779c1f8a9297135a8a91ed86114a4b785151fe611475a529d5bd4aec903083d91f9a85c76860dfc7358874cbb51866 SHA512 16542c6a9d8065bf35164550a57a4be5048eb249a4a5f8fc99ae5c05c79e5a84b2db4f565363cce834de8e38505cbc92ce4f42cd1f1927bde2df7bee994d4dd4
-DIST thunderbird-52.7.0-rm.xpi 557605 BLAKE2B 57a3f888dff3daa8cd38156d85a6985052999d54598c4c2cf950de79c103e055c99bdf7d329993779dbfd4b51515887114be1eef069f185e9e3fd7795d914e11 SHA512 aecfbfd31a0731c5a2c89c731d63570ca9de04f9dc01339a9f17c54038852218670c76f969809cedc6b9afd1fa8ce5ee852c0e78ae889a8b70e832a59b2c13fe
-DIST thunderbird-52.7.0-ro.xpi 570530 BLAKE2B bc07c944e791745fed70687bcd4f378c5af6cb91cba8405d1959515cd6059ddc3adbf8b629dd4860ae67705f5826756debf89980b989474a50b1943864309114 SHA512 1da58f6f2a8da1f011123b8601931c9430877bf3446aa267591180e29e034c6ac3deebf94f07c3ce4256169aa48e6f6e793d10d58afd40907654992e620ac786
-DIST thunderbird-52.7.0-ru.xpi 530670 BLAKE2B 8a737bfbca2b69a290da6f873e926b535a55896f3a855e3012e0d7850c373956bef9136f361a89f4d4d42cb437321000b47166d6b392469f3514bf6ff25c5043 SHA512 734a28b963eb5430ebf210b492cf5376f2988ceb5afaed6685fc78e17933330b9c178bc3a8e96baaff34402da0f434c277f0592305575a1308e7b1331726ede8
-DIST thunderbird-52.7.0-si.xpi 649010 BLAKE2B 14b63ddf0a3907fc426d109387d2dab8d6e9ab9ebe73abf950ab7ebdab69616965937cdaadb5676b454c2671a513bee30ad2fc27b1bd8513837fc499f80d35fd SHA512 957d1bf1ab45f56e8271fd9071a98f3be3b9b711708c098fb46ac2636949696d685892e4ab6392b56a82b41547a0735fcd5b11043377127084ab1895dca10f9d
-DIST thunderbird-52.7.0-sk.xpi 583882 BLAKE2B 6a7b46ff516ee0572a86fa0372f4b4fb8a090cd0c5f11edfde58d2a7df37d98b7bca3d6c38cb825918d4b63156090fc495ba191ec43fe224ad1cba9891968ec1 SHA512 793520668940be422ff96d680330a6b991ee49107aaf13fe7f475edfc35c1285e09bb4af55a7fe1ffe6839ce44d174cad4c4a139904f7a6c5f5cf733ab9ba50e
-DIST thunderbird-52.7.0-sl.xpi 562835 BLAKE2B 04cefe89e64bc85ec7baa08af71d1a2a1a2bd1fd87da526c09092e2ca4903613f865d794b49ac9e4fdadfa29b21dc9898463151d6c8d5fc9c64dea6f590a4d91 SHA512 55a79a83bec3aff011cdfcbe80f39a927371703e914ffbe43b99b6104e8de77225979c92b7942c4bc74fc222a2c08a90ad52273277ff3d738f687a0c20d66f24
-DIST thunderbird-52.7.0-sq.xpi 570616 BLAKE2B d27017442693bf342714b9f46010078eec5696c45cb81c5b3b30dca45af78b872c3850b302e690ed70485848e67df2e9e89523de714479a951b7ffcd6bb86e5e SHA512 05d927adaffc6ec7d187e2ad62c47a43ba69b33bda764e5196666aabae7127e6ae6e753fc13a61add339df9a794c0f78e9c145c45b5c6913dd29801cdf9591d4
-DIST thunderbird-52.7.0-sr.xpi 609020 BLAKE2B 824ddde4977b463b962d8484405ee77133276996c9685bb96bd3a1dc56d9142403c1bb4ab3052b07f335b09d98e0bb29ba1288d81a0736ad0ed4245f008c5e0a SHA512 c3cef0085050e1f2bc155858789bee9a699ac43fd859fe4b3ff32596de92483df9f63e27b28c344c127441e51b9492827077e83d77545f208a0c876ecdc53d8e
-DIST thunderbird-52.7.0-sv-SE.xpi 565777 BLAKE2B c55abc8259102c72840510113e481ededbc2e657b7ff179a31d27b52da53281bbfb9303167594a41212fdc2540434a6b54ba9f2f8336a9e8cba8b085e1d00056 SHA512 cd1acab8f60d4db1afed1358866ce2eaae7a032ee45a2616f5074868c4afb08049dfb5014e4fc6eeebfdb6f2f187d0afcb342d89b1896c5484ed6825faf974cb
-DIST thunderbird-52.7.0-ta-LK.xpi 675039 BLAKE2B a9c09bb8bb96ec555dbc9b4d363305244d5ae05a29139968bdcd74191d061fb335b908915298aadbb283b435ba8e8b59654bb3c748e18c1cec8d810562607ce8 SHA512 83d511ca833f6a37958b8b45f33a4a3fe23413efaa04c92fe40f192d31bec8623046ccf669cdcd21361c66f7458923810b95db099267cb1b5f97c50fe70d4c07
-DIST thunderbird-52.7.0-tr.xpi 569926 BLAKE2B aec66b4dd9f268ef7880598bb13b2dbb82b232de9900e2f038d6ae3066e597e2c5a60f55eaa55a82145fc902a8179d1efedcc7064844692b679aec734ea5ed64 SHA512 a15aa5cfc11c5708b697d82fbc0c9611fbad4cf4cf374fd4b989b8afe687dde1c64c363e18093d6de845ba7ab4842b64661e0c3893e80aaf8c9438e517e16445
-DIST thunderbird-52.7.0-uk.xpi 652855 BLAKE2B d78bdee25c519750ae812c6d69b344239ea41b46ba5d1e3a3e2b5681cac7dc5f460a7168e0b4a3bfdb0b2efe44714b879d484d14abdb8037311c06ba294d6c9b SHA512 6791d3a192d4975b188d4dc713a43726a1d30e5321c69a93b9135d2608e83e665e868b2a681115a5edd17536d5653efde67cabac4d712086df89425c46df5d00
-DIST thunderbird-52.7.0-vi.xpi 637164 BLAKE2B d9b33374ee657248f3c83c41dbd7deeadc523ff9158dec2fdf698924fda0a80e805b8c1f5c592fb67b663b7b221e494b7d1af00bc4530c7bbd0a27a844d0efc1 SHA512 e0f914e55174c5827b887cc2dfb1dd5e63be55b46fb40c2bf6bedcf7b5f06201ca12535e732806f9278d008da02df8ff9cadd01b3b8b893d630e2072f6ef01d0
-DIST thunderbird-52.7.0-zh-CN.xpi 593612 BLAKE2B 51027d99360c386d9f61ad1049f239757291bd0eb449ddd247263d139a4b583bad6ceadb14a0a5ac33a1ac0013f635837c6c6b8fa04e6b856c0a02bda9169d81 SHA512 e3a8b15133484760f6a9acb49600f979f62b194b5c6621cb5ec9805317de49e58a79692f9c69b34f03af119de31e54f42cfd43434b8a0e0fa26082e7746bc92d
-DIST thunderbird-52.7.0-zh-TW.xpi 595729 BLAKE2B 4b2877e9f45e6d64cfba8ebe41d6d832e5ee87a667ce5c778d1bfb651b9d18ca1abe34125bdc308d226bf79f67505ebe1de05cd14dbc7aa0228611a2f9d00916 SHA512 9aae56ebd2f3e13f097927953d0a1f7834a68d7d37259a2bf425a88d404b91da9488aacf64bda89bb6e35856e6a1a4e6d26d636915df9f15c49fe5e781a0d35a
-DIST thunderbird-bin_i686-52.7.0.tar.bz2 51178246 BLAKE2B 3f76b8de1cd1ca2d19d5c1a8fd693d850319b532cb71e7dd9a0fec6533af50ffe628c1f0412f26da335c4fa3243944a29daeb4b0adf65e70c58b38381c72faca SHA512 f7f8bf3f74052310987b546bba0f986abcfd65e53125c2cbde4bc4744e27de054f21eba8080313c28c9c3b44de1d773e4471facc9b71f520b6085c32cfe721c2
-DIST thunderbird-bin_x86_64-52.7.0.tar.bz2 49902909 BLAKE2B b5a20f7dcd83d66cf1075cce7530a673537f77844a2f5d58991ecf0a90e449011ef70648976197fb918ccc5e9eda7184d912e949913251b5f8c7b99a923f7efa SHA512 a8f4cb2238c3bf0ea6e4f8b444991bf0d6a4fe42cf7c0e38ae3738167900ac52debc0daf8bf4d7fb1e63326626072fc498db6b227337eab82ea48f2fcd561334
-EBUILD thunderbird-bin-52.7.0.ebuild 4742 BLAKE2B 09cf322050e3564ef6f2969b651db2f000f3ed23cae73ad1904f2d4065eee0f78cd86ce8638d908bfb8e827c06e9ba7f6d1361792f734877882411396f1dcb34 SHA512 b9ffb328592f8ccd8c5a7b6de292158fc8fe71768738af4a2be150c22ff513c6927e6e109c0e167a16cd6308b0bba4a255eb4a4f49fe9cb65aa9fe9e9605b0f3
+DIST lightning-5.4.8.tar.xz 1891528 BLAKE2B 8b15d2058171d09b8fc1e992b48d36f024ae9405803c0626060bbdb75318a6ce652cc1b527cc2a30041c81f2ea215c63950912a8783d55e4042c2fcc270bfccf SHA512 9c36ad58ef77f9e7a1e34c07db0357d4db75a44c837068016e1413e31cc762f2cc1b4cf1edf8a78124077053db6ddddec68c17ba42da91c2a05dc87616f742dc
+DIST thunderbird-52.8.0-ar.xpi 604235 BLAKE2B 70f75466606be60e8f9a0897a537264a35e9f4046c88fdadb0a3ea2ae97155f9c5167c4f808ee8231712822cc44b710b03d748c6453e62ad23d4cc4cfd3e24c1 SHA512 fbf320836fcb9fbcd71ba529f4279ee008b08ccc7264856877068c8eb3de6199a8e1f95ab7ca85727d7ef0632bbf46d3d91d00c4dca67e09e0a3597f5225f56a
+DIST thunderbird-52.8.0-ast.xpi 541174 BLAKE2B c1053599d028b75288a0a9e3b256925ae4577d90c74f96abe518d1ee3fb98b9c3d76a86eea8dd0a97f3291831a9fb957315461f889bffbbf0f4ca9a650016094 SHA512 dcdc1ebff99e7afc4d070a6aee4227fbd98bc04af8b3c0b17d44e2e842fbf93b1114f22b1943f0dc2b6572bdae5feed61733c6cb463cc720046efac90ae5dda4
+DIST thunderbird-52.8.0-be.xpi 570932 BLAKE2B 323d8cb018e5a7c42c6a1ec2d189c992e151be997eb2678d91487c32f92a31a4a9842da6a5c0c3f67debaaaae74463e9289570e336d58eb2509ba441ecabef58 SHA512 0a7ee16c9f6bd24b44d6ff9ad6d933ade89ee4d39fc5decf982cf7b25cdc0b5e00278b345fb35bf8fa35f9319474ee2f3366f8318bfa5d9fdec4b06195967189
+DIST thunderbird-52.8.0-bg.xpi 634897 BLAKE2B 2842d604d0e5dd208a9897d5982bfcfe085c57ac117c14db581cbe012e3357f31e5555d9ee96d080e5f5f15abb8fe33a323ea141427ee6922d655dde81e85f46 SHA512 5e1c9610fa9261d05ad6ba9821aa406e07fd7f8f6db2465c19a635d450d93280e889c4b97948910baf545c5a60687f758ea598fc7806fee2abd85f44338966d7
+DIST thunderbird-52.8.0-bn-BD.xpi 676901 BLAKE2B c896d1cfabf30d62c8b44ce1dd3cb300d53a5ad13f7819ebcbb61beb4e767ce9cc9b652b594376ede80bde3dacd921172afca0a04432a5d3e26abc30bcb20548 SHA512 ebf1194badfd0767d6744154decd275b079f3e31d3295e9ee5aa47d034c0a6e961489836938ab9e6402a52a68efe74de11d3baa44cfeeb6bc32d3f56c116845f
+DIST thunderbird-52.8.0-br.xpi 559380 BLAKE2B bb78ec6f7e46b8e79d16908fc3f06be993ca492ed224ce2c2646bd0fb7fb343e7a398aab3ed1ea7cd2806dc70a6464fdafa3be6420c0a254b15303368d6e9d00 SHA512 432a52847d20e48d1b9910fbdeb5a01e7248bc929704f00024f0b284ffc3c1cf4f48f13cf730f9e8b3588d3370e42d734f970ca74b2e88b81c66205a8a4e79ee
+DIST thunderbird-52.8.0-ca.xpi 569910 BLAKE2B b2941e0d0b1ce1753f6b686d11b0a6cc3a5e203195b77a28d26460b34d85ce741adfa9ae696695375aeb91f26d26abc94e5aa9e433c67f55a0fae98642128ab1 SHA512 061e82090625d3161a58818c31a446de662499bc545294446148a389a44c862b40ec0d3d6b480a24d37cabe7867c3c29eaee4ac40a993ec1b837b45b5abd5ff7
+DIST thunderbird-52.8.0-cs.xpi 579150 BLAKE2B 8ddfb14a51edeb35aa09e221ab79e849bce9e4aab801b5876d49b590ff7fe0ce8ed25add1f56230634b5da7fb8878011d8692a01c3dfb0394f307dfba0f8e4b7 SHA512 0b151713a567dbfd873d6104ef077ca4f0e6daa20a0e234eddb40d6f8fbc9c40dcd780a4cf2d84c570dd2004c7beac12bb61e19d975c8668b176bca18838ca8c
+DIST thunderbird-52.8.0-cy.xpi 554858 BLAKE2B a88d23a63a7b18a247164b5cef8380b60b142d419eadd906e3259435503b656cb8583afdba116d6f5314fa5d9d13fb60efffc34012978ffed21ae8c6b3f0191b SHA512 318c4cabace7209adfd41f6c14c3cb0e03edf9194799903d9d4b03a8819e314d65b4fcf5321a27f012a8eecf44308fd566737eb4e6c54d2a2d4deffca63a0243
+DIST thunderbird-52.8.0-da.xpi 543335 BLAKE2B 318cd6abb1c372ff1344cb68b4d54d946eaaa32ca8d7556851011e83a188321be822a30f2d7fa290d02b2a0222617fa6ed097c5bf83d849cb85c7d8f2526cdac SHA512 1aefaabbb16ac6a56a18fc27681afbd4ec7d3798f87743d55a04a1eb24e59ad1517b362af992cab50cb8e11b77c6c28e329e78e37a84faf05ba55612308c8dff
+DIST thunderbird-52.8.0-de.xpi 555744 BLAKE2B 771f700291e0d9f88dba24721bc282e9af9aacd0eba0af1c723cfa1643e3bf8c7dd2f67cf7895074ea434dfb9638dd811294fea5ba6aeb1819f8b57cde8bf182 SHA512 78bd4a22226387a9f106e9a536d916aa97f162d6ed6d8db455cc0db78924696becf9ea89d3feae2653d5e5c981d2d52457d3f29719223fc63cd488703973040c
+DIST thunderbird-52.8.0-el.xpi 662965 BLAKE2B dcbf86f96911de7e6e7626d78cada4f49412db196360a56a167815e660973a37c1ff87ed26868adb7e0e56da3a18e1a830bda7b2499923e824e36bb74cda9584 SHA512 b0e8739ebdfcbd4f7a28d06a3739ad05e65a3c392628d0c127ebfdaf5e889ae439e185458dcf4d0958ee96b969114ef5438e14bb25abd56ecedfaad4c5f51bd9
+DIST thunderbird-52.8.0-en-GB.xpi 531234 BLAKE2B d3633bd90323cffa9b596c43ce908371204528b8eed32ad9a4af62e14da1d885ed0c64f019b7820e53c43a31eeda00dc6838813145e1bc56e7a052f87ddc2127 SHA512 dc6ca61551a6c5c0268ad4fbac8c5fe97ef632ba8b782e0b5a882caca0db5dd36ca194c47ca8d2897639609abc5f0c396f332dfdaa9dfd062d31e4cece6bf1b5
+DIST thunderbird-52.8.0-es-AR.xpi 565995 BLAKE2B 4d9748648daf2e7453d296437e236c9b041252c35663a3d3ffed451cb959f878db18fdd18362628d059d0db2384bbcb6726c79fd16275bd4edc0b8a75947151f SHA512 2e3b5229ab92d8e20c47b6b5258db42801e6780cc714457385e81c0b5195632ae8a5afacfec7afe9a7cc7f500e34dcc7cc6d7f008704161696a4fb22ebf7734b
+DIST thunderbird-52.8.0-es-ES.xpi 445464 BLAKE2B bacd19d5656b1c915a95a3cb305236a5322a0405a8cb2a60eda84898102ed7f2c7f28e9304ce59a72808634f9238f97faa88bf1a818f8f94493c92549c42afe8 SHA512 1f65d35f272a1a91a26cde39cae23c959e921d2706b66cdde9d3a8824f8a9169b65fe7f81165b667610907e871d42495afc95c3b7341dc3139a7859e2eac94d7
+DIST thunderbird-52.8.0-et.xpi 551661 BLAKE2B 2cf6decf5e8286ab636baf2f79526d1b161eefc4711c6edb226a620ac79f03a94d94cb3c9d5a79d7b850ac5f8b423ef2b9f5fbfa8f7a91e018ce070d5c245230 SHA512 d90d8acc40160267455304e63f6594b03e9a32e15646be0bb5693de57c521b2a2b851acc0cbbe6fd471910d5da17d373fd7d9848186b77f36bd931506154d7e6
+DIST thunderbird-52.8.0-eu.xpi 555536 BLAKE2B adbc99eadb748286d03a35ca6bcc537c034ac65e4bad7e37f63e7bec349ff03df261f1ffe82527e965ca93b6c0d4e83d5ab5e3cf69117d580c791129410c488f SHA512 0001d6ac27631657165e5db8f296d2c0b2ca47e855373019fd46f10053c1090456118867193370add05efe2597298227bb1f42f6fbad9fc166e3212ef77c6201
+DIST thunderbird-52.8.0-fi.xpi 550669 BLAKE2B da3befbd6d4619c227841761baccb3ddf20346565da7eedd8d5cda3299feb44c8f998e89551779dcefff32eb6cd25cc32d3e81a6586e45f1e2faf906a989fa84 SHA512 fc8a8c681e47ff26f17542304449d97100af3c7d6d7aaa48e356f256ed4818021007ca07a3fd11a9502f2311c129bb1c1cf1cfc73f03b01c66f0b476afc51c08
+DIST thunderbird-52.8.0-fr.xpi 577561 BLAKE2B 008fb9d2913ed2cbbc291736c559c120511e87fb155d010b9da2c40fc599b22fe7985a37c397d3f0481ed43a2e4a88a71bf16b4e55c84a119081357b37349432 SHA512 f6ddd49e8db1c7491f329f5270dbe04a17db84863d7c2c1b9f8184cc72eaf610f53f43415c499400933a1d4a21c0e2703eb855919df179076032f2e049b9a4a5
+DIST thunderbird-52.8.0-fy-NL.xpi 563632 BLAKE2B 0a8c1dfe8d65faa9786b0b296ef5ee5e6bbf6aa3768fc8bf80303fa50e5345e65d161bf6f0073380d8f0fd03d17d6857880f6625aa1fbafb6bd63bf21e645fea SHA512 24a1fe29c2e9c35ae854c84d95f4d2bd3c5156531e43139e1129ff6366aa7daa952910c043b6393d541667067f1fc93c81c75b3d7dc67197fdb965ac1de793e7
+DIST thunderbird-52.8.0-ga-IE.xpi 583556 BLAKE2B 11fec560da638cafd9334445792b3c5f6b3bc4c50e55bcb0932fe230416da41089cfd615a9cec1fa6ca46f4fe5c0bb6f2412a793974964b4197d7bc84352a763 SHA512 73a26e8687fb91a8c7b6bf15b8d1da681355b71037836eb20616a37c523ce0d08b33f0b6fc9f5c6c7c27ca925d8ef9345baed62ac697933fcc7da0cf8728ca36
+DIST thunderbird-52.8.0-gd.xpi 574065 BLAKE2B dcf9e78c5ec5995797e78d0c3fa860fe035be140f54973c19d79672eb32cca588e594aee642b284d1b20e94b79bed96b64751b58b07f51cbae664665f0698e21 SHA512 3ab2a8149c069950dc7585305e61b83e07be0f298c90af5bbb5c01deb5be20f8e531b5083f6fa0a5d7bc459cb2f4b2f04faefd13d510474d05b4404f996be4e3
+DIST thunderbird-52.8.0-gl.xpi 575150 BLAKE2B ed48cc6ce087f40fb30dabdba4091e71339c6be02fa99f6a5356f356de09045231645c3e8448792c297b1ee0a7a29a3e924ede20e9fb05ecb2005769e9dd52fe SHA512 5c28a5fb55627ee6d10b393e8b2447658e23d8f6f022da78b7a6aaf33228036ec31a21049adbe6f42198eea91288e9977dc7b1f14fbf5b0ea3d8dee0275e62e6
+DIST thunderbird-52.8.0-he.xpi 592566 BLAKE2B cce5d5b17a7a80d5eaac786c64699fd6bb3f794d4c5fd28ebf958f424dac4c6ecd9ac711cf569299194fe052bc9e1f6d361ee6c169a9079d12349c0ca233e5cd SHA512 c9e14106e95bc9b65ca11bc40abb5e0ed61ee026b34768e178a411f5d27561ee6413076efd10c19c99e7c08adaaa547e21c536e326787cd457cb970fb0a00d68
+DIST thunderbird-52.8.0-hr.xpi 564780 BLAKE2B 39cee9f214ede451812a0c40edf3d222a46b4c7ded0452f61499918e5ee0a9cb1bc1dfa9dd269f684a772066cba7edfbe70f8ee6478f0a4cb0c15e00ef9ac6bd SHA512 3940c5e962cbb3743a4cdd1a402b45c65badf999a23bdd4c79fef055efeede9ead99d1a442edca35b7993a85ac48156162ebbd82d1e51afee78531d4f7718761
+DIST thunderbird-52.8.0-hsb.xpi 582242 BLAKE2B ceebedab1a9eec89da6ddd5c2b012d81ce82ba2989c2dac5bd9874815dbc56766919e7f78f353e72ea0d104a4c1ecce80ce6409452e9d514b00982465255a28e SHA512 9c561b0ca547a1aecb77905e51972d04e494850bf363802a780b015725967f05786c6521132cb5d5ed5f07e2d3f44a72cada23741ce7b3596a72a743825d33b4
+DIST thunderbird-52.8.0-hu.xpi 586446 BLAKE2B 9690aecc7ef9c630de7fd5c746ac682292822c8c8c831dbd1ebacd2587844d74ec0c51242c26c52765b8dbaeadb6bf4ed810c1bb4c0bf5e77dcdbb442ed3eb90 SHA512 39b22ca0f3f681fb807e173d6e8d82d6f34b330b91dafd074f55fd9cb622feffe65063b8ce719832c433bdfbf4979d3a687649d45e0c8cf7be5c5d9df1178c67
+DIST thunderbird-52.8.0-hy-AM.xpi 629879 BLAKE2B a1ad83579bdc39fb5ef2d6ed8a0b68defb00ef20afe038c8c682173242a7f3739a7734435f11719e9c2748785aa049563ae13b5da0496c79f2f739cb3d6ce81c SHA512 2e014f5d180c70858eccb80dfda9cbcfff25d8129311e805072c71568291630a34a492cb3f4b436f06e7a3546c858704e36de4b1c07709827d1532a01eba1dc6
+DIST thunderbird-52.8.0-id.xpi 546527 BLAKE2B 977ad57efad978db9d4a5e4c3289f31b64345442d52dca855372bf8d56c85ab5719c33508905a08cd86900d6baa556a86db904c2d736d29d63587de23d4a9985 SHA512 8d4a671bf1d8982f6520c70d48c4905a23e227c46114698cb33dbabbb8e6d0a393c6ee1b2c21cbfca95d8d8359ddaba8a267ddabe31e363eaf932b8a40d2cee3
+DIST thunderbird-52.8.0-is.xpi 555712 BLAKE2B fd21ae621be473bb372613a459edd17db21cdc1a8d3388e9109d7ed9aa29a7994ff133e5eebc57be8747bd658eab2e6a5bce4f1d3a7216c0db9c2df05e56da7c SHA512 6485c08257780ffdf91e9fa3219a5d26e1979f71904b811fff0e53115676afa7fde8963c2982080bdd37a416ce4c153922f9f120d47ae63ab4af994674b2477a
+DIST thunderbird-52.8.0-it.xpi 455408 BLAKE2B d13f383e76837dbf0958913ee51e7fb00ae543ef09096cd44c1704c6d47a1cc5a6f042385a2ab4d16a918d2cf5383f5fa6720026302f9b399aafba8461f2275c SHA512 7ae09da43960eedb48aeb99296712fcff629ad85437f8343c379d2a62c8c7ebc368ebf1658aa45ce2a4c5eb4aba790e240efea02929763247211f96f38433e36
+DIST thunderbird-52.8.0-ja.xpi 630053 BLAKE2B fb1f5261488641c61b865be55f4bdf8db13431f238c7a553e42c12c16e54864980d24ad18e60ef2cb557a348e8fed72cc21eb8148be3dfee0040074995331af1 SHA512 777ab9b8c46765c227ec0f88dcd633313750e9d4a84eb5b89ec944418975f636ab69bf4d6cca81f7fb7bc51a9b146c313b926dd25b6111e29a3df9ab5acd820e
+DIST thunderbird-52.8.0-ko.xpi 595517 BLAKE2B 7eff3b2638f20abcefd2a72bdaae5a793688715302fd3d3154e4a3fd4d8c5e52a26aaef9ed8b546f294ab8af11c4375fe9f03fc2ba763a3d9a31a9160691ba56 SHA512 536d152498aee8ccac22f2cbf94ab82caeb1c15c18236a3eca7c4b0a9f231ba6410e6c1d4c935f71b7aec214a78752e5b4d2015ef1c2dccd22691ba8142f273b
+DIST thunderbird-52.8.0-lt.xpi 580598 BLAKE2B f789732fbb231563a36a22b693cb648496d5befd804a01b01df5259bb26ab2f887391d88f99666e24744759463c9f81a1b85f8d18559d8c12cf8ef8d32607062 SHA512 81662dd7df9012293cea44b32595cf7e6d952907e2b4514e43c6bef8ffc5021faa898a872207bb59f1dd9fbe00a599b821a7c924301281e1d6c76bd8dc99ff2f
+DIST thunderbird-52.8.0-nb-NO.xpi 551104 BLAKE2B 74c9baa8293516eb4b306d06b2440f87d33c22889ee6d170d124d78fce6217acdaa93b404d23b90b4e83a59004710fb38a1f2217f2266c1d4bc1a1c855828288 SHA512 5ff5fba7953d1caf738ca3caa40f2160e56b5f43aa74a94d544ed5a5966c8a9721d3d0e4ffef96192e7bc9351fe063fb5ae3b2117171ef20c76b6cc8d17de6ae
+DIST thunderbird-52.8.0-nl.xpi 557957 BLAKE2B 84c40e5e37ebe767083ed579279b4fd95288f9b1104698d7a87a0fa18ea3f7274f827a8346e68354afdc70c4a6918f57c71fb7ddd793704005c0fe2d2c9da2a7 SHA512 776666f7a51c3c8432860ab75bbd3b681c156ac90e3c2ff8818001eb26d10d69022d459d227ea7d0051e9654ad95e75e5a5619781711f170a38b6251c76b26e8
+DIST thunderbird-52.8.0-nn-NO.xpi 551891 BLAKE2B 8317aa4f02da92804127e4d46e909a4db38bbad15151a2438783648a9ed450d9d8b412309da357d2e800fc6363ac94a7025f69fa94b8df62b397fa03b013d5dd SHA512 748742f8c4aab5061969d9a1fd39beabf7e403d614e4cd07c3baf6878b097abdd8775ad85ad42989703e4065044de05f1add059ad17cf896a020922947397e0b
+DIST thunderbird-52.8.0-pa-IN.xpi 646569 BLAKE2B d3fd3e9ce6370e4cd5f326d2272b383b5f3cc22d82c0063d31a31e201d251194243f6ff883c6d06f30c61919b63818e5a9cb8ab9f9a13ac76484adbc37ebc30a SHA512 611ac640e3ccd0d1f088b6b9452d7b3a33a7dcdef48137d7f9364d4c7551dea62c50a1c7d503de602181afea9f330adad56eccca34b869eaa85760abcdbe728c
+DIST thunderbird-52.8.0-pl.xpi 469901 BLAKE2B acb0565b6cc0d1606f69b636cdcae77f32f529718369f6b8e7f6c10af52c7df3136655f9bb606eda587ee32543c613d93ae826681cc7c7cd144ae1114945b802 SHA512 efbc2c4079b662544894f3af227fc05e09db9779ed163d24f17fea1f9aa72d83dec4ed7f65d714a18d3a83b3bb6b12db9a48b5ed33cb53f1bf02affa0aa96f0c
+DIST thunderbird-52.8.0-pt-BR.xpi 558224 BLAKE2B 8b27e91c5b12d58a1c2ce70c2f47cf7e116ceba9530fdeb0e4e12fd1c7d3bd53e132b193cc39e176d4b2402381fc524de478bea363e5065df40c1b55a27ca20a SHA512 f65863db9ebac81141416b821642e210434bb068c3270f35bba897f1ee8b5ff0da718592e608e260fb506dd443efc94a30990ba5d1527ef2af8c6164dd03ec66
+DIST thunderbird-52.8.0-pt-PT.xpi 565624 BLAKE2B 6872daa829a292e57755e24a4515306087f2b3896679aa5c63db2e9f23a76d63865309c60a845a5ce9da1ddcc39c7ae3318ff75e818cb7d956a45a990b1e86b4 SHA512 9330ed7cfb59aa596b07215ba7815d24fa5bd86bce67a0e05788112d6742852719336c9d05b72ae1e8b9375b2792b4695e7b45b5412f12045ccd71362f225e0b
+DIST thunderbird-52.8.0-rm.xpi 557605 BLAKE2B 28abbcf419b653271d86ce431e5869825742740bcb571952a2216bc60a8e3e6c4bc110f9e335df7caf0cf69089a21922d34d6d75c0ffe5a2c65db50eef5d1fc0 SHA512 b6d54506382ae216e50d8960a42beebad4a30866f928233670bf51c8d3261452370cd01bea91f6137387acd270bb43ae3a67b09b215f97fd89d79145972a0794
+DIST thunderbird-52.8.0-ro.xpi 570529 BLAKE2B c5be6c2a8a0a6b0d74dba9e375e54f23b53ddc0a6ad419a15e4e2a4a93832bc1010e1096441ae3e2a2bf776219872fd8f05eb037650ae9ad3aafa6a359f69115 SHA512 4d323231445ffdcfaa305845a22483f58f9c37a04f735c4d07b24294a195afda79e08eee45cef6c2463288302d1a8f76a576985dcc89594908dcf6cfc86d632f
+DIST thunderbird-52.8.0-ru.xpi 530670 BLAKE2B cc8fc978e764d7533f4388136ca69f67728c83a06bfa7990368cc7dd6721bdb4268835f64615dbc1e55fb822bb074bb35c88d2b99ccc6f1d857be237d2e9e9b0 SHA512 9ad75a0e32bc3a18b39faf5eab36aa8c2e152e262c065642753e64ac68b594b7b2d0bdc2c8f95f3739f58729bdd69a739da15b69dbac5070114bbc45daf78499
+DIST thunderbird-52.8.0-si.xpi 649010 BLAKE2B c36090a34a13dfff85a020974a0d276dc4e5f16829b615959e000b1c38d08bebe109d65087c8620c426860202fa710a0ce14fc853a242cdb00549ed51f53a970 SHA512 f595ac1805f29e3abdb954791501f02847b6b67f2c95a5d96625cd717ab66a280262eff283240d6e6b4905928523e2ccfb64856d023d7a0aca7e4e580b6488e0
+DIST thunderbird-52.8.0-sk.xpi 583882 BLAKE2B 6dca98f6d047416676ff4efddd82e6123a71d053b8fede47ee0f7e7b6abc4349dfe14254e8befa08d78df5d558edef3ae245e2526fc85f003aa265230f398bfd SHA512 58473dd5e62f1c53cdae0cc90f7c66c1d135ec5934b73e58b7793e9258acd374c2262e6d25dfaccf7ec651136a151bc191abddf9ee3f9d8cd38221fc14281c04
+DIST thunderbird-52.8.0-sl.xpi 562834 BLAKE2B 7e02fd6bef16af5664b46aa5bcdb7ad3c264e53818452e180b559bf4b952cc6383ff0b339359746fbf409ab7e650ce494b61e9dbb602c67c7a308a9fe9d82da3 SHA512 e9ce318f9862274d6b7cf90ca1d517eda323a8d33509d5d063a98f81e55c14d716b5f3285d0621f260867ad41be83e2cbbb5fd240cc842bcb4bdf0e4df0421b4
+DIST thunderbird-52.8.0-sq.xpi 570616 BLAKE2B ece5e1f477a6d46508cdd71db054d558e00069ebc88dd334455d522487bcc300934cbd83eee7a72d2e3165bdc1bef31857ed01d326f7ff4780b1d37295c38764 SHA512 ce4f02970ca3c2d4c7d85aabdadd0c7068a40eb102edbf67a2f3521848f9d1a0905f0c7f245e6088b3c7af501c8aee637dabce64badbae7e81209295b9af9a59
+DIST thunderbird-52.8.0-sr.xpi 609020 BLAKE2B 0c1d690e2daaef172055e333a1e25e6159d8394e1487f24af9ff6bb89e346982a79bdb256e3255b11ac59e5b63288cbfcccb161ea4a03baafbcfd1c03fcb0924 SHA512 34c33a3d8ea9c9ef40e11ae27d03eccdfa19e7eb21114034a741e0f064874867d6138158a255e7438a22f5f7ee5eb632cc6d8caf043d25ef8aa0ddee96d04943
+DIST thunderbird-52.8.0-sv-SE.xpi 565777 BLAKE2B 2a35fa460703fe99849d133b16577d5da0e2093752d071adc7f20950613bac336f5cdf3fa71128d3eb1e15f5f87b3f2d56cc08f7d3deb6d115df5f10532a607e SHA512 3e78e1430db0efd419a94231742a78ed2f094d4e860c925a0a2699481b01ae90ee6a4a556d51af723a69fd37362ec56e544989ab4fc483dcb7c5f9666b81ea37
+DIST thunderbird-52.8.0-ta-LK.xpi 675039 BLAKE2B f141b5aeed64ce104ce7772f70ba66c876cdcf02b381a85451fe1d94fe11ffae96f1249c98516f12af8af12b6ef4464e7a26077fa118400a8b15dcf30e1659c6 SHA512 9a5c5852efdd59ffa13e784956f6d500ea9492506eff6ae352b2f79f60a45686d5b9bdad11cacc3683dec039c9327fd0aaa52209256f2dac6393eebe102c629c
+DIST thunderbird-52.8.0-tr.xpi 569926 BLAKE2B 537bf4d39ad09b26085462b28efe66f9eb58f23621a403cf970ec09299c43acb897db2795260f4581cba56252951ba1967a0aed2bf6970fe2b44ac55ab0ad979 SHA512 39cce6df28f709bf8a3ff6d65707eb94713d683b282085fabfc0fd4a2efb130710bf9387ce7747ee18382344d351668dac08ac0dd3a3db0bcc8a1d8d5277f47f
+DIST thunderbird-52.8.0-uk.xpi 652855 BLAKE2B dae7288cbb6b0d0c6910b852fdd16144a21cd64f1a941e7f3a144e1c5fcde0cf8b66266a3b041eb1fe2407006ef8b85bd95df21a610a6a3bb5eb3ebb4acc22d7 SHA512 26bc7c1cbd8c441c8ef5d4fa5c043c1c802bdf627c9079a85f17fe2d8cc1ab55b854163a12d0548b55c72c0ed4de65c2185bce26bcc868e49cb011e235353665
+DIST thunderbird-52.8.0-vi.xpi 637164 BLAKE2B 0324efd580582af4965de2db1bdffe856c123c67a76c1e0fd1fe367687dd3d97b77ddd47635488896ada5be75a641cacdf3cd81f92162a15fcf60a6ad4464e4a SHA512 f37767066cfdd165aaf4bcfa0bf7a4b8dd1a34d1aa45172560a2f2d5a1d9d5c8ef86a679fc9724af94a2c2d2e856f1af8d4f564988030575d4513ab6759e7533
+DIST thunderbird-52.8.0-zh-CN.xpi 593612 BLAKE2B 725c080083c53aa36f8a93d2bc3b80c20eef2c844c30c4935d510930c67a1f59230f193002276fd7d18ed5b2e61cbc2ec72a52e924fb17d35ebe81bacc271355 SHA512 129105f53cfb56311f855f8d15041f9c2900fe56c2662473e5bd7c1ee3eed96b8d61fd6416fa1ad626a4acf550554d2f4898caacf44c3967b2e7fb03cbcf6b7c
+DIST thunderbird-52.8.0-zh-TW.xpi 595729 BLAKE2B a8f52baf28e60dbc510ad8d0893a4c259dfc34e332810b76f8ddd8e2c84ec9f938804e19cdf4640dd4901bb877921d0570d241d1769351d76e7d59e5a3ad8544 SHA512 fe1b639041bf52c9037ed08a13a9044b9a56241d8c455e8d7a818b60967fef17124c7b18256c72ce72e2b3802b33e632389adc8f36783c633ebd5167cd83c32c
+DIST thunderbird-bin_i686-52.8.0.tar.bz2 51195939 BLAKE2B 364402bc2c0b1f2925d60fcc5abc186478c2a445e676727c74fd982d834d915bacca39dbfee8773844731a8a03b4f759e7b95470f27d3915d78fd067ffc6a6a5 SHA512 5f0d43831c256e00eb3cbe5953cae5b6e84f54bbbde8b71c83f841c38b3704620e1163bcc5cc903a0b716685371912401f90bd00f5500fd42cc6debe97b28470
+DIST thunderbird-bin_x86_64-52.8.0.tar.bz2 49905374 BLAKE2B d70faf7075f4999b0f9e84225d8e46101cb4f01872d69d88559b4492f660e1ae741382297075d676e62f9753363f08e5ecd72d2dbe511f76a23bc080dac5f8b2 SHA512 d5c2ab406d1820745bf425ba7bf6b947166747d0037f1519c0e4a76a6036be9eed1e00e563c7f663f7472ef77a6a85b646f9ed706f26666dc1d4dd39dba3f917
+EBUILD thunderbird-bin-52.8.0.ebuild 4742 BLAKE2B 0c3519e5c946d5508470bd065b543089057eed483291ee4fdb6aef1847d171f5c9fde0e0e0c7c323de7389f27127518e3570a3bef340b012054c1e5a4a127d36 SHA512 4aa75ad4ea44bf2de07d6f9164cd36ee6f1a107ca76710c77f075acb23b7f8ab88517ac614c04e28906aea4d6e11e32992352cc10b9522a35d4c9cf75ede3849
 MISC metadata.xml 329 BLAKE2B 429b3afed246e9243db4ca334139ee4a5cdf8f34c89fd724a718a1d53e88ec3afc96adfa194c4b8f31da7934f1a59348af3bb94882e95b6e9a23ab14cbeeaf42 SHA512 8710fdb1dc3db7de4980029b8c0e2e1b3b449505c3878c955e519b50715a5c82ed16a120e6e259a1e4a56e7e39162e7b009d5db8ef4d96e607e89d48161d1e7f
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-52.7.0.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-52.8.0.ebuild
index a0a280b27aa3..49c01084b9d3 100644
--- a/mail-client/thunderbird-bin/thunderbird-bin-52.7.0.ebuild
+++ b/mail-client/thunderbird-bin/thunderbird-bin-52.8.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 MOZ_ESR=""
-MOZ_LIGHTNING_VER="5.4.5"
+MOZ_LIGHTNING_VER="5.4.8"
 
 # Can be updated using scripts/get_langs.sh from mozilla overlay
 MOZ_LANGS=(ar ast be bg bn-BD br ca cs cy da de el en en-GB en-US es-AR
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index f39f59714ddc..12e818f32c84 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -9,6 +9,7 @@ DIST gdata-provider-3.3.tar.xz 85628 BLAKE2B 2ccde620b181a2d8678f50d7107373886f3
 DIST lightning-4.7.8.tar.xz 1951252 BLAKE2B df8900cacfe660ad17454836893e7199b8590d47ef093699afd135e0a39201cb43dda8d581a36b5375a29c43bb55dd7cb9479dcaf02f52ee8f4a454fe3d426a0 SHA512 37decaf4010e48cf242e76c5d73caf96f7b1e34c67fd465fb8b33055a6986d5fa7b1557862526224ab4ac421df3441e974d297ec4a9454dd63a039683ec46fe6
 DIST lightning-5.4.5.2.tar.xz 1896864 BLAKE2B 545db49edb693696440a48e1b4e0367580284815f918129fe148037312a9950887cfdbc4d41719f8cd8eb47ed193c8e29c10b49dfb919f8bc7d362e07b238ff6 SHA512 544961df074123548c7d71ae195835a17d861d74f838849666380ba6e2975179668d79c2e8053429eb9c52a6b315335e109c942ecf498f48f5729307334a174f
 DIST lightning-5.4.6.tar.xz 1862620 BLAKE2B a7d1d3dd1926844aba7c83378d672317e3ee01ea0d96d233471dcd64cd16af7f1d33c7b2d58ce7539f13874a93efb65edd3329b522eb69f088f734934c5a166f SHA512 10deb6990c260e9b64e08d4a562f6ca496299e5087037632ce082e063999e9af0b0f9fd45df592859b802c510b45818f123a091cde2105167985f99b63031abe
+DIST lightning-5.4.8.tar.xz 1891528 BLAKE2B 8b15d2058171d09b8fc1e992b48d36f024ae9405803c0626060bbdb75318a6ce652cc1b527cc2a30041c81f2ea215c63950912a8783d55e4042c2fcc270bfccf SHA512 9c36ad58ef77f9e7a1e34c07db0357d4db75a44c837068016e1413e31cc762f2cc1b4cf1edf8a78124077053db6ddddec68c17ba42da91c2a05dc87616f742dc
 DIST thunderbird-38.0-patches-0.1.tar.xz 684 BLAKE2B 5f55008421169da375e5cca5e3e4944c207e53b194b7d7b6bc0a589cbcb38695ffd4b06c1f9a8adec9c6affc41717f3a4f0e7da2d8aca647cf8164b6f4834a78 SHA512 52c83af301be959e861dfec55b3c4bc60035387c606976bd29232c4cba077230edcadef242491e699fba10027d0408dd4f33fa320bcf96727afe149166ca02de
 DIST thunderbird-45.8.0-ar.xpi 490775 BLAKE2B acd6914f3792b71a2245c8cdb14f143ff3c3b0f8f5176d2808fbaead0c0c57affbc82c26075d7e3c2c31658e29f038200252ca726a4b9ca0eb8fb8e934439301 SHA512 95adc2355a27d916f96c43bee0d4527990a1eba8cee9e4f85cd6da9202ea0ff4fb89fde127abce03962e185b272f5bbd1d8cfb032f6f32c7895bf3dde8d35a2c
 DIST thunderbird-45.8.0-ast.xpi 428059 BLAKE2B c5fae88f8f28689f663a29f260840a3926830085c2aef8f135e2b6b6b1b81f07673e30792a71edeb57be67cca642752f398de7f74cf338fe29d3ffa232a963cf SHA512 eccf877f29099445ef59c833929a50df7424aa475b1ceb432d6c10b28c71b4e25d840a4fedb1afb3106896da0afeb47a3af1b763553dc6ae40f7bda5b0d65040
@@ -238,8 +239,66 @@ DIST thunderbird-52.7.0-vi.xpi 637164 BLAKE2B d9b33374ee657248f3c83c41dbd7deeadc
 DIST thunderbird-52.7.0-zh-CN.xpi 593612 BLAKE2B 51027d99360c386d9f61ad1049f239757291bd0eb449ddd247263d139a4b583bad6ceadb14a0a5ac33a1ac0013f635837c6c6b8fa04e6b856c0a02bda9169d81 SHA512 e3a8b15133484760f6a9acb49600f979f62b194b5c6621cb5ec9805317de49e58a79692f9c69b34f03af119de31e54f42cfd43434b8a0e0fa26082e7746bc92d
 DIST thunderbird-52.7.0-zh-TW.xpi 595729 BLAKE2B 4b2877e9f45e6d64cfba8ebe41d6d832e5ee87a667ce5c778d1bfb651b9d18ca1abe34125bdc308d226bf79f67505ebe1de05cd14dbc7aa0228611a2f9d00916 SHA512 9aae56ebd2f3e13f097927953d0a1f7834a68d7d37259a2bf425a88d404b91da9488aacf64bda89bb6e35856e6a1a4e6d26d636915df9f15c49fe5e781a0d35a
 DIST thunderbird-52.7.0.source.tar.xz 230410444 BLAKE2B 4c7d10a16f78c2ea791d72f3f99b25556ccfce9448d7b1235403738722aee1c8ad9aa08a21bce3c5a82389d9b4d96ada104950b0168424308f07fa6a939c190b SHA512 875ad6f2b030c65d248ecec4f4a5b51767c3ee7944ac72893237efd2af50145ec2e4a9efa8d60807b78bcfb8189969e5a67d15124710e8b0091f639cddfbfe21
+DIST thunderbird-52.8.0-ar.xpi 604235 BLAKE2B 70f75466606be60e8f9a0897a537264a35e9f4046c88fdadb0a3ea2ae97155f9c5167c4f808ee8231712822cc44b710b03d748c6453e62ad23d4cc4cfd3e24c1 SHA512 fbf320836fcb9fbcd71ba529f4279ee008b08ccc7264856877068c8eb3de6199a8e1f95ab7ca85727d7ef0632bbf46d3d91d00c4dca67e09e0a3597f5225f56a
+DIST thunderbird-52.8.0-ast.xpi 541174 BLAKE2B c1053599d028b75288a0a9e3b256925ae4577d90c74f96abe518d1ee3fb98b9c3d76a86eea8dd0a97f3291831a9fb957315461f889bffbbf0f4ca9a650016094 SHA512 dcdc1ebff99e7afc4d070a6aee4227fbd98bc04af8b3c0b17d44e2e842fbf93b1114f22b1943f0dc2b6572bdae5feed61733c6cb463cc720046efac90ae5dda4
+DIST thunderbird-52.8.0-be.xpi 570932 BLAKE2B 323d8cb018e5a7c42c6a1ec2d189c992e151be997eb2678d91487c32f92a31a4a9842da6a5c0c3f67debaaaae74463e9289570e336d58eb2509ba441ecabef58 SHA512 0a7ee16c9f6bd24b44d6ff9ad6d933ade89ee4d39fc5decf982cf7b25cdc0b5e00278b345fb35bf8fa35f9319474ee2f3366f8318bfa5d9fdec4b06195967189
+DIST thunderbird-52.8.0-bg.xpi 634897 BLAKE2B 2842d604d0e5dd208a9897d5982bfcfe085c57ac117c14db581cbe012e3357f31e5555d9ee96d080e5f5f15abb8fe33a323ea141427ee6922d655dde81e85f46 SHA512 5e1c9610fa9261d05ad6ba9821aa406e07fd7f8f6db2465c19a635d450d93280e889c4b97948910baf545c5a60687f758ea598fc7806fee2abd85f44338966d7
+DIST thunderbird-52.8.0-bn-BD.xpi 676901 BLAKE2B c896d1cfabf30d62c8b44ce1dd3cb300d53a5ad13f7819ebcbb61beb4e767ce9cc9b652b594376ede80bde3dacd921172afca0a04432a5d3e26abc30bcb20548 SHA512 ebf1194badfd0767d6744154decd275b079f3e31d3295e9ee5aa47d034c0a6e961489836938ab9e6402a52a68efe74de11d3baa44cfeeb6bc32d3f56c116845f
+DIST thunderbird-52.8.0-br.xpi 559380 BLAKE2B bb78ec6f7e46b8e79d16908fc3f06be993ca492ed224ce2c2646bd0fb7fb343e7a398aab3ed1ea7cd2806dc70a6464fdafa3be6420c0a254b15303368d6e9d00 SHA512 432a52847d20e48d1b9910fbdeb5a01e7248bc929704f00024f0b284ffc3c1cf4f48f13cf730f9e8b3588d3370e42d734f970ca74b2e88b81c66205a8a4e79ee
+DIST thunderbird-52.8.0-ca.xpi 569910 BLAKE2B b2941e0d0b1ce1753f6b686d11b0a6cc3a5e203195b77a28d26460b34d85ce741adfa9ae696695375aeb91f26d26abc94e5aa9e433c67f55a0fae98642128ab1 SHA512 061e82090625d3161a58818c31a446de662499bc545294446148a389a44c862b40ec0d3d6b480a24d37cabe7867c3c29eaee4ac40a993ec1b837b45b5abd5ff7
+DIST thunderbird-52.8.0-cs.xpi 579150 BLAKE2B 8ddfb14a51edeb35aa09e221ab79e849bce9e4aab801b5876d49b590ff7fe0ce8ed25add1f56230634b5da7fb8878011d8692a01c3dfb0394f307dfba0f8e4b7 SHA512 0b151713a567dbfd873d6104ef077ca4f0e6daa20a0e234eddb40d6f8fbc9c40dcd780a4cf2d84c570dd2004c7beac12bb61e19d975c8668b176bca18838ca8c
+DIST thunderbird-52.8.0-cy.xpi 554858 BLAKE2B a88d23a63a7b18a247164b5cef8380b60b142d419eadd906e3259435503b656cb8583afdba116d6f5314fa5d9d13fb60efffc34012978ffed21ae8c6b3f0191b SHA512 318c4cabace7209adfd41f6c14c3cb0e03edf9194799903d9d4b03a8819e314d65b4fcf5321a27f012a8eecf44308fd566737eb4e6c54d2a2d4deffca63a0243
+DIST thunderbird-52.8.0-da.xpi 543335 BLAKE2B 318cd6abb1c372ff1344cb68b4d54d946eaaa32ca8d7556851011e83a188321be822a30f2d7fa290d02b2a0222617fa6ed097c5bf83d849cb85c7d8f2526cdac SHA512 1aefaabbb16ac6a56a18fc27681afbd4ec7d3798f87743d55a04a1eb24e59ad1517b362af992cab50cb8e11b77c6c28e329e78e37a84faf05ba55612308c8dff
+DIST thunderbird-52.8.0-de.xpi 555744 BLAKE2B 771f700291e0d9f88dba24721bc282e9af9aacd0eba0af1c723cfa1643e3bf8c7dd2f67cf7895074ea434dfb9638dd811294fea5ba6aeb1819f8b57cde8bf182 SHA512 78bd4a22226387a9f106e9a536d916aa97f162d6ed6d8db455cc0db78924696becf9ea89d3feae2653d5e5c981d2d52457d3f29719223fc63cd488703973040c
+DIST thunderbird-52.8.0-el.xpi 662965 BLAKE2B dcbf86f96911de7e6e7626d78cada4f49412db196360a56a167815e660973a37c1ff87ed26868adb7e0e56da3a18e1a830bda7b2499923e824e36bb74cda9584 SHA512 b0e8739ebdfcbd4f7a28d06a3739ad05e65a3c392628d0c127ebfdaf5e889ae439e185458dcf4d0958ee96b969114ef5438e14bb25abd56ecedfaad4c5f51bd9
+DIST thunderbird-52.8.0-en-GB.xpi 531234 BLAKE2B d3633bd90323cffa9b596c43ce908371204528b8eed32ad9a4af62e14da1d885ed0c64f019b7820e53c43a31eeda00dc6838813145e1bc56e7a052f87ddc2127 SHA512 dc6ca61551a6c5c0268ad4fbac8c5fe97ef632ba8b782e0b5a882caca0db5dd36ca194c47ca8d2897639609abc5f0c396f332dfdaa9dfd062d31e4cece6bf1b5
+DIST thunderbird-52.8.0-es-AR.xpi 565995 BLAKE2B 4d9748648daf2e7453d296437e236c9b041252c35663a3d3ffed451cb959f878db18fdd18362628d059d0db2384bbcb6726c79fd16275bd4edc0b8a75947151f SHA512 2e3b5229ab92d8e20c47b6b5258db42801e6780cc714457385e81c0b5195632ae8a5afacfec7afe9a7cc7f500e34dcc7cc6d7f008704161696a4fb22ebf7734b
+DIST thunderbird-52.8.0-es-ES.xpi 445464 BLAKE2B bacd19d5656b1c915a95a3cb305236a5322a0405a8cb2a60eda84898102ed7f2c7f28e9304ce59a72808634f9238f97faa88bf1a818f8f94493c92549c42afe8 SHA512 1f65d35f272a1a91a26cde39cae23c959e921d2706b66cdde9d3a8824f8a9169b65fe7f81165b667610907e871d42495afc95c3b7341dc3139a7859e2eac94d7
+DIST thunderbird-52.8.0-et.xpi 551661 BLAKE2B 2cf6decf5e8286ab636baf2f79526d1b161eefc4711c6edb226a620ac79f03a94d94cb3c9d5a79d7b850ac5f8b423ef2b9f5fbfa8f7a91e018ce070d5c245230 SHA512 d90d8acc40160267455304e63f6594b03e9a32e15646be0bb5693de57c521b2a2b851acc0cbbe6fd471910d5da17d373fd7d9848186b77f36bd931506154d7e6
+DIST thunderbird-52.8.0-eu.xpi 555536 BLAKE2B adbc99eadb748286d03a35ca6bcc537c034ac65e4bad7e37f63e7bec349ff03df261f1ffe82527e965ca93b6c0d4e83d5ab5e3cf69117d580c791129410c488f SHA512 0001d6ac27631657165e5db8f296d2c0b2ca47e855373019fd46f10053c1090456118867193370add05efe2597298227bb1f42f6fbad9fc166e3212ef77c6201
+DIST thunderbird-52.8.0-fi.xpi 550669 BLAKE2B da3befbd6d4619c227841761baccb3ddf20346565da7eedd8d5cda3299feb44c8f998e89551779dcefff32eb6cd25cc32d3e81a6586e45f1e2faf906a989fa84 SHA512 fc8a8c681e47ff26f17542304449d97100af3c7d6d7aaa48e356f256ed4818021007ca07a3fd11a9502f2311c129bb1c1cf1cfc73f03b01c66f0b476afc51c08
+DIST thunderbird-52.8.0-fr.xpi 577561 BLAKE2B 008fb9d2913ed2cbbc291736c559c120511e87fb155d010b9da2c40fc599b22fe7985a37c397d3f0481ed43a2e4a88a71bf16b4e55c84a119081357b37349432 SHA512 f6ddd49e8db1c7491f329f5270dbe04a17db84863d7c2c1b9f8184cc72eaf610f53f43415c499400933a1d4a21c0e2703eb855919df179076032f2e049b9a4a5
+DIST thunderbird-52.8.0-fy-NL.xpi 563632 BLAKE2B 0a8c1dfe8d65faa9786b0b296ef5ee5e6bbf6aa3768fc8bf80303fa50e5345e65d161bf6f0073380d8f0fd03d17d6857880f6625aa1fbafb6bd63bf21e645fea SHA512 24a1fe29c2e9c35ae854c84d95f4d2bd3c5156531e43139e1129ff6366aa7daa952910c043b6393d541667067f1fc93c81c75b3d7dc67197fdb965ac1de793e7
+DIST thunderbird-52.8.0-ga-IE.xpi 583556 BLAKE2B 11fec560da638cafd9334445792b3c5f6b3bc4c50e55bcb0932fe230416da41089cfd615a9cec1fa6ca46f4fe5c0bb6f2412a793974964b4197d7bc84352a763 SHA512 73a26e8687fb91a8c7b6bf15b8d1da681355b71037836eb20616a37c523ce0d08b33f0b6fc9f5c6c7c27ca925d8ef9345baed62ac697933fcc7da0cf8728ca36
+DIST thunderbird-52.8.0-gd.xpi 574065 BLAKE2B dcf9e78c5ec5995797e78d0c3fa860fe035be140f54973c19d79672eb32cca588e594aee642b284d1b20e94b79bed96b64751b58b07f51cbae664665f0698e21 SHA512 3ab2a8149c069950dc7585305e61b83e07be0f298c90af5bbb5c01deb5be20f8e531b5083f6fa0a5d7bc459cb2f4b2f04faefd13d510474d05b4404f996be4e3
+DIST thunderbird-52.8.0-gl.xpi 575150 BLAKE2B ed48cc6ce087f40fb30dabdba4091e71339c6be02fa99f6a5356f356de09045231645c3e8448792c297b1ee0a7a29a3e924ede20e9fb05ecb2005769e9dd52fe SHA512 5c28a5fb55627ee6d10b393e8b2447658e23d8f6f022da78b7a6aaf33228036ec31a21049adbe6f42198eea91288e9977dc7b1f14fbf5b0ea3d8dee0275e62e6
+DIST thunderbird-52.8.0-he.xpi 592566 BLAKE2B cce5d5b17a7a80d5eaac786c64699fd6bb3f794d4c5fd28ebf958f424dac4c6ecd9ac711cf569299194fe052bc9e1f6d361ee6c169a9079d12349c0ca233e5cd SHA512 c9e14106e95bc9b65ca11bc40abb5e0ed61ee026b34768e178a411f5d27561ee6413076efd10c19c99e7c08adaaa547e21c536e326787cd457cb970fb0a00d68
+DIST thunderbird-52.8.0-hr.xpi 564780 BLAKE2B 39cee9f214ede451812a0c40edf3d222a46b4c7ded0452f61499918e5ee0a9cb1bc1dfa9dd269f684a772066cba7edfbe70f8ee6478f0a4cb0c15e00ef9ac6bd SHA512 3940c5e962cbb3743a4cdd1a402b45c65badf999a23bdd4c79fef055efeede9ead99d1a442edca35b7993a85ac48156162ebbd82d1e51afee78531d4f7718761
+DIST thunderbird-52.8.0-hsb.xpi 582242 BLAKE2B ceebedab1a9eec89da6ddd5c2b012d81ce82ba2989c2dac5bd9874815dbc56766919e7f78f353e72ea0d104a4c1ecce80ce6409452e9d514b00982465255a28e SHA512 9c561b0ca547a1aecb77905e51972d04e494850bf363802a780b015725967f05786c6521132cb5d5ed5f07e2d3f44a72cada23741ce7b3596a72a743825d33b4
+DIST thunderbird-52.8.0-hu.xpi 586446 BLAKE2B 9690aecc7ef9c630de7fd5c746ac682292822c8c8c831dbd1ebacd2587844d74ec0c51242c26c52765b8dbaeadb6bf4ed810c1bb4c0bf5e77dcdbb442ed3eb90 SHA512 39b22ca0f3f681fb807e173d6e8d82d6f34b330b91dafd074f55fd9cb622feffe65063b8ce719832c433bdfbf4979d3a687649d45e0c8cf7be5c5d9df1178c67
+DIST thunderbird-52.8.0-hy-AM.xpi 629879 BLAKE2B a1ad83579bdc39fb5ef2d6ed8a0b68defb00ef20afe038c8c682173242a7f3739a7734435f11719e9c2748785aa049563ae13b5da0496c79f2f739cb3d6ce81c SHA512 2e014f5d180c70858eccb80dfda9cbcfff25d8129311e805072c71568291630a34a492cb3f4b436f06e7a3546c858704e36de4b1c07709827d1532a01eba1dc6
+DIST thunderbird-52.8.0-id.xpi 546527 BLAKE2B 977ad57efad978db9d4a5e4c3289f31b64345442d52dca855372bf8d56c85ab5719c33508905a08cd86900d6baa556a86db904c2d736d29d63587de23d4a9985 SHA512 8d4a671bf1d8982f6520c70d48c4905a23e227c46114698cb33dbabbb8e6d0a393c6ee1b2c21cbfca95d8d8359ddaba8a267ddabe31e363eaf932b8a40d2cee3
+DIST thunderbird-52.8.0-is.xpi 555712 BLAKE2B fd21ae621be473bb372613a459edd17db21cdc1a8d3388e9109d7ed9aa29a7994ff133e5eebc57be8747bd658eab2e6a5bce4f1d3a7216c0db9c2df05e56da7c SHA512 6485c08257780ffdf91e9fa3219a5d26e1979f71904b811fff0e53115676afa7fde8963c2982080bdd37a416ce4c153922f9f120d47ae63ab4af994674b2477a
+DIST thunderbird-52.8.0-it.xpi 455408 BLAKE2B d13f383e76837dbf0958913ee51e7fb00ae543ef09096cd44c1704c6d47a1cc5a6f042385a2ab4d16a918d2cf5383f5fa6720026302f9b399aafba8461f2275c SHA512 7ae09da43960eedb48aeb99296712fcff629ad85437f8343c379d2a62c8c7ebc368ebf1658aa45ce2a4c5eb4aba790e240efea02929763247211f96f38433e36
+DIST thunderbird-52.8.0-ja.xpi 630053 BLAKE2B fb1f5261488641c61b865be55f4bdf8db13431f238c7a553e42c12c16e54864980d24ad18e60ef2cb557a348e8fed72cc21eb8148be3dfee0040074995331af1 SHA512 777ab9b8c46765c227ec0f88dcd633313750e9d4a84eb5b89ec944418975f636ab69bf4d6cca81f7fb7bc51a9b146c313b926dd25b6111e29a3df9ab5acd820e
+DIST thunderbird-52.8.0-ko.xpi 595517 BLAKE2B 7eff3b2638f20abcefd2a72bdaae5a793688715302fd3d3154e4a3fd4d8c5e52a26aaef9ed8b546f294ab8af11c4375fe9f03fc2ba763a3d9a31a9160691ba56 SHA512 536d152498aee8ccac22f2cbf94ab82caeb1c15c18236a3eca7c4b0a9f231ba6410e6c1d4c935f71b7aec214a78752e5b4d2015ef1c2dccd22691ba8142f273b
+DIST thunderbird-52.8.0-lt.xpi 580598 BLAKE2B f789732fbb231563a36a22b693cb648496d5befd804a01b01df5259bb26ab2f887391d88f99666e24744759463c9f81a1b85f8d18559d8c12cf8ef8d32607062 SHA512 81662dd7df9012293cea44b32595cf7e6d952907e2b4514e43c6bef8ffc5021faa898a872207bb59f1dd9fbe00a599b821a7c924301281e1d6c76bd8dc99ff2f
+DIST thunderbird-52.8.0-nb-NO.xpi 551104 BLAKE2B 74c9baa8293516eb4b306d06b2440f87d33c22889ee6d170d124d78fce6217acdaa93b404d23b90b4e83a59004710fb38a1f2217f2266c1d4bc1a1c855828288 SHA512 5ff5fba7953d1caf738ca3caa40f2160e56b5f43aa74a94d544ed5a5966c8a9721d3d0e4ffef96192e7bc9351fe063fb5ae3b2117171ef20c76b6cc8d17de6ae
+DIST thunderbird-52.8.0-nl.xpi 557957 BLAKE2B 84c40e5e37ebe767083ed579279b4fd95288f9b1104698d7a87a0fa18ea3f7274f827a8346e68354afdc70c4a6918f57c71fb7ddd793704005c0fe2d2c9da2a7 SHA512 776666f7a51c3c8432860ab75bbd3b681c156ac90e3c2ff8818001eb26d10d69022d459d227ea7d0051e9654ad95e75e5a5619781711f170a38b6251c76b26e8
+DIST thunderbird-52.8.0-nn-NO.xpi 551891 BLAKE2B 8317aa4f02da92804127e4d46e909a4db38bbad15151a2438783648a9ed450d9d8b412309da357d2e800fc6363ac94a7025f69fa94b8df62b397fa03b013d5dd SHA512 748742f8c4aab5061969d9a1fd39beabf7e403d614e4cd07c3baf6878b097abdd8775ad85ad42989703e4065044de05f1add059ad17cf896a020922947397e0b
+DIST thunderbird-52.8.0-pa-IN.xpi 646569 BLAKE2B d3fd3e9ce6370e4cd5f326d2272b383b5f3cc22d82c0063d31a31e201d251194243f6ff883c6d06f30c61919b63818e5a9cb8ab9f9a13ac76484adbc37ebc30a SHA512 611ac640e3ccd0d1f088b6b9452d7b3a33a7dcdef48137d7f9364d4c7551dea62c50a1c7d503de602181afea9f330adad56eccca34b869eaa85760abcdbe728c
+DIST thunderbird-52.8.0-pl.xpi 469901 BLAKE2B acb0565b6cc0d1606f69b636cdcae77f32f529718369f6b8e7f6c10af52c7df3136655f9bb606eda587ee32543c613d93ae826681cc7c7cd144ae1114945b802 SHA512 efbc2c4079b662544894f3af227fc05e09db9779ed163d24f17fea1f9aa72d83dec4ed7f65d714a18d3a83b3bb6b12db9a48b5ed33cb53f1bf02affa0aa96f0c
+DIST thunderbird-52.8.0-pt-BR.xpi 558224 BLAKE2B 8b27e91c5b12d58a1c2ce70c2f47cf7e116ceba9530fdeb0e4e12fd1c7d3bd53e132b193cc39e176d4b2402381fc524de478bea363e5065df40c1b55a27ca20a SHA512 f65863db9ebac81141416b821642e210434bb068c3270f35bba897f1ee8b5ff0da718592e608e260fb506dd443efc94a30990ba5d1527ef2af8c6164dd03ec66
+DIST thunderbird-52.8.0-pt-PT.xpi 565624 BLAKE2B 6872daa829a292e57755e24a4515306087f2b3896679aa5c63db2e9f23a76d63865309c60a845a5ce9da1ddcc39c7ae3318ff75e818cb7d956a45a990b1e86b4 SHA512 9330ed7cfb59aa596b07215ba7815d24fa5bd86bce67a0e05788112d6742852719336c9d05b72ae1e8b9375b2792b4695e7b45b5412f12045ccd71362f225e0b
+DIST thunderbird-52.8.0-rm.xpi 557605 BLAKE2B 28abbcf419b653271d86ce431e5869825742740bcb571952a2216bc60a8e3e6c4bc110f9e335df7caf0cf69089a21922d34d6d75c0ffe5a2c65db50eef5d1fc0 SHA512 b6d54506382ae216e50d8960a42beebad4a30866f928233670bf51c8d3261452370cd01bea91f6137387acd270bb43ae3a67b09b215f97fd89d79145972a0794
+DIST thunderbird-52.8.0-ro.xpi 570529 BLAKE2B c5be6c2a8a0a6b0d74dba9e375e54f23b53ddc0a6ad419a15e4e2a4a93832bc1010e1096441ae3e2a2bf776219872fd8f05eb037650ae9ad3aafa6a359f69115 SHA512 4d323231445ffdcfaa305845a22483f58f9c37a04f735c4d07b24294a195afda79e08eee45cef6c2463288302d1a8f76a576985dcc89594908dcf6cfc86d632f
+DIST thunderbird-52.8.0-ru.xpi 530670 BLAKE2B cc8fc978e764d7533f4388136ca69f67728c83a06bfa7990368cc7dd6721bdb4268835f64615dbc1e55fb822bb074bb35c88d2b99ccc6f1d857be237d2e9e9b0 SHA512 9ad75a0e32bc3a18b39faf5eab36aa8c2e152e262c065642753e64ac68b594b7b2d0bdc2c8f95f3739f58729bdd69a739da15b69dbac5070114bbc45daf78499
+DIST thunderbird-52.8.0-si.xpi 649010 BLAKE2B c36090a34a13dfff85a020974a0d276dc4e5f16829b615959e000b1c38d08bebe109d65087c8620c426860202fa710a0ce14fc853a242cdb00549ed51f53a970 SHA512 f595ac1805f29e3abdb954791501f02847b6b67f2c95a5d96625cd717ab66a280262eff283240d6e6b4905928523e2ccfb64856d023d7a0aca7e4e580b6488e0
+DIST thunderbird-52.8.0-sk.xpi 583882 BLAKE2B 6dca98f6d047416676ff4efddd82e6123a71d053b8fede47ee0f7e7b6abc4349dfe14254e8befa08d78df5d558edef3ae245e2526fc85f003aa265230f398bfd SHA512 58473dd5e62f1c53cdae0cc90f7c66c1d135ec5934b73e58b7793e9258acd374c2262e6d25dfaccf7ec651136a151bc191abddf9ee3f9d8cd38221fc14281c04
+DIST thunderbird-52.8.0-sl.xpi 562834 BLAKE2B 7e02fd6bef16af5664b46aa5bcdb7ad3c264e53818452e180b559bf4b952cc6383ff0b339359746fbf409ab7e650ce494b61e9dbb602c67c7a308a9fe9d82da3 SHA512 e9ce318f9862274d6b7cf90ca1d517eda323a8d33509d5d063a98f81e55c14d716b5f3285d0621f260867ad41be83e2cbbb5fd240cc842bcb4bdf0e4df0421b4
+DIST thunderbird-52.8.0-sq.xpi 570616 BLAKE2B ece5e1f477a6d46508cdd71db054d558e00069ebc88dd334455d522487bcc300934cbd83eee7a72d2e3165bdc1bef31857ed01d326f7ff4780b1d37295c38764 SHA512 ce4f02970ca3c2d4c7d85aabdadd0c7068a40eb102edbf67a2f3521848f9d1a0905f0c7f245e6088b3c7af501c8aee637dabce64badbae7e81209295b9af9a59
+DIST thunderbird-52.8.0-sr.xpi 609020 BLAKE2B 0c1d690e2daaef172055e333a1e25e6159d8394e1487f24af9ff6bb89e346982a79bdb256e3255b11ac59e5b63288cbfcccb161ea4a03baafbcfd1c03fcb0924 SHA512 34c33a3d8ea9c9ef40e11ae27d03eccdfa19e7eb21114034a741e0f064874867d6138158a255e7438a22f5f7ee5eb632cc6d8caf043d25ef8aa0ddee96d04943
+DIST thunderbird-52.8.0-sv-SE.xpi 565777 BLAKE2B 2a35fa460703fe99849d133b16577d5da0e2093752d071adc7f20950613bac336f5cdf3fa71128d3eb1e15f5f87b3f2d56cc08f7d3deb6d115df5f10532a607e SHA512 3e78e1430db0efd419a94231742a78ed2f094d4e860c925a0a2699481b01ae90ee6a4a556d51af723a69fd37362ec56e544989ab4fc483dcb7c5f9666b81ea37
+DIST thunderbird-52.8.0-ta-LK.xpi 675039 BLAKE2B f141b5aeed64ce104ce7772f70ba66c876cdcf02b381a85451fe1d94fe11ffae96f1249c98516f12af8af12b6ef4464e7a26077fa118400a8b15dcf30e1659c6 SHA512 9a5c5852efdd59ffa13e784956f6d500ea9492506eff6ae352b2f79f60a45686d5b9bdad11cacc3683dec039c9327fd0aaa52209256f2dac6393eebe102c629c
+DIST thunderbird-52.8.0-tr.xpi 569926 BLAKE2B 537bf4d39ad09b26085462b28efe66f9eb58f23621a403cf970ec09299c43acb897db2795260f4581cba56252951ba1967a0aed2bf6970fe2b44ac55ab0ad979 SHA512 39cce6df28f709bf8a3ff6d65707eb94713d683b282085fabfc0fd4a2efb130710bf9387ce7747ee18382344d351668dac08ac0dd3a3db0bcc8a1d8d5277f47f
+DIST thunderbird-52.8.0-uk.xpi 652855 BLAKE2B dae7288cbb6b0d0c6910b852fdd16144a21cd64f1a941e7f3a144e1c5fcde0cf8b66266a3b041eb1fe2407006ef8b85bd95df21a610a6a3bb5eb3ebb4acc22d7 SHA512 26bc7c1cbd8c441c8ef5d4fa5c043c1c802bdf627c9079a85f17fe2d8cc1ab55b854163a12d0548b55c72c0ed4de65c2185bce26bcc868e49cb011e235353665
+DIST thunderbird-52.8.0-vi.xpi 637164 BLAKE2B 0324efd580582af4965de2db1bdffe856c123c67a76c1e0fd1fe367687dd3d97b77ddd47635488896ada5be75a641cacdf3cd81f92162a15fcf60a6ad4464e4a SHA512 f37767066cfdd165aaf4bcfa0bf7a4b8dd1a34d1aa45172560a2f2d5a1d9d5c8ef86a679fc9724af94a2c2d2e856f1af8d4f564988030575d4513ab6759e7533
+DIST thunderbird-52.8.0-zh-CN.xpi 593612 BLAKE2B 725c080083c53aa36f8a93d2bc3b80c20eef2c844c30c4935d510930c67a1f59230f193002276fd7d18ed5b2e61cbc2ec72a52e924fb17d35ebe81bacc271355 SHA512 129105f53cfb56311f855f8d15041f9c2900fe56c2662473e5bd7c1ee3eed96b8d61fd6416fa1ad626a4acf550554d2f4898caacf44c3967b2e7fb03cbcf6b7c
+DIST thunderbird-52.8.0-zh-TW.xpi 595729 BLAKE2B a8f52baf28e60dbc510ad8d0893a4c259dfc34e332810b76f8ddd8e2c84ec9f938804e19cdf4640dd4901bb877921d0570d241d1769351d76e7d59e5a3ad8544 SHA512 fe1b639041bf52c9037ed08a13a9044b9a56241d8c455e8d7a818b60967fef17124c7b18256c72ce72e2b3802b33e632389adc8f36783c633ebd5167cd83c32c
+DIST thunderbird-52.8.0.source.tar.xz 230380780 BLAKE2B 6bb13abbbfc6fbb9eba6bbc9a66b891bf463233ff875b4bf0b877c3ee8c6b868e964381cd7904ff91027189ef05bf11eae90791612cee66720c0713930594df0 SHA512 ce44f32f44244560499c44dbe963a8296cf58cf33e3f26d07be455746ed7f77791084e41bc66b2c90fe46e97fa15ae2041b1f5fcfa94d15b45c4f90172230d03
 EBUILD thunderbird-45.8.0.ebuild 11907 BLAKE2B 9c59384a0af373242f9c0178ce2d9ecfa47d462d35b937ba6f7822db31ab1f7ac0f6c74039f8ac616d10461e7d6a343ecb1e3c17e1f8648b45200d4b6d04a9ee SHA512 fdd92606748e698b21b6f8c3a37aad0e107de5326a5e20cb53b48878b153e7a77c01e30aea3a9e60a187da3265efc36bbbc2783d5edcda921ca3d172b801f1e3
 EBUILD thunderbird-52.5.2.ebuild 10421 BLAKE2B eae5e5b0aa7a10289518343dfc8471a185fcf8bbdd789eca86615be2263fb6e300aee27c82f54133518893060dec53f5488f32c61dde6f585f2e018a9cc2580c SHA512 e1f50c390c7c889c546fbcbe18f1aedf976a3d79ce9531aad20389e736df1b7ca0e7cdd11c9bb140c160e2db537e707b4ba272c9d4b7235eb1cfc2ecfa634930
 EBUILD thunderbird-52.6.0-r1.ebuild 10489 BLAKE2B 3e76ba3894f8715ffbfaa0c4a9cd16e9a288e63c45d2e194991073e784fa7fae89f87dbcd7b83cd1d0ca0a3bbd45bb2b773ffcfc2678ef63ea21cb8d3ea3c246 SHA512 9f605505758d73e79c574ac52a2a3fc6b2ab2d6113b3e9a5c598df3991e8c22d058dbf732b6a8f77f4b2f3f420a39df16bdadf129b03c28a30a09ca6bd1a6849
 EBUILD thunderbird-52.7.0.ebuild 10489 BLAKE2B 3e76ba3894f8715ffbfaa0c4a9cd16e9a288e63c45d2e194991073e784fa7fae89f87dbcd7b83cd1d0ca0a3bbd45bb2b773ffcfc2678ef63ea21cb8d3ea3c246 SHA512 9f605505758d73e79c574ac52a2a3fc6b2ab2d6113b3e9a5c598df3991e8c22d058dbf732b6a8f77f4b2f3f420a39df16bdadf129b03c28a30a09ca6bd1a6849
+EBUILD thunderbird-52.8.0.ebuild 10480 BLAKE2B aa6a15eae4772cd29f851f1f0fcb37df82bb25323b1dffe49ced7951eea41dc91a99da47ab0bf66a5a2211b827a0a4fe3cde7d7e75da5ff2ed71851d282b349b SHA512 b913e232c8426c74438257dab09cf74c0f6209894bc58949789274b921fa681823e11d3fe97a6b02fb19e42ebc0fa53e004f164b96a784430ddd7aa3503f06ed
 MISC metadata.xml 2018 BLAKE2B 992a35d8bcd4492c85a2ab2566c63b070f46ddbb7adb4a87ffabcfd64dda0a183337a60bf9fb23b0513972f50e4214af2ee0316f53c9eb18705f83d9843f9fda SHA512 274dd1f5aeb1db04a5a0d0414ee35cb3b656d7864f78f349de9e535150d34b42d950d67e9029de5648725a1ab53b51e5d6054f0b5325bdfcae5f1171689df7d7
diff --git a/mail-client/thunderbird/thunderbird-52.8.0.ebuild b/mail-client/thunderbird/thunderbird-52.8.0.ebuild
new file mode 100644
index 000000000000..718e4040d3cb
--- /dev/null
+++ b/mail-client/thunderbird/thunderbird-52.8.0.ebuild
@@ -0,0 +1,342 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+WANT_AUTOCONF="2.1"
+MOZ_ESR=""
+MOZ_LIGHTNING_VER="5.4.8"
+MOZ_LIGHTNING_GDATA_VER="3.3"
+
+# This list can be updated using scripts/get_langs.sh from the mozilla overlay
+MOZ_LANGS=(ar ast be bg bn-BD br ca cs cy da de el en en-GB en-US es-AR
+es-ES et eu fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM id is it ja ko lt
+nb-NO nl nn-NO pa-IN pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE ta-LK tr
+uk vi zh-CN zh-TW )
+
+# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
+MOZ_PV="${PV/_beta/b}"
+
+# Patches
+PATCHFF="firefox-52.5-patches-02"
+
+MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
+
+# ESR releases have slightly version numbers
+if [[ ${MOZ_ESR} == 1 ]]; then
+	MOZ_PV="${MOZ_PV}esr"
+fi
+MOZ_P="${PN}-${MOZ_PV}"
+
+MOZCONFIG_OPTIONAL_GTK2ONLY=1
+MOZCONFIG_OPTIONAL_WIFI=1
+
+inherit flag-o-matic toolchain-funcs mozconfig-v6.52 autotools pax-utils check-reqs nsplugins mozlinguas-v2 xdg-utils gnome2-utils
+
+DESCRIPTION="Thunderbird Mail Client"
+HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"
+
+KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="bindist crypt hardened ldap lightning +minimal mozdom rust selinux"
+RESTRICT="!bindist? ( bindist )"
+
+PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c}/mozilla/patchsets/${PATCHFF}.tar.xz )
+SRC_URI="${SRC_URI}
+	${MOZ_HTTP_URI}/${MOZ_PV}/source/${MOZ_P}.source.tar.xz
+	https://dev.gentoo.org/~axs/distfiles/lightning-${MOZ_LIGHTNING_VER}.tar.xz
+	lightning? ( https://dev.gentoo.org/~axs/distfiles/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}.tar.xz )
+	${PATCH_URIS[@]}"
+
+ASM_DEPEND=">=dev-lang/yasm-1.1"
+
+CDEPEND="
+	>=dev-libs/nss-3.28.3
+	>=dev-libs/nspr-4.13.1
+	"
+
+DEPEND="rust? ( dev-lang/rust )
+	amd64? ( ${ASM_DEPEND}
+		virtual/opengl )
+	x86? ( ${ASM_DEPEND}
+		virtual/opengl )"
+
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-thunderbird )
+	crypt? ( >=x11-plugins/enigmail-2.0.5 )
+"
+
+S="${WORKDIR}/${MOZ_P}"
+
+BUILD_OBJ_DIR="${S}/tbird"
+
+pkg_setup() {
+	moz_pkgsetup
+
+	export MOZILLA_DIR="${S}/mozilla"
+
+	if ! use bindist ; then
+		elog "You are enabling official branding. You may not redistribute this build"
+		elog "to any users on your network or the internet. Doing so puts yourself into"
+		elog "a legal problem with Mozilla Foundation"
+		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
+		elog
+	fi
+}
+
+pkg_pretend() {
+	# Ensure we have enough disk space to compile
+	CHECKREQS_DISK_BUILD="4G"
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# Unpack language packs
+	mozlinguas_src_unpack
+
+	# this version of lightning is a .tar.xz, no xpi needed
+	#xpi_unpack lightning-${MOZ_LIGHTNING_VER}.xpi
+
+	# this version of gdata-provider is a .tar.xz , no xpi needed
+	#use lightning && xpi_unpack gdata-provider-${MOZ_LIGHTNING_GDATA_VER}.xpi
+}
+
+src_prepare() {
+	# Apply our Thunderbird patchset
+	epatch "${FILESDIR}"/1000_fix_gentoo_preferences.patch
+
+	# Apply our patchset from firefox to thunderbird as well
+	rm -f "${WORKDIR}"/firefox/2007_fix_nvidia_latest.patch || die
+	pushd "${S}"/mozilla &>/dev/null || die
+	eapply "${WORKDIR}/firefox"
+	popd &>/dev/null || die
+
+	# Ensure that are plugins dir is enabled as default
+	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
+		"${S}"/mozilla/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"
+	sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \
+		"${S}"/mozilla/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!"
+
+	# Don't exit with error when some libs are missing which we have in
+	# system.
+	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
+		-i "${S}"/mail/installer/Makefile.in || die
+
+	# Don't error out when there's no files to be removed:
+	sed 's@\(xargs rm\)$@\1 -f@' \
+		-i "${S}"/mozilla/toolkit/mozapps/installer/packager.mk || die
+
+	# Shell scripts sometimes contain DOS line endings; bug 391889
+	grep -rlZ --include="*.sh" $'\r$' . |
+	while read -r -d $'\0' file ; do
+		einfo edos2unix "${file}"
+		edos2unix "${file}"
+	done
+
+	# Allow user to apply any additional patches without modifing ebuild
+	eapply_user
+
+	# Confirm the version of lightning being grabbed for langpacks is the same
+	# as that used in thunderbird
+	local THIS_MOZ_LIGHTNING_VER=$(python "${S}"/calendar/lightning/build/makeversion.py ${PV})
+	if [[ ${MOZ_LIGHTNING_VER} != ${THIS_MOZ_LIGHTNING_VER} ]]; then
+		eqawarn "The version of lightning used for localization differs from the version"
+		eqawarn "in thunderbird.  Please update MOZ_LIGHTNING_VER in the ebuild from ${MOZ_LIGHTNING_VER}"
+		eqawarn "to ${THIS_MOZ_LIGHTNING_VER}"
+	fi
+
+	eautoreconf
+	# Ensure we run eautoreconf in mozilla to regenerate configure
+	cd "${S}"/mozilla || die
+	eautoconf
+	cd "${S}"/mozilla/js/src || die
+	eautoconf
+}
+
+src_configure() {
+	MEXTENSIONS="default"
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+	mozconfig_config
+
+	# It doesn't compile on alpha without this LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Add full relro support for hardened
+	use hardened && append-ldflags "-Wl,-z,relro,-z,now"
+
+	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+	mozconfig_annotate '' --enable-calendar
+
+	# Other tb-specific settings
+	mozconfig_annotate '' --with-user-appdir=.thunderbird
+
+	mozconfig_use_enable ldap
+	mozconfig_use_enable rust
+
+	mozlinguas_mozconfig
+
+	# Bug #72667
+	if use mozdom; then
+		MEXTENSIONS="${MEXTENSIONS},inspector"
+	fi
+
+	# Use an objdir to keep things organized.
+	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
+	echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig
+
+	# Finalize and report settings
+	mozconfig_final
+
+	####################################
+	#
+	#  Configure and build
+	#
+	####################################
+
+	# Disable no-print-directory
+	MAKEOPTS=${MAKEOPTS/--no-print-directory/}
+
+	if [[ $(gcc-major-version) -lt 4 ]]; then
+		append-cxxflags -fno-stack-protector
+	fi
+
+	# workaround for funky/broken upstream configure...
+	SHELL="${SHELL:-${EPREFIX}/bin/bash}" \
+	emake V=1 -f client.mk configure
+}
+
+src_compile() {
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" \
+	emake V=1 -f client.mk
+}
+
+src_install() {
+	declare emid
+	cd "${BUILD_OBJ_DIR}" || die
+
+	# Pax mark xpcshell for hardened support, only used for startupcache creation.
+	pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
+
+	# Copy our preference before omnijar is created.
+	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs-1.js-1 \
+		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
+		|| die
+
+	mozconfig_install_prefs \
+		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js"
+
+	# dev-db/sqlite does not have FTS3_TOKENIZER support.
+	# gloda needs it to function, and bad crashes happen when its enabled and doesn't work
+	if in_iuse system-sqlite && use system-sqlite ; then
+		echo "sticky_pref(\"mailnews.database.global.indexer.enabled\", false);" \
+			>>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
+	fi
+
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" \
+	emake DESTDIR="${D}" install
+
+	# Install language packs
+	mozlinguas_src_install
+
+	local size sizes icon_path icon
+	if ! use bindist; then
+		icon_path="${S}/other-licenses/branding/thunderbird"
+		icon="${PN}-icon"
+
+		domenu "${FILESDIR}"/icon/${PN}.desktop
+	else
+		icon_path="${S}/mail/branding/aurora"
+		icon="${PN}-icon-unbranded"
+
+		newmenu "${FILESDIR}"/icon/${PN}-unbranded.desktop \
+			${PN}.desktop
+
+		sed -i -e "s:Mozilla\ Thunderbird:EarlyBird:g" \
+			"${ED}"/usr/share/applications/${PN}.desktop
+	fi
+
+	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
+	newicon "${icon_path}"/mailicon48.png "${icon}".png
+	# Install icons for menu entry
+	sizes="16 22 24 32 48 256"
+	for size in ${sizes}; do
+		newicon -s ${size} "${icon_path}/mailicon${size}.png" "${icon}.png"
+	done
+
+	local emid
+	# stage extra locales for lightning and install over existing
+	mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/xpi-stage/lightning \
+		"${WORKDIR}"/lightning-${MOZ_LIGHTNING_VER} lightning calendar
+
+	emid='{e2fda1a4-762b-4020-b5ad-a41df1933103}'
+	mkdir -p "${T}/${emid}" || die
+	cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/xpi-stage/lightning/* || die
+	insinto ${MOZILLA_FIVE_HOME}/distribution/extensions
+	doins -r "${T}/${emid}"
+
+	if use lightning; then
+		# move lightning out of distribution/extensions and into extensions for app-global install
+		mv "${ED}"/${MOZILLA_FIVE_HOME}/{distribution,}/extensions/${emid} || die
+
+		# stage extra locales for gdata-provider and install app-global
+		mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/xpi-stage/gdata-provider \
+			"${WORKDIR}"/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}
+		emid='{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}'
+		mkdir -p "${T}/${emid}" || die
+		cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/xpi-stage/gdata-provider/* || die
+		insinto ${MOZILLA_FIVE_HOME}/extensions
+		doins -r "${T}/${emid}"
+	fi
+
+	# Required in order to use plugins and even run thunderbird on hardened.
+	pax-mark pm "${ED}"${MOZILLA_FIVE_HOME}/{thunderbird,thunderbird-bin,plugin-container}
+
+	if use minimal; then
+		rm -r "${ED}"/usr/include "${ED}"${MOZILLA_FIVE_HOME}/{idl,include,lib,sdk} || \
+			die "Failed to remove sdk and headers"
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+
+	if use crypt; then
+		elog
+		elog "USE=crypt will be dropped from thunderbird with version 52.6.0 as"
+		elog "x11-plugins/enigmail-1.9.8.3-r1 and above is now a fully standalone"
+		elog "package.  For continued enigmail support in thunderbird please add"
+		elog "x11-plugins/enigmail to your @world set."
+	fi
+
+	elog
+	elog "If you experience problems with plugins please issue the"
+	elog "following command : rm \${HOME}/.thunderbird/*/extensions.sqlite ,"
+	elog "then restart thunderbird"
+
+	if ! use lightning; then
+		elog
+		elog "If calendar fails to show up in extensions please open config editor"
+		elog "and set extensions.lastAppVersion to 38.0.0 to force a reload. If this"
+		elog "fails to show the calendar extension after restarting with above change"
+		elog "please file a bug report."
+	fi
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 131221183109..e0e1161f7ef2 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/policyd-weight/Manifest b/mail-filter/policyd-weight/Manifest
index f36e4761f570..cbf394edd55a 100644
--- a/mail-filter/policyd-weight/Manifest
+++ b/mail-filter/policyd-weight/Manifest
@@ -1,4 +1,3 @@
-AUX policyd-weight.init.d-r1 357 BLAKE2B 2db3418b0d16a99d523a0460960206f10ed06b8d09ba0079da07097c0941f6a0b557503f3e5fe4c2a16d3e0b7b6bea4964668359bd5b0ed70e453b93b7be645d SHA512 e419b516c914282a4ec34bedb786e88e3cc26caef028f79bd994f31786ca55a6dbf71876ac1b33d3cf4e5411dda8d02ffb61c65c3270a63ab3a0022dbfc8a977
 AUX policyd-weight.init.d-r2 390 BLAKE2B a6d42795a70f9aa75e33e777ab235762932207b51ecc08bee929a3b1aeb5703fb509dd8198becdc00f86834838c099765543f7a14277f3817b086dea05303342 SHA512 1cb3c16c791f50e360ce50af5f5529b72e7b42c4d53df160829e1053ee732ee71563634eb1c6e770d8aadac844d4ce19dc91a48fdf5e37eb0fb5fd2b5cf876e3
 AUX policyd-weight.tmpfile 37 BLAKE2B 3401fc7d784c9d61f216fa46856a6d6e462866eaf80cedb8d51c9f4db89026049833d087c106acbec4c2cd49b878e085567cc93b808fed77423f9f96efe54802 SHA512 8970d2e83191a381fc8dc1efdddcdcc1e1429d39edecc567a9c98693610db7556853f59b944774d876d4acee80acc3254a218583b792880c8985fa0f2879268a
 DIST policyd-weight-0.1.15.2-patches-1.0.tar.xz 6920 BLAKE2B 92bcf7b11dc5e07d5c8f10b9c103ac52b1d8e3449beb6e049311c2360ecb59d8751e35e20453c8dc402b286cf028f44cbdcc8bc45cf202a2af883d8954ae5e51 SHA512 a2d4ecd2ee76180cb6ebb0790a04e4fb101e9e6a73a253b83473ebb8952bc88cc903a8ea51b84743419dd8bc974a8ffc9378a187f8b8b65620268c382aaaa94e
diff --git a/mail-filter/policyd-weight/files/policyd-weight.init.d-r1 b/mail-filter/policyd-weight/files/policyd-weight.init.d-r1
deleted file mode 100644
index 366cd183f9dd..000000000000
--- a/mail-filter/policyd-weight/files/policyd-weight.init.d-r1
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/sbin/openrc-run
-
-extra_started_commands="reload"
-
-daemon="policyd-weight"
-exec="/usr/libexec/postfix/policyd-weight"
-
-depend(){
-	before postfix
-	use net
-}
-
-start(){
-	ebegin "Starting ${daemon}"
-	${exec} start
-	eend $?
-}
-
-stop(){
-	ebegin "Stopping ${daemon}"
-	${exec} -k stop
-	eend $?
-}
-
-reload(){
-	ebegin "Reloading ${daemon}"
-	${exec} reload
-	eend $?
-}
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index c64b048cf7fe..6a40fb88f0f9 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -6,9 +6,11 @@ DIST rspamd-1.6.5.tar.gz 2484271 BLAKE2B 880e862eecd4a082b87bee2ba8c7b17a475efbf
 DIST rspamd-1.6.6.tar.gz 2487482 BLAKE2B f18640f64a8c0bcf6077267a1715f0bb096ab18484c24de56a012c42666cdc9f8671237c5336dce7cd47f44f9aba7905ce3723232d53a5b8ddfe143df682bd9b SHA512 14c7144017df69600dbd09541d16dae19d87105b09f95811fc09624b60e89ca68200654e88dea242508afd3c4963ea7cac086abddec8ca1a3d8fc73d7c27e899
 DIST rspamd-1.7.1.tar.gz 4453460 BLAKE2B 28070804a6daf7f6354203038fbd974176a1ed5135b51a5ef7f089e63ffac3b3bbdca1961154b846f5b7d054071925722b311b46a3be6d09ff3d853232cbbd5f SHA512 3de4e07fa9cc72e306936a201f6bc019b5bf6f3ade003bf9217dc8a7decf027b986d80e1c0d2f09460af6f1d59aa520fee68287ad6ccee1cec94698054bc2fbb
 DIST rspamd-1.7.2.tar.gz 4460606 BLAKE2B 2c4389fd5350d67d21745288f74c4e1276772c47bbb0c74364227d0c04e4102c2ce00cd8242a639825e8c9971e87822af7a38a0a8561ba979e3f3b396d120414 SHA512 45ab95c7488e58da9e8803daefda5a0f8920cc4d4c4508a0347ed07d201124d07b10e93010b2be5fab3ecd0ac2be962bcebbb41f434a449fdbc31ded744878cf
+DIST rspamd-1.7.5.tar.gz 4494681 BLAKE2B 709b589157cb61568ebe78af64bb2363cb7342736e29971f30de1e1a1e9e667402006cb3a34e1d240a32560608ab9ab86838a288707b5043c89c3d9127880f60 SHA512 3e77c99abd47b1d22ccae33c0312b4338253af0ff10825dc2796fc42864142c91324d349677098bcd0c156a9229c04d3ce8a08808b6eb702624c918722e3acc4
 EBUILD rspamd-1.6.5.ebuild 1868 BLAKE2B 3a1b3b56887ac104ad88a01e6ba591d12dc2cd26faad7015b172f86fe9980527e96f8834237d88590ea3045ff15b4d75f6eb89378a24c34257dbb5a3a689bd0a SHA512 1377875abc3cdb66f5dd78fda1e44b93fb8a1f1c39f17757d7289a2c13464071731116ed1e4450b7c371f7682407575986fe73c8e0d9e3d0352b29a7e4098511
 EBUILD rspamd-1.6.6.ebuild 1947 BLAKE2B a126b72800155611a024b3767643b1e511d70a4cee87727d35292500b6d97cbb538b3dd960efef11d78de270d5804d0e1af20629898a017d635e9fec2bbf6e10 SHA512 62e4cca1df35d0889f06667cc2cb4498d818d555fea5a71a0cd924acc25eec25bf1e292a56f448b0339dbacd39f790502da239d8bb61c9500d58ac5c2a2d4118
 EBUILD rspamd-1.7.1.ebuild 1868 BLAKE2B b96b526ad711af5be848b9fe6ae541aec4fd05ff6b49ddaa6e39a7f5c6d208b2a48f3f650371bd4bff86d88a11e8eaedded27e903677d4d7445953b8138daab2 SHA512 9169fdab9007c470f68d4e9f227a6769dbdbad9e51bb3f8c5fb3ceb220cbc97fc65bfb6df27e45276816da7f10793f6c87c9f41df1c27fe8bd2b3d3d016fb46e
 EBUILD rspamd-1.7.2.ebuild 1975 BLAKE2B 8ed2fa843435751c54b1e3bcc1701e3915b39d2967403fd74374cce8b20c26e4334239dda05041967d8fc266f1e7e76270d4cca28dc3cfa7f45f7bb990cd2e3d SHA512 da8518a050e62b815c7c2742ccfdfedd431299d6906bc840cc6cecb0fd05e51620475da63929eca5208ffd3d87eb3e36afd6d315619703059ef50f3f19170207
-EBUILD rspamd-9999.ebuild 1745 BLAKE2B e433d8893ada66ed50bdf80d31183b3388866b253882f8b69906f54e353de9ffa2b2002e3f66ddbdda6dd7c6a3d48b681f10ff3c1df6fc9bade60ffdb1e12de1 SHA512 73fa228a4f998effbb7f2505e34f4b35d766dccb5335e5d8e76f6f01c6123e68f17fad5767e8d17336328939b1cdb2d9f4f11f76be006d5d0c444b2d082d8e3d
+EBUILD rspamd-1.7.5.ebuild 2158 BLAKE2B d1c19e91d0f1a1c886ca4173436003e3fb69511fd10a1ff4b6c09da8c978e0fd1bcf7c7e5d22bcef0771a6024616ea52ad5b586b492a67433281a3435d834b1e SHA512 063c50d3ae63e8811ea2d115250cbd08d8963e39e9259ad35140a8b6c8faf40820ae238b18d098c206d4b2969169ddbdda617a0244671e2b761227627342b247
+EBUILD rspamd-9999.ebuild 2158 BLAKE2B d1c19e91d0f1a1c886ca4173436003e3fb69511fd10a1ff4b6c09da8c978e0fd1bcf7c7e5d22bcef0771a6024616ea52ad5b586b492a67433281a3435d834b1e SHA512 063c50d3ae63e8811ea2d115250cbd08d8963e39e9259ad35140a8b6c8faf40820ae238b18d098c206d4b2969169ddbdda617a0244671e2b761227627342b247
 MISC metadata.xml 905 BLAKE2B 2b14bdf8077a435c70da3c7d3c259a457a2defa947674365ea9928b070efecc6e6aac2bfc3663d9125be6c4844e3dda0e79feeb8c96d7cf3495fb16605cbf39b SHA512 16d6df60d418d067d25b0ad42abdc9a0b36b4ac94ef96c3d3c48c725eab09ec59a2e9808a70065714f18eb6c7150ca8379763f0c5e14b04e3ed47c4167fb7e1e
diff --git a/mail-filter/rspamd/rspamd-1.7.5.ebuild b/mail-filter/rspamd/rspamd-1.7.5.ebuild
new file mode 100644
index 000000000000..1a20cc22321c
--- /dev/null
+++ b/mail-filter/rspamd/rspamd-1.7.5.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == *9999 ]] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/vstakhov/rspamd.git"
+fi
+
+inherit cmake-utils user systemd pax-utils ${SCM}
+
+DESCRIPTION="Rapid spam filtering system"
+HOMEPAGE="https://github.com/vstakhov/rspamd"
+
+if [[ ${PV} == *9999 ]] ; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/vstakhov/rspamd/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="cpu_flags_x86_ssse3 fann gd jemalloc +jit libressl pcre2 +torch"
+REQUIRED_USE="torch? ( jit )"
+
+RDEPEND="!libressl? ( dev-libs/openssl:0=[-bindist] )
+	libressl? ( dev-libs/libressl:0= )
+	fann? ( sci-mathematics/fann )
+	pcre2? ( dev-libs/libpcre2[jit=] )
+	!pcre2? ( dev-libs/libpcre[jit=] )
+	jit? ( dev-lang/luajit:2 )
+	jemalloc? ( dev-libs/jemalloc )
+	dev-libs/libevent
+	dev-db/sqlite:3
+	dev-libs/glib:2
+	<dev-util/ragel-7.0
+	sys-apps/file
+	gd? ( media-libs/gd[jpeg] )
+	dev-libs/icu
+	cpu_flags_x86_ssse3? ( dev-libs/hyperscan )"
+DEPEND="dev-util/ragel
+	${RDEPEND}"
+
+QA_MULTILIB_PATHS="usr/lib/rspamd/.*"
+
+pkg_setup() {
+	enewgroup rspamd
+	enewuser rspamd -1 -1 /var/lib/rspamd rspamd
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCONFDIR=/etc/rspamd
+		-DRUNDIR=/var/run/rspamd
+		-DDBDIR=/var/lib/rspamd
+		-DLOGDIR=/var/log/rspamd
+		-DENABLE_LUAJIT=$(usex jit ON OFF)
+		-DENABLE_FANN=$(usex fann ON OFF)
+		-DENABLE_GD=$(usex gd ON OFF)
+		-DENABLE_PCRE2=$(usex pcre2 ON OFF)
+		-DENABLE_JEMALLOC=$(usex jemalloc ON OFF)
+		-DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF)
+		-DENABLE_TORCH=$(usex torch ON OFF)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	newinitd "${FILESDIR}/rspamd.init-r5" rspamd
+
+	# Remove mprotect for JIT support
+	if use jit; then
+		pax-mark m "${ED}"/usr/bin/rspamd-* "${ED}"/usr/bin/rspamadm-* || die
+	fi
+
+	keepdir /var/lib/rspamd
+	keepdir /var/log/rspamd
+
+	fowners rspamd:rspamd /var/lib/rspamd /var/log/rspamd
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/rspamd.logrotate" rspamd
+
+	systemd_newunit rspamd.service rspamd.service
+}
diff --git a/mail-filter/rspamd/rspamd-9999.ebuild b/mail-filter/rspamd/rspamd-9999.ebuild
index 6c3a653743ec..1a20cc22321c 100644
--- a/mail-filter/rspamd/rspamd-9999.ebuild
+++ b/mail-filter/rspamd/rspamd-9999.ebuild
@@ -1,18 +1,30 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit cmake-utils user systemd git-r3 pax-utils
+if [[ ${PV} == *9999 ]] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/vstakhov/rspamd.git"
+fi
+
+inherit cmake-utils user systemd pax-utils ${SCM}
 
 DESCRIPTION="Rapid spam filtering system"
 HOMEPAGE="https://github.com/vstakhov/rspamd"
-EGIT_REPO_URI="https://github.com/vstakhov/rspamd.git"
+
+if [[ ${PV} == *9999 ]] ; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/vstakhov/rspamd/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS=""
-IUSE="fann +gd jemalloc +jit libressl pcre2"
+IUSE="cpu_flags_x86_ssse3 fann gd jemalloc +jit libressl pcre2 +torch"
+REQUIRED_USE="torch? ( jit )"
 
 RDEPEND="!libressl? ( dev-libs/openssl:0=[-bindist] )
 	libressl? ( dev-libs/libressl:0= )
@@ -24,10 +36,11 @@ RDEPEND="!libressl? ( dev-libs/openssl:0=[-bindist] )
 	dev-libs/libevent
 	dev-db/sqlite:3
 	dev-libs/glib:2
-	dev-util/ragel
+	<dev-util/ragel-7.0
 	sys-apps/file
 	gd? ( media-libs/gd[jpeg] )
-	dev-libs/icu"
+	dev-libs/icu
+	cpu_flags_x86_ssse3? ( dev-libs/hyperscan )"
 DEPEND="dev-util/ragel
 	${RDEPEND}"
 
@@ -46,24 +59,26 @@ src_configure() {
 		-DLOGDIR=/var/log/rspamd
 		-DENABLE_LUAJIT=$(usex jit ON OFF)
 		-DENABLE_FANN=$(usex fann ON OFF)
+		-DENABLE_GD=$(usex gd ON OFF)
 		-DENABLE_PCRE2=$(usex pcre2 ON OFF)
 		-DENABLE_JEMALLOC=$(usex jemalloc ON OFF)
-		-DENABLE_GD=$(usex gd ON OFF)
+		-DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF)
+		-DENABLE_TORCH=$(usex torch ON OFF)
 	)
 	cmake-utils_src_configure
 }
 
 src_install() {
 	cmake-utils_src_install
-	newinitd "${FILESDIR}/rspamd.init-r2" rspamd
+	newinitd "${FILESDIR}/rspamd.init-r5" rspamd
 
 	# Remove mprotect for JIT support
 	if use jit; then
 		pax-mark m "${ED}"/usr/bin/rspamd-* "${ED}"/usr/bin/rspamadm-* || die
 	fi
 
-	dodir /var/lib/rspamd
-	dodir /var/log/rspamd
+	keepdir /var/lib/rspamd
+	keepdir /var/log/rspamd
 
 	fowners rspamd:rspamd /var/lib/rspamd /var/log/rspamd
 
diff --git a/media-fonts/Humor-Sans/Humor-Sans-1.0.ebuild b/media-fonts/Humor-Sans/Humor-Sans-1.0-r1.ebuild
index 79abfa716fb0..a840cf3146d2 100644
--- a/media-fonts/Humor-Sans/Humor-Sans-1.0.ebuild
+++ b/media-fonts/Humor-Sans/Humor-Sans-1.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
 inherit font
 
@@ -19,5 +19,5 @@ FONT_S="${S}"
 FONT_SUFFIX="ttf"
 
 src_unpack() {
-	cp "${DISTDIR}/${A}" "${FONT_S}/${PN}.${FONT_SUFFIX}"
+	cp "${DISTDIR}/${A}" "${FONT_S}/${PN}.${FONT_SUFFIX}" || die
 }
diff --git a/media-fonts/Humor-Sans/Manifest b/media-fonts/Humor-Sans/Manifest
index 2823f051bbf5..630565d1e17e 100644
--- a/media-fonts/Humor-Sans/Manifest
+++ b/media-fonts/Humor-Sans/Manifest
@@ -1,3 +1,3 @@
 DIST Humor-Sans-1.0.ttf 25832 BLAKE2B 4190361e42ae30a5870ba79a1125e16569c6eeb2ad6fc739d18068c36d39dfb33d46ee0d0944af6f7b61fdbd7cffb992ef6e69bcc736d322897b612305fa9bcf SHA512 f0ed2f61f5cedb93ff955d9d5562fd110db750b6d4d91a74346ff94c16c87cac294c061e6ded97ffea372970912f51ee0792a611a6224cd3a38585812971b3dd
-EBUILD Humor-Sans-1.0.ebuild 465 BLAKE2B 9030efedbc4bd893cde2611672a8092b23737ffdf34242dc3617eb1a0f40033d69d747877e7c87719fbf2b59e0a6fcd61921e859c9b4dd8276c1164e9a8a735b SHA512 bbda3120d96e4950c3c3190414d4fa08756abd17c5ff3ab74d942945ae12b47ef02996c184c5c05ff1dd00d5028e43a2bdf12e1eda8d204089aace42c2e5daf4
+EBUILD Humor-Sans-1.0-r1.ebuild 470 BLAKE2B 1cb8726f6b05f42ddd634386e6aac1b934de3e8894c0fb30dc07b05d4d4f628988be902f2e4595fcd4bc4cbde80adcec5ec4836eb13bbd6a300957d1cf403de3 SHA512 f399b467438de103cb65cae033172d1ac861104550c1849a3a78773592ebe4eeb8a6f54b98778cda4dbadaca194c94514c22d192c4e3c0e7022c7d5220a65746
 MISC metadata.xml 447 BLAKE2B 4dabe996257d908ff535332b5d0a02d8ec460e9d5c2e24571ccc40f4a6c2f558643c4e1f859193adec70b347b05b94b63a057936ba6785aa83e8973a5bd74d72 SHA512 6c529893c55d015bee56c3ed28b0d46b6ee847461474776fb4d7fc77705f7b0ea5207f95a627f63cd9ba4b673251b9371d8f4ae690c5b32cb5c54f8582fec1bf
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index 5a0851bc7366..877235ca2ef0 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/alegreya-sans/Manifest b/media-fonts/alegreya-sans/Manifest
index 30874ea0ee1d..816fc67fdfaa 100644
--- a/media-fonts/alegreya-sans/Manifest
+++ b/media-fonts/alegreya-sans/Manifest
@@ -1,3 +1,3 @@
-DIST alegreya-sans-1.0.2.zip 1461248 BLAKE2B 58e4ac68583dc6be6389cb7d1844c46442614b32b2267cd2967632c55c89b5541a028ffb29593ce6e84dc5faa43a154181e5550056cac99a0304d15ce61780e3 SHA512 d2f4b116c32386f26d1fd754e544af97b4ec8d25de1f5358e8e8d9049dff5f77dade44b8fd23f003e9a11459ed9423ddf3235d5dd84f1f497873e7f9d05f5f7c
-EBUILD alegreya-sans-1.0.2.ebuild 497 BLAKE2B e882d780dfc082a25e066566c262b4160f931ae9d8f707a5bcd6e0ee6dd01bac8f7f2e01674d9ad5b33577a9573d27d29cc9a697d6b2b648ee16930edae46168 SHA512 2e0eff37c22e14ef19502ba8978f5b21f3683736b6be957420ebcaf69c8fda8ce56b46c90c0b722828935bcba354b71679f25a54c9f40a3222ce7231ac5af22b
-MISC metadata.xml 244 BLAKE2B e0bf9b0f6266265d6d5cc2e84988bddf02316ff93448093bcacdd41fdb3012c4375e694cf9cbb015ff2e9e185c810a94fdcc71367061cf484fd5e998438d8cc2 SHA512 1515810c51d8c8a86ba49a80a70db683a105643a6246ca7e4b00237f74c41bf453e84768ae640b14f1a72a5f1dd0ffd133a36c6b3257516c4f04de9e9daedfbd
+DIST alegreya-sans-2.008.tar.gz 16351420 BLAKE2B 163593cda1419bbc24503c9c892349c941a7de9e85e6f26614d54092098d0343d388018cd92d940e55ab073347ad38dc961b03bc2982ea6b96ea5415a437018a SHA512 8052fe15717ecdfd301d878b03282ff4fd472a7e13a1e581c84d6f3993780897354d103aeda2f027350d9e56466914be38e97417fe450ec32e5823769015d0a4
+EBUILD alegreya-sans-2.008.ebuild 576 BLAKE2B 1d319462adb154243b6c393338af1354b8fb18d6db66a0bc795f5d98abd18169130df740e114e1251a1c9e08b4491156f5824d7c6bc5884a6465e77e083552e5 SHA512 cdff19bbfe3d56868bcd194e9f3672c3cd54d7aa31bee4e0edc08a5e025913fa38aabcd9c2c67efa5894eea12c461b526f13234b08e477dc600568d7b0237cec
+MISC metadata.xml 334 BLAKE2B 19a664636579edd6ca0a99d72eec9c0bdd8c69148ef85d9bdb6fe46269e6aaf98199f7a45d3f88dfd141ec8ebcea2d95509ac792cf605f62cc7ccf6b593f2629 SHA512 997159235cfe76fa19578a74a7c2f3a636476632ccf856fc7d6f494bc3a618b90f42fb76ccfa6cf6b36d6419f9b32b35efccab843748f3400d1e91b9b472532c
diff --git a/media-fonts/alegreya-sans/alegreya-sans-1.0.2.ebuild b/media-fonts/alegreya-sans/alegreya-sans-1.0.2.ebuild
deleted file mode 100644
index 50178bb54bac..000000000000
--- a/media-fonts/alegreya-sans/alegreya-sans-1.0.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit font
-
-DESCRIPTION="A humanist sans-serif typeface with a calligraphic, dynamic feeling"
-HOMEPAGE="http://www.huertatipografica.com/fonts/alegreya-sans-ht"
-SRC_URI="http://www.huertatipografica.com/free_download/23 -> ${P}.zip"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}
-FONT_S=${WORKDIR}
-FONT_SUFFIX="otf"
diff --git a/media-fonts/alegreya-sans/alegreya-sans-2.008.ebuild b/media-fonts/alegreya-sans/alegreya-sans-2.008.ebuild
new file mode 100644
index 000000000000..ed6906668cf2
--- /dev/null
+++ b/media-fonts/alegreya-sans/alegreya-sans-2.008.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="Alegreya-Sans"
+inherit font
+
+DESCRIPTION="A humanist sans-serif typeface with a calligraphic, dynamic feeling"
+HOMEPAGE="https://www.huertatipografica.com/en/fonts/alegreya-sans-ht"
+SRC_URI="https://github.com/huertatipografica/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DOCS="CONTRIBUTORS.txt README.md"
+S="${WORKDIR}/${MY_PN}-${PV}"
+FONT_S="${S}/fonts/ttf"
+FONT_SUFFIX="ttf"
diff --git a/media-fonts/alegreya-sans/metadata.xml b/media-fonts/alegreya-sans/metadata.xml
index d0f1df7c94c0..52a13773a341 100644
--- a/media-fonts/alegreya-sans/metadata.xml
+++ b/media-fonts/alegreya-sans/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>fonts@gentoo.org</email>
-    <name>Fonts</name>
-  </maintainer>
+	<maintainer type="project">
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">huertatipografica/Alegreya-Sans</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-fonts/fira-code/Manifest b/media-fonts/fira-code/Manifest
index 73f4b7d6400f..7fb46a718419 100644
--- a/media-fonts/fira-code/Manifest
+++ b/media-fonts/fira-code/Manifest
@@ -1,4 +1,4 @@
 DIST FiraCode-Regular-Symbol.zip 9337 BLAKE2B b901cc37ad796f3a68d8b9e492aa35570c2d718fc84920b5b23c0a055e46c19916a7ec6b2c0a0adba650161c5a032761d46b303de64bddd81696adf960e3e541 SHA512 2570958b0f4b28ded52327150b67118d693d6bc6f483be3e3147ddda1c5870ab21f1b64938e4abc1030080455976c0d33ae3925b51660fd2c8b5428b5b0f8eb7
 DIST fira-code-1.205.tar.gz 5348822 BLAKE2B 9167765fb986a0b4552387fa43e71ddcfb97371692ad071659cc6a198dd4bee707e15a2f438daac1d5e038b8a4d2ddf4d5e0b94cf182655cd83b5085af3a207a SHA512 cbeb5fe4577ff6de5c4d58247c3b82b7aec4022afa5552394c660846d8caab8cca3a1a44aed8cccd10d03fe8c38e419d97663f5a750bd9d4e11ec4d2e5659bf8
-EBUILD fira-code-1.205.ebuild 621 BLAKE2B 68fcbdbcbd51163996704209108dc0b82f490902835cdca441515189b19b80f214c0c421ae8c65d72c19afc6de52fcf79fcab8cef53079378e5d17e85309f3ef SHA512 fe8ecbd00908bfa2b745b9513bedb33dc4343658e402c4f28f091aaee7c2f6cd62130aaddf7e7b3fd07e6fd9f8fe894cf07908979488d8ded3753561fdf5ea3f
+EBUILD fira-code-1.205.ebuild 620 BLAKE2B 70785ffdc85e8cc83a6ac7662ea8de3710f3efb6f5aa85ffed06e04242b6a8295ad5048f865d300e34b72036b9fb9054ded01800cbbb81b20440ee021bc23c0d SHA512 11157bf704a5782860fe0855ba249e0edb90ccd7c8309279ff78ac70325a6897feb5c9c5e4d324d35908a96c4dbb0781be4b1dbee45801a533ef132f955c3ce0
 MISC metadata.xml 430 BLAKE2B 1d5b9b36382478e6ce2e7444cec9513f560e7c642cace9241ec36769b2ac17ba9282151ea321574dc53dfd26e2a98a289b9dd02bea1ea7a4641f8a75046213f2 SHA512 2378c23273f922c0088d9535e4ac94da0c05e59a79ef8119f351911bde62f7e3c8706a4276a888404ae8f18a3e5ad7181358db00c8a9c990a6874dc69f24eac8
diff --git a/media-fonts/fira-code/fira-code-1.205.ebuild b/media-fonts/fira-code/fira-code-1.205.ebuild
index 9fe9f4c9623d..50bb9a72f16a 100644
--- a/media-fonts/fira-code/fira-code-1.205.ebuild
+++ b/media-fonts/fira-code/fira-code-1.205.ebuild
@@ -12,7 +12,7 @@ https://github.com/tonsky/FiraCode/files/412440/FiraCode-Regular-Symbol.zip"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~x86"
 IUSE=""
 
 S="${WORKDIR}/FiraCode-${PV}"
diff --git a/media-fonts/inconsolata-hellenic/Manifest b/media-fonts/inconsolata-hellenic/Manifest
index ec4e8baf7d11..7e46d46c1066 100644
--- a/media-fonts/inconsolata-hellenic/Manifest
+++ b/media-fonts/inconsolata-hellenic/Manifest
@@ -1,3 +1,3 @@
 DIST inconsolata-hellenic-1.19.zip 18362 BLAKE2B fa9999195802b7171c643fc68f4f984a521f393e7110b6219cf1b9bb87d89bfb43f298bd7f4ff26c3a0bae5f6352a857ed3a1635ff7d1d5e3125837a09f61bea SHA512 5834a46e200abea9045c0d88fbf8ec55486e87e1faf27478b376f1006737d37bafe4b4e1938a3dd28fd107c587db40de0ec77ebab4fd82317f0dff87fb11cfbe
-EBUILD inconsolata-hellenic-1.19.ebuild 479 BLAKE2B ace0311722706874c4ef5ac535ccd34d51e192e1f53d4ebaf53f87e8db1333ed6d780487568178a505f33e094dcde2cc113f6c2990b8434984e5cbefb80b6516 SHA512 b7007803bbb02c34e026fe9754f9ce9fedfe0618b8db4027ef2f6650f3e0908e424a150917c972bdb6c3bb1b33c7473de068a0907a1aaf6b8d20c74155001e79
+EBUILD inconsolata-hellenic-1.19-r1.ebuild 480 BLAKE2B 75c83dcf258b2dd3d6dcb7e27c29ca893458e4bbe20465bf3e19b3d10b41b34eaca9b4b5729a0b78c9b7ef743709994752621c6e2edfe88c67d24455bc426ba3 SHA512 8fafddcef8178e674923a54a40fdb74042c82b4a54cc1dbaa5176365af445fed7b817f1ede5e2207a6c6fbdf45d360b8060582496bf0fea1bbfdc6866d077145
 MISC metadata.xml 244 BLAKE2B e0bf9b0f6266265d6d5cc2e84988bddf02316ff93448093bcacdd41fdb3012c4375e694cf9cbb015ff2e9e185c810a94fdcc71367061cf484fd5e998438d8cc2 SHA512 1515810c51d8c8a86ba49a80a70db683a105643a6246ca7e4b00237f74c41bf453e84768ae640b14f1a72a5f1dd0ffd133a36c6b3257516c4f04de9e9daedfbd
diff --git a/media-fonts/inconsolata-hellenic/inconsolata-hellenic-1.19.ebuild b/media-fonts/inconsolata-hellenic/inconsolata-hellenic-1.19-r1.ebuild
index 9f963398ca7d..5c0ab15d5935 100644
--- a/media-fonts/inconsolata-hellenic/inconsolata-hellenic-1.19.ebuild
+++ b/media-fonts/inconsolata-hellenic/inconsolata-hellenic-1.19-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
+
 inherit font
 
 DESCRIPTION="Hellenisation of the wonderful, monospace, open/free font Inconsolata"
diff --git a/media-fonts/lklug/Manifest b/media-fonts/lklug/Manifest
index e65bba7d2c31..36cf0cc0d95b 100644
--- a/media-fonts/lklug/Manifest
+++ b/media-fonts/lklug/Manifest
@@ -1,4 +1,3 @@
 DIST ttf-sinhala-lklug-0.6.tar.gz 382873 BLAKE2B cce5b23e2c83db860fc023a4acdfcc336c79b335e39ffd226d7c26d87b98ca12a23ed7aa7fa99832c4c72b2b3ac75e0681f8f70392cc7f0123a42dd08353c36b SHA512 d1b1459981f1d80acd17aa09a2171e17ad246d98e00035c9592a6c93d89423ccb20f440c3eaccb21b9bb5fae2ac8eca5458715fe8a60e7294f75f9fffe3417aa
-EBUILD lklug-0.6-r1.ebuild 450 BLAKE2B b92a42c6b419a6c636a1f94392354e69d8e98b2baa68b46f04456d5db153816194ba3cbd752704c238be0ce6643e7874e1bab1fd6a09bc399e2c5d582d09d111 SHA512 dda3ecf89ddf550d1bb13b507e8aa9a8ab5e7f05f90f8aecb7c3d3b9acedd0dfa9e40375c8d51439a3f7a391f2fbf9cc4acbda0ba3d4f8b253c8cbfbc825ec27
-EBUILD lklug-0.6.ebuild 448 BLAKE2B c874b7cdbea4cfc3998e54d2c85af21b305777b1caeb44dc09c02868311f1061f5d04989c0db3f600785e7db0f0180fafd3248d64959804554238568efb02f41 SHA512 1cb8d840f37e85715509ab52a6d6c5786aefe7354397303926d83326bd735ac0a24908929b21cc4a6d0b8cf8eb8d30cc0d00a56eb5d8ded9213d792a5450b8b9
+EBUILD lklug-0.6-r1.ebuild 446 BLAKE2B d81dc6728a5e8481d42e04721f0b67e7fd2e052d97a51eb86f1db18ae6575a1062e38c43491034b8ef239f6f1e8d8b547f610f2706610a8b699219348a3e2f17 SHA512 454f301b92324c7c04505adb217c05558a5713b2885fe8f37299c078f46eb02952c321e4f52f813d4c42903bdadbcfef03f61c5ee586307a2f1aacaee115c02b
 MISC metadata.xml 315 BLAKE2B 552ff2bb3878109136f58c429e796e690fe2d9813291d1cd2f9617910e5d8ddbc5e9891560a081b90c6d866972108879d63be2058a0b975647c1fc05390c6701 SHA512 2d525597860e240d8d7d1282ea6b3a9459597e7980f9e82c99ed76e10a1d78ca71993fdb321279f45fe517a5852effd3abe31c7ef7b1af5dfa04af0b8c3d7089
diff --git a/media-fonts/lklug/lklug-0.6-r1.ebuild b/media-fonts/lklug/lklug-0.6-r1.ebuild
index 2f2a9e7752d2..956e033f45d9 100644
--- a/media-fonts/lklug/lklug-0.6-r1.ebuild
+++ b/media-fonts/lklug/lklug-0.6-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://sinhala.sourceforge.net/files/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_P}"
diff --git a/media-fonts/lklug/lklug-0.6.ebuild b/media-fonts/lklug/lklug-0.6.ebuild
deleted file mode 100644
index dc4415457e9a..000000000000
--- a/media-fonts/lklug/lklug-0.6.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit font
-
-MY_P="ttf-sinhala-${P}"
-DESCRIPTION="Sinhala font"
-HOMEPAGE="http://sinhala.sourceforge.net"
-SRC_URI="http://sinhala.sourceforge.net/files/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-FONT_S="${S}"
-
-FONT_SUFFIX="ttf"
-
-DOCS="README.fonts"
diff --git a/media-fonts/terminus-font/Manifest b/media-fonts/terminus-font/Manifest
index e4c89db25ad4..5f517754df0a 100644
--- a/media-fonts/terminus-font/Manifest
+++ b/media-fonts/terminus-font/Manifest
@@ -1,7 +1,5 @@
-DIST terminus-font-4.39.tar.gz 324890 BLAKE2B ed5ad839311ac08601ea78a617db285c6e9a7bee6776d4902879aa95a26c79eca4195ee58bd5b2f44d25c401222ed966b5a3cfacbcff7ccad873b3155e009c67 SHA512 d2b1c55584eabf423a455ea11d90ba8037b4e5823c677a8c604de1e41c55d829b743db2d1932cd755064db681fcd0b5be8484439ddde4394955d0af5174ff591
 DIST terminus-font-4.40.tar.gz 558440 BLAKE2B 60a9b6a62c2db82896071adee6004aeb54cefc1f1d1cc941e5322d8d318413bb1255e8219c3fb56f6568baee0998357c572348b4085dd884bf6bcf360448e9a1 SHA512 843da1f51e37d48ae88c88def965ed96c2236c183fb596705290a96eba41256a02197a298439b83913eb7679b32c2a8f44dd04de031be4db56285efd3d4c6900
 DIST terminus-font-4.46.tar.gz 590210 BLAKE2B 427b4878afd47cc6c1a0ba6b6116568630a618e313c24744b3465b3e301e142ccbb9bd5e336bed7d98f3d1e01a0a61c6fbdd17912f4d9332ed5430ef47bca4fe SHA512 ae221920ecff54b9575a25d30a429feee6e19ef1e9669896c34f86f80d5495c3654f5423ff1df76e86bc999d1f37c306048b44d8ca55144f0f299926d3d33b58
-EBUILD terminus-font-4.39-r1.ebuild 2696 BLAKE2B 71a63ebe584b926b19e1da008704c0609fe4da9004cdc240f1703cae24a96c7f0bd6de464ccad6ddb9082ab2442d7787cd068a937700df0074f5793dfbeaae30 SHA512 c445efab8de32f841076128525ece1ad4ebf56108fb4d3e5c19f0a5cee970aa58e777ff09b1ca64c94390e580daa71886f1119ba494278f65a8d587b8f30b244
 EBUILD terminus-font-4.40.ebuild 2662 BLAKE2B 02446fd7b02c53f52552f8bcb73c4d0ce6f9445e2af1ba8d88865ed88b52c664d6997266c3830c70291f072ae7273d216f2098f88737fb61095061d8628c70d9 SHA512 074a9be54fb79b9e86540fef5a49d6c075d443d29b21eb7e1ab160c102ff4e8649e608f71e928f24c900c342dc0b9bc1fc3958e994f21f554308e2d2ccd33f5e
-EBUILD terminus-font-4.46.ebuild 2640 BLAKE2B 3e3ae6413e4ef2a9552f14097ae208d0cc0de2630b23a788311232c8b3c66a9455b323bbb4583b7f02f47d19f56a1febcb776b2fe807c9da9082998c77961a2e SHA512 6c670b9ff6d173fe65e6bcbaef4cdc595be0f9943b4fb5fb0a4c271b70f3998883170d6de4326bdf4021566ca8f220045537bc94afd85483ef922ab333aadd2c
+EBUILD terminus-font-4.46.ebuild 2638 BLAKE2B 705a200f18b30d3627f68323e2b1be07e65497e3f6508cf60fba0fb0aff16d7ae9883dcbdbeb22b8d04f90ebb132dc2132c555ce0d68c647bc836323444a148b SHA512 c4dc34a7033eac72e482c6cf74969184c790610c0d290e1ff7ecc0eb4261060bbe0e4bcc63e0a863d652f1f8ea2c9ee5626a51034b0626761abbdf3bd99c16b0
 MISC metadata.xml 1727 BLAKE2B 2b0553ed8023868296f4c29a97a3f27c799933af878fcbfb6b5fb6cc1f8c94c53d3581da7b7b8550b8e41e2d5f69a13f3b88e19a7b53b5b42a42e4f1c9523299 SHA512 fc2290e70f773c2418aa9a0eb58013a855eece0edb345da21ed176739a22a3344d6ec97b9f72b2480b57b4d4c68400db00bbd9dafd55b3bb02ffaaed1d788967
diff --git a/media-fonts/terminus-font/terminus-font-4.39-r1.ebuild b/media-fonts/terminus-font/terminus-font-4.39-r1.ebuild
deleted file mode 100644
index daf180b3bc5b..000000000000
--- a/media-fonts/terminus-font/terminus-font-4.39-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils font
-
-DESCRIPTION="A clean fixed font for the console and X11"
-HOMEPAGE="http://terminus-font.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}/${P}.tar.gz"
-
-LICENSE="OFL-1.1 GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="a-like-o +center-tilde distinct-l +pcf +pcf-unicode-only +psf quote
-	raw-font-data ru-dv +ru-g ru-i ru-k"
-
-DEPEND="app-arch/gzip
-	dev-lang/perl
-	virtual/awk
-	pcf? ( x11-apps/bdftopcf )"
-RDEPEND=""
-
-FONTDIR=/usr/share/fonts/terminus
-FONT_CONF=( 75-yes-terminus.conf )
-DOCS="README README-BG AUTHORS CHANGES"
-
-REQUIRED_USE="X? ( pcf )"
-
-src_prepare() {
-	# Upstream patches. Some of them are suggested to be applied by default
-	# dv - de NOT like latin g, but like caps greek delta
-	#      ve NOT like greek beta, but like caps latin B
-	# ge - ge NOT like "mirrored" latin s, but like caps greek gamma
-	# ka - small ka NOT like minimised caps latin K, but like small latin k
-	use a-like-o && epatch "${S}"/alt/ao2.diff
-	use center-tilde && epatch "${S}"/alt/td1.diff
-	use distinct-l && epatch "${S}"/alt/ll2.diff
-	use ru-i     && epatch "${S}"/alt/ij1.diff
-	use ru-k     && epatch "${S}"/alt/ka2.diff
-	use ru-dv    && epatch "${S}"/alt/dv1.diff
-	use ru-g     && epatch "${S}"/alt/ge2.diff
-	use quote    && epatch "${S}"/alt/gq2.diff
-}
-
-src_configure() {
-	# selfwritten configure script without executable bit
-	chmod +x ./configure || die
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--psfdir="${EPREFIX}"/usr/share/consolefonts \
-		--acmdir="${EPREFIX}"/usr/share/consoletrans \
-		--unidir="${EPREFIX}"/usr/share/consoletrans \
-		--x11dir="${EPREFIX}"/${FONTDIR} || die
-}
-
-src_compile() {
-	local args=(
-		$(usex psf 'psf txt' '')
-		$(usex raw-font-data 'raw' '')
-		$(usex pcf 'pcf' '')
-	)
-	[[ ${#args[@]} -gt 0 ]] && emake "${args[@]}"
-}
-
-src_install() {
-	local args=(
-		$(usex psf 'install-psf install-uni install-acm install-ref' '')
-		$(usex raw-font-data 'install.raw' '')
-		$(usex pcf 'install-pcf' '')
-	)
-	# Set the CHECKDIR to a dummy location so we always get the same set of
-	# files installed regardless of what is in / or ROOT or wherever.
-	[[ ${#args[@]} -gt 0 ]] && emake DESTDIR="${D}" CHECKDIR="${D}" "${args[@]}"
-
-	# Remove trans files that the kbd package takes care of installing.
-	rm -f "${ED}"/usr/share/consoletrans/*.trans
-
-	if use pcf-unicode-only; then
-		# Only the ter-x* fonts are unicode (ISO-10646-1) based
-		rm -f "${ED}"/usr/share/fonts/terminus/ter-[0-9a-wy-z]* || die
-	fi
-
-	font_src_install
-}
diff --git a/media-fonts/terminus-font/terminus-font-4.46.ebuild b/media-fonts/terminus-font/terminus-font-4.46.ebuild
index 442b89128e6f..6fe4b660df39 100644
--- a/media-fonts/terminus-font/terminus-font-4.46.ebuild
+++ b/media-fonts/terminus-font/terminus-font-4.46.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}/${P}.tar.gz"
 
 LICENSE="OFL-1.1 GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="a-like-o +center-tilde distinct-l +pcf +pcf-unicode-only +psf quote
 	ru-dv +ru-g ru-i ru-k"
 
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 9a2338d94d01..9ac5b8f32478 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 749b212cfab5..978fb80e7f28 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -4,11 +4,12 @@ AUX inkscape-0.91_pre3-exif.patch 321 BLAKE2B 36f9d7ce19c1716b56800431ac095f047c
 AUX inkscape-0.91_pre3-sk-man.patch 362 BLAKE2B adfe363332dcf46297d01feb986ffaf4e5fe2f2db88c5d7e663e477736a56f226183caa90ca2b421f064ce42e5e7b4e81419026681987aa85040f4379c74511d SHA512 5b4b6fd927b88fbf5d113da7fbd70a5d39a7926849b7e0118bbade0218e8429e751d977e0630894ba7f024d1628c4ff9e54c9a0a4ed6b9b87315e200b04bd8ab
 AUX inkscape-0.92.1-automagic.patch 5421 BLAKE2B 0885e9f785b7884e10659c1f8aace9a843113b5d1c059251c75297ef828eb7c704815798c861e03060c89c02e36cb45edf566065234d330c1757e8f2bcc89688 SHA512 c6bc791c8e0a4302f2b21c1ad4d39e8e880017f4cdcf8b23d7749498a0f0a1d2460abeab3216e9eeb6b87a300e17451ace86c738c58a174e92946cb280ef43b9
 AUX inkscape-0.92.1-desktop.patch 919 BLAKE2B c9952613e8d8dca1cd11146afd4d8db210be0f65f61b1a674cf5443dfaed3422e7082667cb93e183589d1e840ac3b55c7e70d03f44c0302b8c7db8ae621a976d SHA512 0000e5c6bd83e7d3994712d5a9f7369b2ecb7a15ba8371bfc9e2646b33293334eff987ffc360c2753025d0561395368024587d71ffc015f5a0e8c39077fd45b2
-AUX inkscape-0.92.3-freetype_pkgconfig.patch 489 BLAKE2B 4f0e9dda521f21dc888267193ddba63ec89011cf8dbd32c0901991e58397f0c22134c1a7647239cb6bc26c4d45d5583bbaac83fb4a26681122cc8cf488a93a58 SHA512 da286f5eea8bdc443d0b4b3c2ffb6a403b4ea85f7f355545ea5dde05bb75e59e0a0bb42d28d5cbc77115acd2e0ebecf48536664a508ffb788c7f3e09a59557b4
+AUX inkscape-0.92.3-freetype_pkgconfig.patch 948 BLAKE2B 4a21ed3ef6c002a6fd756b31989d531f94f0bbf2c9bad2ac5fdb453f8a1a5c169e71d7ef5d71ca55072f76fd31646589a62c06b5d44809f6ef873cbe1edca1f9 SHA512 95a265b0e7e9fda74a9bcf31eb6d23afead4c71567126ca893b75c0dcc87f5b03e38c30e2917b4278dbf4fcaf35c2b3fe7a1b509a43b19212c814a2a2b9de53d
 AUX inkscape-0.92.3-poppler-0.64.patch 4493 BLAKE2B 3ee9635cf8b287c1a530a8a70876c92c1e941e6d89a9a74e4f6bb3fdd445bc60a47c8adb6f567f8bc539241c0884ca093add00ede19dfba3220ffcccde0a5384 SHA512 dbfc28ec5dd7b96c7994ab57bcde95baa57ec600d2ec5458c242273407d822f0947d8fd2ef0ce7ac07125f108314a25eb1646aaad474fa150e3010031c1807bb
+AUX inkscape-0.92.3-poppler-0.65.patch 904 BLAKE2B cd31960bf20fbc3cff762949d435838864ebff18dbcef99a658ed5732a3c7fe647c2a7e4b15bdf79a6c445f523dd2b7c19b3c3bc71cc656f0dabfc2bf5ce7ce4 SHA512 38887caacfd8c37f017b8b9c3a6de09aaa1d1ea7caffe9ab91d234b162a36bb4fc19e4985acd9a120929f4941126be31fc9d51a84628803157746834b60de8bb
 DIST inkscape-0.92.1-poppler.patch 44142 BLAKE2B 4431a4185cfeb6c41f08da656db4335017fc08a62e154f75ef4ef1a2ae92dd510f22a4f9cd1cf8bb1fae09770f47a398b7b789c8bad4e47bc4941b9e8f79c1f0 SHA512 4a0504c236c816f413b3bf055754513bb53b52eb5f0323faa28ab445ce3fb83b6f41de5bc6e3865909e50fc9be937e3f99282e8414f4cdc954e04b974d7f15ab
 DIST inkscape-0.92.2.tar.bz2 31224100 BLAKE2B c0a7b01220d1b0b0863f71f3e1c8ba7bdb58bd86e79c2d3f214831a344c992a1084d64813de00e6f88d77b1b1f1b8562c7a0ee98824149cb867eba586314d27d SHA512 e790cafb7cc2be2eb75f04ac4c18ae8558ae997f4261c38dac9c2a3383c7a12a0f4a090956770d1341b212fc9698d31d212f2c1609421907255f8af650569b30
 DIST inkscape-0.92.3.tar.bz2 31606442 BLAKE2B bc90dc160ca059395a2951b7b2daeb8730753c551f78e6af88b51b41322a438256499f754fb6b07946d77b80e1ddfe5514944f9b5cbb19d2bfdecb8625328db0 SHA512 af3c0f672a108e583f3c92cde1451b3f1f5319c1669891005c230e73b3485aa8951af6d7b21c7ccd9e4acbca8eaa5a3bb61ae1d828e81885bc7b61a8ae933687
 EBUILD inkscape-0.92.2.ebuild 3875 BLAKE2B 980f69de82cfd74d88e0dccd55fa8500847aba1614ee291e990bcc167dd409e61dccc473d6a62711a125d6586ab26cb9d4c661dcbdea4af6adcca5508785fad9 SHA512 258802353c77b8a1cbec4df73aacc0edfb6b601d6a9a8200f7cf82c97f5bd7582033d547c9f7df1d8ebefd1d8fab2a6ccdd5c9efebbfa05df21990cedcb5a500
-EBUILD inkscape-0.92.3.ebuild 3911 BLAKE2B a351a676e95df783f9105922c90c89a9f68b2a81ec9e6cb516f943a4d6b5964c6eae212b2967aac4a6c1b37607df90da8f2fd9586c74249df315e29987c93a37 SHA512 c15f6a8b96b2eab7a4b2dc1bdd27104c048a6d5e43e0effdb987eeebda59e91cc14c2f47300128a620a1f53682724f6ec9b537b72dc18a44e992401811b1b103
+EBUILD inkscape-0.92.3.ebuild 3958 BLAKE2B 301b320e79f50648df33780705180fbb0b781d7b1e65cbe755c56aa6178ae2cc6962922a2cef62b5e663ac7197a8ef9c8676b5631099646238663de618cacf1b SHA512 bac3b875f935d5a64a85058b33571693ad394b0fb7a14f0b0ae7d20d33d1e1df52c7b3c55396822c7bd9fcfed739cb0064b1cd9d2aad54d3836d6237f163eb57
 MISC metadata.xml 812 BLAKE2B 9b06a44ec7ded4b7b4618813bb4b2b5deed3bbc45fd43cffcf435594f3141943a45e592bf2947b00895f0f40d40b0fbe51109daa63f73f3276f50afec620d9fa SHA512 dbe4bb2e918a4c8a20c9a273cef29976d8cfe74e6c2ae1ba8cb77f592c885e8353b7bc3ca8f529e00629f6a0ac7627877cdef68fe07472fc1f417abba5d0268b
diff --git a/media-gfx/inkscape/files/inkscape-0.92.3-freetype_pkgconfig.patch b/media-gfx/inkscape/files/inkscape-0.92.3-freetype_pkgconfig.patch
index 0f577bd0e9ab..d00c23d8addc 100644
--- a/media-gfx/inkscape/files/inkscape-0.92.3-freetype_pkgconfig.patch
+++ b/media-gfx/inkscape/files/inkscape-0.92.3-freetype_pkgconfig.patch
@@ -1,6 +1,19 @@
---- inkscape-0.92.3/configure.ac
-+++ inkscape-0.92.3/configure.ac
-@@ -252,12 +252,9 @@
+From 62ed18b4d99e690298cc1984b6f2df2363d165fe Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Fri, 18 May 2018 07:55:38 +0200
+Subject: [PATCH] Use pkg-config to find freetype
+
+As of freetype-2.9.1 the freetype-config file no longer gets installed
+by default.
+---
+ configure.ac | 9 +++------
+ 1 file changed, 3 insertions(+), 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 12a081612b..1b75e23670 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -252,12 +252,9 @@ AC_CHECK_FUNCS([mallinfo], [
  			 [#include <malloc.h>])
  ])
  
@@ -16,3 +29,6 @@
  AC_SUBST(FREETYPE_CFLAGS)
  AC_SUBST(FREETYPE_LIBS)
  
+-- 
+2.17.0
+
diff --git a/media-gfx/inkscape/files/inkscape-0.92.3-poppler-0.65.patch b/media-gfx/inkscape/files/inkscape-0.92.3-poppler-0.65.patch
new file mode 100644
index 000000000000..86d9e48396df
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-0.92.3-poppler-0.65.patch
@@ -0,0 +1,29 @@
+From 332a80f4847715546be9a00756f693b4aa1316e2 Mon Sep 17 00:00:00 2001
+From: Jan Palus <atler@pld-linux.org>
+Date: Fri, 25 May 2018 00:30:17 +0200
+Subject: [PATCH] Fix compilation with poppler 0.65.0
+
+replace unused includes with one that is actually used
+
+Signed-off-by: Jan Palus <atler@pld-linux.org>
+---
+ src/extension/internal/pdfinput/pdf-parser.cpp | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
+index 6c498f9..caaeca1 100644
+--- a/src/extension/internal/pdfinput/pdf-parser.cpp
++++ b/src/extension/internal/pdfinput/pdf-parser.cpp
+@@ -37,8 +37,7 @@ extern "C" {
+ #include "util/units.h"
+ 
+ #include "goo/gmem.h"
+-#include "goo/GooTimer.h"
+-#include "goo/GooHash.h"
++#include "goo/GooString.h"
+ #include "GlobalParams.h"
+ #include "CharTypes.h"
+ #include "Object.h"
+-- 
+2.17.0
+
diff --git a/media-gfx/inkscape/inkscape-0.92.3.ebuild b/media-gfx/inkscape/inkscape-0.92.3.ebuild
index 97020416d36e..89ad5363774c 100644
--- a/media-gfx/inkscape/inkscape-0.92.3.ebuild
+++ b/media-gfx/inkscape/inkscape-0.92.3.ebuild
@@ -101,6 +101,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-0.48.4-epython.patch"
 	"${FILESDIR}/${PN}-0.92.3-freetype_pkgconfig.patch"
 	"${FILESDIR}/${PN}-0.92.3-poppler-0.64.patch"
+	"${FILESDIR}/${PN}-0.92.3-poppler-0.65.patch"
 )
 
 S="${WORKDIR}/${MY_P}"
diff --git a/media-gfx/shotwell/Manifest b/media-gfx/shotwell/Manifest
index 34e8897d743d..96fc5403c99f 100644
--- a/media-gfx/shotwell/Manifest
+++ b/media-gfx/shotwell/Manifest
@@ -2,8 +2,10 @@ DIST shotwell-0.26.4.tar.xz 5619280 BLAKE2B 0ca9ecf6e96019aa8e9bd4bae09d1b888902
 DIST shotwell-0.28.2.tar.xz 5582276 BLAKE2B 20d35f714543d35bd04fe81617040419664e662664ae504cbfb0b3bb160d97a5469478e1e134b6432b174fc19bb4fc370b5eb38c576c805e876d00999fb7d979 SHA512 dc00f45e55eabadaaf825de5a4152d40db2eb652f966b870a08d36006887a18aacf570b05d232a9fc7ef7df097a468a497778022bf7b86ae2143877c02540cc0
 DIST shotwell-0.28.3.tar.xz 5531900 BLAKE2B b585989434e3da9b2d5f43aabf41451e33b7b2f537a21305ff9decd9992d42e5422971d1f89836936630f641efdac1242dc21574d86f61a4c71562b657e0300d SHA512 9a0c15bfe856dabaa85038fe875cc178be6a3e104397b36555005615212ac92579234fc6277f1a4a7bddba517e9ea0db5ed06e0fc30614453e3db1153b47dc16
 DIST shotwell-0.29.1.tar.xz 2368080 BLAKE2B b706229803528c55486219a4190d1145d98b513ff26a4a3d2989abd57ff3465ffab231b1779014b7babf7ce33cc875fa11905a95bbf108251c57d3692a5156a4 SHA512 25e7e7d303ecbe89ecf4eba219b6f10ad44d23209d2c2724c6d61afae47afc0a6e1a7a7fe99931888f7374419818c5d74e28bb6120383e191c038c967c84ce39
+DIST shotwell-0.29.2.tar.xz 2321576 BLAKE2B 2dd3c959ca8aba6ecb7c3c15ca491291a2c6ead860fac9c1fb1b97ad22140ce9e67617dd268b2d4d362bb8a0c2606d97b5cc71c12e19fcb59fec0185f27c3f0f SHA512 98c57d511a384ced717e2fb410af16326080e2291fce77ea953a377430459c7a81de73118925b2d42bf96b8b717efc93a898d0d859fbab1364c0c192dbb60311
 EBUILD shotwell-0.26.4.ebuild 1488 BLAKE2B a18a437d65ca3a9999f0f238d7442564c012b08d209384d8b47fedd12a8eca4c1e91e28ba18b456ff860c56a16cd1059b2d7a0541d06f10d2937efcf893a607b SHA512 2cd5b9e390f61de3d0db9ff5d0ea59ff36eef745afb237ea82d87f584fda7ca200b95eb7273e1a74f401e5a7187e8eb78c98910723d68dccdf90535a094bd0d6
 EBUILD shotwell-0.28.2.ebuild 1488 BLAKE2B a18a437d65ca3a9999f0f238d7442564c012b08d209384d8b47fedd12a8eca4c1e91e28ba18b456ff860c56a16cd1059b2d7a0541d06f10d2937efcf893a607b SHA512 2cd5b9e390f61de3d0db9ff5d0ea59ff36eef745afb237ea82d87f584fda7ca200b95eb7273e1a74f401e5a7187e8eb78c98910723d68dccdf90535a094bd0d6
 EBUILD shotwell-0.28.3.ebuild 1490 BLAKE2B b6ddc14476e5cccc9b2d023c4c263d7672fe0b6533f9816344be00b490d484eb01da730b1bd1635d1728a6a34dd80a5728ce6adcb8fcd7da8a6fa0776b2cac46 SHA512 4de0d6fc6c0f9a942248a49115ff1468f23f1e34714b23d7eebd44869cae5e42b7501587118e67017d703932d598a30d27325858e9989a1dd81c292dc05b095a
 EBUILD shotwell-0.29.1.ebuild 1490 BLAKE2B b6ddc14476e5cccc9b2d023c4c263d7672fe0b6533f9816344be00b490d484eb01da730b1bd1635d1728a6a34dd80a5728ce6adcb8fcd7da8a6fa0776b2cac46 SHA512 4de0d6fc6c0f9a942248a49115ff1468f23f1e34714b23d7eebd44869cae5e42b7501587118e67017d703932d598a30d27325858e9989a1dd81c292dc05b095a
+EBUILD shotwell-0.29.2.ebuild 1490 BLAKE2B b6ddc14476e5cccc9b2d023c4c263d7672fe0b6533f9816344be00b490d484eb01da730b1bd1635d1728a6a34dd80a5728ce6adcb8fcd7da8a6fa0776b2cac46 SHA512 4de0d6fc6c0f9a942248a49115ff1468f23f1e34714b23d7eebd44869cae5e42b7501587118e67017d703932d598a30d27325858e9989a1dd81c292dc05b095a
 MISC metadata.xml 900 BLAKE2B 62d1bd65c242a5da435f9217c538250495879be4d0b2de3477111018ed456f019abeb0bf678835997ff2c567fdbb844ca257d0c4bad8d07c3ad590adc82202cf SHA512 aab4bb7556cb7fc926b59e68d16a2425af57cab5ae80c68ce2dd650bf49b9e3872771fee51552aa0aba9c50167a33b1976700f65bbc1531de44ac638cdd4a0be
diff --git a/media-gfx/shotwell/shotwell-0.29.2.ebuild b/media-gfx/shotwell/shotwell-0.29.2.ebuild
new file mode 100644
index 000000000000..ed1f73414218
--- /dev/null
+++ b/media-gfx/shotwell/shotwell-0.29.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+VALA_MIN_API_VERSION="0.28"
+
+inherit gnome2 multilib toolchain-funcs vala versionator
+
+MY_PV=$(get_version_component_range 1-2)
+DESCRIPTION="Open source photo manager for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="
+	>=app-crypt/gcr-3[gtk]
+	>=dev-db/sqlite-3.5.9:3
+	>=dev-libs/glib-2.40.0:2
+	>=dev-libs/json-glib-0.7.6
+	>=dev-libs/libgee-0.8.5:0.8
+	>=dev-libs/libxml2-2.6.32:2
+	gnome-base/dconf
+	>=media-libs/gexiv2-0.10.4
+	media-libs/gst-plugins-base:1.0
+	media-libs/gst-plugins-good:1.0
+	media-libs/gstreamer:1.0
+	media-libs/lcms:2
+	>=media-libs/libexif-0.6.16:=
+	>=media-libs/libgphoto2-2.5:=
+	>=media-libs/libraw-0.13.2:=
+	media-plugins/gst-plugins-gdkpixbuf:1.0
+	>=net-libs/libsoup-2.42.0:2.4
+	net-libs/webkit-gtk:4
+	virtual/libgudev:=[introspection]
+	>=x11-libs/gtk+-3.14.0:3[X]
+	dev-libs/libgdata
+
+"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.7
+	>=sys-devel/m4-1.4.13
+	virtual/pkgconfig
+"
+
+# This probably comes from libraries that
+# shotwell-video-thumbnailer links to.
+# Nothing we can do at the moment. #435048
+QA_FLAGS_IGNORED="/usr/libexec/${PN}/${PN}-video-thumbnailer"
+
+src_prepare() {
+	vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure --disable-static
+}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index cec0fdff4b84..abd11e33b5c6 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/chromaprint/Manifest b/media-libs/chromaprint/Manifest
index 83cda46b4329..aad55a4adb71 100644
--- a/media-libs/chromaprint/Manifest
+++ b/media-libs/chromaprint/Manifest
@@ -12,5 +12,5 @@ EBUILD chromaprint-1.2.ebuild 1077 BLAKE2B 7c9097b038c87c0742331d664d885d57fedb5
 EBUILD chromaprint-1.3.2.ebuild 1099 BLAKE2B eae31032f7ff4149b15053850fe6ae3bf38f391a05a9df4a0f40da6a7f295aad1ef534b2d9942f74e4918d499911346c6d5e24356b206a56050e790ffe4fe4c9 SHA512 70de616dda26df13fe39cf64ec6686e73391774ac3439ed1fd9b9456f7551e909ba74e6aed81f12fd1d2abf8c18b86eb78e5413aac77730f81f3294efb456496
 EBUILD chromaprint-1.4.1.ebuild 1332 BLAKE2B 38f0c3f4fa222d6b9263e103a96b75cb1d86635e22da11cfed090864a02053a0649258d58d1e2866c2f7c4525f1356091a5e590870c69b80ae076fca5af71d2f SHA512 5b488ad56ab7de56531a7e9fce045463e91bc2c37202e1115836247b964ac04385376a2a067b3a6178148543d09c3d2c944981efa25d5cb814d0ef18a8c602d1
 EBUILD chromaprint-1.4.2.ebuild 1355 BLAKE2B 266f15e363ba036a702044d0e067e779e9db15cf6874cc1fc8f543f48ed877f56a430f66bd3f04a7898f9f73e6cdae54e3a6a0a6cc2ef24a0ee53c71f35d9f29 SHA512 9619edbec8b7c40e60985a65c7f146f56f2d3c380512b467ef37a0f02fce4c0ef921ea3ded9fc6c730dd9d7350829476ec7964c73cb4f3c0159e661eef9a1036
-EBUILD chromaprint-1.4.3.ebuild 1467 BLAKE2B a3eabebfbec5ad69d188108fcbc3ac7225ec8905a9e061e4c11075ba3c94fe7463ff19dc315e88cefe6dbe517c5a87e925f1f2bdae2d46ee86c543c8c5a404ef SHA512 277fa46adbeac1bf4bf53a8eb276a406ea0ed9241c3581bd47a7dcd185c014caa6fb59775b901700a6df866e0cd78c8f1e04193f9cbcea71412fe4c744dde441
+EBUILD chromaprint-1.4.3.ebuild 1468 BLAKE2B a7aca368f640e533b391838aa2b865442310d6c210ef64a4872b8245417e4b19dba18cd20738ba7195d99dd66b31c038af01d6cf40b352e8cf9a2abf7ef69120 SHA512 7419ae2d36b6cb92a1d8aac11075eadd1775358768b890ba58a32a12b767a307eacafda9e88c7cc92909b213a16ff42d3b8babbf91f2cdc7ab66f1a6911ca344
 MISC metadata.xml 502 BLAKE2B b4f7420ba8b5e4004b6f8fa9cc70c0eddea04a0e1759c9724b94198e3df99c2505893706cb5232c643a43208822d7ef5bb56660c76029cadb52b9a0562fd8021 SHA512 229e807429496e637ba289f269af83eca274c53eb2fc2d9dc5f304c39118eaf1d0ae9a5cca01ffa1958d110c55537f1792e26343bf3309ad72b1f0411af9dafe
diff --git a/media-libs/chromaprint/chromaprint-1.4.3.ebuild b/media-libs/chromaprint/chromaprint-1.4.3.ebuild
index c1ac357af584..12ae454f9693 100644
--- a/media-libs/chromaprint/chromaprint-1.4.3.ebuild
+++ b/media-libs/chromaprint/chromaprint-1.4.3.ebuild
@@ -7,7 +7,7 @@ inherit cmake-multilib
 GTEST_VERSION="1.8.0"
 
 DESCRIPTION="A client-side library that implements a custom algorithm for extracting fingerprints"
-HOMEPAGE="http://acoustid.org/chromaprint"
+HOMEPAGE="https://acoustid.org/chromaprint"
 SRC_URI="https://github.com/acoustid/${PN}/releases/download/v${PV}/${P}.tar.gz
 	test? (	https://github.com/google/googletest/archive/release-${GTEST_VERSION}.tar.gz -> gtest-${GTEST_VERSION}.tar.gz )
 "
diff --git a/media-libs/elles_icc_profiles/Manifest b/media-libs/elles_icc_profiles/Manifest
index cdbd0e849bc0..1d177827bb1f 100644
--- a/media-libs/elles_icc_profiles/Manifest
+++ b/media-libs/elles_icc_profiles/Manifest
@@ -1,3 +1,4 @@
 DIST elles_icc_profiles-20160501.0932.tar.gz 334145 BLAKE2B c2aa9b8720a83d9296e87e0dc56c18e34536a395d80412589d29a5d39bb36ea8c83929afdc1c36b335f3bff4b6d19b5793fd25b8ec45ca49ad159008a70e1f2e SHA512 10a3df45aadf923b2d7ff9c8ee906b000e70ad7d17c1a5005f889b49c6d57849c8befb5c4ed92748908bd5506789b6877c0504666de43c1a8621f646ab665e2f
+EBUILD elles_icc_profiles-20160501.0932-r1.ebuild 562 BLAKE2B 59f2a04d1de870905e7cbd1b118777e69e9fc64b2e761df4016c30ca14d78ac84fc56d7ab9e6cb2055550e07704aa4ff92fd3693c7dfbdc59be320b4322d66e4 SHA512 bc8b353f1b31c223c80be7b3555a047d49a6fb409403ed19205e7114ea25301ef365a8a9f5d3f4798e39ea30b7b34a1eb7bb1d26ddef11a6b77da0e8572dce54
 EBUILD elles_icc_profiles-20160501.0932.ebuild 601 BLAKE2B 0117d5f3a453df72fca364da878fc9f815befd42caa3b6dbeac37ff2623b33c534b058b96641db1af892320b89c9430c832fe20c4003f0acf45f7cc24b26fb9d SHA512 942d824839add0ecb64cf13b574b8a1f7a6e7748716e39552399e6e88121a50d0b2d06619f6a95db23030592b998d87d0fbc004809ff89c945da4a5b792913eb
 MISC metadata.xml 1155 BLAKE2B 7d65efd6ec703153a72426b810abb5ea5a2d2f705f2c2971f8196c0591726f5919ca293e82b5f230ce5d994569950249f6cc044714fd50bdb71eadc0a6343c1e SHA512 3ab1772a6f2e06380dbd61e10926dda5ca7c80f1ae28cbf6e0f62e546c343eb8d9661bd6570c575b6f70cc83ea93e7df009a13eb4cecca4fcc63d4540bad37ae
diff --git a/media-libs/elles_icc_profiles/elles_icc_profiles-20160501.0932-r1.ebuild b/media-libs/elles_icc_profiles/elles_icc_profiles-20160501.0932-r1.ebuild
new file mode 100644
index 000000000000..9bd3e4d5753d
--- /dev/null
+++ b/media-libs/elles_icc_profiles/elles_icc_profiles-20160501.0932-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV="$(ver_rs 1 '-')EST"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Elle Stone's well-behaved RGB and grey ICC profiles"
+HOMEPAGE="http://ninedegreesbelow.com/photography/lcms-make-icc-profiles.html"
+SRC_URI="https://github.com/ellelstone/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	default
+
+	insinto /usr/share/color/icc/ellestone
+	doins profiles/*.icc
+}
diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index 70e1cdf36737..410f1c340861 100644
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -10,7 +10,7 @@ DIST ft2demos-2.8.tar.bz2 225274 BLAKE2B b8b02b8b03b84709b7d274d1c8dff323051051c
 DIST ft2demos-2.9.1.tar.bz2 233462 BLAKE2B c689942b222b2c600b5ec3963791621ae87acefb9b01caa5dc35af52525d03e3a1094e48c0789d5eaabbce787bddd7c3055e12454e54ea3c7fae92bca47614de SHA512 38bee59184b20c2eb983deaa5c1f241e31c1b4793e47dc06b1b419601489cfece3b11fde4cf4fb6c5af12254ad0c1ce9a1547885c208e8e715655e9c48f22a46
 DIST ft2demos-2.9.tar.bz2 230926 BLAKE2B 8c8e02101243468d52953aeeee7ad985a5aa3fabc82c19a3404ce301348fd32e5f89aa56798613658d5d29a8c3a6c7d4a70eae038ef6095005f8c10354b3f288 SHA512 3dfaf97619d585d6e4db20002c69f9c46cb8991c4faf86d9d92884a80001235ef01010148156cb4879d7869e6121fc27ef03c13288af011df26fe85c3fb7e6a1
 EBUILD freetype-2.8.ebuild 5276 BLAKE2B ab6ab026dec672db2407ace0cb9b3037cee83b2100f3432ee1ec140754f6a204449590a07dc82789d7b53fdb1ca3834852bec506763bc7dcafd852abdbb78889 SHA512 2d38568b0d55fbbb8e54600c5c1ce75088faa47009982840ed5e287b33e3cefe110e7ea3f00e22bee30b348d40af73a30f86724d6e21364aaa9aa1c476831a68
-EBUILD freetype-2.9.1-r3.ebuild 6705 BLAKE2B 05df6c5838e2e9859ced3ec18ff7a223e079022ce9b271a3e435393df0e32efe42dd56efddc66a3d35c8f9de345440f5451f052a8bbce4e81ca39e93cf980608 SHA512 bf198b9e656c16e03c28625e50a797f0957b15378a6d4a1836b2e2e8ccda795504f5b178e7f304e17a0a7c7de622bb04072571ccb5e492b5656a041863fe84f3
+EBUILD freetype-2.9.1-r3.ebuild 6703 BLAKE2B af83a3e972a7d1dead1696fdc54832a1ae237af0f1cf0afb5618e6aeb7a26b1eeaea2693f78f2963db0e279e113c51e5a1073819aa20be6f7bbc3b4390cb9a1b SHA512 fd5d45c5645887459f851c01f8ca66d346d8c464188293763ef0b2e9478640267fa1cb5bf45f63c61d4b5ef28c8f5eee7f27a8fb4237d745638bd5978cbd8ad6
 EBUILD freetype-2.9.1-r4.ebuild 6713 BLAKE2B 161173b75bd41db18db1fad4a515a8fefbe0174ebd145f983af3931572d3f1af036929d2d1773d4a188521898de160cf0d272147b55feb521bce55db098192dc SHA512 88f99dd4163c515cb9150b629472a8ed3f46814bfb8277461b23cdf0248a6acdc17e160e7f2f669daed7ae9e594a2b5d933be0f764012f5e58c2e7104964ddb2
 EBUILD freetype-2.9.ebuild 5288 BLAKE2B 439147ccd14d1fa1b022c491fbc6233fa86b1f545229b3abb85d2f186f53b26fd8098d228588c843801cb343b9fa3a615f25663a432c0c96a8f1cd4c949b25bf SHA512 47904142a2fd8c80658f18a472f6838926434297d8b39f243e6fa19e9a0f7896130d2e6e7337bb7ad8ad5b71b819b5c6de3cfff7a82d5563985c4c28e0c21b26
 EBUILD freetype-9999.ebuild 6713 BLAKE2B 161173b75bd41db18db1fad4a515a8fefbe0174ebd145f983af3931572d3f1af036929d2d1773d4a188521898de160cf0d272147b55feb521bce55db098192dc SHA512 88f99dd4163c515cb9150b629472a8ed3f46814bfb8277461b23cdf0248a6acdc17e160e7f2f669daed7ae9e594a2b5d933be0f764012f5e58c2e7104964ddb2
diff --git a/media-libs/freetype/freetype-2.9.1-r3.ebuild b/media-libs/freetype/freetype-2.9.1-r3.ebuild
index 81bc3b1097f0..9060267bef2e 100644
--- a/media-libs/freetype/freetype-2.9.1-r3.ebuild
+++ b/media-libs/freetype/freetype-2.9.1-r3.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" != 9999 ]] ; then
 			mirror://nongnu/freetype/ft2demos-${PV}.tar.bz2 )
 		doc?	( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.bz2
 			mirror://nongnu/freetype/${PN}-doc-${PV}.tar.bz2 )"
-	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 ~x86-winnt"
+	KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 	IUSE+=" doc"
 else
 	inherit autotools git-r3
diff --git a/media-libs/gexiv2/Manifest b/media-libs/gexiv2/Manifest
index 98dbeb302e51..ffd8baf7ec24 100644
--- a/media-libs/gexiv2/Manifest
+++ b/media-libs/gexiv2/Manifest
@@ -8,5 +8,5 @@ EBUILD gexiv2-0.10.3-r1.ebuild 1309 BLAKE2B e84c8556178cc05c47eebd511139abd9d1d2
 EBUILD gexiv2-0.10.3.ebuild 1270 BLAKE2B dc6f81c5599f6bbf9f51a632c37e141227527b20b1d0274911242b40867c65329e9ca4d513589e08dbdf596b5efce125784c408db2ea0fac1cc138b59284f3a5 SHA512 85dfd941c7ef4413ab277489e2e05eb9d5b55aba4a61fa56546200517fe7a4bf3e4f3ed66e9475d8137e9bcbef95c318b4e77044b201ab9f6504c25479162e18
 EBUILD gexiv2-0.10.5-r1.ebuild 1395 BLAKE2B 0cdfba0d2a67f586aac986c5aabbe66375868004c476ab700053e94f2cda1602974501645d360e0755168a3dc3a14a9b66aeac32dec343721e20a6fb33bd5200 SHA512 d4eaf6dad6c7ae160c0cff8b10a8c34dca7f88538ce70671e7cbd936b81a5139acf30703f515ca47280f00b8cecfd920866f57992c4ae7af2edd35697a80ede6
 EBUILD gexiv2-0.10.6.ebuild 1333 BLAKE2B cd2474b63ecbab4fc5ca47e836e3afbd82d85023cb0d3744967b269f05a4316c39cf59dd6774989d7532ee67cc6a0a7eecac2be55a4c9e8e0351796289670118 SHA512 377878817bf52c642b012af0f15433866eebb0c06974b26c23faa1865ea26beb7ac647181b1a6e4b98fefe0a5ed1efa9acd879bb9e90d46641d05681c636ca6f
-EBUILD gexiv2-0.10.8.ebuild 1512 BLAKE2B c80236a31cb8e78dfc4e939b38e522086f5721105912966bd7d3af3ed0050a3a4f8c709268350bde41549d425befcf0c0b687b8b253d5868d6daa7f8d3752f56 SHA512 d8ebbde07890772946f28fa38e1fdb0c7436566dcd30f558e209ce759bc9549794d024e486d4add19dce0321ba0903174231d6bbdb1cb2619cfb43a8c47294df
+EBUILD gexiv2-0.10.8.ebuild 1511 BLAKE2B 65b967c889607b27f6955e2fcdb329051c2de80849c3bea67e1fc94be216914455a39f0c168e24dd6d1b8d62dd4c825ab882d3457a168247561259438e9662e2 SHA512 716b016bb29d60f7f3d80249ffa52003fa93eddab0b92f5f7c5fbf51b2b2d943da5d3981b3dbdc2bc82a0369fbba5f101195c6f695702ee51ee9af23cb32165d
 MISC metadata.xml 265 BLAKE2B 5e9da641ca1949fb00cecaed654cfc3cad540c14b19043c2032e2c6593d47793d6ad7ee461667575ee51a919890ff1ec63195a43c2a35c8b56c12257668fa2b5 SHA512 65fd64249e8dde8eb2ddcb67c58c05b36b10e51956e2237f60dd3ae50872492f3d5872b64106acb13e453a41960f4f817161be3c8b89e6b9a2367b8f1403ffaf
diff --git a/media-libs/gexiv2/gexiv2-0.10.8.ebuild b/media-libs/gexiv2/gexiv2-0.10.8.ebuild
index dca051d1b597..e3a432736fe8 100644
--- a/media-libs/gexiv2/gexiv2-0.10.8.ebuild
+++ b/media-libs/gexiv2/gexiv2-0.10.8.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnome/sources/${PN}/${MY_PV}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="introspection python static-libs test vala"
 
 REQUIRED_USE="
diff --git a/media-libs/gst-plugins-bad/Manifest b/media-libs/gst-plugins-bad/Manifest
index 3b4287707828..f182462fd22a 100644
--- a/media-libs/gst-plugins-bad/Manifest
+++ b/media-libs/gst-plugins-bad/Manifest
@@ -5,5 +5,5 @@ DIST gst-plugins-bad-1.12.3.tar.xz 4707000 BLAKE2B 1cb82e6f1c20d24a42ed0c7465e4d
 DIST gst-plugins-bad-1.12.4.tar.xz 4709272 BLAKE2B a4d1fec48fdd67fc66eb5588dbee820c22b19a41dda4f5643b1ae326bfc827cd4796fc7a523fb0a9758605952377a2491f4e53ea74237ca7841659dea4ddcbc0 SHA512 a8e281aee1f1d0bb3f171fbe4242e997c661cbfd0be78da3913c0f55d68d6b7c3d34cabfcdd8c25728217ff885b86a7bedc0be34a7b14e2eb2a6c6236753231b
 EBUILD gst-plugins-bad-0.10.23-r4.ebuild 1565 BLAKE2B 8907f6548ae1d077342bf0f35280c9cd59c492bd8a2e23e9c176c1682e32cab561835123af61fc40067f55c43574e401aa16e418ede39a56786744f741f203f7 SHA512 6c68c102487868c23bc177aa65a9a734f7e2cd89bcca5af827d98dcfb61d26a84b09a07d4ec6d7397a17ffa57ab33fdbfc5fc290bb9eb397209150da86ebb492
 EBUILD gst-plugins-bad-1.12.3.ebuild 2812 BLAKE2B f6ea1539d722daf9296ea0c1ce99653f709e36297e0c04ccb1ae45705ae3ee11325036e892aeffedba002632f2379f0c7486cfc92b67fae76b69036ed58b1ac4 SHA512 27e72cde6700f40d738abe14e709072326ca2af3e556b65acd09604b472168f7e705808c8756edc8d14a1992c8091a6065c2500cec6aa9cbbdda137a229a0bc4
-EBUILD gst-plugins-bad-1.12.4.ebuild 2821 BLAKE2B 11375c0e5c4c2a177a5ff36eb35326a0dd762efd10e08bdcc4ecf6d05192c8ccad503cf75fc42cbafcb0ae7d3c46b62cee16e1a192e72b8d13a2f77e2efcc190 SHA512 cee2988855d6c959c9717cc571c2a20e66b93029810ec979f4a3d4bafced0d6d16930ac16a90d5a602942f530e08b684fc73ea5eb6def0845953652c04271a5f
+EBUILD gst-plugins-bad-1.12.4.ebuild 2819 BLAKE2B 19d7afaf0e34e98ffd67ac1dbb453ce8477cd719803560a445e0cf2c8829c07f8355780151cd2273ea36e4bf624c1bdb278507ab8aa0da44e42746037abab895 SHA512 3414136d383f5669e11edfee11732de39b5f4f1fe20f821e2add0cf0d66b675fc337bfeed392770d3beee2144b70505c067121a2b7381c67c347dec431986425
 MISC metadata.xml 439 BLAKE2B 5a4a36ccf4bd485eaf1fa66650eec8fa592d4c5bbf9fa478f1645e1b39649b7115694bf55dee7aeb4a5c53b2ba3c4614591cdf4e7d745938397c304108e0aa7c SHA512 9bd27a1a513fc2d697f7d0f2ceb7fa0701c446fe21b597256afd4c2c1f44145e875323ed1ef6202bf7b85472ab4aab43a4b6db5795bb1d28ff53a2a7e484055e
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.12.4.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.12.4.ebuild
index 7d8ad7dd4c6d..33a7e25a8878 100644
--- a/media-libs/gst-plugins-bad/gst-plugins-bad-1.12.4.ebuild
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.12.4.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Less plugins for GStreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 
 IUSE="X bzip2 +egl gles2 gtk +introspection +opengl +orc vcd vnc wayland"
 REQUIRED_USE="
diff --git a/media-libs/gst-plugins-base/Manifest b/media-libs/gst-plugins-base/Manifest
index 399d5ff85ba8..6fde94ec1a24 100644
--- a/media-libs/gst-plugins-base/Manifest
+++ b/media-libs/gst-plugins-base/Manifest
@@ -5,5 +5,5 @@ DIST gst-plugins-base-1.12.3.tar.xz 3117364 BLAKE2B c5c16f1b46b10cfc5b9731ea9906
 DIST gst-plugins-base-1.12.4.tar.xz 3119468 BLAKE2B d5ac157618a25c8f0323d1922d5b26b0b5c49f56cb75df3ceeadd0566f873be1a06c863a1da6afff40901fbbbeb1ec6cd6ef4614309ca7f7ff988c0fa9040a10 SHA512 89a6e92cd294612cf1406eb156416ab4606643f6b43637e64a18f6f28ab789ca8d4cf1308434ed85e5fc679c79cc3ca115db48f37e0065a6ab3cdfdbaaad9f53
 EBUILD gst-plugins-base-0.10.36-r2.ebuild 2120 BLAKE2B 5e670a72e651af6a8ef1e4992fc42a7a444e9a77e708b86cdf5d373d96cc549c2953df5da5b001479938f77498eb09de861e89e705ce555618cd45227209a769 SHA512 bc9f491322b473f7ae2a55a7fab8315584b1ef3f71f94ec4968705fb1063d72e6dd2dd80342bd85b7abb29315abb26adbe3002c94c7a7ec27517c8edcf32eafb
 EBUILD gst-plugins-base-1.12.3.ebuild 2559 BLAKE2B ecc42507c99ff833f3918fff11b4667b210b1f7c8688d55c1cad1b5ceb0e637369027bf28e343ad7528af409d81ccadf1da7a128a1f1873cc4195f6e2c6e5e2b SHA512 0ff63387e44a61fc8d2be8d93d75cd720473742ed68652d1e901cd85fd167b8a683870065a4bfaad10af91348dbe7cbf1adc4d00cfb909df7d284daf700c1998
-EBUILD gst-plugins-base-1.12.4.ebuild 2637 BLAKE2B 07819e92f34435a8c2c0ae9a8f0e1697848795bc7f52faaaecc2b81fb6640a78d754b3aec5ba326a879b5ef90bf51051d8741b818ab924966cefb92230e77c09 SHA512 415d5bd26782aca201ee569573b4e5e41cb27545d77d4c5729e10db3736dac3ea94419d1495d3805fb16e832c6a6456a8fd3b9fc2ef222394689bc614b2aeef7
+EBUILD gst-plugins-base-1.12.4.ebuild 2635 BLAKE2B 135ac9f8423f4d994fc90320871716c18bc37afef01fdd8fbadb25b1b37addd05aaf9efe915850a64d041f3d1cb52231cf64af87021cb4cc24205e4618d85536 SHA512 01ccfae2d189a9506ae1261f15126aee3967bf76e91808d88b0d2214083e19d628ceba84e44b6a1f47ef673137d42dcecf13ba7750e4f279dbc4a605948e3f76
 MISC metadata.xml 397 BLAKE2B 4bb000c5586a8912669b1584356b30d8483b6f15180e7acfdb03d0c4e169c3cc703487a9f1f96867c23ba6b5114903b92bb2b2fda4deb9b979ccf610f8151b8e SHA512 89c4bdb8f7a5da325255b43be4017510c4a5b4a3f8f650dc625b513d0cd2260267f840fc52926fe9ca262d9f3f2c16bcf0aff9c22dd0c8b577e632155910b568
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.12.4.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.12.4.ebuild
index e3e797dd39e4..e8f7f84e345f 100644
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.12.4.ebuild
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.12.4.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for gstreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+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 ~x64-solaris ~x86-solaris"
 
 IUSE="alsa +introspection ivorbis +ogg +orc +pango theora +vorbis X"
 REQUIRED_USE="
diff --git a/media-libs/gst-plugins-good/Manifest b/media-libs/gst-plugins-good/Manifest
index 52e5cf868cf8..ef8c7fe7032d 100644
--- a/media-libs/gst-plugins-good/Manifest
+++ b/media-libs/gst-plugins-good/Manifest
@@ -4,5 +4,5 @@ DIST gst-plugins-good-1.12.3.tar.xz 3487448 BLAKE2B 2c27918f8020c50078b983244e9a
 DIST gst-plugins-good-1.12.4.tar.xz 3489992 BLAKE2B 41715d3e9bda183706d87085bc8cca546720f20e32fd5ecf6e284814745f2fe8ba4cfcd244e50d0734e57dde26944539b8273879608d3042262bfc10f82cc2b9 SHA512 18f270c01be80fe5b026e2c26db3ec200117ffd99c1dca55a8a78f0bd6dcc4701126836e52a410f179779e363f11218413c7b4d13e96ef5ee1bfa82e79a81178
 EBUILD gst-plugins-good-0.10.31-r2.ebuild 1661 BLAKE2B 25c45ebacc5a0a532761dcfdf49cdd4dbd1b61a133dbf1845d293570bdc203b4e9b72b917e5e8833ad9fee0f8595d6371615ae5fb0a2d616ac2f0dc3bf31260e SHA512 a66cb0a552686b588d54a962e9888c29edcf49442aaefa665b753658e31a96b108b07b7fa8033eb4bd7f0535a2fd4b3a6fa8ecc1a91649fd3ab0456e91c01f0c
 EBUILD gst-plugins-good-1.12.3.ebuild 1430 BLAKE2B d8779e22c9fa2e946ffab5b57b3e0e8f1fd6cc5ad99f3973b464b153cb903f26431c8417fdd7698ec9906c381b1a6d8234fa654bdabf8cf8684bac6d9172fe79 SHA512 3f468cfa4b74dd8f98093cb6b9acf9cb46b172e17de538f7689dd7463be13363bdd89509a2bd38867d80692017ea4eae0178885bf2c2e4bbc602dfd5c1775420
-EBUILD gst-plugins-good-1.12.4.ebuild 1433 BLAKE2B 834aa3e5edeb5841856725c13e646f9d2f541e01fceb22336a9df8418a8951ff78311892a1bd8c9211bd519fb565d51b85026d9570f892e2c31d0c7ee381c015 SHA512 860d11a19d863694b1cfb9927fba8d136cb9b2fd967de289517298ffced25ee151f741f9dc9090fc5031c310b8b1ad78779276fcb88b87a3ac0ec150da7a2e22
+EBUILD gst-plugins-good-1.12.4.ebuild 1431 BLAKE2B 464355f1ed004290395cb487a31d32c82a61e400cac1b0260c1e4254854db8d4414fda88d849502fcac10faab192018959a6d4386861300c391843d2dee23186 SHA512 1b7e52559dc1287bd8b9b1256464c21662f396f648cf50a66430f712bdcad6baf52c03e78c40153795df74586ab71f4f0cd219b38ab743f00c063a8546d1e568
 MISC metadata.xml 266 BLAKE2B 3180109d2a1479e9436a76fb478dfb1b23db0daedbf0ef264a469fbbfecd858adf6ec01f3fdc5c56270d0a9e1e150ac947f4a1f893e967d6b1dc1f1b8f6d4ccb SHA512 aa2ce82fa0c848119ff309462722e1d7897da904f9e1dc9ae12dd61582823b69cf5a40faf8da0825ec397d2f01d44e82cb56730d9545abd619a17696091eca75
diff --git a/media-libs/gst-plugins-good/gst-plugins-good-1.12.4.ebuild b/media-libs/gst-plugins-good/gst-plugins-good-1.12.4.ebuild
index c3da467d35b0..464f241bcd93 100644
--- a/media-libs/gst-plugins-good/gst-plugins-good-1.12.4.ebuild
+++ b/media-libs/gst-plugins-good/gst-plugins-good-1.12.4.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for GStreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2.1+"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="+orc"
 
 RDEPEND="
diff --git a/media-libs/gst-plugins-ugly/Manifest b/media-libs/gst-plugins-ugly/Manifest
index 1859f57839b4..c70e91329079 100644
--- a/media-libs/gst-plugins-ugly/Manifest
+++ b/media-libs/gst-plugins-ugly/Manifest
@@ -3,5 +3,5 @@ DIST gst-plugins-ugly-1.12.3.tar.xz 903784 BLAKE2B f0a9538f8d3c2500470a721a998d3
 DIST gst-plugins-ugly-1.12.4.tar.xz 904592 BLAKE2B 6ec59cea23ba45e705fc3140530576232c758884cc7cdcc293022233f4aeb440918c147563706a7309253dab318190bd6484fe2ac21af4b54af61ede349a1e82 SHA512 920f5be5a060293319f4c45bf7f28e14953e897473a04e1c83bce61261365198a6dc2d7ad6cf5396b2bbdc35a5f77014741e902e67c00c3c6596680ab9924e8a
 EBUILD gst-plugins-ugly-0.10.19-r1.ebuild 1058 BLAKE2B 3e51a96a9cec4e7cb9d5ea36620fc7210b0efdf9fb9d4e88984eb492786c441a6bedf87a91133ec24e014a08bbe161e785cab0415bc6e0844d8a0db5d4be5d69 SHA512 32c32c59686f099e1e5a9c2b75aad193fdcff900734d8dee31129a00cbdf84e219ae86c89bc6e35f4c5fb54532183cbe24683c463ce45e92c26041267e5ee1d1
 EBUILD gst-plugins-ugly-1.12.3.ebuild 963 BLAKE2B 82203025bcece6b6566b2a29bdb2bcd3fc460ac02b9d3be42cdad13aeb62510d1c3739ff72856bec86c7b7bbd6645b365d9528b5cd68cb35965a687f8ab0bdd9 SHA512 ba2965acd379fa1d93681c93317c09ea8db6c48d482d905955b54b1e4d471ffc45c893066dc7633654c2ab52d7447cd44c3394dd78cd5a596d91e2177a004fa7
-EBUILD gst-plugins-ugly-1.12.4.ebuild 966 BLAKE2B 3962ba15e0c602c769e634884592934f27e8449bba050fc96c617b7920c76b3370dbafa444e60b40a09ff7efaac7e8a6efdfc90faa6e576b3ca93a6137abfe79 SHA512 84a42de51373842f83c36ec0f4af0b85aa3b6655a1fc14447000407db99f8eab711def1d36bba5adbe48a4c3bff3e920c9d5c6f35c1293831c44fca961692a86
+EBUILD gst-plugins-ugly-1.12.4.ebuild 964 BLAKE2B 761e7977f23dcd1d58c3cd4c7b214474c1204f6f9f9f88e1b935db7f60e1c9cfcb7e235122c64b1bf30216ac18b10a498e8e59ddcfe2cacbfc62debb785a0a60 SHA512 95d7137036d588ceb9e0c2fe6ce923df587ae2855a68606078c20c4a5c80de433be19a0e252468c879b9fdb2167814c135cb005eaa6ec0b8702fb86d1a854da4
 MISC metadata.xml 345 BLAKE2B c8af39d4811da5ca9cad30110ed9b2a090fd27a957bf32f831b4c3f5a22bb87fcc15957151ce9752521d2a92c667568d8ab002c8f4f9ba3363d9b7ca79655ce8 SHA512 c8c693633f2fdbf66f2308a2ee82880bf0cdd58b0c1e42a2d3b2733b3a7411769da60e8beb375def6473fe50303f1a68a0c7712e48abf88935b045f93103b206
diff --git a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.12.4.ebuild b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.12.4.ebuild
index 1870cd05cb95..2304395aad55 100644
--- a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.12.4.ebuild
+++ b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.12.4.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for gstreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="+orc"
 
 RDEPEND="
diff --git a/media-libs/gstreamer/Manifest b/media-libs/gstreamer/Manifest
index 4df3cd385059..abfb3b513356 100644
--- a/media-libs/gstreamer/Manifest
+++ b/media-libs/gstreamer/Manifest
@@ -5,5 +5,5 @@ DIST gstreamer-1.12.3.tar.xz 3175480 BLAKE2B e42b908b6fef2be5d4a0ad435cab5760a5e
 DIST gstreamer-1.12.4.tar.xz 3177208 BLAKE2B cb859503edbe09cebbbfa70cb4edc5d433bbaa5b299e05921d30e6096f8765e17d449c45bd7d5ea3e4603ae46d337d4e3291b1d0456c7b72a7ebb41faad9e73a SHA512 849aa4ddf8ef465f2915e05d36fc0c31c2e31ae28be2fa38f8069a64a91b7347020fac5b881b7f3ee54c2198c3596138d49f27b09f258303834164a5d68b38a2
 EBUILD gstreamer-0.10.36-r2.ebuild 3843 BLAKE2B 5755f04502e3fd6bb5eafbba0710009fd0dba7f402c4a28c20c768ad6290201a900200a33f21b2d97bf6aa7596df06a0001530f001164eb2777a9f3b5cb0adfb SHA512 3a9be6924cb416b173297ff022edffb6a8c496607a4b5f88c1b81fb8489ec045e9f611a88a736fb67a84418d472e37fbdb078e9e9d8593a03418cb6658de6c67
 EBUILD gstreamer-1.12.3.ebuild 3309 BLAKE2B f2dae365901d455f952bcb9a568a4aafaa46ac2da6e90307108ebc1f28d89adec2e96c3c0aae0811ce20f6dd7559d5cf90e4c8e8022a65c3ac26b06a9ece3997 SHA512 4fd05a9b129e65dff3420defc93b5dd7b3f2573c3c587f410c301732b879e12b904dbaafcab98aa7f8aef0b9cb897488e62fde387d40c199a42929172a9c7119
-EBUILD gstreamer-1.12.4.ebuild 3312 BLAKE2B 1df850530140f38f72c02878e0253e5ba2dfd4ce9de936419e118961d0beb602b16b11f3684861f0104ef5651abba3ce56c060f5944e5d3ef0c5de3a34f3b0fa SHA512 6bf27b7d96ce6589c3b3fb32f10f4255848ebf19f0b08aaca083f3984e2ed8d8e96a915db9b5209c737b19ff7503cf794389153c0306393cc7dc235f4cfe72b1
+EBUILD gstreamer-1.12.4.ebuild 3310 BLAKE2B 3628c62235e16443c6cc95dcdbaaf51b8e5931f6b50553eaa786b21b98fac481bfa27bdec00bfcef0f8abc78f3be5f1652e9996a13d75d8dc2022da1d368f07f SHA512 04ee255b76d7aa2fb18c978baf51dd427586a8255449931165c7e327eb16387e640a1a0f5ff7354dc3080f19dda5610a430994dfbbb41397df43d3155c183133
 MISC metadata.xml 586 BLAKE2B 319df0c2c013f3018bdb31afddcd80b298f9b74d0a581981f30d483b0773339befe4dc62eb78a267b3a0f5a63a7e6462bd0ece4d4285c0ca91a1329c12ba1b93 SHA512 f7de0325f671119a5b787dcba9572d06d58375ba9d815854beffd668da55e4d4695f586365b3455e63cd56f4469fb8e1a92ab6de4e05847668f56c076dfdaf57
diff --git a/media-libs/gstreamer/gstreamer-1.12.4.ebuild b/media-libs/gstreamer/gstreamer-1.12.4.ebuild
index fd811b198be7..eb6202dd1358 100644
--- a/media-libs/gstreamer/gstreamer-1.12.4.ebuild
+++ b/media-libs/gstreamer/gstreamer-1.12.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://${PN}.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="1.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 ~x64-solaris ~x86-solaris"
+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 ~x64-solaris ~x86-solaris"
 IUSE="+caps +introspection nls +orc test unwind"
 
 RDEPEND="
diff --git a/media-libs/jpeg/Manifest b/media-libs/jpeg/Manifest
index 89159bd10f49..6b9895335624 100644
--- a/media-libs/jpeg/Manifest
+++ b/media-libs/jpeg/Manifest
@@ -8,5 +8,5 @@ DIST libjpeg8_8d-1.debian.tar.gz 13676 BLAKE2B ac6fab3e52f91c9ece95ed809fc972afc
 EBUILD jpeg-6b-r12.ebuild 1126 BLAKE2B 8a161ddc45d213b874815518bbaf5d3b5f5053658153e60bdbf6c376c29d0964aff0f220e41135935d1276641fad69fd8f4ce042023a9d6e4460ca07c7929694 SHA512 97aa4b853ca53728cebf56da61468b0cba0c35f78ac37add53c403489c7c13df2530194f2876f0c49f13dd3ff2fe162c9472eca8ab87266c0b6aec38f6c9ff25
 EBUILD jpeg-8d-r1.ebuild 1942 BLAKE2B 05938a73c8013d923e450b189b9c7f746a928237810ec41a017ecad5924d92a61d6b6c887f4aa3f26231604b94526905b83e8e5215bb714a432d1402a7a2f5e4 SHA512 f4aab4bda823dc772d309cb96156ae60bdf4d8528a8117540e7b7d82e116cc11cd45bcf0abc0dfc4767cc782e24905792cae6f96b1a24eae4de40a338dc124cf
 EBUILD jpeg-8d-r2.ebuild 1405 BLAKE2B 5bea27ef13659ebfc7f4e3aa9605da42b49ba478f15abe9cf0aca65206641a89692f6b764d99df40e977299e4c233da8a481285768369dc5aefc03a472950afe SHA512 809b128963ac2a257d8eaf58e2df54c34fd42a7f1a8756552dd88758f572eb30edfa2378f49b765276fd0d83eda4bbf9682efcf6b739d34164687c0b0f9ed2cf
-EBUILD jpeg-9c.ebuild 2000 BLAKE2B 5c787ac7856149564c95fa0a0c90fd56b23b545ced39e495b98706b0736f5fce2bb0e6aa49ba08bee607ec19bc7946075b4fababe1ab2278be9fc0c350f9f13d SHA512 2c6bd89524f5eb4e82841d2f36e92bfc98b80785644d9f953feea0fe381aeec574538778dfa6d36cdd478073f36e57c21bb0d7874e2aa540806b039acd9febd4
+EBUILD jpeg-9c.ebuild 1999 BLAKE2B 61674ac6d4fcacf27289e09f9233ffd31557836d32cd3e750ce5300cab71706386d9e6028d05d57090f341a78916383f46018ec759f32f75787f57d7172e79e2 SHA512 80829a2063476bad79f367308206dcef8e3253ce4825e73a5f9d9a7dcc5a8d1254c5ff51d0d8d8ac85f2122b44926920d2e1f5cb810460b0e2f1640e4010fb8a
 MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-libs/jpeg/jpeg-9c.ebuild b/media-libs/jpeg/jpeg-9c.ebuild
index 66a11695608c..8c78b2668aff 100644
--- a/media-libs/jpeg/jpeg-9c.ebuild
+++ b/media-libs/jpeg/jpeg-9c.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.ijg.org/files/${PN}src.v${PV}.tar.gz
 
 LICENSE="IJG"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 DEPEND=""
diff --git a/media-libs/libbluray/Manifest b/media-libs/libbluray/Manifest
index d84e67ee4771..dc675e98f1d6 100644
--- a/media-libs/libbluray/Manifest
+++ b/media-libs/libbluray/Manifest
@@ -5,6 +5,6 @@ DIST libbluray-1.0.2.tar.bz2 733058 BLAKE2B 6428b3cb8a2339e2c2d7f86663d6917d8484
 EBUILD libbluray-0.9.3.ebuild 2186 BLAKE2B 811d0c37422c0a9425084573f25c19be5a272a88654a227338029de63b4217a6ffe644cd88e45410fd66cd810d1931130e973ce839e8721ab3214710890ec1db SHA512 e2fa9e014338231de6f2811439f88bc861a8765eac08e25121c3200307d01dd478a537b368dd4b9a28966d4f3b2fe73f2d451369dacde8ef441400c0add68629
 EBUILD libbluray-1.0.0.ebuild 2194 BLAKE2B 16b08e28b74eb2d8635092ab2a02d2225d8d69b0b100346170abef947f2a56cb3a3aba7e8a52307c0781e11b74b35ec13b11e15bf2b2e78f46c3481e7ce57976 SHA512 33d28c33eb451f6360426efcde049a9250bcc8ed63e35132f37517bc1630e9c95d189b40fc69ae642e5444ed19bd9a19f4521a92bdaa2640c62fbad8c0060952
 EBUILD libbluray-1.0.1.ebuild 2202 BLAKE2B 486111965f4623e1f9b894f4533276c3e626a1152cbfb4ca0417bab5c4fc11489a7e564b6724123312bb7759e711db945cdbd4f508a0bef77df94ab65ea60353 SHA512 d6666bcc3db0d2c0407b364eccfda76710da9fb66710e93bb71707e4a5ea5941b7bcca4d06a1afa4273d20e1224496f8b60f2106f35ccfe6121efd25d1aae896
-EBUILD libbluray-1.0.2.ebuild 2222 BLAKE2B f4e1d609b4f74a4504fb02e4828ed1330c942f616a89b42ef589259e31890756fbc6b70129ba4a8f4e322041142d5469bc2eb454ea474d5e7e92bbb20367b2b7 SHA512 c1a5be48481ce60e6b6ffbd2597703ebbabc383a283f6028df586024da94ad0361c8e3e2ac8d6ad34e9c3c2b608b9eb6b5528c47d61a85b6172c4261ef299d96
+EBUILD libbluray-1.0.2.ebuild 2220 BLAKE2B ad0848c9a6e6a507439addbd366368003e4fd593c1633738707c773464772a97a92f31da798e86540c8ef3127edb725dc8dbbce4b309bda549fce916f23498c8 SHA512 ccae5f7cadd1b5dc072b642d9983f493c02153ef34846407aa1d02e398ba712de5dbf3f15026ec0b9b01b0a08b5fb2e11ce2e8d5d5e33ad6a2c4299fefc91781
 EBUILD libbluray-9999.ebuild 2201 BLAKE2B 161cdc3be5991a0462a1d4fd90d361032d44e8d6c21ab4166e2db49698803b7a561a1e5f78c5dbcd95708658b46e33a968c78d0f4466387833eeb02afdde8451 SHA512 a3d54041b72299fa25da8c4ec957f77aff6f8b4f1c0be1d775172fdbf6162bcd51c36275e16b71951f1e6f267bd12bc799a99b87f97a723b74aad7522da7b81a
 MISC metadata.xml 606 BLAKE2B f492e640b388b4aadaad89a5e282f3c09044baee74d8698b57c554d0cef6c99ebb64c13aaefbc0d4e2dabd3d5d4c0942465ed4ed2d4d439734f6c9ad55307ade SHA512 649b1a57ebffc011f011a0adc13b3d9a04a43f74dd9e24e4a233de59cd7fa0408ab14b67db21618e1c3e7cd7d78300b181dd22f4110ced4cf4ca12ce0c4951bb
diff --git a/media-libs/libbluray/libbluray-1.0.2.ebuild b/media-libs/libbluray/libbluray-1.0.2.ebuild
index 20254bb5fbc2..955ed347c52f 100644
--- a/media-libs/libbluray/libbluray-1.0.2.ebuild
+++ b/media-libs/libbluray/libbluray-1.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ if [[ "${PV#9999}" != "${PV}" ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.videolan.org/git/libbluray.git"
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 	SRC_URI="https://downloads.videolan.org/pub/videolan/libbluray/${PV}/${P}.tar.bz2"
 fi
 
diff --git a/media-libs/libdc1394/Manifest b/media-libs/libdc1394/Manifest
index a958652f0811..976318f99557 100644
--- a/media-libs/libdc1394/Manifest
+++ b/media-libs/libdc1394/Manifest
@@ -1,4 +1,3 @@
-AUX libdc1394-2.2.1-includes.patch 1024 BLAKE2B 9bd32fdd870be4607531318c18a48245507cf21c53d289a1dcb969d5e3578607f186ca04707e88d237e81231713722b11ecb93680c40e8ea04f2a6a0244c4ee9 SHA512 8fd615b01c1233c11815c9aaa1137c477e52c0482f860e0395c1e10a64694e4c8850d61ba42480a6a13a26cab6732a2dead95e9f4d2e2662aafae51482e69f70
 AUX libdc1394-2.2.1-pthread.patch 332 BLAKE2B e43035a9b9f9f7dc42806ee5fac9b1c7c7edcef700a82e845fe72e55f09de31904d61795afdbe50a8e8e1638ac2da0efaee5658a0301b183bfe06dea0a5f46f8 SHA512 ae0c6c4ad19da0b06ebae86e2602dcf80997ccea5cc45c18f71b5c55ac668310989d87e99075a1020cc58fe5d9f8bae71435aecae21e786b4c7436628fba808e
 DIST libdc1394-2.2.5.tar.gz 611918 BLAKE2B 64a5e156bfcef1f7a0ab2ec9be6cab65cf47bdc79ec3387d183778287ea1f72234325f7df5b67745289d68aea0105f24d7c55a4f13e913a60d43e3d74fcd4979 SHA512 4a02560b7b2db7199b91c35786cb9d5af51398795fc1b7f0cb577d3563b27c0d03d407fa472d9756a2f87b658350a55d29c16fef401a74f835ba86e25214d13c
 DIST sdl.m4-20140620.tar.xz 2420 BLAKE2B 2057bd14817809fc4ce8188971e846d70deda495c25dc3e1e87499f61b67373870c4b3f171edd9e5cf20e29c5d4c1eb11858001c67658e06715be3550668a61d SHA512 d8844d0967809241b642e0b6aaf45f2a5e94567d239d338aee45aaeb0e38765bcae419660562b7064d91afec63cc6ade0878fc7d6f36c61c083d136098a9af55
diff --git a/media-libs/libdc1394/files/libdc1394-2.2.1-includes.patch b/media-libs/libdc1394/files/libdc1394-2.2.1-includes.patch
deleted file mode 100644
index db703e9c3718..000000000000
--- a/media-libs/libdc1394/files/libdc1394-2.2.1-includes.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Fix out of source builds.
-https://bugs.gentoo.org/show_bug.cgi?id=488716
-
-Index: libdc1394-2.2.1/dc1394/juju/Makefile.am
-===================================================================
---- libdc1394-2.2.1.orig/dc1394/juju/Makefile.am
-+++ libdc1394-2.2.1/dc1394/juju/Makefile.am
-@@ -7,7 +7,7 @@ noinst_LTLIBRARIES = libdc1394-juju.la
- pkgjujuinclude_HEADERS = 
- endif
- 
--AM_CFLAGS = -I$(top_srcdir)/dc1394
-+AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/dc1394
- libdc1394_juju_la_SOURCES =  \
- 	control.c \
- 	capture.c \
-Index: libdc1394-2.2.1/dc1394/usb/Makefile.am
-===================================================================
---- libdc1394-2.2.1.orig/dc1394/usb/Makefile.am
-+++ libdc1394-2.2.1/dc1394/usb/Makefile.am
-@@ -7,7 +7,7 @@ noinst_LTLIBRARIES = libdc1394-usb.la
- pkgusbinclude_HEADERS = 
- endif
- 
--AM_CFLAGS = -I$(top_srcdir)/dc1394 $(LIBUSB_CFLAGS)
-+AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/dc1394 $(LIBUSB_CFLAGS)
- libdc1394_usb_la_LIBADD = $(LIBUSB_LIBS)
- libdc1394_usb_la_SOURCES =  \
- 	control.c \
diff --git a/media-libs/libebur128/Manifest b/media-libs/libebur128/Manifest
index 11e1f40ed803..88766f63606e 100644
--- a/media-libs/libebur128/Manifest
+++ b/media-libs/libebur128/Manifest
@@ -1,18 +1,4 @@
-AUX libebur128-1.0.3_fix-tests.patch 783 BLAKE2B 7a43ca98b36e7f257b176721e71093e8da5bb01dc27896188a360625e2cfb2b96e29a1bc8f67a99aa9228ef4001a58307d9f05506fd46bdfeee8fab7b89dd950 SHA512 0a65d0a635cadbb15f3153dd84f367258d7dea2100777b16a3ad954cb2a08ba1032290d4060e7b2424956a9f8792684bd82710af68e902f00e4a92d5283a3f20
-AUX libebur128-1.2.2-cmake.patch 1919 BLAKE2B eeac97404b0a6028afa9f48f061c4ae543b82e47b02c8c4b373b77257283c53181d8cabe95b0975b01c4081435ccb9b1fd6208aefb8a74878f75a2a7cdb74073 SHA512 a0e2b257a860d88436de1c3a55f416dc17486142b8202a79f314d17254366e502985a662b789d6fea08c54722df466ca8576bf5753832832a3a747aa1fd46362
-AUX libebur128-1.2.2-pkgconfig.patch 1480 BLAKE2B 72356eb4243546117838d58880fedc15188570dac200777e1537a919cf6ba1382633d3c01ab72bd1ccab04a35af5b090d59c9290cc93b6a1a5f37a4d8b89a975 SHA512 abe467351baf73cc159ebccbd9497cbebb6506d09192801d9b9711df4c2f354a0753a84f9af39a182bfbf76b9169ac29cfb3822dc41ba7471c6140b4a8bd202d
-DIST ebu-loudness-test-setv03.zip 80837115 BLAKE2B ec122cc0928c3cdc78d319d7aabe7d9c7fdc307abbb3b6a44b92ac9b943044eba297c705d3bea51809de8edf761ea57fe0ed296fc13b598a286a3c2443a8d20c SHA512 ffa60e3f17370a7436614269ce33b2e3c8ec84c2477f05bd42b436bbd07b7018ae9ef935c9fd75ccff731bdf24b8231397ccc95fd003cdf6e04578ee62a663d5
 DIST ebu-loudness-test-setv05.zip 91631421 BLAKE2B 95a345b0700893ab96854c7563ecc9c667db30e8137352226d1f1ac7a666f6b08d1748d88ef11f72056d0a4bd513f365a1336de568ea45917a6ba9af5bc526ea SHA512 60d022fdac47ad0be2688411be9daecbff85da994d6fa4921bba6cffab841b081d8b15d9ce284ad2253efb686463450a84a0d19cb0bad7a934546cc52dd73771
-DIST libebur128-1.0.2.tar.gz 29794 BLAKE2B 1d20b5064c4686e6b11b716dc6b9dc17180a211f39bb5f829a1a2137b8110811f4428d14a5190aee400f0a7a22e191e87ff14c714fd2223d09cee90df71810df SHA512 10f0248db9ebae48c0b3a62f5bab668d77bf10cd004267593b0cec1c5fcd5b1223fff2ae82d6753db7329210a0d7feb5a65a1c030e92607805d05c1b9885416a
-DIST libebur128-1.0.3.tar.gz 19804 BLAKE2B 799cc3cd4a5f873fbebc66f2534239129fc8705634333c27a8f73fd4744d3c555972d3e5e1e15187ed14eb6d9e84c29aff5a4a8051aa3ae982e48ffb472bdf5e SHA512 586ae80c31b9ef1d315821cef6901edd3f3d5309299411e969cce18cdc1911639971ad249b3b49edae9195b428557dbfa3281a5dc22da20a245e66c497eb0422
-DIST libebur128-1.1.0.tar.gz 19318 BLAKE2B 94e33bea4a045f363d68ccdebf51a29cee07ece881b97f0960c983d8fb117f850f950088890be24eb14cfbfcf763afff2c52ee116c7cf324e596ddfb36978951 SHA512 13a0d92eae8d991a15cb090e5f3ca34fbe285bf7e8e01e10b5ccc8be4f066e8bbff6920370d4506284f02dbfca3a5189ddfe9135f195179d356257055768c08a
-DIST libebur128-1.2.0.tar.gz 21690 BLAKE2B 58221437b0f22515529ea9f67d03b0a5bf996ba06460a7fba6200fcfb7efb5db40835b9da3f571da02dcbf6d27cf5ca207dddb6125a8a44ceab99499e314b3ed SHA512 70bae021e4a9c60e1eee5dd2ffb357bda007b9f29cda0a25b9ae453cf389661a238e6300a2bbfb323afe9b0955d2b8468fff91eb1bf2a3d665c9e32c5e80631d
-DIST libebur128-1.2.2.tar.gz 21738 BLAKE2B 9e32968a7d58ae0aeb0e0c8c35e076a12e69260b4fdf5ee2bc0fc71f2ab00278f6c5195b43e4321b796711cfcba1e740ecc8f6d85b6cb6e866009d7ddc32c442 SHA512 76cf92824498cc0f73676ce4bf8e58156a0b2d5c686c6a483bbbdba95f879d651a2a3bb3b836e6409e0821aa165dc3c71827f47fd952407fb3e421a0c2c7ebf6
 DIST libebur128-1.2.3.tar.gz 22150 BLAKE2B dee5857aa6d7a2523a4635d9d69964f22c7bda32b4329822650ad738d88a789f13d9ab5b66058f75093cbecac6db31742f4d041a511605be1357b5c2b6988c00 SHA512 d3e335a547e7e2b276be4f28ab93b87f6af91e818ea1e6513bcabe1ea74c99a04af0b03b6a36a27a83fec065ac609db0c6f70b67275134d39151114d54a50e29
-EBUILD libebur128-1.0.2.ebuild 942 BLAKE2B a739b5059a00d0cb34acdb470332894ff87596df11b0963067fb5c6069548b96a0342c912bc4820ad4a255b794db10bd36e5431cf34b08cb17c9a3db8ada5eac SHA512 4e38695dc1b4b8cf086040859b6b41b5de35a329076571d1a9eda10d6d05fca74cb56c2b1d0d0389972217162612233c3b97573670a54068d2581c0b8212371f
-EBUILD libebur128-1.0.3.ebuild 1159 BLAKE2B a284d1752c4c0d780c24d8c4ef6a291f824c8617b222d72a6c3129faff1d303ad07d620dac04854a4aefabc3c8251fb54fa0bfcc5fa6ca17d29bfd4a36d0e584 SHA512 b7e0d59cb4098dc49eb8b6c72c8a8e8bd49a85e28fda52c5c5dc64bcf155e57eff822b20d9512a7a3463d7d2ec0e942a652637e7cdb4d63bd1cb98b66e4df5c0
-EBUILD libebur128-1.1.0.ebuild 1069 BLAKE2B 44f6662374f5799fe69bc3a301b78b78f30eb02746e08395a5a4f755a1cb460989120981824a3eb9a582488a88d972604648b7a0f8767262951c588a9a8dc491 SHA512 897b218e80356300bcf6494816db7dc487591a21ca35764b34ee7237377b4f9c37b4e3c2eef522ac4469061fc2429db07a016e30ca498b3ffe92763ee85cf5d0
-EBUILD libebur128-1.2.0-r1.ebuild 953 BLAKE2B b25cb6ba208c8db3e762982e16b661e1d4ed82299065be01a59a82dfc1d149b64275290ee630b4cac80ff46173511f3c9cacea8d3f0c1cc8a92d602e16bb6d40 SHA512 a7b1ae3173dd6ce3ced5f947750b4fe223f4d468746f77df471a20753439534269ec3b8b6fc9288cffb80f60d15e84debe165a9a3f8fb7d631d3ce4e7e73889b
-EBUILD libebur128-1.2.2.ebuild 1049 BLAKE2B 077efae20cf8edcf0c1eb90ee5b3ffad097bcc3f8e7b137c52482bbec2c766ec897f2271d6f1e528ef1036368ab3383e02ed3d4ac0a35ec1c8c67ebe1457cb08 SHA512 33bb394ebf1aefd5447a38b88d9b72892ec2e8580de5691bc2f96e4c1673a01373d450587917c45d5d77b76aae9ef4137e037add82e380b57c94fb7c0d84c141
 EBUILD libebur128-1.2.3.ebuild 966 BLAKE2B 882581c9744364f4fdd8c4f6ad92f73738ca6cfc965b3d8ac4e7e8f7a6667cadf6e7305a0ce6f1192b2433e1fbc3ecf3464468edb211b1f3338ce6e5496508eb SHA512 f82bb5049af5e486337bd2c36456cd05135d69ac804c521d146026b29779d0a21653aa9dfc7e8538bec8c757af99e396f90fec49c309443028a325a5fef056ae
 MISC metadata.xml 752 BLAKE2B fd4288cd3e104741b109ce1bfaa4562ec9258940a3b43d58d6a6427a6ded2a762c56907012811e2fd9de363ba87f3978aed62c0b1c9c79e1f9eac4134d1c6552 SHA512 d0117447e87d367f45438b1b2ebd3f238b8ddf97491d8d742bb0f6609e6da4cb155249f86f95a330545c89b6433badd93ff2d26b55a3417990d63612e26b6218
diff --git a/media-libs/libebur128/files/libebur128-1.0.3_fix-tests.patch b/media-libs/libebur128/files/libebur128-1.0.3_fix-tests.patch
deleted file mode 100644
index 34a49cbea35e..000000000000
--- a/media-libs/libebur128/files/libebur128-1.0.3_fix-tests.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From d5a443afaf8bb16188d4069891c63ceab67bdb80 Mon Sep 17 00:00:00 2001
-From: Diogo Pereira <sir.suriv@gmail.com>
-Date: Mon, 7 Sep 2015 18:46:20 +0100
-Subject: [PATCH] Fix tests build
-
----
- test/CMakeLists.txt | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
-index 28716f0..9bc67d4 100644
---- a/test/CMakeLists.txt
-+++ b/test/CMakeLists.txt
-@@ -3,7 +3,8 @@ cmake_minimum_required(VERSION 2.8.9)
- set(ENABLE_TESTS OFF CACHE BOOL "Build test binaries, needs libsndfile")
- 
- if(ENABLE_TESTS)
--  find_pkg_config(SNDFILE sndfile REQUIRED)
-+  find_package(PkgConfig REQUIRED)
-+  pkg_check_modules(SNDFILE REQUIRED sndfile)
- 
-   include_directories(${EBUR128_INCLUDE_DIR})
-   include_directories(SYSTEM ${SNDFILE_INCLUDE_DIRS})
diff --git a/media-libs/libebur128/files/libebur128-1.2.2-cmake.patch b/media-libs/libebur128/files/libebur128-1.2.2-cmake.patch
deleted file mode 100644
index 9563ed15319f..000000000000
--- a/media-libs/libebur128/files/libebur128-1.2.2-cmake.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From d374f1983966fc3ff65bcd73e5f12d358c4f1273 Mon Sep 17 00:00:00 2001
-From: "Yann E. MORIN" <yann.morin.1998@free.fr>
-Date: Sat, 4 Mar 2017 14:33:07 +0100
-Subject: [PATCH] CMakeList: do not overwrite module path
-
-Currently, the CMakeList.txt completely overwrites the CMAKE_MODULE_PATH
-variable.
-
-This is problematic when an upper-layer buildsystem wants to set its own
-module path to use custom modules.
-
-For example, Buildroot [0] provides a custom platform description [1] to
-fix cross-compilation issue. Overwriting the module path means that this
-custom platform description is not found:
-
-    System is unknown to cmake, create:
-    Platform/Buildroot to use this system, please send your config file
-    to cmake@www.cmake.org so it can be added to cmake
-
-Providing such a custom platform description is what the upstream cmake
-devs suggest [2], quoting:
-
-    If a toolchain file specifies CMAKE_SYSTEM_NAME such that a custom
-    `Platform/MySystem.cmake` file is loaded then the latter can set
-    them [*] as needed for the target platform.
-
-[*] offending settings causing RPATH issues during cross-compilation.
-
-So we need to append to the module path, rather than replace it blindly.
-
-[0] https://buildroot.org/
-[1] https://git.buildroot.org/buildroot/tree/support/misc/Buildroot.cmake
-[2] http://public.kitware.com/pipermail/cmake/2017-February/065063.html
-
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index eea18a6..ff352eb 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,7 +1,7 @@
- cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
- project(libebur128 C)
- 
--set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
-+list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
- set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR})
- set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR})
- 
diff --git a/media-libs/libebur128/files/libebur128-1.2.2-pkgconfig.patch b/media-libs/libebur128/files/libebur128-1.2.2-pkgconfig.patch
deleted file mode 100644
index 7382960711f1..000000000000
--- a/media-libs/libebur128/files/libebur128-1.2.2-pkgconfig.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 13d70019c6d0e94b1ab71d0d2cf80023cc793071 Mon Sep 17 00:00:00 2001
-From: Sebastian Ramacher <sramacher@debian.org>
-Date: Sat, 18 Feb 2017 01:13:03 +0100
-Subject: [PATCH] Add a pkg-config file (fixes #61)
-
-Signed-off-by: Sebastian Ramacher <sramacher@debian.org>
----
- ebur128/CMakeLists.txt      |  6 ++++++
- ebur128/libebur128.pc.cmake | 11 +++++++++++
- 2 files changed, 17 insertions(+)
- create mode 100644 ebur128/libebur128.pc.cmake
-
-diff --git a/ebur128/CMakeLists.txt b/ebur128/CMakeLists.txt
-index af09ebb..f9a8017 100644
---- a/ebur128/CMakeLists.txt
-+++ b/ebur128/CMakeLists.txt
-@@ -59,3 +59,9 @@ if(BUILD_STATIC_LIBS)
- else()
-   install(TARGETS ebur128 DESTINATION ${CMAKE_INSTALL_LIBDIR})
- endif()
-+
-+#### pkg-config
-+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libebur128.pc.cmake
-+               ${CMAKE_CURRENT_BINARY_DIR}/libebur128.pc @ONLY)
-+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libebur128.pc"
-+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
-diff --git a/ebur128/libebur128.pc.cmake b/ebur128/libebur128.pc.cmake
-new file mode 100644
-index 0000000..017fdeb
---- /dev/null
-+++ b/ebur128/libebur128.pc.cmake
-@@ -0,0 +1,11 @@
-+prefix=@CMAKE_INSTALL_PREFIX@
-+includedir=${prefix}/include
-+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
-+
-+Name: libebur128
-+Description: EBU R 128 standard for loudness normalisation
-+Version: @EBUR128_VERSION@
-+URL: https://github.com/jiixyj/libebur128
-+Libs: -L${libdir} -lebur128
-+Libs.private: -lm
-+Cflags: -I${includedir}
diff --git a/media-libs/libebur128/libebur128-1.0.2.ebuild b/media-libs/libebur128/libebur128-1.0.2.ebuild
deleted file mode 100644
index 2994e6026ef5..000000000000
--- a/media-libs/libebur128/libebur128-1.0.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="A library implementing the EBU R128 loudness standard."
-HOMEPAGE="https://github.com/jiixyj/libebur128"
-SRC_URI="https://github.com/jiixyj/libebur128/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	test? ( https://tech.ebu.ch/files/live/sites/tech/files/shared/testmaterial/ebu-loudness-test-setv03.zip )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+speex test"
-
-RDEPEND="speex? ( media-libs/speex )"
-DEPEND="${RDEPEND}
-	test? ( media-libs/libsndfile
-		app-arch/unzip )"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_disable speex SPEEXDSP)
-		$(cmake-utils_use_enable test TESTS)
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cd "${WORKDIR}"
-	"${P}_build"/r128-test-library | tee test-results
-	grep -c "^FAILED" test-results > /dev/null \
-		&& die "At least one test failed"
-}
diff --git a/media-libs/libebur128/libebur128-1.0.3.ebuild b/media-libs/libebur128/libebur128-1.0.3.ebuild
deleted file mode 100644
index 4f58da06c7f5..000000000000
--- a/media-libs/libebur128/libebur128-1.0.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-multilib
-
-DESCRIPTION="A library implementing the EBU R128 loudness standard"
-HOMEPAGE="https://github.com/jiixyj/libebur128"
-SRC_URI="https://github.com/jiixyj/libebur128/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	test? ( https://tech.ebu.ch/files/live/sites/tech/files/shared/testmaterial/ebu-loudness-test-setv03.zip )"
-
-LICENSE="MIT"
-SLOT="0/1"
-KEYWORDS="~amd64 ~x86"
-IUSE="+speex static-libs test"
-
-RDEPEND="speex? ( media-libs/speex[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	test? ( media-libs/libsndfile[${MULTILIB_USEDEP}]
-		app-arch/unzip )"
-
-# Fix tests build. Merged upstream (#39).
-PATCHES=( "${FILESDIR}/${P}_fix-tests.patch" )
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_disable speex SPEEXDSP)
-		$(cmake-utils_use_build static-libs STATIC_LIBS)
-		$(cmake-utils_use_enable test TESTS)
-	)
-	cmake-utils_src_configure
-}
-
-multilib_src_test() {
-	cd "${WORKDIR}"
-	"${BUILD_DIR}"/r128-test-library | tee test-results
-	grep -c "^FAILED" test-results > /dev/null \
-		&& die "At least one test failed"
-}
diff --git a/media-libs/libebur128/libebur128-1.1.0.ebuild b/media-libs/libebur128/libebur128-1.1.0.ebuild
deleted file mode 100644
index f8a6bf6fa1eb..000000000000
--- a/media-libs/libebur128/libebur128-1.1.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-multilib
-
-DESCRIPTION="A library implementing the EBU R128 loudness standard"
-HOMEPAGE="https://github.com/jiixyj/libebur128"
-SRC_URI="https://github.com/jiixyj/libebur128/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	test? ( https://tech.ebu.ch/files/live/sites/tech/files/shared/testmaterial/ebu-loudness-test-setv03.zip )"
-
-LICENSE="MIT"
-SLOT="0/1"
-KEYWORDS="~amd64 ~x86"
-IUSE="+speex static-libs test"
-
-RDEPEND="speex? ( media-libs/speex[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	test? ( media-libs/libsndfile[${MULTILIB_USEDEP}]
-		app-arch/unzip )"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_disable speex SPEEXDSP)
-		$(cmake-utils_use_build static-libs STATIC_LIBS)
-		$(cmake-utils_use_enable test TESTS)
-	)
-	cmake-utils_src_configure
-}
-
-multilib_src_test() {
-	cd "${WORKDIR}"
-	"${BUILD_DIR}"/r128-test-library | tee test-results
-	grep -c "^FAILED" test-results > /dev/null \
-		&& die "At least one test failed"
-}
diff --git a/media-libs/libebur128/libebur128-1.2.0-r1.ebuild b/media-libs/libebur128/libebur128-1.2.0-r1.ebuild
deleted file mode 100644
index 8ddaa34fcd8d..000000000000
--- a/media-libs/libebur128/libebur128-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib
-
-DESCRIPTION="A library implementing the EBU R128 loudness standard"
-HOMEPAGE="https://github.com/jiixyj/libebur128"
-SRC_URI="https://github.com/jiixyj/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	test? ( https://tech.ebu.ch/files/live/sites/tech/files/shared/testmaterial/ebu-loudness-test-setv05.zip )"
-
-LICENSE="MIT"
-SLOT="0/1"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 x86"
-IUSE="static-libs test"
-
-DEPEND="test? ( app-arch/unzip
-		media-libs/libsndfile[${MULTILIB_USEDEP}] )"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_STATIC_LIBS=$(usex static-libs)
-		-DENABLE_TESTS=$(usex test)
-	)
-	cmake-utils_src_configure
-}
-
-multilib_src_test() {
-	cd "${WORKDIR}"
-	"${BUILD_DIR}"/r128-test-library | tee test-results
-	grep -c "^FAILED" test-results > /dev/null \
-		&& die "At least one test failed"
-}
diff --git a/media-libs/libebur128/libebur128-1.2.2.ebuild b/media-libs/libebur128/libebur128-1.2.2.ebuild
deleted file mode 100644
index 7ba0c94bd14e..000000000000
--- a/media-libs/libebur128/libebur128-1.2.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib
-
-DESCRIPTION="A library implementing the EBU R128 loudness standard"
-HOMEPAGE="https://github.com/jiixyj/libebur128"
-SRC_URI="https://github.com/jiixyj/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	test? ( https://tech.ebu.ch/files/live/sites/tech/files/shared/testmaterial/ebu-loudness-test-setv05.zip )"
-
-LICENSE="MIT"
-SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="static-libs test"
-
-DEPEND="test? ( app-arch/unzip
-		media-libs/libsndfile[${MULTILIB_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-pkgconfig.patch"
-	"${FILESDIR}/${P}-cmake.patch"
-)
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_STATIC_LIBS=$(usex static-libs)
-		-DENABLE_TESTS=$(usex test)
-	)
-	cmake-utils_src_configure
-}
-
-multilib_src_test() {
-	cd "${WORKDIR}"
-	"${BUILD_DIR}"/r128-test-library | tee test-results
-	grep -c "^FAILED" test-results > /dev/null \
-		&& die "At least one test failed"
-}
diff --git a/media-libs/libepoxy/Manifest b/media-libs/libepoxy/Manifest
index 110b03e74a8e..31681d0643d7 100644
--- a/media-libs/libepoxy/Manifest
+++ b/media-libs/libepoxy/Manifest
@@ -1,8 +1,10 @@
 DIST libepoxy-1.4.2.tar.gz 309973 BLAKE2B 029948aea64db917e782a57c901f537be796b269bcfdc9f4238db4fae41d3d11f68def2288d73a673b7e2a159e7ed2226761e4ebf603ec4f0fdcaf7f56eb02d1 SHA512 b94e1fe749c63a82f38369ff62b7d0d8cf1c55884159f030dc2919c17daf5811dd71cfd6a663edb38df66ff4ca53120a6a53501568cc8a582f08d4ae82fe9d89
 DIST libepoxy-1.4.3.tar.gz 310823 BLAKE2B 6eab12a0ecf68a1bda3484c7cd71c0b3d62391e2bee8efd3c0fe7970ee4c3672f2dd81547d3884b301165accf3a8ce91a7c2a2e9686b1ca43c7f37cd15c5c946 SHA512 41c7a4eea66c89346b0ec71407b2d22bf645ed0ef81ebad560370903f138ed48abb6bc6bcc88c75a3a05497acc6720397db828d61301599c05040263a9f4f7f0
 DIST libepoxy-1.5.1.tar.gz 324985 BLAKE2B 338b558ca3c174c04383dfc1bfe4f444965aef745b3043183d4024df62b37fdfc923c5c1d243a3061201a0f7b6946ce443d4ede3195b85d1022c187f46b08540 SHA512 f839f82e4ffabda42a2bb9c2822ba2e8da6583bdb481daa2e090e62b580fdfb0d11f96af790685769317ff2446d1d8d7cb6374b2049614ee938b84014b604bce
+DIST libepoxy-1.5.2.tar.gz 324905 BLAKE2B bbc1904b99e6674b03259bc2a5f4076f248d698e80a6f57013f5c19dcb5d6c22fe8b821eae3ff014f40c273a6f91ad3efc054ec48ddf5b8e8b5d8e12da3b60cc SHA512 3dfa10b356d6105fc8b1fda62dcf025b20a786b37f82c8275b3f12df8d3a62bbd4a9800abac396cfb48b789f72ff3c5f7a796eb83f046e978f9403a53e6ddf0d
 EBUILD libepoxy-1.4.2.ebuild 1055 BLAKE2B 585d84565beffa47a418913e8b9833c38676f551222dae02c1f0f4a20788a8a27727709ea9bd4df4fa27e136b2f5e3b1c8797abb4ffd761d9e48ec8eb39dd14f SHA512 80291d0d467d736c6e865ad9786ec876a64e6b05ecc22e5df13a7ac60ee48703a514d73bc42562eabf7d54364b8e6a00635904478e551ca4dd70a9694e4e9356
 EBUILD libepoxy-1.4.3.ebuild 1080 BLAKE2B 4546353e099a85502a82a35c551621e1092fa21228ea78c3f02ab8db8ed760472ec42ed08b1a86d29a8a0079912c8e12f8d784fb5bf1064bc78f6af573cba4e4 SHA512 706ca5de96e6833cd77237c95dd9d638e06dd1b266ce0522db3774f37edfd61293c2fbf7fc480ff02484f124042875dca28b630ca6b72806ab945aafb3e23cd8
 EBUILD libepoxy-1.5.1.ebuild 1203 BLAKE2B dccf195c51e8a940a4e8d662069d86aaf933dc04bea426bdad78a49745b282edd392f4373f31a1863ace42e824476b88ddd177bb1ac8bfc13a777124d7e81524 SHA512 6ff58a8592e299ab63c3128428b0b817a1aee5f09cb2b112a14fe4edf7e96f5f180928ecce1be1e6a3e2e8caa141db4ac3951ad4fb944c9dc7ff8398f436ded6
+EBUILD libepoxy-1.5.2.ebuild 1212 BLAKE2B 7cb9c61326e602863f9c8e014eb403c3d243a30420a45a1c252dc73f8c1ba49580ec80e6784f8a7432c7bbd8363232ec34f5ea0f3b0de1c7a2ef2ed364d379d7 SHA512 2a34ad6e5a4a70cc637480006e75298c1674aac76e80ae8056b48d75e5a69357c8a53828383e72a25abf59c1caaaeaa5490758887cf0cab1b73478a191b8388c
 EBUILD libepoxy-9999.ebuild 1224 BLAKE2B 47604c61c6f4e9baa84e4eb5e87eea12141cb0c5fe139dba409a091306825bb32162e178c4a8ac22b06aadff6534ab0801ee1f7f8bcc9c6822515182a287337e SHA512 dd72815b8bf3d0aecc7c66ec49596dbf9bdf3aa855c6d7c469903829801b92e5ac4f8786fb12bb4e716908c3e53eac584bce7413a68227f7804127740e321f70
 MISC metadata.xml 314 BLAKE2B ff8d671379855f61b90688f26772026f83f00d3e303bcf1fc7e851c9a2e6f410beb7c9dbd115f57d8613df8ffc043b2994cbc1a134eefd160888a0ac21cac154 SHA512 5d63de65f850f14f37ed4998a3d7f7686dcd999fd6f13be9c528be6423940684e709d08042ba5cbeccad2a38f3752df2580913cdbdfbc569f576cc958cf3bc73
diff --git a/media-libs/libepoxy/libepoxy-1.5.2.ebuild b/media-libs/libepoxy/libepoxy-1.5.2.ebuild
new file mode 100644
index 000000000000..21db4db9f63b
--- /dev/null
+++ b/media-libs/libepoxy/libepoxy-1.5.2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="https://github.com/anholt/${PN}.git"
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-r3"
+fi
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE='xml(+)'
+inherit ${GIT_ECLASS} meson multilib-minimal python-any-r1
+
+DESCRIPTION="Epoxy is a library for handling OpenGL function pointer management for you"
+HOMEPAGE="https://github.com/anholt/libepoxy"
+if [[ ${PV} = 9999* ]]; then
+	SRC_URI=""
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+	SRC_URI="https://github.com/anholt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test +X"
+
+DEPEND="${PYTHON_DEPS}
+	media-libs/mesa[egl,${MULTILIB_USEDEP}]
+	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
+	>=dev-util/meson-0.44.0"
+RDEPEND=""
+
+src_unpack() {
+	default
+	[[ $PV = 9999* ]] && git-r3_src_unpack
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Degl=yes
+		-Dglx=$(usex X)
+		-Dx11=$(usex X true false)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	meson_src_test
+}
+
+multilib_src_install() {
+	meson_src_install
+}
diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index 959839425683..13a78082fc12 100644
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -8,5 +8,5 @@ DIST libpng-1.6.34.tar.xz 997968 BLAKE2B 4cd0c46d11097cdeb0e419f1363cb9632ceaf56
 EBUILD libpng-1.2.57.ebuild 876 BLAKE2B f0cb7b05dc3482ce809203e21cb68b6e85aaf6ca8aff492fd9d30349a0c11f927e263a2edbfad9ac615acc174338a128b3d01fcad5465b6e319ffb34b9751ad8 SHA512 3619d150972189cb9d9a3f7d72f7df74f5377f52405006b99dfa6cef66291c1eae2bb4e157180d1eaa8b2a217e6d321a5bc3f6e368f5c8efa2eade305f14a370
 EBUILD libpng-1.5.28.ebuild 1651 BLAKE2B b651d04efd3f74d50225ebe18bd06aec7e38f933e44a4913ff973a17ee4799151171dfc78ccea2921be8e9b364c68f09f2d0bbd1e3ebb377f23667438b9a9a60 SHA512 94a6c624ce02d7b03071653184ac91acf949244c1c0c1d2cc51483e3ca8bda9860e6ba76e2a77513dcf4a08d717888bebb91c1b464c5c201d3766499cd01fd9d
 EBUILD libpng-1.6.29.ebuild 1333 BLAKE2B afb45e4346f2dc5c307c3d5a1c03a8ce9202b1182475fbf2153c7c0ac8b4398227e68e9d65b5d26ad4415a0472373fdd70ac89b6f06c599b245514d4a753a481 SHA512 0fd0d8cf9b06a6fdf8276bd7f1d7656d7211b01e42180aa8d69ae79f227f669d04460e6749e04a4ab03fabf55de8449faac6db5994aaa49c56049e8351941093
-EBUILD libpng-1.6.34.ebuild 1373 BLAKE2B 1f52726989eb4b211fbdefb8adbf76d67cebeffdbec1061ae160bd0586ebe76d17ac50fe969f63f5ec06622cb78e8cb7ff0f22544fd1db8bc5faca3947d477f1 SHA512 f4a340f6b8fc256ebeb70db6101c4073a14a23b2efc17de5391d8f32b3f09d8102b2c985b47192c0e2598b20766cdd3c1ff03144dfec4cf8d280aa4a6dbe58fb
+EBUILD libpng-1.6.34.ebuild 1372 BLAKE2B eb8dd1b99ce17f4012954030c0f0a4b03a34192959662b5f44f437193d58add6489c9764245b64d8c9c70004d1b24023e32bd5e3deed58acf73ad12fbb2d05d5 SHA512 5f2d0bc6174bdb8f0737e6e3596b0d247b5bfa22f5ec304d690c7b8f9702f6a93ef54ed8dd90c80b2b57d285c1bf1936c4872568e32270b2c11475eebd5452b9
 MISC metadata.xml 843 BLAKE2B e8736137db2c0e06193b3bbc9d933b1b8e2b8609d050a93a5369a8de81acf02af1d7ff6eb3c1e1967d7dbd6fec38373e389011d290cda1577203075f2f679167 SHA512 43cd4bd8981c828f2de943bb5ee90958f6a4f555d824be1325a7663219b0386ebaeb99406697affa8086b5b50f3d185e01ed12ace030557aa66a8e7b9af006b3
diff --git a/media-libs/libpng/libpng-1.6.34.ebuild b/media-libs/libpng/libpng-1.6.34.ebuild
index 24ae7d056d11..f8f1a98b2e7b 100644
--- a/media-libs/libpng/libpng-1.6.34.ebuild
+++ b/media-libs/libpng/libpng-1.6.34.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
 
 LICENSE="libpng"
 SLOT="0/16"
-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 ~x86-winnt"
+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 ~x86-winnt"
 IUSE="apng cpu_flags_x86_sse neon static-libs"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]"
diff --git a/media-libs/libraw/Manifest b/media-libs/libraw/Manifest
index 54a2dcfcd4ec..d2cd00a457a8 100644
--- a/media-libs/libraw/Manifest
+++ b/media-libs/libraw/Manifest
@@ -1,4 +1,5 @@
 AUX libraw-0.18.4-glibc-2.27.patch 531 BLAKE2B dccb6c080bcb0ebaf0db9e406ebcc46b1aeae2608a4a006284265413b4b9a3f4b0d2dda7e42bab539dbe4e74ad6603350cac03fac37ec5e2a87ff639bf9dc704 SHA512 26c4e0f86149dba7da89f185bf98821fe20d0770718102228e351772ad0959c9140ba230f0e75892e612e40e9bd573389ee46c9b549a5414f0ba6da5c9b6e16f
+DIST LibRaw-0.18.11.tar.gz 1283643 BLAKE2B cd217a0c40d0f30ff95968c5238ad349d32f6ae44aca3847b32c236e8e82e7ff25ba5d6bb0cffe8d73b288239830982d074a306b682160bfe8c73b0df9fcff09 SHA512 4d114bdb589c96d95f646b1d016cfb9546ea7a53b9f23af1dc5d0e38cb4d1b2aa7270f2d4dbe7c6c323fb7f21403914a0bb75afa7b6204d0a99c72ecf0c812c9
 DIST LibRaw-0.18.4.tar.gz 1281104 BLAKE2B dc6c2b594f0897eea509d3122bd7f41bccd89182a5e294b331544ad626631f18637660e1de7ea1c8b5e1c0b59678189d06f9fd12e27016e2ea3ec736cabfbbe4 SHA512 e71db23a70f0cda745ae862f4cb6a0c51c968e4c7399f28e86de8beb894526fa76cd337c1406e2eaee3f287f15e8912d1a0f7217493c6444a491ca3329f63776
 DIST LibRaw-0.18.8.tar.gz 1281773 BLAKE2B 755d17ee4c08e26b04d20cc6284f43e1a87d2bc1b41499d175c6ebfc39684732a4407b990115818553c7b815c66bb04ad451d478ed2c084c443871de8ea221e4 SHA512 48871a5e43c89a17962fae426a962d11a6ce40cb8e7d8abc90e98c899dc42b7e1711398c075901ddbc710fe7e916ba6d507bee7e18975779caa8f5d512b1d580
 DIST LibRaw-0.18.9.tar.gz 1282015 BLAKE2B d94681633e3b187102462be5b849cb4cb3468a74d5c4288e23a07ccf0b66246305f9e75e1d6408e259b3c7777ef77501954d208669c9ddc56b943f13f95c867e SHA512 5becbbf05db091d86f7a3a098402c5a981a5c614e9ac742e80823efec5dccfb3a1336cfd1493aa88c8d1a37fe05896efd3f8f145536d799a9ce19665073cf8ce
@@ -6,6 +7,7 @@ DIST LibRaw-demosaic-pack-GPL2-0.18.4.tar.gz 33129 BLAKE2B 724501ae52bf83006dd1e
 DIST LibRaw-demosaic-pack-GPL2-0.18.8.tar.gz 30868 BLAKE2B 30cef85c49e066fa4b1d86ee4d7bfd7bff07897f91edd57aa52428f7ecf2d6e930703e496d4e55e034c6da2f68735f8b20f493a1d7a00d51b0430a4b98e6ee45 SHA512 c34419cec055ea976a348c342f5ec2141e2686b5eb50dd23d7b9fd707eefd86779d331f06b4570dedb1682c33fcd6ac0446b3167ca1f3e3fd2566a0c66c6fd3d
 DIST LibRaw-demosaic-pack-GPL3-0.18.4.tar.gz 38622 BLAKE2B 268085234335619487f52bf22739c28f077c24d02990e7a56a0a3e5b9a654227762adb366b0be5b3b0a9a1fe2553a798b4d5b120699c93cae16415f4aaf4ea4a SHA512 158d951d0e1c35f1ebdde8849f0b51e23332c8b5b13a4b0ab0677a3d4a1682afd6e7c5dec4194072b4588699bf49a023591fa1b05d2a8f4c54cd1a44e65e3ad9
 DIST LibRaw-demosaic-pack-GPL3-0.18.8.tar.gz 39002 BLAKE2B 544a1eab61c825c7f2202107d623a56e1f81ad3e5111b419bf12708e2d8a9903f192c23904ab8fb274636d9262d3d89f02fa5e05a0e70d7834782c2df8ec0548 SHA512 10e8cb6694159d04deb813a88e5c3195eed6e2e438f41533db91b17997af1b9d54f286303447ca6e3d1b377922e388f6fcc8a8370254011e11b85612c914d500
+EBUILD libraw-0.18.11.ebuild 1848 BLAKE2B e17828060310981447af3318510c713f1c5ee65246a22e2cc337da360b0bf96799503d5376e9baf6f42ed98e58b69d637031e36cdd5dfe9a5a974f57d0cec9d4 SHA512 a1e47c7c6dd414a5e23c5a4e02fca6e4efb88894e22fc05cc0d1fb67f15a02009ee473c1ac40a24b9ee540c458396275d63214d6ed6c28992afa839684afaefa
 EBUILD libraw-0.18.4.ebuild 1774 BLAKE2B b34582c011016beb415bf262bb8a5db89e9a6a2e641b0cb3bc26b93d86fd4b95616255a42fe5a6e50a76a0974875ebe151f9684b674435966265a16e97845442 SHA512 a0277cda774fc2ec3f318544655dbb3a39266828bf9bdac80a839577f4fb5a2028b34548c7aeea33a61560753ff4631ccfb0ae3fa558440cc507e23c9bc246db
 EBUILD libraw-0.18.8.ebuild 1723 BLAKE2B f48d3b7e4d07c1d48064a8dc16d5af25f532bde1501cc1a6714f5412c42b824b6e9c1ae936a2d548746871925df553f3f7f722aa450930f70006ffdd2e4026e8 SHA512 679c029b6628eaa141085c1a4788ddc17b927eda419a6ebdd6d398341293aec4703e00e0aef81ef7c5ee9794ccd8eb45cfcea682bee006b75621325cbf0692ed
 EBUILD libraw-0.18.9.ebuild 1815 BLAKE2B a17813cba8285e7dddbb7c13db642faed63dc11d4b32b69a8d9ca7cb46bcc8c55a3c0a415afbf243e9fa487f05a6f933feddd48a35ac9ec919379401896a8508 SHA512 55ca2174034614f008fd9c2daa96ff5dcfb612353c5d3b1ccebd28b71b91c5b40bcb130efc98b263f17eab46d13019d06dcd41d37bb5ddf22d257d830ec8dd01
diff --git a/media-libs/libraw/libraw-0.18.11.ebuild b/media-libs/libraw/libraw-0.18.11.ebuild
new file mode 100644
index 000000000000..ffecd964bdf8
--- /dev/null
+++ b/media-libs/libraw/libraw-0.18.11.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib-minimal toolchain-funcs
+
+MY_PN=LibRaw
+MY_PV="${PV/_b/-B}"
+MY_P="${MY_PN}-${MY_PV}"
+# demosaic package sometimes doesn't get bumped.
+# Otherwise you can set it to ${PV}.
+DEMOSAIC_PV="0.18.8"
+
+DESCRIPTION="LibRaw is a library for reading RAW files obtained from digital photo cameras"
+HOMEPAGE="https://www.libraw.org/ https://github.com/LibRaw/LibRaw"
+SRC_URI="https://www.libraw.org/data/${MY_P}.tar.gz
+	demosaic? (
+		https://www.libraw.org/data/LibRaw-demosaic-pack-GPL2-${DEMOSAIC_PV}.tar.gz
+		https://www.libraw.org/data/LibRaw-demosaic-pack-GPL3-${DEMOSAIC_PV}.tar.gz
+	)"
+
+LICENSE="LGPL-2.1 CDDL demosaic? ( GPL-2 GPL-3 )"
+SLOT="0/16" # subslot = libraw soname version
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="demosaic examples jpeg jpeg2k +lcms openmp"
+
+RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
+	jpeg2k? ( >=media-libs/jasper-1.900.1-r6:=[${MULTILIB_USEDEP}] )
+	lcms? ( >=media-libs/lcms-2.5:2[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( Changelog.txt README )
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-static
+		$(use_enable demosaic demosaic-pack-gpl2)
+		$(use_enable demosaic demosaic-pack-gpl3)
+		$(use_enable examples)
+		$(use_enable jpeg)
+		$(use_enable jpeg2k jasper)
+		$(use_enable lcms)
+		$(use_enable openmp)
+	)
+	ECONF_SOURCE="${S}" \
+	econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# package installs .pc files
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/ming/Manifest b/media-libs/ming/Manifest
index 1e7c3e874bb9..64c235600574 100644
--- a/media-libs/ming/Manifest
+++ b/media-libs/ming/Manifest
@@ -1,5 +1,5 @@
 AUX ming-0.4.8-CVE-2017-8782.patch 772 BLAKE2B 4425c357155b1a57b6498ffcc31119408aae3ca0de8e31160a9d449599ce94139438e55638808bb667042f0c0e3dcf3f6b5de9959314f17bed3e3f11e090f871 SHA512 69a445d41856e4a567c253d5a0a1f63128ad8f71d8c418da855d62e2f1ff13e2a19a6887a22cfdaa8682811695b79b3bc736b569756f88e8472d294d89561005
-AUX ming-0.4.8-freetype_pkgconfig.patch 1605 BLAKE2B bf247ebadff2c223c00dbf8e8bce22de9d0fdaa651cc08dee5cc0cb01b8799ef3f713e1ce20bb613db5baa842c6c6deaf04af66df6809711c3e3df3cca9f74f8 SHA512 fc07a00f24c10875ae1e0e8be259673486602c7702c30c75a4f088283be0504e6e26831ba93c0d4a0d3606a908da5ff8ce0365ef3f587d37925540f9720c42d7
+AUX ming-0.4.8-freetype_pkgconfig.patch 2146 BLAKE2B df8c56a04cfe5d0a264402ce5636853ea53c4376999077405355ad112503e82d1b346d7219eafad3689e93a2ac66f89f9ca5f9ad03c564c76571a1919c00e9d2 SHA512 f40ccdc5b97b847ff4bffbdc6a691db8627bbf85f97089e55214f19b34f098ddf0b7eb1a65d1fdc220cb9fb90f89f7fdfa78e44b5d10de872706451be89647ed
 DIST ming-0_4_8.tar.gz 14908459 BLAKE2B df89beab98a7fbdcbefccad3a2fb013453405a7dba757131a61f06d9e40b7e1fe7beeadab42c113b12cff24b91cb1e76e9fabee0e1b4af58e2127eba13cc27bc SHA512 e395acde9119ad32f4cedd500bcceee70bdd563222a41dda899cc318d5e34eb580abc38ac39c6dec7821913a0a70d2f953fc81f52255b623e34f7c3aaafbc9c0
 EBUILD ming-0.4.8-r1.ebuild 2257 BLAKE2B c6134cd272270764346d8fe80ae1897ad9353a131ade67d820c4fa4f1a3dd525b4a12851c79a357daaa83c52a84b8fa82eace830836b9d10c061880708cdb90f SHA512 2c7a0af6e4792d9ffce756dac6416432543912fd86bb1c7552b3d67fedd7968a19c971a6db7ea24707d73e2970af43469678d76c0097c83e9c53c00ec1eff1aa
 MISC metadata.xml 388 BLAKE2B 7083db03bf7efad4015f4aa3838925123a71bae6d57ed318232622e96c8590ef1f770520da535c9efc94f33b416430dccecc9a81fa81df936d4e15933a1dd041 SHA512 0efbb0ad1eadfd764bdf6e182cf8865994ca8e96ccc6e14845829638730e1ce6ff7ac2777e9ad3d396e7e29d77e034b818c95259eb8aab53a23b3c0815f787d0
diff --git a/media-libs/ming/files/ming-0.4.8-freetype_pkgconfig.patch b/media-libs/ming/files/ming-0.4.8-freetype_pkgconfig.patch
index 5c2de7554d46..5bddf0521224 100644
--- a/media-libs/ming/files/ming-0.4.8-freetype_pkgconfig.patch
+++ b/media-libs/ming/files/ming-0.4.8-freetype_pkgconfig.patch
@@ -1,4 +1,4 @@
-From ef3719d39e8bb7e96c6ec57d60261f1516353460 Mon Sep 17 00:00:00 2001
+From 0d5b3bc1cc492c10072def017fe704782bc4b274 Mon Sep 17 00:00:00 2001
 From: Lars Wendler <polynomial-c@gentoo.org>
 Date: Fri, 4 May 2018 17:40:04 +0200
 Subject: [PATCH] Use pkg-config to find freetype
@@ -6,14 +6,14 @@ Subject: [PATCH] Use pkg-config to find freetype
 As of freetype-2.9.1 the freetype-config script has been deprecated and
 is no longer shipped by default.
 ---
- configure.in | 22 ++--------------------
- 1 file changed, 2 insertions(+), 20 deletions(-)
+ configure.in | 30 +++++++-----------------------
+ 1 file changed, 7 insertions(+), 23 deletions(-)
 
 diff --git a/configure.in b/configure.in
-index 95943a0b..f1685c26 100644
+index 361db86c..cb9423f5 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -257,26 +257,8 @@ freetype_support=yes)
+@@ -257,26 +257,10 @@ freetype_support=yes)
  
  if test "$freetype_support" = "yes"; then
  	dnl Check for the freetype library
@@ -38,10 +38,25 @@ index 95943a0b..f1685c26 100644
 -	AC_SUBST(FREETYPE_LIBS)
 -	AC_SUBST(FREETYPE_CFLAGS)
 +	PKG_PROG_PKG_CONFIG
-+	PKG_CHECK_MODULES(FREETYPE, freetype2,, AC_MSG_ERROR([Could not find freetype]))
++	PKG_CHECK_MODULES(FREETYPE, freetype2, HAS_FREETYPE=true,
++		AC_MSG_ERROR([Could not find freetype])
++	)
  fi
  
  dnl Check for the ungif or gif (new or old) libraries
+@@ -334,9 +318,9 @@ if test -n "${ZLIB}" -a -n "${ZLIB_INC}"; then
+ 	AC_DEFINE([USE_ZLIB], [1], [Use zlib])
+ fi
+ 
+-AM_CONDITIONAL(USE_FREETYPE, test x${ft_config} != x)
+-if test -n "${ft_config}"; then
+-	AC_DEFINE(USE_FREETYPE, [1], [Use freetype library])
++AM_CONDITIONAL(USE_FREETYPE, test x${HAS_FREETYPE} != x)
++if test x${HAS_FREETYPE} = xtrue ; then
++       AC_DEFINE(USE_FREETYPE, [1], [Use freetype library])
+ fi
+ 
+ AM_CONDITIONAL(GIFLIB_GIFERRORSTRING, test x"$ac_cv_lib_gif_GifErrorString" = xyes)
 -- 
 2.17.0
 
diff --git a/media-libs/opencolorio/Manifest b/media-libs/opencolorio/Manifest
index b195f28c83ee..5fa3e59a0695 100644
--- a/media-libs/opencolorio/Manifest
+++ b/media-libs/opencolorio/Manifest
@@ -8,5 +8,5 @@ DIST opencolorio-1.0.9-yaml-0.5-compat-v2.patch.bz2 15418 BLAKE2B 6eaabec7780cb4
 DIST opencolorio-1.0.9.tar.gz 12473406 BLAKE2B 54c867521b66d7479c175f65046ffd50ce41fb665c640cf5097b7178cc11dbf17cd324e7d861e4a56c990a109d7f80041d5e83a2438bbfb550e2d8affab7c2da SHA512 f5310cd6d3048d5f307adb41ac1ac807f087a6344c96324cb0f13d0eae1fa3fe5f8005f17adf77664044daf762902223b650b5d8c1636c7801183cd3b4e03ac8
 DIST opencolorio-1.1.0.tar.gz 13826812 BLAKE2B 555a5ac393170503c944c3471ea482b1a22be7c98ee7b81af37f52db185c8b61c5318102c139a8711f4828d306b6c4322f5d839c4df08ce41ebbb9dcb2bda152 SHA512 909874a9f91a8d229622810fc70233680c6e75203bd8555179322de2873da00bf302432e19f189b787ffcda3157ddec1e4601c97f75a36e16f644fe7d42f6998
 EBUILD opencolorio-1.0.9-r2.ebuild 2375 BLAKE2B 6e50184ecd9df51cec933a55fbdb9365c82661b7e9d66d804bebdc329433c996d616898334bd3f1856b381371083584488faa46476962fe3c306db324d891575 SHA512 0e3d7dc603f5811e547ba6de400ae05c519e87ba6135bcda8d7fdbc1d5d87526c0fd8a2f8dd26062b39826bacdc6590fda538036d3cd7d09a0b86e70ccb202c1
-EBUILD opencolorio-1.1.0-r1.ebuild 2352 BLAKE2B 48a06072eb619bba42e6c510ab37064109c4b16edb5d09ae4c5c934b1d01f25b8d6310ce0ea49179401eb71ed12c507560b7e26b009f1dc52a20a6e331d5298f SHA512 b87dc3c20d5e86f74d64f6369b7083cdab1c47bb1b29e84c785a26c94dc75b8b73ada08b0c9c9d702024aed5c2dfbfba8ee45163748ea453cace5d40ef4a41d7
+EBUILD opencolorio-1.1.0-r1.ebuild 2351 BLAKE2B 9818f4e13c1ff8f1b5df8eea1e1ba290cbb8383a503d8b9d251f869613b856d1c13a504499c25d8d5c831b78fe67ceb5d0c7a0af45eacf682a44f64ab1c8ffda SHA512 ec1b4d164872dab45dbd7b89c6cea5394f943f31a1afc407cd00d88abaa270cc7986c2dc8816ae17ceb592ba56f8bec9e9cfa2e734471f827c340889da3fd049
 MISC metadata.xml 686 BLAKE2B d2e3b9c9bc524854acf2fdd3d67d596606434bee2bbe5ceef3c2f45823e2948be0c0dc3bbcce82f90d2fb77e1fb5ae74b4e82ec737051f31c2726f82aecf05ee SHA512 68ba2a2e1063a0f8c3e345aa908f4327f38b876581f0cf3cce0e2075a06919c60ca77b40545fcbc923a61700d00e46bb0ff2ce5d44ac5cbe40b1523491e34822
diff --git a/media-libs/opencolorio/opencolorio-1.1.0-r1.ebuild b/media-libs/opencolorio/opencolorio-1.1.0-r1.ebuild
index 7ed8940ab029..8343ce9ccba4 100644
--- a/media-libs/opencolorio/opencolorio-1.1.0-r1.ebuild
+++ b/media-libs/opencolorio/opencolorio-1.1.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/imageworks/OpenColorIO/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="cpu_flags_x86_sse2 doc opengl python static-libs test"
 REQUIRED_USE="
 	doc? ( python )
diff --git a/media-libs/phonon-gstreamer/Manifest b/media-libs/phonon-gstreamer/Manifest
index 7d58627923fb..a6deacb7c949 100644
--- a/media-libs/phonon-gstreamer/Manifest
+++ b/media-libs/phonon-gstreamer/Manifest
@@ -1,6 +1,6 @@
 AUX phonon-gstreamer-4.9.0-qt-5.11.patch 2144 BLAKE2B a11065fab61037e11f54ab2b3a41f55231ac2175372077b302b033bbf7483030e763e50e8dce00886394ce94feb205b75d3bf5f4ea4b0c11f3e0c0fba42f14f3 SHA512 b13fe80bf493d33ef942babf084f823e9d6314f489496007dd43e9c0efba4c8e354067cba5ccae53806156d631a8bbf115b84e654052086aeb1d5d32f15b6f08
 DIST phonon-backend-gstreamer-4.9.0.tar.xz 75960 BLAKE2B 676810dc99f3734a6932bfe355a37df1334c3460eba9a6d96e039442ce2729b61db61798c1f7207aef68a30f79355703c80e6aeb1a2ca7156f22e9fd7e07027b SHA512 9c13d37c6c7070c2bd8fcc562f743ac2f55289bc7cc82147ef0ae990e5d380d541cc1d9ce61e6ad1549ed1935d41faafaeeb0cd5463e4c656ea8fee636ff4dfe
 EBUILD phonon-gstreamer-4.9.0-r1.ebuild 1978 BLAKE2B ab48d3cd7486242e6eaedf43434f32d6f857a5ac3f6bf80b63bb41f28acf6b9dc52d900a0e6de6667f88dffd2aa174c59586f4d5837358b42c71267c8e88315d SHA512 062854f40de54080251b0490a359b9579941b8f3fd6300ecb505c500e1f373d8ec818fa477d18306463144211e5e1c80b49c896713b50fab201ace9f53aadf30
-EBUILD phonon-gstreamer-4.9.0-r2.ebuild 1114 BLAKE2B 614c5ee2f4714ae5b26a5e54aa68460b19773208bb79d300db433d71e390d1742af9db72f681cec28775abb6c3971c37c52981fa55e4ec2504d3a61b57c8456e SHA512 f41fee2b740703e9f17a4a622cfcf60838c699d44fc849328106905a3fee992ccd44bd2d339e802a78eadd42de3f7655e9ed960efed9d470d9cce82538a1784a
+EBUILD phonon-gstreamer-4.9.0-r2.ebuild 1113 BLAKE2B 0d4e098bc9b6c6905471b840f4021ea6450707dbb931295697562e146147da221f6ff949ea4e9be95d4046ee5d1339fadab68cacbcda83ca27c2a3a2855c1dbb SHA512 a6cb5624ce4eb471bbba9ab0ce71a91b8a0310229d6a2d8a43b3aa5eeed163871c09a10ea7360e6cecdeebca33c4d1138f51a3e5c8b12e9c6b435fbbd219e75e
 EBUILD phonon-gstreamer-9999.ebuild 1056 BLAKE2B aa1afd5ade889a59c5ec4218fe9cba15f50d863483e5b379077c5a832e35a9c57eecf9eddb307e04ccc5bf6882ef72f845749b54407fa57cdfb79bb230882e71 SHA512 17a27ab64a08f7be157a59106e3f8871b631533164d517130c37448fa6d2d26eb2ceb2056cd31c35cc4af15bbe821d0c2792e89ffe86a3d832aa4b10862d9efc
 MISC metadata.xml 339 BLAKE2B 2e6fd710b9791c7dd1f8836dac9209a84608dcb54d5ebef458acef6651c03eb55d8733d23df0a6cd0dbe470f00d43e0413b3d18b432f8a38a765af458e5662fc SHA512 c481721ab8e7762b2b951501cc99f7e2d2263ffd682dce3731fb415b677b74f7fbfe7770e9d2b1b1ce496c10254b84bb7489ff971593dac90c151a9ff1623e9a
diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r2.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r2.ebuild
index 67c68221168a..0a4c3229123a 100644
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r2.ebuild
+++ b/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r2.ebuild
@@ -8,7 +8,7 @@ MY_P=${MY_PN}-${PV}
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd"
 else
 	EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
 	inherit git-r3
diff --git a/media-libs/phonon-vlc/Manifest b/media-libs/phonon-vlc/Manifest
index cff8a88e261d..82f4e5f5a969 100644
--- a/media-libs/phonon-vlc/Manifest
+++ b/media-libs/phonon-vlc/Manifest
@@ -1,7 +1,7 @@
 AUX phonon-vlc-0.10.1-qt-5.11.patch 998 BLAKE2B e182ed8a038577c48c8798e6769b992a3099930a8332c0cdf146af699f7ca5020df3e9d2f072cf83f43e5570307f90558b2facdf526d216c423a705fa6121d4b SHA512 2bc6f4e08693ff8d02eab9a1aad9ef1f425ced736b7cb11ebfadbe33c111ec053dc60bd48220130f4a80cc117a08fb53e3fd5789554bd0e57f81a61203d2ba9c
 DIST phonon-backend-vlc-0.10.1.tar.xz 61096 BLAKE2B 5124d43a68af5a1ecac46c591e8b727868096e07156e6bc277c94199b6138433c826febf46cf5ffc7776c936fa6373d5ac2114c7a730a6b89380014c44e581fe SHA512 fa94298a8236c29f792285d3f288140d244e0eacba02511a32ee56b5bace50f92a93a714b5c44dc5bafb15b2a9d5ae792231e78dce8ca1a45ab3a328492911df
 DIST phonon-backend-vlc-0.9.1.tar.xz 59972 BLAKE2B 79c3b0d2cb21a04446cfe0a5b4bfed20f4c63cf6eb00037b0f0d8a67ff74fc9eab484d9a108a8d6694bb1ed97ac5618ad1813f7bbcd981bca9678b862bdc9eeb SHA512 104a29159541002d4064486b54d02183c32cf87931c205badf44333d9481b0c0e70e6eae7f9d3c558bef977de37f76cc203dc5c15120f4146d64d451992947aa
-EBUILD phonon-vlc-0.10.1.ebuild 843 BLAKE2B 2947e43fd6c016fd6d045b19e3ef2f89101bb633b5a6a11d8a57698f2ea8de67175d2922ea89c1ea71a524193016007101dcbb45a2543610767e1f424a27880a SHA512 8e23c6e1bae32abb1268905a5f77ba6a19c15b653dfd4e6b766ac4e36de1ef3da7b1acc75350295893f73272aeae8bad11e6d484dbbd455f0f1e3acfb23aa8f2
+EBUILD phonon-vlc-0.10.1.ebuild 842 BLAKE2B da1c0d9c658ecc81d57d0d2c2e58ff1f338ac7b2452d1098fa5b7f5b3bb467d29bd62fdbed3b0a1b5b110bb45f527b768546b68eb930268b62c2bb64378bb57a SHA512 ebf1f438459528f95066691ce3d394bff5561c4cc3e815e8669a841753f5821df51b385ab296da02cbd105a6624218a4f7afc0bbdf959092bddc1e0040cf5613
 EBUILD phonon-vlc-0.9.1-r1.ebuild 1664 BLAKE2B 59522c485d8aaf0d37fb0e6a69605fbfa889d101e6975c11a97d1f93b459b1ed0d4bb32e6048189b6f2a431d5105ea33b474eb373ca74af44326e91861b3f8df SHA512 653af9c113b9de6c41cbd070a1f044c621f6505c5502c9e830e2a314850022834407c9720eae4da86e5b6b1886d7c922ffc6a44bf50e64ee3054a0293b85105a
 EBUILD phonon-vlc-9999.ebuild 797 BLAKE2B 5dc25a00e545c408243ca77aacce55644aa42588fecc0000695a871311c102703294d98398c4c9eef4a7c0c0a13103961e945eaae9516956c6145615e7ebca3a SHA512 cfd63cb76e8dcb28646e25dc87ce814f1b2864bdf075e72478ef9729b9d20581dd79568b27eb73193c6b97e3b6c4c40e86bfbf2f75b330bb2291f6f19efcbd4e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-libs/phonon-vlc/phonon-vlc-0.10.1.ebuild b/media-libs/phonon-vlc/phonon-vlc-0.10.1.ebuild
index 9506df8aba4d..a54cb1d6d54a 100644
--- a/media-libs/phonon-vlc/phonon-vlc-0.10.1.ebuild
+++ b/media-libs/phonon-vlc/phonon-vlc-0.10.1.ebuild
@@ -7,7 +7,7 @@ MY_PN="phonon-backend-vlc"
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_PN}-${PV}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 else
 	EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
 	inherit git-r3
diff --git a/media-libs/phonon/Manifest b/media-libs/phonon/Manifest
index 287ab711607d..4ea922c8b5e2 100644
--- a/media-libs/phonon/Manifest
+++ b/media-libs/phonon/Manifest
@@ -1,7 +1,7 @@
 AUX phonon-4.7.0-plugin-install.patch 1252 BLAKE2B b9c0022007babf5f56d7f651e18bce5ef3c7b36a5bb6d2d042fd14639433faadd6a99f0f276751fc4849ab2845f265481d4c307a1d16af029f3c11c6b6104f7b SHA512 62b6cffa985057722c5d2dbe07bd1124f9fcb6e1b861fe76fafd46ec980702655d55b37a29006e79c8e28e5a4df82dafa1a308dca8a6abd3402889777a93d8f2
 DIST phonon-4.10.1.tar.xz 322100 BLAKE2B 0040bcc82e68a52cb8056c29b5008daddfd8b985f95113e17f1c18d1b5bf1f81222a34ae45b2ee5bd3bc0f104614551638642a85e1770fc218cbe7e2209b5a0e SHA512 a1cc0960c587d09a2fb0f43ae82147df133c34cba7bf01f5720b4b27aca4dda1d83444e89e40fb2f25828d152f89ccfff56d2d4649007c57b7df9eca8c64c007
 DIST phonon-4.9.1.tar.xz 321872 BLAKE2B a315189f578ad71e241ebfbea1bc6c81f06cf041b2eb2914d66f82f35c69c3811d16dbf4303551aafdd1a63d6ff6da619b06a6f03274a9867393f6d032348673 SHA512 a1741765071a625d9b9073d9ad1571b91cf5bfce2223bd1b034828d02dc52624587a6ec5352f3702df79f6e4201007596843fbcb9f15c9b489a858200787d728
-EBUILD phonon-4.10.1.ebuild 1318 BLAKE2B f81d0fa3e4d96d19c0ca73f69c70929d0f3f8ef5ed6d0056c5c77b7de3ba4770e8b0f5260ee761374b3bd92091af015364d8d3651c322603e580c4a309b58809 SHA512 ec473a05b87f24fa10b52097f4a3dec0d890ab368a92b4bbcf176a8b80242776a37bc999b23c6f16da123e76c9df1b8a61e21d90e579718ad48e550c8cf457f8
+EBUILD phonon-4.10.1.ebuild 1317 BLAKE2B 1d5701e4569f150b29715923c06cf46f6537fda0c9bb6137fa412fe508bc8963163aed83804053256880794d06ff810c4823697e63fb3fa75578ade31128f19e SHA512 c5fa302741ff834e8297a2f4e05667763c47c3427ee13cc70b372b18e2a1318242ccb662cc872169b647245704c9a993b59b3502f0b33df9383b8ce65e240b12
 EBUILD phonon-4.9.1-r1.ebuild 3088 BLAKE2B 0d162cfad037d952af2b935999fb0634073103e727a7426101cb2cffb03b8bed18461687ec767e81a6a1d9728ff6cbd02793e8d60940b0ea56b2b7deca17118b SHA512 22ab58d17069ebbe15f0f7bce13026c4fd0accd32db2fdd6d158da489ac0399407c840b01195b22b2e5fa454443b9f71ff94f4cc24f31f0ef55eb87563c1d7ec
 EBUILD phonon-9999.ebuild 1318 BLAKE2B f81d0fa3e4d96d19c0ca73f69c70929d0f3f8ef5ed6d0056c5c77b7de3ba4770e8b0f5260ee761374b3bd92091af015364d8d3651c322603e580c4a309b58809 SHA512 ec473a05b87f24fa10b52097f4a3dec0d890ab368a92b4bbcf176a8b80242776a37bc999b23c6f16da123e76c9df1b8a61e21d90e579718ad48e550c8cf457f8
 MISC metadata.xml 394 BLAKE2B e551fa12fcce92bd237d1cdb3fcbd496768e012004ace1e08a89f1e0e5f5c997d5b9d1488afce03925337d28a9c431994ce23244ffcb46f7138cde951dc26662 SHA512 963308198d2057bc2869eb21b644c59211f3c4bb04a46de3cca04dc85cdcf67b113555870149b971c8c43a0c64fb88cd141ccf20740f6428d1573485844574a6
diff --git a/media-libs/phonon/phonon-4.10.1.ebuild b/media-libs/phonon/phonon-4.10.1.ebuild
index 478b0d3bb95d..93ca3f635de1 100644
--- a/media-libs/phonon/phonon-4.10.1.ebuild
+++ b/media-libs/phonon/phonon-4.10.1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="mirror://kde/stable/phonon/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd"
 else
 	EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
 	inherit git-r3
diff --git a/media-libs/rubberband/Manifest b/media-libs/rubberband/Manifest
index 84dd722e2365..be3dce253787 100644
--- a/media-libs/rubberband/Manifest
+++ b/media-libs/rubberband/Manifest
@@ -1,3 +1,3 @@
 DIST rubberband-1.8.1.tar.bz2 177501 BLAKE2B 57ca56abc7db2f2a25ff7c900daf24f32a892a1ef27099d34ab8ad290344ea8c5884cbace9206bfdf75262ee0c30bec8d736ae5398d5aaf92f73d0d5980e6932 SHA512 9721eaa36b80574f90b8ae5cfae388159a239e4257b8c85b9e55e7cf0dbbb9a996b857213a6a172a4ada5ff712e6936a16adbe08396e2ab1df3fd8d5a02a3620
-EBUILD rubberband-1.8.1-r1.ebuild 1316 BLAKE2B b9f1c303d6e3f6dd519646bef08db871972a9f881f40b95134f75d479273dc48393825b04b72ef5c0a82063e32c3e73df894c78493ab68369484a25ad1570825 SHA512 b0c5118c68951049923f8439ae5f020f2c8c74e1816300d1b235427da0a273a27d2db8cec2f6d2e03e4803312d115ed6d49a9904f6a6393f660f89d70aba7ff0
+EBUILD rubberband-1.8.1-r1.ebuild 1318 BLAKE2B ef83174727b0932afa5aadd90c0beaf29d099d01dc259cb57803e0c717e1b367ca962034964587fa5743474b057a0a93d32c343c54cdd42d0d637b6071eaad76 SHA512 da3e700e934bec7f7b05382c277c7d6226446052729363503631562b2eedc6a9e88e62595817344f25c153462806c20e77f8d7c2daa13386521192b3d56ba416
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-libs/rubberband/rubberband-1.8.1-r1.ebuild b/media-libs/rubberband/rubberband-1.8.1-r1.ebuild
index 39fc6399d835..2fb849c626be 100644
--- a/media-libs/rubberband/rubberband-1.8.1-r1.ebuild
+++ b/media-libs/rubberband/rubberband-1.8.1-r1.ebuild
@@ -5,8 +5,8 @@ EAPI=5
 inherit multilib multilib-minimal
 
 DESCRIPTION="An audio time-stretching and pitch-shifting library and utility program"
-HOMEPAGE="http://www.breakfastquay.com/rubberband/"
-SRC_URI="http://code.breakfastquay.com/attachments/download/34/${P}.tar.bz2"
+HOMEPAGE="https://www.breakfastquay.com/rubberband/"
+SRC_URI="https://code.breakfastquay.com/attachments/download/34/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-libs/svgalib/Manifest b/media-libs/svgalib/Manifest
index ff2f948bfc9f..a62b42b76221 100644
--- a/media-libs/svgalib/Manifest
+++ b/media-libs/svgalib/Manifest
@@ -11,6 +11,5 @@ AUX svgalib-1.9.25-missing_include.patch 1157 BLAKE2B eded4f9ac19d1254cbeb82e89f
 AUX svgalib-1.9.25-vga_reset.patch 747 BLAKE2B 73e459c902be26584bc727bdb4c48398ed4200eaec7155ea12bee897906fd7c97dbb95961db6bc3d13dadbb620a9dd3220a201740343830fbef62db20713c78a SHA512 9baf930a3da15340f3f6823bcb45242bdf6b53d60d4ea2e9ef81af42e748838d40b2d5973821005decd3d44375508838fe852c89d1b704e57b790c042907ba94
 AUX svgalib.udev.rules.d.2 44 BLAKE2B 513532c74e5172a5f2882df1912508f12adf1347c3af1bf0a44f66781d139a28b7aa332f5a5e630d099b381b9a94931ba0b7ad787393228bf694878f442279ab SHA512 41336ddd1fc2a033c684dee1a442ee20ed58fdd1395346913502e4b0c5f798ad0e4cffe69de3dcdfa993dc8b480910c422d38e0483eacfea8f8ad24c41060c82
 DIST svgalib-1.9.25.tar.gz 987084 BLAKE2B 0ca81483d754796d8c96abef2940c506dd8c6f69ac015f0b34995a81db91c0540f405271f3c9e337ead551c783e9d6a336ef53bfb1531481115bd1228b679ea8 SHA512 697e417e6fb4fc3c41f47945a87bd0252f33b565ac1b20d98f984168c6b3ac0f04887e929fbf912ef7bb7b0a3b0a1763cc7cf3e316b62235cc926ca4b1ed96f7
-EBUILD svgalib-1.9.25-r4.ebuild 4043 BLAKE2B a7d0923085e1b203498078e8a2639efcc8c6c5044c43bc7d942b66f6ad0caf0d5bf712809a0b9ed6f780fd0ae8d30193f4bfc4753b5b8c82da21dd5b7b4d78f3 SHA512 b96d007f1dff3d8f3f55a6f10d7f64ba10277e2cb6edf02120ac52fef8afa0c44440d94c05a850d0b1845a66f5cb945b27dd19ea3b69b474dfc502a06bc2de20
 EBUILD svgalib-1.9.25-r5.ebuild 3564 BLAKE2B 34169bab844e25a70e0872a767dc50b44efe2af788b8a2f6aa4c707d01e3e2c015c7fb25db1aaa45ee0617930251b83bf15618438fba26dd7e8195310b8c8368 SHA512 c32cd1636355ef7cba7572e894ab7d83c35becaaa999db1849535b8b179a800a34be5afda2a416ef54cb09fa37045d53c290dc909ecb6d04372d72b17b93f21d
 MISC metadata.xml 325 BLAKE2B eee2dcb0d80f8fa891865f3074139f3a9db2af0339f342f0f82512dc1195e7a95616a36ae9917e8724d12f15c1b5c056c3c5d242c32e989c354b39a7d6fbd5da SHA512 7d2874207eaab21b41da8bd8b9afb5cda10351e3c88fe09ae1856664115b3c86d13362a82695a016911390e5ff6762a86409b437a3d76b077e01ac0ff6662d5d
diff --git a/media-libs/svgalib/svgalib-1.9.25-r4.ebuild b/media-libs/svgalib/svgalib-1.9.25-r4.ebuild
deleted file mode 100644
index 3896ddd8506a..000000000000
--- a/media-libs/svgalib/svgalib-1.9.25-r4.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils flag-o-matic toolchain-funcs linux-mod
-
-DESCRIPTION="A library for running svga graphics on the console"
-HOMEPAGE="http://www.svgalib.org/"
-SRC_URI="http://www.arava.co.il/matan/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="-* x86"
-IUSE="build +kernel-helper"
-
-DEPEND=""
-RDEPEND=""
-
-MODULE_NAMES="svgalib_helper(misc:${S}/kernel/svgalib_helper)"
-BUILD_TARGETS="default"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	BUILD_PARAMS="KDIR=${KV_OUT_DIR}"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.9.25-linux_2.6.patch
-	epatch "${FILESDIR}"/${PN}-1.9.19-pic.patch #51698
-	epatch "${FILESDIR}"/${PN}-1.9.25-build.patch
-	epatch "${FILESDIR}"/${PN}-1.9.25-linux_2.6.28.patch
-	epatch "${FILESDIR}"/${PN}-1.9.25-glibc210.patch #274305
-	epatch "${FILESDIR}"/${PN}-1.9.25-linux_2.6.36-r1.patch
-	epatch "${FILESDIR}"/${PN}-1.9.25-fix_buffer.patch
-	epatch "${FILESDIR}"/${PN}-1.9.25-vga_reset.patch
-	epatch "${FILESDIR}"/${PN}-1.9.25-missing_include.patch
-	epatch "${FILESDIR}"/${PN}-1.9.25-linux_3.4.patch
-	epatch "${FILESDIR}"/${PN}-1.9.25-linux_3.9.patch #557052
-	sed -i -e '/linux\/smp_lock.h/d' kernel/svgalib_helper/main.c || die
-}
-
-src_compile() {
-	use kernel-helper || export NO_HELPER=y
-
-	export CC=$(tc-getCC)
-
-	# First build static
-	emake OPTIMIZE="${CFLAGS}" static || die "Failed to build static libraries!"
-	# Then build shared ...
-	emake OPTIMIZE="${CFLAGS}" shared || die "Failed to build shared libraries!"
-	# Missing in some cases ...
-	ln -s libvga.so.${PV} sharedlib/libvga.so
-	# Build lrmi and tools ...
-	emake OPTIMIZE="${CFLAGS}" LDFLAGS+=" -L../sharedlib" \
-		textutils lrmi utils \
-		|| die "Failed to build libraries and utils!"
-	# Build the gl stuff tpp
-	emake OPTIMIZE="${CFLAGS}" -C gl || die "Failed to build gl!"
-	emake OPTIMIZE="${CFLAGS}" -C gl libvgagl.so.${PV} \
-		|| die "Failed to build libvgagl.so.${PV}!"
-	# Missing in some cases ...
-	ln -s libvgagl.so.${PV} sharedlib/libvgagl.so
-	emake OPTIMIZE="${CFLAGS}" -C src libvga.so.${PV} \
-		|| die "Failed to build libvga.so.${PV}!"
-	cp -pPR src/libvga.so.${PV} sharedlib/
-	# Build threeDKit ...
-	emake OPTIMIZE="${CFLAGS}" LDFLAGS+=" -L../sharedlib" \
-		-C threeDKit lib3dkit.a || die "Failed to build threeDKit!"
-	# Build demo's ...
-	emake OPTIMIZE="${CFLAGS} -I../gl" LDFLAGS+=" -L../sharedlib" \
-		demoprogs || die "Failed to build demoprogs!"
-
-	! use build && use kernel-helper && linux-mod_src_compile
-}
-
-src_install() {
-	local x=
-
-	dodir /etc/svgalib /usr/{include,lib,bin,share/man}
-
-	emake \
-		TOPDIR="${D}" OPTIMIZE="${CFLAGS}" INSTALLMODULE="" \
-		install || die "Failed to install svgalib!"
-	! use build && use kernel-helper && linux-mod_src_install
-
-	insinto /usr/include
-	doins gl/vgagl.h
-	dolib.a staticlib/libvga.a || die "dolib.a libvga"
-	dolib.a gl/libvgagl.a || die "dolib.a libvgagl"
-	dolib.a threeDKit/lib3dkit.a
-	dolib.so gl/libvgagl.so.${PV} || die "dolib.so libvgagl.so"
-	local abiver=$(sed -n '/^MAJOR_VER.*=/{s:.*=[ ]*::;p}' Makefile.cfg)
-	for x in lib3dkit libvga libvgagl ; do
-		dosym ${x}.so.${PV} /usr/lib/${x}.so
-		dosym ${x}.so.${PV} /usr/lib/${x}.so.${abiver}
-	done
-
-	insinto /usr/include
-	doins src/vga.h gl/vgagl.h src/mouse/vgamouse.h src/joystick/vgajoystick.h
-	doins src/keyboard/vgakeyboard.h kernel/svgalib_helper/svgalib_helper.h
-
-	insinto /lib/udev/rules.d
-	newins "${FILESDIR}"/svgalib.udev.rules.d.2 30-svgalib.rules
-
-	exeinto /usr/lib/svgalib/demos
-	for x in "${S}"/demos/* ; do
-		[[ -x ${x} ]] && doexe ${x}
-	done
-
-	cd "${S}"/threeDKit
-	exeinto /usr/lib/svgalib/threeDKit
-	local THREED_PROGS="plane wrapdemo"
-	doexe ${THREED_PROGS}
-
-	cd "${S}"
-	dodoc 0-README
-	cd "${S}"/doc
-	dodoc CHANGES DESIGN TODO
-	docinto txt
-	dodoc Driver-programming-HOWTO add_driver svgalib.lsm \
-		README.{joystick,keymap,multi-monitor,patching,vesa}
-	# avoid installation of a broken symlink
-	newdoc ../lrmi-0.6m/README README.lrmi
-}
-
-pkg_postinst() {
-	! use build && use kernel-helper && linux-mod_pkg_postinst
-}
diff --git a/media-libs/vamp-plugin-sdk/Manifest b/media-libs/vamp-plugin-sdk/Manifest
index f94b7e75d903..38b4358fc111 100644
--- a/media-libs/vamp-plugin-sdk/Manifest
+++ b/media-libs/vamp-plugin-sdk/Manifest
@@ -1,5 +1,5 @@
 DIST vamp-plugin-sdk-2.6.tar.gz 174908 BLAKE2B 32a498244e7b8e4feba8d09bad57bb7137d345fccebd1df7f9af21f5d91d352204cda32009341cee703442d2de66911680c27e1e2d886c7b3642669a414ae9c4 SHA512 0de0eee37629b86c664d42837eb4dbac8bb311af71082b3d0a880c6b475a8de1ab7ac42daf7c1a234dc29690e5788b70011fa01a956941cf414347011e9c27d3
 DIST vamp-plugin-sdk-2.7.1.tar.gz 306956 BLAKE2B d8e765f54cb3544efcca4b08241afc070026adeaa4c0273cc01dae26e0ad60a976bc443184cc83413c6e32f4cf6fbee6590954e7ab12872993abb78c2541653f SHA512 91dd7cae72334718dcbdac06b1ffa3f3ba76e977b82b928ab634d9982aa15ca4e30978a7778215753c61e56831077d7634d24e65e468ab6a8a87a5957fb09bf3
-EBUILD vamp-plugin-sdk-2.6-r1.ebuild 1460 BLAKE2B 15583af61cf497b94f59c8024c7c2795b4121c6e5212855fec9bdeec6f47681de03cb4776f916b6c2b2990e8e610b9d8253756bfaa2cb8ae6669837303cc51d3 SHA512 9f61715b8e6bf5448ba3984198bcb042e1d8063ee30571ec44d6b6a0ca8cf15f0d3e6697d03081eed6c063103fea87d783e314aa9e8d91a84c1b73624fa39407
-EBUILD vamp-plugin-sdk-2.7.1.ebuild 1514 BLAKE2B 1ba64e12736f3f3877c1c1f08f54e73e902a2d1d79c803ffd9035ebc58fedfbc1fb3ace819e6e791cd0448683cecf61c9ddf1dfbd678f1c9a979bb6d1fd84989 SHA512 d52530a46315a56af8a50ca03a7fe175cb77fd87adde9006a7fafcb4248d707014eaeb1942150ffb3fa4ff27d53d0f8068c1980ea7107b436569e90216a64635
+EBUILD vamp-plugin-sdk-2.6-r1.ebuild 1461 BLAKE2B 331373d8984bdf3888e1a62f1c2de6ccc73b87bf09c02197719627d194aeaf1d375522e6ec93297ddb558f1968281d99debf76f2e454c8b7fc17dd2e6d95545f SHA512 549daba14ff7cd4bc3bdddf7e5ac7d83ddda044b87703a5b2e06071d6c20a923cefbfcb4b777ca8995e9bf1907066fde9ba49e14d32c2a28ee97eda77f123e7f
+EBUILD vamp-plugin-sdk-2.7.1.ebuild 1515 BLAKE2B 61708a664167fd986306e4186fc15b7255e1132da6aa53c0bbd4153c05b861d6068930445ab864a41f6a2035ac0d5180bffb34f346851b9b2eaf65ac8230e1cc SHA512 fa065b977b38fb17cdce37dea5b65bb38dc59bfc21b9e441372c67d42b93a4e4c9332bac91cd945b205613e70c0dfe04b74907af8874ecb95cc20c9293f2a6a2
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.6-r1.ebuild b/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.6-r1.ebuild
index 066f98e9fa8d..63d05509d40d 100644
--- a/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.6-r1.ebuild
+++ b/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
 inherit toolchain-funcs eutils multilib multilib-minimal
 
 DESCRIPTION="Audio processing system for plugins to extract information from audio data"
-HOMEPAGE="http://www.vamp-plugins.org"
+HOMEPAGE="https://www.vamp-plugins.org"
 SRC_URI="https://code.soundsoftware.ac.uk/attachments/download/1514/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.7.1.ebuild b/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.7.1.ebuild
index e8f68b16d6af..7b03ba466418 100644
--- a/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.7.1.ebuild
+++ b/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.7.1.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit toolchain-funcs eutils multilib multilib-minimal
 
 DESCRIPTION="Audio processing system for plugins to extract information from audio data"
-HOMEPAGE="http://www.vamp-plugins.org"
+HOMEPAGE="https://www.vamp-plugins.org"
 SRC_URI="https://code.soundsoftware.ac.uk/attachments/download/2206/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 5ea647055c22..981ee9826ec8 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/gst-plugins-a52dec/Manifest b/media-plugins/gst-plugins-a52dec/Manifest
index fca73c585fe8..bd955fde9ab1 100644
--- a/media-plugins/gst-plugins-a52dec/Manifest
+++ b/media-plugins/gst-plugins-a52dec/Manifest
@@ -3,5 +3,5 @@ DIST gst-plugins-ugly-1.12.3.tar.xz 903784 BLAKE2B f0a9538f8d3c2500470a721a998d3
 DIST gst-plugins-ugly-1.12.4.tar.xz 904592 BLAKE2B 6ec59cea23ba45e705fc3140530576232c758884cc7cdcc293022233f4aeb440918c147563706a7309253dab318190bd6484fe2ac21af4b54af61ede349a1e82 SHA512 920f5be5a060293319f4c45bf7f28e14953e897473a04e1c83bce61261365198a6dc2d7ad6cf5396b2bbdc35a5f77014741e902e67c00c3c6596680ab9924e8a
 EBUILD gst-plugins-a52dec-0.10.19-r1.ebuild 399 BLAKE2B 5badb061e541f634bb4bc301a4e2828f95f74bd239551c859ae09b3aeed94ea89a1ea743b26ee4011c3f9e26b1fce587b5bb59186c300b4d37f9420294de4c67 SHA512 81f762ae4e234a7a3f1cfa82ec0efb712cc61da6b4944b0242d5d7d273f3bbdf01f3f9471860778b23a75b654d7e59f2bc355f7d8d68faa81672630d17aeaf40
 EBUILD gst-plugins-a52dec-1.12.3.ebuild 464 BLAKE2B b7b0adb7eab47c167966d9f96fc0d878b8e2615300c3f145665544fbf2095eecb0a0c1a405171b8e92b2be6b3c023eac8a8ef0339cfc4e487b966fa217cdf774 SHA512 4ba6bcbf376f07e4bc25e02d1ab9332ba291f952cf0e4a811c6aa6a60faf4dd8403c0599d406bc631b6801bc92fb7c79e030a34e0cd7ed8cb7cdf912a6bb7465
-EBUILD gst-plugins-a52dec-1.12.4.ebuild 473 BLAKE2B 2800b90d78671bb2057060d9cb886ca50005629afc58e9f574ced3395fe504f3bac0a34c15bc285e59af5ff5869c6440faf95ae264db74d051560c6d33febb76 SHA512 573dc5fff6cb2e1c7a0fbe7b6a3975225b2aa68d625b88cd6e1c032733ed35f946707dc1c79cd28c2cdab9fd21c79bd571a9572de2a6bdf761ab6357dd694eb1
+EBUILD gst-plugins-a52dec-1.12.4.ebuild 471 BLAKE2B 60875f6de0c6ea3ef6527099381a188d8806dd332fc953d8b9651702dfaea70ff8db28697a005eb0fc489c70c905ceddaaf120e5ac0d7b68edbb427cdca649b2 SHA512 9c8fc92228d8d9a65f29dcb6d464f2e785511723b442543966eecd315b451e21c16c5157ac39758c2acec7ec5b96c4a8fdefa1e50c60481204bced4405171246
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.12.4.ebuild b/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.12.4.ebuild
index 85b691d4d787..4789b0fd11aa 100644
--- a/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.12.4.ebuild
+++ b/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.12.4.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 inherit gstreamer
 
 DESCRIPTION="ATSC A/52 audio decoder plugin for GStreamer"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="+orc"
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-assrender/Manifest b/media-plugins/gst-plugins-assrender/Manifest
index f77c5f4f503f..53ab3304f220 100644
--- a/media-plugins/gst-plugins-assrender/Manifest
+++ b/media-plugins/gst-plugins-assrender/Manifest
@@ -3,5 +3,5 @@ DIST gst-plugins-bad-1.12.3.tar.xz 4707000 BLAKE2B 1cb82e6f1c20d24a42ed0c7465e4d
 DIST gst-plugins-bad-1.12.4.tar.xz 4709272 BLAKE2B a4d1fec48fdd67fc66eb5588dbee820c22b19a41dda4f5643b1ae326bfc827cd4796fc7a523fb0a9758605952377a2491f4e53ea74237ca7841659dea4ddcbc0 SHA512 a8e281aee1f1d0bb3f171fbe4242e997c661cbfd0be78da3913c0f55d68d6b7c3d34cabfcdd8c25728217ff885b86a7bedc0be34a7b14e2eb2a6c6236753231b
 EBUILD gst-plugins-assrender-0.10.23-r1.ebuild 397 BLAKE2B a37da2f3411bf8a65a65bab2c0acdb246feeda44f7bf843f6fb20a39c9835e2dc9c332683831d628fc861c08c03303768eb728725462abaff417deed43ae2e1f SHA512 cce12435dac51172f7f263bd8c0c0ab33be80a6740584e1dbcb5b707ebf62c034e5d4da247e54639c1a6592cbe7d8be055d3f7b335331cb18629b52c279d18a6
 EBUILD gst-plugins-assrender-1.12.3.ebuild 405 BLAKE2B 3f29d673d85bfd487956f053d08580298e7c60b9b9847aaaf795dee5ee398b5387ec997d297018a0dc0e2daa8e37bb73f41716548c8dbaa1da5c75db2f9c4de4 SHA512 a277e58ef2ff5d1f0bf83f6a925e606413ee6b32e9f9cf81c1877502dd7bf9201511cea235c2d280148f9cb88c850b6bc73bcc53171fd97f8c87ea072ff1788e
-EBUILD gst-plugins-assrender-1.12.4.ebuild 414 BLAKE2B f13457416be2d6f8d51a7e59155b53f6f474d859d684ff968dd359296ed9bc26b8484c3e63815bb0ab38eea400e40b509944fe1f066ada37a90cffdbd19dbdc2 SHA512 20f0daca04e506f57ed20e373da9a1a626d7b3ac63ed781aed000d1651ef2d301d37fcca8c031ff6c1bfe74df94c0607862d7fa97b7d8cca9b281a797c52b53e
+EBUILD gst-plugins-assrender-1.12.4.ebuild 412 BLAKE2B 75f67b98e49d72ec797e54535ce9a236411a119130a23b9c4e461bbe98a4e138f6c1df4e2c5890c83cee62fc7e8e5cbaa22f0f68ec454cab0f75d288c5126d40 SHA512 6a622786a8552121140a5c21af9366173505aa977a03d8ed78848cdfcb9ea60a3a068969a4cf165df35a95057036ab723014efb18fb2016a06181411e4ec88d4
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.12.4.ebuild b/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.12.4.ebuild
index c8c8e6374771..04acd9ed3689 100644
--- a/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.12.4.ebuild
+++ b/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.12.4.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="ASS/SSA rendering with effects support plugin for GStreamer"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND=">=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-cdio/Manifest b/media-plugins/gst-plugins-cdio/Manifest
index 6f6ada2e93de..2e048f4ea4eb 100644
--- a/media-plugins/gst-plugins-cdio/Manifest
+++ b/media-plugins/gst-plugins-cdio/Manifest
@@ -4,5 +4,5 @@ DIST gst-plugins-ugly-1.12.3.tar.xz 903784 BLAKE2B f0a9538f8d3c2500470a721a998d3
 DIST gst-plugins-ugly-1.12.4.tar.xz 904592 BLAKE2B 6ec59cea23ba45e705fc3140530576232c758884cc7cdcc293022233f4aeb440918c147563706a7309253dab318190bd6484fe2ac21af4b54af61ede349a1e82 SHA512 920f5be5a060293319f4c45bf7f28e14953e897473a04e1c83bce61261365198a6dc2d7ad6cf5396b2bbdc35a5f77014741e902e67c00c3c6596680ab9924e8a
 EBUILD gst-plugins-cdio-0.10.19-r1.ebuild 418 BLAKE2B 1c7a01775e4347b4db8474a8f7ba85c992f694878f53fe9e119b85fa17196f43a2edb0967b5791ac673f4a0a50636acea2cc6c08f8c276c7533833797ba27063 SHA512 9df5ba64af0b1bd1d99e46851f6184f889386898d056d2c82cd6c5c023ff183bf59a6818c401f8ccd6a62beadd6bdd77a2d447f250c0472c5f54b46013d6dbb6
 EBUILD gst-plugins-cdio-1.12.3.ebuild 390 BLAKE2B 3bcab9a5c49e43e38243faae71cebc2789d1abb8234d5006af66657264766e958d97be024a1efe356d8cd259a9aeb47696417b6a85e72c2c447f421dd81d64a0 SHA512 8aac3993d99e666afd6ad8024e59a71786cce60d22b6023e16342325fcceb6ead8419fe80f4b740d26dc63a201cc0139b5292b934118e056dad45e83bee1b337
-EBUILD gst-plugins-cdio-1.12.4.ebuild 398 BLAKE2B d12df8148a368c0ae74bcd779c9e6e47a9e8bd94329ae1835fbcf623cd6c590178d5c400a57c99d052833603e9afb07e5cba33f83e9a9927fbad6f11282ea2c5 SHA512 27a5c532c0c13bf30c3eab5f99b22f640c6e90a75643cd67628ab89085c81419f425e3c2304eef5f3eff658eed481bf6e225151b1feafe681738362fb7d1e4d9
+EBUILD gst-plugins-cdio-1.12.4.ebuild 396 BLAKE2B 01557e64ea5a466dbfaf7de6dbbad6fcd79d1abde852eb749948a05999b6d210ed38465c3b4ea2db81ff55324aa5eed9f8d6de8f8f1c64a1ccff69ebefdc98eb SHA512 f5c0fd82f8452edd3ebf1268367a9810c8ea13e54a9196cef056740c5a80d745773bbde8502b085ce05a90941f06802c232586343af32d19beed2c37c9448889
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.12.4.ebuild b/media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.12.4.ebuild
index ecc66561ac28..3ee0b808419c 100644
--- a/media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.12.4.ebuild
+++ b/media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.12.4.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 inherit gstreamer
 
 DESCRIPTION="CD Audio Source (cdda) plugin for GStreamer"
-KEYWORDS="alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=dev-libs/libcdio-0.90-r1:=[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-cdparanoia/Manifest b/media-plugins/gst-plugins-cdparanoia/Manifest
index 58d06f877484..bee6c82f098b 100644
--- a/media-plugins/gst-plugins-cdparanoia/Manifest
+++ b/media-plugins/gst-plugins-cdparanoia/Manifest
@@ -3,5 +3,5 @@ DIST gst-plugins-base-1.12.3.tar.xz 3117364 BLAKE2B c5c16f1b46b10cfc5b9731ea9906
 DIST gst-plugins-base-1.12.4.tar.xz 3119468 BLAKE2B d5ac157618a25c8f0323d1922d5b26b0b5c49f56cb75df3ceeadd0566f873be1a06c863a1da6afff40901fbbbeb1ec6cd6ef4614309ca7f7ff988c0fa9040a10 SHA512 89a6e92cd294612cf1406eb156416ab4606643f6b43637e64a18f6f28ab789ca8d4cf1308434ed85e5fc679c79cc3ca115db48f37e0065a6ab3cdfdbaaad9f53
 EBUILD gst-plugins-cdparanoia-0.10.36-r1.ebuild 438 BLAKE2B 056dbad1b9473f84356d9fb0f0ba8c0f7a0438e06b0353d4344c879e9092d05e655f2ab4141259412f621bb53218c454dda0033aca1dc204c5eb0a03c0612757 SHA512 8be7db6c102859a541cf40301567414398e0cd7cc51435956490af1a92a403444d252260178de83f48453ce701020d963fa0f95ff3bad03c1b7973a94ab5d4a8
 EBUILD gst-plugins-cdparanoia-1.12.3.ebuild 470 BLAKE2B 80c0c24e05fb0d5627a801b5fe209db94a98ea783496113c72978f7aa9249145cf12fc9f136fa692f027f94a7d1752a318f26ea9d888926fdebebc8413707862 SHA512 1429e584a600a4199ace2cf2e4ff98cfc782a815da12044472ec27df80bab5ffaad5ff488c1977e65c61f48b6273eafb112760ff5a9fa2e4108a9458e4f78157
-EBUILD gst-plugins-cdparanoia-1.12.4.ebuild 479 BLAKE2B 1235544768524317dd9fd1cc96a97556469b4f0ed8464f6c66c35ce0a0aa770155e5e46ddc2a6aaddbc37dfd69aead84d654e12b12fd58561beaf065dddd03a3 SHA512 cf3682a1a32ec016e328b10dca17b9dbfe603170a60952b6c69f2183e18366a955ad6234bc05cce4b680018816625a22911e213775b0a073abdd7ed6095995e6
+EBUILD gst-plugins-cdparanoia-1.12.4.ebuild 477 BLAKE2B 146dbd3c217747c7937e01241123a7d7c00f2b4af6f58082fc7a994f5a3e4ec5f0851ea6ac5f54d9bb6c8b408743ff8effc29d9e5897acdac8d542102fba72d2 SHA512 a415e603a083bea57b444fce9263ccf5a78d167ac2daf45918f3b0b40b937a4028f80bcff6b93f0d5b5274dc0daec80003d40c14dd225891abb682fc5d14ce03
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.12.4.ebuild b/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.12.4.ebuild
index 5de734a37d2f..725fd417518f 100644
--- a/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.12.4.ebuild
+++ b/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.12.4.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-base
 inherit gstreamer
 
 DESCRIPTION="CD Audio Source (cdda) plugin for GStreamer"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=media-sound/cdparanoia-3.10.2-r6[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-dv/Manifest b/media-plugins/gst-plugins-dv/Manifest
index ea9123a674e9..ac22f2286694 100644
--- a/media-plugins/gst-plugins-dv/Manifest
+++ b/media-plugins/gst-plugins-dv/Manifest
@@ -3,5 +3,5 @@ DIST gst-plugins-good-1.12.3.tar.xz 3487448 BLAKE2B 2c27918f8020c50078b983244e9a
 DIST gst-plugins-good-1.12.4.tar.xz 3489992 BLAKE2B 41715d3e9bda183706d87085bc8cca546720f20e32fd5ecf6e284814745f2fe8ba4cfcd244e50d0734e57dde26944539b8273879608d3042262bfc10f82cc2b9 SHA512 18f270c01be80fe5b026e2c26db3ec200117ffd99c1dca55a8a78f0bd6dcc4701126836e52a410f179779e363f11218413c7b4d13e96ef5ee1bfa82e79a81178
 EBUILD gst-plugins-dv-0.10.31-r1.ebuild 409 BLAKE2B 317010ff0bc97edbcde420f253bfb746fe524c0d58ee7648fd03d6151b9e0d56ba035c703676791f86756c3af4e961f712529458cdaf7747fdba9b4553539b9c SHA512 5eb3d45d44139eb190c0ce873a62b6543cc88e38ab37205bf33209811675a412d7d5bf3405c10b513f60ead3772299cc5725df3a91788a7c504d7c81251de9c9
 EBUILD gst-plugins-dv-1.12.3.ebuild 413 BLAKE2B 5e353d2b515cb845fcf1e5948c97f5e1c83e959d5aea11651fc00d23aa08ca532245723cf96c388cfd5456b17df54513621e0553a21e2df0f86feae1326775f1 SHA512 6a5ef55b2b336cb36ae703fea340edcbd61314ff196ec6f126bf2e5ad35131de2807fd478d9e38a258bf8ec65ea77c9c04692db98c060aa69092f29e324321ae
-EBUILD gst-plugins-dv-1.12.4.ebuild 422 BLAKE2B a8ceca4b13b46d43ecc0c8a96d23d44763099a1f45a40c5eb12615742c35ff90a27b0c6c70fcf8cc8c65c13cce9698cfda4cec1ded680a090651df7828b6a510 SHA512 2c5412252ecc66f3f30a6bf1c78f8f485cea3de44c1a410ea4b56e84e5aba6688ee23eff163284565da350023c829291e72a646c143701dfaf76d1690c83fa8c
+EBUILD gst-plugins-dv-1.12.4.ebuild 420 BLAKE2B 3912731f2241f4686933eb02e03e01b342807eb6fa1e68ba18fccb2651dba8ae4c0eb0dfa64fe832300429d21364151d96f46c93751e9b00d7bae01582834c2a SHA512 6b5cc086a0f0e41c780319d01b0121357aa92f9187b4e2b36252a85a1c7148619b9c36135ffff76f9b6232979a0bbe4f9ff2c5786e40145a88c0a23e4d5f7d5e
 MISC metadata.xml 380 BLAKE2B e30d4f36d092c662f4b2caf33ae705dcee14cadb22174b125686c45a8724a880b291d4683fbf6b06a1e8003cf18be831a368d617d872904a58b1e3fe70ae7ca6 SHA512 bcbeccb0d35ae268383fd3cff3c5739301777233f6769556b5793b3b34a0c5c6e6bbcafcad392e22a8ee441698dc508d9638c1c53eaa17b692ecf5a40ee6f27c
diff --git a/media-plugins/gst-plugins-dv/gst-plugins-dv-1.12.4.ebuild b/media-plugins/gst-plugins-dv/gst-plugins-dv-1.12.4.ebuild
index fbcd48efce23..ecbe0fa03dac 100644
--- a/media-plugins/gst-plugins-dv/gst-plugins-dv-1.12.4.ebuild
+++ b/media-plugins/gst-plugins-dv/gst-plugins-dv-1.12.4.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="DV demuxer and decoder plugin for GStreamer"
-KEYWORDS="alpha amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND=">=media-libs/libdv-1.0.0-r3[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-dvb/Manifest b/media-plugins/gst-plugins-dvb/Manifest
index 333955976f11..6be3903bf601 100644
--- a/media-plugins/gst-plugins-dvb/Manifest
+++ b/media-plugins/gst-plugins-dvb/Manifest
@@ -3,5 +3,5 @@ DIST gst-plugins-bad-1.12.3.tar.xz 4707000 BLAKE2B 1cb82e6f1c20d24a42ed0c7465e4d
 DIST gst-plugins-bad-1.12.4.tar.xz 4709272 BLAKE2B a4d1fec48fdd67fc66eb5588dbee820c22b19a41dda4f5643b1ae326bfc827cd4796fc7a523fb0a9758605952377a2491f4e53ea74237ca7841659dea4ddcbc0 SHA512 a8e281aee1f1d0bb3f171fbe4242e997c661cbfd0be78da3913c0f55d68d6b7c3d34cabfcdd8c25728217ff885b86a7bedc0be34a7b14e2eb2a6c6236753231b
 EBUILD gst-plugins-dvb-0.10.23-r1.ebuild 321 BLAKE2B 5c391b84793fc06dda951b5a779be73cd69489f09e256ef6c801b7110d72da926e0b5eff2f4d9fd122f683ed0e8846775b58fead0956f8049fcaa8600782b8c6 SHA512 2853b009153861de3710fb1facb4b0f08a8b0cca9ead928f7b8dd773d32de9ed373c2884cad48345ae44356fb8ff00d31652d4f9f1a34a9fa5d8e3629bc63def
 EBUILD gst-plugins-dvb-1.12.3.ebuild 407 BLAKE2B cb75baad3aa8269fce581ab60a54295f8dabb901bb0ff1c548895f7e4c1cb2ed960781ffe418ec1292e1b6b68863e58602546f0b39f9445be624dc782fffb7f0 SHA512 f4ede304cc3f3dfa6472c4516ffb0bcda46f8f849b0c7bd3754b3f5f59a84fc08e046ebaf01510e4c7e986a4b1fc94be9a29229b192d3bc6baa2a1dc8e810ba4
-EBUILD gst-plugins-dvb-1.12.4.ebuild 415 BLAKE2B 985e8016f06b081a1320ae0abee13c5fe1298ba1c18f07b41339ac7bd3f084a091327c13285a5d13690a1edf810a804d4356184360cd77ee29af51a801baa358 SHA512 6c10ed6498f77fdc50ea421a27097c3e40f66b471fbd28f11736410d6a21dfa47e2b01deb31294aba8d8e3a60cbee7b5bae59ec48d63b09f736c6f948c53706e
+EBUILD gst-plugins-dvb-1.12.4.ebuild 413 BLAKE2B 37f69ff849e2a79e9e1804b0f2cf526a0ecede47c5a48b4a065eb4ee38241f39faa67fa4af0a0ac155d77c06ab5cbd0dcf4a1461e890a2ea420787632ce00529 SHA512 aa767d91327f195b2c6c85353e77789969d38b8d69a6b9ae4b6ad3d5093b0d3f1fd5a10f37419c49ad925ea21cbc784d3c369cc78cd3d59399ccc269071e0281
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.12.4.ebuild b/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.12.4.ebuild
index c12332f44420..cc1c5f192bb0 100644
--- a/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.12.4.ebuild
+++ b/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.12.4.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPION="DVB device capture plugin for GStreamer"
-KEYWORDS="alpha amd64 arm ~arm64 ~mips ~ppc ~ppc64 x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~mips ppc ppc64 x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/media-plugins/gst-plugins-dvdread/Manifest b/media-plugins/gst-plugins-dvdread/Manifest
index 997116d49e38..5ad3cf8072d8 100644
--- a/media-plugins/gst-plugins-dvdread/Manifest
+++ b/media-plugins/gst-plugins-dvdread/Manifest
@@ -3,5 +3,5 @@ DIST gst-plugins-ugly-1.12.3.tar.xz 903784 BLAKE2B f0a9538f8d3c2500470a721a998d3
 DIST gst-plugins-ugly-1.12.4.tar.xz 904592 BLAKE2B 6ec59cea23ba45e705fc3140530576232c758884cc7cdcc293022233f4aeb440918c147563706a7309253dab318190bd6484fe2ac21af4b54af61ede349a1e82 SHA512 920f5be5a060293319f4c45bf7f28e14953e897473a04e1c83bce61261365198a6dc2d7ad6cf5396b2bbdc35a5f77014741e902e67c00c3c6596680ab9924e8a
 EBUILD gst-plugins-dvdread-0.10.19-r1.ebuild 344 BLAKE2B a09e4ee0ff0b119dbc2c3f0da87793b7b9ecb594ead947cdac3209b9a8b377bbbe98bc68baafd84357b468f3186c936513d592ea79448e661147dac320d38c16 SHA512 abdd7868cdff669bdcb5ccf31f41b2cb47615967aced3d1edec5f02f025be814fe3ab0ed1afb49719f3b329ea64320a26971459078efe3192c8bd2e320b9f4ac
 EBUILD gst-plugins-dvdread-1.12.3.ebuild 394 BLAKE2B 7c70950734bd8c645f9a36ac60b6aa27b340f2d31eb12e942414050f847d657df81d32676fefe9b023ea64c4a4309dcaed018eaf5c2745e8e4284632cc26e93d SHA512 7c516b34078047cb2385dd809f1e7c2778f8527e10b532f69acc869f7081ba58b566094dc817bfac9672934165beec8b9dbfaffd5c6210e60e3f5dbb51c115b1
-EBUILD gst-plugins-dvdread-1.12.4.ebuild 403 BLAKE2B 0becf44ae60359c1d2efe357410d09df7e1dd0b54b99de38b21fa795c32df01b79c9198a5293ac23c7fe8e455294dcb2a9ba789081f0e8682ceccfc633d8b6e0 SHA512 e736f01f36999851d426ee84ceea2797eec99d6f7c2cbdb3a758ba8f4b5ba9dbedea15981bd80d61ad1583e4e9fe2a7fcf4c2f8f6d4f34ce9c83899898f2c409
+EBUILD gst-plugins-dvdread-1.12.4.ebuild 401 BLAKE2B 5cd34dcf4983ef93c3ef7bc8d18cf4c3fe7022bd241973172cd9326751ca81902539afea6638d1cd944dd792c70b45d5171656cee662daca6a2079df5be5590c SHA512 5c876d71917b90595e47e0f047fe99f37149470caf013ba5947d7bae8e728d27b3c99ad3c00d3e130327608b5b3115c101c5e260b8b651ef93eec629061591a1
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.12.4.ebuild b/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.12.4.ebuild
index d161a3b5b31a..71cffdadcc34 100644
--- a/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.12.4.ebuild
+++ b/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.12.4.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 inherit gstreamer
 
 DESCRIPTION="DVD read plugin for GStreamer"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=media-libs/libdvdread-4.2.0-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-faac/Manifest b/media-plugins/gst-plugins-faac/Manifest
index a151db7c5817..4cdbee32b99d 100644
--- a/media-plugins/gst-plugins-faac/Manifest
+++ b/media-plugins/gst-plugins-faac/Manifest
@@ -3,5 +3,5 @@ DIST gst-plugins-bad-1.12.3.tar.xz 4707000 BLAKE2B 1cb82e6f1c20d24a42ed0c7465e4d
 DIST gst-plugins-bad-1.12.4.tar.xz 4709272 BLAKE2B a4d1fec48fdd67fc66eb5588dbee820c22b19a41dda4f5643b1ae326bfc827cd4796fc7a523fb0a9758605952377a2491f4e53ea74237ca7841659dea4ddcbc0 SHA512 a8e281aee1f1d0bb3f171fbe4242e997c661cbfd0be78da3913c0f55d68d6b7c3d34cabfcdd8c25728217ff885b86a7bedc0be34a7b14e2eb2a6c6236753231b
 EBUILD gst-plugins-faac-0.10.23-r1.ebuild 308 BLAKE2B ce6856e16ad97ca843b0f6f0d6184895721c50059747baf672c78506e96e021eaa2f44017881850c0e20a50b2fe27edb7f180f6fb4141968869548654ee11f81 SHA512 f27ed34767f0e948b9bf03baa96359690783610771ee0b6421a30e7997c38f7abcb079060ae5b51c43a6a93b097fedf891a97ac999e1dcb5b1da04cee8148504
 EBUILD gst-plugins-faac-1.12.3.ebuild 359 BLAKE2B a78b366c09ea383b157a1ec537102382de7d804e5fc6e5a79c4342c31917fc30dd0fba150c20954165f9957484b2cc14684c7dbaf19cb4100006706993644406 SHA512 b2077a786f13606f36d48f6091bb0221255df7597b3f47d0e09d04cc8d1939dd5199dadeab5f534cb7f1baee4e6503db74ebdc1b50e4660aa1013836265e6210
-EBUILD gst-plugins-faac-1.12.4.ebuild 361 BLAKE2B e7db6189c4f964a82249482fed469a95ea0b83b52ac2a0f4acbdd098f039057973eb79dfcfccf342ea98d89f954879cb28f5bddc8dbf091917cdb927e7daccf6 SHA512 959887227d9dd494054a8f9d8191f5e85e05775e00cd25b38933a68cb55a0cb278dc171ac65a570ed32fd7c21792c230a8d327a80698ec694979d3460dede942
+EBUILD gst-plugins-faac-1.12.4.ebuild 359 BLAKE2B d1b7fa0a77ae2b42d125b454bbf4fd245aeec9a583f8feed982267d98ae2135a44c482b0fc30bd3835f31ad036a63d48143da40c419c780be4ba5e0cbd312954 SHA512 697e294e8a39f5e7f3c4cefac1fd0880b81dc72e94613843adfec8187fd6d85c0431181c51b62698ae750ad50eaf3239a541bd8458f70bff52644c5eda4f24e6
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-faac/gst-plugins-faac-1.12.4.ebuild b/media-plugins/gst-plugins-faac/gst-plugins-faac-1.12.4.ebuild
index 571bacc6ecc4..1cefbcb81907 100644
--- a/media-plugins/gst-plugins-faac/gst-plugins-faac-1.12.4.ebuild
+++ b/media-plugins/gst-plugins-faac/gst-plugins-faac-1.12.4.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="AAC audio encoder plugin for GStreamer"
-KEYWORDS="alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm ~ia64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-faad/Manifest b/media-plugins/gst-plugins-faad/Manifest
index 2e90cac06a58..716b2b39b2a7 100644
--- a/media-plugins/gst-plugins-faad/Manifest
+++ b/media-plugins/gst-plugins-faad/Manifest
@@ -4,5 +4,5 @@ DIST gst-plugins-bad-1.12.3.tar.xz 4707000 BLAKE2B 1cb82e6f1c20d24a42ed0c7465e4d
 DIST gst-plugins-bad-1.12.4.tar.xz 4709272 BLAKE2B a4d1fec48fdd67fc66eb5588dbee820c22b19a41dda4f5643b1ae326bfc827cd4796fc7a523fb0a9758605952377a2491f4e53ea74237ca7841659dea4ddcbc0 SHA512 a8e281aee1f1d0bb3f171fbe4242e997c661cbfd0be78da3913c0f55d68d6b7c3d34cabfcdd8c25728217ff885b86a7bedc0be34a7b14e2eb2a6c6236753231b
 EBUILD gst-plugins-faad-0.10.23-r2.ebuild 491 BLAKE2B aa9f09d4174849650d316c19018779d87f078830d9ee5a94f0ef3c8031debf135cf90c06d46b8d4d97ef77d910d80e3496d4e70358d90414326020eb59198335 SHA512 921f66afbb23c737d62338c425952835bd7fad9572d2638a06baddc54596323e7a059b1330001f42a875b5263baa1e9bc591818120b00fec49e216e915664bb0
 EBUILD gst-plugins-faad-1.12.3.ebuild 379 BLAKE2B 65689dede2c7dd876c1173a0bd4dd5b4851bb6895779cc9db47b26559f090da1d0d6245101403f0e5c1a60ab7d9429c5519d1794644753d21572dce86bdd50d0 SHA512 632573a91965364fd267578cfe265478dce689663cc451250f16511bf63f4446cdc98065c2c3089fdd8b93086d13563741e195ebb5fd54fad285a4097e75797c
-EBUILD gst-plugins-faad-1.12.4.ebuild 388 BLAKE2B 049ccd643a586be18fe1f28cc79aff10d3c81dfc1651c04129dbde3e9698024a1e58f247366255a6c203df8e113365a85b6138300ae4d0cdf44009cf2ee1bfe4 SHA512 ab7bbd7cf306e05b91a1ec3d890e74c89e0a9e8cf5742a0d1b3da68e2134b91c9c5e9be0eac9cb94f5d7bc59de077b023dfef4334e9378aeb8149b0bcd648a99
+EBUILD gst-plugins-faad-1.12.4.ebuild 386 BLAKE2B eb4db36f240a779be689135a791908b19ebd28294d35824f2ad737757dd109b4f83e6dd78a03e135fd28aa83cdd5e48a7eb0369fb67dc0ab1eabb5ecdff945e7 SHA512 b12473fa46d73ab4fb45af638373d1437e0211fed20bbb9eaca620cf98a8af37af053cb8728255958d5f78bd894ea9b863fa98353be8ebb6ab7db62315384745
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-faad/gst-plugins-faad-1.12.4.ebuild b/media-plugins/gst-plugins-faad/gst-plugins-faad-1.12.4.ebuild
index 88a4e3d27885..0dcce9230c37 100644
--- a/media-plugins/gst-plugins-faad/gst-plugins-faad-1.12.4.ebuild
+++ b/media-plugins/gst-plugins-faad/gst-plugins-faad-1.12.4.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="AAC audio decoder plugin."
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=media-libs/faad2-2.7-r3[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-flac/Manifest b/media-plugins/gst-plugins-flac/Manifest
index 800ee9a7856a..4842d6ebddf9 100644
--- a/media-plugins/gst-plugins-flac/Manifest
+++ b/media-plugins/gst-plugins-flac/Manifest
@@ -3,5 +3,5 @@ DIST gst-plugins-good-1.12.3.tar.xz 3487448 BLAKE2B 2c27918f8020c50078b983244e9a
 DIST gst-plugins-good-1.12.4.tar.xz 3489992 BLAKE2B 41715d3e9bda183706d87085bc8cca546720f20e32fd5ecf6e284814745f2fe8ba4cfcd244e50d0734e57dde26944539b8273879608d3042262bfc10f82cc2b9 SHA512 18f270c01be80fe5b026e2c26db3ec200117ffd99c1dca55a8a78f0bd6dcc4701126836e52a410f179779e363f11218413c7b4d13e96ef5ee1bfa82e79a81178
 EBUILD gst-plugins-flac-0.10.31-r1.ebuild 402 BLAKE2B 7dbf745b4d3d9d276df3ca7ea6688b38bb44abd7f32babeacb64ac49bc52f05e73759a89fb53706bcdbcaf66b81fc96fa87dd5e61eb5351c12f69f54626c0873 SHA512 1d0231e51a2320544cb5ff13381b288693f6c43136ebf5452ef3ce46755fe0b4ed976a678d09cb2e4eabff13d3aa1f6b8b28c67b1cf26de93c5111944805474f
 EBUILD gst-plugins-flac-1.12.3.ebuild 413 BLAKE2B cd005b37d610084ab39a7760ebac1f675db50b8b6e520f66cf63e6c08feacc955e3139adc981f2c7e58430098131fd967dbd41d49203b16730e978d59a05807d SHA512 ad6ae31e94fce426bcd6ce44e07c97bb7ee638ae66dcce56d7b67d88481bd77d9779a77c9e8f14b19dd4c06c9899596cc8afc28c51c6d24622fabf7a648a8544
-EBUILD gst-plugins-flac-1.12.4.ebuild 416 BLAKE2B 562e2be1cd78639670947a930541cb864e64eeb2d7cb853343e3a571105d3e765300de7c8cd18ff1f7e7345e93915303110dab480d5c04ec5cd3ac70287a495b SHA512 04e6c5b2ac7ed8209a0d5a461205b300428201339307cb3358b6deaeb6915b8481f87fd7ad99a16884018d58b44ad57668ca7935361a23d7e597b0ce381c9b41
+EBUILD gst-plugins-flac-1.12.4.ebuild 414 BLAKE2B 91cc0e95de205d25054b4fee1bc3f889bf4c2e296aa12695dc3393343bf379d546a9e855e6dd6af768983eeceab882ead34b55ba928a0d36d3e0df328ce9775c SHA512 b5b736df81993668aa8aebdc9ec61a066d4b398639de376943fa152df264bc8d1e4ec6fa6a67cc3f21592a51af0945d3a5aa49191fc5e2c3abaa00e1d67d3e9c
 MISC metadata.xml 555 BLAKE2B 0a6c97712429505d543caaa732d716a95e4f6f5256aeb202da38bd2399ceb335e1fc6079279c96848d479d3fa3e2b8bb1c92b37ba284204b1936078d0175caf3 SHA512 2ffe5f5f8ef59e30a7da2efe1b5e88858c5f27776b7f48a7748f9cd72a18d5c97ddb239609c7bab808de874f0a51bf886ec24e395641fac995c8d3f041271e7d
diff --git a/media-plugins/gst-plugins-flac/gst-plugins-flac-1.12.4.ebuild b/media-plugins/gst-plugins-flac/gst-plugins-flac-1.12.4.ebuild
index 13205e9d251b..becdda82122d 100644
--- a/media-plugins/gst-plugins-flac/gst-plugins-flac-1.12.4.ebuild
+++ b/media-plugins/gst-plugins-flac/gst-plugins-flac-1.12.4.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="FLAC encoder/decoder/tagger plugin for GStreamer"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=media-libs/flac-1.2.1-r5[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-gdkpixbuf/Manifest b/media-plugins/gst-plugins-gdkpixbuf/Manifest
index 37a398f80382..a10befb0b62c 100644
--- a/media-plugins/gst-plugins-gdkpixbuf/Manifest
+++ b/media-plugins/gst-plugins-gdkpixbuf/Manifest
@@ -3,5 +3,5 @@ DIST gst-plugins-good-1.12.3.tar.xz 3487448 BLAKE2B 2c27918f8020c50078b983244e9a
 DIST gst-plugins-good-1.12.4.tar.xz 3489992 BLAKE2B 41715d3e9bda183706d87085bc8cca546720f20e32fd5ecf6e284814745f2fe8ba4cfcd244e50d0734e57dde26944539b8273879608d3042262bfc10f82cc2b9 SHA512 18f270c01be80fe5b026e2c26db3ec200117ffd99c1dca55a8a78f0bd6dcc4701126836e52a410f179779e363f11218413c7b4d13e96ef5ee1bfa82e79a81178
 EBUILD gst-plugins-gdkpixbuf-0.10.31-r1.ebuild 476 BLAKE2B 3ce84c6bd9e0ae6d0bd7d948e32c4ad63b7f42abe7bebc865010202cdce9c139f9829f6a435be21ba01b8ca78d18b8dc11c187923d2ef58c6db7e0d1b8bc4393 SHA512 a5fcb6e80f02bb9695d8dbad1333aa63ef3a9d24da2bc2f6dc2074f69a5a74369567f4652899837ea496ee2018090f2bb6c86495db045af2e1e8b0ad531d64b6
 EBUILD gst-plugins-gdkpixbuf-1.12.3.ebuild 480 BLAKE2B 3c188019683473a98c9ef52e4ad3a7d8caeb69cc8dae1d8c38b36a3499e72f4427df5cc070c85ae4a75b37c91e8519ea77ea96cfa6cec974e86d501da8a9006c SHA512 ea0e8108abf1af0d12f7a307c9df4c565fd6b75b3785c23196278a0ff5d64380f442c3f58e421e07ebed5fc07737b2fa06d762a74d8263dd3987d8d44f4fed0d
-EBUILD gst-plugins-gdkpixbuf-1.12.4.ebuild 483 BLAKE2B 140d60b2b8e5994c1655729aa21b0f552e07aa6863c62e4d5a8584dd4b7f18ca8d7eb29d0a50e5e99d7d56ff70692c1fba3d49fd959b83678735702d5a1e49b4 SHA512 ade4b52fd574d39b8c3c762e32a6d565d5292f1aad8114e6280ab19f7341875c6fdc14948f87ed324743a2160281ac38c0bc641dcab4c7c951654f63d03f1a4c
+EBUILD gst-plugins-gdkpixbuf-1.12.4.ebuild 481 BLAKE2B 2f2530f7d09003a651af7f49c126177a2f3f62b3d8501ffde53b038f8ae3bbb2b4fbbfa037b5227f591fc71a10cc842a31dc0ac6de5ad4c39b6825e58e674846 SHA512 e4c61e725b032215fa32213f6c13698c40477921d039fbb89253f4250ed3d436aa509534b7836f39e7258c13a12e16d94cf052f9494d1b6b94c66dbd7f8c6d6d
 MISC metadata.xml 610 BLAKE2B e0597a0e835fd058d1d172bef6cb6616efbd83b3f97e9b9d644afa6a68956dc97b37385ba7b5996468911f9da16e54b2dec18d9657ad8b1b6a4dcd71cb229f7e SHA512 472dddb540087c89be5a85ab67733d345bf039a95fc1a7bd2ec6ce3b08b8556b2676af77b93ee903bc8ace178963935b21dfcfc6c1c0a6ecab5a7429d60e5cbd
diff --git a/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.12.4.ebuild b/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.12.4.ebuild
index 5bdad30827b5..93eec26ed984 100644
--- a/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.12.4.ebuild
+++ b/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.12.4.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPION="Image decoder, overlay and sink plugin for GStreamer"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=x11-libs/gdk-pixbuf-2.30.7:2[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-jack/Manifest b/media-plugins/gst-plugins-jack/Manifest
index 00d2b937b690..246fa0bd7f6a 100644
--- a/media-plugins/gst-plugins-jack/Manifest
+++ b/media-plugins/gst-plugins-jack/Manifest
@@ -3,5 +3,5 @@ DIST gst-plugins-good-1.12.3.tar.xz 3487448 BLAKE2B 2c27918f8020c50078b983244e9a
 DIST gst-plugins-good-1.12.4.tar.xz 3489992 BLAKE2B 41715d3e9bda183706d87085bc8cca546720f20e32fd5ecf6e284814745f2fe8ba4cfcd244e50d0734e57dde26944539b8273879608d3042262bfc10f82cc2b9 SHA512 18f270c01be80fe5b026e2c26db3ec200117ffd99c1dca55a8a78f0bd6dcc4701126836e52a410f179779e363f11218413c7b4d13e96ef5ee1bfa82e79a81178
 EBUILD gst-plugins-jack-0.10.31-r1.ebuild 422 BLAKE2B 7a4fcaf73634137d42bc94a80823c18159092d0fdac3b5bded55777c2c8724073f0eba785b6a41403dff2e328b3ad818f20785b920b35562431841f30979c6d0 SHA512 3cc92fbb1b8d6c8b9a0a1307f3148df3779cd711cd66f5221e75118da6393697d086f6f27364a36fe37ce95f79ffbfb13517a51575c06ba130a2740109375105
 EBUILD gst-plugins-jack-1.12.3.ebuild 380 BLAKE2B 82c12336d3ae158ecf118d758d88c50eff857122a8a7fe90bd7fa9244afd11abcc57be93e39d459ef1fe4840bf22f1dbc796dfe6dbecb09acea20b2046ddc2a3 SHA512 9fa95ff5f978d795a049c7836f6a36c27fd45a976da97cd0943c49bb3ba6bb9a13570ff52062af9a0bd2368bad4bebfb7a0c2d5027dec3c3084b5b838d373d7e
-EBUILD gst-plugins-jack-1.12.4.ebuild 383 BLAKE2B 1021de366872be7e27ff53fb0c5c13609726fbaaff9bdee43e406deec68d2d5bd9219fd44a18df1da6e371e206eb51005df9b39e72e60208a8302ed6cd9a0ed2 SHA512 171bb5f5008a0827f81e356679d89bbff4bfbfa8e292c0e043e847be68b77fea82e51170102438d6ea9269c8ff94fbf7e21af7494f2b975a4d90d4be76a05dcd
+EBUILD gst-plugins-jack-1.12.4.ebuild 381 BLAKE2B 024a1bcf30ad5505909092d2ff06cef4c19b70b32bb7c6a3ccf8c420f1fc291ce2375fc3153ce49553394e8279091020bbf3b0b0994d5887e44452f840321b2d SHA512 95a04726aa6568f05e48d104fcbe0a708be9667b8552d4b7cd1d60b456a3249e7a6eed429849b618924a40acb89c5f31ee9cfd6bff9a8df33a50cc3bf4e32e66
 MISC metadata.xml 487 BLAKE2B 182c55b79c188f12dcc000cecf9c507933183ab62a78c806b6f43918af528c1c7bf3adf435ad077f689a2b64706b7517b14393500dc4d1b7f2cc14b45dd6b764 SHA512 811374b3dabbff1084c5b1b6fb502197f58da02da195b922ce7556ca6e0f3668f266a14ba1a03ff352edb89a0cff9550e7d59f3f4e116ff63a22c6e8436ef6b8
diff --git a/media-plugins/gst-plugins-jack/gst-plugins-jack-1.12.4.ebuild b/media-plugins/gst-plugins-jack/gst-plugins-jack-1.12.4.ebuild
index a7e116b3c6fb..32af0f736361 100644
--- a/media-plugins/gst-plugins-jack/gst-plugins-jack-1.12.4.ebuild
+++ b/media-plugins/gst-plugins-jack/gst-plugins-jack-1.12.4.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPION="JACK audio server source/sink plugin for GStreamer"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND="virtual/jack[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-jpeg/Manifest b/media-plugins/gst-plugins-jpeg/Manifest
index 338c92902215..1a884c2b0cbb 100644
--- a/media-plugins/gst-plugins-jpeg/Manifest
+++ b/media-plugins/gst-plugins-jpeg/Manifest
@@ -3,5 +3,5 @@ DIST gst-plugins-good-1.12.3.tar.xz 3487448 BLAKE2B 2c27918f8020c50078b983244e9a
 DIST gst-plugins-good-1.12.4.tar.xz 3489992 BLAKE2B 41715d3e9bda183706d87085bc8cca546720f20e32fd5ecf6e284814745f2fe8ba4cfcd244e50d0734e57dde26944539b8273879608d3042262bfc10f82cc2b9 SHA512 18f270c01be80fe5b026e2c26db3ec200117ffd99c1dca55a8a78f0bd6dcc4701126836e52a410f179779e363f11218413c7b4d13e96ef5ee1bfa82e79a81178
 EBUILD gst-plugins-jpeg-0.10.31-r1.ebuild 426 BLAKE2B b6689d5335b662aeed278f862e6cbae10463ebaf789768e18d9eeb4728f32c07b4b9600cffd45d26baac82944bdd4c4bdc3dea25d1d4e3991e63da27c0845c9e SHA512 585c281477672f655746d9b0872b825c7cfffdf839ea9940c8c5bb0318aff5a2e4c0284f3c136ba828019170de8824535b5ef8107c885fdcac2cfd6fbfb0b2da
 EBUILD gst-plugins-jpeg-1.12.3.ebuild 375 BLAKE2B 6119cd75ffde9c3e03d124ebb1a8dcfd0c8a18f55a5c07275296c91bb84804017281f6d5072d631de65b529b82856a396abe2d42edf33f64fd51f5db7d6be1c3 SHA512 69a166ec842cddbb832a943fad6e4e192d70e9f7063e37a85d84b671811785277c54bdf2805ee491011cec21fbd5fb19d7cf11beeed55f266c5a4dbea86cb20a
-EBUILD gst-plugins-jpeg-1.12.4.ebuild 378 BLAKE2B 35dd41972a5f272a0234832067efc4ed2cb337b8bd3abc12f439a9e8069abf93a02eae8ce5d1b399f9c10fff187c2c1a3727301d9879452781af57e516012f7f SHA512 44b3dc57fc35ed1f1ace36d0813c0f936890b3f069c72613a8300b54054c7f9b6758865656ea0eab4f4a6d0518b9122fca0c3c8ddc9b085f79ae439f68d8d64f
+EBUILD gst-plugins-jpeg-1.12.4.ebuild 376 BLAKE2B 2fd674337aaa61ae88a20d48f3d260b059695b92f0178e011767a3a4ad2c2dd366c338f0a02998d0d4f4424810bb8a9244a1238a3561c221803c6fb0c9db0f9c SHA512 3d98f64e2443bc786c3626894685c193eba597768446032b1e30aa41ea09b0c830f233c5aca27b3941a71d5e9d7095ec960777e46ccd06920c6852212295a26d
 MISC metadata.xml 659 BLAKE2B 8da81502aaf3eecb4ef62469b494598b329cb7e134511df9bd4269807882564e052ec76ddb50640203d96c08fa80deb3cb96d2b2c3c8dfae21fe296b87351ff5 SHA512 c4d076bdd3a4cf70540a9cc56c91a8e805f0a809065b629970158ca002f3cc03f3b7b91615121813030f510eb2e9a912aa4ca79504a20e023cc36f1fa3acf329
diff --git a/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.12.4.ebuild b/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.12.4.ebuild
index e98d31f0b824..0c798e64b54e 100644
--- a/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.12.4.ebuild
+++ b/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.12.4.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="JPEG image encoder/decoder plugin for GStreamer"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-lame/Manifest b/media-plugins/gst-plugins-lame/Manifest
index db6c773bea35..17bd52b0edae 100644
--- a/media-plugins/gst-plugins-lame/Manifest
+++ b/media-plugins/gst-plugins-lame/Manifest
@@ -3,5 +3,5 @@ DIST gst-plugins-ugly-1.12.3.tar.xz 903784 BLAKE2B f0a9538f8d3c2500470a721a998d3
 DIST gst-plugins-ugly-1.12.4.tar.xz 904592 BLAKE2B 6ec59cea23ba45e705fc3140530576232c758884cc7cdcc293022233f4aeb440918c147563706a7309253dab318190bd6484fe2ac21af4b54af61ede349a1e82 SHA512 920f5be5a060293319f4c45bf7f28e14953e897473a04e1c83bce61261365198a6dc2d7ad6cf5396b2bbdc35a5f77014741e902e67c00c3c6596680ab9924e8a
 EBUILD gst-plugins-lame-0.10.19-r1.ebuild 338 BLAKE2B d38330bec07d66569e856ee0f5c36e51cb5a086df745aa71161c442175a00f03fe5d33937bb40a6a1c46e38698061a94acaed332287e1d71686a1e88c1245a5d SHA512 13a168e21fdd2b0651d93d45689b5447b60f47bb98d6c43a2c0de7a4007fa6bef2847df7a2cd881a72655b003034cefcdddf154130cb769ddc5aa91d5ca61455
 EBUILD gst-plugins-lame-1.12.3.ebuild 391 BLAKE2B 6fbf5976fce88a3828231d7194f74b2e4bea94bc160d872ae7f4022acceef5054d895bce5b3aeb864e014574c26310c806ba87089ff6a295641712ec7979a36d SHA512 870af329ddb05fd5067cda99af7873955c2f9dbee4517a976346d565408b2a0e5d6e44e34a93b5a598556296ca998e89f3e67ddb0a477dc795bf29458e985c10
-EBUILD gst-plugins-lame-1.12.4.ebuild 400 BLAKE2B 08642cbc0588dc98516abc6eebf652fcc1f7ed19086ed622c63391a4229a2eb01d4f1b532f91aa8af28841b74b7aecf8253692d3f040f7e592df5b685f67c4e0 SHA512 a0d355efc249abfc57e5e5b75fc95a212d8f4f4a204ca9f53e5933987e86cbe7fb1ff23fac4381dad4d1439317244c25341365c11ec2e6d5039f656f6b3f68cb
+EBUILD gst-plugins-lame-1.12.4.ebuild 398 BLAKE2B ff805a8d805fb64f73561b4b309846fc969e849bf5cec4eb2cf64ec81dca6886bbbdf32f2394a6af4c9839ba0781b51184a5a06c16cc77ce765ed9c707f7966e SHA512 7a1b72bcb51c1103372cdeed775d4c7b86254f84d5112544af13b8bca65ba1f4d687911cf8095fa29398c01b0e9cf614b9c62c2a1daf98fecc95c5d0ee37396d
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-lame/gst-plugins-lame-1.12.4.ebuild b/media-plugins/gst-plugins-lame/gst-plugins-lame-1.12.4.ebuild
index e98cf768c92b..4125c8f8d63b 100644
--- a/media-plugins/gst-plugins-lame/gst-plugins-lame-1.12.4.ebuild
+++ b/media-plugins/gst-plugins-lame/gst-plugins-lame-1.12.4.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 inherit gstreamer
 
 DESCRIPTION="MP3 encoder plugin for GStreamer"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-libav/Manifest b/media-plugins/gst-plugins-libav/Manifest
index a1e550214136..5c3c5227e570 100644
--- a/media-plugins/gst-plugins-libav/Manifest
+++ b/media-plugins/gst-plugins-libav/Manifest
@@ -1,5 +1,5 @@
 DIST gst-libav-1.12.3.tar.xz 8791724 BLAKE2B 1d69be6a581d00ad939c1d35dd6913f03a816d7daee579a00fa3c39a2d936a3dbecfa576e98243fd2db4d3e76d9fa9b7b3799a00223436621606ba134a90c85e SHA512 33b380b7094afe1db57103eeeca5ae13db98a5bee6785f884a7ec8abb93a94f702eb52f0515f4fa27a0f157ecb0757cf3576df335dc456254f9a82567f5ab7a8
 DIST gst-libav-1.12.4.tar.xz 8792776 BLAKE2B 8feb2b6d6b8b0dd018d7e23718112aa803c054e344b190946e598f5af195a7f16c6b10191ff051d74e521b78fc478fcc62a38c4aa3cb5aac303a5b7a16cbda23 SHA512 80ef9b7e179c081996875e452f66a3c5124cb99b5439e15b6ed4edf43e7ed1821b56639eea0db24050f0d5291d2b67d59e884dd71ab9193b5d1820153976f879
 EBUILD gst-plugins-libav-1.12.3.ebuild 2158 BLAKE2B b11928ea20efcd064a9d8c0a9e076e1b6c6ab716347fe519b68c919e384d692954a65a9a2557f08600e8164bee7147bf18978e1428050d957164a464132e8219 SHA512 1372c442de3915736ed162a3c852dc39b22b5c5cbc86e0ffd5c0e33aeb3f0c462751b3b4dd077cbf7e022001c36aeea0ed891015b0f78c5ddd8cf4c4e048f21f
-EBUILD gst-plugins-libav-1.12.4.ebuild 2042 BLAKE2B 394319a471499ebbc7ddf3ce00bec5ea06ea119276ef910e5e1a46666b218c23007190b65c02ad4d88315bfcbcc2c5e128c103abaa9e0aec81d9b58ca3888a03 SHA512 c2c96397d1ed29c880d56fb8f89af556c3f513de95dd236709fc13d51d6e3e3188cda8b57ca6f7dfe8ae8ab4fda9972b7d8e439a49ccbdd66dd864fcfd89d37a
+EBUILD gst-plugins-libav-1.12.4.ebuild 2040 BLAKE2B f26b629d3cd4aa596f597edbb598044f9589379b5721a52e683eab0894d9a38751bf41f53224d9401a55d9afd05d60eb7b44fd3aaef55ac1c67f335271f8077d SHA512 87556338c9b5defa43c6e418f1174d275ed1bd490960f72de2e28940ebb78cc04a59a335ce162d9ae61f325928ba8d707c4b39988e67e143e2c72aee82d961ee
 MISC metadata.xml 266 BLAKE2B 3180109d2a1479e9436a76fb478dfb1b23db0daedbf0ef264a469fbbfecd858adf6ec01f3fdc5c56270d0a9e1e150ac947f4a1f893e967d6b1dc1f1b8f6d4ccb SHA512 aa2ce82fa0c848119ff309462722e1d7897da904f9e1dc9ae12dd61582823b69cf5a40faf8da0825ec397d2f01d44e82cb56730d9545abd619a17696091eca75
diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.12.4.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.12.4.ebuild
index c31ec5f9756f..d82ebcacc092 100644
--- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.12.4.ebuild
+++ b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.12.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://gstreamer.freedesktop.org/src/${MY_PN}/${MY_PN}-${PV}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="1.0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="libav +orc"
 
 # XXX: bzip2/lzma are automagic
diff --git a/media-plugins/gst-plugins-libmms/Manifest b/media-plugins/gst-plugins-libmms/Manifest
index fb8751d5a1ea..c227b6f0b85e 100644
--- a/media-plugins/gst-plugins-libmms/Manifest
+++ b/media-plugins/gst-plugins-libmms/Manifest
@@ -3,5 +3,5 @@ DIST gst-plugins-bad-1.12.3.tar.xz 4707000 BLAKE2B 1cb82e6f1c20d24a42ed0c7465e4d
 DIST gst-plugins-bad-1.12.4.tar.xz 4709272 BLAKE2B a4d1fec48fdd67fc66eb5588dbee820c22b19a41dda4f5643b1ae326bfc827cd4796fc7a523fb0a9758605952377a2491f4e53ea74237ca7841659dea4ddcbc0 SHA512 a8e281aee1f1d0bb3f171fbe4242e997c661cbfd0be78da3913c0f55d68d6b7c3d34cabfcdd8c25728217ff885b86a7bedc0be34a7b14e2eb2a6c6236753231b
 EBUILD gst-plugins-libmms-0.10.23-r1.ebuild 327 BLAKE2B ab473b2e83c130d09803f4f420abeff558bec080dddf0a9de6e262ffe4bea9dd3dd56147d84b12318910045c4a6e66ffd026a7d4aab28090265ec93c56443844 SHA512 634932db7bd44c120212219a943533789973660699f488110c2d52722ac4d63e295723b7c1a7b701544e5d04f3a28253cc18c3841ad757235ab98293bb5800d4
 EBUILD gst-plugins-libmms-1.12.3.ebuild 404 BLAKE2B 163bf98d799063327e726a0b5b3c2e04f33b8c7b54be6e4aa3d4d5ba59387df05789ade4ede4716844b082bf5a2f3df3082aeb87b3d13eb06f271e4ca4116ed7 SHA512 b5066fa3a6e522cd371e604979ec828de304124fc99fadc959f8d71de6e8072b4df5f4faeb039f00639c1b22fe59d6c6e5538f7a34c94f64fec83ba8363cc7d0
-EBUILD gst-plugins-libmms-1.12.4.ebuild 413 BLAKE2B 0c6f8fe0b8479a0f13749c2d8c6ada28aaded7cc8421d2089b123cab923c53eb7761d861ae5a4e4ee96099f93fdbb227c6bcd730c47b17c05f588b90cb026fe4 SHA512 02dc67bb4a5fe15519f91b2939046bee6ac5eaae205ffd2a245e56183e60dc702812749d0edf8c18efd75b0502405cc956c38c96d4d45fd12344ba36ae29f2da
+EBUILD gst-plugins-libmms-1.12.4.ebuild 411 BLAKE2B 505db181336c8ad1c1c7f44400f36e78ac70127879676e929d2cf643445cd53dfb616f47af508c923188a8c82b7eb076789779616ee16a5aa9615c7d831621fa SHA512 37c7128295838e8681e7b034c897087a1862468e9de459d8d3efc7ddc3ea9d90a7c1c6a30ed8f5e302539e98881e388cdc0edffafc34ab09d390d438ef69aa68
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.12.4.ebuild b/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.12.4.ebuild
index 66062f771074..427f145abdef 100644
--- a/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.12.4.ebuild
+++ b/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.12.4.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="Microsoft Multi Media Server source plugin for GStreamer"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND=">=media-libs/libmms-0.6.2-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-libpng/Manifest b/media-plugins/gst-plugins-libpng/Manifest
index beec6b11a051..16a5807b7d84 100644
--- a/media-plugins/gst-plugins-libpng/Manifest
+++ b/media-plugins/gst-plugins-libpng/Manifest
@@ -3,5 +3,5 @@ DIST gst-plugins-good-1.12.3.tar.xz 3487448 BLAKE2B 2c27918f8020c50078b983244e9a
 DIST gst-plugins-good-1.12.4.tar.xz 3489992 BLAKE2B 41715d3e9bda183706d87085bc8cca546720f20e32fd5ecf6e284814745f2fe8ba4cfcd244e50d0734e57dde26944539b8273879608d3042262bfc10f82cc2b9 SHA512 18f270c01be80fe5b026e2c26db3ec200117ffd99c1dca55a8a78f0bd6dcc4701126836e52a410f179779e363f11218413c7b4d13e96ef5ee1bfa82e79a81178
 EBUILD gst-plugins-libpng-0.10.31-r1.ebuild 361 BLAKE2B f52a7448f035e37a03d64a68e2119d73c42f0d20ed6331842ae68c7a37fde6220765f87222fe589288115fee1b63a7b3c5041db8171fa1f1801ea5afd6153c5d SHA512 2a43a507e1403266467bb352ab5de0746bbceedf1b9bf72d41a9f86410856f2b4f782acd3ca09b1cae9cc821d60d03508ef63b8d0b313550e650286577939365
 EBUILD gst-plugins-libpng-1.12.3.ebuild 366 BLAKE2B 6ad9893f47e27230b95249c2436a32d51d3a33258ab333b08ac6242f6bdf3271436315ba381deec6f2ea7875282c068c39a3e00f4570b1ca712aaf4fa29dbc23 SHA512 50cf86240470757ea7d3967656a0f3d53d15fb33f1bb3b787bb55f5cdff0c14ef274f66ac1134df9f69f6fcb9efc59090f0063393fec1dcfd53f83fc940d9951
-EBUILD gst-plugins-libpng-1.12.4.ebuild 368 BLAKE2B 8659c7f5c5bf3fec1a43ae6a126a97292af67094a3e0c8d04f5e0bff1781f1f7f20b3f6d7a152c43380d0cf19d70774054dcb3a396a8e8c7071d0c7d65789c70 SHA512 d11e92f8d95eaaf7861e43dba9c9b59306d6924406980021b59f1f5d98d7079d8aa75ea1f28717161b25bebf9d68e21eb51a64e8d7e47201c82d6cc662a8d5e7
+EBUILD gst-plugins-libpng-1.12.4.ebuild 366 BLAKE2B 0f3df80a0a6997889b5da7101deb4dc157360cb2bf342a432199a51bbc136a1b10100ec171c8713246d1b82ff627489902b0463c9d4ce5754f5f0eae148bbc35 SHA512 fe75cbf84a0ac798942749263e4d63ee9cf50365f0a3b3ce2809ed6c0b3f195f3bc0c1aec69b80c777480e4c0413053a3e1a7ab7d91d992fc445623b1394c16b
 MISC metadata.xml 483 BLAKE2B 3c07bc4538ab8a6e0f2ca484f7b67a41d60f672714f17a1555eb2ebbcbbf14fe8e16f21360007789400352d3c1540c1644fd1402a12b639306a3068e5c9be822 SHA512 6d536bf8813f1f4d6b402487852ef1372172cb42c01d0a57af6b70166896deea5db36bed91f78ea18c1cdb8f809e5b5514f2b91a7668efeea170bee422d8a3a7
diff --git a/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.12.4.ebuild b/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.12.4.ebuild
index 279aeaa69dc2..fcfb848ced11 100644
--- a/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.12.4.ebuild
+++ b/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.12.4.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="PNG image encoder/decoder plugin for GStreamer"
-KEYWORDS="alpha amd64 ~arm ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-libvisual/Manifest b/media-plugins/gst-plugins-libvisual/Manifest
index 265d9fc3b948..2849d492ea88 100644
--- a/media-plugins/gst-plugins-libvisual/Manifest
+++ b/media-plugins/gst-plugins-libvisual/Manifest
@@ -3,5 +3,5 @@ DIST gst-plugins-base-1.12.3.tar.xz 3117364 BLAKE2B c5c16f1b46b10cfc5b9731ea9906
 DIST gst-plugins-base-1.12.4.tar.xz 3119468 BLAKE2B d5ac157618a25c8f0323d1922d5b26b0b5c49f56cb75df3ceeadd0566f873be1a06c863a1da6afff40901fbbbeb1ec6cd6ef4614309ca7f7ff988c0fa9040a10 SHA512 89a6e92cd294612cf1406eb156416ab4606643f6b43637e64a18f6f28ab789ca8d4cf1308434ed85e5fc679c79cc3ca115db48f37e0065a6ab3cdfdbaaad9f53
 EBUILD gst-plugins-libvisual-0.10.36-r1.ebuild 517 BLAKE2B 613be0fe785b8e48de8cf992817fb9f3de264430efa63d9067921565af06abd13bfe06c7794e83dd011d4e86f87853a188348558076ce6f97a27228004ec0c6b SHA512 54c26a7c8f82a1e2c7fa1f7fece6112bed1d6205d188a1368c5e101641d81009361b28e67caa8daf827817bbfe33a260eed0fc747b78d9ce18d8dc2ff8f7d9c0
 EBUILD gst-plugins-libvisual-1.12.3.ebuild 623 BLAKE2B 6300696bd9703bd6af4004f57479e804d65beaeda1b9085223d1ba82a8f54c9b72b6189f4c39430691b9c4e2d2c07585bad559222d6a0bddf582621499db37a8 SHA512 a83e8a034225975ed73a5e5319408cae4e37e336b7cf00619015b4d603001701014266a6fac1a125cbaea4620bdb15f95cdfcc589dc8084b3322b9b0040bf042
-EBUILD gst-plugins-libvisual-1.12.4.ebuild 632 BLAKE2B 33a8fabb0750b39499823eb763ff6badc33aae92542e41066c71e2dd7d874864e46b6b496e6f62d25a48c054073400d1e62bd6dcef50820599cb3ac2b244bf8a SHA512 242cb220c9788dee2e6dbae708f1e25a25ba6e695f4975953a05bbbd72ea08e11193d5f56521ed04e0327d7f0f7de2309c79ecf02782686c934d1c64d5d0ba62
+EBUILD gst-plugins-libvisual-1.12.4.ebuild 630 BLAKE2B 4084a324e5630ba3f4d52fb7eec752ce7148fcfa958db0e58cb331ec987c32b9d3d762d7b996de5514a96714375365c7e2dd4dd165ad94892bc38d27f6f3850b SHA512 4566123585417a4ac83b9bb4373c19eea2186377aa9bd669ca8069477d624310bfdc78d0c3831719036f7db2da362305dc0237443071fe86512b5b30f3424325
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.12.4.ebuild b/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.12.4.ebuild
index 360497d5f0b7..ebfda4e73175 100644
--- a/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.12.4.ebuild
+++ b/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.12.4.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-base
 inherit gstreamer
 
 DESCRIPTION="Visualization elements for GStreamer"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-meta/Manifest b/media-plugins/gst-plugins-meta/Manifest
index 391780aede64..35941e270423 100644
--- a/media-plugins/gst-plugins-meta/Manifest
+++ b/media-plugins/gst-plugins-meta/Manifest
@@ -1,4 +1,4 @@
 EBUILD gst-plugins-meta-0.10-r11.ebuild 4380 BLAKE2B 90b2d3511987d3a9bc6f8cf6f0a44fc616015280a378ca50ea1fbb1e1531305fc8c0331f3b77da8e3d6a03628cbff879d75664cd569f7755c850a271d01ba83a SHA512 e047adac8d873c0568a59afaba4eeac62ff3e1822309096ac0b9a337e730d2ad8b204a3cce0385ac63c36f922a6181ef22be1ed0a0a4f9b7637ee7f34a14e6e3
 EBUILD gst-plugins-meta-1.12.3.ebuild 3734 BLAKE2B a353f8539dd3217ee9362c1d7583ceb8a8412b74449affcb776edeac7cba0e4b73e00894869753991438460543899a1fbb1e44160b770e83a95134f6ccdcf643 SHA512 65a90a76f581659da6bc0fc927f72d01df92b30bf442eeabe454adb3e50dd4edfddc4495f8f788a19a4496c7cfcf8c8b50c6c1c2134f7b82cf6efbc45f8add14
-EBUILD gst-plugins-meta-1.12.4.ebuild 3760 BLAKE2B 75fb165b78ebeeb92e6595b8b7c8dfb008a440616b1c8bbce43d224486c11f942f9234c421b7034ea6a9186e60f8809817c7725c7e6c0147f3723c642a999d05 SHA512 176dc6e728c295899f45994e13ff1629805dca08b6acca55987ef50d30a6b7b402b70c2e7a63e3e00f9feac73b067824d17d4859c00583739633b380d860e2d5
+EBUILD gst-plugins-meta-1.12.4.ebuild 3758 BLAKE2B e8ef288159540fc4d4996bc3aac63a5b855c48426001d373f946c08973c354ec24e39ce015de128c29341f9c7305d54f523c55821de47af363aa6f66fb01006a SHA512 c9afdb06895118abfcb7e407b561110bfe8085be682dbc891c3fb0c419c465192241a0be62242fea86c51a673086212c81acd5838895effa546f1ccd8cf6b624
 MISC metadata.xml 1054 BLAKE2B f766fa7d1ffda2bdc4523f242deaf22b13cb3e89f979071a90bbe1758785c797eb1d08ff318978b6375d5cbeb7db59bcdbd4d7f27b979b3aabdfe28b01d9b902 SHA512 604995aac26c05be7a4ec9bb1632420f96e930536c344e1c059f70c3eb13a3e1f1c604fbd95a8201b0ff3d727af0830f788ff14edf399b8c3a1d48de93fb490c
diff --git a/media-plugins/gst-plugins-meta/gst-plugins-meta-1.12.4.ebuild b/media-plugins/gst-plugins-meta/gst-plugins-meta-1.12.4.ebuild
index 21977e8654db..dcd283104d85 100644
--- a/media-plugins/gst-plugins-meta/gst-plugins-meta-1.12.4.ebuild
+++ b/media-plugins/gst-plugins-meta/gst-plugins-meta-1.12.4.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gentoo.org"
 
 LICENSE="metapackage"
 SLOT="1.0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd"
 IUSE="aac a52 alsa cdda dts dv dvb dvd ffmpeg flac http jack lame libass libvisual mms mp3 modplug mpeg ogg opus oss pulseaudio taglib theora v4l vaapi vcd vorbis vpx wavpack X x264"
 REQUIRED_USE="opus? ( ogg ) theora? ( ogg ) vorbis? ( ogg )"
 
diff --git a/media-plugins/gst-plugins-modplug/Manifest b/media-plugins/gst-plugins-modplug/Manifest
index e34ecd465e65..3e47268a2608 100644
--- a/media-plugins/gst-plugins-modplug/Manifest
+++ b/media-plugins/gst-plugins-modplug/Manifest
@@ -4,5 +4,5 @@ DIST gst-plugins-bad-1.12.3.tar.xz 4707000 BLAKE2B 1cb82e6f1c20d24a42ed0c7465e4d
 DIST gst-plugins-bad-1.12.4.tar.xz 4709272 BLAKE2B a4d1fec48fdd67fc66eb5588dbee820c22b19a41dda4f5643b1ae326bfc827cd4796fc7a523fb0a9758605952377a2491f4e53ea74237ca7841659dea4ddcbc0 SHA512 a8e281aee1f1d0bb3f171fbe4242e997c661cbfd0be78da3913c0f55d68d6b7c3d34cabfcdd8c25728217ff885b86a7bedc0be34a7b14e2eb2a6c6236753231b
 EBUILD gst-plugins-modplug-0.10.23-r1.ebuild 448 BLAKE2B 79098c3f7e021e91c3d3ff1c42bdd2a2ad5209cb090564ebf9a59948407ed595ad5ee62c5405b9ff84ae2a5812c1e175820060a7674099d74e54335d21044926 SHA512 fca50e87abf1b0da7daec6b60c57656cd66ffc3a260694866eb63ff0118bf72f156efb9578c4506573da42ad9c011a2a38e08193bff1c1c815d5c386aefcfa50
 EBUILD gst-plugins-modplug-1.12.3.ebuild 363 BLAKE2B a705c8a4c2c9db5ff7585a4a7b54de91461682848935d0deb66f7ef1c82c870d22624db4cc556c073c7a9d491bdbb76ca8a95f65f92028d03e955601dc190517 SHA512 6ef6a89ba2c993879b41227d7d90068a52bb34001280e4852647822596a3e76cb386ff052e2a313aec53a875e4d709a8a118642eb8b50b2857c5419ba2ff76cc
-EBUILD gst-plugins-modplug-1.12.4.ebuild 372 BLAKE2B e486d94fc3648c440e6747bb442f986bf2c5aa49fe7e9ba80e5ae1ff02d1e212a14a3e777b40ab9d83f2ededd84d71dd690f8aef1f1d0b9ceedcf23ae0eef2de SHA512 40def595aa4f281a702d937dcf58ddb53e60926014bb42bc56aaac3ea8018080948b2f2421f47204f2d0e836df06ae339266c262ea83ae53422454e077667688
+EBUILD gst-plugins-modplug-1.12.4.ebuild 370 BLAKE2B 1402cf6c9ba4f434307f4c80cd288e3a9f7f580a2089aebcc27becacf9d8d4204b0b8b6b0b73782cea00f2e64c7dd972e95dd21f9e0f21260dbcf813e987ec17 SHA512 77407f4ebffcbd27a7eb19fe480b7cd00e5584027b64adc1cd90ed54f928bb47172ae39d3a85bb92e528e07a94bbcbc989f1701073064a329a7f1194c4b3a1fd
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.12.4.ebuild b/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.12.4.ebuild
index 1132476fc682..16d538b354f9 100644
--- a/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.12.4.ebuild
+++ b/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.12.4.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="MOD audio decoder plugin for GStreamer"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~mips ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~mips ppc ppc64 x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-mpeg2dec/Manifest b/media-plugins/gst-plugins-mpeg2dec/Manifest
index c31fdb09e4e1..628678af78b1 100644
--- a/media-plugins/gst-plugins-mpeg2dec/Manifest
+++ b/media-plugins/gst-plugins-mpeg2dec/Manifest
@@ -3,5 +3,5 @@ DIST gst-plugins-ugly-1.12.3.tar.xz 903784 BLAKE2B f0a9538f8d3c2500470a721a998d3
 DIST gst-plugins-ugly-1.12.4.tar.xz 904592 BLAKE2B 6ec59cea23ba45e705fc3140530576232c758884cc7cdcc293022233f4aeb440918c147563706a7309253dab318190bd6484fe2ac21af4b54af61ede349a1e82 SHA512 920f5be5a060293319f4c45bf7f28e14953e897473a04e1c83bce61261365198a6dc2d7ad6cf5396b2bbdc35a5f77014741e902e67c00c3c6596680ab9924e8a
 EBUILD gst-plugins-mpeg2dec-0.10.19-r1.ebuild 425 BLAKE2B a282bc36a9b8b2c9756eecbcb44e1191a9a04db2d79f4d5cda5e85f5418537ae9b5318f4fea32d3f840c1b4bc9d4aabf5d9492a17a4bcb31a6ac893ced054026 SHA512 5e0127181a8fdac077ba6919ee56ddcccecb8944bc63f481c4880bf933545bb56f3213f561a3214505933f3ee24b6aa7a96c01549f4d60ba14bb763c7eff922c
 EBUILD gst-plugins-mpeg2dec-1.12.3.ebuild 421 BLAKE2B 126661c3478250dbde1b14574c8471187d626d8ebdadfb3286e124028ee7caacfd99b9f99859104edd0d3b8f8c5f134f86d60c9b008c3c8eb25b403da0d06f7a SHA512 a646db70db197046feefe0371909b360a4da9fdf49bd71fe5e51ffc3fd65f257d3b08431506eea533c905c8106c5814324b1c057857e1f41e2d61aa742d43ccb
-EBUILD gst-plugins-mpeg2dec-1.12.4.ebuild 430 BLAKE2B b2f2998296ef9a9633fc2df5ef14a866fecba3c337d3be4ef219b66818eb06bdc0af638c223cbc9299a33eff0bde27c512d0d27fd86a9ae7aa910de09e8133f5 SHA512 1b9c94c8daa0516de501bdc84112f7774f2ef7b4e676171be94cb6abc8a8a70943b1372c9b588e2516c9e2da07cba26b1ff70bce83aa8693694a944a774684cc
+EBUILD gst-plugins-mpeg2dec-1.12.4.ebuild 428 BLAKE2B 33472fc0616ec878f1a3ff4eb99b78b726346c32db97737752812fa36ea4bea8eab3888f9103d0a9a55a68847dd43fb5435604c06458c874feb412d8d584be4c SHA512 dc9a5d9ab738eee614b00b6872aded26f51fa51a53de00eeb22fa7077ad00f9ac2612d163b067f5bda5c8d866db7a03905cb213b126bab263ba22a9ce9b1121f
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.12.4.ebuild b/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.12.4.ebuild
index f091d51e3328..efb5863d09ef 100644
--- a/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.12.4.ebuild
+++ b/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.12.4.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 inherit gstreamer
 
 DESCRIPTION="MPEG2 decoder plugin for GStreamer"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=media-libs/libmpeg2-0.5.1-r2[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-mpg123/Manifest b/media-plugins/gst-plugins-mpg123/Manifest
index 7456567018c5..7baf64398077 100644
--- a/media-plugins/gst-plugins-mpg123/Manifest
+++ b/media-plugins/gst-plugins-mpg123/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-ugly-1.12.3.tar.xz 903784 BLAKE2B f0a9538f8d3c2500470a721a998d385af3611aaa003e1f0f315747f8df1680529c4c0332c5b4130eadfbcbd57d18b7fa1deb794e07cc9b0d8db22b98e27d9cee SHA512 9ca5769c325df3d2d97ba83d785fab08da5119f6d26c4ac4db72853af143477ea8fb7087464a8614b6e59f384463ac01087ee76cec2af8acd80a4dc15e392e34
 DIST gst-plugins-ugly-1.12.4.tar.xz 904592 BLAKE2B 6ec59cea23ba45e705fc3140530576232c758884cc7cdcc293022233f4aeb440918c147563706a7309253dab318190bd6484fe2ac21af4b54af61ede349a1e82 SHA512 920f5be5a060293319f4c45bf7f28e14953e897473a04e1c83bce61261365198a6dc2d7ad6cf5396b2bbdc35a5f77014741e902e67c00c3c6596680ab9924e8a
 EBUILD gst-plugins-mpg123-1.12.3.ebuild 361 BLAKE2B 57be3f0e8da1a2788f98489174437295de14112da6967ad90602186bcc2d6b7ddca39bb161105c11b05bb459ba8b39daf3bbb397418549a3f1d1989fd2757af7 SHA512 9975e5f6f6eabaea7375d380cbe8dbc78ba02f542d52035b150ee3066fd27f781a8c22f0eda66c6617722d63cfaebf32eb3c70792a2dd23ddb259fcf07823d27
-EBUILD gst-plugins-mpg123-1.12.4.ebuild 381 BLAKE2B 0a08f0aa4fa10f2924259cdf3421b2666e70e1563b90e57fab55944060b86b3b557d34ea820d84b342504e4616620466f508a707218972b02527e3ae20b51cbc SHA512 ec45a6d0b5868ba5678ab98dfbe33e4c17e07d1090e79a59555b0bcdd27291328d40816b786f60c72319c3f35e7fb42784d510d287b4a3a163d08a23827886c7
+EBUILD gst-plugins-mpg123-1.12.4.ebuild 379 BLAKE2B da21a6765202665861b3b93ea71ca1aae6ae11a1af0c45b73f153f28f2c78b6bc5f66da2c22d91083425a6cca38f08a0e28cab318ac66eb97e4dbed43275d05c SHA512 f41059684f24d1c3ec88fab46765fc87ebf484cb91d4ee06d92b8d87efff43a71d54bf25b749bc611d3ae84ea79b65748927c8968c86d3638ab07767175ccf43
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-mpg123/gst-plugins-mpg123-1.12.4.ebuild b/media-plugins/gst-plugins-mpg123/gst-plugins-mpg123-1.12.4.ebuild
index b68aefb663cf..5689ef13a65f 100644
--- a/media-plugins/gst-plugins-mpg123/gst-plugins-mpg123-1.12.4.ebuild
+++ b/media-plugins/gst-plugins-mpg123/gst-plugins-mpg123-1.12.4.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 inherit gstreamer
 
 DESCRIPTION="MP3 decoder plugin for GStreamer"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-neon/Manifest b/media-plugins/gst-plugins-neon/Manifest
index 192bc3230997..c1082b507dea 100644
--- a/media-plugins/gst-plugins-neon/Manifest
+++ b/media-plugins/gst-plugins-neon/Manifest
@@ -3,5 +3,5 @@ DIST gst-plugins-bad-1.12.3.tar.xz 4707000 BLAKE2B 1cb82e6f1c20d24a42ed0c7465e4d
 DIST gst-plugins-bad-1.12.4.tar.xz 4709272 BLAKE2B a4d1fec48fdd67fc66eb5588dbee820c22b19a41dda4f5643b1ae326bfc827cd4796fc7a523fb0a9758605952377a2491f4e53ea74237ca7841659dea4ddcbc0 SHA512 a8e281aee1f1d0bb3f171fbe4242e997c661cbfd0be78da3913c0f55d68d6b7c3d34cabfcdd8c25728217ff885b86a7bedc0be34a7b14e2eb2a6c6236753231b
 EBUILD gst-plugins-neon-0.10.23-r1.ebuild 485 BLAKE2B 439c33ac05a4da45e5f222748c300cee6066d60d32a5b0ae02edc3eff5fef3bac18f5312137180d7818d584f2021373d55b6bedcea9df50771c3c2e7f3472583 SHA512 fe45be60e56ac658bebf737e85e52865eaf86a5fa4087554138205b4ad65d7caaffa4d83b29f8c55e9336b13737c37a0bbe73cc3bf9b1b190fdfba2a9e1d5743
 EBUILD gst-plugins-neon-1.12.3.ebuild 339 BLAKE2B 5352360c80e78d2cd218fae077f304a54842868a6ad43909196d8aac5b0c24e3921206d0c76251b3b18cdfce4ce55527d5e7a49631f12bbfced2690d5674cbaa SHA512 e192628e85061647862a8eaab1007e104a2643aae9b4f4cb70168476fde1f9e81d041052cd478bea05d0108bb4c0fc67d2b4747a088f3756adddad33c0be610b
-EBUILD gst-plugins-neon-1.12.4.ebuild 341 BLAKE2B f94fc8355bcea10069765348359f8fbdf9cac4c63319268aeaf59623f9e05a270d68d93e398f4661435e6ae0a869b2e7bc8e6d8b10e112ce2868114cc304886e SHA512 3d94eec2eccd3bdff919e14918aaf29f1ce705c3b4fc7101ca03abda42b480b680a2413586386c8c09e443cd6c99ba072efc74b26fb4b85c8460590366a4dedf
+EBUILD gst-plugins-neon-1.12.4.ebuild 339 BLAKE2B a5d974816a8b3e8df9c01217d4deb4b19f1856d45ac8da81ec17a87c749747c5d8dd08b0b880eb4f9e2682b0a9452fce79ac6b0f9af2bef38cd570a7d4b8209d SHA512 9f9564b7d0f84488bf8c9fbb0666b833b8265cfcb1dccb45b9d37047b31cc4511d666aa5257d8bdac035ac0461cad6580fd1b3b032962db81c4166da87ab8ec2
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-neon/gst-plugins-neon-1.12.4.ebuild b/media-plugins/gst-plugins-neon/gst-plugins-neon-1.12.4.ebuild
index 51c088e77d82..225be30c19c6 100644
--- a/media-plugins/gst-plugins-neon/gst-plugins-neon-1.12.4.ebuild
+++ b/media-plugins/gst-plugins-neon/gst-plugins-neon-1.12.4.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="HTTP client source plugin for GStreamer"
-KEYWORDS="alpha amd64 ~ppc ~ppc64 x86"
+KEYWORDS="alpha amd64 ppc ppc64 x86"
 IUSE=""
 
 RDEPEND=">=net-libs/neon-0.30.0[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-opus/Manifest b/media-plugins/gst-plugins-opus/Manifest
index 1d5a2aa68f2a..95a16ba9395a 100644
--- a/media-plugins/gst-plugins-opus/Manifest
+++ b/media-plugins/gst-plugins-opus/Manifest
@@ -3,5 +3,5 @@ DIST gst-plugins-base-1.12.3.tar.xz 3117364 BLAKE2B c5c16f1b46b10cfc5b9731ea9906
 DIST gst-plugins-base-1.12.4.tar.xz 3119468 BLAKE2B d5ac157618a25c8f0323d1922d5b26b0b5c49f56cb75df3ceeadd0566f873be1a06c863a1da6afff40901fbbbeb1ec6cd6ef4614309ca7f7ff988c0fa9040a10 SHA512 89a6e92cd294612cf1406eb156416ab4606643f6b43637e64a18f6f28ab789ca8d4cf1308434ed85e5fc679c79cc3ca115db48f37e0065a6ab3cdfdbaaad9f53
 EBUILD gst-plugins-opus-0.10.23-r1.ebuild 483 BLAKE2B 6bb8cdf5374aae793161711f58f645d7dc0a9e0e984dd36ef440c86350d6af56f302acaa34233745509731ac228275b062b4131262baf636b40a6e77f821278f SHA512 5bdc5e46ed34feaa7b63fd6f5dadb6e6c7b623b05a6c22b0f5e893f0f6c1e9a243d6265f865dc509d460822429d446833172ece1549564d676b1154d2ef8cba8
 EBUILD gst-plugins-opus-1.12.3.ebuild 658 BLAKE2B 717918a4f782fc986be3a89e1510fa7700c7d33170bd5c97d548e484b8e8ad36c7721e13a8fe3d5df5b60fa1981f80570b6154e4e96319a5c480a4ba26c5a116 SHA512 f3c5d1611e6635ba42a0b13c9c1f000a6c4fa6d3381f08d916295ad7edaff3b75e15ef225e7aba1a72c85e9d50c294cca5e75f24e3304cd14df1d8ea9c06f780
-EBUILD gst-plugins-opus-1.12.4.ebuild 667 BLAKE2B b389cfc9c0dd1ff2d2782d4edf0dbf532856cddc3b12f0bf3e657e8b904927ca9b21ab11148a91973388681690978897c61a408ab7758f785a8eea16363911bc SHA512 84d649eebfa5001e81391c18772711b17aebdc57e694175cb7dc37635499c4801346686a3a93222a0e678eef906f7fe6111aaeb8e3cefb9432b0febf0b8c4d25
+EBUILD gst-plugins-opus-1.12.4.ebuild 665 BLAKE2B ebef6491b73603b37c607bc0e8822f4af7950118777810132960e710a43b9f93acbfcfba889634ad04847e74e072f102bfba004617b5ab8fbfff05263dfebed5 SHA512 7990b2e951e8378ed15d88acd3b9541364f241f231823ab7f9e6c08398fa09e021ab6a5aadb678f6a0c42c0b33c89e409a6ac1717f429d49e9e505f556e3d3f8
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-opus/gst-plugins-opus-1.12.4.ebuild b/media-plugins/gst-plugins-opus/gst-plugins-opus-1.12.4.ebuild
index fbe390b0a7b1..77406ec28075 100644
--- a/media-plugins/gst-plugins-opus/gst-plugins-opus-1.12.4.ebuild
+++ b/media-plugins/gst-plugins-opus/gst-plugins-opus-1.12.4.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-base
 inherit gstreamer
 
 DESCRIPTION="Opus audio parser plugin for GStreamer"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd"
 IUSE=""
 
 COMMON_DEPEND=">=media-libs/opus-1.1:=[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-oss/Manifest b/media-plugins/gst-plugins-oss/Manifest
index ef6d9f2e957b..5d87e455e570 100644
--- a/media-plugins/gst-plugins-oss/Manifest
+++ b/media-plugins/gst-plugins-oss/Manifest
@@ -3,5 +3,5 @@ DIST gst-plugins-good-1.12.3.tar.xz 3487448 BLAKE2B 2c27918f8020c50078b983244e9a
 DIST gst-plugins-good-1.12.4.tar.xz 3489992 BLAKE2B 41715d3e9bda183706d87085bc8cca546720f20e32fd5ecf6e284814745f2fe8ba4cfcd244e50d0734e57dde26944539b8273879608d3042262bfc10f82cc2b9 SHA512 18f270c01be80fe5b026e2c26db3ec200117ffd99c1dca55a8a78f0bd6dcc4701126836e52a410f179779e363f11218413c7b4d13e96ef5ee1bfa82e79a81178
 EBUILD gst-plugins-oss-0.10.31-r1.ebuild 367 BLAKE2B ee12205502d2dd27d73697107dee57116d4d47f2f45176a56b3e805922201d4a91be11b12ae0f3b65cf10b461ada4054bb0801cd4de1bd80c91b6ccfa15fbbb0 SHA512 cf6f4d422bf392ebe0695262b8468fca446c5451ba36c5ffe4ccbb3ecf867a2f373124edf1670ed211bfa9ea39d8f5afa98e245920ec9a14527037b9d5c8ddfa
 EBUILD gst-plugins-oss-1.12.3.ebuild 373 BLAKE2B 2cff73a1a01ae2bafc0cdc969fa6a926ef508421cd43d9e549205aa397e3dc3478b3026270977c25d4c574f81732564b0dcfdd4ce7219ec9ac28a5bf2202ae3d SHA512 a2c147868624cd2208d8363bf21e86e51204bcc1d5f84abb00052da352f304c547707e052cdfd6f8664e96e5b342cae8de1c5a86babf17579ec3f58905866999
-EBUILD gst-plugins-oss-1.12.4.ebuild 382 BLAKE2B 4a67531727b6dd008561735633154da031f2e812c2b78a0c10764c1151e95a6e5588c29d6d186a788d357062f353de74ebedc45613054a0ace2e43776a0d14c1 SHA512 da777ab3809d419e9a970e056a4d145e5ca184d7ca147f864fe046a8f1bf81465084b211c5bc60100b8bfca03c46c82261fd34ecc88064b36d6024af5ac81463
+EBUILD gst-plugins-oss-1.12.4.ebuild 380 BLAKE2B 54671349d17924db84f0e68b9a0572e497faa95133e1da01350b928bc5b2767199418ed392fce224b89828a9f68260ef7b076b7490433d26c926e50a55d14d50 SHA512 a08893122f723fcccba5b91de1cbdbf1f25675c73dc04deb50d74ab55e629a549790adb2e3a57a0c5455c001cdfd7e22b2f9ccd59641c269962c6e45a7203551
 MISC metadata.xml 488 BLAKE2B 72817781f31070fbba548a5a0e724d3a3a419f55b2c1ba1155e88f66b0f779d34fc5705c39d60ecc5c40a9ba47ed568aa2458c0557de1795ddacadf54b39a436 SHA512 6ab36e28308e33d9b2e74a419ed558c913510f23bee1fd1a58ff87c6937dc2c3b4c8c683831e771460258424e89797a6b8c5ebed95cb87506ae7d67c11b2c243
diff --git a/media-plugins/gst-plugins-oss/gst-plugins-oss-1.12.4.ebuild b/media-plugins/gst-plugins-oss/gst-plugins-oss-1.12.4.ebuild
index ef74bf0ff071..c902eb866cf5 100644
--- a/media-plugins/gst-plugins-oss/gst-plugins-oss-1.12.4.ebuild
+++ b/media-plugins/gst-plugins-oss/gst-plugins-oss-1.12.4.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="OSS (Open Sound System) support plugin for GStreamer"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=""
diff --git a/media-plugins/gst-plugins-pulse/Manifest b/media-plugins/gst-plugins-pulse/Manifest
index 12d690794cff..161054e98fe7 100644
--- a/media-plugins/gst-plugins-pulse/Manifest
+++ b/media-plugins/gst-plugins-pulse/Manifest
@@ -3,5 +3,5 @@ DIST gst-plugins-good-1.12.3.tar.xz 3487448 BLAKE2B 2c27918f8020c50078b983244e9a
 DIST gst-plugins-good-1.12.4.tar.xz 3489992 BLAKE2B 41715d3e9bda183706d87085bc8cca546720f20e32fd5ecf6e284814745f2fe8ba4cfcd244e50d0734e57dde26944539b8273879608d3042262bfc10f82cc2b9 SHA512 18f270c01be80fe5b026e2c26db3ec200117ffd99c1dca55a8a78f0bd6dcc4701126836e52a410f179779e363f11218413c7b4d13e96ef5ee1bfa82e79a81178
 EBUILD gst-plugins-pulse-0.10.31-r2.ebuild 451 BLAKE2B cc688af55730de520620886f87f68cb85ebcf476165bbfaed3e46d2afdb46db36eb80432e86ce791a8f25a6041a0b834c4d714e0b3e0f50f5c1e41a38f02a622 SHA512 762cc23f92d89251b3f92c57d796a0acd0c4904d6a0bedc475d54eb5f475949a34cd0d3ed5384922a35a15448e9ed81ed9efe4ebb8aa25f5ef9158a4f981311e
 EBUILD gst-plugins-pulse-1.12.3.ebuild 454 BLAKE2B c1aab9e11d16160656cbff75b9c304dbfd0b57d638f6eb9f503a7b6a9211e6d15a60055499c68dcb4c444e22d504b4e8595150a44cc257aee1da5fe41a78a38c SHA512 330f3777b1d89bf064fec2767cb650fece5cb10a987c1644c3f5959b4a76223416359ce10cf4c12f589c5169c04ac68db2ba113964cf55dddc259851b1b84c89
-EBUILD gst-plugins-pulse-1.12.4.ebuild 463 BLAKE2B 53052c9a1175c3c95f51c9916771c7f3dd0be91013574accfe6fd78fbfa0ecfb8c884c35c313d8d3d652ccb89538e64fb1126186fb7e0010788dc5db0785ecd5 SHA512 864e76f77f2dff415c185fe04824527a7e8e6a3e68a18efcd103bc71f7d39c1cccaa2bcc21f507bd564435c1ab206e73510c3cb52abc0f8436417cfed3c14492
+EBUILD gst-plugins-pulse-1.12.4.ebuild 461 BLAKE2B 915aa168a025f7a7ed8c406eef81273a0cacfe58e279ff5d7373c97b6903604cf3d6a869c521f1a9e8a4f37b04c2554ff8066b045ccb7720f307f6a28b71def1 SHA512 f39b4ab2542eda3a3439623da3922a8af90aeb2c16d876d07a12f34a685f2e77fe633a7fee1f48d51ea7d82b533147ecc1dffd72b91268d9683487f3749b48e1
 MISC metadata.xml 610 BLAKE2B c8d30b8baa2a2dc5dc43b2a0f5badcb212567f7ce4873f58b1662b3454c8232a4916f10470bb98c3dae745f818f0e02d7266542d44d3fd4b9eb7edf99bf2a419 SHA512 0f0fa4496446fbaa649c3d76538c4960ca0d7918b40e305aa0da8516e79ef25c10136b0097fd687cb968c37de636b57ae667be1bc3197a571f557400a9c0c478
diff --git a/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.12.4.ebuild b/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.12.4.ebuild
index 8b1faf02f50c..2a2b0c7ed3e7 100644
--- a/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.12.4.ebuild
+++ b/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.12.4.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="PulseAudio sound server plugin for GStreamer"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-raw1394/Manifest b/media-plugins/gst-plugins-raw1394/Manifest
index 6aeefb6cc655..e948c549835b 100644
--- a/media-plugins/gst-plugins-raw1394/Manifest
+++ b/media-plugins/gst-plugins-raw1394/Manifest
@@ -3,5 +3,5 @@ DIST gst-plugins-good-1.12.3.tar.xz 3487448 BLAKE2B 2c27918f8020c50078b983244e9a
 DIST gst-plugins-good-1.12.4.tar.xz 3489992 BLAKE2B 41715d3e9bda183706d87085bc8cca546720f20e32fd5ecf6e284814745f2fe8ba4cfcd244e50d0734e57dde26944539b8273879608d3042262bfc10f82cc2b9 SHA512 18f270c01be80fe5b026e2c26db3ec200117ffd99c1dca55a8a78f0bd6dcc4701126836e52a410f179779e363f11218413c7b4d13e96ef5ee1bfa82e79a81178
 EBUILD gst-plugins-raw1394-0.10.31-r1.ebuild 517 BLAKE2B 1dd965a7a7e5e696b9a2f4a2138e15f2b6443869f08031571c97e0a66b71dcf22abf43e4aeef920fba787e14d70693f67d97ab24c3994c17bf85112d70ecdb2f SHA512 895bf265fa6c2dce27a71b5487c6084bb67f9a12d299e6eeed6171b7bb8fc60357793200426e88fd8a461601e4e5697b2b659dbae85db8e6ee94c07efe6dbdb8
 EBUILD gst-plugins-raw1394-1.12.3.ebuild 517 BLAKE2B fd4f06c953708f4de16522cf4bd22762af9ae1d2164b69be985ae8c2bfe040babd192db537133babbdbba638d8c39d4ab64ad24b412fb6822388fc9a3441d199 SHA512 9b21e9c4ba4924b44fcacbdd1d1411bfc4cde1530b6f7e0686aecbab018f17d83bbd18d4db08922e06b92624b14ba1cdc6387b2e52cf53975f08a950f7cb9417
-EBUILD gst-plugins-raw1394-1.12.4.ebuild 519 BLAKE2B 1ca0db55b7c599580526c0c1ca1c209e9cfc5041ce5e467fe3e967489fe4ff7c6fa2e89d20b01f68907664b15ac409c93700630b420abc86b48215eb6839ae4d SHA512 4930e073a75f068147d9b8990bde97ce09ce15ccc4a95a4e8a9f6d6099bcbcc464a964d846bda6373ab886c5ccacfef95d2a6b5380ea6defa2956bcf26118d65
+EBUILD gst-plugins-raw1394-1.12.4.ebuild 517 BLAKE2B b035768c2a3c4f90469bdb1bc994716991b08f181e4d429aa6fbee426c542bc43bdbfe353c116d3b1179a733948f6bd020508ff051a641acd83f958454bf8da4 SHA512 ca8842f89335058b7fa3b479cf8bf7fb260397417d87a4f901b85d2ddf1e379dd4fc217399bc50bd2cdf6703d0a23046bc5e0a9de559fdb58c6988f92a24bcc3
 MISC metadata.xml 548 BLAKE2B affa90bfebf1a2616bfe7262f0850227bdb4aac3580924c58fda8c1c9c89fb288252c921c73404149d02c8f1d38f61840301bdfdea01608a3db14e5e8b0b08a6 SHA512 ad3c3f4e095d868f0df4f869fe521f3c51ada956f578b995bd9e7161ef679c5c395434a76f4ddcfe1242dc37790e8f1ffe0167c8a50c686d434747563c151031
diff --git a/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.12.4.ebuild b/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.12.4.ebuild
index 92139c541c24..8e450889cfe1 100644
--- a/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.12.4.ebuild
+++ b/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.12.4.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="Fiwewire DV/HDV capture plugin for GStreamer"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-resindvd/Manifest b/media-plugins/gst-plugins-resindvd/Manifest
index 6fe215bfc1a3..32b6bb672551 100644
--- a/media-plugins/gst-plugins-resindvd/Manifest
+++ b/media-plugins/gst-plugins-resindvd/Manifest
@@ -3,5 +3,5 @@ DIST gst-plugins-bad-1.12.3.tar.xz 4707000 BLAKE2B 1cb82e6f1c20d24a42ed0c7465e4d
 DIST gst-plugins-bad-1.12.4.tar.xz 4709272 BLAKE2B a4d1fec48fdd67fc66eb5588dbee820c22b19a41dda4f5643b1ae326bfc827cd4796fc7a523fb0a9758605952377a2491f4e53ea74237ca7841659dea4ddcbc0 SHA512 a8e281aee1f1d0bb3f171fbe4242e997c661cbfd0be78da3913c0f55d68d6b7c3d34cabfcdd8c25728217ff885b86a7bedc0be34a7b14e2eb2a6c6236753231b
 EBUILD gst-plugins-resindvd-0.10.23-r1.ebuild 386 BLAKE2B e68fc74e19c19d205f904b3f5e576b10de64c2d46e9da71d671b729e63354ad85a33c39ef6d8a87a4555bad62c57dbb624900fb51fc0d7d636e57a8f65b0d120 SHA512 079db94e47930bd7886e03e3a51341709880847f945abe2ff4c75c54755850417b29cfa5e71fb0f710cdcc81cd858949c6e99744a4f7896395db299a97dca7f0
 EBUILD gst-plugins-resindvd-1.12.3.ebuild 448 BLAKE2B 858cf605c9e87ef8848cac7d409c888172e9fedb7c17da9cc946846f326352c0b25666f6a324b757a654940cc66ca1d433054ffefa54fc9ad45c1abef3cde459 SHA512 ceddb2790abba9cc3df44866f63e728e2520766207a581ebac2eca1ad4183e2ec7a57baf760033d36f5f0dcb0537d9c9584b26915e29d60de73abdb9e05ac8a0
-EBUILD gst-plugins-resindvd-1.12.4.ebuild 457 BLAKE2B 95a92e62d5676e5fc6cd27cd7fe6dc7e92f49068558a6c070bbb73a8a9c70fa9efdc75e86add2361cdeb81b26b0eb25a2305b526fbe358d2fef9fca18377d25f SHA512 2f29f29b7184822386694b502e9d14e376943a2bffbaac0a93abb58afccb324021d1ca2f6e44a78b848d9b3f99df57a93aa5b700247b785b287df8ff22e1ade0
+EBUILD gst-plugins-resindvd-1.12.4.ebuild 455 BLAKE2B b44884617b7b74a46974753fdf81bf62be4ecd3b8b90ed1a29302365543e9ffe88851046bf028c34473275c7efba298a72028b4db868112eb15b87071cad0486 SHA512 4e94913d467b75102846338606e152233152915b3075f9a3d4a05ea6f0102b011bbb23e010644fd993e85de30fcdc085b83ba05f7932db2ea59e503eb764e3e0
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.12.4.ebuild b/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.12.4.ebuild
index 7d7acc413637..5fbb3596d420 100644
--- a/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.12.4.ebuild
+++ b/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.12.4.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="DVD playback support plugin for GStreamer"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-shout2/Manifest b/media-plugins/gst-plugins-shout2/Manifest
index e3dd3302b70d..dcb0861a9769 100644
--- a/media-plugins/gst-plugins-shout2/Manifest
+++ b/media-plugins/gst-plugins-shout2/Manifest
@@ -3,5 +3,5 @@ DIST gst-plugins-good-1.12.3.tar.xz 3487448 BLAKE2B 2c27918f8020c50078b983244e9a
 DIST gst-plugins-good-1.12.4.tar.xz 3489992 BLAKE2B 41715d3e9bda183706d87085bc8cca546720f20e32fd5ecf6e284814745f2fe8ba4cfcd244e50d0734e57dde26944539b8273879608d3042262bfc10f82cc2b9 SHA512 18f270c01be80fe5b026e2c26db3ec200117ffd99c1dca55a8a78f0bd6dcc4701126836e52a410f179779e363f11218413c7b4d13e96ef5ee1bfa82e79a81178
 EBUILD gst-plugins-shout2-0.10.31-r1.ebuild 365 BLAKE2B 753c5cc142004f2435062960ef4ef440ab21a63457557dbb34e5af76d38a6edadd6ec70e2e500f6ae37f45991b0ffef70bdc58e3ee9f67cf2bfc89a14150c436 SHA512 c3b6f5fea3129b6345bfbdba61ed39b27d97e1f090780d66a4bad31722a578ab5b5248ffd526ec769fc12a36264d8a2f741a5775e19e919f81618342cf0f68bb
 EBUILD gst-plugins-shout2-1.12.3.ebuild 349 BLAKE2B a518e02d3ac53a278bb784a470be638d65840706f89b434d223ec7e8134c4e34c64369feb3ed73fb273563009161bc12da0dde455b665d322b5ec72c0787710a SHA512 a8191dd2f059b64c3b486d28d8c24896440b4862ffa5b06bd4fd99bbcb3bba306028ef727e10fa8d355ccb096a490ba611ea15ac456af46286c4d211510ddd4a
-EBUILD gst-plugins-shout2-1.12.4.ebuild 351 BLAKE2B dd64e32c52a6ff1683fdb7006c3f10261463f1aacccbb2a47dad72f27ad354626d27ed904972682ff0f67e96d459c208d4d59328291e43c6f0d5b7b4f6a9a6a8 SHA512 e98182e028d76d516176e3d675b91806516899dcefca46dceb8b294e57229be105334863036af99fd7f602e11f5b2c3365375947ddc25e2349c28d360bdd0ece
+EBUILD gst-plugins-shout2-1.12.4.ebuild 349 BLAKE2B 54a2d407fc3d3451f1a151f613a8163a59f4769b58490656c0304b175293263a56ab5c7013567ff35f773683ffb2737e59ecdd8962068de5899dc6d3813ab712 SHA512 530aacb197170b45bb6faed86f5ea19f7ac12d20aaacb294217d4cc6dde2327caa6cd0241c551c0adbe0e2c0bcea94b88c6e4d9ca8a8c005b2e6b31db55332d6
 MISC metadata.xml 478 BLAKE2B 4c7e5bbe6d79d01544434b93b998847f6c5e3fa7bf2b979c9ff0238d75c0f1ac5693cb4224073926b6cf098a661fc5064f9ba2db3dd2b121093ee78cf905b1ea SHA512 a24a36ebfdfc159df5e23891118ea4e21855a4db31c1ddee9a081c55597be4f34014adbf0a46712d202f1557f2a63e776382c86ce5193465f35868c91114cc52
diff --git a/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.12.4.ebuild b/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.12.4.ebuild
index 59a9b035ece4..6b0ad52e64b6 100644
--- a/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.12.4.ebuild
+++ b/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.12.4.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="Icecast server sink plugin for GStreamer"
-KEYWORDS="alpha amd64 ~ppc ~ppc64 x86"
+KEYWORDS="alpha amd64 ppc ppc64 x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libshout-2.3.1-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-sidplay/Manifest b/media-plugins/gst-plugins-sidplay/Manifest
index 698af2efe88c..a69684c55576 100644
--- a/media-plugins/gst-plugins-sidplay/Manifest
+++ b/media-plugins/gst-plugins-sidplay/Manifest
@@ -3,5 +3,5 @@ DIST gst-plugins-ugly-1.12.3.tar.xz 903784 BLAKE2B f0a9538f8d3c2500470a721a998d3
 DIST gst-plugins-ugly-1.12.4.tar.xz 904592 BLAKE2B 6ec59cea23ba45e705fc3140530576232c758884cc7cdcc293022233f4aeb440918c147563706a7309253dab318190bd6484fe2ac21af4b54af61ede349a1e82 SHA512 920f5be5a060293319f4c45bf7f28e14953e897473a04e1c83bce61261365198a6dc2d7ad6cf5396b2bbdc35a5f77014741e902e67c00c3c6596680ab9924e8a
 EBUILD gst-plugins-sidplay-0.10.19-r1.ebuild 308 BLAKE2B b1bb530617582fc2eb35e2d247cf6d3f1fea5e9d6df38c02d7bd00c0221082cebadd4e6d69a50cca8b5fbcc214feae6cc9f75304b88df2f14039c5f29b76130f SHA512 3dec5c4c01d3fad1d703a16acb726da7f438878acb859f867fc4e4747a8fa4407df11d054328b8f90cb84b22946924464f677a7a1373d409364b906d9b0a695c
 EBUILD gst-plugins-sidplay-1.12.3.ebuild 354 BLAKE2B 4f6f8d075cdc89e3c677dc856774a42ce49693db42b6320c4f073013f156ad142c8a12dc420b7e21b2a5421ba3422d9841bbbe60152c75742bc58e8f90631930 SHA512 59f043f64ad3e015f63a13f8b550a38827a2500602721d322d35a28190fdbb8afa379dd7ce20e1ed26fdae5265c5ce55047a5ed9e3f832047ac651711bdda5c2
-EBUILD gst-plugins-sidplay-1.12.4.ebuild 356 BLAKE2B 7f2424e4d11ee1548d51497926cb278e16b79ca33891c441c53518c07f185a325035dd927147d3d001f244fb6a0cb4e90bb7be9403e32b30f79737c66a2ef770 SHA512 34e1356ea74ef06103af212c591967657eba797f25c64253106183d8567f7918451a6c5492abf1628f3f879b0b492e15f647ca3f5e51d1f0117a365c00f5099c
+EBUILD gst-plugins-sidplay-1.12.4.ebuild 354 BLAKE2B b2f3cb31ad97520462915e63242afc105e6f997b919b0f2736d7d66fb7aa68310215ba4803244a39e7eabb822599ebcc8baea8863e5c88d2633e03fa22e33df3 SHA512 9ec86213e301bd8a3505aa37f6c846431c1e5a81d6b1a70b62a84abca0290e757a7641365d0682c795677bb04022301d379a22f9423220d0c5da4a8cc2936e8f
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.12.4.ebuild b/media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.12.4.ebuild
index 7989bf17eff2..d95ff0bf59ff 100644
--- a/media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.12.4.ebuild
+++ b/media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.12.4.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 inherit gstreamer
 
 DESCRIPTION="Sid decoder plugin for GStreamer"
-KEYWORDS="alpha amd64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libsidplay-1.36.59-r1:1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-soup/Manifest b/media-plugins/gst-plugins-soup/Manifest
index 8d2bddeb71c1..15b6c6bcdaea 100644
--- a/media-plugins/gst-plugins-soup/Manifest
+++ b/media-plugins/gst-plugins-soup/Manifest
@@ -4,5 +4,5 @@ DIST gst-plugins-good-1.12.3.tar.xz 3487448 BLAKE2B 2c27918f8020c50078b983244e9a
 DIST gst-plugins-good-1.12.4.tar.xz 3489992 BLAKE2B 41715d3e9bda183706d87085bc8cca546720f20e32fd5ecf6e284814745f2fe8ba4cfcd244e50d0734e57dde26944539b8273879608d3042262bfc10f82cc2b9 SHA512 18f270c01be80fe5b026e2c26db3ec200117ffd99c1dca55a8a78f0bd6dcc4701126836e52a410f179779e363f11218413c7b4d13e96ef5ee1bfa82e79a81178
 EBUILD gst-plugins-soup-0.10.31-r2.ebuild 545 BLAKE2B 074f21224146bcd4fa25ad3116cf5c71955900a6608b0041eb9f9c7a20750713e8edbf91f0fb144ba18ddbaa7ae2781ae345f7634a22b17290aaf5dd00aebfbe SHA512 a204577538e6ce251baa4e50148d91800c0a541b07032b8ce9e7ea02b77413add2c8c0409540158e003c9ccd4cbec116d6723473347efc8c8b5227af6ddf9f7a
 EBUILD gst-plugins-soup-1.12.3.ebuild 417 BLAKE2B 23418c692a073a8a6837b66f62620640e0a62fa5bf8d76c593638e85e5200433475c9059bfa9bcec4a919fd201889f88d05404e8d90678ba79132435e73e4a44 SHA512 4cc33293e5185f2001aad7a1e772a554a49d40705b2779c127fb9eb60a86b09a10c6fb1dba069b15c6efb7d6fccef9482b06eef58d6b5ba7caf8ba6e0632c483
-EBUILD gst-plugins-soup-1.12.4.ebuild 420 BLAKE2B 46b2c7d4764323309f3ba7bdc3b2bfb8b19eaa5dcb71694a8f3c6b09199274361196e4e6d0b3ee74848872998f9401bda2ffffea2afa8d25f7a35478f45728f9 SHA512 c945f2dd493f277a66d657033445ae92d7593ecb07e7b9215a627d237bc7dd80cfef2c826beab0b49fcb1ff9d402b29009cc249368d3eaeb2ff73b299faba114
+EBUILD gst-plugins-soup-1.12.4.ebuild 418 BLAKE2B 6fdf59cad2dbc65cc44e80408216bafa3ae7ab332bcab390ea961259650ffcca8327169248f0d4e81a983bb6ec2e430a6c932370cfbcf3e4978b85c948b2f61e SHA512 32a068a3b0d04f580de5322a8853c4abecf0a745f8753140d4584da04c016aea13c1cde018c719d6f1f0aa0a4b5da118dfbfc24b3b15fd6edc79b136365a9d59
 MISC metadata.xml 552 BLAKE2B d1dddafba0b921d7484d1c52567a8b9fbecc611b5234bc602cef79c7953a2a3a9bb423bc929055127ab894506409ddd8e8a71cb432169b1370e65b83b2e4341e SHA512 ce8b5a2a0d33e00ef141b82b3c6d192e31b681f016f431f1306d2066677d7fac66135129f57d25f9d13644c9d3976baf74fa6e6f65f5feebee045b82d04e2d8c
diff --git a/media-plugins/gst-plugins-soup/gst-plugins-soup-1.12.4.ebuild b/media-plugins/gst-plugins-soup/gst-plugins-soup-1.12.4.ebuild
index 967f19d1e702..b95f1ce6cde5 100644
--- a/media-plugins/gst-plugins-soup/gst-plugins-soup-1.12.4.ebuild
+++ b/media-plugins/gst-plugins-soup/gst-plugins-soup-1.12.4.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="HTTP client source/sink plugin for GStreamer"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
 IUSE=""
 
 RDEPEND=">=net-libs/libsoup-2.48:2.4[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-speex/Manifest b/media-plugins/gst-plugins-speex/Manifest
index 05e9d3d27618..b580b7ef76b6 100644
--- a/media-plugins/gst-plugins-speex/Manifest
+++ b/media-plugins/gst-plugins-speex/Manifest
@@ -3,5 +3,5 @@ DIST gst-plugins-good-1.12.3.tar.xz 3487448 BLAKE2B 2c27918f8020c50078b983244e9a
 DIST gst-plugins-good-1.12.4.tar.xz 3489992 BLAKE2B 41715d3e9bda183706d87085bc8cca546720f20e32fd5ecf6e284814745f2fe8ba4cfcd244e50d0734e57dde26944539b8273879608d3042262bfc10f82cc2b9 SHA512 18f270c01be80fe5b026e2c26db3ec200117ffd99c1dca55a8a78f0bd6dcc4701126836e52a410f179779e363f11218413c7b4d13e96ef5ee1bfa82e79a81178
 EBUILD gst-plugins-speex-0.10.31-r1.ebuild 397 BLAKE2B 9e5bd661cd4645bfac227e49875a57bd7db528aa019b0d47e195cec55d683a763f018546f01b9f9bcef03adee13b8d8be5bceb49aa61d1297cbbaa31a1960251 SHA512 1ae0a70f8ea59bf9f7ffd95c4ae30565db22daa8ca9dfeac0c4207c588d58cd1ec431bdbb4fb33efa233af5a59f6e6f8169b234664fc35dcf33151fb076fa510
 EBUILD gst-plugins-speex-1.12.3.ebuild 382 BLAKE2B 875b499e11cd40f6b5eefd6b9720643bda6fe9addac556370d946fdd024cbb1a96f3eb29f63dcb8b2629414a45483edf58aaccd92c99cf68f9f8ed495274ab8f SHA512 8fb064d2c47f60a84b30ba96a87edb00986c04046e2e699393fd2ba197e4df66e1c821a30a69892d8abfb49ca0a15d3b548d2c5da0d626d29c81562cd44ccea4
-EBUILD gst-plugins-speex-1.12.4.ebuild 385 BLAKE2B 1766be6f4f0049a45851ff7985fd63593e161939e58ec5c4da8cc6b0e7dea2a65da78ced653c7a0ca69edfab7b007c414c84768185137bdf2f5878d2c30d92aa SHA512 7b48100b6201d6dcb098b2b0072602bddbae9595b2d8692484fa5d618c3a2ea585db8c0be384417b3df824e2d086ec710dafc4f34151be0af0bbdd2c9a3a0d18
+EBUILD gst-plugins-speex-1.12.4.ebuild 383 BLAKE2B 590a3d687ad6416ec0506dea5d2ec5e4434dfa81106eb23e4f728cb08b60f9ffa0a24df578e95395cc774878ca8b3d057aa435168dd31e71d69bf013b1d27534 SHA512 564ad55eeba95302e254d4880ed25e0ddaab91e219dac98e817d3641e8d714dac36e4d9786be99fe650f7f3c65ea6f1a4ba4f220bf5c050569b4471f56e36a8a
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-speex/gst-plugins-speex-1.12.4.ebuild b/media-plugins/gst-plugins-speex/gst-plugins-speex-1.12.4.ebuild
index b52723c7340b..7c6aa0cb2649 100644
--- a/media-plugins/gst-plugins-speex/gst-plugins-speex-1.12.4.ebuild
+++ b/media-plugins/gst-plugins-speex/gst-plugins-speex-1.12.4.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="Speex encoder/decoder plugin for GStreamer"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-taglib/Manifest b/media-plugins/gst-plugins-taglib/Manifest
index 385682472128..6e8ce3b67780 100644
--- a/media-plugins/gst-plugins-taglib/Manifest
+++ b/media-plugins/gst-plugins-taglib/Manifest
@@ -3,5 +3,5 @@ DIST gst-plugins-good-1.12.3.tar.xz 3487448 BLAKE2B 2c27918f8020c50078b983244e9a
 DIST gst-plugins-good-1.12.4.tar.xz 3489992 BLAKE2B 41715d3e9bda183706d87085bc8cca546720f20e32fd5ecf6e284814745f2fe8ba4cfcd244e50d0734e57dde26944539b8273879608d3042262bfc10f82cc2b9 SHA512 18f270c01be80fe5b026e2c26db3ec200117ffd99c1dca55a8a78f0bd6dcc4701126836e52a410f179779e363f11218413c7b4d13e96ef5ee1bfa82e79a81178
 EBUILD gst-plugins-taglib-0.10.31-r1.ebuild 382 BLAKE2B e456720302ad92518b49532d7591b5044e5b92a6bcddce9cfc972d666a50ae6b60f1a4adfdcdcf6bf0be3ccbebb18d89a92ff1124c6c9ac0c89a7d97bbce4fca SHA512 169755c78931a29a3f7b0a4b8b0f430b2ad8e4e6990806d49fea709645d8fd90256d34fc734ea04c479872a87b44ad486866bd80c927449b3c8cd0cda7308585
 EBUILD gst-plugins-taglib-1.12.3.ebuild 393 BLAKE2B 650642bf6dd6cbcf6ee36fb023a6ec7b700557e1514dc8eef54e14dec123eed32d3bb95ddb7a94b2e68b8f822109624063d44a82eee3c9f0942c698738355740 SHA512 f3894386ad0a646cdbc74e091f4b81297fd6bf3aa6a0c0d54c61a31be51911950c464781cae1b734f2d60f8e6c3ef7c9afb47c7294c46a82be3e3d94599dedcd
-EBUILD gst-plugins-taglib-1.12.4.ebuild 402 BLAKE2B ffb62f3b4cbf28dce9053b7c9d574142151aec3793cef83281410bb73af46524fc478e23ab0c4d5c4225239e02f24229643d39db74a8a2bf5aa8215a7de0ead4 SHA512 694ea1fdeff0b19c458bca55d302c56c4bbc3d43a214712864a2d04e3f40753987cbd7385a4a3d0e26a36ef4673b2c18864508d3d4486cfa5b9955c2a22e3c23
+EBUILD gst-plugins-taglib-1.12.4.ebuild 400 BLAKE2B 275964d3455bd6f3d4b41efff400dd4c0df2863630c37439916f8575294ba96a25261abe5f7cf61dbd87f63f6913bda2854089dd8e42744fbfd55a0512d1e778 SHA512 53ffc1a1001ce584fcd0fd542cb01b11193ae54f58ee63e647dd17f8f1af9e08a75432dd3e2894219282b33bbe327cbcd70f2f9e9835c9b19196e675ae4dae10
 MISC metadata.xml 472 BLAKE2B 2ddad354e550883322f2276a979d7cace56275d6b0ebe9301c40a6204043c0a05b0efae27cea079bdf1c0c04b8f588ab39e080d8b0e4f405c0d0287a00c4c746 SHA512 8ddf53f0cf2e92dbc2adc5f4910b2a6fab0b0ac68eb9c9c33fd94809714d0f10d0d9d546df012a70c5d9a13adce7cccc232be4fc107b63c4649ba3ff0ff32444
diff --git a/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.12.4.ebuild b/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.12.4.ebuild
index fd7ca0dbeae6..5cf126bea948 100644
--- a/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.12.4.ebuild
+++ b/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.12.4.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="ID3v2/APEv2 tagger plugin for GStreamer"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=media-libs/taglib-1.9.1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-twolame/Manifest b/media-plugins/gst-plugins-twolame/Manifest
index 54d9f51f3687..01791b320971 100644
--- a/media-plugins/gst-plugins-twolame/Manifest
+++ b/media-plugins/gst-plugins-twolame/Manifest
@@ -3,5 +3,5 @@ DIST gst-plugins-ugly-1.12.3.tar.xz 903784 BLAKE2B f0a9538f8d3c2500470a721a998d3
 DIST gst-plugins-ugly-1.12.4.tar.xz 904592 BLAKE2B 6ec59cea23ba45e705fc3140530576232c758884cc7cdcc293022233f4aeb440918c147563706a7309253dab318190bd6484fe2ac21af4b54af61ede349a1e82 SHA512 920f5be5a060293319f4c45bf7f28e14953e897473a04e1c83bce61261365198a6dc2d7ad6cf5396b2bbdc35a5f77014741e902e67c00c3c6596680ab9924e8a
 EBUILD gst-plugins-twolame-0.10.19-r1.ebuild 314 BLAKE2B 9eeec5a6fa1280b33b7d2d3d14a3063875f1f9d84b47b07435b76aafa0ac79056ccf1c9abbc9ee1e41543ddd02480e1a682fd21f26e280227aa97d88fb825f7b SHA512 a8e948e4f0137097c3717a28fc4c506db7bea4635258275a84d9175debf26b7031be85ae44fdfa0ec81ea00923c6ef813786da2a1329b59afa4a9182e8dd0171
 EBUILD gst-plugins-twolame-1.12.3.ebuild 362 BLAKE2B a484b7c2ceae42b3f1250d00b506afe23f59c87dd29a9da4345c675b2c3249bc647082bee50fcb7e3cfc74f83f6561db4c71a30050f2adcc774d37dc31e7fa0c SHA512 2cc9e5ee0ca4702f7942806fa6d70ce4e4413b1eeb1d890906ef75bb5c29407ee7a469d86c67e33dddd2a689815ce61e04de0487144cfb0129c19310e4ee9c6d
-EBUILD gst-plugins-twolame-1.12.4.ebuild 364 BLAKE2B 26679c616d077cceb05f7d115d965fb3d4e00e6f3f42316e67ecf3230bc6194906fd579dfa712c70740cdd0d076f3dd5141fffc6f4d7a03e7df884bdb1478995 SHA512 d2218e463035844d654563b99750054982601591239bd9aafa1a102ff22b5aa6902035de5610e0f8e902cd086b37e6ab86c9d590c5b56ce52af3f50dea58c470
+EBUILD gst-plugins-twolame-1.12.4.ebuild 362 BLAKE2B b34421203ca10dc8c8f2ab513a4de1d3467c64925c6eaf816722114b055b2d7dd540b1bf75ffbaaa6f9d22f199fe00dbed2c5aa1f5c8e990a750e43d48f6b8c2 SHA512 338ca7be7be4225f36295eb15599f6e4403adc01fbfac3dbb70a6885728b8dfc66d252954d9af1e93df71cfe420b54946f466bf3470d0e709ea0ba3ad9eccbd4
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.12.4.ebuild b/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.12.4.ebuild
index a47109c646cf..004b6015c105 100644
--- a/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.12.4.ebuild
+++ b/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.12.4.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 inherit gstreamer
 
 DESCRIPTION="MPEG2 encoder plugin for GStreamer"
-KEYWORDS="alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm ~ia64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-v4l2/Manifest b/media-plugins/gst-plugins-v4l2/Manifest
index aa1e0685de12..958f2a8d2632 100644
--- a/media-plugins/gst-plugins-v4l2/Manifest
+++ b/media-plugins/gst-plugins-v4l2/Manifest
@@ -5,5 +5,5 @@ DIST gst-plugins-good-1.12.3.tar.xz 3487448 BLAKE2B 2c27918f8020c50078b983244e9a
 DIST gst-plugins-good-1.12.4.tar.xz 3489992 BLAKE2B 41715d3e9bda183706d87085bc8cca546720f20e32fd5ecf6e284814745f2fe8ba4cfcd244e50d0734e57dde26944539b8273879608d3042262bfc10f82cc2b9 SHA512 18f270c01be80fe5b026e2c26db3ec200117ffd99c1dca55a8a78f0bd6dcc4701126836e52a410f179779e363f11218413c7b4d13e96ef5ee1bfa82e79a81178
 EBUILD gst-plugins-v4l2-0.10.31-r1.ebuild 829 BLAKE2B 695b8b8aba7477541c7425d5a3dc5c50ee6fd62d8480cb8a440a6aa40b5c22861ea701d2ab7c9b355d7e42ef748e7cdc6836568184f0c9eeef4be078145cac99 SHA512 38b460f13965a518bf6910a0ffa60a1bd89c68bed5ee2eb07873bda27dcc55260ef6f4520b6a8dd97a8a4cc62215762b6003441d8df4484133dda6586a13ffb4
 EBUILD gst-plugins-v4l2-1.12.3.ebuild 659 BLAKE2B aeb02aa046aef7fa8c2d4459508941204caae68a266ecde13b10621ca81a0980876d508d6be44d37b0595700d4bcd1da1886c3405a252753175317926f12bdfa SHA512 7ef7f4cf276267442cc8c20e40430011d925cf6b1fbe08a3becd78de58b51522413d0e65f12ef377a040bafa2efb437032d30c060e7e7bac6e66659c0512f216
-EBUILD gst-plugins-v4l2-1.12.4.ebuild 666 BLAKE2B 198d804db245cf9311c75d1c80948bf19eb2ccbfec794983b8af3691fb60c56e59f215b736c2f5546f7a43bfefd9b41cc2285537e2046b67171566ef38c86b88 SHA512 4ed2f2f183ca8dceb00d9a3a11288f7a3b0d054dee2aef0f7987c59201931e0f67e2d5a28b1bba48a53e847f15461ef60fb0dad95e0cadec74650e72c9a29861
+EBUILD gst-plugins-v4l2-1.12.4.ebuild 664 BLAKE2B ca8066b64e60349f550a484502b58bb12ac7706f25cefcb26d1bd09d7e13cbf67cc582dcd67ff9558b2dd35bba5a2b93fb5ec5290d443bf8967690e8fcdcc9a9 SHA512 177b3b852c5f0aa01332d39e9cc3c13dee5d493cd8e7917fc5b54bde3cfd614a2e05cc0c468328480ea44e25726b5add6940eb649e8625170873da567618cf60
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.12.4.ebuild b/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.12.4.ebuild
index e33f2dba3883..e7a845ad0ac0 100644
--- a/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.12.4.ebuild
+++ b/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.12.4.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPION="V4L2 source/sink plugin for GStreamer"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE="udev"
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-vpx/Manifest b/media-plugins/gst-plugins-vpx/Manifest
index e29e695f5844..ce86bcb43b37 100644
--- a/media-plugins/gst-plugins-vpx/Manifest
+++ b/media-plugins/gst-plugins-vpx/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-good-1.12.3.tar.xz 3487448 BLAKE2B 2c27918f8020c50078b983244e9abc969bbf6338f65e42c2a74abb425f9e48e9cf2f71e89b92eefbcb9a3eff0ce765336b35b648a386214164cfecf66d03c2fd SHA512 8ed96d2b2c8724659cf8163be5246ec30c8a92d70fc6632e207ad258cff5624d6fc03576e6e674011bb88a4825c8ce225545bc7e60cdf66a173d9e1d4bfbbaa4
 DIST gst-plugins-good-1.12.4.tar.xz 3489992 BLAKE2B 41715d3e9bda183706d87085bc8cca546720f20e32fd5ecf6e284814745f2fe8ba4cfcd244e50d0734e57dde26944539b8273879608d3042262bfc10f82cc2b9 SHA512 18f270c01be80fe5b026e2c26db3ec200117ffd99c1dca55a8a78f0bd6dcc4701126836e52a410f179779e363f11218413c7b4d13e96ef5ee1bfa82e79a81178
 EBUILD gst-plugins-vpx-1.12.3.ebuild 446 BLAKE2B 5d21ca60b24a9b15e3a09294a475af4b2c52c32d6070e3b38dac01d5b27b0b32619f7e32db64471faf0d3641976d6ff1e19043ad07e122444f6bcd5428677b1b SHA512 99ccac7f3a58434c431d88f3e26710e28c10d4d9ef66ff003d7e3aaf504ce9a6b3f99256ae956c95bd58f1125a7af05e49912b579d6a2ea1bdd65440fbd3dff8
-EBUILD gst-plugins-vpx-1.12.4.ebuild 455 BLAKE2B 64e72499a9cbd9dc02b0dd51f9709e33a10355667ef958d61385e6a30f2e22de51dd2923b46219908276514468554c91f04c2b0275aa545a8f1aede6dd8e0257 SHA512 f539877620a92d20cddea0a717ed7219cec89ad8217348bb47922c7f18d0d233c6ee0dcebb66508915fdb22b6094843ee977f667b4c191c14d60359549dbc1e5
+EBUILD gst-plugins-vpx-1.12.4.ebuild 453 BLAKE2B a369cb3a759fc8e675731daf95f40ff1f5012d89f547a9b82b1e9f120e8198edf419f6c33ee1c7fcade4f51dcd43c7c63c7afe1cf5ddf01280ad828a6c70ad23 SHA512 e4c448557828cd7758c38d4b973de0a638f9850f0193d8c175584879f12f89914797581858af498130baa08a1960ac8f31da4e7bc345882d0d604505efae0aeb
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.12.4.ebuild b/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.12.4.ebuild
index 0789512c82ba..3f1f23d139ba 100644
--- a/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.12.4.ebuild
+++ b/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.12.4.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="VP8/VP9 video encoder/decoder plugin for GStreamer"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd"
 IUSE=""
 
 # VP9 is under experimental, do not enable it now
diff --git a/media-plugins/gst-plugins-wavpack/Manifest b/media-plugins/gst-plugins-wavpack/Manifest
index b062967c40c0..96f3729b96ce 100644
--- a/media-plugins/gst-plugins-wavpack/Manifest
+++ b/media-plugins/gst-plugins-wavpack/Manifest
@@ -3,5 +3,5 @@ DIST gst-plugins-good-1.12.3.tar.xz 3487448 BLAKE2B 2c27918f8020c50078b983244e9a
 DIST gst-plugins-good-1.12.4.tar.xz 3489992 BLAKE2B 41715d3e9bda183706d87085bc8cca546720f20e32fd5ecf6e284814745f2fe8ba4cfcd244e50d0734e57dde26944539b8273879608d3042262bfc10f82cc2b9 SHA512 18f270c01be80fe5b026e2c26db3ec200117ffd99c1dca55a8a78f0bd6dcc4701126836e52a410f179779e363f11218413c7b4d13e96ef5ee1bfa82e79a81178
 EBUILD gst-plugins-wavpack-0.10.31-r1.ebuild 397 BLAKE2B bc5868e4a430253b890b6a662334cf199b033a4497aec1764d42d3e12cf470c22e29bd0197cfad64ce8378a917331f610e2b972225bf795d87c9f63b68d37405 SHA512 c68e2de726862d5ced9680237511046c157fc0ea8cfff51bed4f9cc08043b6cc2a9808b6692ae751aaf57484e8543a609955c1cf22ef6c22df28a9d5f9ce2f2a
 EBUILD gst-plugins-wavpack-1.12.3.ebuild 397 BLAKE2B 1adc065fae7d94cf6d9847a2c6bf0943a241490e27bc7fb6aad67681304865ae5e40cacf84de166642c122a156cf6961d7b12738c7f266b6370be40c7300b735 SHA512 1d602f5afe89ba50e69be5d84d1d40fa5577329fceee89912a0c3ed766b09c644c1ce423deba90f3c0953b19f5ae98511351ed143e120efa43e7b684154fea60
-EBUILD gst-plugins-wavpack-1.12.4.ebuild 406 BLAKE2B 49e064cf852472a8703e6c60bec3a6d1bcf99eea78a420649aa812b921f02dc35a7d14804d2144dace0793a3d913bf72c3e9be9e1e92499dbd1c9f6a35e7b00f SHA512 9adb89f7ee2959feb3f6812b33bce434aca7127d73115e21b6f58edb2aac1d5c1be1c3c9d8590597c1dc8e69713d1142943b73ef80401b065dfff94623e31308
+EBUILD gst-plugins-wavpack-1.12.4.ebuild 404 BLAKE2B d604fdf86804080704c8ae6e56faa87a8aacef317ef32625ae223b6bee916f7253f19e23f7fb0b6075f0d0f60923b3cc8cacd3866c560b6d25e7f5000c52b607 SHA512 1d4355a1ae44c65390edcc750974cacdb409951cf15d9712fbd5ec97f572f80834e6e3bb8dc1ea6b4e01eb3ea6ea162a23b164072d66ae94d7f894699957b697
 MISC metadata.xml 529 BLAKE2B 137cd943fda3cba7c57ece2b4eff3c1beb0c694dd564f11a82249171fc2bf17448a18aabd2ebf4eb21dfefef07c9a0a8a749df48e79e7709b56634d4ad8a8250 SHA512 31c1c1b8f7e462a53d6bd6cc68c310f5236c6ba52f3fac37775a30dcc0448b2fba900c1b2ef16f31566f03a3b823aa6de02ccaf033f6ec587d64a175aa57ade4
diff --git a/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.12.4.ebuild b/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.12.4.ebuild
index e7a1a3b13cdc..32faaad2665a 100644
--- a/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.12.4.ebuild
+++ b/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.12.4.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="Wavpack audio encoder/decoder plugin for GStreamer"
-KEYWORDS="alpha amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND=">=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-x264/Manifest b/media-plugins/gst-plugins-x264/Manifest
index 06e05c759cb1..34bb25b125b0 100644
--- a/media-plugins/gst-plugins-x264/Manifest
+++ b/media-plugins/gst-plugins-x264/Manifest
@@ -3,5 +3,5 @@ DIST gst-plugins-ugly-1.12.3.tar.xz 903784 BLAKE2B f0a9538f8d3c2500470a721a998d3
 DIST gst-plugins-ugly-1.12.4.tar.xz 904592 BLAKE2B 6ec59cea23ba45e705fc3140530576232c758884cc7cdcc293022233f4aeb440918c147563706a7309253dab318190bd6484fe2ac21af4b54af61ede349a1e82 SHA512 920f5be5a060293319f4c45bf7f28e14953e897473a04e1c83bce61261365198a6dc2d7ad6cf5396b2bbdc35a5f77014741e902e67c00c3c6596680ab9924e8a
 EBUILD gst-plugins-x264-0.10.19-r1.ebuild 372 BLAKE2B f7006c1521c85e56b2055d838796f034df03ad12870391a4691b9b88b91c4fab6ff9d220c9bf350538bbd3231bf1aec91b0444168d1ea919bc1daec513a5e8ae SHA512 05405a265af0ac17d833cff4c17998af33560f49acffa73185f6bc11e490ade0292daf4ed06a75802d404a427eede3f8d663779e23932487ebf0ec6376c7e918
 EBUILD gst-plugins-x264-1.12.3.ebuild 426 BLAKE2B 4dbf0743912fd9d450800c5ce08779677d918aacf69e2213c4c95a790405909a83de3688e9306a571b2a0db847a1e149c4d568fce075ea657279d0306384a42a SHA512 590ba283a321adc7ba53dcdafcdfa1efa76b14f546aa110c45f168e1f5e655c19df11887fa476ebfceba892d5eeb8d810b117d6e8d8cc35758b67c8c72a3d7ac
-EBUILD gst-plugins-x264-1.12.4.ebuild 428 BLAKE2B 74b32a635f9792ca36e4e2f469086dcda99d2e026d32a02fe9a54fe59a3973487f6895bf29c0614566d673522693c3710087cc19adb69ba5d825fccd7c43fe6a SHA512 404571496cd25acc73d6bcb98bd0de1cabd0cae11ce4d3fbe9432daaa6ba1708c1a7a6063e78f8debe8b6c23de88a11b1475c3441d9d1db300d507d03f60864e
+EBUILD gst-plugins-x264-1.12.4.ebuild 426 BLAKE2B 4dbf0743912fd9d450800c5ce08779677d918aacf69e2213c4c95a790405909a83de3688e9306a571b2a0db847a1e149c4d568fce075ea657279d0306384a42a SHA512 590ba283a321adc7ba53dcdafcdfa1efa76b14f546aa110c45f168e1f5e655c19df11887fa476ebfceba892d5eeb8d810b117d6e8d8cc35758b67c8c72a3d7ac
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-x264/gst-plugins-x264-1.12.4.ebuild b/media-plugins/gst-plugins-x264/gst-plugins-x264-1.12.4.ebuild
index 59098d3af377..2fd6d7b3947e 100644
--- a/media-plugins/gst-plugins-x264/gst-plugins-x264-1.12.4.ebuild
+++ b/media-plugins/gst-plugins-x264/gst-plugins-x264-1.12.4.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 inherit gstreamer
 
 DESCRIPTION="H.264 encoder plugin for GStreamer"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd"
 IUSE=""
 
 # 20111220 ensures us X264_BUILD >= 120
diff --git a/media-plugins/gst-plugins-ximagesrc/Manifest b/media-plugins/gst-plugins-ximagesrc/Manifest
index 41aba6e978ff..67c59c0a34ef 100644
--- a/media-plugins/gst-plugins-ximagesrc/Manifest
+++ b/media-plugins/gst-plugins-ximagesrc/Manifest
@@ -3,5 +3,5 @@ DIST gst-plugins-good-1.12.3.tar.xz 3487448 BLAKE2B 2c27918f8020c50078b983244e9a
 DIST gst-plugins-good-1.12.4.tar.xz 3489992 BLAKE2B 41715d3e9bda183706d87085bc8cca546720f20e32fd5ecf6e284814745f2fe8ba4cfcd244e50d0734e57dde26944539b8273879608d3042262bfc10f82cc2b9 SHA512 18f270c01be80fe5b026e2c26db3ec200117ffd99c1dca55a8a78f0bd6dcc4701126836e52a410f179779e363f11218413c7b4d13e96ef5ee1bfa82e79a81178
 EBUILD gst-plugins-ximagesrc-0.10.31-r2.ebuild 666 BLAKE2B e5d07c16456bbfbebc1c0c1af97732c921883baeede744c31f5fbe057b4cebb3dc99ad5547a30fd53c22bddaf9945496a3d9bfc45a52d628d5625d4f04572414 SHA512 adf9acb7f342544bc6cc447c61709afa9d1c9c6e3736bbf0b7dc8b788a85e82dfbc46b6a13011cfaa080848da88b93935179fc7cf1eb3cf4ad40f64fdf0024fb
 EBUILD gst-plugins-ximagesrc-1.12.3.ebuild 678 BLAKE2B d66d2053be387efba2f4abe3269568c027acf6d1204d9fdc715caeb0e10947856b83d2876b57bc70b56815ff61bb77e9242b821e2f1088e6426c471d7dbf7a69 SHA512 0c354d876bedae182f99e17b3d9ea11f3bdb8e06091a45e6c3d59e08b6fca24c348b45cc74e7dbaef9431b48e052f9d5dd2fc650a3a729413db7f186ca1d25ab
-EBUILD gst-plugins-ximagesrc-1.12.4.ebuild 680 BLAKE2B fbcf9239a72aa3928adcf0494f80b2d694f09245024ebf1e5d33cc61e48a28f2773b2c856387f1e0f54f8a9efbf3ed6483330605b90b49921eaa5cfbe7ad80c5 SHA512 5ca766f2eb239c30a31d9ebd5b0f1c7a4716f8e481dcc19f5e6133a5e7bbed97732b9f860f03ed7f7e68742f89d8261da5b243200ca348e9e6ce68ab93a4d0ab
+EBUILD gst-plugins-ximagesrc-1.12.4.ebuild 678 BLAKE2B d66d2053be387efba2f4abe3269568c027acf6d1204d9fdc715caeb0e10947856b83d2876b57bc70b56815ff61bb77e9242b821e2f1088e6426c471d7dbf7a69 SHA512 0c354d876bedae182f99e17b3d9ea11f3bdb8e06091a45e6c3d59e08b6fca24c348b45cc74e7dbaef9431b48e052f9d5dd2fc650a3a729413db7f186ca1d25ab
 MISC metadata.xml 457 BLAKE2B 6af6de3816b28b279400abcc8e9fce070ce8ac5ce2f4ccbecff7d16ba0081bb277db520bd4efaeb07e48b220cf35baf09e0c68e7d99fab59eefc57c0881af49b SHA512 52d8e5e5f48b1e6a0f0e5742307348d66ec3302ffa32dc1dde2f98078621c242d431bf2354902f5ca17b277910cb733336219bc8c1598a1b4ea2c149fcbcf559
diff --git a/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.12.4.ebuild b/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.12.4.ebuild
index 5beb37b776a6..e9a0f3958ffb 100644
--- a/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.12.4.ebuild
+++ b/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.12.4.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="X11 video capture stream plugin for GStreamer"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/vamp-aubio-plugins/Manifest b/media-plugins/vamp-aubio-plugins/Manifest
index d44ec7a76a51..abba248a21f4 100644
--- a/media-plugins/vamp-aubio-plugins/Manifest
+++ b/media-plugins/vamp-aubio-plugins/Manifest
@@ -1,5 +1,5 @@
 DIST vamp-aubio-plugins-0.5.0.tar.bz2 26253 BLAKE2B dc05ef4d642fee389e60dee5ab46ad9679e641060a47cd084d5328067e88c325d007f9b317b9d46d0600c7cddb82ea7af156ab67330b23746dee6fa78adce2eb SHA512 7b1c13a91cb12b9e5f25a78ed31ccb4b5cfdabc8b3ac546dee776de1786008e6bb4471aa242bb4b128d202ea523e15efa4889e4f1c4189583b6d20d8b0dba675
 DIST vamp-aubio-plugins-0.5.1.tar.bz2 234156 BLAKE2B 99b064a2d2372a6c42e1251ac5d29d0cc607543b4e651c3b006106bad888c9ab22fcc2a907acde135d7e663187388a52c2513f8845501908318ff9d1c0b5df9b SHA512 ebbd8466ec3907d55e24824d7a725586df38212994f1398b75974dfac8e282dd8b2cb2a9381ad7e3da1a130b77936f109b36909b23591cc58ff176d6eb22625e
-EBUILD vamp-aubio-plugins-0.5.0.ebuild 711 BLAKE2B be4e3396a0a4562accebee7897d3ece44b74ba4a69cdaeeace2bb86bf62527afd8d17f0464de039c00fc848c660cfdcf04be1a7d3c46e628c5d1f29ae6233095 SHA512 258508f2072c4c72aae0a679a19a87bf2a2adba0610d53539a278633abb4b3926bec2a1b882ba22797a4a967e14b789acfc646b65d9fb1695545b299aa382850
-EBUILD vamp-aubio-plugins-0.5.1.ebuild 640 BLAKE2B 101f786a32b1e2e3296333818c0316a207e18a8d9c2dd0769bd989ad7d06ccc50a6486d2675c8fa414e13bcd07feb7f1d3596618ef892213daa7bb0a00e1635b SHA512 0e16c08c654d017ee24cefa782732ce8d64c086ac6d29202902aa8cbbe159d84ae638c9f9e51a6e3c55f9445499ad2c413602e070d1093cb78a1096e411ef38b
+EBUILD vamp-aubio-plugins-0.5.0.ebuild 713 BLAKE2B 5b57027d701cc2ac58eee1ba9c631846308ee5745d2333ba344d51d3df2a405f761bd777512ef95c4b3484ec00ba8d72f3a5a0e6fb024a0536b6ce2dda73d651 SHA512 6f3e282f95a70c6f2cd012a9fd25ea3cd687f41eab1dbb6b661189eab757c754483e830a6d38a174d591af50ba679117f8cc23b3bf8df5e3a14883e1ce2c2b9b
+EBUILD vamp-aubio-plugins-0.5.1.ebuild 642 BLAKE2B a6e51a131420a2a7799ee64c07760a012c663177223d84e7dcbad4d81ca0408c096d51ca167768adba71484e5fc624f595ab0c0eb9a39e6d9def02dfb9b95ad5 SHA512 5715fac75053e62e9a47109d2f2c3e286a01ea6c54a65b6abed2f07bca6f52b02e87777c9e2d4cb510dbb977ac4aa1387032c3f6eb585129ddaacf747823e110
 MISC metadata.xml 333 BLAKE2B 757b233440a9b77b19c9812c5469814f18f4ef144588f81520a2458aff7cb4b404ec0a9255f12409881593dce35bcc3c9893daec4fb71e24668904f3bcca1d8f SHA512 355bf8dc7fbdba79cd07d3b4754b301d368c055534932400dc46172a1b0f4d800490dee7ecc7187b6bff0e8be618434e5fe3030dbbba55622033e161c58f8fe1
diff --git a/media-plugins/vamp-aubio-plugins/vamp-aubio-plugins-0.5.0.ebuild b/media-plugins/vamp-aubio-plugins/vamp-aubio-plugins-0.5.0.ebuild
index 8e9631d772c5..81e440734f68 100644
--- a/media-plugins/vamp-aubio-plugins/vamp-aubio-plugins-0.5.0.ebuild
+++ b/media-plugins/vamp-aubio-plugins/vamp-aubio-plugins-0.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,8 +6,8 @@ EAPI=5
 inherit flag-o-matic toolchain-funcs multilib
 
 DESCRIPTION="Onset detection, pitch tracking, note tracking and tempo tracking plugins"
-HOMEPAGE="http://www.vamp-plugins.org/"
-SRC_URI="http://aubio.org/pub/vamp-aubio-plugins/${P}.tar.bz2"
+HOMEPAGE="https://www.vamp-plugins.org/"
+SRC_URI="https://aubio.org/pub/vamp-aubio-plugins/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-plugins/vamp-aubio-plugins/vamp-aubio-plugins-0.5.1.ebuild b/media-plugins/vamp-aubio-plugins/vamp-aubio-plugins-0.5.1.ebuild
index 21282eb80058..b8f7cf32509f 100644
--- a/media-plugins/vamp-aubio-plugins/vamp-aubio-plugins-0.5.1.ebuild
+++ b/media-plugins/vamp-aubio-plugins/vamp-aubio-plugins-0.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,8 +8,8 @@ PYTHON_REQ_USE='threads(+)'
 inherit flag-o-matic toolchain-funcs multilib python-any-r1 waf-utils
 
 DESCRIPTION="Onset detection, pitch tracking, note tracking and tempo tracking plugins"
-HOMEPAGE="http://www.vamp-plugins.org/"
-SRC_URI="http://aubio.org/pub/vamp-aubio-plugins/${P}.tar.bz2"
+HOMEPAGE="https://www.vamp-plugins.org/"
+SRC_URI="https://aubio.org/pub/vamp-aubio-plugins/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 8263098a036b..6890ecde97ca 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/ecasound/Manifest b/media-sound/ecasound/Manifest
index 51d2b8fca655..f2ba38cb3f8d 100644
--- a/media-sound/ecasound/Manifest
+++ b/media-sound/ecasound/Manifest
@@ -2,6 +2,6 @@ AUX ecasound-2.8.1-ldflags.patch 2560 BLAKE2B 04c7c17b44385839a3b9dd5da0bad9306f
 AUX ecasound-2.9.1-tinfo.patch 442 BLAKE2B fd9d1251bcfc8a05acae992b0e5baca334d118a3a2fd3d009b6239fb13e0b11e46131a8e94e215d168a82f176e3061f5789b86329a18814625df47733e3f4422 SHA512 c7d20dadeeb2e1b7dc1a611e1e2889bfb7ad222724f18d7bdd7334e0831183e957cc5f6097cf33fb15d2441ba941d2c90147cfd5ced1d50f05d142e1c04cac54
 DIST ecasound-2.6.0.tar.gz 966629 BLAKE2B 35539d80ea306f2ba38980838895c66a2f5db918854f0bd0d0cd1513d0cdaa00a9359337b469a41b8fa42cd88e7642e8393d91fdb1add277edfe77bde633e1cc SHA512 48b3c65e301a775499765c55b09bddacfde24bfd7a5be6c03389c7bda882abe98b061aaa39ec12a797e3a5a2808f446751155b36c263f0f12da2db1495515c5e
 DIST ecasound-2.9.1.tar.gz 1057333 BLAKE2B 37e337d379ef649877278a4a3736ef98cde57aeee5a547d3a8e3b9d81785a8a33c964680a6b6871a26d097520f7eab20b186291698869014ec9a12c2ced49b28 SHA512 b91fd68cb4809fdf62b25323fbf52c9bb7de6663287d5aa2576cc4fb28e322850b7020df2718ed6087f5d9f5f96692a476287378ea65853d01834523e8eb7033
-EBUILD ecasound-2.6.0-r1.ebuild 1724 BLAKE2B 66e48a09caffbc34571c79ba51c185a9eff167ffe138bb2b12c9ee7e874d9dcf92ad420d070ef982f5763bc3617f684d7729b736242464a88c7688b4e8a68c49 SHA512 3ac59b9ebff9cfd07473258c5489363a4b34a3c957f9af1fd9adbed3d72d1e620f72b06886ce5bbf7a9030cd921c939ceb4a3c01774774119a48f34f5dd0cc30
-EBUILD ecasound-2.9.1-r1.ebuild 2318 BLAKE2B ada746c2b6a2e544a9fd3638659b6da4b285894c4dd5ebecb00860b37b34280f4068830ef37c32874422615c055861c67bb0aec749b7e3a1c54cff910f8cdd92 SHA512 4ac154c8d5b2dec60d8516f358f1c2bd2fd250b12dbb8b8049f6c615ab3bfe5dfef7bcbdf52b0dc03c145ad8898957d802b419a3a22f02275ca69faf9510b904
+EBUILD ecasound-2.6.0-r1.ebuild 1727 BLAKE2B cb86bb09597a3acc6a6417234ff3acd299eb009ca00c57d0b8dbf617a6460d741df22d2f6ba9b8522ebe083ad6b5eb392f30f2bef0a8d5e6c00dbbd34f86e92d SHA512 decedce6d807ca441b8e70f0e5f24f0f60af1ecf66fc5883866fb2fb167b7e4d044d174d05f26c5abb4ce3e1ff8ba9a105a56be58099ac8f9af66483d92eeb2e
+EBUILD ecasound-2.9.1-r1.ebuild 2321 BLAKE2B 0ddf55f0f41c7325a685a46104600eb16f301fa9053b1a04d27ce75079c71da29e37bd022867e9765bf364b9d6ed75af9acbb34c9c07862bd86e5808631f1238 SHA512 8de3629ca871f4048dadc27aac20833a07b6dc93464913e1c9ae6fe5b117dfba5af0b0e613bec2bd2cbf9272477227a7cc903ffc6e025f5a31f68afc73895b19
 MISC metadata.xml 991 BLAKE2B 5730449cc175d580ae46d63a1a463ee8f417dfeab0fcc305903cc511020a2f24b2313ae09cb89d0f627789837a80ad2754b900ceb2e1a9a8ded661bf00f3ce4d SHA512 a057fab8c46cfec1f615671b8c511978c077362e4943134d6a572f141e9cd42dbc4a8d303fbd2d8c28b94d8423e5c0cf5105c352c0fab3a1bd18ff0a2141450c
diff --git a/media-sound/ecasound/ecasound-2.6.0-r1.ebuild b/media-sound/ecasound/ecasound-2.6.0-r1.ebuild
index 9db836fa9200..bab257a0d55b 100644
--- a/media-sound/ecasound/ecasound-2.6.0-r1.ebuild
+++ b/media-sound/ecasound/ecasound-2.6.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,8 +7,8 @@ PYTHON_COMPAT=( python2_7 )
 inherit eutils python-single-r1
 
 DESCRIPTION="a package for multitrack audio processing"
-HOMEPAGE="http://ecasound.seul.org/ecasound"
-SRC_URI="http://${PN}.seul.org/download/${P}.tar.gz"
+HOMEPAGE="https://ecasound.seul.org/ecasound/"
+SRC_URI="https://${PN}.seul.org/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="1"
diff --git a/media-sound/ecasound/ecasound-2.9.1-r1.ebuild b/media-sound/ecasound/ecasound-2.9.1-r1.ebuild
index 52575e945b5c..e9a6f5f90cf3 100644
--- a/media-sound/ecasound/ecasound-2.9.1-r1.ebuild
+++ b/media-sound/ecasound/ecasound-2.9.1-r1.ebuild
@@ -7,8 +7,8 @@ PYTHON_COMPAT=( python2_7 )
 inherit autotools eutils python-single-r1
 
 DESCRIPTION="a package for multitrack audio processing"
-HOMEPAGE="http://ecasound.seul.org/ecasound"
-SRC_URI="http://ecasound.seul.org/download/${P}.tar.gz"
+HOMEPAGE="https://ecasound.seul.org/ecasound/"
+SRC_URI="https://ecasound.seul.org/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="1"
diff --git a/media-sound/grip/Manifest b/media-sound/grip/Manifest
index aba2293d1f9e..2fc2ae8bc998 100644
--- a/media-sound/grip/Manifest
+++ b/media-sound/grip/Manifest
@@ -1,11 +1,11 @@
 DIST grip-3.4.3.tar.gz 740870 BLAKE2B d6b703d4ba08bf976a53e70772977a6b0fd5cd231fc16bf6a387497ad6db8e0ba2226ebe05d77135e7ec55911af0d3cd6cb7608da1452083335f9f8f46cbc182 SHA512 e7690cfe375de525f7dde7cc4d64ac9577f702a58bbd2cc1aa318dba58b208a8affe9e8e07078d6a16ba1340b0bd17edce1c8cf750631c8d677a3bd2679bb361
 DIST grip-3.5.2.tar.gz 952153 BLAKE2B e82ccb50636e68ab9862d2004a4dbe59399372b76a835b33350e539a186fed516e7b4961fe930b3beb5168554324a5bebeee5ef03d1cb7731d7f9d7c1fd1feb9 SHA512 25fbc1aadfcbab57ae585afe0a6663d9640a3614c1b655abd238f272116eccf524e4de465784265cd1f12b48c4cdeb9fdd318f989052400a0bfc9855a5420421
 DIST grip-3.6.3.tar.gz 960255 BLAKE2B 9aad33c04e98f60e5f7871e36f2e4bf616a16486482e7363d165ae7d9fc5343a52583e490b9b9757d31b051e6e96165d35931370e2681d727db7abb0854db2d5 SHA512 f94c5dc24a1355a024833992d05a7c05d84367a004607c9d6c7aa6d4bc24dd93b11e0a061689eb521a8abe637472011a1a4c8e968c48ac8447457cffc4d2957d
-DIST grip-3.7.0.tar.gz 961006 BLAKE2B 826656477ae4d26aa5d3a43cd08336a20144adf2cc0ad538afb288daea748c94b453f5752e4ace95888294e5d269b20ecfa6fd66d4e4b3316af00140d0d25b4d SHA512 bc2cbfbc1602a3639944009326e485195dbbab83a3ee15ab7291050ccc8b62dc52e052dca50a040335cfb20ff8d244c5315a15e8d940f6a9d89b2808d7876ca1
 DIST grip-3.7.1.tar.gz 961428 BLAKE2B 0c31b549577a1bbde17936e8e243d6fa573c6ac0c6035ea303c983c6ac26a0f7ddef193cea74a4148655f2305db97b3e74476bfe763fcbe77c656e012b4fe07a SHA512 812c6d0715e18da78b8657722697cf7b39b345f2d94c5a3002c6a512ff0482d4e96b58910e0c2fd459ac707a24754c6c491e66eac7692c49ec69bb869079202c
+DIST grip-3.8.0.tar.gz 961876 BLAKE2B 72f2bc01868b25f3722ba32b357c728935fef39f82b1c546c7930dc736c6a6c763b00864f41cd5d334bd5209098e5067b036f2c24731128cb7d75ae26074c6dd SHA512 f7b727e5061711ed213638fc281eb399543a7bf0a89c7ad0ab48cdabdb93a8ce3f898bcee6bd0ddb99a04c1c39985935c173f1d908625045d7bbcef514dc93ba
 EBUILD grip-3.4.3.ebuild 1207 BLAKE2B 014b3ae549e72ae4960820532e746337a3d821684f98e19619ab9314441c2be743df3e7049885c921bd5d09f837d275a661116a9c258cfce1008f7978a5fcb00 SHA512 e6fff5d8728217b346a200ee84bec062212be2a2b37e5e942f730d897e53983df66e032a72e7540be6aa83732cd9bd0bdf20566b66ebf6a37a21f1e909a6f44c
 EBUILD grip-3.5.2.ebuild 1214 BLAKE2B bc9c0ff5cd0ae7969eb7ceaa3b328ffacf090c3e76d828d0e9135bf57b50b872dbf9fa0da9abc0b33aae27e045361d306a1c990af424032d15a326a74cafbe11 SHA512 6da4ad712b0da1f19b2e851a4b6ea7122b97bfd77cc5e5a2393888cccf1a241b0cde2359bebd9486885df15cf890802993655370d404c4d8e31756f4e8191b92
 EBUILD grip-3.6.3.ebuild 1214 BLAKE2B 9f83fc44a41fea6a509a0c1f85f8f46d7a7bba8f0e161152dbd31f180ed1336a498d506057a6d7e40a2200b61fdf5d0f5185d4f7d0f9b7aef8dfbea9c9ed39b5 SHA512 ad6bfc7cee3c25c7c6ab4c274b8c98744f8cf6c5d28b0b7d8c88b1699c45a50cc93dcc73559bbb758d39bb339cc2f0a839d7a2e9c263739bcecb8f0e4120424a
-EBUILD grip-3.7.0.ebuild 1214 BLAKE2B 9f83fc44a41fea6a509a0c1f85f8f46d7a7bba8f0e161152dbd31f180ed1336a498d506057a6d7e40a2200b61fdf5d0f5185d4f7d0f9b7aef8dfbea9c9ed39b5 SHA512 ad6bfc7cee3c25c7c6ab4c274b8c98744f8cf6c5d28b0b7d8c88b1699c45a50cc93dcc73559bbb758d39bb339cc2f0a839d7a2e9c263739bcecb8f0e4120424a
 EBUILD grip-3.7.1.ebuild 1214 BLAKE2B 9f83fc44a41fea6a509a0c1f85f8f46d7a7bba8f0e161152dbd31f180ed1336a498d506057a6d7e40a2200b61fdf5d0f5185d4f7d0f9b7aef8dfbea9c9ed39b5 SHA512 ad6bfc7cee3c25c7c6ab4c274b8c98744f8cf6c5d28b0b7d8c88b1699c45a50cc93dcc73559bbb758d39bb339cc2f0a839d7a2e9c263739bcecb8f0e4120424a
+EBUILD grip-3.8.0.ebuild 1214 BLAKE2B 9f83fc44a41fea6a509a0c1f85f8f46d7a7bba8f0e161152dbd31f180ed1336a498d506057a6d7e40a2200b61fdf5d0f5185d4f7d0f9b7aef8dfbea9c9ed39b5 SHA512 ad6bfc7cee3c25c7c6ab4c274b8c98744f8cf6c5d28b0b7d8c88b1699c45a50cc93dcc73559bbb758d39bb339cc2f0a839d7a2e9c263739bcecb8f0e4120424a
 MISC metadata.xml 327 BLAKE2B 3e97916828952f228021896112537b6fa34d2dd248200e76de94e1bb2bb072b6ffb8d97ff69616ebd0d778cffe1aab456bdebea17ec4b93cdbf2cc273c8ed9bf SHA512 3daf9c932bd4e3392751cb3c89ffbaf77b4da1eb3acc20a5cc30bfb8a1d0bc054fe1012ed76499f3c24ca0b599fbdafe9357a7ed1f26b8c4e924a48ffeb8bf14
diff --git a/media-sound/grip/grip-3.7.0.ebuild b/media-sound/grip/grip-3.8.0.ebuild
index b664cc4ecb4e..b664cc4ecb4e 100644
--- a/media-sound/grip/grip-3.7.0.ebuild
+++ b/media-sound/grip/grip-3.8.0.ebuild
diff --git a/media-sound/orpheus/Manifest b/media-sound/orpheus/Manifest
index 58828c24245f..16b8e0d4550e 100644
--- a/media-sound/orpheus/Manifest
+++ b/media-sound/orpheus/Manifest
@@ -5,7 +5,6 @@ AUX orpheus-1.6-constify.patch 2123 BLAKE2B 9842e55e4b0418f77e7f88f045e55eb95353
 AUX orpheus-1.6-cppflags.patch 830 BLAKE2B a5a4d8ca2633fe31bf1b3917e7004578187ef8677a99cecb870e9e181276a2f9a03518989caf2816c52dd07c168cc6d2104b59b9d326786dd0d895a1a4633181 SHA512 4a8d51eb3ef9cadfa78c0d11ae264166589dc0a63f084f904bb7a698fda6aa570cfb940b3ad50b0fbff201d21df049369d92b7ed5452cff473ee2d7b60fda43f
 AUX orpheus-1.6-fix-buildsystem.patch 4231 BLAKE2B 4492870937746e814fc4784cbf4c6c71659c058d1547f87d298a9bb358f50172aa12c41c387d7c2bd32840552878becf1e6cf1b3305cb05f1fbf300f2884280c SHA512 829048f8d327751e78e23fb4304a0b1a9308521bcd47b23dc15015c9ce4a2d36533a6fff18d8903a107c63131bffdb89851088c53bb28ade769245c1dd25e225
 AUX orpheus-1.6-gcc47.patch 275 BLAKE2B 90f817ffe97c0f32865ed2b87a9ec7a044045fe478ace3d290ce0fdd5446e01ab496e0e57d5ff86e6039397c2e797d086485f8c3f3f8ec85aa1592ef294c2c16 SHA512 d502efb94e6cc1e1cb452a5c7f4ed4f662353ef1bb953117d725f8125a4c7f43713071089ce5df2ab9d8adb3f2b62b178e8869b2cf2b52681ba9f9510aa313d7
-AUX orpheus-1.6-nolibghttp.patch 731 BLAKE2B 032963a0a2b4e3a64f3391eb32f2771c89bb7d9591eb94d850ee0059afb9c3f987823ff66ad1a0ea3d5da71bb90127af025e997a45fc1871355f644a68e45067 SHA512 0757f7451fe0ce1d84e4ed710537daac09fff4ffbc14b9fa397cc00bf0c04ed8ad27785917d327ccd69efac10840b534f6379b2f3b020b9d1713fd801e13806b
 DIST orpheus-1.6.tar.gz 440553 BLAKE2B de5621aaf6962668bceebb35a95df7ab543b517cfe208346cdccab4f73f458611b65e4fef515c4f284d2fa83e8fc24aa77e8e6e1808fab489d056f10de7f7a99 SHA512 40f4ac7533449940370f29d4a14281d7f235ce711166e0e979f3e2a5ca37f792dc74b5267ee2a4f51af6c20f346c543d0d9f1fc88f47670971ad32f7c2856abb
 EBUILD orpheus-1.6-r3.ebuild 981 BLAKE2B 2294c1ad4f7e5cd8e14096b6448b8bcbcff6799c74dbbe77c41b5b30d011d8c6b1bbb6c11aec558ced3c401994758b24fad3743cd0ba1558fc71d162b86834df SHA512 a88c4f1fbab4be4c78a390e949ab1ec22a20104c2a3436e448b41c7c1eae64f7c4ea166b7871717733fa9b3440a64b09552d84ea8b96ee968de23f1dddb02176
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-sound/orpheus/files/orpheus-1.6-nolibghttp.patch b/media-sound/orpheus/files/orpheus-1.6-nolibghttp.patch
deleted file mode 100644
index e6a5f87a210f..000000000000
--- a/media-sound/orpheus/files/orpheus-1.6-nolibghttp.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: orpheus-1.6/configure.in
-===================================================================
---- orpheus-1.6.orig/configure.in
-+++ orpheus-1.6/configure.in
-@@ -30,8 +30,8 @@ AM_PATH_XML2(2.0.0, [
- 
- AC_CHECK_LIB(ncurses, main,, AC_CHECK_LIB(curses, main,, AC_MSG_ERROR(The ncurses terminal library is required in order to build the program)))
- 
--AC_CHECK_LIB(ghttp, ghttp_request_new,,
--    [AC_MSG_WARN(libghttp not found - the support for CDDB is be disabled)])
-+#AC_CHECK_LIB(ghttp, ghttp_request_new,,
-+#    [AC_MSG_WARN(libghttp not found - the support for CDDB is be disabled)])
- 
- AC_CHECK_LIB(vorbis, vorbis_synthesis_headerin,,
-     AC_MSG_WARN(libvorbisfile not found - the support for OGG tags edit is disabled))
diff --git a/media-sound/rosegarden/Manifest b/media-sound/rosegarden/Manifest
index ca077d3d04d9..74e5d4f031f7 100644
--- a/media-sound/rosegarden/Manifest
+++ b/media-sound/rosegarden/Manifest
@@ -1,6 +1,6 @@
 AUX rosegarden-17.04-cmake-3.9.1.patch 934 BLAKE2B a59bb497c2fa23f5161ff2953b2338c69d49bd5a5c8d73eefe542dc74c657079ca96d45a2f4db830206d5b71cce66667cf1257a9914da04658136993ce72d8ed SHA512 f3f285597be964aeb9625be9df2443c98ca902f7fe3f7db82ea84f96f0ab461be4762912a6cad30e2c085125394ba37cb0048fca3f8543e1ff41d7776eb671a8
 DIST rosegarden-17.04.tar.bz2 6454603 BLAKE2B cc028a4108f4c51c9f3559bb454a8344d03f31280db6fd51e98a0b39bdc10e29add97272e7dace848dc4b4ac384ba787ade6664d991aed14fa3101b4fdce2743 SHA512 23240522cba8cc3b5d0e3b29ee5b871c911c7634d74f65d04b353f59747bdf6a1bfd9985f16ab331ea2399a797e66b2ebd110e192bb52ba4df453d42d7b8f73b
 DIST rosegarden-17.12.1.tar.bz2 6692715 BLAKE2B 698ecfb58754ee292e589e0fb3618e2076a6e59dde1f06d15ed3bad43313cc79ed03307364350f5cd2323350173119ccc71b42c839d8498d360461a19801a96a SHA512 8bd4a464bbf2825d6c2fb8d36123e68d94de7f4e997c6ed8efc5670e87799781eb8251995890979c9d107d4fc58c636fe73e699c859c8e95aa567c4289958495
-EBUILD rosegarden-17.04.ebuild 1235 BLAKE2B 2fbed7c2c2f3fe2553345170fac28524618c2638c94aed6ef5bdcfbedaf983760cbadc66a812262e9bcc3e191f3d59bb593036d8a5086d74dd05c480ff009ffd SHA512 6a698dba248e5c1b127f67861006b179c3fb5ad45110a83ce0ae7d3a682748119fdcad8ef011478032f8f9a51e5174b1b56a4db8ebc84f77a296f613a57a4694
-EBUILD rosegarden-17.12.1.ebuild 1212 BLAKE2B 0b8214190c7d750933bc1cef8b266bf8b36a6bd54cac1d996854b31cb5de1b0882250c2e14c0298d5e105435552a3cca7941b96e84f5028a5fbb33fd00202aef SHA512 33f5b6f50a7fea72be1e5f3d2a7fdd6f545769fbd35c5038ad36e6393c707b603b00b19f56b17e0de526b23ef2a156063302680c6ec53145aa28cc150de4d923
+EBUILD rosegarden-17.04.ebuild 1236 BLAKE2B 57352999fe5e4779206b9c9b562ff651fb38a8f102718c8aaa9d583084b908101816c560171dc50335e6032172254b92e6ff4525b4f6b06a1dd1a649c5f0963a SHA512 6fe801a1b33637361a583047d7c1b3a1335efac616699137f1a8dd4d00f2a206e66e9386ec8332265c980ab757b85c652aa530dd66aa737e9680a7e7618daf04
+EBUILD rosegarden-17.12.1.ebuild 1213 BLAKE2B 04dfcfd72fb5b670bc534640e4c0c0d9876a5c6221d08413f5b08341ecdd7ba1ab1e860494e5f00e9c8f247bd44f48003cb43cd6019678a56dbdd440edd57c8c SHA512 266c5ff6c4d949c831988ae305b349c419462bfde898df9b7c15339e994f164975a2010859546ee33c6bf6446d29f2962cd4190b8389c42359fcd47364789ea9
 MISC metadata.xml 349 BLAKE2B 0f31b6c7f0aef5e0b487ddcdf963c1701cc3429870464de30409dd788422964adbf05172089315a6543ac858f4d5ae64773c52728f24da4dc06dfe9b1dcabf9e SHA512 1790ba05a4f13f358de6890c908b2f1eb0581143063b7237220dd05aba31d16d68f2cf6c4712a08894909b7de5306d592807e9f3171b66b72fd867bd339a0cee
diff --git a/media-sound/rosegarden/rosegarden-17.04.ebuild b/media-sound/rosegarden/rosegarden-17.04.ebuild
index 9aa12779d08c..53c373ddd12c 100644
--- a/media-sound/rosegarden/rosegarden-17.04.ebuild
+++ b/media-sound/rosegarden/rosegarden-17.04.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit cmake-utils gnome2-utils xdg-utils
 
 DESCRIPTION="MIDI and audio sequencer and notation editor"
-HOMEPAGE="http://www.rosegardenmusic.com/"
+HOMEPAGE="https://www.rosegardenmusic.com/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
diff --git a/media-sound/rosegarden/rosegarden-17.12.1.ebuild b/media-sound/rosegarden/rosegarden-17.12.1.ebuild
index c57f9b291ca3..2e2fb9280351 100644
--- a/media-sound/rosegarden/rosegarden-17.12.1.ebuild
+++ b/media-sound/rosegarden/rosegarden-17.12.1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit cmake-utils gnome2-utils xdg-utils
 
 DESCRIPTION="MIDI and audio sequencer and notation editor"
-HOMEPAGE="http://www.rosegardenmusic.com/"
+HOMEPAGE="https://www.rosegardenmusic.com/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
diff --git a/media-sound/sonic-visualiser/Manifest b/media-sound/sonic-visualiser/Manifest
index 90a24e1525fd..b66252866bae 100644
--- a/media-sound/sonic-visualiser/Manifest
+++ b/media-sound/sonic-visualiser/Manifest
@@ -2,6 +2,6 @@ AUX notest.patch 1545 BLAKE2B f0d6f44eed7811ce3a9c12f1044844a806214489787b90d2d2
 AUX piper.capnp 19756 BLAKE2B f852a7e9890e8e3fe3742115a10ffaa5d9793f48b37afc3d608f01f4548d799b00c7770186548384e9f5e85378c6b51167693cf25648aa5cdbf1e2ee353cce78 SHA512 c520116c978f8abbc747d3a465c006ec800cf1dd5f8f96f7c5879d88ae81fcc09f3a2640f9212b74f41f5b28269a17f35aac3521be946c66b599419c39a95720
 DIST sonic-visualiser-2.5.tar.gz 4112133 BLAKE2B 19a7c61b99c77ebb0b4d53f014aad282244b89b3a527cf69d465812468b87f97f6d33f2d8553066eb8aa9d985a913bf796cca5290426cdfc1f0082fce2eece23 SHA512 ec48456f5b089453ee9e8bdca5449da92b248a9278423b38a63dda4598b0496432337a152d8b296e8c5dcc2b434bc68c8d1dde225e398bf9bee1f4bbb6c8d7e6
 DIST sonic-visualiser-3.0.2.tar.gz 5123229 BLAKE2B 767be64ae74a47e2d1fb2e1b9a93384999c3567613f0b9662d3c5063fd0d951398c6bf4f3ce118545f83f707647461a92e152cabb0596a80dae0284f8415188c SHA512 25259df72175e397c63e76dca25f0099139c6569153c1e5750f90bcf5d661f20dd8c02aba53272567e72e661bfc66ec19cb3b3066795f978a6b76c826a5bf825
-EBUILD sonic-visualiser-2.5.ebuild 2310 BLAKE2B db9b7491beb10d59eb36db2091d7b1b06af68fb3cf22b5cff7fe729bdcf6c6f8a61c325ca58007dd13a6e88b19f50ed5ff0a76ef5b993655a7e5f8a069884cfa SHA512 93a3dc3e5e37024a4afb9110824060b8982a9db36d77159341170e204e11be2e4481683fbcad01e9f1ff65206618f9f694f9765aece784f8368c119c0480ffa8
-EBUILD sonic-visualiser-3.0.2.ebuild 2638 BLAKE2B 834e1d4cc26da9db10d4dfc8d231409073d2224432e6c3fe2e6f78d2d09ef5fe167a638daf62eed8c7b8571f39b050c827a02870b482c9b3beffc184e7360c72 SHA512 4c741f13c748d547699208736962dc9d8881640c70fa7258c62fe6cf7318acfb8646ec4f334dd9353738dcfc65d42b0fe79f53168794cb898ac887a66eb2f1b1
+EBUILD sonic-visualiser-2.5.ebuild 2311 BLAKE2B e803a1126adb6bca848b0bef7b948d34a7334dff14bd0fc90827cca46dfdc2baf01fdf0caabbdd06a15ab063e1538e2266343e033973b7a783f74b684bc7c228 SHA512 8241cc2323ad9f58db098a6c8401e7d2f35e5e8795a390ca0e6c1f4951a8c2fbd6721d8353b40e7ed0a147b361fa975426bd712d6a31e7a16a6cb865e9c872fd
+EBUILD sonic-visualiser-3.0.2.ebuild 2639 BLAKE2B 589b386d5d208d4d93d4ef6a160f233769ff89d9145a46d36426617586bb21176d105122cc94c80dc9b713f0063e69a8d129b59b70f094987a546fac7d378cc1 SHA512 c5704adef2c1ff04ef12e1b20a566e583a0d68deb6ffa1be41a7c0131030f77e329d0d59cd7df97b96f4d008e0684ff18ebe886879b311683738e2439c3153ac
 MISC metadata.xml 353 BLAKE2B a43c47637d7677bb228f7f1be5c106785dc7fb429a831858e1dbcb222fc016676c855e888b31070a363c658d7904b80e09a0fd13c424f9d12ee4bbf9211ac023 SHA512 812f7ef25b8bde0654650ac3f3ddd1e18bfc828db0b5709fdf4c57017438ea118b7d7d14c9dd7006cb7fa63aeb72a25d155ec60beb0eca36bfbd292ecf5faa3f
diff --git a/media-sound/sonic-visualiser/sonic-visualiser-2.5.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-2.5.ebuild
index 00ec1a1077fc..bf3165115d06 100644
--- a/media-sound/sonic-visualiser/sonic-visualiser-2.5.ebuild
+++ b/media-sound/sonic-visualiser/sonic-visualiser-2.5.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
 inherit eutils qmake-utils autotools xdg-utils
 
 DESCRIPTION="Music audio files viewer and analiser"
-HOMEPAGE="http://www.sonicvisualiser.org/"
+HOMEPAGE="https://www.sonicvisualiser.org/"
 SRC_URI="https://code.soundsoftware.ac.uk/attachments/download/1675/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/media-sound/sonic-visualiser/sonic-visualiser-3.0.2.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-3.0.2.ebuild
index 1ee37e1b1a93..e326ea97ed91 100644
--- a/media-sound/sonic-visualiser/sonic-visualiser-3.0.2.ebuild
+++ b/media-sound/sonic-visualiser/sonic-visualiser-3.0.2.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 inherit eutils qmake-utils autotools xdg-utils
 
 DESCRIPTION="Music audio files viewer and analiser"
-HOMEPAGE="http://www.sonicvisualiser.org/"
+HOMEPAGE="https://www.sonicvisualiser.org/"
 SRC_URI="https://code.soundsoftware.ac.uk/attachments/download/2222/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index 6289f67875d2..e13a3c38a509 100644
--- a/media-tv/Manifest.gz
+++ b/media-tv/Manifest.gz
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index 691a62df2ca4..e14d0ae302da 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -23,5 +23,5 @@ EBUILD kodi-17.5-r1.ebuild 8831 BLAKE2B d000b959e2290f0b0d4a81f76f2f1b15eea71970
 EBUILD kodi-17.6-r1.ebuild 8742 BLAKE2B 0312ac3de60702ef038f007d7c4f98739956769b335468425b17a6e1ba7a7e28e1cb86e6a109106d45818abf5a52b425cfb30b30928c80b842bb11c828131c62 SHA512 1662699a15383d3dded76b3a6aa473604075a59218723d0179da19ba7df996a21f9b8b85d2bcf7dec1ddbd7abca8243a54eaf657a962199c374f5d5d30d97d0d
 EBUILD kodi-17.6-r2.ebuild 8744 BLAKE2B 67d8bbffea4f9ab543a2099af0a843bfc10ff9d2905d0a713e0f7ed653bb991ed194cd1b8ddd03532658a532436db0344be0816f8d866aa3e3006799fec59d53 SHA512 dd81f1691b3a97567aa426f1383caf3dac95f6a5f12d40305206d05486601da656b90aa969dcc37df627823e23fd9f2c33678d28fba50cfb4cf64787a0b02c6b
 EBUILD kodi-17.6.ebuild 8746 BLAKE2B 395d3403c75cd6c73a28dce7bbb221d27e418edd84f575c2037d9a4c30f327339193c00d05a3ff56b875b7bc1df7190da75055ac338ef5713fc0d02a9b207e64 SHA512 b4ba942c94019328250e27b1158e8681f12c319ee9f32c633005ddade17a1c09a3e2c875282ba10c93eb3484e19e220bd1aa4e95f96d80f632c8881722172711
-EBUILD kodi-9999.ebuild 8986 BLAKE2B b6a4ac3ada1630cbdecf9d3d993f4f073dde633403d62a25222acbe5c7dbea67f84963e02bc23ee78b7babf2059b8b83accd5afd2cbaf722456bafbaf4369a22 SHA512 7df60a153371c5b776f912b5692d1d00896ef281d6a246bcd0814ef5d813b713c826d0f923f9cc8bcbdb77497661343e9b801c5614ec55dada9acf7e8ba2af16
+EBUILD kodi-9999.ebuild 8986 BLAKE2B f1f9025200b99fde467ed3e6c8f6fe914b80dc9d67d3d1350df5949ec31325feb94bdfa46f0ff306c0dbf30397cd8c6c59b3d340e7b4834cdef2fe8af0284658 SHA512 03440edbec0786b78a09214df56f2a6c7d874ce92e4e302b3db50ec764d139eb8067f8202a059ac84fd20498864e5d7a57039d5cb90965554733383e49e77430
 MISC metadata.xml 1716 BLAKE2B cc5a56b572fc4bc5b17a303e266e66c06450e9ef111f080a57bef31f847d522edd01354be20cbd5450b6773321c49618ae74f9a5caed39948d672314b06c27c0 SHA512 4ea0d31caa3a4c10ff5a421fa830c9db3eeb2628cecc19759ad218eb551d2c4382016ec5655a5c5be1e257eec29cad0717523a9fe3f251ff762cdf0ba60b4355
diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
index dc671f9b1bb2..ea7527a0e6ba 100644
--- a/media-tv/kodi/kodi-9999.ebuild
+++ b/media-tv/kodi/kodi-9999.ebuild
@@ -122,7 +122,7 @@ RDEPEND="${COMMON_DEPEND}
 		|| ( app-misc/lirc app-misc/inputlircd )
 	)
 	!media-tv/xbmc
-	udisks? ( sys-fs/udisks:0 )
+	udisks? ( sys-fs/udisks:2 )
 	upower? (
 		systemd? ( sys-power/upower )
 		!systemd? (
diff --git a/media-tv/xmltv/Manifest b/media-tv/xmltv/Manifest
index 7ab9b4f0eefa..00acd27f3522 100644
--- a/media-tv/xmltv/Manifest
+++ b/media-tv/xmltv/Manifest
@@ -3,7 +3,7 @@ DIST xmltv-0.5.57.tar.bz2 778254 BLAKE2B 0eae024d8bc709835cbaf4bcbe67b41a25f0d56
 DIST xmltv-0.5.67.tar.bz2 1188778 BLAKE2B a463529739c777411e0066baafb55d027f30ac248c3d16f0f8a38b49a8a97a108341889109ff70595e6628d0fd69f95cc4eaa07ad6cf59881c303add955a1b9d SHA512 2451634bf63ed8f5ee1ef4eff23fa5cfe2a98422e8ae75bf055951d5139d8b7ff03ece6aeee9b3ae81abba5a3edd66e64bd9ae8f610f92cb97ec017b839eee1f
 DIST xmltv-0.5.68.tar.bz2 1200116 BLAKE2B 3dcf6140c8eea5bcb729d8159b0e698f0716aff6e46175412a9087f156be5d9a400b4efb96c3566c17bbf352354671fe54d6c5bccd6ef878102a8c98b5749af8 SHA512 bf21837d3804058c6cbfeb0e75af57e5d6e3cd35da40c96291c951bdadc3b4dbfa64c8145a4e2129713b65e7540e1d5da08fe6fbab4c7561ec448f2ce07acbd5
 DIST xmltv-0.5.70.tar.bz2 1274164 BLAKE2B 4a6cbf6bc2f8f113a91fc579afbfc69fc04aec020d386182f6fd78f9f8c18821d0dc09077cccb1ad30e6f0583f958210fbf717d356f1e47dcf785e5a85864dc4 SHA512 36dd497dc20d296ca984ad0a1ca19f471c97cac7bfe7c5d4baeaae7faea565c36103bea10e7a7ae813c1cfc35c7ac376299edd2bf01c4c5da981cb5cca13317c
-EBUILD xmltv-0.5.57.ebuild 5401 BLAKE2B 0c4ca8aa05463ca5d41790431d844adefddad12def480b846b5a04273d8c7b3ff67d698af343d81eedc384c15fae90f093441972d3ed516944d2eb074a305b83 SHA512 881ec922d61a10fe6911e0fd9f6d3dcc15e58ba4ed480cf6eb79dddaf73d5b46fda6c0e084e83681a9ab4ea544bfc3c97722e9de2b8bd225008c50abe3b24e35
+EBUILD xmltv-0.5.57.ebuild 5402 BLAKE2B 0a677f74fb1957529815c547607fe55170e350029a95860b9a3ae06aa375fdddd66434efb9799257cf72e77e0f01621fc3a605d8f50f0f133aa3316d44a34b5e SHA512 0f6bff446308b31e1999a24848dd7a93106cce6b83df998fa3dded5d7f207a43d39b22e7e28943128c3d7bc0c4296a8f23105a1c837a02ea0ebac7db6f0a67ec
 EBUILD xmltv-0.5.67.ebuild 5971 BLAKE2B 3c5a941937f5d6fcb10bcd6762c53fd6bc7ad4b6caa83f568b15ac5f5b444e0293bdb9ecaf7d6d8cf3bdc712db5079ac293d8d0c3133ea7d0ac5a8374636643d SHA512 7b4b31e15a636959ebbf6c5190249524cf3f06cf6223651835e0b9035d84d750ef187d7abd36cd2a7338c52ba694146d332e64d26a96121b84187f79d87f774a
 EBUILD xmltv-0.5.68.ebuild 6280 BLAKE2B 8f089f19c0de98bbc11b4d3e12c448b747734d64c0b40aca835987341c93ba2c402b2fc473da3444abc7cf08045b98c7a1667940ff74859126bda010bd72a682 SHA512 b3df365bd447cd5380f00c17e569f33f3177d587c2dac357a6f2b658444298f77daa66d757450c3dae354a52455e28f18f9afc2d188e47e9401151350cec7cd5
 EBUILD xmltv-0.5.70.ebuild 5268 BLAKE2B f08901b76bca3199e163e3c68493271b7969e65e1b238205255c7646093738a7c873ee251ff0d8d09e622e242899ce72a793b22e94e5e91f990aa209c3ad435d SHA512 d3ef25035c6b4bf8323578c089bcd7abaaad6138470e15afb82c9423ff3272e706b78b6381ad7e18795c6f7c4b59654ac1d8ec33229554ae8cd0980ed4f29661
diff --git a/media-tv/xmltv/xmltv-0.5.57.ebuild b/media-tv/xmltv/xmltv-0.5.57.ebuild
index 513878220974..d89721e55819 100644
--- a/media-tv/xmltv/xmltv-0.5.57.ebuild
+++ b/media-tv/xmltv/xmltv-0.5.57.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/xmltv/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-linux"
+KEYWORDS="amd64 ~ppc x86 ~x86-linux"
 
 IUSE="ar ch dtvla uk_rt uk_bleb is it na_dd na_icons fi es_laguiatv es_miguiatv ee re huro dk se_swedb hr no_gf fr pt eu_epg tv_combiner tv_pick_cgi tv_check na_dtv
 za nl in il"
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 2b7639dfac13..d27014b32772 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/luvcview/Manifest b/media-video/luvcview/Manifest
index 61dc9eff7d30..9fadcec5df44 100644
--- a/media-video/luvcview/Manifest
+++ b/media-video/luvcview/Manifest
@@ -1,4 +1,4 @@
 DIST luvcview_0.2.6-4.diff.gz 8227 BLAKE2B 10c01541920b24dafd55f969f4e86daa2d4bb7d73fc33b7ed3b592e080ef31a6d4e429585402e291f20898af5d48021d618ca6496a668def767fad4dced47a3f SHA512 ae0f760e08979065a072f28367fd6c399ff8bc821b79d021d0fec8bb62e36b10804f30f708de3e23ccada0596b7c57dec6d0f8b92a777046e1bfa087686e7f87
 DIST luvcview_0.2.6.orig.tar.gz 100318 BLAKE2B 94273fc4635d515c78b9604e3a1bcdfeea5f835f64f6bb1f19c192ebee5f96b7e1d3b1e7921969560e5bd111cb7e84d20806c42b64f4ab6de40e1597ffae3c99 SHA512 6d0b480c51716e36401680ae333c37f179122d04feca3e91056f77abee6dc60dac4e431e8cca999780c343d10170678ace1eb29076c9211c0cfef6d65a4599ab
-EBUILD luvcview-0.2.6.ebuild 952 BLAKE2B 9ff52d93d0ce3deac021a28b6603a8f5f19c76a1180eea71847cc50e210ceeffc8e649c4d4d9a41fbf78041c83336ece820f19190ab458c241977fe29698016d SHA512 7f355e5a7d254b0358f0d0f5092dce186be276ad4cbf48d2c919d155e2b8e84f76fd4476aa21ac9b50f2e2c69f033abed3463a25e57aa03518ec2441f8d5cd64
+EBUILD luvcview-0.2.6-r1.ebuild 936 BLAKE2B c19948ed7a0eac1357777795827027ce496dda0405f58e7ba75b2da810d1b6e23b9bbf0ca2035b58848c480a58585316c2ac22dcbaedb9a95701b31ba2e382fb SHA512 ce60dbed98786dea12665dd1c5b90d797d3b567d63087bb84d8ec272eeda1bff83e807f071d6c9a2163fa99a0a45cc5f4add18cc903cc218357f5fb0f21343c2
 MISC metadata.xml 259 BLAKE2B d0ebadef8dc30ed8fcc89ae38ab6a5d4af940b2cd75dea1494d96c37557532dea21ef0e014d09e32ae49eca64fe3d6bd56494fb7460ad69b70f40dd4b7ebc8b0 SHA512 c81aea0e68817fa210dc6f66313aee75246139e50d6324338707f11bca2173c64e88ce8440794c85eb64194ff97cf6c6760a06b4822a121e40629bdc3a04e1fd
diff --git a/media-video/luvcview/luvcview-0.2.6.ebuild b/media-video/luvcview/luvcview-0.2.6-r1.ebuild
index 093f2e4fe702..34f1275f979d 100644
--- a/media-video/luvcview/luvcview-0.2.6.ebuild
+++ b/media-video/luvcview/luvcview-0.2.6-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
-inherit eutils toolchain-funcs
+EAPI=6
+inherit desktop toolchain-funcs
 
-PATCH_LEVEL=4
+PATCH_LEVEL="4"
 
 DESCRIPTION="USB Video Class grabber"
 HOMEPAGE="https://packages.qa.debian.org/l/luvcview.html"
@@ -16,24 +16,30 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="media-libs/libsdl
-	media-libs/libv4l"
+RDEPEND="
+	media-libs/libsdl
+	media-libs/libv4l
+	x11-libs/libX11
+"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 src_prepare() {
-	EPATCH_OPTS="-p1" epatch "${WORKDIR}"/${PN}_${PV}-${PATCH_LEVEL}.diff
-	EPATCH_FORCE=yes EPATCH_SUFFIX=patch epatch debian/patches
+	default
+	eapply "${WORKDIR}"/${PN}_${PV}-${PATCH_LEVEL}.diff
+	eapply debian/patches/*.patch
 	sed -i -e 's:videodev.h:videodev2.h:' *.{c,h} || die
 	sed -i -e 's:-O2::' Makefile || die
 }
 
 src_compile() {
-	emake CC="$(tc-getCC) ${LDFLAGS}" || die
+	emake CC="$(tc-getCC) ${LDFLAGS}"
 }
 
 src_install() {
-	dobin luvcview || die
-	doman debian/luvcview.1 || die
-	dodoc Changelog README ToDo || die
+	dobin luvcview
+	doman debian/luvcview.1
+	dodoc Changelog README ToDo
+	make_desktop_entry ${PN}
 }
diff --git a/media-video/mjpegtools/Manifest b/media-video/mjpegtools/Manifest
index e35d8471c1c7..43de10b899bb 100644
--- a/media-video/mjpegtools/Manifest
+++ b/media-video/mjpegtools/Manifest
@@ -3,5 +3,5 @@ AUX mjpegtools-2.1.0-pic.patch 2298 BLAKE2B 9babd547b6c631845964e7ab6cb929d0b704
 AUX mjpegtools-2.1.0-sdl-cflags.patch 387 BLAKE2B ad8065afdf164335e77adf972b21c6fd7108dba3f21a56006eede02a650f7f0728950c36f9e73dbedd9713eb69f8dab010c547c472c02abd8642dc518cc43621 SHA512 67b43ab22d1358755a6e109b8eaf21b14058c6a4f4dc511e27162c4205274eacbe4fb9016a5c8a3938ca071f6d4f1898801ed3ab0571b011aab170771a1b7602
 DIST mjpegtools-2.1.0.tar.gz 1844336 BLAKE2B 90ae51c81e18708132f26c1fb002128193168366542cadc15060ad52f664a5f90770b3039ada2a1777eab5fec9743fb24c65083de913ebd72b23dd55f6b25741 SHA512 10d3288f47d7cc4de87fa63f65e0fd4bd0a9af95db77155eecccecae7a7e60ebab83eaec44cf7a2c3d9e627f0cc086eda208abee1a7a74cbf3f85e87bb979ac5
 EBUILD mjpegtools-2.1.0-r2.ebuild 2856 BLAKE2B 69ecbbd0dd2a8b6176d9fa5a93e1b5321331e1f701168a809f8d1660d05855bd1cf8187073895442443bd0cdf212494985b56500bebdc531c6b092a47675eae7 SHA512 741507bd082bfdd7a46f1fa5a73cca2c7c903b922268afacc8edaf0ad43392743b79dae798abe9eab7f12f9866199d6f868c386fff930e060eb4f7543e655642
-EBUILD mjpegtools-2.1.0-r3.ebuild 2879 BLAKE2B 35b2a6360c3ac4403429aa78d3d7c35c882c5ae52ace9c03bdbc5132160ecdfe1f70e2264c99c22bdbb31cce3e4ab31c7589a221edc323226b052f00556487f6 SHA512 995c3aa3d071617b767bde3936d9773e8a575542eb8895adf21a680f5e9c1354340598b42eb97afa6c79fe3c4ad4d4181f4c92286ea61d2b143ebab6ff43cb06
+EBUILD mjpegtools-2.1.0-r3.ebuild 2877 BLAKE2B 70aa8dcd33a3708144d592e6be4ceee5cf14a94cc0c6cce465359fa7c607047ccc1d38d245cb49e09492dc27f4e88876ea27f0affd5bafba29b5e473efbd11ae SHA512 ddb70e8829c8c1c6adff6efe441d2d5eddc40c1613ae4a9de01d9474ba3b19e25beecde8def527feb3bba94ef57fd5ca903e7e6a165cf8cb7f26881d4947f69c
 MISC metadata.xml 537 BLAKE2B 9a038894ff7da6df6f8746be16e0a0f9e0586321eba052a95afd038d2625110d7dbcd2961ac8de8c14ab2fd74ccb2eb3881d64c8b96c97936e92173e2b62a67b SHA512 f3360892e77c064d2062bb963b91f031587ebed6a31b8ba2c698d969cf88998daec9ef910689f477e36921df60d2aa8bdfbe569dda701b0e375d75acfd31d79d
diff --git a/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild b/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild
index a12c9c11b243..54dba2b26130 100644
--- a/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild
+++ b/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd"
 IUSE="cpu_flags_x86_mmx dv gtk png quicktime sdl sdlgfx static-libs"
 REQUIRED_USE="sdlgfx? ( sdl )"
 
diff --git a/media-video/simplescreenrecorder/Manifest b/media-video/simplescreenrecorder/Manifest
index a5dccd9f7b47..788a3a58004c 100644
--- a/media-video/simplescreenrecorder/Manifest
+++ b/media-video/simplescreenrecorder/Manifest
@@ -1,8 +1,10 @@
 AUX simplescreenrecorder-0.3.9-cmake.patch 3098 BLAKE2B 5f744c8b56e04022a1048f9fb37924ec4443b12da7bd8c6d8569bab302f39cbe7d697948e578e4b2f19050ff78d7a3d278d0c9481aadafc5b9883e7b84923bc4 SHA512 ffcbc6822d1d0fe833018206fc23bf3c880d5a39bb607346b78dcb6d37e320b357f73b4216d8724c30052cebe70cc0167889fbd4c1ddd2a3713cbaf8ad4ae338
 AUX simplescreenrecorder-0.3.9-pulseaudio_dep.patch 427 BLAKE2B 9ce385a87222d4684f6626db9f6be5d7efc04e84e5175a804e415f053c4c3e4684b0b7338615e74801485f1962d1f8ccc114ec357d6c1446ab56816d0880ede6 SHA512 d9616bf99d784c5ab0a1446b965ebec4e089a3ecafc2ed128dbc04747ad2511a84d679e309530369241816b662f527d7109dfb26df13888d8c4f917a99ea2c72
 DIST simplescreenrecorder-0.3.10.tar.gz 1823448 BLAKE2B 5eef2a803be90b357b08ba6a009cd9bfda73bc7c29200de50c32902598b7044aedaa0a39d9eb71ab0a660bb1a3c03f7d57ae2437203037951f06821ce8a417bb SHA512 dc7b9de386b5f87e8315695ef105dea2491d09b98b19029146dd29562fec001bf6b3fd3f30e91bc87bdb55ec87ff213567b5b17a234b0c06c6b7fe93db63d4ae
+DIST simplescreenrecorder-0.3.11.tar.gz 1823944 BLAKE2B b7692ad158b4784f0222dd47227b85d33aae7eb416ed87d2eda1040027c910ec8d0ebe6a7e164e77cb9c3f6f2756e15fe97a7f05f45c92465473d2ae90e86b34 SHA512 5919774a00cd7015cd7db40561efaea43809b9465508b7770db9eb0fc87f338746e5cd4a79a0ab6c09e516257fa80184c3dcb5ab400c0ef2c0a8cf50ea2a073f
 DIST simplescreenrecorder-0.3.9.tar.gz 1816221 BLAKE2B 995ac44da0a5e65dcb33a10b353085f6907531b2af84a0b4c5898f1a44d45676a759b94facdf7f6f311444bcb1ea2cbd8dcf143b8c6e0efac4a7eb06484d1096 SHA512 36dc30597d1cb07f060dcb667d79074851fec75f369efe349d1a1852110e663f0704fd0ec7d85fd0fc0dac27e478b7422f6e273dfecbb27ddeb6d2228217a3b2
 EBUILD simplescreenrecorder-0.3.10.ebuild 2827 BLAKE2B 97ee9516f58c00e93ffafb47e416c5d7d6b686deec24271a7c59f8f713a327b8179733d3e1f4f2a9799cbaf32206b24e6fcd9ead61bf442092b5d641d7bffc98 SHA512 42d178d475278d1d7c888215b3d11182786575eb3d7447628ee4eeda73799da27c0c291b9ca40fddb4db66a00ebdd969a8dc82b68ab9e8f67d4685eaf236d3d4
+EBUILD simplescreenrecorder-0.3.11.ebuild 2827 BLAKE2B 97ee9516f58c00e93ffafb47e416c5d7d6b686deec24271a7c59f8f713a327b8179733d3e1f4f2a9799cbaf32206b24e6fcd9ead61bf442092b5d641d7bffc98 SHA512 42d178d475278d1d7c888215b3d11182786575eb3d7447628ee4eeda73799da27c0c291b9ca40fddb4db66a00ebdd969a8dc82b68ab9e8f67d4685eaf236d3d4
 EBUILD simplescreenrecorder-0.3.9-r1.ebuild 2913 BLAKE2B da8680a70094428174dd39a169b38cedaec5a4304c031d1024fe5616832252fee8b391889e0de413d291397f3edf39eefc8027136221202f5341b51e542fc5db SHA512 33b9d71372a3fa47492e8afc0d5341b99a2ab33544ca53badabc8678e4f1b2c71a0f6592f7b7c13f6dc6120ca7390b5863ec34a6193402e9ff98245c4bb1f88f
 EBUILD simplescreenrecorder-9999.ebuild 2827 BLAKE2B 97ee9516f58c00e93ffafb47e416c5d7d6b686deec24271a7c59f8f713a327b8179733d3e1f4f2a9799cbaf32206b24e6fcd9ead61bf442092b5d641d7bffc98 SHA512 42d178d475278d1d7c888215b3d11182786575eb3d7447628ee4eeda73799da27c0c291b9ca40fddb4db66a00ebdd969a8dc82b68ab9e8f67d4685eaf236d3d4
 MISC metadata.xml 508 BLAKE2B c43c69903c35e9e1f87c94cb26b06a8d6c4dd1a51c8a3409027ab8c867e54851aa8e4bfcaf4a0a37298795ded69743e82d2b0a4e0bb84cb3d88d6a6c5c4a1c0f SHA512 d4879cb7f57f23d273e45b429ab5548d30a0a6eefe63e28c2c60e7cef9a44b295d8455bfedaf9d9294ff4cf16b4f841f0ddb34541c62c25cbf190f7b6c7538ce
diff --git a/media-video/simplescreenrecorder/simplescreenrecorder-0.3.11.ebuild b/media-video/simplescreenrecorder/simplescreenrecorder-0.3.11.ebuild
new file mode 100644
index 000000000000..da1692bb1d65
--- /dev/null
+++ b/media-video/simplescreenrecorder/simplescreenrecorder-0.3.11.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-multilib flag-o-matic xdg-utils
+
+if [[ ${PV} = 9999 ]]; then
+	inherit git-r3
+fi
+
+DESCRIPTION="A Simple Screen Recorder"
+HOMEPAGE="https://www.maartenbaert.be/simplescreenrecorder"
+LICENSE="GPL-3"
+PKGNAME="ssr"
+if [[ ${PV} = 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/MaartenBaert/${PKGNAME}.git"
+	EGIT_BOOTSTRAP=""
+else
+	SRC_URI="https://github.com/MaartenBaert/${PKGNAME}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${PKGNAME}-${PV}"
+fi
+
+SLOT="0"
+IUSE="+asm jack mp3 pulseaudio theora vorbis vpx x264"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-libs/alsa-lib:0=
+	media-libs/mesa[${MULTILIB_USEDEP}]
+	|| (
+		media-video/ffmpeg[vorbis?,vpx?,x264?,mp3?,theora?]
+		media-video/libav[vorbis?,vpx?,x264?,mp3?,theora?]
+	)
+	x11-libs/libX11[${MULTILIB_USEDEP}]
+	x11-libs/libXext
+	x11-libs/libXfixes[${MULTILIB_USEDEP}]
+	virtual/glu[${MULTILIB_USEDEP}]
+	jack? ( virtual/jack )
+	pulseaudio? ( media-sound/pulseaudio )
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+"
+
+pkg_setup() {
+	if [[ ${ABI} == amd64 ]]; then
+		elog "You may want to add USE flag 'abi_x86_32' when running a 64bit system"
+		elog "When added 32bit GLInject libraries are also included. This is"
+		elog "required if you want to use OpenGL recording on 32bit applications."
+		elog
+	fi
+
+	if { has_version media-video/ffmpeg[x264] || has_version media-video/libav[x264] ; } && has_version media-libs/x264[10bit] ; then
+		ewarn
+		ewarn "media-libs/x264 is currently built with 10bit useflag."
+		ewarn "This is known to prevent simplescreenrecorder from recording x264 videos"
+		ewarn "correctly. Please build media-libs/x264 without 10bit if you want to "
+		ewarn "record videos with x264."
+		ewarn
+	fi
+
+	# QT requires -fPIC. Compile fails otherwise.
+	# Recently removed from the default compile options upstream
+	# https://github.com/MaartenBaert/ssr/commit/25fe1743058f0d1f95f6fbb39014b6ac146b5180
+	append-flags -fPIC
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DENABLE_32BIT_GLINJECT="$(usex abi_x86_32)"
+		-DENABLE_X86_ASM="$(usex asm)"
+		-DWITH_PULSEAUDIO="$(multilib_native_usex pulseaudio)"
+		-DWITH_JACK="$(multilib_native_usex jack)"
+		-DWITH_GLINJECT="true"
+	)
+
+	# libav doesn't have AVFrame::channels
+	# https://github.com/MaartenBaert/ssr/issues/195#issuecomment-45646159
+	if has_version media-video/libav ; then
+		mycmakeargs+=( -DENABLE_FFMPEG_VERSIONS="false" )
+	fi
+
+	if multilib_is_native_abi ; then
+		mycmakeargs+=( -DWITH_QT5="true" )
+	else
+		mycmakeargs+=( -DWITH_SIMPLESCREENRECORDER="false" )
+	fi
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 779798d4db9d..04099ff34a4e 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 9c2593d3e940..82049acb5f24 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 22 May 2018 12:08:36 +0000
+Fri, 25 May 2018 13:38:44 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 42d14a5e8db9..2c9803a78d0b 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 423926 BLAKE2B ef432334c8c41dcc3beb779f71caadf29384449b3e8258f043d5ba442df8bec61eb0e37f0cffe178b49845e496a10322c4f299da85b1bef970a8198b7030cc19 SHA512 0362ff52a0a0f49a21f40c02923be72cf39507aeca71c57ba328332b55d1e4bad4c29b86943b37860f673358dafc794b408fa2b01f8a8d43fb4c3f1ae168a8c9
-TIMESTAMP 2018-05-22T12:08:39Z
+MANIFEST Manifest.files.gz 424400 BLAKE2B 9a73c11ed4c1391d31d1574a9de4d159bae31fe3f5714411d8384fe4e643e59a86fea9f31f62f9bf6ec36e61f4753cce7561cd7aac8bc004d5ad304a9cbd5fd0 SHA512 0fabe1e7393fe3aa88503bbf861fd29966bc3149d4306beec0ac9dd8c1ca947a5da2e44f96f0574aa884a1a3191f2c44649c75b64b46bf96048e6516ea5dcb4b
+TIMESTAMP 2018-05-25T13:38:48Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlsECEdfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlsIEehfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klC6ERAAsISjzASzQtwX2Qxz+kHc7ZJ9x4risbP+f53v/qt9Z9yYcM/CBJaj9A6D
-Oj+/dnDVx1TqNbBS7OVXWuL02E7NyqQGV/6vjQ5YzcWJB2+2/5wt6tBWbiuf71eF
-IAvro3ZNr2XVeuqXMGfUE5M5AzGpib4jT5ZapDZv89rdOM0LA1ASnLM6TQjFWZ9w
-t4j5jwz9B0fd7bnxcYTHZf/gapp2Zfs+BO3C27NbYUhR9k2nsEdxpZN4+m3grQcD
-Zh5VCPidbXgJNnvrvWu1jNIMx1sDHjla3ClgacB2I7DuUUpuX1Qn3jcVISbgM7+n
-t7Aqx+78TutydnwcqHHbrvyldUQK3FV82rYN0twwvIdrDZy7aMSkGhtvP00gLpST
-MupXPuaZZ4W8PNZjs14vPkYFsRXiW9xtERA4uE6/HvDeTaQwh9y7wZZyWQ8VS2Xb
-guw2A7be3S6KOh1jmrzGzt+v1QEpMhDmk2NSJujUfjf1nXJ9rshLOzTgLhuataiu
-7LF26gAX5W6nOuCoalapM/LBdg6HyJIkihv+mMZtOrCREdqJq8plF4J46HiHVyIg
-ncj445vdqsowxaVLPy6CZ94xW3SfQmHzCboDqN2xA27FkTTEifsKWn3IsFTqKtNh
-Ftvcdk0NmBCxgzHe2m4R06CVLW2hcDhAyYarg5FOXsMPUDGzVdk=
-=fYcE
+klA9QQ/+PMvah9YFz+dqGel6WnojoODRBfcaJmNPluFlguaoesOhyGh6Vga3Wdqn
+fbC4YK9EOWEIxK5b/LLYWxhIfMemK3/bkEzzewDhQlZS5eVq+4UWSa8fp7kwcYRR
+jIBur8P08cqf8KXZGV/nc6qcGk0S2S1Ewp9pDqOJMdSJXpTQDalTOHti3G6hBSqC
+i3NaLyc0rBu7tMM21mV8YvMrLJ2hR+tUqOtSsYLY4wN6p9RpqMQ53y76uRmlRpOO
+egTVzbVSVNXJJu36wfdivEORsLQYf17bIpcYuJo2zHHxblGF2q7BgKy6g92C4OJU
+ZsMCUG2mF9ZckZB0CChh9cKgV9m1KNeiHEqcuL86ghJa4DK4P1hySSJABJrmJFi/
+pwtuUgEVKWPC2lc4ComTyIXufmYhU9XmKsX0TS2Pza3ecCcvoVhvPCTTYEIObQvu
+3HE2EaO821yXgV+mvhy7TQkl/yfL4MkY24gJUn8aY8AVAqReTq6uShDAY5SIh06b
+47l68W8ODXs03cQkLUjYDwNCFz58Bg2o9JyI6slSg5y+nv2FFgXnCG2lcU1Z/HdE
+s016fmLwmyZneC1i43/RuZULeD7cXoelBiDd2S/uafPztc/t7+e+WdRaawg9C5Y0
+YYSadRlI+UyxPJomg1+ncZGuOwpnI4WNhdUVUr8ErxBgSA7yIEM=
+=cpLK
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/Manifest.files.gz b/metadata/glsa/Manifest.files.gz
index 8d89a3629bf8..07e00db62d75 100644
--- a/metadata/glsa/Manifest.files.gz
+++ b/metadata/glsa/Manifest.files.gz
diff --git a/metadata/glsa/glsa-201805-07.xml b/metadata/glsa/glsa-201805-07.xml
new file mode 100644
index 000000000000..f57a6fb9d6d1
--- /dev/null
+++ b/metadata/glsa/glsa-201805-07.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201805-07">
+  <title>Samba: Multiple vulnerabilities </title>
+  <synopsis>Multiple vulnerabilities have been found in Samba, the worst of
+    which may allow remote execution of arbitrary code.
+  </synopsis>
+  <product type="ebuild">samba</product>
+  <announced>2018-05-22</announced>
+  <revised count="1">2018-05-22</revised>
+  <bug>588262</bug>
+  <bug>619516</bug>
+  <bug>639024</bug>
+  <bug>650382</bug>
+  <access>remote</access>
+  <affected>
+    <package name="net-fs/samba" auto="yes" arch="*">
+      <unaffected range="ge">4.5.16</unaffected>
+      <vulnerable range="lt">4.5.16</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>Samba is a suite of SMB and CIFS client/server programs.</p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in Samba. Please review
+      the CVE identifiers referenced below for details.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>A remote attacker could possibly execute arbitrary code, cause a Denial
+      of Service condition, conduct a man-in-the-middle attack, or obtain
+      sensitive information.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All Samba users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=net-fs/samba-4.5.16"
+    </code>
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2016-2119">CVE-2016-2119</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2017-14746">CVE-2017-14746</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2017-15275">CVE-2017-15275</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2017-7494">CVE-2017-7494</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-1050">CVE-2018-1050</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-1057">CVE-2018-1057</uri>
+  </references>
+  <metadata tag="requester" timestamp="2018-05-15T00:36:47Z">b-man</metadata>
+  <metadata tag="submitter" timestamp="2018-05-22T22:29:53Z">b-man</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-201805-08.xml b/metadata/glsa/glsa-201805-08.xml
new file mode 100644
index 000000000000..5b8b52935500
--- /dev/null
+++ b/metadata/glsa/glsa-201805-08.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201805-08">
+  <title>VirtualBox: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been found in VirtualBox, the worst
+    of which could allow an attacker to take control of VirtualBox.
+  </synopsis>
+  <product type="ebuild">virtualbox</product>
+  <announced>2018-05-22</announced>
+  <revised count="1">2018-05-22</revised>
+  <bug>655186</bug>
+  <access>remote</access>
+  <affected>
+    <package name="app-emulation/virtualbox" auto="yes" arch="*">
+      <unaffected range="ge">5.1.36</unaffected>
+      <vulnerable range="lt">5.1.36</vulnerable>
+    </package>
+    <package name="app-emulation/virtualbox-bin" auto="yes" arch="*">
+      <unaffected range="ge">5.1.36.122089</unaffected>
+      <vulnerable range="lt">5.1.36.122089</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>VirtualBox is a powerful virtualization product from Oracle.</p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in VirtualBox. Please
+      review the CVE identifiers referenced below for details.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>An attacker could take control of VirtualBox resulting in the execution
+      of arbitrary code with the privileges of the process, a Denial of Service
+      condition, or other unspecified impacts.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All VirtualBox users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=app-emulation/virtualbox-5.1.36"
+    </code>
+    
+    <p>All VirtualBox binary users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose
+      "&gt;=app-emulation/virtualbox-bin-5.1.36.122089"
+    </code>
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-2830">CVE-2018-2830</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-2831">CVE-2018-2831</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-2835">CVE-2018-2835</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-2836">CVE-2018-2836</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-2837">CVE-2018-2837</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-2842">CVE-2018-2842</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-2843">CVE-2018-2843</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-2844">CVE-2018-2844</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-2845">CVE-2018-2845</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-2860">CVE-2018-2860</uri>
+  </references>
+  <metadata tag="requester" timestamp="2018-05-14T23:15:39Z">b-man</metadata>
+  <metadata tag="submitter" timestamp="2018-05-22T22:32:13Z">b-man</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-201805-09.xml b/metadata/glsa/glsa-201805-09.xml
new file mode 100644
index 000000000000..f4af27e4d2fc
--- /dev/null
+++ b/metadata/glsa/glsa-201805-09.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201805-09">
+  <title>Shadow: security bypass</title>
+  <synopsis>A vulnerability found in Shadow may allow local attackers to bypass
+    security restrictions.
+  </synopsis>
+  <product type="ebuild">shadow</product>
+  <announced>2018-05-22</announced>
+  <revised count="1">2018-05-22</revised>
+  <bug>647790</bug>
+  <access>remote</access>
+  <affected>
+    <package name="sys-apps/shadow" auto="yes" arch="*">
+      <unaffected range="ge">4.6</unaffected>
+      <vulnerable range="lt">4.6</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>Shadow is a set of tools to deal with user accounts.</p>
+  </background>
+  <description>
+    <p>A local attacker could possibly bypass security restrictions if an
+      administrator used “group blacklisting” to restrict access to file
+      system paths.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>A local attacker could possibly bypass security restrictions.</p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All shadow users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=sys-apps/shadow-4.6"
+    </code>
+    
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-7169">CVE-2018-7169</uri>
+  </references>
+  <metadata tag="requester" timestamp="2018-05-22T22:21:35Z">Zlogene</metadata>
+  <metadata tag="submitter" timestamp="2018-05-22T22:36:37Z">Zlogene</metadata>
+</glsa>
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 9c2593d3e940..82049acb5f24 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 22 May 2018 12:08:36 +0000
+Fri, 25 May 2018 13:38:44 +0000
diff --git a/metadata/glsa/timestamp.commit b/metadata/glsa/timestamp.commit
index d21b59c7a136..fcae362f2608 100644
--- a/metadata/glsa/timestamp.commit
+++ b/metadata/glsa/timestamp.commit
@@ -1 +1 @@
-255e6e014a866f68f8eba7d65248d45008988f31 1526827283 2018-05-20T14:41:23+00:00
+000a4ecebe264f405efd60fbeab45f98ae1183f7 1527028655 2018-05-22T22:37:35+00:00
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 454ca687712c..109c8b388a3e 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 8c6797932f2a..ae8e0a9c8c38 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/abrt-2.10.9 b/metadata/md5-cache/app-admin/abrt-2.10.9
new file mode 100644
index 000000000000..9a12d480615d
--- /dev/null
+++ b/metadata/md5-cache/app-admin/abrt-2.10.9
@@ -0,0 +1,15 @@
+DEFINED_PHASES=configure install postinst postrm prepare setup
+DEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-libs/glib-2.43:2 >=dev-libs/libreport-2.9.5[python] dev-libs/libxml2 dev-libs/nss >=gnome-base/gsettings-desktop-schemas-3.15.1 sys-apps/dbus sys-apps/systemd sys-auth/polkit sys-fs/inotify-tools x11-libs/gtk+:3 >=x11-libs/libnotify-0.7 app-text/asciidoc app-text/xmlto dev-libs/satyr[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-util/intltool-0.35.0 virtual/pkgconfig >=sys-devel/gettext-0.17 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 virtual/pkgconfig
+DESCRIPTION=Automatic bug detection and reporting tool
+EAPI=6
+HOMEPAGE=https://github.com/abrt/abrt/wiki/ABRT-Project
+IUSE=debug selinux python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-libs/glib-2.43:2 >=dev-libs/libreport-2.9.5[python] dev-libs/libxml2 dev-libs/nss >=gnome-base/gsettings-desktop-schemas-3.15.1 sys-apps/dbus sys-apps/systemd sys-auth/polkit sys-fs/inotify-tools x11-libs/gtk+:3 >=x11-libs/libnotify-0.7 app-arch/cpio dev-libs/elfutils dev-python/argcomplete dev-python/argh dev-python/humanize sys-apps/util-linux >=sys-devel/gdb-7
+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 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/abrt/abrt/archive/2.10.9.tar.gz -> abrt-2.10.9.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0b6b086877e83d06240a6c0bcd566b53
diff --git a/metadata/md5-cache/app-admin/aerospike-amc-community-3.6.10.1 b/metadata/md5-cache/app-admin/aerospike-amc-community-3.6.10.1
deleted file mode 100644
index dc7cca7cdfc2..000000000000
--- a/metadata/md5-cache/app-admin/aerospike-amc-community-3.6.10.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=app-crypt/gcr dev-python/eventlet dev-python/flask dev-python/greenlet dev-python/setproctitle www-servers/gunicorn
-DESCRIPTION=Web UI based monitoring tool for Aerospike Community Edition Server
-EAPI=5
-HOMEPAGE=http://www.aerospike.com
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=app-crypt/gcr dev-python/eventlet dev-python/flask dev-python/greenlet dev-python/setproctitle www-servers/gunicorn
-SLOT=0
-SRC_URI=http://www.aerospike.com/artifacts/aerospike-amc-community/3.6.10.1/aerospike-amc-community-3.6.10.1.all.x86_64.deb
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b95040c95ac80c09e3e9577d3b8fa7cb
diff --git a/metadata/md5-cache/app-admin/aerospike-amc-community-3.6.11 b/metadata/md5-cache/app-admin/aerospike-amc-community-3.6.11
deleted file mode 100644
index ea8c679ecf14..000000000000
--- a/metadata/md5-cache/app-admin/aerospike-amc-community-3.6.11
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=app-crypt/gcr dev-python/eventlet dev-python/flask dev-python/greenlet dev-python/setproctitle www-servers/gunicorn
-DESCRIPTION=Web UI based monitoring tool for Aerospike Community Edition Server
-EAPI=5
-HOMEPAGE=http://www.aerospike.com
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=app-crypt/gcr dev-python/eventlet dev-python/flask dev-python/greenlet dev-python/setproctitle www-servers/gunicorn
-SLOT=0
-SRC_URI=http://www.aerospike.com/artifacts/aerospike-amc-community/3.6.11/aerospike-amc-community-3.6.11.all.x86_64.deb
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b95040c95ac80c09e3e9577d3b8fa7cb
diff --git a/metadata/md5-cache/app-admin/aerospike-amc-community-3.6.12 b/metadata/md5-cache/app-admin/aerospike-amc-community-3.6.12
deleted file mode 100644
index bf5cfa0fce62..000000000000
--- a/metadata/md5-cache/app-admin/aerospike-amc-community-3.6.12
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=app-crypt/gcr dev-python/eventlet dev-python/flask dev-python/greenlet dev-python/setproctitle www-servers/gunicorn
-DESCRIPTION=Web UI based monitoring tool for Aerospike Community Edition Server
-EAPI=5
-HOMEPAGE=http://www.aerospike.com
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=app-crypt/gcr dev-python/eventlet dev-python/flask dev-python/greenlet dev-python/setproctitle www-servers/gunicorn
-SLOT=0
-SRC_URI=http://www.aerospike.com/artifacts/aerospike-amc-community/3.6.12/aerospike-amc-community-3.6.12.all.x86_64.deb
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b95040c95ac80c09e3e9577d3b8fa7cb
diff --git a/metadata/md5-cache/app-admin/aerospike-amc-community-3.6.8.2 b/metadata/md5-cache/app-admin/aerospike-amc-community-3.6.8.2
deleted file mode 100644
index 18e9be6142c5..000000000000
--- a/metadata/md5-cache/app-admin/aerospike-amc-community-3.6.8.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=app-crypt/gcr dev-python/eventlet dev-python/flask dev-python/greenlet dev-python/setproctitle www-servers/gunicorn
-DESCRIPTION=Web UI based monitoring tool for Aerospike Community Edition Server
-EAPI=5
-HOMEPAGE=http://www.aerospike.com
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=app-crypt/gcr dev-python/eventlet dev-python/flask dev-python/greenlet dev-python/setproctitle www-servers/gunicorn
-SLOT=0
-SRC_URI=http://www.aerospike.com/artifacts/aerospike-amc-community/3.6.8.2/aerospike-amc-community-3.6.8.2.all.x86_64.deb
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b95040c95ac80c09e3e9577d3b8fa7cb
diff --git a/metadata/md5-cache/app-admin/aerospike-amc-community-3.6.8 b/metadata/md5-cache/app-admin/aerospike-amc-community-4.0.19
index dde011517668..cbc591a3384e 100644
--- a/metadata/md5-cache/app-admin/aerospike-amc-community-3.6.8
+++ b/metadata/md5-cache/app-admin/aerospike-amc-community-4.0.19
@@ -1,12 +1,10 @@
-DEFINED_PHASES=install unpack
-DEPEND=app-crypt/gcr dev-python/eventlet dev-python/flask dev-python/greenlet dev-python/setproctitle www-servers/gunicorn
+DEFINED_PHASES=install
 DESCRIPTION=Web UI based monitoring tool for Aerospike Community Edition Server
-EAPI=5
+EAPI=6
 HOMEPAGE=http://www.aerospike.com
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=app-crypt/gcr dev-python/eventlet dev-python/flask dev-python/greenlet dev-python/setproctitle www-servers/gunicorn
 SLOT=0
-SRC_URI=http://www.aerospike.com/artifacts/aerospike-amc-community/3.6.8/aerospike-amc-community-3.6.8.all.x86_64.deb
+SRC_URI=http://www.aerospike.com/download/amc/4.0.19/artifact/linux -> aerospike-amc-community-4.0.19.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b95040c95ac80c09e3e9577d3b8fa7cb
+_md5_=073a7e686e88f0a946543e939ddc80a5
diff --git a/metadata/md5-cache/app-admin/ansible-2.5.3-r1 b/metadata/md5-cache/app-admin/ansible-2.5.3-r1
new file mode 100644
index 000000000000..01fc36fb2a13
--- /dev/null
+++ b/metadata/md5-cache/app-admin/ansible-2.5.3-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/packaging-16.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/paramiko[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/netaddr[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] net-misc/sshpass virtual/ssh dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/passlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/coverage[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/unittest2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-vcs/git ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) 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_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Model-driven deployment, config management, and command execution framework
+EAPI=6
+HOMEPAGE=https://ansible.com/
+IUSE=doc test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86 ~x64-macos
+LICENSE=GPL-3
+RDEPEND=dev-python/paramiko[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/netaddr[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] net-misc/sshpass virtual/ssh python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) 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_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://releases.ansible.com/ansible/ansible-2.5.3.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=73beead4d32ff66bdab1f630ff38d020
diff --git a/metadata/md5-cache/app-admin/ansible-9999 b/metadata/md5-cache/app-admin/ansible-9999
index c12ab6d10731..a96b88f17be2 100644
--- a/metadata/md5-cache/app-admin/ansible-9999
+++ b/metadata/md5-cache/app-admin/ansible-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/packaging-16.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/paramiko[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/netaddr[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] net-misc/sshpass virtual/ssh dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/passlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/coverage[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/unittest2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-vcs/git ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) 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_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/packaging-16.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/paramiko[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/netaddr[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] net-misc/sshpass virtual/ssh dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/passlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/coverage[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/unittest2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-vcs/git ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) 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_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Model-driven deployment, config management, and command execution framework
 EAPI=6
 HOMEPAGE=https://ansible.com/
-IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+IUSE=doc test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
 LICENSE=GPL-3
 RDEPEND=dev-python/paramiko[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/netaddr[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] net-misc/sshpass virtual/ssh python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) 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_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	git-r3	af51ccfceeb403ab80f1bf9209d372c8	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1e16e0cb1517599e9bcea89ac17a7cff
+_md5_=7021a2144a1aaca0b55b3525ee446c1d
diff --git a/metadata/md5-cache/app-admin/eselect-1.4.12 b/metadata/md5-cache/app-admin/eselect-1.4.12
index f6de9728d5b7..f8688c44e827 100644
--- a/metadata/md5-cache/app-admin/eselect-1.4.12
+++ b/metadata/md5-cache/app-admin/eselect-1.4.12
@@ -4,11 +4,11 @@ DESCRIPTION=Gentoo's multi-purpose configuration and management tool
 EAPI=5
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Eselect
 IUSE=doc emacs vim-syntax
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )
 PDEPEND=emacs? ( app-emacs/eselect-mode ) vim-syntax? ( app-vim/eselect-syntax )
 RDEPEND=sys-apps/sed || ( sys-apps/coreutils sys-freebsd/freebsd-bin app-misc/realpath ) sys-apps/file sys-libs/ncurses:0
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/eselect/eselect-1.4.12.tar.xz
 _eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=ac6eeb1948fac831b0c2e6752eeebb3c
+_md5_=51a913ffed91a822ad19b12ea9c6775d
diff --git a/metadata/md5-cache/app-admin/glance-16.0.0 b/metadata/md5-cache/app-admin/glance-16.0.0
deleted file mode 100644
index 3764a21c6349..000000000000
--- a/metadata/md5-cache/app-admin/glance-16.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pbr-2.1.0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Services for discovering, registering, and retrieving VM images
-EAPI=6
-HOMEPAGE=https://launchpad.net/glance
-IUSE=doc mysql postgres +sqlite +swift python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pbr-2.1.0 >=dev-python/defusedxml-0.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/eventlet-0.20.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/eventlet-0.21.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/routes-2.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/webob-1.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-migrate-0.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-sqlparse-0.2.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/alembic-0.8.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/httplib2-0.9.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-config-5.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-concurrency-3.25.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-context-2.19.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/futurist-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/taskflow-2.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/keystoneauth-3.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/keystonemiddleware-4.17.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/WSME-0.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/prettytable-0.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/prettytable-0.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/paste-2.0.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/jsonschema-2.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/jsonschema-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-keystoneclient-3.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pyopenssl-16.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-db-4.27.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-log-3.36.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-messaging-5.29.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-policy-1.30.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/retrying-1.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/retrying-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/osprofiler-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/glance_store-0.22.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/debtcollector-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/cryptography-1.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/cryptography-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/cursive-0.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/iso8601-0.1.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/monotonic-0.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=https://tarballs.openstack.org/glance/glance-16.0.0.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1e13faf3882ba48a6e2e50a22557a1ea
diff --git a/metadata/md5-cache/app-admin/glance-16.0.1 b/metadata/md5-cache/app-admin/glance-16.0.1
index 4b37aa6932bd..886f40a061d3 100644
--- a/metadata/md5-cache/app-admin/glance-16.0.1
+++ b/metadata/md5-cache/app-admin/glance-16.0.1
@@ -4,11 +4,11 @@ DESCRIPTION=Services for discovering, registering, and retrieving VM images
 EAPI=6
 HOMEPAGE=https://launchpad.net/glance
 IUSE=doc mysql postgres +sqlite +swift python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pbr-2.1.0 >=dev-python/defusedxml-0.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/eventlet-0.20.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/eventlet-0.21.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/routes-2.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/webob-1.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-migrate-0.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-sqlparse-0.2.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/alembic-0.8.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/httplib2-0.9.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-config-5.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-concurrency-3.25.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-context-2.19.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/futurist-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/taskflow-2.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/keystoneauth-3.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/keystonemiddleware-4.17.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/WSME-0.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/prettytable-0.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/prettytable-0.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/paste-2.0.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/jsonschema-2.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/jsonschema-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-keystoneclient-3.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pyopenssl-16.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-db-4.27.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-log-3.36.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-messaging-5.29.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-policy-1.30.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/retrying-1.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/retrying-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/osprofiler-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/glance_store-0.22.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/debtcollector-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/cryptography-1.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/cryptography-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/cursive-0.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/iso8601-0.1.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/monotonic-0.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://tarballs.openstack.org/glance/glance-16.0.1.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9625819e5efc2ed4f9192a95f45753f7
+_md5_=1e13faf3882ba48a6e2e50a22557a1ea
diff --git a/metadata/md5-cache/app-admin/installer-0.1.1_beta b/metadata/md5-cache/app-admin/installer-0.1.1_beta
index 3bfae508bb15..304710e9fbcf 100644
--- a/metadata/md5-cache/app-admin/installer-0.1.1_beta
+++ b/metadata/md5-cache/app-admin/installer-0.1.1_beta
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_4? ( dev-lang/python:3.4[ncurses(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DEPEND=python_targets_python3_4? ( dev-lang/python:3.4[ncurses(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=A software for Gentoo installation
 EAPI=6
 HOMEPAGE=https://github.com/ChrisADR/installer
-IUSE=python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64
+IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=amd64
 LICENSE=GPL-2
-RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4[ncurses(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
+RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4[ncurses(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/ChrisADR/installer/archive/v0.1.1-beta.tar.gz -> installer-0.1.1_beta.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8a7161c9a1d5dcdfc9a10642bdaf46bd
+_md5_=049422e998c0d1ab0241318bcf70717c
diff --git a/metadata/md5-cache/app-admin/logcheck-1.3.18-r1 b/metadata/md5-cache/app-admin/logcheck-1.3.18-r1
index 24a80142c792..a9d042e90d96 100644
--- a/metadata/md5-cache/app-admin/logcheck-1.3.18-r1
+++ b/metadata/md5-cache/app-admin/logcheck-1.3.18-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst prepare setup
 DESCRIPTION=Mails anomalies in the system logfiles to the administrator
 EAPI=6
 HOMEPAGE=https://packages.debian.org/sid/logcheck
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~ppc ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=!app-admin/logsentry app-misc/lockfile-progs dev-lang/perl dev-perl/mime-construct virtual/mailx
 SLOT=0
 SRC_URI=mirror://debian/pool/main/l/logcheck/logcheck_1.3.18.tar.xz
 _eclasses_=readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=c80bd9f99e8834753dd2b73fac12152b
+_md5_=29afa90e9d06313a1eb5b72d6a3184f9
diff --git a/metadata/md5-cache/app-admin/pass-1.7.1 b/metadata/md5-cache/app-admin/pass-1.7.1
index 0c0a3cef0039..cff4ef90fb26 100644
--- a/metadata/md5-cache/app-admin/pass-1.7.1
+++ b/metadata/md5-cache/app-admin/pass-1.7.1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install postinst postrm prepare
 DESCRIPTION=Stores, retrieves, generates, and synchronizes passwords securely
-EAPI=5
+EAPI=6
 HOMEPAGE=https://www.passwordstore.org/
 IUSE=+git X zsh-completion fish-completion emacs dmenu importers elibc_Darwin
 KEYWORDS=amd64 ~arm x86 ~x86-macos
@@ -9,4 +9,4 @@ RDEPEND=app-crypt/gnupg media-gfx/qrencode >=app-text/tree-1.7.0 git? ( dev-vcs/
 SLOT=0
 SRC_URI=https://git.zx2c4.com/password-store/snapshot/password-store-1.7.1.tar.xz
 _eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	elisp-common	23f47b2e1de7abf387105eddd1318738	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=4411855990d20079f1b54cf90e99a733
+_md5_=228f6eaf592d7c1a8e4a83154d8edc70
diff --git a/metadata/md5-cache/app-admin/puppet-lint-2.3.5 b/metadata/md5-cache/app-admin/puppet-lint-2.3.5
index 1c887e529237..ccc6d9978637 100644
--- a/metadata/md5-cache/app-admin/puppet-lint-2.3.5
+++ b/metadata/md5-cache/app-admin/puppet-lint-2.3.5
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/rspec-its:1[ruby_targets_ruby23] dev-ruby/rspec-collection_matchers:1[ruby_targets_ruby23] dev-ruby/rspec-json_expectations[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec-its:1[ruby_targets_ruby24] dev-ruby/rspec-collection_matchers:1[ruby_targets_ruby24] dev-ruby/rspec-json_expectations[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/rspec-its:1[ruby_targets_ruby23] dev-ruby/rspec-collection_matchers:1[ruby_targets_ruby23] dev-ruby/rspec-json_expectations[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec-its:1[ruby_targets_ruby24] dev-ruby/rspec-collection_matchers:1[ruby_targets_ruby24] dev-ruby/rspec-json_expectations[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec-its:1[ruby_targets_ruby25] dev-ruby/rspec-collection_matchers:1[ruby_targets_ruby25] dev-ruby/rspec-json_expectations[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=A linter for puppet DSL
 EAPI=6
 HOMEPAGE=http://puppet-lint.com/
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/puppet-lint-2.3.5.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=64cf3c5c33759c629e42dd9f96c45be2
+_md5_=f88d73e0075db46ef95095ce73c027bf
diff --git a/metadata/md5-cache/app-admin/setools-3.3.8-r7 b/metadata/md5-cache/app-admin/setools-3.3.8-r7
deleted file mode 100644
index c6175bd16cbe..000000000000
--- a/metadata/md5-cache/app-admin/setools-3.3.8-r7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=sys-libs/libsepol-2.4 >=sys-libs/libselinux-2.4 >=dev-db/sqlite-3.2:3 dev-libs/libxml2:2 python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) X? ( >=dev-lang/tk-8.4.9:0= >=gnome-base/libglade-2.0 >=x11-libs/gtk+-2.8:2 ) >=sys-devel/automake-1.12.1 sys-devel/bison sys-devel/flex virtual/pkgconfig java? ( dev-lang/swig virtual/jdk:= ) python? ( dev-lang/swig ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=SELinux policy tools
-EAPI=5
-HOMEPAGE=https://github.com/TresysTechnology/setools/wiki
-IUSE=X debug java python elibc_FreeBSD java python_targets_python2_7 python_targets_python3_4
-KEYWORDS=amd64 ~arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-libs/libsepol-2.4 >=sys-libs/libselinux-2.4 >=dev-db/sqlite-3.2:3 dev-libs/libxml2:2 python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) X? ( >=dev-lang/tk-8.4.9:0= >=gnome-base/libglade-2.0 >=x11-libs/gtk+-2.8:2 ) java? ( >=virtual/jre-1.4:= ) X? ( >=dev-tcltk/bwidget-1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://oss.tresys.com/projects/setools/chrome/site/dists/setools-3.3.8/setools-3.3.8.tar.bz2 https://dev.gentoo.org/~perfinion/patches/setools/setools-3.3.8-04-gentoo-patches.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=14135f4e18ea744865147b4bbe7d6dcd
diff --git a/metadata/md5-cache/app-admin/setools-4.0.1 b/metadata/md5-cache/app-admin/setools-4.0.1
deleted file mode 100644
index 8ea7b638bfac..000000000000
--- a/metadata/md5-cache/app-admin/setools-4.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=sys-libs/libselinux-2.4:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/networkx-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] app-arch/bzip2:= dev-libs/libpcre:= X? ( dev-python/PyQt5 ) >=dev-lang/swig-2.0.12:0 sys-devel/bison sys-devel/flex >=sys-libs/libsepol-2.5 test? ( python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-python/tox[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Policy Analysis Tools for SELinux
-EAPI=6
-HOMEPAGE=https://github.com/TresysTechnology/setools/wiki
-IUSE=X debug test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~arm64 ~mips x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=sys-libs/libselinux-2.4:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/networkx-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] app-arch/bzip2:= dev-libs/libpcre:= X? ( dev-python/PyQt5 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=https://github.com/TresysTechnology/setools/archive/4.0.1.tar.gz -> setools-4.0.1.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8810206bc4119ac80d2a424ec84dd23e
diff --git a/metadata/md5-cache/app-admin/setools-4.1.1 b/metadata/md5-cache/app-admin/setools-4.1.1
index 09d0149a5f1c..4f5441a60eac 100644
--- a/metadata/md5-cache/app-admin/setools-4.1.1
+++ b/metadata/md5-cache/app-admin/setools-4.1.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 SLOT=0
 SRC_URI=https://github.com/TresysTechnology/setools/archive/4.1.1.tar.gz -> setools-4.1.1.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8dfcbdefc842e2bcec7141b3811b1794
+_md5_=301898d47429ada8f727dcbb28f53d22
diff --git a/metadata/md5-cache/app-admin/supervisor-3.3.4 b/metadata/md5-cache/app-admin/supervisor-3.3.4
new file mode 100644
index 000000000000..4b0e58b100f8
--- /dev/null
+++ b/metadata/md5-cache/app-admin/supervisor-3.3.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) test? ( dev-python/meld3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/pkgconfig
+DESCRIPTION=A system for controlling process state under UNIX
+EAPI=6
+HOMEPAGE=http://supervisord.org/ https://pypi.org/project/supervisor/
+IUSE=doc test python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=repoze ZPL BSD HPND GPL-2
+RDEPEND=dev-python/meld3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://pypi/s/supervisor/supervisor-3.3.4.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f44653197cc52ed3a2bd1bb1e027268f
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index c9e659b51d6d..13df91c5fe12 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/advancecomp-2.0 b/metadata/md5-cache/app-arch/advancecomp-2.0
index 773f785c5cef..c17966cfd406 100644
--- a/metadata/md5-cache/app-arch/advancecomp-2.0
+++ b/metadata/md5-cache/app-arch/advancecomp-2.0
@@ -4,11 +4,11 @@ DESCRIPTION=Recompress ZIP, PNG and MNG, considerably improving compression
 EAPI=6
 HOMEPAGE=http://www.advancemame.it/comp-readme.html
 IUSE=mng png test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd
 LICENSE=GPL-3 LGPL-2
 RDEPEND=app-arch/bzip2 sys-libs/zlib
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/amadvance/advancecomp/releases/download/v2.0/advancecomp-2.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0e5d1f06c20b6a654be77e97aed465eb
+_md5_=2567489440c73d6c3088fcdc87f12893
diff --git a/metadata/md5-cache/app-arch/alien-8.95-r1 b/metadata/md5-cache/app-arch/alien-8.95-r1
new file mode 100644
index 000000000000..d2411e05fd63
--- /dev/null
+++ b/metadata/md5-cache/app-arch/alien-8.95-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-arch/rpm app-arch/dpkg dev-util/debhelper >=app-arch/tar-1.14.91 bzip2? ( app-arch/bzip2 ) dev-lang/perl:=
+DESCRIPTION=Converts between the rpm, dpkg, stampede slp, and slackware tgz file formats
+EAPI=6
+HOMEPAGE=http://kitenet.net/programs/alien
+IUSE=+bzip2
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=app-arch/rpm app-arch/dpkg dev-util/debhelper >=app-arch/tar-1.14.91 bzip2? ( app-arch/bzip2 ) dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://debian/pool/main/a/alien/alien_8.95.tar.xz -> alien-8.95.tar.xz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=312d7a4e74cb81380e657b8be441a014
diff --git a/metadata/md5-cache/app-arch/bzip2-1.0.6-r9 b/metadata/md5-cache/app-arch/bzip2-1.0.6-r9
index 638fe03f7f47..3d972f51eb4a 100644
--- a/metadata/md5-cache/app-arch/bzip2-1.0.6-r9
+++ b/metadata/md5-cache/app-arch/bzip2-1.0.6-r9
@@ -3,9 +3,9 @@ DESCRIPTION=A high-quality data compressor used extensively by Gentoo Linux
 EAPI=6
 HOMEPAGE=http://www.bzip.org/
 IUSE=static static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=BZIP2
 SLOT=0/1
 SRC_URI=http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz
 _eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=5f27deed9bb4f56037f4556a9df23bef
+_md5_=c7a011bebf346a9b74f71a9c19b1da79
diff --git a/metadata/md5-cache/media-libs/libebur128-1.2.0-r1 b/metadata/md5-cache/app-arch/lz4-1.8.2
index e24f996d8f37..2b4883a49c00 100644
--- a/metadata/md5-cache/media-libs/libebur128-1.2.0-r1
+++ b/metadata/md5-cache/app-arch/lz4-1.8.2
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( app-arch/unzip media-libs/libsndfile[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A library implementing the EBU R128 loudness standard
+DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Extremely Fast Compression algorithm
 EAPI=6
-HOMEPAGE=https://github.com/jiixyj/libebur128
-IUSE=static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 x86
-LICENSE=MIT
-SLOT=0/1
-SRC_URI=https://github.com/jiixyj/libebur128/archive/v1.2.0.tar.gz -> libebur128-1.2.0.tar.gz test? ( https://tech.ebu.ch/files/live/sites/tech/files/shared/testmaterial/ebu-loudness-test-setv05.zip )
+HOMEPAGE=https://github.com/lz4/lz4
+IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=BSD-2 GPL-2
+SLOT=0/r131
+SRC_URI=https://github.com/Cyan4973/lz4/archive/v1.8.2.tar.gz -> lz4-1.8.2.tar.gz
 _eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	49cd471f02483798c5068698836b7429	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=05744e4c7c05c76cc65b044b7bc80e8a
+_md5_=9febdfa850ea2a41b2b6e0a0427c5865
diff --git a/metadata/md5-cache/app-arch/unar-1.10.1 b/metadata/md5-cache/app-arch/unar-1.10.1
index a940691fce11..77bc29944bb4 100644
--- a/metadata/md5-cache/app-arch/unar-1.10.1
+++ b/metadata/md5-cache/app-arch/unar-1.10.1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=gnustep-base/gnustep-base dev-libs/icu:= sys-libs/zlib app-arch/bzip2 >=gnustep-base/gnustep-make-2.6.0[native-exceptions] sys-devel/gcc[objc]
+DEPEND=app-arch/bzip2:= dev-libs/icu:= gnustep-base/gnustep-base sys-libs/zlib:= >=gnustep-base/gnustep-make-2.6.0[native-exceptions] sys-devel/gcc[objc]
 DESCRIPTION=unpacker for various archiving formats, e.g. rar v3
-EAPI=5
+EAPI=6
 HOMEPAGE=https://unarchiver.c3.cx/
 KEYWORDS=amd64
 LICENSE=LGPL-2.1
-RDEPEND=gnustep-base/gnustep-base dev-libs/icu:= sys-libs/zlib app-arch/bzip2
+RDEPEND=app-arch/bzip2:= dev-libs/icu:= gnustep-base/gnustep-base sys-libs/zlib:=
 SLOT=0
 SRC_URI=https://unarchiver.c3.cx/downloads/unar1.10.1_src.zip
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=e0508700d7356d176c0d0111cbd5eefa
+_md5_=385bd468d63b2816ee534d304e2d7f19
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index 62867984d00c..dedc4c2fcadb 100644
--- a/metadata/md5-cache/app-backup/Manifest.gz
+++ b/metadata/md5-cache/app-backup/Manifest.gz
diff --git a/metadata/md5-cache/app-backup/burp-2.0.54-r2 b/metadata/md5-cache/app-backup/burp-2.0.54-r2
deleted file mode 100644
index 298209eca043..000000000000
--- a/metadata/md5-cache/app-backup/burp-2.0.54-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=dev-libs/uthash net-libs/librsync sys-libs/ncurses:0= sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) acl? ( sys-apps/acl ) xattr? ( sys-apps/attr ) virtual/pkgconfig test? ( dev-libs/check ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=Network backup and restore client and server for Unix and Windows
-EAPI=6
-HOMEPAGE=http://burp.grke.org/
-IUSE=acl ipv6 libressl test xattr
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=AGPL-3
-RDEPEND=dev-libs/uthash net-libs/librsync sys-libs/ncurses:0= sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) acl? ( sys-apps/acl ) xattr? ( sys-apps/attr ) virtual/logger virtual/tmpfiles
-SLOT=0
-SRC_URI=https://github.com/grke/burp/archive/2.0.54.tar.gz -> burp-2.0.54.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	tmpfiles	7bd1d7bf5261430a2d2991cff7958c52	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=a5154ad11be9d6426ae281fc13ae9c8e
diff --git a/metadata/md5-cache/app-backup/burp-2.1.22 b/metadata/md5-cache/app-backup/burp-2.1.22
deleted file mode 100644
index d3d1e29ca94c..000000000000
--- a/metadata/md5-cache/app-backup/burp-2.1.22
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=dev-libs/uthash net-libs/librsync sys-libs/ncurses:0= sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) acl? ( sys-apps/acl ) xattr? ( sys-apps/attr ) virtual/pkgconfig test? ( dev-libs/check ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=Network backup and restore client and server for Unix and Windows
-EAPI=6
-HOMEPAGE=http://burp.grke.org/
-IUSE=acl ipv6 libressl test xattr
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=AGPL-3
-RDEPEND=dev-libs/uthash net-libs/librsync sys-libs/ncurses:0= sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) acl? ( sys-apps/acl ) xattr? ( sys-apps/attr ) virtual/logger virtual/tmpfiles
-SLOT=0
-SRC_URI=https://github.com/grke/burp/archive/2.1.22.tar.gz -> burp-2.1.22.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	tmpfiles	7bd1d7bf5261430a2d2991cff7958c52	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=606bf02499069cd1ec69dcf3d1c6fc2f
diff --git a/metadata/md5-cache/app-backup/burp-2.1.24-r1 b/metadata/md5-cache/app-backup/burp-2.1.24-r1
deleted file mode 100644
index bdfad9ee2f91..000000000000
--- a/metadata/md5-cache/app-backup/burp-2.1.24-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=dev-libs/uthash net-libs/librsync sys-libs/ncurses:0= sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) acl? ( sys-apps/acl ) xattr? ( sys-apps/attr ) virtual/pkgconfig test? ( dev-libs/check ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=Network backup and restore client and server for Unix and Windows
-EAPI=6
-HOMEPAGE=http://burp.grke.org/
-IUSE=acl ipv6 libressl test xattr
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=AGPL-3
-RDEPEND=dev-libs/uthash net-libs/librsync sys-libs/ncurses:0= sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) acl? ( sys-apps/acl ) xattr? ( sys-apps/attr ) virtual/logger
-SLOT=0
-SRC_URI=https://github.com/grke/burp/archive/2.1.24.tar.gz -> burp-2.1.24.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=da0098dd3aad199cf92e4fc9d7f1b828
diff --git a/metadata/md5-cache/app-backup/burp-2.1.26 b/metadata/md5-cache/app-backup/burp-2.1.26
deleted file mode 100644
index 91d58b266318..000000000000
--- a/metadata/md5-cache/app-backup/burp-2.1.26
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=dev-libs/uthash net-libs/librsync sys-libs/ncurses:0= sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) acl? ( sys-apps/acl ) xattr? ( sys-apps/attr ) virtual/pkgconfig test? ( dev-libs/check ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=Network backup and restore client and server for Unix and Windows
-EAPI=6
-HOMEPAGE=http://burp.grke.org/
-IUSE=acl ipv6 libressl test xattr
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=AGPL-3
-RDEPEND=dev-libs/uthash net-libs/librsync sys-libs/ncurses:0= sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) acl? ( sys-apps/acl ) xattr? ( sys-apps/attr ) virtual/logger
-SLOT=0
-SRC_URI=https://github.com/grke/burp/archive/2.1.26.tar.gz -> burp-2.1.26.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=75aa30d7b893b94bb9fd5eafd93c489f
diff --git a/metadata/md5-cache/app-backup/burp-2.1.28 b/metadata/md5-cache/app-backup/burp-2.1.28
deleted file mode 100644
index ec08e3f46e54..000000000000
--- a/metadata/md5-cache/app-backup/burp-2.1.28
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=dev-libs/uthash net-libs/librsync sys-libs/ncurses:0= sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) acl? ( sys-apps/acl ) xattr? ( sys-apps/attr ) virtual/pkgconfig test? ( dev-libs/check ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=Network backup and restore client and server for Unix and Windows
-EAPI=6
-HOMEPAGE=http://burp.grke.org/
-IUSE=acl ipv6 libressl test xattr
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=AGPL-3
-RDEPEND=dev-libs/uthash net-libs/librsync sys-libs/ncurses:0= sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) acl? ( sys-apps/acl ) xattr? ( sys-apps/attr ) virtual/logger
-SLOT=0
-SRC_URI=https://github.com/grke/burp/archive/2.1.28.tar.gz -> burp-2.1.28.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=75aa30d7b893b94bb9fd5eafd93c489f
diff --git a/metadata/md5-cache/app-benchmarks/Manifest.gz b/metadata/md5-cache/app-benchmarks/Manifest.gz
index 552ab383d0a9..f8a427d82ccd 100644
--- a/metadata/md5-cache/app-benchmarks/Manifest.gz
+++ b/metadata/md5-cache/app-benchmarks/Manifest.gz
diff --git a/metadata/md5-cache/app-benchmarks/spew-1.0.8 b/metadata/md5-cache/app-benchmarks/spew-1.0.8
deleted file mode 100644
index 6e4b8050eef7..000000000000
--- a/metadata/md5-cache/app-benchmarks/spew-1.0.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=static? ( sys-libs/ncurses[-gpm] dev-libs/popt[static-libs] ) !static? ( sys-libs/ncurses dev-libs/popt ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Measures I/O performance and/or generates I/O load
-EAPI=4
-HOMEPAGE=http://spew.berlios.de/
-IUSE=static
-KEYWORDS=amd64 ~arm ~mips ~ppc ~ppc64 x86
-LICENSE=GPL-2
-RDEPEND=static? ( sys-libs/ncurses[-gpm] dev-libs/popt[static-libs] ) !static? ( sys-libs/ncurses dev-libs/popt )
-SLOT=0
-SRC_URI=ftp://ftp.berlios.de/pub/spew/1.0.8/spew-1.0.8.tgz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=eb52c8c2bf0a4594080bb5f2f568963d
diff --git a/metadata/md5-cache/app-cdr/Manifest.gz b/metadata/md5-cache/app-cdr/Manifest.gz
index 3208057e3f19..f9c341e3b557 100644
--- a/metadata/md5-cache/app-cdr/Manifest.gz
+++ b/metadata/md5-cache/app-cdr/Manifest.gz
diff --git a/metadata/md5-cache/app-cdr/cdrdao-1.2.4 b/metadata/md5-cache/app-cdr/cdrdao-1.2.4
new file mode 100644
index 000000000000..d449964b3abe
--- /dev/null
+++ b/metadata/md5-cache/app-cdr/cdrdao-1.2.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=virtual/cdrtools encode? ( >=media-sound/lame-3.99 ) mad? ( media-libs/libmad media-libs/libao ) vorbis? ( media-libs/libvorbis media-libs/libao ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Burn CDs in disk-at-once mode -- with optional GUI frontend
+EAPI=6
+HOMEPAGE=http://cdrdao.sourceforge.net/
+IUSE=encode mad vorbis
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=virtual/cdrtools encode? ( >=media-sound/lame-3.99 ) mad? ( media-libs/libmad media-libs/libao ) vorbis? ( media-libs/libvorbis media-libs/libao ) !app-cdr/cue2toc !dev-util/pccts
+SLOT=0
+SRC_URI=mirror://sourceforge/cdrdao/cdrdao-1.2.4.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=438086f29ed18820d2011072dd6299d1
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index d0edd850dc30..4cc243a5ca94 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/qca-2.1.3-r2 b/metadata/md5-cache/app-crypt/qca-2.1.3-r2
index 9a48804c0336..5aa4337cb928 100644
--- a/metadata/md5-cache/app-crypt/qca-2.1.3-r2
+++ b/metadata/md5-cache/app-crypt/qca-2.1.3-r2
@@ -10,4 +10,4 @@ RDEPEND=dev-qt/qtcore:5 botan? ( dev-libs/botan:0 ) gcrypt? ( dev-libs/libgcrypt
 SLOT=2
 SRC_URI=mirror://kde/stable/qca/2.1.3/src/qca-2.1.3.tar.xz
 _eclasses_=cmake-utils	49cd471f02483798c5068698836b7429	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f90725a4627873d09644ab8e8347b0da
+_md5_=aed5c3ad41c548bc99980e51bdd7efb5
diff --git a/metadata/md5-cache/app-crypt/veracrypt-1.22 b/metadata/md5-cache/app-crypt/veracrypt-1.22
index 68864783ef50..0c584bebafee 100644
--- a/metadata/md5-cache/app-crypt/veracrypt-1.22
+++ b/metadata/md5-cache/app-crypt/veracrypt-1.22
@@ -4,11 +4,11 @@ DESCRIPTION=Disk encryption with strong security based on TrueCrypt
 EAPI=6
 HOMEPAGE=https://www.veracrypt.fr/en/Home.html
 IUSE=+asm cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3 +doc X
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=Apache-2.0 truecrypt-3.0
 RDEPEND=sys-fs/lvm2 sys-fs/fuse:0 x11-libs/wxGTK:3.0[X?] app-admin/sudo dev-libs/pkcs11-helper
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://github.com/veracrypt/VeraCrypt/archive/VeraCrypt_1.22.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
-_md5_=6e0d09181d70080525f5aff26a51b980
+_md5_=b629e6d3b51ab0f09d06c5a2909956ca
diff --git a/metadata/md5-cache/app-crypt/xca-1.4.1 b/metadata/md5-cache/app-crypt/xca-1.4.1
index 455afd0b5f23..2b86e8589368 100644
--- a/metadata/md5-cache/app-crypt/xca-1.4.1
+++ b/metadata/md5-cache/app-crypt/xca-1.4.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm
-DEPEND=dev-qt/qtgui:5 dev-qt/qtwidgets:5 !libressl? ( dev-libs/openssl:0=[bindist=] ) libressl? ( dev-libs/libressl:0= ) doc? ( app-text/linuxdoc-tools )
+DEPEND=dev-libs/libltdl:0= dev-qt/qtgui:5 dev-qt/qtwidgets:5 !libressl? ( dev-libs/openssl:0=[bindist=] ) libressl? ( dev-libs/libressl:0= ) doc? ( app-text/linuxdoc-tools )
 DESCRIPTION=A GUI to OpenSSL, RSA public keys, certificates, signing requests etc
 EAPI=6
 HOMEPAGE=http://hohnstaedt.de/xca/
 IUSE=bindist doc libressl
 KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=BSD
-RDEPEND=dev-qt/qtgui:5 dev-qt/qtwidgets:5 !libressl? ( dev-libs/openssl:0=[bindist=] ) libressl? ( dev-libs/libressl:0= ) doc? ( app-text/linuxdoc-tools )
+RDEPEND=dev-libs/libltdl:0= dev-qt/qtgui:5 dev-qt/qtwidgets:5 !libressl? ( dev-libs/openssl:0=[bindist=] ) libressl? ( dev-libs/libressl:0= ) doc? ( app-text/linuxdoc-tools )
 SLOT=0
 SRC_URI=https://github.com/chris2511/xca/releases/download/RELEASE.1.4.1/xca-1.4.1.tar.gz
 _eclasses_=xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=da19215389312efbe8c75143ffe8c0b9
+_md5_=e260ae9fe9ae5496de175ebb453c8be4
diff --git a/metadata/md5-cache/app-crypt/yubikey-manager-qt-0.5.1 b/metadata/md5-cache/app-crypt/yubikey-manager-qt-0.5.1
new file mode 100644
index 000000000000..0afee77edfb6
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/yubikey-manager-qt-0.5.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare setup
+DEPEND=>=app-crypt/yubikey-manager-0.7.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] <app-crypt/yubikey-manager-0.8 dev-python/cryptography[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/pyotherside[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-qt/qtsingleapplication[qt5(+),X] dev-qt/qtdeclarative:5 dev-qt/qtsvg:5 dev-qt/qtquickcontrols:5[widgets] dev-qt/qtwidgets:5
+DESCRIPTION=Cross-platform application for configuring any YubiKey over all USB transports
+EAPI=6
+HOMEPAGE=https://developers.yubico.com/yubikey-manager-qt https://github.com/Yubico/yubikey-manager-qt
+IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~amd64
+LICENSE=BSD-2
+RDEPEND=>=app-crypt/yubikey-manager-0.7.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] <app-crypt/yubikey-manager-0.8 dev-python/cryptography[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/pyotherside[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-qt/qtsingleapplication[qt5(+),X] dev-qt/qtdeclarative:5 dev-qt/qtsvg:5 dev-qt/qtquickcontrols:5[widgets] dev-qt/qtwidgets:5
+SLOT=0
+SRC_URI=https://github.com/Yubico/yubikey-manager-qt/releases/download/yubikey-manager-qt-0.5.1/yubikey-manager-qt-0.5.1.tar.gz -> yubikey-manager-qt-0.5.1.tar
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=400ea37d25d73cd08a284c9b49282ea6
diff --git a/metadata/md5-cache/app-doc/Manifest.gz b/metadata/md5-cache/app-doc/Manifest.gz
index ab75217ec642..02c9beb3ecda 100644
--- a/metadata/md5-cache/app-doc/Manifest.gz
+++ b/metadata/md5-cache/app-doc/Manifest.gz
diff --git a/metadata/md5-cache/app-doc/mkdoxy-1.0.0-r1 b/metadata/md5-cache/app-doc/mkdoxy-1.0.0-r1
index fd50cfd6b341..2da8be2100c4 100644
--- a/metadata/md5-cache/app-doc/mkdoxy-1.0.0-r1
+++ b/metadata/md5-cache/app-doc/mkdoxy-1.0.0-r1
@@ -3,8 +3,8 @@ DEPEND=app-doc/doxygen >=dev-lang/perl-5
 DESCRIPTION=mkDoxy generates Doxygen-compatible HTML documentation for makefiles
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/mkdoxy/
-KEYWORDS=~alpha amd64 ~hppa ia64 ppc sparc x86
+KEYWORDS=~alpha amd64 hppa ia64 ppc sparc x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://sourceforge/mkdoxy/mkdoxy-1.0.0.tar.gz
-_md5_=f7f210e28a551fcab46495b173dad0ca
+_md5_=162ce641f05cf84b0d51b2b9d8e4d23d
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 48b2a71f9a21..5d0587a7e089 100644
--- a/metadata/md5-cache/app-editors/Manifest.gz
+++ b/metadata/md5-cache/app-editors/Manifest.gz
diff --git a/metadata/md5-cache/app-editors/jupp-3.1_p27 b/metadata/md5-cache/app-editors/jupp-3.1_p27
deleted file mode 100644
index b99c4dc9d920..000000000000
--- a/metadata/md5-cache/app-editors/jupp-3.1_p27
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=ncurses? ( sys-libs/ncurses ) !app-editors/joe
-DESCRIPTION=portable version of JOE's Own Editor
-EAPI=4
-HOMEPAGE=https://www.mirbsd.org/jupp.htm
-IUSE=ncurses
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-1
-RDEPEND=ncurses? ( sys-libs/ncurses ) !app-editors/joe
-SLOT=0
-SRC_URI=https://www.mirbsd.org/MirOS/dist/jupp/joe-3.1jupp27.tgz
-_md5_=3fba8696cd6cd3d6deceb9c5351ac4b7
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index aa7fecc6c0e9..31ee6645ee6f 100644
--- a/metadata/md5-cache/app-emacs/Manifest.gz
+++ b/metadata/md5-cache/app-emacs/Manifest.gz
diff --git a/metadata/md5-cache/app-emacs/puppet-mode-0.3.20171221 b/metadata/md5-cache/app-emacs/puppet-mode-0.3.20171221
new file mode 100644
index 000000000000..363d06858aec
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/puppet-mode-0.3.20171221
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=>=virtual/emacs-23
+DESCRIPTION=Emacs major mode for editing Puppet manifests
+EAPI=6
+HOMEPAGE=https://github.com/voxpupuli/puppet-mode
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=virtual/emacs-23
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/voxpupuli/puppet-mode/archive/b3ed5057166a4f49dfa9be638523a348b55a2fd2.tar.gz -> puppet-mode-0.3.20171221.tar.gz
+_eclasses_=elisp	71fc1fea53f2bcc9e39073663574ce4a	elisp-common	23f47b2e1de7abf387105eddd1318738
+_md5_=bbb591e196ab9e0f8ab1527b583ec63e
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 67eb88725ed9..d02430bfda4b 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/spice-vdagent-0.17.0 b/metadata/md5-cache/app-emulation/spice-vdagent-0.17.0
deleted file mode 100644
index 949318b2558b..000000000000
--- a/metadata/md5-cache/app-emulation/spice-vdagent-0.17.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install setup
-DEPEND=>=app-emulation/spice-protocol-0.12.8 media-libs/alsa-lib >=x11-libs/libpciaccess-0.10 x11-libs/libXfixes x11-libs/libXrandr x11-libs/libX11 x11-libs/libXinerama consolekit? ( sys-auth/consolekit sys-apps/dbus ) systemd? ( sys-apps/systemd ) virtual/pkgconfig
-DESCRIPTION=SPICE VD Linux Guest Agent
-EAPI=6
-HOMEPAGE=https://www.spice-space.org/
-IUSE=+consolekit selinux systemd
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=>=app-emulation/spice-protocol-0.12.8 media-libs/alsa-lib >=x11-libs/libpciaccess-0.10 x11-libs/libXfixes x11-libs/libXrandr x11-libs/libX11 x11-libs/libXinerama consolekit? ( sys-auth/consolekit sys-apps/dbus ) systemd? ( sys-apps/systemd ) selinux? ( sec-policy/selinux-vdagent )
-SLOT=0
-SRC_URI=https://www.spice-space.org/download/releases/spice-vdagent-0.17.0.tar.bz2
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	ca370deef9d44125d829f2eb6ebc83e0	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=1520eada354530faa2618e9338f5819f
diff --git a/metadata/md5-cache/app-eselect/Manifest.gz b/metadata/md5-cache/app-eselect/Manifest.gz
index 54d74b83e7da..1701001cba49 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-blas-0.1 b/metadata/md5-cache/app-eselect/eselect-blas-0.1
index 8e60ca24cff8..8d07a47948a2 100644
--- a/metadata/md5-cache/app-eselect/eselect-blas-0.1
+++ b/metadata/md5-cache/app-eselect/eselect-blas-0.1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install
 DEPEND=>=app-admin/eselect-1.0.5
 DESCRIPTION=BLAS module for eselect
-EAPI=0
-HOMEPAGE=https://www.gentoo.org/proj/en/eselect/
+EAPI=6
+HOMEPAGE=https://www.gentoo.org
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
 LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.0.5
 SLOT=0
-_md5_=fe9f68458178ac348dac18ab5ec19b13
+_md5_=aed48cac13dd656a3f05c8751a30ecb7
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index 6a80a255716f..a3f0423ec92b 100644
--- a/metadata/md5-cache/app-i18n/Manifest.gz
+++ b/metadata/md5-cache/app-i18n/Manifest.gz
diff --git a/metadata/md5-cache/app-i18n/fcitx-4.2.9.4 b/metadata/md5-cache/app-i18n/fcitx-4.2.9.4
deleted file mode 100644
index 95bdeeae2c71..000000000000
--- a/metadata/md5-cache/app-i18n/fcitx-4.2.9.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-libs/glib:2 sys-apps/dbus virtual/libiconv virtual/libintl x11-libs/libxkbcommon X? ( x11-libs/libX11 x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrender xml? ( x11-libs/libxkbfile x11-misc/xkeyboard-config ) ) cairo? ( x11-libs/cairo[X] x11-libs/libXext pango? ( x11-libs/pango ) !pango? ( media-libs/fontconfig ) ) enchant? ( app-text/enchant:0= ) gtk2? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) introspection? ( dev-libs/gobject-introspection ) lua? ( dev-lang/lua:= ) nls? ( sys-devel/gettext ) opencc? ( app-i18n/opencc:= ) qt4? ( dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 ) xml? ( app-text/iso-codes dev-libs/libxml2 ) kde-frameworks/extra-cmake-modules:5 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=Fcitx (Flexible Context-aware Input Tool with eXtension) input method framework
-EAPI=6
-HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/fcitx
-IUSE=+X +autostart +cairo debug +enchant gtk2 gtk3 +introspection lua nls opencc +pango qt4 static-libs +table test +xml
-KEYWORDS=amd64 ~hppa ppc ppc64 x86
-LICENSE=BSD-1 GPL-2+ LGPL-2+ MIT
-RDEPEND=dev-libs/glib:2 sys-apps/dbus virtual/libiconv virtual/libintl x11-libs/libxkbcommon X? ( x11-libs/libX11 x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrender xml? ( x11-libs/libxkbfile x11-misc/xkeyboard-config ) ) cairo? ( x11-libs/cairo[X] x11-libs/libXext pango? ( x11-libs/pango ) !pango? ( media-libs/fontconfig ) ) enchant? ( app-text/enchant:0= ) gtk2? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) introspection? ( dev-libs/gobject-introspection ) lua? ( dev-lang/lua:= ) nls? ( sys-devel/gettext ) opencc? ( app-i18n/opencc:= ) qt4? ( dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 ) xml? ( app-text/iso-codes dev-libs/libxml2 )
-REQUIRED_USE=cairo? ( X ) pango? ( cairo ) qt4? ( X )
-SLOT=4
-SRC_URI=https://download.fcitx-im.org/fcitx/fcitx-4.2.9.4_dict.tar.xz
-_eclasses_=cmake-utils	49cd471f02483798c5068698836b7429	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b3a752c3522ca6bf1086d6ee34a10de3
diff --git a/metadata/md5-cache/app-i18n/fcitx-cloudpinyin-0.3.5 b/metadata/md5-cache/app-i18n/fcitx-cloudpinyin-0.3.5
deleted file mode 100644
index 919085f777fd..000000000000
--- a/metadata/md5-cache/app-i18n/fcitx-cloudpinyin-0.3.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-i18n/fcitx-4.2.9:4 net-misc/curl:= virtual/libiconv virtual/libintl virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Internet look-up support for Chinese Pinyin input methods for Fcitx
-EAPI=6
-HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/fcitx-cloudpinyin
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=GPL-2+
-RDEPEND=>=app-i18n/fcitx-4.2.9:4 net-misc/curl:= virtual/libiconv virtual/libintl
-SLOT=4
-SRC_URI=https://download.fcitx-im.org/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.5.tar.xz
-_eclasses_=cmake-utils	49cd471f02483798c5068698836b7429	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9f9f394b818536c216430df536143e84
diff --git a/metadata/md5-cache/app-i18n/fcitx-qt5-1.1.1 b/metadata/md5-cache/app-i18n/fcitx-qt5-1.1.1
deleted file mode 100644
index 80c8e6f455b6..000000000000
--- a/metadata/md5-cache/app-i18n/fcitx-qt5-1.1.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-i18n/fcitx-4.2.9:4 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5= dev-qt/qtwidgets:5 virtual/libintl x11-libs/libxkbcommon kde-frameworks/extra-cmake-modules:5 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Fcitx input method module for Qt 5
-EAPI=6
-HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/fcitx-qt5
-KEYWORDS=amd64 ~hppa ppc ppc64 x86
-LICENSE=GPL-2+ GPL-3+ LGPL-2+
-RDEPEND=>=app-i18n/fcitx-4.2.9:4 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5= dev-qt/qtwidgets:5 virtual/libintl x11-libs/libxkbcommon
-SLOT=4
-SRC_URI=https://download.fcitx-im.org/fcitx-qt5/fcitx-qt5-1.1.1.tar.xz
-_eclasses_=cmake-utils	49cd471f02483798c5068698836b7429	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f1a494e703d398cd5da787c2cb78bc9c
diff --git a/metadata/md5-cache/app-i18n/fcitx-qt5-1.2.0 b/metadata/md5-cache/app-i18n/fcitx-qt5-1.2.0
deleted file mode 100644
index ac0236397090..000000000000
--- a/metadata/md5-cache/app-i18n/fcitx-qt5-1.2.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-i18n/fcitx-4.2.9:4 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5= dev-qt/qtwidgets:5 virtual/libintl x11-libs/libxkbcommon dev-qt/qtconcurrent:5 kde-frameworks/extra-cmake-modules:5 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Fcitx input method module for Qt 5
-EAPI=6
-HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/fcitx-qt5
-KEYWORDS=~amd64 ~hppa ~ppc64 ~x86
-LICENSE=BSD GPL-2+ GPL-3+ LGPL-2+
-RDEPEND=>=app-i18n/fcitx-4.2.9:4 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5= dev-qt/qtwidgets:5 virtual/libintl x11-libs/libxkbcommon
-SLOT=4
-SRC_URI=https://download.fcitx-im.org/fcitx-qt5/fcitx-qt5-1.2.0.tar.xz
-_eclasses_=cmake-utils	49cd471f02483798c5068698836b7429	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=897903bf57cce133e5f96973c361c6fe
diff --git a/metadata/md5-cache/app-i18n/fcitx-unikey-0.2.6 b/metadata/md5-cache/app-i18n/fcitx-unikey-0.2.6
deleted file mode 100644
index 77a54babb8e2..000000000000
--- a/metadata/md5-cache/app-i18n/fcitx-unikey-0.2.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-i18n/fcitx-4.2.9:4 virtual/libintl macro-editor? ( >=app-i18n/fcitx-4.2.9:4[qt4] dev-qt/qtcore:4 dev-qt/qtgui:4 ) sys-devel/gettext virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=Vietnamese Unikey input methods for Fcitx
-EAPI=6
-HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/fcitx-unikey
-IUSE=+macro-editor
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=GPL-2+ GPL-3+ LGPL-2+
-RDEPEND=>=app-i18n/fcitx-4.2.9:4 virtual/libintl macro-editor? ( >=app-i18n/fcitx-4.2.9:4[qt4] dev-qt/qtcore:4 dev-qt/qtgui:4 )
-SLOT=4
-SRC_URI=https://download.fcitx-im.org/fcitx-unikey/fcitx-unikey-0.2.6.tar.xz
-_eclasses_=cmake-utils	49cd471f02483798c5068698836b7429	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4f8cf8e01f1a0f0f7dbea88fdad804a8
diff --git a/metadata/md5-cache/app-i18n/mozc-2.23.2815.102 b/metadata/md5-cache/app-i18n/mozc-2.23.2815.102
index 92b120489ef9..7712ebe4b71a 100644
--- a/metadata/md5-cache/app-i18n/mozc-2.23.2815.102
+++ b/metadata/md5-cache/app-i18n/mozc-2.23.2815.102
@@ -4,11 +4,11 @@ DESCRIPTION=Mozc - Japanese input method editor
 EAPI=6
 HOMEPAGE=https://github.com/google/mozc
 IUSE=debug emacs fcitx4 +gui +handwriting-tegaki handwriting-tomoe ibus renderer test
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc64 x86
 LICENSE=BSD BSD-2 ipadic public-domain unicode
 RDEPEND=>=dev-libs/protobuf-3.0.0:= emacs? ( virtual/emacs ) fcitx4? ( app-i18n/fcitx:4 ) gui? ( app-i18n/zinnia dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 handwriting-tegaki? ( app-i18n/tegaki-zinnia-japanese ) handwriting-tomoe? ( app-i18n/zinnia-tomoe ) ) ibus? ( >=app-i18n/ibus-1.4.1 dev-libs/glib:2 x11-libs/libxcb ) renderer? ( dev-libs/glib:2 x11-libs/cairo x11-libs/gtk+:2 x11-libs/pango )
 REQUIRED_USE=|| ( emacs fcitx4 ibus ) gui? ( ^^ ( handwriting-tegaki handwriting-tomoe ) ) !gui? ( !handwriting-tegaki !handwriting-tomoe )
 SLOT=0
 SRC_URI=https://github.com/google/mozc/archive/afb03ddfe72dde4cf2409863a3bfea160f7a66d8.tar.gz -> mozc-2.23.2815.102.tar.gz https://github.com/hiroyuki-komatsu/japanese-usage-dictionary/archive/e5b3425575734c323e1d947009dd74709437b684.tar.gz -> japanese-usage-dictionary-20120416091336.tar.gz fcitx4? ( https://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-2.23.2815.102.1.patch )
 _eclasses_=elisp-common	23f47b2e1de7abf387105eddd1318738	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=058609aaab1511319250e583bd1d69a4
+_md5_=d5627e8898ee788f0013e5476c75eeec
diff --git a/metadata/md5-cache/app-metrics/Manifest.gz b/metadata/md5-cache/app-metrics/Manifest.gz
index 192eea33e2d4..69094b4c0780 100644
--- a/metadata/md5-cache/app-metrics/Manifest.gz
+++ b/metadata/md5-cache/app-metrics/Manifest.gz
diff --git a/metadata/md5-cache/app-metrics/pushgateway-0.5.0 b/metadata/md5-cache/app-metrics/pushgateway-0.5.0
new file mode 100644
index 000000000000..11faa1f5bc9d
--- /dev/null
+++ b/metadata/md5-cache/app-metrics/pushgateway-0.5.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=dev-util/promu >=dev-lang/go-1.9 virtual/pkgconfig
+DESCRIPTION=Prometheus push acceptor for ephemeral and batch jobs
+EAPI=6
+HOMEPAGE=https://github.com/prometheus/pushgateway
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+SLOT=0
+SRC_URI=https://github.com/prometheus/pushgateway/archive/v0.5.0.tar.gz -> pushgateway-0.5.0.tar.gz
+_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=e40c442a815246b7e2f66f4dd718da0d
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 409bb716f3ad..fd7610f8e259 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/beep-1.3-r3 b/metadata/md5-cache/app-misc/beep-1.3-r3
index 030e5c4c2bf0..d9834352e341 100644
--- a/metadata/md5-cache/app-misc/beep-1.3-r3
+++ b/metadata/md5-cache/app-misc/beep-1.3-r3
@@ -3,9 +3,9 @@ DESCRIPTION=The advanced PC speaker beeper
 EAPI=6
 HOMEPAGE=http://www.johnath.com/beep
 IUSE=suid
-KEYWORDS=alpha amd64 arm ~ppc ~ppc64 sparc x86
+KEYWORDS=alpha amd64 arm ppc ppc64 sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.johnath.com/beep/beep-1.3.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=935d4f210bcad2d4f0585cdde53b0088
+_md5_=91ea73bf0eadb72e5b2db14eca022cd1
diff --git a/metadata/md5-cache/app-misc/cadubi-1.3 b/metadata/md5-cache/app-misc/cadubi-1.3
index 76d6954b1f2a..63ccb6e3b30c 100644
--- a/metadata/md5-cache/app-misc/cadubi-1.3
+++ b/metadata/md5-cache/app-misc/cadubi-1.3
@@ -1,12 +1,10 @@
-DEFINED_PHASES=install unpack
+DEFINED_PHASES=install prepare
 DEPEND=dev-lang/perl >=dev-perl/TermReadKey-2.21
-DESCRIPTION=CADUBI is an application that allows you to draw ASCII-Art images
-EAPI=0
+DESCRIPTION=An application that allows you to draw ASCII-Art images
+EAPI=6
 HOMEPAGE=http://langworth.com/CadubiProject
 KEYWORDS=~amd64 ppc ppc64 x86
 LICENSE=Artistic
-RDEPEND=dev-lang/perl >=dev-perl/TermReadKey-2.21
 SLOT=0
 SRC_URI=http://langworth.com/downloads/cadubi-1.3.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6f97d4860bb8f5bbe11761664d354739
+_md5_=c116b211ef577c6ed28bdcedb8c9bb39
diff --git a/metadata/md5-cache/app-misc/calendar-0.9.1-r1 b/metadata/md5-cache/app-misc/calendar-0.9.1-r1
index 4cc0ecfead14..e4248df6028b 100644
--- a/metadata/md5-cache/app-misc/calendar-0.9.1-r1
+++ b/metadata/md5-cache/app-misc/calendar-0.9.1-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Standard unix calendar program for Linux, ported from OpenBSD
 EAPI=6
 HOMEPAGE=http://bsdcalendar.sourceforge.net/
-KEYWORDS=alpha amd64 ~hppa ia64 ~mips ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://bsdcalendar.sourceforge.net/calendar-0.9.1.tar.bz2
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=f8edc4e8546863055fa02e6392c783f5
+_md5_=d2c1cda523d32cb50da20864467099a8
diff --git a/metadata/md5-cache/app-misc/elasticsearch-1.7.6 b/metadata/md5-cache/app-misc/elasticsearch-1.7.6
deleted file mode 100644
index 44d410c7d924..000000000000
--- a/metadata/md5-cache/app-misc/elasticsearch-1.7.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare setup
-DEPEND=virtual/pkgconfig
-DESCRIPTION=Open Source, Distributed, RESTful, Search Engine
-EAPI=6
-HOMEPAGE=https://www.elastic.co/products/elasticsearch
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=|| ( virtual/jre:1.7 virtual/jre:1.8 )
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-1.7.6.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=dc54eb69c0c23384b43f60fb9c74ba74
diff --git a/metadata/md5-cache/app-misc/regionset-0.2 b/metadata/md5-cache/app-misc/regionset-0.2
index 9dc348583064..0a6f66601930 100644
--- a/metadata/md5-cache/app-misc/regionset-0.2
+++ b/metadata/md5-cache/app-misc/regionset-0.2
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install postinst prepare
 DESCRIPTION=Sets the region on DVD drives
 EAPI=5
 HOMEPAGE=http://linvdr.org/projects/regionset/
-KEYWORDS=amd64 ~ppc x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://linvdr.org/download/regionset/regionset-0.2.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=457922a9627200562a01bf1ad1ed1514
+_md5_=bba51414748da224b96644a088178a59
diff --git a/metadata/md5-cache/app-misc/screen-4.6.1 b/metadata/md5-cache/app-misc/screen-4.6.1
index 40b2cb8ecaa8..0e15cf53eecc 100644
--- a/metadata/md5-cache/app-misc/screen-4.6.1
+++ b/metadata/md5-cache/app-misc/screen-4.6.1
@@ -4,10 +4,10 @@ DESCRIPTION=screen manager with VT100/ANSI terminal emulation
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/screen/
 IUSE=debug nethack pam selinux multiuser
-KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2:0= pam? ( virtual/pam ) selinux? ( sec-policy/selinux-screen )
 SLOT=0
 SRC_URI=mirror://gnu/screen/screen-4.6.1.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c554dca21588fe838372ac8436b16525
+_md5_=3405da52815f7dfd7c25a163d81d23f5
diff --git a/metadata/md5-cache/app-misc/tdfsb-0.0.10-r1 b/metadata/md5-cache/app-misc/tdfsb-0.0.10-r1
index a373ec8ce3f2..5e2ce0aab063 100644
--- a/metadata/md5-cache/app-misc/tdfsb-0.0.10-r1
+++ b/metadata/md5-cache/app-misc/tdfsb-0.0.10-r1
@@ -3,10 +3,10 @@ DEPEND=media-libs/freeglut media-libs/sdl-image media-libs/smpeg virtual/glu x11
 DESCRIPTION=SDL based graphical file browser
 EAPI=5
 HOMEPAGE=http://www.determinate.net/webdata/seg/tdfsb.html
-KEYWORDS=alpha amd64 ~ppc ~sparc x86
+KEYWORDS=alpha amd64 ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=media-libs/freeglut media-libs/sdl-image media-libs/smpeg virtual/glu x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu
 SLOT=0
 SRC_URI=http://www.determinate.net/webdata/data/tdfsb-0.0.10.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6928be783ef1500f3cd28abbea8d7778
+_md5_=53d3286a246f58ca2a40ab85806e7fbf
diff --git a/metadata/md5-cache/app-misc/vifm-0.9.1 b/metadata/md5-cache/app-misc/vifm-0.9.1
index 6b53797858a7..8bec9d44822c 100644
--- a/metadata/md5-cache/app-misc/vifm-0.9.1
+++ b/metadata/md5-cache/app-misc/vifm-0.9.1
@@ -4,10 +4,10 @@ DESCRIPTION=Console file manager with vi(m)-like keybindings
 EAPI=6
 HOMEPAGE=https://vifm.info/
 IUSE=X developer +extended-keys gtk +magic vim vim-syntax
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.9-r3:0 magic? ( sys-apps/file ) gtk? ( x11-libs/gtk+:2 ) X? ( x11-libs/libX11 ) vim? ( || ( app-editors/vim app-editors/gvim ) ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/vifm/vifm-0.9.1.tar.bz2
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=27aaf2fc5f89dd87b0bd76bb80fe4fb9
+_md5_=16d906c1c64e6af0d494642e677f4926
diff --git a/metadata/md5-cache/app-mobilephone/Manifest.gz b/metadata/md5-cache/app-mobilephone/Manifest.gz
index 159873495485..1cd7f49e6c62 100644
--- a/metadata/md5-cache/app-mobilephone/Manifest.gz
+++ b/metadata/md5-cache/app-mobilephone/Manifest.gz
diff --git a/metadata/md5-cache/app-mobilephone/scmxx-0.9.0 b/metadata/md5-cache/app-mobilephone/scmxx-0.9.0
index d83ee2308f1b..6901d45cd5d5 100644
--- a/metadata/md5-cache/app-mobilephone/scmxx-0.9.0
+++ b/metadata/md5-cache/app-mobilephone/scmxx-0.9.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=install
 DEPEND=bluetooth? ( net-wireless/bluez ) nls? ( sys-devel/gettext )
 DESCRIPTION=Exchange data with Siemens phones
-EAPI=0
+EAPI=6
 HOMEPAGE=http://www.hendrik-sattler.de/scmxx/
 IUSE=bluetooth nls
 KEYWORDS=~amd64 x86
@@ -9,4 +9,4 @@ LICENSE=GPL-2
 RDEPEND=bluetooth? ( net-wireless/bluez )
 SLOT=0
 SRC_URI=mirror://sourceforge/scmxx/scmxx-0.9.0.tar.bz2
-_md5_=4940938adf9cc27d833bfa20a9ca2377
+_md5_=6f99ad807de59d618b7501512268dbdd
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 4814701043ff..4657afc97300 100644
--- a/metadata/md5-cache/app-office/Manifest.gz
+++ b/metadata/md5-cache/app-office/Manifest.gz
diff --git a/metadata/md5-cache/app-office/libreoffice-5.4.7.2 b/metadata/md5-cache/app-office/libreoffice-5.4.7.2
new file mode 100644
index 000000000000..74a8490c5a4b
--- /dev/null
+++ b/metadata/md5-cache/app-office/libreoffice-5.4.7.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error =dev-libs/liborcus-0.12* dev-libs/librevenge dev-libs/nspr dev-libs/nss !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.24[nss] media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 ) gtk3? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf x11-libs/gtk+:3 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) !<sys-devel/make-3.82 >=dev-libs/libatomic_ops-7.2d >=dev-libs/libxml2-2.7.8 dev-libs/libxslt dev-perl/Archive-Zip >=dev-util/cppunit-1.14.0 >=dev-util/gperf-3 dev-util/intltool >=dev-util/mdds-1.2.2:1= media-libs/glm sys-devel/bison sys-devel/flex sys-devel/gettext sys-devel/ucpp sys-libs/zlib virtual/pkgconfig x11-base/xorg-proto x11-libs/libXt x11-libs/libXtst java? ( dev-java/ant-core >=virtual/jdk-1.6 ) odk? ( >=app-doc/doxygen-1.8.4 ) test? ( dev-util/cppunit media-fonts/dejavu ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=A full office productivity suite
+EAPI=6
+HOMEPAGE=https://www.libreoffice.org
+IUSE=bluetooth +branding coinmp +cups dbus debug eds firebird googledrive gstreamer +gtk gtk3 jemalloc libressl mysql odk pdfimport postgres test vlc libreoffice_extensions_nlpsolver libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript libreoffice_extensions_wiki-publisher elibc_FreeBSD java python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( LGPL-3 MPL-1.1 )
+PDEPEND==app-office/libreoffice-l10n-5.4*
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error =dev-libs/liborcus-0.12* dev-libs/librevenge dev-libs/nspr dev-libs/nss !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.24[nss] media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 ) gtk3? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf x11-libs/gtk+:3 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug !app-office/openoffice media-fonts/dejavu media-fonts/liberation-fonts media-fonts/libertine || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( >=virtual/jre-1.6 ) vlc? ( media-video/vlc ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) bluetooth? ( dbus ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
+SLOT=0
+SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-5.4.7.2.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-5.4.7.2.tar.xz https://download.documentfoundation.org/libreoffice/src/5.4.7//libreoffice-5.4.7.2.tar.xz https://download.documentfoundation.org/libreoffice/src/5.4.7//libreoffice-help-5.4.7.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/5.4.7.2/src/libreoffice-5.4.7.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/5.4.7.2/src/libreoffice-help-5.4.7.2.tar.xz java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	7e76462890d7d19cad453151876b0ecf	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d9edbee6251fcbe17253d3b70878d2cf
diff --git a/metadata/md5-cache/app-office/libreoffice-6.0.3.2 b/metadata/md5-cache/app-office/libreoffice-6.0.3.2
index 454e21c0d76e..cb6edcfa9a15 100644
--- a/metadata/md5-cache/app-office/libreoffice-6.0.3.2
+++ b/metadata/md5-cache/app-office/libreoffice-6.0.3.2
@@ -4,7 +4,7 @@ DESCRIPTION=A full office productivity suite
 EAPI=6
 HOMEPAGE=https://www.libreoffice.org
 IUSE=bluetooth +branding coinmp +cups dbus debug eds firebird googledrive gstreamer +gtk gtk2 jemalloc kde libressl mysql odk pdfimport postgres test vlc libreoffice_extensions_nlpsolver libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript libreoffice_extensions_wiki-publisher elibc_FreeBSD java python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( LGPL-3 MPL-1.1 )
 PDEPEND==app-office/libreoffice-l10n-6.0*
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error >=dev-libs/liborcus-0.13.3 dev-libs/librevenge dev-libs/nspr dev-libs/nss !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.24[nss] media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf x11-libs/gtk+:3 ) gtk2? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtx11extras:5 dev-qt/qtwidgets:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug !app-office/openoffice media-fonts/dejavu media-fonts/liberation-fonts media-fonts/libertine || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( >=virtual/jre-1.6 ) kde? ( kde-frameworks/breeze-icons:* ) vlc? ( media-video/vlc ) java? ( >=dev-java/java-config-2.2.0-r3 )
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4
 SLOT=0
 SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev.gentoo.org/~asturm/distfiles/libreoffice-6.0.3.2-patchset-01.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-6.0.3.2.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-6.0.3.2.tar.xz https://download.documentfoundation.org/libreoffice/src/6.0.3//libreoffice-6.0.3.2.tar.xz https://download.documentfoundation.org/libreoffice/src/6.0.3//libreoffice-help-6.0.3.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.0.3.2/src/libreoffice-6.0.3.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.0.3.2/src/libreoffice-help-6.0.3.2.tar.xz java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	7e76462890d7d19cad453151876b0ecf	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=74941a50f2e1b5b14924d5fbce795e2a
+_md5_=549d81777eb41043cc3d26eb00ca061a
diff --git a/metadata/md5-cache/app-office/libreoffice-bin-6.0.3.2 b/metadata/md5-cache/app-office/libreoffice-bin-6.0.3.2
index f3419351afc4..c6d64b6d8ad1 100644
--- a/metadata/md5-cache/app-office/libreoffice-bin-6.0.3.2
+++ b/metadata/md5-cache/app-office/libreoffice-bin-6.0.3.2
@@ -4,7 +4,7 @@ DESCRIPTION=A full office productivity suite. Binary package
 EAPI=6
 HOMEPAGE=https://www.libreoffice.org
 IUSE=gnome java kde elibc_FreeBSD java python_targets_python3_5
-KEYWORDS=-* ~amd64 ~x86
+KEYWORDS=-* amd64 ~x86
 LICENSE=LGPL-3
 PDEPEND==app-office/libreoffice-l10n-6.0.3.2*
 RDEPEND=app-text/hunspell:0/1.6 =app-text/libexttextcat-3.4* =app-text/libmwaw-0.3* dev-libs/boost:0/1.65.0 dev-libs/icu:0/60.2 >=media-gfx/graphite2-1.3.10 media-libs/harfbuzz:0/0.9.18[icu] media-libs/libpng:0/16 >=sys-devel/gcc-6.4.0 >=sys-libs/glibc-2.25 virtual/jpeg:62 python_targets_python3_5? ( dev-lang/python:3.5[threads,xml] ) >=dev-lang/python-exec-2:=[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_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error >=dev-libs/liborcus-0.13.3 dev-libs/librevenge dev-libs/nspr dev-libs/nss >=dev-libs/openssl-1.0.0d:0 >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.24[nss] media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender net-print/cups dev-libs/dbus-glib gnome? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 gnome? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf x11-libs/gtk+:3 ) kde? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf x11-libs/gtk+:3 ) x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtx11extras:5 dev-qt/qtwidgets:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) !app-office/libreoffice !app-office/openoffice media-fonts/dejavu media-fonts/liberation-fonts media-fonts/libertine || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( >=virtual/jre-1.6 ) kde? ( kde-frameworks/breeze-icons:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
@@ -13,4 +13,4 @@ RESTRICT=test strip
 SLOT=0
 SRC_URI=amd64? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-6.0.3.2.tar.xz kde? ( !java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-kde-6.0.3.2.xd3 ) java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-kde-java-6.0.3.2.xd3 ) ) gnome? ( !java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-gnome-6.0.3.2.xd3 ) java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-gnome-java-6.0.3.2.xd3 ) ) !kde? ( !gnome? ( java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-java-6.0.3.2.xd3 ) ) ) ) x86? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-6.0.3.2.tar.xz kde? ( !java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-kde-6.0.3.2.xd3 ) java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-kde-java-6.0.3.2.xd3 ) ) gnome? ( !java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-gnome-6.0.3.2.xd3 ) java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-gnome-java-6.0.3.2.xd3 ) ) !kde? ( !gnome? ( java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-java-6.0.3.2.xd3 ) ) ) )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=aec7f0cd3f6801666229e9a5457803cd
+_md5_=46748cc1d44cc9fa3f25fc359f7a7591
diff --git a/metadata/md5-cache/app-office/libreoffice-bin-debug-6.0.3.2 b/metadata/md5-cache/app-office/libreoffice-bin-debug-6.0.3.2
index 431adf2d6a2d..604c87a48122 100644
--- a/metadata/md5-cache/app-office/libreoffice-bin-debug-6.0.3.2
+++ b/metadata/md5-cache/app-office/libreoffice-bin-debug-6.0.3.2
@@ -4,10 +4,10 @@ DESCRIPTION=LibreOffice, a full office productivity suite. Binary package, debug
 EAPI=6
 HOMEPAGE=https://www.libreoffice.org
 IUSE=gnome java kde
-KEYWORDS=-* ~amd64 ~x86
+KEYWORDS=-* amd64 ~x86
 LICENSE=LGPL-3
 RDEPEND==app-office/libreoffice-bin-6.0.3.2[gnome=,java=,kde=]
 RESTRICT=test strip
 SLOT=0
 SRC_URI=amd64? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-debug-libreoffice-6.0.3.2.tar.xz kde? ( !java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-debug-libreoffice-kde-6.0.3.2.xd3 ) java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-debug-libreoffice-kde-java-6.0.3.2.xd3 ) ) gnome? ( !java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-debug-libreoffice-gnome-6.0.3.2.xd3 ) java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-debug-libreoffice-gnome-java-6.0.3.2.xd3 ) ) !kde? ( !gnome? ( java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-debug-libreoffice-java-6.0.3.2.xd3 ) ) ) ) x86? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-debug-libreoffice-6.0.3.2.tar.xz kde? ( !java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-debug-libreoffice-kde-6.0.3.2.xd3 ) java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-debug-libreoffice-kde-java-6.0.3.2.xd3 ) ) gnome? ( !java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-debug-libreoffice-gnome-6.0.3.2.xd3 ) java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-debug-libreoffice-gnome-java-6.0.3.2.xd3 ) ) !kde? ( !gnome? ( java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-debug-libreoffice-java-6.0.3.2.xd3 ) ) ) )
-_md5_=a540348125be75faed5ab90999413f95
+_md5_=d34cff65c83733063dbcb166838110b8
diff --git a/metadata/md5-cache/app-office/libreoffice-l10n-5.4.7.2 b/metadata/md5-cache/app-office/libreoffice-l10n-5.4.7.2
new file mode 100644
index 000000000000..709b67b6fba8
--- /dev/null
+++ b/metadata/md5-cache/app-office/libreoffice-l10n-5.4.7.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare unpack
+DEPEND=>=app-arch/rpm2targz-9.0.0.3g
+DESCRIPTION=Translations for the Libreoffice suite
+EAPI=6
+HOMEPAGE=https://www.libreoffice.org
+IUSE=offlinehelp l10n_am l10n_ast l10n_bg l10n_bn-IN l10n_bn l10n_bo l10n_bs l10n_ca-valencia l10n_ca l10n_cs l10n_da l10n_de l10n_dz l10n_el l10n_en-GB l10n_en l10n_en-ZA l10n_eo l10n_es l10n_et l10n_eu l10n_fi l10n_fr l10n_gl l10n_gu l10n_he l10n_hi l10n_hr l10n_hu l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_km l10n_ko l10n_mk l10n_nb l10n_ne l10n_nl l10n_nn l10n_om l10n_pl l10n_pt-BR l10n_pt l10n_ru l10n_si l10n_sk l10n_sl l10n_sq l10n_sv l10n_tg l10n_tr l10n_ug l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW l10n_af l10n_ar l10n_as l10n_be l10n_br l10n_brx l10n_cy l10n_dgo l10n_fa l10n_ga l10n_gd l10n_gug l10n_kk l10n_kmr-Latn l10n_kn l10n_kok l10n_ks l10n_lb l10n_lo l10n_lt l10n_lv l10n_mai l10n_ml l10n_mn l10n_mni l10n_mr l10n_my l10n_nr l10n_nso l10n_oc l10n_or l10n_pa l10n_ro l10n_rw l10n_sa l10n_sat l10n_sd l10n_sid l10n_sr-Latn l10n_sr l10n_ss l10n_st l10n_sw-TZ l10n_ta l10n_te l10n_th l10n_tn l10n_ts l10n_tt l10n_uz l10n_ve l10n_xh l10n_zu
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( LGPL-3 MPL-1.1 )
+RDEPEND=app-text/hunspell
+RESTRICT=strip
+SLOT=0
+SRC_URI=l10n_am? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_helppack_am.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_am.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_am.tar.gz ) ) l10n_ast? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_helppack_ast.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_ast.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_ast.tar.gz ) ) l10n_bg? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_helppack_bg.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_bg.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_bg.tar.gz ) ) l10n_bn-IN? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_helppack_bn-IN.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_bn-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_bn-IN.tar.gz ) ) l10n_bn? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_helppack_bn.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_bn.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_bn.tar.gz ) ) l10n_bo? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_helppack_bo.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_bo.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_bo.tar.gz ) ) l10n_bs? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_helppack_bs.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_bs.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_bs.tar.gz ) ) l10n_ca-valencia? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_helppack_ca-valencia.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_ca-valencia.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_ca-valencia.tar.gz ) ) l10n_ca? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_helppack_ca.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_ca.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_ca.tar.gz ) ) l10n_cs? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_helppack_cs.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_cs.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_cs.tar.gz ) ) l10n_da? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_helppack_da.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_da.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_da.tar.gz ) ) l10n_de? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_helppack_de.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_de.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_de.tar.gz ) ) l10n_dz? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_helppack_dz.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_dz.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_dz.tar.gz ) ) l10n_el? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_helppack_el.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_el.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_el.tar.gz ) ) l10n_en-GB? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_helppack_en-GB.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_en-GB.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_en-GB.tar.gz ) ) l10n_en? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_helppack_en-US.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_en-US.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_en-US.tar.gz ) ) l10n_en-ZA? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_helppack_en-ZA.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_en-ZA.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_en-ZA.tar.gz ) ) l10n_eo? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_helppack_eo.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_eo.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_eo.tar.gz ) ) l10n_es? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_helppack_es.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_es.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_es.tar.gz ) ) l10n_et? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_helppack_et.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_et.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_et.tar.gz ) ) l10n_eu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_helppack_eu.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_eu.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_eu.tar.gz ) ) l10n_fi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_helppack_fi.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_fi.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_fi.tar.gz ) ) l10n_fr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_helppack_fr.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_fr.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_fr.tar.gz ) ) l10n_gl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_helppack_gl.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_gl.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_gl.tar.gz ) ) l10n_gu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_helppack_gu.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_gu.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_gu.tar.gz ) ) l10n_he? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_helppack_he.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_he.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_he.tar.gz ) ) l10n_hi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_helppack_hi.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_hi.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_hi.tar.gz ) ) l10n_hr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_helppack_hr.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_hr.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_hr.tar.gz ) ) l10n_hu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_helppack_hu.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_hu.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_hu.tar.gz ) ) l10n_id? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_helppack_id.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_id.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_id.tar.gz ) ) l10n_is? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_helppack_is.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_is.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_is.tar.gz ) ) l10n_it? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_helppack_it.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_it.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_it.tar.gz ) ) l10n_ja? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_helppack_ja.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_ja.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_ja.tar.gz ) ) l10n_ka? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_helppack_ka.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_ka.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_ka.tar.gz ) ) l10n_km? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_helppack_km.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_km.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_km.tar.gz ) ) l10n_ko? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_helppack_ko.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_ko.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_ko.tar.gz ) ) l10n_mk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_helppack_mk.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_mk.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_mk.tar.gz ) ) l10n_nb? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_helppack_nb.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_nb.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_nb.tar.gz ) ) l10n_ne? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_helppack_ne.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_ne.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_ne.tar.gz ) ) l10n_nl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_helppack_nl.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_nl.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_nl.tar.gz ) ) l10n_nn? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_helppack_nn.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_nn.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_nn.tar.gz ) ) l10n_om? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_helppack_om.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_om.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_om.tar.gz ) ) l10n_pl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_helppack_pl.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_pl.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_pl.tar.gz ) ) l10n_pt-BR? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_helppack_pt-BR.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_pt-BR.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_pt-BR.tar.gz ) ) l10n_pt? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_helppack_pt.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_pt.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_pt.tar.gz ) ) l10n_ru? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_helppack_ru.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_ru.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_ru.tar.gz ) ) l10n_si? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_helppack_si.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_si.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_si.tar.gz ) ) l10n_sk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_helppack_sk.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_sk.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_sk.tar.gz ) ) l10n_sl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_helppack_sl.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_sl.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_sl.tar.gz ) ) l10n_sq? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_helppack_sq.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_sq.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_sq.tar.gz ) ) l10n_sv? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_helppack_sv.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_sv.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_sv.tar.gz ) ) l10n_tg? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_helppack_tg.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_tg.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_tg.tar.gz ) ) l10n_tr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_helppack_tr.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_tr.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_tr.tar.gz ) ) l10n_ug? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_helppack_ug.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_ug.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_ug.tar.gz ) ) l10n_uk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_helppack_uk.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_uk.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_uk.tar.gz ) ) l10n_vi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_helppack_vi.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_vi.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_vi.tar.gz ) ) l10n_zh-CN? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_helppack_zh-CN.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_zh-CN.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_zh-CN.tar.gz ) ) l10n_zh-TW? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_helppack_zh-TW.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_zh-TW.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_zh-TW.tar.gz ) ) l10n_am? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_am.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_am.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_am.tar.gz ) l10n_ast? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_ast.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_ast.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_ast.tar.gz ) l10n_bg? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_bg.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_bg.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_bg.tar.gz ) l10n_bn-IN? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_bn-IN.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_bn-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_bn-IN.tar.gz ) l10n_bn? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_bn.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_bn.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_bn.tar.gz ) l10n_bo? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_bo.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_bo.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_bo.tar.gz ) l10n_bs? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_bs.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_bs.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_bs.tar.gz ) l10n_ca-valencia? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_ca-valencia.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_ca-valencia.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_ca-valencia.tar.gz ) l10n_ca? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_ca.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_ca.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_ca.tar.gz ) l10n_cs? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_cs.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_cs.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_cs.tar.gz ) l10n_da? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_da.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_da.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_da.tar.gz ) l10n_de? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_de.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_de.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_de.tar.gz ) l10n_dz? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_dz.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_dz.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_dz.tar.gz ) l10n_el? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_el.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_el.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_el.tar.gz ) l10n_en-GB? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_en-GB.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_en-GB.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_en-GB.tar.gz ) l10n_en-ZA? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_en-ZA.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_en-ZA.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_en-ZA.tar.gz ) l10n_eo? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_eo.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_eo.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_eo.tar.gz ) l10n_es? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_es.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_es.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_es.tar.gz ) l10n_et? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_et.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_et.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_et.tar.gz ) l10n_eu? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_eu.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_eu.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_eu.tar.gz ) l10n_fi? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_fi.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_fi.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_fi.tar.gz ) l10n_fr? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_fr.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_fr.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_fr.tar.gz ) l10n_gl? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_gl.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_gl.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_gl.tar.gz ) l10n_gu? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_gu.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_gu.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_gu.tar.gz ) l10n_he? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_he.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_he.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_he.tar.gz ) l10n_hi? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_hi.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_hi.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_hi.tar.gz ) l10n_hr? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_hr.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_hr.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_hr.tar.gz ) l10n_hu? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_hu.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_hu.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_hu.tar.gz ) l10n_id? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_id.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_id.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_id.tar.gz ) l10n_is? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_is.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_is.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_is.tar.gz ) l10n_it? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_it.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_it.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_it.tar.gz ) l10n_ja? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_ja.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_ja.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_ja.tar.gz ) l10n_ka? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_ka.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_ka.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_ka.tar.gz ) l10n_km? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_km.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_km.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_km.tar.gz ) l10n_ko? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_ko.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_ko.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_ko.tar.gz ) l10n_mk? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_mk.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_mk.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_mk.tar.gz ) l10n_nb? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_nb.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_nb.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_nb.tar.gz ) l10n_ne? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_ne.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_ne.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_ne.tar.gz ) l10n_nl? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_nl.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_nl.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_nl.tar.gz ) l10n_nn? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_nn.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_nn.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_nn.tar.gz ) l10n_om? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_om.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_om.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_om.tar.gz ) l10n_pl? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_pl.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_pl.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_pl.tar.gz ) l10n_pt-BR? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_pt-BR.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_pt-BR.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_pt-BR.tar.gz ) l10n_pt? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_pt.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_pt.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_pt.tar.gz ) l10n_ru? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_ru.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_ru.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_ru.tar.gz ) l10n_si? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_si.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_si.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_si.tar.gz ) l10n_sk? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_sk.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_sk.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_sk.tar.gz ) l10n_sl? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_sl.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_sl.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_sl.tar.gz ) l10n_sq? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_sq.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_sq.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_sq.tar.gz ) l10n_sv? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_sv.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_sv.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_sv.tar.gz ) l10n_tg? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_tg.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_tg.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_tg.tar.gz ) l10n_tr? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_tr.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_tr.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_tr.tar.gz ) l10n_ug? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_ug.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_ug.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_ug.tar.gz ) l10n_uk? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_uk.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_uk.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_uk.tar.gz ) l10n_vi? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_vi.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_vi.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_vi.tar.gz ) l10n_zh-CN? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_zh-CN.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_zh-CN.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_zh-CN.tar.gz ) l10n_zh-TW? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_zh-TW.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_zh-TW.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_zh-TW.tar.gz ) l10n_af? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_af.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_af.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_af.tar.gz ) l10n_ar? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_ar.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_ar.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_ar.tar.gz ) l10n_as? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_as.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_as.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_as.tar.gz ) l10n_be? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_be.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_be.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_be.tar.gz ) l10n_br? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_br.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_br.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_br.tar.gz ) l10n_brx? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_brx.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_brx.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_brx.tar.gz ) l10n_cy? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_cy.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_cy.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_cy.tar.gz ) l10n_dgo? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_dgo.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_dgo.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_dgo.tar.gz ) l10n_fa? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_fa.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_fa.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_fa.tar.gz ) l10n_ga? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_ga.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_ga.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_ga.tar.gz ) l10n_gd? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_gd.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_gd.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_gd.tar.gz ) l10n_gug? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_gug.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_gug.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_gug.tar.gz ) l10n_kk? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_kk.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_kk.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_kk.tar.gz ) l10n_kmr-Latn? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_kmr-Latn.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_kmr-Latn.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_kmr-Latn.tar.gz ) l10n_kn? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_kn.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_kn.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_kn.tar.gz ) l10n_kok? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_kok.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_kok.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_kok.tar.gz ) l10n_ks? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_ks.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_ks.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_ks.tar.gz ) l10n_lb? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_lb.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_lb.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_lb.tar.gz ) l10n_lo? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_lo.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_lo.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_lo.tar.gz ) l10n_lt? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_lt.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_lt.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_lt.tar.gz ) l10n_lv? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_lv.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_lv.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_lv.tar.gz ) l10n_mai? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_mai.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_mai.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_mai.tar.gz ) l10n_ml? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_ml.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_ml.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_ml.tar.gz ) l10n_mn? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_mn.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_mn.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_mn.tar.gz ) l10n_mni? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_mni.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_mni.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_mni.tar.gz ) l10n_mr? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_mr.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_mr.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_mr.tar.gz ) l10n_my? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_my.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_my.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_my.tar.gz ) l10n_nr? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_nr.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_nr.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_nr.tar.gz ) l10n_nso? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_nso.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_nso.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_nso.tar.gz ) l10n_oc? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_oc.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_oc.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_oc.tar.gz ) l10n_or? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_or.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_or.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_or.tar.gz ) l10n_pa? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_pa-IN.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_pa-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_pa-IN.tar.gz ) l10n_ro? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_ro.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_ro.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_ro.tar.gz ) l10n_rw? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_rw.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_rw.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_rw.tar.gz ) l10n_sa? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_sa-IN.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_sa-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_sa-IN.tar.gz ) l10n_sat? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_sat.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_sat.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_sat.tar.gz ) l10n_sd? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_sd.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_sd.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_sd.tar.gz ) l10n_sid? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_sid.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_sid.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_sid.tar.gz ) l10n_sr-Latn? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_sr-Latn.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_sr-Latn.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_sr-Latn.tar.gz ) l10n_sr? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_sr.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_sr.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_sr.tar.gz ) l10n_ss? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_ss.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_ss.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_ss.tar.gz ) l10n_st? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_st.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_st.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_st.tar.gz ) l10n_sw-TZ? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_sw-TZ.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_sw-TZ.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_sw-TZ.tar.gz ) l10n_ta? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_ta.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_ta.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_ta.tar.gz ) l10n_te? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_te.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_te.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_te.tar.gz ) l10n_th? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_th.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_th.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_th.tar.gz ) l10n_tn? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_tn.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_tn.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_tn.tar.gz ) l10n_ts? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_ts.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_ts.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_ts.tar.gz ) l10n_tt? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_tt.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_tt.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_tt.tar.gz ) l10n_uz? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_uz.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_uz.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_uz.tar.gz ) l10n_ve? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_ve.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_ve.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_ve.tar.gz ) l10n_xh? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_xh.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_xh.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_xh.tar.gz ) l10n_zu? ( https://download.documentfoundation.org/libreoffice/stable/5.4.7/rpm/x86/LibreOffice_5.4.7_Linux_x86_rpm_langpack_zu.tar.gz -> LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_zu.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.7/rpm/x86/LibreOffice_5.4.7.2_Linux_x86_rpm_langpack_zu.tar.gz )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=0d724f652b383a9e5ea19e984af7be96
diff --git a/metadata/md5-cache/app-office/libreoffice-l10n-6.0.3.2 b/metadata/md5-cache/app-office/libreoffice-l10n-6.0.3.2
index 716c79443664..5082f09844ed 100644
--- a/metadata/md5-cache/app-office/libreoffice-l10n-6.0.3.2
+++ b/metadata/md5-cache/app-office/libreoffice-l10n-6.0.3.2
@@ -4,11 +4,11 @@ DESCRIPTION=Translations for the Libreoffice suite
 EAPI=6
 HOMEPAGE=https://www.libreoffice.org
 IUSE=offlinehelp l10n_am l10n_ast l10n_bg l10n_bn-IN l10n_bn l10n_bo l10n_bs l10n_ca-valencia l10n_ca l10n_cs l10n_da l10n_de l10n_dz l10n_el l10n_en-GB l10n_en l10n_en-ZA l10n_eo l10n_es l10n_et l10n_eu l10n_fi l10n_fr l10n_gl l10n_gu l10n_he l10n_hi l10n_hr l10n_hu l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_km l10n_ko l10n_mk l10n_nb l10n_ne l10n_nl l10n_nn l10n_om l10n_pl l10n_pt-BR l10n_pt l10n_ru l10n_si l10n_sk l10n_sl l10n_sq l10n_sv l10n_tg l10n_tr l10n_ug l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW l10n_af l10n_ar l10n_as l10n_be l10n_br l10n_brx l10n_cy l10n_dgo l10n_fa l10n_ga l10n_gd l10n_gug l10n_kk l10n_kmr-Latn l10n_kn l10n_kok l10n_ks l10n_lb l10n_lo l10n_lt l10n_lv l10n_mai l10n_ml l10n_mn l10n_mni l10n_mr l10n_my l10n_nr l10n_nso l10n_oc l10n_or l10n_pa l10n_ro l10n_rw l10n_sa l10n_sat l10n_sd l10n_sid l10n_sr-Latn l10n_sr l10n_ss l10n_st l10n_sw-TZ l10n_ta l10n_te l10n_th l10n_tn l10n_ts l10n_tt l10n_uz l10n_ve l10n_xh l10n_zu
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( LGPL-3 MPL-1.1 )
 RDEPEND=app-text/hunspell
 RESTRICT=strip
 SLOT=0
 SRC_URI=l10n_am? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_am.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_am.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_am.tar.gz ) ) l10n_ast? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_ast.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_ast.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_ast.tar.gz ) ) l10n_bg? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_bg.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_bg.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_bg.tar.gz ) ) l10n_bn-IN? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_bn-IN.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_bn-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_bn-IN.tar.gz ) ) l10n_bn? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_bn.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_bn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_bn.tar.gz ) ) l10n_bo? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_bo.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_bo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_bo.tar.gz ) ) l10n_bs? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_bs.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_bs.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_bs.tar.gz ) ) l10n_ca-valencia? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_ca-valencia.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_ca-valencia.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_ca-valencia.tar.gz ) ) l10n_ca? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_ca.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_ca.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_ca.tar.gz ) ) l10n_cs? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_cs.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_cs.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_cs.tar.gz ) ) l10n_da? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_da.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_da.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_da.tar.gz ) ) l10n_de? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_de.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_de.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_de.tar.gz ) ) l10n_dz? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_dz.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_dz.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_dz.tar.gz ) ) l10n_el? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_el.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_el.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_el.tar.gz ) ) l10n_en-GB? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_en-GB.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_en-GB.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_en-GB.tar.gz ) ) l10n_en? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_en-US.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_en-US.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_en-US.tar.gz ) ) l10n_en-ZA? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_en-ZA.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_en-ZA.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_en-ZA.tar.gz ) ) l10n_eo? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_eo.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_eo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_eo.tar.gz ) ) l10n_es? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_es.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_es.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_es.tar.gz ) ) l10n_et? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_et.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_et.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_et.tar.gz ) ) l10n_eu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_eu.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_eu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_eu.tar.gz ) ) l10n_fi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_fi.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_fi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_fi.tar.gz ) ) l10n_fr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_fr.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_fr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_fr.tar.gz ) ) l10n_gl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_gl.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_gl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_gl.tar.gz ) ) l10n_gu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_gu.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_gu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_gu.tar.gz ) ) l10n_he? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_he.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_he.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_he.tar.gz ) ) l10n_hi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_hi.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_hi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_hi.tar.gz ) ) l10n_hr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_hr.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_hr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_hr.tar.gz ) ) l10n_hu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_hu.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_hu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_hu.tar.gz ) ) l10n_id? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_id.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_id.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_id.tar.gz ) ) l10n_is? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_is.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_is.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_is.tar.gz ) ) l10n_it? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_it.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_it.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_it.tar.gz ) ) l10n_ja? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_ja.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_ja.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_ja.tar.gz ) ) l10n_ka? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_ka.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_ka.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_ka.tar.gz ) ) l10n_km? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_km.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_km.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_km.tar.gz ) ) l10n_ko? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_ko.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_ko.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_ko.tar.gz ) ) l10n_mk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_mk.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_mk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_mk.tar.gz ) ) l10n_nb? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_nb.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_nb.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_nb.tar.gz ) ) l10n_ne? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_ne.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_ne.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_ne.tar.gz ) ) l10n_nl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_nl.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_nl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_nl.tar.gz ) ) l10n_nn? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_nn.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_nn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_nn.tar.gz ) ) l10n_om? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_om.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_om.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_om.tar.gz ) ) l10n_pl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_pl.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_pl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_pl.tar.gz ) ) l10n_pt-BR? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_pt-BR.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_pt-BR.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_pt-BR.tar.gz ) ) l10n_pt? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_pt.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_pt.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_pt.tar.gz ) ) l10n_ru? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_ru.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_ru.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_ru.tar.gz ) ) l10n_si? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_si.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_si.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_si.tar.gz ) ) l10n_sk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_sk.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_sk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_sk.tar.gz ) ) l10n_sl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_sl.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_sl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_sl.tar.gz ) ) l10n_sq? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_sq.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_sq.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_sq.tar.gz ) ) l10n_sv? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_sv.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_sv.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_sv.tar.gz ) ) l10n_tg? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_tg.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_tg.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_tg.tar.gz ) ) l10n_tr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_tr.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_tr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_tr.tar.gz ) ) l10n_ug? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_ug.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_ug.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_ug.tar.gz ) ) l10n_uk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_uk.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_uk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_uk.tar.gz ) ) l10n_vi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_vi.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_vi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_vi.tar.gz ) ) l10n_zh-CN? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_zh-CN.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_zh-CN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_zh-CN.tar.gz ) ) l10n_zh-TW? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_zh-TW.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_zh-TW.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_zh-TW.tar.gz ) ) l10n_am? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_am.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_am.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_am.tar.gz ) l10n_ast? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_ast.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ast.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ast.tar.gz ) l10n_bg? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_bg.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_bg.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_bg.tar.gz ) l10n_bn-IN? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_bn-IN.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_bn-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_bn-IN.tar.gz ) l10n_bn? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_bn.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_bn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_bn.tar.gz ) l10n_bo? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_bo.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_bo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_bo.tar.gz ) l10n_bs? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_bs.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_bs.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_bs.tar.gz ) l10n_ca-valencia? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_ca-valencia.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ca-valencia.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ca-valencia.tar.gz ) l10n_ca? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_ca.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ca.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ca.tar.gz ) l10n_cs? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_cs.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_cs.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_cs.tar.gz ) l10n_da? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_da.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_da.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_da.tar.gz ) l10n_de? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_de.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_de.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_de.tar.gz ) l10n_dz? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_dz.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_dz.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_dz.tar.gz ) l10n_el? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_el.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_el.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_el.tar.gz ) l10n_en-GB? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_en-GB.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_en-GB.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_en-GB.tar.gz ) l10n_en-ZA? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_en-ZA.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_en-ZA.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_en-ZA.tar.gz ) l10n_eo? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_eo.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_eo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_eo.tar.gz ) l10n_es? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_es.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_es.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_es.tar.gz ) l10n_et? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_et.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_et.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_et.tar.gz ) l10n_eu? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_eu.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_eu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_eu.tar.gz ) l10n_fi? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_fi.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_fi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_fi.tar.gz ) l10n_fr? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_fr.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_fr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_fr.tar.gz ) l10n_gl? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_gl.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_gl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_gl.tar.gz ) l10n_gu? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_gu.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_gu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_gu.tar.gz ) l10n_he? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_he.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_he.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_he.tar.gz ) l10n_hi? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_hi.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_hi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_hi.tar.gz ) l10n_hr? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_hr.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_hr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_hr.tar.gz ) l10n_hu? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_hu.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_hu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_hu.tar.gz ) l10n_id? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_id.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_id.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_id.tar.gz ) l10n_is? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_is.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_is.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_is.tar.gz ) l10n_it? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_it.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_it.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_it.tar.gz ) l10n_ja? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_ja.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ja.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ja.tar.gz ) l10n_ka? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_ka.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ka.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ka.tar.gz ) l10n_km? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_km.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_km.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_km.tar.gz ) l10n_ko? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_ko.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ko.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ko.tar.gz ) l10n_mk? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_mk.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_mk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_mk.tar.gz ) l10n_nb? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_nb.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_nb.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_nb.tar.gz ) l10n_ne? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_ne.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ne.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ne.tar.gz ) l10n_nl? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_nl.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_nl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_nl.tar.gz ) l10n_nn? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_nn.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_nn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_nn.tar.gz ) l10n_om? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_om.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_om.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_om.tar.gz ) l10n_pl? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_pl.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_pl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_pl.tar.gz ) l10n_pt-BR? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_pt-BR.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_pt-BR.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_pt-BR.tar.gz ) l10n_pt? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_pt.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_pt.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_pt.tar.gz ) l10n_ru? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_ru.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ru.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ru.tar.gz ) l10n_si? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_si.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_si.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_si.tar.gz ) l10n_sk? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_sk.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sk.tar.gz ) l10n_sl? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_sl.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sl.tar.gz ) l10n_sq? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_sq.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sq.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sq.tar.gz ) l10n_sv? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_sv.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sv.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sv.tar.gz ) l10n_tg? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_tg.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_tg.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_tg.tar.gz ) l10n_tr? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_tr.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_tr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_tr.tar.gz ) l10n_ug? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_ug.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ug.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ug.tar.gz ) l10n_uk? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_uk.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_uk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_uk.tar.gz ) l10n_vi? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_vi.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_vi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_vi.tar.gz ) l10n_zh-CN? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_zh-CN.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_zh-CN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_zh-CN.tar.gz ) l10n_zh-TW? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_zh-TW.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_zh-TW.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_zh-TW.tar.gz ) l10n_af? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_af.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_af.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_af.tar.gz ) l10n_ar? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_ar.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ar.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ar.tar.gz ) l10n_as? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_as.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_as.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_as.tar.gz ) l10n_be? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_be.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_be.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_be.tar.gz ) l10n_br? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_br.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_br.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_br.tar.gz ) l10n_brx? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_brx.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_brx.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_brx.tar.gz ) l10n_cy? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_cy.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_cy.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_cy.tar.gz ) l10n_dgo? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_dgo.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_dgo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_dgo.tar.gz ) l10n_fa? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_fa.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_fa.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_fa.tar.gz ) l10n_ga? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_ga.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ga.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ga.tar.gz ) l10n_gd? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_gd.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_gd.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_gd.tar.gz ) l10n_gug? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_gug.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_gug.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_gug.tar.gz ) l10n_kk? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_kk.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_kk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_kk.tar.gz ) l10n_kmr-Latn? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_kmr-Latn.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_kmr-Latn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_kmr-Latn.tar.gz ) l10n_kn? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_kn.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_kn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_kn.tar.gz ) l10n_kok? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_kok.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_kok.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_kok.tar.gz ) l10n_ks? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_ks.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ks.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ks.tar.gz ) l10n_lb? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_lb.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_lb.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_lb.tar.gz ) l10n_lo? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_lo.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_lo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_lo.tar.gz ) l10n_lt? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_lt.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_lt.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_lt.tar.gz ) l10n_lv? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_lv.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_lv.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_lv.tar.gz ) l10n_mai? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_mai.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_mai.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_mai.tar.gz ) l10n_ml? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_ml.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ml.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ml.tar.gz ) l10n_mn? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_mn.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_mn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_mn.tar.gz ) l10n_mni? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_mni.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_mni.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_mni.tar.gz ) l10n_mr? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_mr.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_mr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_mr.tar.gz ) l10n_my? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_my.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_my.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_my.tar.gz ) l10n_nr? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_nr.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_nr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_nr.tar.gz ) l10n_nso? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_nso.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_nso.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_nso.tar.gz ) l10n_oc? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_oc.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_oc.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_oc.tar.gz ) l10n_or? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_or.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_or.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_or.tar.gz ) l10n_pa? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_pa-IN.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_pa-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_pa-IN.tar.gz ) l10n_ro? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_ro.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ro.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ro.tar.gz ) l10n_rw? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_rw.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_rw.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_rw.tar.gz ) l10n_sa? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_sa-IN.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sa-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sa-IN.tar.gz ) l10n_sat? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_sat.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sat.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sat.tar.gz ) l10n_sd? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_sd.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sd.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sd.tar.gz ) l10n_sid? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_sid.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sid.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sid.tar.gz ) l10n_sr-Latn? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_sr-Latn.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sr-Latn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sr-Latn.tar.gz ) l10n_sr? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_sr.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sr.tar.gz ) l10n_ss? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_ss.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ss.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ss.tar.gz ) l10n_st? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_st.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_st.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_st.tar.gz ) l10n_sw-TZ? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_sw-TZ.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sw-TZ.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sw-TZ.tar.gz ) l10n_ta? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_ta.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ta.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ta.tar.gz ) l10n_te? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_te.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_te.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_te.tar.gz ) l10n_th? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_th.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_th.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_th.tar.gz ) l10n_tn? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_tn.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_tn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_tn.tar.gz ) l10n_ts? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_ts.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ts.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ts.tar.gz ) l10n_tt? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_tt.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_tt.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_tt.tar.gz ) l10n_uz? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_uz.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_uz.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_uz.tar.gz ) l10n_ve? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_ve.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ve.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ve.tar.gz ) l10n_xh? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_xh.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_xh.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_xh.tar.gz ) l10n_zu? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_zu.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_zu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_zu.tar.gz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=90d20d65c156742febded9ceda8ca7da
+_md5_=3ab0c94d5a2c6622212bfba3847c0b5e
diff --git a/metadata/md5-cache/app-pda/Manifest.gz b/metadata/md5-cache/app-pda/Manifest.gz
index a4b5b4cb4ae2..f793fbdd828f 100644
--- a/metadata/md5-cache/app-pda/Manifest.gz
+++ b/metadata/md5-cache/app-pda/Manifest.gz
diff --git a/metadata/md5-cache/app-pda/iripdb-0.1.3b b/metadata/md5-cache/app-pda/iripdb-0.1.3b
index 89f631c181b0..4f726368e32d 100644
--- a/metadata/md5-cache/app-pda/iripdb-0.1.3b
+++ b/metadata/md5-cache/app-pda/iripdb-0.1.3b
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile install
 DEPEND=media-libs/taglib sys-libs/zlib app-arch/unzip
 DESCRIPTION=Allows generating the DB files necessary for the iRiver iHP-1xx
-EAPI=0
+EAPI=6
 HOMEPAGE=http://www.fataltourist.com/iripdb/
 KEYWORDS=~x86 ~ppc ~amd64
 LICENSE=GPL-2
 RDEPEND=media-libs/taglib sys-libs/zlib
 SLOT=0
 SRC_URI=http://www.fataltourist.com/iripdb/iRipDB-0.1.3b.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=30be785235a11fc5ef95dad2b0207823
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec
+_md5_=b2d0e508308ad0846b9829508dfd2fba
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index f58bab956d57..1f57760e39c3 100644
--- a/metadata/md5-cache/app-portage/Manifest.gz
+++ b/metadata/md5-cache/app-portage/Manifest.gz
diff --git a/metadata/md5-cache/app-portage/gentoolkit-0.4.2-r1 b/metadata/md5-cache/app-portage/gentoolkit-0.4.2-r1
index 0e0cd247f4fc..4b09bfd70ddc 100644
--- a/metadata/md5-cache/app-portage/gentoolkit-0.4.2-r1
+++ b/metadata/md5-cache/app-portage/gentoolkit-0.4.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Collection of administration scripts for Gentoo
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage-Tools
 IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=|| ( sys-apps/portage[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-apps/portage-mgorny[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(-)] ) !app-portage/gentoolkit-dev sys-apps/gawk sys-apps/gentoo-functions python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_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://dev.gentoo.org/~mgorny/dist/gentoolkit-0.4.2.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2aab3aadcf393ee8656a9d9cc21819fe
+_md5_=cc804d2d85c3f7747b7f8c6b47c0898e
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index 783bb7db28ec..25916a1c914e 100644
--- a/metadata/md5-cache/app-shells/Manifest.gz
+++ b/metadata/md5-cache/app-shells/Manifest.gz
diff --git a/metadata/md5-cache/app-shells/ksh-93.20180215 b/metadata/md5-cache/app-shells/ksh-93.20180215
index 65e8f2f5ace8..db1b57cf8324 100644
--- a/metadata/md5-cache/app-shells/ksh-93.20180215
+++ b/metadata/md5-cache/app-shells/ksh-93.20180215
@@ -8,5 +8,5 @@ LICENSE=CPL-1.0 EPL-1.0
 RDEPEND=!app-shells/pdksh
 SLOT=0
 SRC_URI=https://github.com/att/ast/archive/e3dd5b1a4b1bf58a018bbd9c8626b15113b72717/ksh-93.20180215.tar.gz
-_eclasses_=meson	ecfaf615b512dc4ff2a50a35e6b26c09	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec
+_eclasses_=meson	53e3ab209402d5ad07a9c4580c423d1a	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec
 _md5_=0a3d32a993f45af469c95d3b80c26ba7
diff --git a/metadata/md5-cache/app-shells/ksh-93.20180331 b/metadata/md5-cache/app-shells/ksh-93.20180331
index b19ad33fc46d..acda78bc5926 100644
--- a/metadata/md5-cache/app-shells/ksh-93.20180331
+++ b/metadata/md5-cache/app-shells/ksh-93.20180331
@@ -8,5 +8,5 @@ LICENSE=CPL-1.0 EPL-1.0
 RDEPEND=!app-shells/pdksh
 SLOT=0
 SRC_URI=https://github.com/att/ast/archive/b9d0b8ebfead0edba9004fc32b1782d1e1410aeb/ksh-93.20180331.tar.gz
-_eclasses_=meson	ecfaf615b512dc4ff2a50a35e6b26c09	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec
+_eclasses_=meson	53e3ab209402d5ad07a9c4580c423d1a	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec
 _md5_=bf5e81b032f63f17c3f270e2263ac2e1
diff --git a/metadata/md5-cache/app-shells/thefuck-3.24 b/metadata/md5-cache/app-shells/thefuck-3.24
deleted file mode 100644
index 204dd418082b..000000000000
--- a/metadata/md5-cache/app-shells/thefuck-3.24
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/psutil[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[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/decorator[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/colorama[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/pyte[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/pytest[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/pytest-mock[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/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=Magnificent app which corrects your previous console command
-EAPI=6
-HOMEPAGE=https://github.com/nvbn/thefuck
-IUSE=test python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/psutil[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[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/decorator[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/colorama[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/pyte[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/nvbn/thefuck/archive/3.24.tar.gz -> thefuck-3.24.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=464e3a133ffc14e4e1d854d15270f915
diff --git a/metadata/md5-cache/app-shells/thefuck-3.25 b/metadata/md5-cache/app-shells/thefuck-3.25
deleted file mode 100644
index f5557486285d..000000000000
--- a/metadata/md5-cache/app-shells/thefuck-3.25
+++ /dev/null
@@ -1,14 +0,0 @@
-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(-)] test? ( dev-python/psutil[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[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/decorator[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/colorama[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/pyte[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/pytest[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/pytest-mock[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=Magnificent app which corrects your previous console command
-EAPI=6
-HOMEPAGE=https://github.com/nvbn/thefuck
-IUSE=test python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/psutil[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[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/decorator[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/colorama[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/pyte[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/nvbn/thefuck/archive/3.25.tar.gz -> thefuck-3.25.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=448efb47cf6e503d9824a2bb1f1f2281
diff --git a/metadata/md5-cache/app-shells/thefuck-3.26 b/metadata/md5-cache/app-shells/thefuck-3.27
index 31ab9a4140c3..a1055e630e19 100644
--- a/metadata/md5-cache/app-shells/thefuck-3.26
+++ b/metadata/md5-cache/app-shells/thefuck-3.27
@@ -1,7 +1,8 @@
+BDEPEND=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(-)]
 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(-)] test? ( dev-python/psutil[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[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/decorator[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/colorama[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/pyte[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/pytest[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/pytest-mock[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(-)]
+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(-)] test? ( dev-python/psutil[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[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/decorator[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/colorama[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/pyte[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/pytest[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/pytest-mock[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=Magnificent app which corrects your previous console command
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/nvbn/thefuck
 IUSE=test python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~amd64 ~x86
@@ -9,6 +10,6 @@ LICENSE=MIT
 RDEPEND=dev-python/psutil[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[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/decorator[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/colorama[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/pyte[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
-SRC_URI=https://github.com/nvbn/thefuck/archive/3.26.tar.gz -> thefuck-3.26.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a645aa7d7d331eae9cbcb3c4894d41f1
+SRC_URI=https://github.com/nvbn/thefuck/archive/3.27.tar.gz -> thefuck-3.27.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec
+_md5_=7cceabcd76265fdab260b02131ce2896
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index dd20634baa8b..852aa680f9c4 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/convertlit-1.8-r3 b/metadata/md5-cache/app-text/convertlit-1.8-r3
index 4413bc56f766..e1aa76e9e91d 100644
--- a/metadata/md5-cache/app-text/convertlit-1.8-r3
+++ b/metadata/md5-cache/app-text/convertlit-1.8-r3
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/libtommath-0.36-r1 app-arch/unzip
 DESCRIPTION=CLit converts MS ebook .lit files to .opf (xml+html+png+jpg)
 EAPI=6
 HOMEPAGE=http://www.convertlit.com/
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/libtommath-0.36-r1
 SLOT=0
 SRC_URI=http://www.convertlit.com/clit18src.zip
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=6c00053ce57800ae2688650a30ba94c6
+_md5_=7530c8c1795f8eed62bde071360ebd7f
diff --git a/metadata/md5-cache/app-text/coolreader-3.1.2.71-r3 b/metadata/md5-cache/app-text/coolreader-3.2.2.1
index ec8ce6516213..92f1b578165b 100644
--- a/metadata/md5-cache/app-text/coolreader-3.1.2.71-r3
+++ b/metadata/md5-cache/app-text/coolreader-3.2.2.1
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/zlib media-libs/libpng:0 virtual/jpeg:0 media-libs/freetype wxwidgets? ( x11-libs/wxGTK:3.0 ) !wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) sys-devel/make >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=sys-libs/zlib media-libs/libpng:0 virtual/jpeg:0 media-libs/freetype wxwidgets? ( x11-libs/wxGTK:3.0 ) !wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
 DESCRIPTION=CoolReader - reader of eBook files (fb2,epub,htm,rtf,txt)
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/crengine/
-IUSE=wxwidgets
+IUSE=wxwidgets l10n_bg l10n_cs l10n_de l10n_es l10n_hu l10n_pl l10n_ru l10n_uk
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib media-libs/libpng:0 virtual/jpeg:0 media-libs/freetype wxwidgets? ( x11-libs/wxGTK:3.0 ) !wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) wxwidgets? ( || ( media-fonts/liberation-fonts media-fonts/corefonts ) )
 SLOT=0
-SRC_URI=https://dev.gentoo.org/~grozin/coolreader-3.1.2.71.tar.bz2
-_eclasses_=cmake-utils	49cd471f02483798c5068698836b7429	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=edc79bb07bf6aebd7c3bc3d3461a2fc7
+SRC_URI=https://github.com/buggins/coolreader/archive/cr3.2.2-1.tar.gz -> coolreader-3.2.2.1.tar.gz
+_eclasses_=cmake-utils	49cd471f02483798c5068698836b7429	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d4fe3af57035d4ef94d6ae3d7b8d5019
diff --git a/metadata/md5-cache/app-text/libabw-0.1.2 b/metadata/md5-cache/app-text/libabw-0.1.2
index 960aaf73a0af..b217ade976da 100644
--- a/metadata/md5-cache/app-text/libabw-0.1.2
+++ b/metadata/md5-cache/app-text/libabw-0.1.2
@@ -4,10 +4,10 @@ DESCRIPTION=Library parsing abiword documents
 EAPI=6
 HOMEPAGE=https://wiki.documentfoundation.org/DLP/Libraries/libabw
 IUSE=doc static-libs
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=MPL-2.0
 RDEPEND=dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib
 SLOT=0
 SRC_URI=https://dev-www.libreoffice.org/src/libabw/libabw-0.1.2.tar.xz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3988c4973928839ca3220d9dca46ed34
+_md5_=d0f7862a9f8d4c144b7636c4c6ce7fde
diff --git a/metadata/md5-cache/app-text/libepubgen-0.1.0 b/metadata/md5-cache/app-text/libepubgen-0.1.0
index 2f91daa67ffb..7ebbe67feaac 100644
--- a/metadata/md5-cache/app-text/libepubgen-0.1.0
+++ b/metadata/md5-cache/app-text/libepubgen-0.1.0
@@ -4,9 +4,9 @@ DESCRIPTION=EPUB generator for librevenge
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/libepubgen/
 IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm ~x86
 LICENSE=MPL-2.0
 RDEPEND=dev-libs/librevenge
 SLOT=0
 SRC_URI=mirror://sourceforge/libepubgen/libepubgen-0.1.0.tar.xz
-_md5_=09e2daabb432fd549e43f9276417567e
+_md5_=6f8a87fbbcf12f52a940be912b5681c7
diff --git a/metadata/md5-cache/app-text/libgepub-0.5.2 b/metadata/md5-cache/app-text/libgepub-0.5.2
index 010ec402b967..a7553ad3f436 100644
--- a/metadata/md5-cache/app-text/libgepub-0.5.2
+++ b/metadata/md5-cache/app-text/libgepub-0.5.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=app-arch/libarchive dev-libs/glib:2 dev-libs/libxml2 net-libs/libsoup:2.4 net-libs/webkit-gtk:4 x11-libs/gtk+:3 introspection? ( >=dev-libs/gobject-introspection-1.30:= )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libgepub/0.5/libgepub-0.5.2.tar.xz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	meson	ecfaf615b512dc4ff2a50a35e6b26c09	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	meson	53e3ab209402d5ad07a9c4580c423d1a	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=8a946f07e3e3273d190d06c65c1d8768
diff --git a/metadata/md5-cache/app-text/libgxps-0.3.0 b/metadata/md5-cache/app-text/libgxps-0.3.0
index b774eaa72dea..10baa39146bb 100644
--- a/metadata/md5-cache/app-text/libgxps-0.3.0
+++ b/metadata/md5-cache/app-text/libgxps-0.3.0
@@ -10,5 +10,5 @@ RDEPEND=>=app-arch/libarchive-2.8 >=dev-libs/glib-2.36:2 media-libs/freetype:2 m
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/libgxps/0.3/libgxps-0.3.0.tar.xz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	meson	ecfaf615b512dc4ff2a50a35e6b26c09	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	meson	53e3ab209402d5ad07a9c4580c423d1a	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=4113e566613036100fbb60914d9a6f8b
diff --git a/metadata/md5-cache/app-text/libmspub-0.1.4 b/metadata/md5-cache/app-text/libmspub-0.1.4
index 0744fe365b02..263d995e0a6e 100644
--- a/metadata/md5-cache/app-text/libmspub-0.1.4
+++ b/metadata/md5-cache/app-text/libmspub-0.1.4
@@ -4,10 +4,10 @@ DESCRIPTION=Library parsing Microsoft Publisher documents
 EAPI=6
 HOMEPAGE=https://wiki.documentfoundation.org/DLP/Libraries/libmspub
 IUSE=doc static-libs
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/icu:= dev-libs/librevenge sys-libs/zlib
 SLOT=0
 SRC_URI=https://dev-www.libreoffice.org/src/libmspub/libmspub-0.1.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f768d04b7b670fe09646c4075942d275
+_md5_=05fc09b22182e64658e914b7fec9d29b
diff --git a/metadata/md5-cache/app-text/libqxp-0.0.1 b/metadata/md5-cache/app-text/libqxp-0.0.1
index 1b2dc217d691..0b4071d30766 100644
--- a/metadata/md5-cache/app-text/libqxp-0.0.1
+++ b/metadata/md5-cache/app-text/libqxp-0.0.1
@@ -4,9 +4,9 @@ DESCRIPTION=Library parsing QuarkXpress documents
 EAPI=6
 HOMEPAGE=https://wiki.documentfoundation.org/DLP/Libraries/libqxp
 IUSE=debug doc test tools
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm ~x86
 LICENSE=MPL-2.0
 RDEPEND=dev-libs/librevenge dev-libs/icu:=
 SLOT=0
 SRC_URI=https://dev-www.libreoffice.org/src/libqxp/libqxp-0.0.1.tar.xz
-_md5_=f51bde3c589262023bcb11bc78b59819
+_md5_=2fc4166c9da7a42d167b5562b1bd9457
diff --git a/metadata/md5-cache/app-text/odt2txt-0.5 b/metadata/md5-cache/app-text/odt2txt-0.5
index 9a75b9e2e7f4..63a0474d9507 100644
--- a/metadata/md5-cache/app-text/odt2txt-0.5
+++ b/metadata/md5-cache/app-text/odt2txt-0.5
@@ -3,10 +3,10 @@ DEPEND=!app-office/unoconv sys-libs/zlib virtual/libiconv sys-apps/groff
 DESCRIPTION=A simple converter from OpenDocument Text to plain text
 EAPI=6
 HOMEPAGE=http://stosberg.net/odt2txt/
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc64 ~sparc ~x86 ~x86-macos
+KEYWORDS=~alpha amd64 ia64 ~ppc64 ~sparc ~x86 ~x86-macos
 LICENSE=GPL-2
 RDEPEND=!app-office/unoconv sys-libs/zlib virtual/libiconv
 SLOT=0
 SRC_URI=https://github.com/dstosberg/odt2txt/archive/v0.5.tar.gz -> odt2txt-0.5.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=66f96f025a6858621c4d06c8baa399db
+_md5_=9e509261e4dbf667871600fd2f219180
diff --git a/metadata/md5-cache/app-text/qpdfview-0.4.18_pre2 b/metadata/md5-cache/app-text/qpdfview-0.4.18_pre2
new file mode 100644
index 000000000000..edb42429066d
--- /dev/null
+++ b/metadata/md5-cache/app-text/qpdfview-0.4.18_pre2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst postrm prepare
+DEPEND=cups? ( net-print/cups ) djvu? ( app-text/djvu ) fitz? ( >=app-text/mupdf-1.7:= ) postscript? ( app-text/libspectre ) dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dbus? ( dev-qt/qtdbus:5 ) pdf? ( >=app-text/poppler-0.35[qt5] dev-qt/qtxml:5 ) sqlite? ( dev-qt/qtsql:5[sqlite] ) svg? ( dev-qt/qtsvg:5 ) !svg? ( virtual/freedesktop-icon-theme ) synctex? ( app-text/texlive-core ) dev-qt/linguist-tools:5 virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=A tabbed document viewer
+EAPI=6
+HOMEPAGE=https://launchpad.net/qpdfview
+IUSE=cups +dbus djvu fitz +pdf postscript +sqlite +svg synctex
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2+
+RDEPEND=cups? ( net-print/cups ) djvu? ( app-text/djvu ) fitz? ( >=app-text/mupdf-1.7:= ) postscript? ( app-text/libspectre ) dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dbus? ( dev-qt/qtdbus:5 ) pdf? ( >=app-text/poppler-0.35[qt5] dev-qt/qtxml:5 ) sqlite? ( dev-qt/qtsql:5[sqlite] ) svg? ( dev-qt/qtsvg:5 ) !svg? ( virtual/freedesktop-icon-theme ) synctex? ( app-text/texlive-core )
+REQUIRED_USE=?? ( fitz pdf )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~grozin/qpdfview-0.4.18_pre2.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ca051361bc4aa1d77bbec3fe74f10b5a
diff --git a/metadata/md5-cache/app-text/sgrep-1.94a b/metadata/md5-cache/app-text/sgrep-1.94a
index ea1c2e4b6d26..86559d1083c2 100644
--- a/metadata/md5-cache/app-text/sgrep-1.94a
+++ b/metadata/md5-cache/app-text/sgrep-1.94a
@@ -1,9 +1,9 @@
 DEFINED_PHASES=configure install prepare
 DESCRIPTION=Use structural criteria to grep and index text, SGML, XML and HTML and filter
-EAPI=4
-HOMEPAGE=http://www.cs.helsinki.fi/u/jjaakkol/sgrep.html
+EAPI=6
+HOMEPAGE=https://www.cs.helsinki.fi/u/jjaakkol/sgrep.html
 KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=ftp://ftp.cs.helsinki.fi/pub/Software/Local/Sgrep/sgrep-1.94a.tar.gz
-_md5_=748ee547eb0b5d3e86897f4ff978e180
+_md5_=1aec8e2828150450b9e91ddc4012114a
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index 6bbf00c49bf5..e4a377108347 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
index b83e87f86d83..ad2adc18d723 100644
--- a/metadata/md5-cache/dev-cpp/glibmm-2.52.1
+++ b/metadata/md5-cache/dev-cpp/glibmm-2.52.1
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/libsigc++-2.9.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 SLOT=2
 SRC_URI=mirror://gnome/sources/glibmm/2.52/glibmm-2.52.1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ae8bcfef6b11abdce2ad28343680ec1e
+_md5_=9a028a5bfa7a60467f736653a3c531f6
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 5a377670d961..c36114932445 100644
--- a/metadata/md5-cache/dev-db/Manifest.gz
+++ b/metadata/md5-cache/dev-db/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/aerospike-amc-community-3.6.9 b/metadata/md5-cache/dev-db/aerospike-server-community-4.1.0.1
index 19875fbe788f..fcc3849136ae 100644
--- a/metadata/md5-cache/app-admin/aerospike-amc-community-3.6.9
+++ b/metadata/md5-cache/dev-db/aerospike-server-community-4.1.0.1
@@ -1,12 +1,12 @@
-DEFINED_PHASES=install unpack
-DEPEND=app-crypt/gcr dev-python/eventlet dev-python/flask dev-python/greenlet dev-python/setproctitle www-servers/gunicorn
-DESCRIPTION=Web UI based monitoring tool for Aerospike Community Edition Server
+DEFINED_PHASES=install prepare setup
+DEPEND=sys-libs/readline:0 sys-libs/zlib dev-libs/openssl:0
+DESCRIPTION=Flash-optimized, in-memory, nosql database
 EAPI=5
 HOMEPAGE=http://www.aerospike.com
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=app-crypt/gcr dev-python/eventlet dev-python/flask dev-python/greenlet dev-python/setproctitle www-servers/gunicorn
+RDEPEND=sys-libs/readline:0 sys-libs/zlib dev-libs/openssl:0
 SLOT=0
-SRC_URI=http://www.aerospike.com/artifacts/aerospike-amc-community/3.6.9/aerospike-amc-community-3.6.9.all.x86_64.deb
+SRC_URI=http://www.aerospike.com/artifacts/aerospike-server-community/4.1.0.1/aerospike-server-community-4.1.0.1-debian7.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b95040c95ac80c09e3e9577d3b8fa7cb
+_md5_=56edbd9b6d9cf7ca96d8b28b43799e2a
diff --git a/metadata/md5-cache/dev-db/mydumper-0.6.2 b/metadata/md5-cache/dev-db/mydumper-0.6.2
deleted file mode 100644
index 8d627bf1c37a..000000000000
--- a/metadata/md5-cache/dev-db/mydumper-0.6.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libpcre virtual/mysql dev-libs/glib:2 virtual/pkgconfig doc? ( <dev-python/sphinx-1.3 ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A high-performance multi-threaded backup toolset for MySQL and Drizzle
-EAPI=5
-HOMEPAGE=https://launchpad.net/mydumper
-IUSE=doc
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/libpcre virtual/mysql dev-libs/glib:2
-SLOT=0
-SRC_URI=https://launchpad.net/mydumper/0.6/0.6.2/+download/mydumper-0.6.2.tar.gz
-_eclasses_=cmake-utils	49cd471f02483798c5068698836b7429	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5b0b6fae3e43a44e031184d3dd815634
diff --git a/metadata/md5-cache/media-libs/libebur128-1.0.2 b/metadata/md5-cache/dev-db/mydumper-0.9.5
index aece978cec0b..78f93e1ce51f 100644
--- a/metadata/md5-cache/media-libs/libebur128-1.0.2
+++ b/metadata/md5-cache/dev-db/mydumper-0.9.5
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=speex? ( media-libs/speex ) test? ( media-libs/libsndfile app-arch/unzip ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A library implementing the EBU R128 loudness standard.
-EAPI=5
-HOMEPAGE=https://github.com/jiixyj/libebur128
-IUSE=+speex test
+DEPEND=dev-libs/glib:= dev-libs/libpcre:= dev-libs/openssl:= sys-libs/zlib:= virtual/mysql virtual/pkgconfig doc? ( dev-python/sphinx ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=A high-performance multi-threaded backup (and restore) toolset for MySQL
+EAPI=6
+HOMEPAGE=https://github.com/maxbube/mydumper
+IUSE=doc
 KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=speex? ( media-libs/speex )
+LICENSE=GPL-3
+RDEPEND=dev-libs/glib:= dev-libs/libpcre:= dev-libs/openssl:= sys-libs/zlib:= virtual/mysql
 SLOT=0
-SRC_URI=https://github.com/jiixyj/libebur128/archive/v1.0.2.tar.gz -> libebur128-1.0.2.tar.gz test? ( https://tech.ebu.ch/files/live/sites/tech/files/shared/testmaterial/ebu-loudness-test-setv03.zip )
+SRC_URI=https://github.com/maxbube/mydumper/archive/v0.9.5.tar.gz -> mydumper-0.9.5.tar.gz
 _eclasses_=cmake-utils	49cd471f02483798c5068698836b7429	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2224aee8933c7dc759f634b911085c0d
+_md5_=5a0fb45cc51a60aa399539602f4325ee
diff --git a/metadata/md5-cache/dev-db/percona-toolkit-3.0.10 b/metadata/md5-cache/dev-db/percona-toolkit-3.0.10
new file mode 100644
index 000000000000..35f1d31179e1
--- /dev/null
+++ b/metadata/md5-cache/dev-db/percona-toolkit-3.0.10
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-perl/DBI dev-perl/DBD-mysql virtual/perl-Time-HiRes virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=
+DESCRIPTION=Advanced command-line tools to perform a variety of MySQL and system tasks
+EAPI=6
+HOMEPAGE=https://www.percona.com/software/mysql-tools/percona-toolkit
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( GPL-2 Artistic )
+RDEPEND=dev-perl/DBI dev-perl/DBD-mysql virtual/perl-Time-HiRes dev-perl/JSON dev-perl/libwww-perl dev-perl/Role-Tiny virtual/perl-File-Path virtual/perl-Getopt-Long virtual/perl-Time-Local virtual/perl-Digest-MD5 virtual/perl-IO-Compress virtual/perl-File-Temp virtual/perl-File-Spec virtual/perl-Scalar-List-Utils dev-perl/TermReadKey dev-lang/perl:=
+SLOT=0
+SRC_URI=https://www.percona.com/downloads/percona-toolkit/3.0.10/source/tarball/percona-toolkit-3.0.10.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=1f3b4275686c36c13f38a4c6faa7f44b
diff --git a/metadata/md5-cache/dev-db/sqlite-3.23.1 b/metadata/md5-cache/dev-db/sqlite-3.23.1
index 8bb55af670d3..85577de51eca 100644
--- a/metadata/md5-cache/dev-db/sqlite-3.23.1
+++ b/metadata/md5-cache/dev-db/sqlite-3.23.1
@@ -4,10 +4,10 @@ DESCRIPTION=A SQL Database Engine in a C Library
 EAPI=6
 HOMEPAGE=https://sqlite.org/
 IUSE=debug doc icu +readline secure-delete static-libs tcl test tools abi_x86_32 abi_x86_64 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 ~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=public-domain
 RDEPEND=sys-libs/zlib: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(-)?] icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline: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(-)?] ) tcl? ( dev-lang/tcl: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(-)?] ) tools? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=3
 SRC_URI=doc? ( https://sqlite.org/2018/sqlite-doc-3230100.zip ) tcl? ( https://sqlite.org/2018/sqlite-src-3230100.zip ) test? ( https://sqlite.org/2018/sqlite-src-3230100.zip ) tools? ( https://sqlite.org/2018/sqlite-src-3230100.zip ) !tcl? ( !test? ( !tools? ( https://sqlite.org/2018/sqlite-autoconf-3230100.tar.gz ) ) )
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=de96170e771ff922af87fd5840b61eff
+_md5_=49eb846356eea2ccf0a8b48bef659a91
diff --git a/metadata/md5-cache/dev-go/Manifest.gz b/metadata/md5-cache/dev-go/Manifest.gz
index 043c4d2e9fd6..dcc673363428 100644
--- a/metadata/md5-cache/dev-go/Manifest.gz
+++ b/metadata/md5-cache/dev-go/Manifest.gz
diff --git a/metadata/md5-cache/dev-go/goptlib-0.5 b/metadata/md5-cache/dev-go/goptlib-0.5
deleted file mode 100644
index 69d1aefc5852..000000000000
--- a/metadata/md5-cache/dev-go/goptlib-0.5
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=Go Tor pluggable transports library
-EAPI=6
-HOMEPAGE=https://gitweb.torproject.org/pluggable-transports/goptlib.git
-KEYWORDS=~amd64
-LICENSE=CC0-1.0
-SLOT=0
-SRC_URI=mirror://debian/pool/main/g/golang-goptlib/golang-goptlib_0.5.orig.tar.gz -> goptlib-0.5.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=2a827d4aa72332eeec8d6a424ad4fa70
diff --git a/metadata/md5-cache/dev-go/siphash-1.1.0 b/metadata/md5-cache/dev-go/siphash-1.1.0
new file mode 100644
index 000000000000..ff2ccb96e43c
--- /dev/null
+++ b/metadata/md5-cache/dev-go/siphash-1.1.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install test unpack
+DEPEND=>=dev-lang/go-1.9
+DESCRIPTION=Go implementation of SipHash-2.4
+EAPI=6
+HOMEPAGE=https://github.com/dchest/siphash
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=CC0-1.0
+SLOT=0
+SRC_URI=https://github.com/dchest/siphash/archive/v1.1.0.tar.gz -> siphash-1.1.0.tar.gz
+_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_md5_=7d996d72f96305c2dbc6f24d8794e447
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 8654c3925af5..fafbb22373bd 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/julia-0.6.2 b/metadata/md5-cache/dev-lang/julia-0.6.2
index 929c7599c4ec..0caa1f31dbba 100644
--- a/metadata/md5-cache/dev-lang/julia-0.6.2
+++ b/metadata/md5-cache/dev-lang/julia-0.6.2
@@ -10,4 +10,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/JuliaLang/julia/releases/download/v0.6.2/julia-0.6.2.tar.gz https://dev.gentoo.org/~tamiko/distfiles/julia-0.6.2-bundled.tar.gz
 _eclasses_=llvm	f9e74238f1b5743ea5d7214fcc7dbb36	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=694c2ffd5ee2eb1efbc386a15dbdcac4
+_md5_=31f48271267ac9b815fcbfcd1cc179b8
diff --git a/metadata/md5-cache/dev-lang/julia-9999 b/metadata/md5-cache/dev-lang/julia-9999
index c6bdefdecd0c..b7f4f3e86e23 100644
--- a/metadata/md5-cache/dev-lang/julia-9999
+++ b/metadata/md5-cache/dev-lang/julia-9999
@@ -8,4 +8,4 @@ RDEPEND=>=sys-devel/llvm-4.0.0:= >=sys-devel/clang-4.0.0:= dev-libs/double-conve
 RESTRICT=test
 SLOT=0
 _eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	llvm	f9e74238f1b5743ea5d7214fcc7dbb36	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=dcbb3745fb7c6df2cdbbd8fbad737b31
+_md5_=a5c636f00b4da4a6d2bd42c636f0cb5b
diff --git a/metadata/md5-cache/dev-lang/micropython-1.9.4 b/metadata/md5-cache/dev-lang/micropython-1.9.4
new file mode 100644
index 000000000000..5095445bed92
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/micropython-1.9.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install test
+DEPEND=virtual/libffi virtual/pkgconfig
+DESCRIPTION=Python implementation for microcontrollers
+EAPI=6
+HOMEPAGE=https://github.com/micropython/micropython
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://github.com/micropython/micropython/releases/download/v1.9.4/micropython-1.9.4.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec
+_md5_=dfab625b491d34d5f2385825f2e37c4b
diff --git a/metadata/md5-cache/dev-lang/orc-0.4.28-r1 b/metadata/md5-cache/dev-lang/orc-0.4.28-r1
index f1af95781d95..5311a14da959 100644
--- a/metadata/md5-cache/dev-lang/orc-0.4.28-r1
+++ b/metadata/md5-cache/dev-lang/orc-0.4.28-r1
@@ -4,9 +4,9 @@ DESCRIPTION=The Oil Runtime Compiler, a just-in-time compiler for array operatio
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=examples pax_kernel 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=amd64 arm ~arm64 ~hppa ~ppc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 arm ~arm64 ~hppa ppc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD BSD-2
 SLOT=0
 SRC_URI=https://gstreamer.freedesktop.org/src/orc/orc-0.4.28.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8021723ae37701af28f061466643111a
+_md5_=bb71f690df119ceedd2146b603d3d582
diff --git a/metadata/md5-cache/dev-lang/rust-1.26.0-r2 b/metadata/md5-cache/dev-lang/rust-1.26.0-r2
new file mode 100644
index 000000000000..978aeabf2c1f
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/rust-1.26.0-r2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup
+DEPEND=>=app-eselect/eselect-rust-0.3_pre20150425 jemalloc? ( dev-libs/jemalloc ) || ( dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 >=virtual/pypy-5:0 ) || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.5 ) dev-util/cmake
+DESCRIPTION=Systems programming language from Mozilla
+EAPI=6
+HOMEPAGE=http://www.rust-lang.org/
+IUSE=debug doc extended +jemalloc llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
+PDEPEND=!extended? ( >=dev-util/cargo-0.27.0 )
+RDEPEND=>=app-eselect/eselect-rust-0.3_pre20150425 jemalloc? ( dev-libs/jemalloc )
+REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore )
+SLOT=stable/1.26
+SRC_URI=https://static.rust-lang.org/dist/rustc-1.26.0-src.tar.xz -> rustc-1.26.0-src.tar.xz amd64? ( https://static.rust-lang.org/dist/rust-1.25.0-x86_64-unknown-linux-gnu.tar.xz ) x86? ( https://static.rust-lang.org/dist/rust-1.25.0-i686-unknown-linux-gnu.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.25.0-aarch64-unknown-linux-gnu.tar.xz )
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=2f0d68e3bb2aa10cf6296509cbd5d11f
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index a29ba284182f..0d1ba9b5b710 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/amdgpu-pro-opencl-17.40.492261 b/metadata/md5-cache/dev-libs/amdgpu-pro-opencl-17.40.492261
deleted file mode 100644
index 387d2ca82eb9..000000000000
--- a/metadata/md5-cache/dev-libs/amdgpu-pro-opencl-17.40.492261
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install nofetch postinst prepare unpack
-DEPEND=dev-util/patchelf
-DESCRIPTION=Proprietary OpenCL implementation for AMD GPUs
-EAPI=6
-HOMEPAGE=https://support.amd.com/en-us/kb-articles/Pages/AMDGPU-PRO-Driver-for-Linux-Release-Notes.aspx
-KEYWORDS=~amd64
-LICENSE=AMD-GPU-PRO-EULA
-RDEPEND=dev-libs/ocl-icd
-RESTRICT=mirror fetch strip
-SLOT=0
-SRC_URI=amdgpu-pro-17.40-492261.tar.xz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=1e8ce26555da084879d008c5d2d16966
diff --git a/metadata/md5-cache/dev-libs/amdgpu-pro-opencl-17.50.511655 b/metadata/md5-cache/dev-libs/amdgpu-pro-opencl-17.50.511655
index 23d5faf67552..a66e96f13458 100644
--- a/metadata/md5-cache/dev-libs/amdgpu-pro-opencl-17.50.511655
+++ b/metadata/md5-cache/dev-libs/amdgpu-pro-opencl-17.50.511655
@@ -9,5 +9,5 @@ RDEPEND=dev-libs/ocl-icd
 RESTRICT=mirror fetch strip
 SLOT=0
 SRC_URI=amdgpu-pro-17.50-511655.tar.xz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=c4365c31542b088d61eea38c7d5f918c
+_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
+_md5_=55833761d1b30ee489f6912d2df3b87b
diff --git a/metadata/md5-cache/dev-libs/appstream-0.11.5 b/metadata/md5-cache/dev-libs/appstream-0.11.5
index 2371855daab8..007af941f168 100644
--- a/metadata/md5-cache/dev-libs/appstream-0.11.5
+++ b/metadata/md5-cache/dev-libs/appstream-0.11.5
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+ GPL-2+
 RDEPEND=dev-libs/glib:2 dev-libs/gobject-introspection dev-libs/libxml2:2 dev-libs/libyaml dev-libs/snowball-stemmer qt5? ( dev-qt/qtcore:5 )
 SLOT=0/4
 SRC_URI=https://github.com/ximion/appstream/archive/APPSTREAM_0_11_5.tar.gz -> appstream-0.11.5.tar.gz
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	meson	ecfaf615b512dc4ff2a50a35e6b26c09	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	meson	53e3ab209402d5ad07a9c4580c423d1a	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=280e450f2650693b1339a0340f89ffbf
diff --git a/metadata/md5-cache/dev-libs/libbsd-0.9.1 b/metadata/md5-cache/dev-libs/libbsd-0.9.1
new file mode 100644
index 000000000000..689b4852a7cd
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libbsd-0.9.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install setup test
+DEPEND=>=sys-kernel/linux-headers-3.17
+DESCRIPTION=An library to provide useful functions commonly found on BSD systems
+EAPI=6
+HOMEPAGE=https://libbsd.freedesktop.org/wiki/
+IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD BSD-2 BSD-4 ISC
+SLOT=0
+SRC_URI=https://libbsd.freedesktop.org/releases/libbsd-0.9.1.tar.xz
+_eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	fa02994d0beba88681127d93da4411ec
+_md5_=59ad8988ef2f586d89e38848b1a6feee
diff --git a/metadata/md5-cache/dev-libs/libfmt-5.0.0 b/metadata/md5-cache/dev-libs/libfmt-5.0.0
new file mode 100644
index 000000000000..062c4748a270
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libfmt-5.0.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Small, safe and fast formatting library
+EAPI=6
+HOMEPAGE=https://github.com/fmtlib/fmt
+IUSE=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=~amd64 ~x86
+LICENSE=BSD-2
+SLOT=0/5
+SRC_URI=https://github.com/fmtlib/fmt/archive/5.0.0.tar.gz -> libfmt-5.0.0.tar.gz
+_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	49cd471f02483798c5068698836b7429	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=30f4d4d6ca77de549fb5ec5343d42283
diff --git a/metadata/md5-cache/dev-libs/libinput-1.10.6 b/metadata/md5-cache/dev-libs/libinput-1.10.6
index 07b8fd4a77fb..810b3a8ac9bc 100644
--- a/metadata/md5-cache/dev-libs/libinput-1.10.6
+++ b/metadata/md5-cache/dev-libs/libinput-1.10.6
@@ -10,5 +10,5 @@ RDEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.20 ) >=dev-libs/libevdev-1.
 RESTRICT=test
 SLOT=0/10
 SRC_URI=https://www.freedesktop.org/software/libinput/libinput-1.10.6.tar.xz
-_eclasses_=meson	ecfaf615b512dc4ff2a50a35e6b26c09	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	udev	d91cac2c73b94629cad2daea66e0d182
+_eclasses_=meson	53e3ab209402d5ad07a9c4580c423d1a	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	udev	d91cac2c73b94629cad2daea66e0d182
 _md5_=29649723d266f913bf622481a28cc7e3
diff --git a/metadata/md5-cache/dev-libs/libinput-1.10.7 b/metadata/md5-cache/dev-libs/libinput-1.10.7
index c66dbf01937b..519b6130a7dd 100644
--- a/metadata/md5-cache/dev-libs/libinput-1.10.7
+++ b/metadata/md5-cache/dev-libs/libinput-1.10.7
@@ -10,5 +10,5 @@ RDEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.20 ) >=dev-libs/libevdev-1.
 RESTRICT=test
 SLOT=0/10
 SRC_URI=https://www.freedesktop.org/software/libinput/libinput-1.10.7.tar.xz
-_eclasses_=meson	ecfaf615b512dc4ff2a50a35e6b26c09	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	udev	d91cac2c73b94629cad2daea66e0d182
+_eclasses_=meson	53e3ab209402d5ad07a9c4580c423d1a	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	udev	d91cac2c73b94629cad2daea66e0d182
 _md5_=29649723d266f913bf622481a28cc7e3
diff --git a/metadata/md5-cache/dev-libs/libixion-0.13.0 b/metadata/md5-cache/dev-libs/libixion-0.13.0
index 0b9a72e1c537..5d6eef306ae6 100644
--- a/metadata/md5-cache/dev-libs/libixion-0.13.0
+++ b/metadata/md5-cache/dev-libs/libixion-0.13.0
@@ -4,11 +4,11 @@ DESCRIPTION=General purpose formula parser & interpreter
 EAPI=6
 HOMEPAGE=https://gitlab.com/ixion/ixion
 IUSE=debug python static-libs +threads python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=MIT
 RDEPEND=dev-libs/boost:= 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(+)?] )
 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 ) )
 SLOT=0/0.13
 SRC_URI=https://kohei.us/files/ixion/src/libixion-0.13.0.tar.xz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=f3a5ece294780a4f29ccf31bd8ce66fc
+_md5_=2a88f7c9c919edf5d747b8c9f100c521
diff --git a/metadata/md5-cache/dev-libs/liborcus-0.13.4 b/metadata/md5-cache/dev-libs/liborcus-0.13.4
index d977d77b43ba..dd1ba9df45c5 100644
--- a/metadata/md5-cache/dev-libs/liborcus-0.13.4
+++ b/metadata/md5-cache/dev-libs/liborcus-0.13.4
@@ -4,11 +4,11 @@ DESCRIPTION=Standalone file import filter library for spreadsheet documents
 EAPI=6
 HOMEPAGE=https://gitlab.com/orcus/orcus/blob/master/README.md
 IUSE=python +spreadsheet-model static-libs tools python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=MIT
 RDEPEND=dev-libs/boost:= sys-libs/zlib:= 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(+)?] ) spreadsheet-model? ( >=dev-libs/libixion-0.13.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 ) )
 SLOT=0/0.13
 SRC_URI=https://kohei.us/files/orcus/src/liborcus-0.13.4.tar.xz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=ee273eb193287747348897808c3d83f8
+_md5_=d3913e9ac020073f402984db7d26def1
diff --git a/metadata/md5-cache/dev-libs/libratbag-0.9 b/metadata/md5-cache/dev-libs/libratbag-0.9
index 8a08b3c25a36..904bf2c8b391 100644
--- a/metadata/md5-cache/dev-libs/libratbag-0.9
+++ b/metadata/md5-cache/dev-libs/libratbag-0.9
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/libevdev virtual/libudev
 SLOT=0
 SRC_URI=https://github.com/libratbag/libratbag/archive/v0.9.tar.gz -> libratbag-0.9.tar.gz
-_eclasses_=meson	ecfaf615b512dc4ff2a50a35e6b26c09	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	udev	d91cac2c73b94629cad2daea66e0d182
+_eclasses_=meson	53e3ab209402d5ad07a9c4580c423d1a	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	udev	d91cac2c73b94629cad2daea66e0d182
 _md5_=44850f6152995a59cceb90d025aaa2c5
diff --git a/metadata/md5-cache/dev-libs/libreport-2.9.5 b/metadata/md5-cache/dev-libs/libreport-2.9.5
new file mode 100644
index 000000000000..2fd17a451ad8
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libreport-2.9.5
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] app-admin/augeas >=dev-libs/glib-2.43:2 dev-libs/satyr dev-libs/json-c:= dev-libs/libtar dev-libs/libxml2:2 dev-libs/newt:= dev-libs/xmlrpc-c:= net-libs/libproxy:= net-misc/curl:=[ssl] sys-apps/dbus sys-apps/systemd gtk? ( >=x11-libs/gtk+-3.3.12:3 ) python? ( python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) x11-misc/xdg-utils app-text/asciidoc app-text/xmlto >=dev-util/intltool-0.3.50 >=sys-devel/gettext-0.17 virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Generic library for reporting software bugs
+EAPI=6
+HOMEPAGE=https://github.com/abrt/libreport
+IUSE=+gtk python python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] app-admin/augeas >=dev-libs/glib-2.43:2 dev-libs/satyr dev-libs/json-c:= dev-libs/libtar dev-libs/libxml2:2 dev-libs/newt:= dev-libs/xmlrpc-c:= net-libs/libproxy:= net-misc/curl:=[ssl] sys-apps/dbus sys-apps/systemd gtk? ( >=x11-libs/gtk+-3.3.12:3 ) python? ( python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) x11-misc/xdg-utils
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/abrt/libreport/archive/2.9.5.tar.gz -> libreport-2.9.5.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=76e7ae724d7f850e35b8a0214df6c584
diff --git a/metadata/md5-cache/dev-libs/libressl-2.6.4 b/metadata/md5-cache/dev-libs/libressl-2.6.4
index be07ccf99437..4413b22231ba 100644
--- a/metadata/md5-cache/dev-libs/libressl-2.6.4
+++ b/metadata/md5-cache/dev-libs/libressl-2.6.4
@@ -11,5 +11,5 @@ RDEPEND=!dev-libs/openssl:0
 REQUIRED_USE=test? ( static-libs )
 SLOT=0/44
 SRC_URI=https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.6.4.tar.gz
-_eclasses_=ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=68bafd41e58253d96ee007eab7b6bc53
+_eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	fa02994d0beba88681127d93da4411ec
+_md5_=b849a56569c00973cbca0b5afa40132f
diff --git a/metadata/md5-cache/dev-libs/libressl-2.7.3 b/metadata/md5-cache/dev-libs/libressl-2.7.3
index 233cdbbfefca..326eb119d885 100644
--- a/metadata/md5-cache/dev-libs/libressl-2.7.3
+++ b/metadata/md5-cache/dev-libs/libressl-2.7.3
@@ -11,5 +11,5 @@ RDEPEND=!dev-libs/openssl:0
 REQUIRED_USE=test? ( static-libs )
 SLOT=0/45
 SRC_URI=https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.7.3.tar.gz
-_eclasses_=ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=5bd34adf16833c75302e0244f0804e68
+_eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	fa02994d0beba88681127d93da4411ec
+_md5_=bc0a2b60e48776eaf2472f3c8f370d9b
diff --git a/metadata/md5-cache/dev-libs/libsigsegv-2.12 b/metadata/md5-cache/dev-libs/libsigsegv-2.12
index 8756a085107e..bd47dbd23cca 100644
--- a/metadata/md5-cache/dev-libs/libsigsegv-2.12
+++ b/metadata/md5-cache/dev-libs/libsigsegv-2.12
@@ -2,8 +2,8 @@ DEFINED_PHASES=configure install test
 DESCRIPTION=Library for handling page faults in user mode
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/libsigsegv/
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gnu/libsigsegv/libsigsegv-2.12.tar.gz
-_md5_=c66d70a3dac12ba6853d1f52b495e44f
+_md5_=20077381397fbfa211637e0bcb031d00
diff --git a/metadata/md5-cache/dev-libs/nss-3.37 b/metadata/md5-cache/dev-libs/nss-3.37
index f5c1bd8aa0fb..d78741a259e1 100644
--- a/metadata/md5-cache/dev-libs/nss-3.37
+++ b/metadata/md5-cache/dev-libs/nss-3.37
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://archive.mozilla.org/pub/security/nss/releases/NSS_3_37_RTM/src/nss-3.37.tar.gz cacert? ( https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch ) nss-pem? ( https://dev.gentoo.org/~polynomial-c/nss-pem-20160329.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4f296ca8f3ab1f51a08ede60e43b3274
+_md5_=8f5c6aa3e9215c71bba28d6d81f5f0ba
diff --git a/metadata/md5-cache/dev-libs/qjson-0.9.0 b/metadata/md5-cache/dev-libs/qjson-0.9.0
deleted file mode 100644
index 0b47a7e65712..000000000000
--- a/metadata/md5-cache/dev-libs/qjson-0.9.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=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(-)?] doc? ( app-doc/doxygen ) test? ( dev-qt/qttest: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(-)?] ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Library for mapping JSON data to QVariant objects
-EAPI=6
-HOMEPAGE=http://qjson.sourceforge.net
-IUSE=debug doc 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=amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=LGPL-2.1
-RDEPEND=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(-)?]
-SLOT=0
-SRC_URI=https://github.com/flavio/qjson/archive/0.9.0.tar.gz -> qjson-0.9.0.tar.gz
-_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	49cd471f02483798c5068698836b7429	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=00c1956fc382829df806144ed0810214
diff --git a/metadata/md5-cache/dev-libs/satyr-0.26 b/metadata/md5-cache/dev-libs/satyr-0.26
new file mode 100644
index 000000000000..8bf909d00bcc
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/satyr-0.26
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure prepare
+DEPEND=python? ( python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-libs/elfutils-0.158 virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Satyr is a collection of low-level algorithms for program failure processing
+EAPI=6
+HOMEPAGE=https://github.com/abrt/satyr
+IUSE=python python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=python? ( python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-libs/elfutils-0.158
+REQUIRED_USE=python? ( || ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
+SLOT=0/3
+SRC_URI=https://github.com/abrt/satyr/archive/0.26/satyr-0.26.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec
+_md5_=bceb4292aea17cb8591b473e308a0c42
diff --git a/metadata/md5-cache/dev-libs/volume_key-0.3.10 b/metadata/md5-cache/dev-libs/volume_key-0.3.10
new file mode 100644
index 000000000000..36dd7215004b
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/volume_key-0.3.10
@@ -0,0 +1,15 @@
+DEFINED_PHASES=prepare setup
+DEPEND=app-crypt/gpgme dev-libs/glib:2 dev-libs/nspr dev-libs/nss sys-apps/util-linux sys-fs/cryptsetup:= sys-devel/gettext test? ( dev-libs/nss[utils] ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Library for manipulating and storing storage volume encryption keys
+EAPI=6
+HOMEPAGE=https://pagure.io/volume_key
+IUSE=test python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=app-crypt/gpgme dev-libs/glib:2 dev-libs/nspr dev-libs/nss sys-apps/util-linux sys-fs/cryptsetup:=
+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 )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://releases.pagure.org/volume_key/volume_key-0.3.10.tar.xz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec
+_md5_=4d708ea4576884b826669dfe890bd6d5
diff --git a/metadata/md5-cache/dev-libs/xmlsec-1.2.24-r1 b/metadata/md5-cache/dev-libs/xmlsec-1.2.24-r1
deleted file mode 100644
index 93903df525ba..000000000000
--- a/metadata/md5-cache/dev-libs/xmlsec-1.2.24-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=>=dev-libs/libxml2-2.7.4 >=dev-libs/libxslt-1.0.20 gcrypt? ( >=dev-libs/libgcrypt-1.4.0:0 ) gnutls? ( >=net-libs/gnutls-2.8.0 ) nss? ( >=dev-libs/nspr-4.4.1 >=dev-libs/nss-3.9 ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Command line tool for signing, verifying, encrypting and decrypting XML
-EAPI=6
-HOMEPAGE=https://www.aleksey.com/xmlsec
-IUSE=doc gcrypt gnutls libressl nss +openssl static-libs
-KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 ~sparc x86
-LICENSE=MIT
-RDEPEND=>=dev-libs/libxml2-2.7.4 >=dev-libs/libxslt-1.0.20 gcrypt? ( >=dev-libs/libgcrypt-1.4.0:0 ) gnutls? ( >=net-libs/gnutls-2.8.0 ) nss? ( >=dev-libs/nspr-4.4.1 >=dev-libs/nss-3.9 ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
-REQUIRED_USE=|| ( gcrypt gnutls nss openssl ) gnutls? ( gcrypt )
-SLOT=0
-SRC_URI=https://www.aleksey.com/xmlsec/download/xmlsec1-1.2.24.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=1adb683e0bfae6db102dd46cd04ced31
diff --git a/metadata/md5-cache/dev-libs/xmlsec-1.2.25 b/metadata/md5-cache/dev-libs/xmlsec-1.2.25
index aef3d3f1d84c..e007127f512c 100644
--- a/metadata/md5-cache/dev-libs/xmlsec-1.2.25
+++ b/metadata/md5-cache/dev-libs/xmlsec-1.2.25
@@ -4,11 +4,11 @@ DESCRIPTION=Command line tool for signing, verifying, encrypting and decrypting
 EAPI=6
 HOMEPAGE=https://www.aleksey.com/xmlsec
 IUSE=doc gcrypt gnutls libressl nss +openssl static-libs
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-libs/libxml2-2.7.4 >=dev-libs/libxslt-1.0.20 gcrypt? ( >=dev-libs/libgcrypt-1.4.0:0 ) gnutls? ( >=net-libs/gnutls-2.8.0 ) nss? ( >=dev-libs/nspr-4.4.1 >=dev-libs/nss-3.9 ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 REQUIRED_USE=|| ( gcrypt gnutls nss openssl ) gnutls? ( gcrypt )
 SLOT=0
 SRC_URI=https://www.aleksey.com/xmlsec/download/xmlsec1-1.2.25.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=2f2ffbb01fcc17cad0a048c805ac44fd
+_md5_=e15a5fbc2720a97ed13e122ecb0d614d
diff --git a/metadata/md5-cache/dev-lisp/Manifest.gz b/metadata/md5-cache/dev-lisp/Manifest.gz
index 588f3c490ff6..bfd28d4ec492 100644
--- a/metadata/md5-cache/dev-lisp/Manifest.gz
+++ b/metadata/md5-cache/dev-lisp/Manifest.gz
diff --git a/metadata/md5-cache/dev-lisp/ecls-16.1.3 b/metadata/md5-cache/dev-lisp/ecls-16.1.3
index a1d879fc1104..88738969974d 100644
--- a/metadata/md5-cache/dev-lisp/ecls-16.1.3
+++ b/metadata/md5-cache/dev-lisp/ecls-16.1.3
@@ -4,11 +4,11 @@ DESCRIPTION=ECL is an embeddable Common Lisp implementation
 EAPI=6
 HOMEPAGE=https://common-lisp.net/project/ecl/
 IUSE=cxx debug emacs gengc precisegc cpu_flags_x86_sse +threads +unicode +libatomic X
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~ppc ~sparc ~x86
 LICENSE=BSD-2 LGPL-2.1+
 RDEPEND=dev-libs/gmp:0 virtual/libffi libatomic? ( dev-libs/libatomic_ops ) >=dev-libs/boehm-gc-7.1[threads?] >=dev-lisp/asdf-2.33-r3:=
 RESTRICT=test
 SLOT=0/16.1.3
 SRC_URI=https://common-lisp.net/project/ecl/static/files/release/ecl-16.1.3.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f7e1704c9a8b60fdebd96108f1cba1cd
+_md5_=101bdc5161eebb23c22dc48dce3380a9
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index e1a0fc500d42..601e8b0b279b 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/XML-TreePP-0.430.0-r1 b/metadata/md5-cache/dev-perl/XML-TreePP-0.430.0-r1
index a6a92ed17240..9cc6a17f2826 100644
--- a/metadata/md5-cache/dev-perl/XML-TreePP-0.430.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-TreePP-0.430.0-r1
@@ -3,10 +3,10 @@ DEPEND=dev-perl/libwww-perl virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=
 DESCRIPTION=Pure Perl implementation for parsing/writing XML documents
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/XML-TreePP/
-KEYWORDS=amd64 ~arm ~ppc x86
+KEYWORDS=amd64 ~arm ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/libwww-perl dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KA/KAWASAKI/XML-TreePP-0.43.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=4cb6225d65f95c4cde9206697eb8c66e
+_md5_=d6468f018fa0ad57117c64c6f39d0ab7
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index beb958ef9bb8..5d2944cd3dfa 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/certifi-2018.4.16 b/metadata/md5-cache/dev-python/certifi-2018.4.16
index 6e3c96c44520..733403d58ffe 100644
--- a/metadata/md5-cache/dev-python/certifi-2018.4.16
+++ b/metadata/md5-cache/dev-python/certifi-2018.4.16
@@ -4,11 +4,11 @@ DESCRIPTION=Python package for providing Mozilla's CA Bundle
 EAPI=6
 HOMEPAGE=http://certifi.io/ https://pypi.org/project/certifi
 IUSE=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 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MPL-2.0
 RDEPEND=app-misc/ca-certificates 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/c/certifi/certifi-2018.4.16.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	fa02994d0beba88681127d93da4411ec	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c7c3720bb8bb45acb082c0004afc3c40
+_md5_=dd6415e86b22f8d29c363c9738d15ca2
diff --git a/metadata/md5-cache/dev-python/cryptography-2.1.4-r1 b/metadata/md5-cache/dev-python/cryptography-2.1.4-r1
index 17ba578f0c3b..8839913ecfb6 100644
--- a/metadata/md5-cache/dev-python/cryptography-2.1.4-r1
+++ b/metadata/md5-cache/dev-python/cryptography-2.1.4-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Library providing cryptographic recipes and primitives
 EAPI=6
 HOMEPAGE=https://github.com/pyca/cryptography/ https://pypi.org/project/cryptography/
 IUSE=libressl test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=|| ( Apache-2.0 BSD )
 RDEPEND=!libressl? ( dev-libs/openssl:0= ( || ( dev-libs/openssl:0[-bindist(-)] >=dev-libs/openssl-1.1.0g-r1:0 ) ) ) libressl? ( dev-libs/libressl:0= ) python_targets_python2_7? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_4? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_5? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_pypy? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy3? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/idna-2.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/asn1crypto-0.21.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.4.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-ipaddress[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/c/cryptography/cryptography-2.1.4.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=553b95f2e004487f5e8444387a5439a8
+_md5_=75af8b6e255a3daddfaf5dd199590ea6
diff --git a/metadata/md5-cache/dev-python/cryptography-2.1.4-r2 b/metadata/md5-cache/dev-python/cryptography-2.1.4-r2
new file mode 100644
index 000000000000..1818fc426644
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cryptography-2.1.4-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!libressl? ( dev-libs/openssl:0= ( || ( dev-libs/openssl:0[-bindist(-)] >=dev-libs/openssl-1.0.2o-r2:0 ) ) ) libressl? ( dev-libs/libressl:0= ) python_targets_python2_7? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_4? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_5? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_pypy? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy3? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/idna-2.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/asn1crypto-0.21.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.4.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-ipaddress[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/setuptools-1.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( ~dev-python/cryptography-vectors-2.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(-)] dev-python/hypothesis[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/iso8601[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pretend[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyasn1-modules[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytest-2.9.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Library providing cryptographic recipes and primitives
+EAPI=6
+HOMEPAGE=https://github.com/pyca/cryptography/ https://pypi.org/project/cryptography/
+IUSE=libressl test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+LICENSE=|| ( Apache-2.0 BSD )
+RDEPEND=!libressl? ( dev-libs/openssl:0= ( || ( dev-libs/openssl:0[-bindist(-)] >=dev-libs/openssl-1.0.2o-r2:0 ) ) ) libressl? ( dev-libs/libressl:0= ) python_targets_python2_7? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_4? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_5? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_pypy? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy3? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/idna-2.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/asn1crypto-0.21.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.4.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-ipaddress[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/c/cryptography/cryptography-2.1.4.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=54e51f214ed9b431d3b1325dde080c9c
diff --git a/metadata/md5-cache/dev-python/google-auth-1.4.1 b/metadata/md5-cache/dev-python/google-auth-1.4.1
new file mode 100644
index 000000000000..bd86a3fbecaa
--- /dev/null
+++ b/metadata/md5-cache/dev-python/google-auth-1.4.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/namespace-google[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/pyasn1-0.1.7[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/pyasn1-modules-0.2.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/rsa-3.1.4[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.9.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/cachetools-2.0.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(-)] test? ( dev-python/flask[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/mock[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-localserver[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=Google Authentication Library
+EAPI=6
+HOMEPAGE=https://github.com/GoogleCloudPlatform/google-auth-library-python https://pypi.org/project/google-auth/
+IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/namespace-google[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/pyasn1-0.1.7[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/pyasn1-modules-0.2.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/rsa-3.1.4[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.9.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/cachetools-2.0.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(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/g/google-auth/google-auth-1.4.1.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a9ea2557a975964eb1790472fc387525
diff --git a/metadata/md5-cache/dev-python/matplotlib-2.1.2-r1 b/metadata/md5-cache/dev-python/matplotlib-2.1.2-r1
deleted file mode 100644
index b5f5db2ab486..000000000000
--- a/metadata/md5-cache/dev-python/matplotlib-2.1.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-python/cycler[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_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/numpy-1.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-dateutil: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/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 >=media-libs/qhull-2013 cairo? ( dev-python/cairocffi[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) gtk2? ( dev-libs/glib:2= x11-libs/gdk-pixbuf x11-libs/gtk+:2 dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) wxwidgets? ( >=dev-python/wxpython-2.8:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/functools32[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/subprocess32[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/backports-functools-lru-cache[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/versioneer[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/pkgconfig doc? ( app-text/dvipng dev-python/colorspacious[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ipython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpydoc[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-gallery-0.1.12[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_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/xlwt[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexrecommended media-gfx/graphviz[cairo] ) test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/nose-0.11.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[tk?,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[tk?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[tk?,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(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Pure python plotting library with matlab like syntax
-EAPI=6
-HOMEPAGE=https://matplotlib.org/
-IUSE=cairo doc excel examples gtk2 gtk3 latex pyside qt5 test tk wxwidgets python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ppc64 x86
-LICENSE=BitstreamVera BSD matplotlib MIT OFL-1.1
-RDEPEND=dev-python/cycler[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_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/numpy-1.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-dateutil: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/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 >=media-libs/qhull-2013 cairo? ( dev-python/cairocffi[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) gtk2? ( dev-libs/glib:2= x11-libs/gdk-pixbuf x11-libs/gtk+:2 dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) wxwidgets? ( >=dev-python/wxpython-2.8:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/functools32[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/subprocess32[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/backports-functools-lru-cache[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/pyparsing-1.5.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] excel? ( dev-python/xlwt[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) gtk3? ( 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(-)] x11-libs/gtk+:3[introspection] ) latex? ( virtual/latex-base app-text/ghostscript-gpl app-text/dvipng app-text/poppler[utils] dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-xetex ) pyside? ( dev-python/pyside[X,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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[tk?,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[tk?,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[tk?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[tk?,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=doc? ( || ( python_targets_python2_7 ) ) excel? ( || ( python_targets_python2_7 ) ) gtk2? ( || ( python_targets_python2_7 ) ) wxwidgets? ( || ( python_targets_python2_7 ) ) test? ( cairo latex qt5 tk wxwidgets || ( gtk2 gtk3 ) ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~grozin/matplotlib-2.1.2.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=03b5ebe0860e9eb0c780bdb37e0f7497
diff --git a/metadata/md5-cache/dev-python/miniupnpc-2.0.20180222 b/metadata/md5-cache/dev-python/miniupnpc-2.0.20180222
index 9c2b2af3a59e..05b94e49a42d 100644
--- a/metadata/md5-cache/dev-python/miniupnpc-2.0.20180222
+++ b/metadata/md5-cache/dev-python/miniupnpc-2.0.20180222
@@ -4,11 +4,11 @@ DESCRIPTION=Python bindings for UPnP client library
 EAPI=6
 HOMEPAGE=http://miniupnp.free.fr/
 IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~ppc ppc64 x86
+KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=BSD
 RDEPEND=>=net-libs/miniupnpc-2.0.20180222:0= python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=http://miniupnp.free.fr/files/miniupnpc-2.0.20180222.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=982f0647ff40f37d9e1f25c5edaa422f
+_md5_=af90a99cfc6ab20b4c2c02af409db498
diff --git a/metadata/md5-cache/dev-python/pyasn1-0.4.2 b/metadata/md5-cache/dev-python/pyasn1-0.4.2
new file mode 100644
index 000000000000..98998b5592fa
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyasn1-0.4.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=ASN.1 library for Python
+EAPI=6
+HOMEPAGE=http://snmplabs.com/pyasn1/
+IUSE=doc 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 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+LICENSE=BSD-2
+RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/p/pyasn1/pyasn1-0.4.2.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=af695763596b8d6a050c5760fccda5a8
diff --git a/metadata/md5-cache/dev-python/pyasn1-modules-0.2.1 b/metadata/md5-cache/dev-python/pyasn1-modules-0.2.1
new file mode 100644
index 000000000000..3f8c4ef2ac08
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyasn1-modules-0.2.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/pyasn1-0.4.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=pyasn1 modules
+EAPI=6
+HOMEPAGE=http://snmplabs.com/pyasn1/ https://github.com/etingof/pyasn1-modules/
+IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux
+LICENSE=BSD
+RDEPEND=>=dev-python/pyasn1-0.4.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/p/pyasn1-modules/pyasn1-modules-0.2.1.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=35d079add139d5e5bfba6b42a4111eb5
diff --git a/metadata/md5-cache/dev-python/pyicu-1.9.5 b/metadata/md5-cache/dev-python/pyicu-1.9.5
deleted file mode 100644
index fcdc0a5ef2ef..000000000000
--- a/metadata/md5-cache/dev-python/pyicu-1.9.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-libs/icu-59 doc? ( dev-python/epydoc[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Python bindings for dev-libs/icu
-EAPI=6
-HOMEPAGE=https://github.com/ovalhub/pyicu
-IUSE=doc python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-libs/icu-59 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/P/PyICU/PyICU-1.9.5.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=668350bbbf603e4d38eccbdb83172194
diff --git a/metadata/md5-cache/dev-python/pyicu-1.9.8 b/metadata/md5-cache/dev-python/pyicu-1.9.8
deleted file mode 100644
index 97ff01765a4e..000000000000
--- a/metadata/md5-cache/dev-python/pyicu-1.9.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/icu python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python bindings for dev-libs/icu
-EAPI=6
-HOMEPAGE=https://github.com/ovalhub/pyicu
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/icu 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 ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/P/PyICU/PyICU-1.9.8.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1faa79e87d5653e6d7ee876b764fe49e
diff --git a/metadata/md5-cache/dev-python/pytest-qt-2.3.0 b/metadata/md5-cache/dev-python/pytest-qt-2.3.0
deleted file mode 100644
index 616636619526..000000000000
--- a/metadata/md5-cache/dev-python/pytest-qt-2.3.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
-DESCRIPTION=pytest plugin for PyQt4 or PyQt5 applications
-EAPI=6
-HOMEPAGE=https://pypi.org/project/pytest-qt/
-IUSE=doc python_targets_python2_7 python_targets_python3_5
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=>=dev-python/pytest-2.7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] || ( dev-python/PyQt4 dev-python/PyQt5 ) doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/sphinx-py3doc-enhanced-theme[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/p/pytest-qt/pytest-qt-2.3.0.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d10b45e60e9c9df4e99ac7b07545b3f2
diff --git a/metadata/md5-cache/dev-python/pytest-qt-2.3.0-r2 b/metadata/md5-cache/dev-python/pytest-qt-2.3.0-r2
index ce1a7817d412..563c01e3777c 100644
--- a/metadata/md5-cache/dev-python/pytest-qt-2.3.0-r2
+++ b/metadata/md5-cache/dev-python/pytest-qt-2.3.0-r2
@@ -4,7 +4,7 @@ DESCRIPTION=pytest plugin for PyQt4 or PyQt5 applications
 EAPI=6
 HOMEPAGE=https://pypi.org/project/pytest-qt/
 IUSE=doc python_targets_python2_7 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=>=dev-python/pytest-2.7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/PyQt5[gui,testlib,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/sphinx-py3doc-enhanced-theme[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-qt/pytest-qt-2.3.0.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d2d67bd3a0875a063091b97992903594
+_md5_=afa804d3d87e7a7b4b00630d7cf5ba80
diff --git a/metadata/md5-cache/dev-python/python-novaclient-6.0.1 b/metadata/md5-cache/dev-python/python-novaclient-6.0.1
deleted file mode 100644
index 7e817c3ae463..000000000000
--- a/metadata/md5-cache/dev-python/python-novaclient-6.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( >=dev-python/bandit-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/coverage-3.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/fixtures-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/keyring-5.5.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/mock-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-keystoneclient-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/python-keystoneclient-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-cinderclient-1.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/python-cinderclient-1.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/python-cinderclient-1.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-glanceclient-2.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/python-glanceclient-2.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/requests-mock-0.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/os-client-config-1.13.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/os-client-config-1.19.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/os-client-config-1.19.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/os-client-config-1.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/os-client-config-1.20.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-sphinx-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-sphinx-3.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/testtools-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/reno-1.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=A client for the OpenStack Nova API
-EAPI=6
-HOMEPAGE=https://github.com/openstack/python-novaclient
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/keystoneauth-2.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/iso8601-0.1.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/prettytable-0.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/requests-2.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/simplejson-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/p/python-novaclient/python-novaclient-6.0.1.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=84b139e373ea8b24223bb88fe64342b6
diff --git a/metadata/md5-cache/dev-python/python-novaclient-9.1.1 b/metadata/md5-cache/dev-python/python-novaclient-9.1.1
deleted file mode 100644
index 82faf1151003..000000000000
--- a/metadata/md5-cache/dev-python/python-novaclient-9.1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pbr-2.1.0 test? ( >=dev-python/bandit-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/coverage-4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/coverage-4.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/fixtures-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/keyring-5.5.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/mock-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-keystoneclient-3.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-cinderclient-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-glanceclient-2.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-neutronclient-6.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/requests-mock-1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sphinx-1.6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/os-client-config-1.28.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/openstackdocstheme-1.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/osprofiler-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/testtools-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/reno-1.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/reno-2.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=A client for the OpenStack Nova API
-EAPI=6
-HOMEPAGE=https://github.com/openstack/python-novaclient
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/keystoneauth-3.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/iso8601-0.1.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-i18n-3.15.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/prettytable-0.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/requests-2.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/requests-2.12.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/simplejson-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/Babel-2.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/p/python-novaclient/python-novaclient-9.1.1.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=af1646ecbfbd98448dc66d7f22bced68
diff --git a/metadata/md5-cache/dev-python/python-novaclient-9.1.2 b/metadata/md5-cache/dev-python/python-novaclient-9.1.2
index 6e1f8e371a46..4908103c4a5f 100644
--- a/metadata/md5-cache/dev-python/python-novaclient-9.1.2
+++ b/metadata/md5-cache/dev-python/python-novaclient-9.1.2
@@ -4,11 +4,11 @@ DESCRIPTION=A client for the OpenStack Nova API
 EAPI=6
 HOMEPAGE=https://github.com/openstack/python-novaclient
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/keystoneauth-3.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/iso8601-0.1.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-i18n-3.15.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/prettytable-0.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/requests-2.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/requests-2.12.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/simplejson-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/Babel-2.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-novaclient/python-novaclient-9.1.2.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5b70baca303439c32ddc5509d11c6175
+_md5_=423c229c92a7ae49ed002fdf67302960
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index f1068db1ba92..244c4c746c96 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/addressable-2.5.2 b/metadata/md5-cache/dev-ruby/addressable-2.5.2
index f128366df76d..1195fa5b6653 100644
--- a/metadata/md5-cache/dev-ruby/addressable-2.5.2
+++ b/metadata/md5-cache/dev-ruby/addressable-2.5.2
@@ -4,11 +4,11 @@ DESCRIPTION=A replacement for the URI implementation that is part of Ruby's stan
 EAPI=6
 HOMEPAGE=https://rubygems.org/gems/addressable https://github.com/sporkmonger/addressable
 IUSE=doc test test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/public_suffix-2.0.2:*[ruby_targets_ruby23] <dev-ruby/public_suffix-4:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/public_suffix-2.0.2:*[ruby_targets_ruby24] <dev-ruby/public_suffix-4:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/public_suffix-2.0.2:*[ruby_targets_ruby25] <dev-ruby/public_suffix-4:*[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
 REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/addressable-2.5.2.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=0a74fb960be72ff911e3caea5353c736
+_md5_=1eab065aaaebeb5c25e3afd687347b8a
diff --git a/metadata/md5-cache/dev-ruby/commander-4.4.5 b/metadata/md5-cache/dev-ruby/commander-4.4.5
new file mode 100644
index 000000000000..b59ea62289d8
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/commander-4.4.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/highline-1.7.2[ruby_targets_ruby23] =dev-ruby/highline-1.7*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/highline-1.7.2[ruby_targets_ruby24] =dev-ruby/highline-1.7*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/highline-1.7.2[ruby_targets_ruby25] =dev-ruby/highline-1.7*[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=The complete solution for Ruby command-line executables
+EAPI=6
+HOMEPAGE=https://visionmedia.github.com/commander/
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/highline-1.7.2[ruby_targets_ruby23] =dev-ruby/highline-1.7*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/highline-1.7.2[ruby_targets_ruby24] =dev-ruby/highline-1.7*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/highline-1.7.2[ruby_targets_ruby25] =dev-ruby/highline-1.7*[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=0
+SRC_URI=mirror://rubygems/commander-4.4.5.gem
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=9af18484ae031995f1ac1c3e345dc79b
diff --git a/metadata/md5-cache/dev-ruby/connection_pool-2.2.2 b/metadata/md5-cache/dev-ruby/connection_pool-2.2.2
new file mode 100644
index 000000000000..7352cf9c1049
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/connection_pool-2.2.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/minitest-5[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/minitest-5[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=Generic connection pooling for Ruby
+EAPI=6
+HOMEPAGE=https://github.com/mperham/connection_pool
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=0
+SRC_URI=mirror://rubygems/connection_pool-2.2.2.gem
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=40f440d295e4cbc22099db727ddd632f
diff --git a/metadata/md5-cache/dev-ruby/dbf-3.1.1 b/metadata/md5-cache/dev-ruby/dbf-3.1.1
index ff5ec813ab29..2fd866d4bdc7 100644
--- a/metadata/md5-cache/dev-ruby/dbf-3.1.1
+++ b/metadata/md5-cache/dev-ruby/dbf-3.1.1
@@ -4,11 +4,11 @@ DESCRIPTION=a small fast library for reading dBase, xBase, Clipper and FoxPro da
 EAPI=6
 HOMEPAGE=https://github.com/infused/dbf
 IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/dbf-3.1.1.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=79f474f58e02364c8b64ecee35c54714
+_md5_=290cceaf8752f5767dc0da9aff5eb931
diff --git a/metadata/md5-cache/dev-ruby/haml-5.0.4 b/metadata/md5-cache/dev-ruby/haml-5.0.4
index d332b2478dc0..589a0911ca22 100644
--- a/metadata/md5-cache/dev-ruby/haml-5.0.4
+++ b/metadata/md5-cache/dev-ruby/haml-5.0.4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/temple-0.8.0[ruby_targets_ruby23] dev-ruby/tilt:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/temple-0.8.0[ruby_targets_ruby24] dev-ruby/tilt:*[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] dev-ruby/nokogiri[ruby_targets_ruby23] dev-ruby/railties:4.2[ruby_targets_ruby23] dev-ruby/activemodel:4.2[ruby_targets_ruby23] dev-ruby/actionpack:4.2[ruby_targets_ruby23] ) doc? ( dev-ruby/yard[ruby_targets_ruby23] >=dev-ruby/maruku-0.7.2-r1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby24] dev-ruby/nokogiri[ruby_targets_ruby24] dev-ruby/railties:4.2[ruby_targets_ruby24] dev-ruby/activemodel:4.2[ruby_targets_ruby24] dev-ruby/actionpack:4.2[ruby_targets_ruby24] ) doc? ( dev-ruby/yard[ruby_targets_ruby24] >=dev-ruby/maruku-0.7.2-r1[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/temple-0.8.0[ruby_targets_ruby23] dev-ruby/tilt:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/temple-0.8.0[ruby_targets_ruby24] dev-ruby/tilt:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/temple-0.8.0[ruby_targets_ruby25] dev-ruby/tilt:*[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] dev-ruby/nokogiri[ruby_targets_ruby23] dev-ruby/railties:5.2[ruby_targets_ruby23] dev-ruby/activemodel:5.2[ruby_targets_ruby23] dev-ruby/actionpack:5.2[ruby_targets_ruby23] ) doc? ( dev-ruby/yard[ruby_targets_ruby23] >=dev-ruby/maruku-0.7.2-r1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby24] dev-ruby/nokogiri[ruby_targets_ruby24] dev-ruby/railties:5.2[ruby_targets_ruby24] dev-ruby/activemodel:5.2[ruby_targets_ruby24] dev-ruby/actionpack:5.2[ruby_targets_ruby24] ) doc? ( dev-ruby/yard[ruby_targets_ruby24] >=dev-ruby/maruku-0.7.2-r1[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby25] dev-ruby/nokogiri[ruby_targets_ruby25] dev-ruby/railties:5.2[ruby_targets_ruby25] dev-ruby/activemodel:5.2[ruby_targets_ruby25] dev-ruby/actionpack:5.2[ruby_targets_ruby25] ) doc? ( dev-ruby/yard[ruby_targets_ruby25] >=dev-ruby/maruku-0.7.2-r1[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=A ruby web page templating engine
 EAPI=6
 HOMEPAGE=http://haml.info/
-IUSE=doc test test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=doc test test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
 KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=!!<dev-ruby/haml-3.1.8-r2 ruby_targets_ruby23? ( >=dev-ruby/temple-0.8.0[ruby_targets_ruby23] dev-ruby/tilt:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/temple-0.8.0[ruby_targets_ruby24] dev-ruby/tilt:*[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=!!<dev-ruby/haml-3.1.8-r2 ruby_targets_ruby23? ( >=dev-ruby/temple-0.8.0[ruby_targets_ruby23] dev-ruby/tilt:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/temple-0.8.0[ruby_targets_ruby24] dev-ruby/tilt:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/temple-0.8.0[ruby_targets_ruby25] dev-ruby/tilt:*[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=5
 SRC_URI=https://github.com/haml/haml/archive/v5.0.4.tar.gz -> haml-5.0.4.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=2f5c3f2e1f07bc2a9b015fc2aab2123e
+_md5_=459db01d9edd6df3f17bba9370da17b5
diff --git a/metadata/md5-cache/dev-ruby/hiera-eyaml-plaintext-0.6-r1 b/metadata/md5-cache/dev-ruby/hiera-eyaml-plaintext-0.6-r1
index 4e1dd46d0a07..2a3873a261dc 100644
--- a/metadata/md5-cache/dev-ruby/hiera-eyaml-plaintext-0.6-r1
+++ b/metadata/md5-cache/dev-ruby/hiera-eyaml-plaintext-0.6-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=A plaintext backend for hiera-eyaml
 EAPI=5
 HOMEPAGE=https://github.com/gtmtechltd/hiera-eyaml-plaintext
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/hiera-eyaml-plaintext-0.6.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=7f65fdd0588ae3621826b706b6c00548
+_md5_=13719aa0bfe2891053f4c1ac1ee3420b
diff --git a/metadata/md5-cache/dev-ruby/http-3.3.0 b/metadata/md5-cache/dev-ruby/http-3.3.0
index 21a06c55ec2d..8d3a0febc9a4 100644
--- a/metadata/md5-cache/dev-ruby/http-3.3.0
+++ b/metadata/md5-cache/dev-ruby/http-3.3.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3:0[ruby_targets_ruby23] >=dev-ruby/http-cookie-1.0:0[ruby_targets_ruby23] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby23] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby23] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/addressable-2.3:0[ruby_targets_ruby24] >=dev-ruby/http-cookie-1.0:0[ruby_targets_ruby24] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby24] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby24] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/certificate_authority[ruby_targets_ruby23] dev-ruby/rspec-its[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/certificate_authority[ruby_targets_ruby24] dev-ruby/rspec-its[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3:0[ruby_targets_ruby23] >=dev-ruby/http-cookie-1.0:0[ruby_targets_ruby23] dev-ruby/http-form_data:2[ruby_targets_ruby23] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby23] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/addressable-2.3:0[ruby_targets_ruby24] >=dev-ruby/http-cookie-1.0:0[ruby_targets_ruby24] dev-ruby/http-form_data:2[ruby_targets_ruby24] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby24] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/addressable-2.3:0[ruby_targets_ruby25] >=dev-ruby/http-cookie-1.0:0[ruby_targets_ruby25] dev-ruby/http-form_data:2[ruby_targets_ruby25] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby25] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/certificate_authority[ruby_targets_ruby23] dev-ruby/rspec-its[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/certificate_authority[ruby_targets_ruby24] dev-ruby/rspec-its[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/certificate_authority[ruby_targets_ruby25] dev-ruby/rspec-its[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=An easy-to-use client library for making requests from Ruby
 EAPI=6
 HOMEPAGE=https://github.com/tarcieri/http
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
 KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3:0[ruby_targets_ruby23] >=dev-ruby/http-cookie-1.0:0[ruby_targets_ruby23] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby23] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby23] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/addressable-2.3:0[ruby_targets_ruby24] >=dev-ruby/http-cookie-1.0:0[ruby_targets_ruby24] >=dev-ruby/http-form_data-1.0.1:1.0[ruby_targets_ruby24] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby24] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3:0[ruby_targets_ruby23] >=dev-ruby/http-cookie-1.0:0[ruby_targets_ruby23] dev-ruby/http-form_data:2[ruby_targets_ruby23] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby23] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/addressable-2.3:0[ruby_targets_ruby24] >=dev-ruby/http-cookie-1.0:0[ruby_targets_ruby24] dev-ruby/http-form_data:2[ruby_targets_ruby24] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby24] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/addressable-2.3:0[ruby_targets_ruby25] >=dev-ruby/http-cookie-1.0:0[ruby_targets_ruby25] dev-ruby/http-form_data:2[ruby_targets_ruby25] >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby25] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=3
 SRC_URI=mirror://rubygems/http-3.3.0.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=a54b94ecf163dde1d53d662f57ad514f
+_md5_=35f4b1b89ae1e05c74619fed32066e18
diff --git a/metadata/md5-cache/dev-ruby/instantiator-0.0.7 b/metadata/md5-cache/dev-ruby/instantiator-0.0.7
index ceae992a4b5c..5945891f5a78 100644
--- a/metadata/md5-cache/dev-ruby/instantiator-0.0.7
+++ b/metadata/md5-cache/dev-ruby/instantiator-0.0.7
@@ -4,11 +4,11 @@ DESCRIPTION=Instantiate an arbitrary Ruby class
 EAPI=5
 HOMEPAGE=https://github.com/floehopper/introspection
 IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby23? ( dev-ruby/blankslate:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/blankslate:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/blankslate:*[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
 REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/instantiator-0.0.7.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=615a31adc784377da48528f38d9a9c6c
+_md5_=7b7d933a8a794714d209e26488914125
diff --git a/metadata/md5-cache/dev-ruby/introspection-0.0.4 b/metadata/md5-cache/dev-ruby/introspection-0.0.4
index 3cd45925543e..ee97d8f99116 100644
--- a/metadata/md5-cache/dev-ruby/introspection-0.0.4
+++ b/metadata/md5-cache/dev-ruby/introspection-0.0.4
@@ -4,11 +4,11 @@ DESCRIPTION=Dynamic inspection of the hierarchy of method definitions on a Ruby
 EAPI=5
 HOMEPAGE=http://jamesmead.org/
 IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/metaclass-0.0.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/metaclass-0.0.1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/metaclass-0.0.1[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
 REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/introspection-0.0.4.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=6c89fe358a31943c47a6c0c9cbe45e83
+_md5_=6745cc41c5ea84c72c628da91715fe0d
diff --git a/metadata/md5-cache/dev-ruby/logue-1.0.11 b/metadata/md5-cache/dev-ruby/logue-1.0.11
index 3cc63fc01bdd..6637b96a0426 100644
--- a/metadata/md5-cache/dev-ruby/logue-1.0.11
+++ b/metadata/md5-cache/dev-ruby/logue-1.0.11
@@ -4,11 +4,11 @@ DESCRIPTION=A module that adds logging/trace functionality
 EAPI=6
 HOMEPAGE=https://github.com/jpace/logue
 IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~hppa ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~hppa ~ppc ~sparc ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/rainbow-2.0.0:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rainbow-2.0.0:*[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/jpace/logue/archive/v1.0.11.tar.gz -> logue-git-1.0.11.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=07ea500207b092cd800b8c6d25cd390d
+_md5_=985fff94c30dba0e5348ae1e619f7cfa
diff --git a/metadata/md5-cache/dev-ruby/maruku-0.7.3 b/metadata/md5-cache/dev-ruby/maruku-0.7.3
index c823a320b310..283b51b0997b 100644
--- a/metadata/md5-cache/dev-ruby/maruku-0.7.3
+++ b/metadata/md5-cache/dev-ruby/maruku-0.7.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/nokogiri-diff[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/nokogiri-diff[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby23? ( highlight? ( dev-ruby/syntax[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( highlight? ( dev-ruby/syntax[ruby_targets_ruby24] ) ) ) test? ( app-text/blahtexml ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/nokogiri-diff[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/nokogiri-diff[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/nokogiri-diff[ruby_targets_ruby25] ) ) test? ( ruby_targets_ruby23? ( highlight? ( dev-ruby/syntax[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( highlight? ( dev-ruby/syntax[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( highlight? ( dev-ruby/syntax[ruby_targets_ruby25] ) ) ) test? ( app-text/blahtexml ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=A Markdown-superset interpreter written in Ruby
 EAPI=5
 HOMEPAGE=https://github.com/bhollis/maruku
-IUSE=highlight test test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=highlight test test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby23? ( highlight? ( dev-ruby/syntax[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( highlight? ( dev-ruby/syntax[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby23? ( highlight? ( dev-ruby/syntax[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( highlight? ( dev-ruby/syntax[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( highlight? ( dev-ruby/syntax[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/maruku-0.7.3.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=b7bdf1ffd71ed4d2504ff7ebd08ed0a1
+_md5_=fd0c547f342c5d418b187cd9f4248568
diff --git a/metadata/md5-cache/dev-ruby/mocha-1.4.0 b/metadata/md5-cache/dev-ruby/mocha-1.4.0
index 164fe478ba95..1e4efb561bfe 100644
--- a/metadata/md5-cache/dev-ruby/mocha-1.4.0
+++ b/metadata/md5-cache/dev-ruby/mocha-1.4.0
@@ -4,11 +4,11 @@ DESCRIPTION=Mocking and stubbing using a syntax like that of JMock and SchMock
 EAPI=6
 HOMEPAGE=http://gofreerange.com/mocha/docs/
 IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby23? ( =dev-ruby/metaclass-0.0*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/metaclass-0.0*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( =dev-ruby/metaclass-0.0*[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
 REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=1.0
 SRC_URI=mirror://rubygems/mocha-1.4.0.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=6ca0b70a8f4c83ec030675e41fdda738
+_md5_=a78bcf8205bccfb495665311d10f2104
diff --git a/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4.1 b/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4.1
index 2d2d9de8c7a0..10205730d430 100644
--- a/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4.1
+++ b/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4.1
@@ -4,11 +4,11 @@ DESCRIPTION=An implementation of RFC 2617 - Digest Access Authentication
 EAPI=5
 HOMEPAGE=https://github.com/drbrain/net-http-digest_auth
 IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
 REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/net-http-digest_auth-1.4.1.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=2ea31702971d5ac62eccb4b04d9635eb
+_md5_=901def2de2c1677913e2e9f2714971ce
diff --git a/metadata/md5-cache/dev-ruby/nokogiri-diff-0.2.0-r2 b/metadata/md5-cache/dev-ruby/nokogiri-diff-0.2.0-r2
index 093c27be72cb..2ab26f781df5 100644
--- a/metadata/md5-cache/dev-ruby/nokogiri-diff-0.2.0-r2
+++ b/metadata/md5-cache/dev-ruby/nokogiri-diff-0.2.0-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.5[ruby_targets_ruby23] >=dev-ruby/tdiff-0.3.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/nokogiri-1.5[ruby_targets_ruby24] >=dev-ruby/tdiff-0.3.2[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.5[ruby_targets_ruby23] >=dev-ruby/tdiff-0.3.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/nokogiri-1.5[ruby_targets_ruby24] >=dev-ruby/tdiff-0.3.2[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/nokogiri-1.5[ruby_targets_ruby25] >=dev-ruby/tdiff-0.3.2[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby25] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=Calculate the differences between two XML/HTML documents
 EAPI=5
 HOMEPAGE=https://github.com/postmodern/nokogiri-diff
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
 KEYWORDS=amd64 arm ~arm64 ~hppa ppc ppc64 x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.5[ruby_targets_ruby23] >=dev-ruby/tdiff-0.3.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/nokogiri-1.5[ruby_targets_ruby24] >=dev-ruby/tdiff-0.3.2[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.5[ruby_targets_ruby23] >=dev-ruby/tdiff-0.3.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/nokogiri-1.5[ruby_targets_ruby24] >=dev-ruby/tdiff-0.3.2[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/nokogiri-1.5[ruby_targets_ruby25] >=dev-ruby/tdiff-0.3.2[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/nokogiri-diff-0.2.0.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=9a67e5a5578b4e74a39458da9551a5d2
+_md5_=084ab489cc9b41ccee8c4acb2c0a610c
diff --git a/metadata/md5-cache/dev-ruby/parallel-1.12.1 b/metadata/md5-cache/dev-ruby/parallel-1.12.1
index 75590581d851..e15177e74456 100644
--- a/metadata/md5-cache/dev-ruby/parallel-1.12.1
+++ b/metadata/md5-cache/dev-ruby/parallel-1.12.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( sys-process/lsof ) ruby_targets_ruby23? ( test? ( dev-ruby/ruby-progressbar[ruby_targets_ruby23] dev-ruby/activerecord:4.2[ruby_targets_ruby23] dev-ruby/sqlite3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/ruby-progressbar[ruby_targets_ruby24] dev-ruby/activerecord:4.2[ruby_targets_ruby24] dev-ruby/sqlite3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( sys-process/lsof ) ruby_targets_ruby23? ( test? ( dev-ruby/ruby-progressbar[ruby_targets_ruby23] dev-ruby/activerecord:5.2[ruby_targets_ruby23] dev-ruby/sqlite3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/ruby-progressbar[ruby_targets_ruby24] dev-ruby/activerecord:5.2[ruby_targets_ruby24] dev-ruby/sqlite3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/ruby-progressbar[ruby_targets_ruby25] dev-ruby/activerecord:5.2[ruby_targets_ruby25] dev-ruby/sqlite3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=Run any code in parallel Processes or Threads
 EAPI=6
 HOMEPAGE=https://github.com/grosser/parallel
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=1
 SRC_URI=https://github.com/grosser/parallel/archive/v1.12.1.tar.gz -> parallel-1.12.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=13846c09c6de56173a00cb02764b5d8b
+_md5_=9eee8cc9ae485318ae63992f0da788a2
diff --git a/metadata/md5-cache/dev-ruby/public_suffix-3.0.2 b/metadata/md5-cache/dev-ruby/public_suffix-3.0.2
index a49f1ba06a0c..3cf581c2571d 100644
--- a/metadata/md5-cache/dev-ruby/public_suffix-3.0.2
+++ b/metadata/md5-cache/dev-ruby/public_suffix-3.0.2
@@ -4,11 +4,11 @@ DESCRIPTION=Parse and decompose a domain name into top level domain, domain and
 EAPI=6
 HOMEPAGE=https://simonecarletti.com/code/publicsuffix-ruby/
 IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
 REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=3
 SRC_URI=mirror://rubygems/public_suffix-3.0.2.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=b3fcb08b910e0b3978422339a64de3ec
+_md5_=0fdde7f06d3b6a00e4ca0b2b52a2d065
diff --git a/metadata/md5-cache/dev-ruby/rspec-json_expectations-2.1.0 b/metadata/md5-cache/dev-ruby/rspec-json_expectations-2.1.0
index 62c3830693fb..783c9b512635 100644
--- a/metadata/md5-cache/dev-ruby/rspec-json_expectations-2.1.0
+++ b/metadata/md5-cache/dev-ruby/rspec-json_expectations-2.1.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( test? ( dev-util/cucumber[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-util/cucumber[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby23? ( test? ( dev-util/cucumber[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-util/cucumber[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-util/cucumber[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=Set of matchers and helpers to allow you test your APIs responses.
 EAPI=5
 HOMEPAGE=https://github.com/waterlink/rspec-json_expectations
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=1
 SRC_URI=mirror://rubygems/rspec-json_expectations-2.1.0.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=2292400be3818af4813243607fab1631
+_md5_=5c10ea09c4f8c1ac1df3926418217ac2
diff --git a/metadata/md5-cache/dev-ruby/ruby-termios-1.0.2-r1 b/metadata/md5-cache/dev-ruby/ruby-termios-1.0.2-r1
index 0cfdb604240a..c8c4bfd3942f 100644
--- a/metadata/md5-cache/dev-ruby/ruby-termios-1.0.2-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-termios-1.0.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A Ruby interface to termios
 EAPI=5
 HOMEPAGE=http://arika.org/ruby/termios
 IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test
-KEYWORDS=~amd64 ~hppa ~mips ~ppc ~x86 ~x86-macos
+KEYWORDS=amd64 ~hppa ~mips ~ppc ~x86 ~x86-macos
 LICENSE=Ruby
 RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
 REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-termios-1.0.2.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=839d306e7e3cca8c4a9b86d043b724e5
+_md5_=3a70b134995cc89aaeaa400a6f5d2fba
diff --git a/metadata/md5-cache/dev-ruby/rubypants-0.7.0 b/metadata/md5-cache/dev-ruby/rubypants-0.7.0
index 5ae46c56c23f..b10ac16cd05e 100644
--- a/metadata/md5-cache/dev-ruby/rubypants-0.7.0
+++ b/metadata/md5-cache/dev-ruby/rubypants-0.7.0
@@ -4,11 +4,11 @@ DESCRIPTION=A Ruby port of the SmartyPants PHP library
 EAPI=6
 HOMEPAGE=http://chneukirchen.org/repos/rubypants/README
 IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=Ruby
 RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
 REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/rubypants-0.7.0.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=b27658614c707125110fd93d925be283
+_md5_=0c25cb44e3a21be4ff6680e53985fb21
diff --git a/metadata/md5-cache/dev-ruby/slim-3.0.9 b/metadata/md5-cache/dev-ruby/slim-3.0.9
index 527364c9e5fd..7cee778bdad6 100644
--- a/metadata/md5-cache/dev-ruby/slim-3.0.9
+++ b/metadata/md5-cache/dev-ruby/slim-3.0.9
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/tilt-1.3.3:*[ruby_targets_ruby23] <dev-ruby/tilt-2.1:*[ruby_targets_ruby23] >=dev-ruby/temple-0.7.6:0.7[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/tilt-1.3.3:*[ruby_targets_ruby24] <dev-ruby/tilt-2.1:*[ruby_targets_ruby24] >=dev-ruby/temple-0.7.6:0.7[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] dev-ruby/redcarpet[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] dev-ruby/redcarpet[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/sass[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/sass[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/tilt-1.3.3:*[ruby_targets_ruby23] <dev-ruby/tilt-2.1:*[ruby_targets_ruby23] >=dev-ruby/temple-0.7.6:0.7[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/tilt-1.3.3:*[ruby_targets_ruby24] <dev-ruby/tilt-2.1:*[ruby_targets_ruby24] >=dev-ruby/temple-0.7.6:0.7[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/tilt-1.3.3:*[ruby_targets_ruby25] <dev-ruby/tilt-2.1:*[ruby_targets_ruby25] >=dev-ruby/temple-0.7.6:0.7[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] dev-ruby/redcarpet[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] dev-ruby/redcarpet[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25] dev-ruby/redcarpet[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/sass[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/sass[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/sass[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=A template language aiming to reduce the syntax to the essential parts
 EAPI=6
 HOMEPAGE=http://slim-lang.com/
-IUSE=doc test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=doc test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/tilt-1.3.3:*[ruby_targets_ruby23] <dev-ruby/tilt-2.1:*[ruby_targets_ruby23] >=dev-ruby/temple-0.7.6:0.7[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/tilt-1.3.3:*[ruby_targets_ruby24] <dev-ruby/tilt-2.1:*[ruby_targets_ruby24] >=dev-ruby/temple-0.7.6:0.7[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/tilt-1.3.3:*[ruby_targets_ruby23] <dev-ruby/tilt-2.1:*[ruby_targets_ruby23] >=dev-ruby/temple-0.7.6:0.7[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/tilt-1.3.3:*[ruby_targets_ruby24] <dev-ruby/tilt-2.1:*[ruby_targets_ruby24] >=dev-ruby/temple-0.7.6:0.7[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/tilt-1.3.3:*[ruby_targets_ruby25] <dev-ruby/tilt-2.1:*[ruby_targets_ruby25] >=dev-ruby/temple-0.7.6:0.7[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/slim-3.0.9.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=65c71e3dfb143971e5d905917c36d84c
+_md5_=e77d3a29ff0d858e334991019e6e3788
diff --git a/metadata/md5-cache/dev-ruby/websocket-1.2.7 b/metadata/md5-cache/dev-ruby/websocket-1.2.7
new file mode 100644
index 000000000000..ce94407bc5fa
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/websocket-1.2.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=Universal Ruby library to handle WebSocket protocol
+EAPI=6
+HOMEPAGE=https://github.com/imanel/websocket-ruby
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=0
+SRC_URI=mirror://rubygems/websocket-1.2.7.gem
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=89fa3ca23fe4dbf0f6207fe3df7903a3
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 54f06976eb18..fb2886a7b4ba 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/aruba-0.6.2-r2 b/metadata/md5-cache/dev-util/aruba-0.6.2-r2
new file mode 100644
index 000000000000..a8dc8fc87b12
--- /dev/null
+++ b/metadata/md5-cache/dev-util/aruba-0.6.2-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( sys-devel/bc ) test? ( ruby_targets_ruby23? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby23] >=dev-ruby/rspec-expectations-2.7:2[ruby_targets_ruby23] >=dev-util/cucumber-1.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby24] >=dev-ruby/rspec-expectations-2.7:2[ruby_targets_ruby24] >=dev-util/cucumber-1.1.1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby25] >=dev-ruby/rspec-expectations-2.7:2[ruby_targets_ruby25] >=dev-util/cucumber-1.1.1[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/rspec-2.11:2[ruby_targets_ruby23] >=dev-ruby/bcat-0.6.1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/rspec-2.11:2[ruby_targets_ruby24] >=dev-ruby/bcat-0.6.1[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/rspec-2.11:2[ruby_targets_ruby25] >=dev-ruby/bcat-0.6.1[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( test? ( dev-util/cucumber[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-util/cucumber[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-util/cucumber[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=Cucumber steps for driving out command line applications
+EAPI=6
+HOMEPAGE=https://github.com/cucumber/aruba
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby23] >=dev-ruby/rspec-expectations-2.7:2[ruby_targets_ruby23] >=dev-util/cucumber-1.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby24] >=dev-ruby/rspec-expectations-2.7:2[ruby_targets_ruby24] >=dev-util/cucumber-1.1.1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby25] >=dev-ruby/rspec-expectations-2.7:2[ruby_targets_ruby25] >=dev-util/cucumber-1.1.1[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=0
+SRC_URI=mirror://rubygems/aruba-0.6.2.gem
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=d9df1daab8029ee2ac369d5e54e67832
diff --git a/metadata/md5-cache/dev-util/ccache-3.3.4-r1 b/metadata/md5-cache/dev-util/ccache-3.3.4-r1
index 966572229cfe..226af697994e 100644
--- a/metadata/md5-cache/dev-util/ccache-3.3.4-r1
+++ b/metadata/md5-cache/dev-util/ccache-3.3.4-r1
@@ -3,10 +3,10 @@ DEPEND=app-arch/xz-utils sys-libs/zlib
 DESCRIPTION=fast compiler cache
 EAPI=6
 HOMEPAGE=https://ccache.samba.org/
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd
 LICENSE=GPL-3
 RDEPEND=app-arch/xz-utils sys-libs/zlib dev-util/shadowman sys-apps/gentoo-functions
 SLOT=0
 SRC_URI=https://www.samba.org/ftp/ccache/ccache-3.3.4.tar.xz
 _eclasses_=readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986
-_md5_=a0361d8d41f2de30a7ac31f34a1b7c36
+_md5_=0c417645b7a323b27d0d4ac133d46852
diff --git a/metadata/md5-cache/dev-util/colm-0.13.0.6 b/metadata/md5-cache/dev-util/colm-0.13.0.6
new file mode 100644
index 000000000000..a5974e927c4a
--- /dev/null
+++ b/metadata/md5-cache/dev-util/colm-0.13.0.6
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DEPEND=app-text/asciidoc
+DESCRIPTION=COmputer Language Manipulation
+EAPI=6
+HOMEPAGE=https://www.colm.net/open-source/colm/
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://www.colm.net/files/colm/colm-0.13.0.6.tar.gz
+_md5_=42824b35884ba30223a482ea549a4084
diff --git a/metadata/md5-cache/dev-util/cucumber-3.1.0 b/metadata/md5-cache/dev-util/cucumber-3.1.0
index 2d26f1210d3f..7a04a3148500 100644
--- a/metadata/md5-cache/dev-util/cucumber-3.1.0
+++ b/metadata/md5-cache/dev-util/cucumber-3.1.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby23] >=dev-ruby/syntax-1.0.0[ruby_targets_ruby23] >=dev-util/aruba-0.6.1[ruby_targets_ruby23] =dev-util/aruba-0.6*[ruby_targets_ruby23] >=dev-ruby/json-1.7[ruby_targets_ruby23] >=dev-util/cucumber-3[ruby_targets_ruby23] >=dev-ruby/mime-types-2.99:2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby24] >=dev-ruby/syntax-1.0.0[ruby_targets_ruby24] >=dev-util/aruba-0.6.1[ruby_targets_ruby24] =dev-util/aruba-0.6*[ruby_targets_ruby24] >=dev-ruby/json-1.7[ruby_targets_ruby24] >=dev-util/cucumber-3[ruby_targets_ruby24] >=dev-ruby/mime-types-2.99:2[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby23? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby23] dev-util/cucumber-core:3.1[ruby_targets_ruby23] dev-util/cucumber-expressions:5.0[ruby_targets_ruby23] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby23] >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby23] dev-ruby/gherkin:5[ruby_targets_ruby23] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby23] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby24] dev-util/cucumber-core:3.1[ruby_targets_ruby24] dev-util/cucumber-expressions:5.0[ruby_targets_ruby24] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby24] >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby24] dev-ruby/gherkin:5[ruby_targets_ruby24] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby24] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby23] >=dev-ruby/syntax-1.0.0[ruby_targets_ruby23] >=dev-util/aruba-0.6.1[ruby_targets_ruby23] =dev-util/aruba-0.6*[ruby_targets_ruby23] >=dev-ruby/json-1.7[ruby_targets_ruby23] >=dev-util/cucumber-3[ruby_targets_ruby23] >=dev-ruby/mime-types-2.99:2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby24] >=dev-ruby/syntax-1.0.0[ruby_targets_ruby24] >=dev-util/aruba-0.6.1[ruby_targets_ruby24] =dev-util/aruba-0.6*[ruby_targets_ruby24] >=dev-ruby/json-1.7[ruby_targets_ruby24] >=dev-util/cucumber-3[ruby_targets_ruby24] >=dev-ruby/mime-types-2.99:2[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby25] >=dev-ruby/syntax-1.0.0[ruby_targets_ruby25] >=dev-util/aruba-0.6.1[ruby_targets_ruby25] =dev-util/aruba-0.6*[ruby_targets_ruby25] >=dev-ruby/json-1.7[ruby_targets_ruby25] >=dev-util/cucumber-3[ruby_targets_ruby25] >=dev-ruby/mime-types-2.99:2[ruby_targets_ruby25] ) ) test? ( ruby_targets_ruby23? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby23] dev-util/cucumber-core:3.1[ruby_targets_ruby23] dev-util/cucumber-expressions:5.0[ruby_targets_ruby23] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby23] >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby23] dev-ruby/gherkin:5[ruby_targets_ruby23] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby23] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby24] dev-util/cucumber-core:3.1[ruby_targets_ruby24] dev-util/cucumber-expressions:5.0[ruby_targets_ruby24] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby24] >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby24] dev-ruby/gherkin:5[ruby_targets_ruby24] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby24] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby25] dev-util/cucumber-core:3.1[ruby_targets_ruby25] dev-util/cucumber-expressions:5.0[ruby_targets_ruby25] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby25] >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby25] dev-ruby/gherkin:5[ruby_targets_ruby25] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby25] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=Executable feature scenarios
 EAPI=6
 HOMEPAGE=https://github.com/aslakhellesoy/cucumber/wikis
-IUSE=examples test test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=examples test test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~x86
 LICENSE=Ruby
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby23] dev-util/cucumber-core:3.1[ruby_targets_ruby23] dev-util/cucumber-expressions:5.0[ruby_targets_ruby23] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby23] >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby23] dev-ruby/gherkin:5[ruby_targets_ruby23] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby23] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby24] dev-util/cucumber-core:3.1[ruby_targets_ruby24] dev-util/cucumber-expressions:5.0[ruby_targets_ruby24] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby24] >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby24] dev-ruby/gherkin:5[ruby_targets_ruby24] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby24] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby23] dev-util/cucumber-core:3.1[ruby_targets_ruby23] dev-util/cucumber-expressions:5.0[ruby_targets_ruby23] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby23] >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby23] dev-ruby/gherkin:5[ruby_targets_ruby23] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby23] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby24] dev-util/cucumber-core:3.1[ruby_targets_ruby24] dev-util/cucumber-expressions:5.0[ruby_targets_ruby24] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby24] >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby24] dev-ruby/gherkin:5[ruby_targets_ruby24] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby24] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby25] dev-util/cucumber-core:3.1[ruby_targets_ruby25] dev-util/cucumber-expressions:5.0[ruby_targets_ruby25] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby25] >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby25] dev-ruby/gherkin:5[ruby_targets_ruby25] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby25] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=https://github.com/cucumber/cucumber-ruby/archive/v3.1.0.tar.gz -> cucumber-3.1.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=b7360855bca8fe352314eaca5598e5e4
+_md5_=bad46f737e34dda6e310c68add67e1db
diff --git a/metadata/md5-cache/dev-util/cucumber-wire-0.0.1-r1 b/metadata/md5-cache/dev-util/cucumber-wire-0.0.1-r1
new file mode 100644
index 000000000000..1c964800146b
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cucumber-wire-0.0.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby23? ( test? ( dev-util/cucumber[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-util/cucumber[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-util/cucumber[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=Executable feature scenarios
+EAPI=6
+HOMEPAGE=https://github.com/aslakhellesoy/cucumber/wikis
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86
+LICENSE=Ruby
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=0
+SRC_URI=mirror://rubygems/cucumber-wire-0.0.1.gem
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=93c18d86b21e4d4a422fe3a18cffe031
diff --git a/metadata/md5-cache/dev-util/kdevelop-5.2.3 b/metadata/md5-cache/dev-util/kdevelop-5.2.3
new file mode 100644
index 000000000000..43090118f981
--- /dev/null
+++ b/metadata/md5-cache/dev-util/kdevelop-5.2.3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kbookmarks-5.43.0:5 >=kde-frameworks/kcmutils-5.43.0:5 >=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdeclarative-5.43.0:5 >=kde-frameworks/kguiaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kitemmodels-5.43.0:5 >=kde-frameworks/kitemviews-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/knotifyconfig-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/ktexteditor-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-frameworks/sonnet-5.43.0:5 >=kde-frameworks/threadweaver-5.43.0:5 >=kde-apps/libkomparediff2-14.12.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qthelp-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qttest-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/grantlee:5 >=sys-devel/clang-3.8.0:= x11-misc/shared-mime-info gdbui? ( >=kde-plasma/libksysguard-5.11.5:5 ) okteta? ( >=kde-apps/okteta-14.12.0:5 ) plasma? ( >=kde-frameworks/krunner-5.43.0:5 >=kde-frameworks/plasma-5.43.0:5 ) qmake? ( dev-util/kdevelop-pg-qt:5 ) reviewboard? ( kde-frameworks/purpose ) subversion? ( dev-libs/apr:1 dev-libs/apr-util:1 dev-vcs/subversion ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) !webkit? ( >=dev-qt/qtwebengine-5.9.4:5[widgets] ) welcomepage? ( >=dev-qt/qtdeclarative-5.9.4:5[widgets] ) dev-libs/boost >=dev-qt/qtconcurrent-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Integrated Development Environment, supporting KF5/Qt, C/C++ and much more
+EAPI=6
+HOMEPAGE=https://www.kdevelop.org/
+IUSE=cvs +gdbui okteta +plasma +qmake reviewboard subversion webkit +welcomepage test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 LGPL-2
+RDEPEND=>=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kbookmarks-5.43.0:5 >=kde-frameworks/kcmutils-5.43.0:5 >=kde-frameworks/kcodecs-5.43.0:5 >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/kcrash-5.43.0:5 >=kde-frameworks/kdeclarative-5.43.0:5 >=kde-frameworks/kguiaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kiconthemes-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kitemmodels-5.43.0:5 >=kde-frameworks/kitemviews-5.43.0:5 >=kde-frameworks/kjobwidgets-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/knotifications-5.43.0:5 >=kde-frameworks/knotifyconfig-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/kservice-5.43.0:5 >=kde-frameworks/ktexteditor-5.43.0:5 >=kde-frameworks/ktextwidgets-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kwindowsystem-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-frameworks/sonnet-5.43.0:5 >=kde-frameworks/threadweaver-5.43.0:5 >=kde-apps/libkomparediff2-14.12.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qthelp-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qttest-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/grantlee:5 >=sys-devel/clang-3.8.0:= x11-misc/shared-mime-info gdbui? ( >=kde-plasma/libksysguard-5.11.5:5 ) okteta? ( >=kde-apps/okteta-14.12.0:5 ) plasma? ( >=kde-frameworks/krunner-5.43.0:5 >=kde-frameworks/plasma-5.43.0:5 ) qmake? ( dev-util/kdevelop-pg-qt:5 ) reviewboard? ( kde-frameworks/purpose ) subversion? ( dev-libs/apr:1 dev-libs/apr-util:1 dev-vcs/subversion ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) !webkit? ( >=dev-qt/qtwebengine-5.9.4:5[widgets] ) welcomepage? ( >=dev-qt/qtdeclarative-5.9.4:5[widgets] ) >=kde-apps/kapptemplate-14.12.0:5 >=kde-apps/kio-extras-14.12.0:5 dev-util/ninja >=sys-devel/gdb-7.0[python] cvs? ( dev-vcs/cvs ) reviewboard? ( >=kde-apps/ktp-accounts-kcm-14.12.0:5 ) !dev-util/kdevelop:4 !dev-util/kdevelop-clang !dev-util/kdevelop-cppcheck !dev-util/kdevelop-qmake !dev-util/kdevelop-qmljs !dev-util/kdevplatform !<kde-apps/kapptemplate-16.04.0 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+REQUIRED_USE=test? ( welcomepage )
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/kdevelop/5.2.3/src/kdevelop-5.2.3.tar.xz
+_eclasses_=cmake-utils	49cd471f02483798c5068698836b7429	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8f067043bfd6d7e91030d9b9e2f63fa9
diff --git a/metadata/md5-cache/dev-util/kdevelop-php-5.2.3 b/metadata/md5-cache/dev-util/kdevelop-php-5.2.3
new file mode 100644
index 000000000000..db0f33d83f67
--- /dev/null
+++ b/metadata/md5-cache/dev-util/kdevelop-php-5.2.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kcmutils-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kitemmodels-5.43.0:5 >=kde-frameworks/ktexteditor-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-frameworks/threadweaver-5.43.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-util/kdevelop-pg-qt:5 dev-util/kdevelop:5 test? ( dev-util/kdevelop:5[test] ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 handbook? ( >=kde-frameworks/kdoctools-5.43.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=PHP plugin for KDevelop
+EAPI=6
+HOMEPAGE=https://www.kdevelop.org/
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 LGPL-2
+RDEPEND=>=kde-frameworks/karchive-5.43.0:5 >=kde-frameworks/kcmutils-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kconfigwidgets-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kitemmodels-5.43.0:5 >=kde-frameworks/ktexteditor-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-frameworks/threadweaver-5.43.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-util/kdevelop-pg-qt:5 dev-util/kdevelop:5 !dev-util/kdevelop-php-docs >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/kdevelop/5.2.3/src/kdev-php-5.2.3.tar.xz
+_eclasses_=cmake-utils	49cd471f02483798c5068698836b7429	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6ce77b27b43c46cc23f91793f0dfdd31
diff --git a/metadata/md5-cache/dev-util/kdevelop-python-5.2.3 b/metadata/md5-cache/dev-util/kdevelop-python-5.2.3
new file mode 100644
index 000000000000..51c6b309c06c
--- /dev/null
+++ b/metadata/md5-cache/dev-util/kdevelop-python-5.2.3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kitemmodels-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/ktexteditor-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-frameworks/threadweaver-5.43.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-util/kdevelop:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43.0:5 test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Python plugin for KDevelop
+EAPI=6
+HOMEPAGE=https://www.kdevelop.org/
+IUSE=debug test python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=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(+)?] >=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5 >=kde-frameworks/kcoreaddons-5.43.0:5 >=kde-frameworks/ki18n-5.43.0:5 >=kde-frameworks/kio-5.43.0:5 >=kde-frameworks/kitemmodels-5.43.0:5 >=kde-frameworks/knewstuff-5.43.0:5 >=kde-frameworks/kparts-5.43.0:5 >=kde-frameworks/ktexteditor-5.43.0:5 >=kde-frameworks/kwidgetsaddons-5.43.0:5 >=kde-frameworks/kxmlgui-5.43.0:5 >=kde-frameworks/threadweaver-5.43.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-util/kdevelop:5 dev-python/pycodestyle[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(+)?] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+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 )
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/kdevelop/5.2.3/src/kdev-python-5.2.3.tar.xz
+_eclasses_=cmake-utils	49cd471f02483798c5068698836b7429	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ab0be6239c615956b347922097152790
diff --git a/metadata/md5-cache/dev-util/qstlink2-1.2.3 b/metadata/md5-cache/dev-util/qstlink2-1.2.3
index f9ab7a3d0079..26e8b6f02606 100644
--- a/metadata/md5-cache/dev-util/qstlink2-1.2.3
+++ b/metadata/md5-cache/dev-util/qstlink2-1.2.3
@@ -3,10 +3,10 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 virtual/
 DESCRIPTION=GUI and CLI ST-Link V2(Debugger/Programmer) client
 EAPI=6
 HOMEPAGE=https://github.com/fpoussin/QStlink2/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 virtual/libusb:1
 SLOT=0
 SRC_URI=https://github.com/fpoussin/QStlink2/archive/v1.2.3.tar.gz -> qstlink2-1.2.3.tar.gz https://github.com/fpoussin/QtUsb/archive/v0.2.1.tar.gz -> qtusb-0.2.1.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	fa02994d0beba88681127d93da4411ec	udev	d91cac2c73b94629cad2daea66e0d182
-_md5_=6a095d3de399fa3e5d11357489c1e9c9
+_md5_=d0c4b965e09679ae2e453502c09139e0
diff --git a/metadata/md5-cache/dev-util/radare2-2.6.0 b/metadata/md5-cache/dev-util/radare2-2.6.0
new file mode 100644
index 000000000000..691b66b45602
--- /dev/null
+++ b/metadata/md5-cache/dev-util/radare2-2.6.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install
+DEPEND=dev-libs/capstone:0= ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) virtual/pkgconfig
+DESCRIPTION=unix-like reverse engineering framework and commandline tools
+EAPI=6
+HOMEPAGE=http://www.radare.org
+IUSE=ssl libressl
+KEYWORDS=~amd64 ~x86 ~arm ~arm64
+LICENSE=GPL-2
+RDEPEND=dev-libs/capstone:0= ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
+SLOT=0
+SRC_URI=https://github.com/radare/radare2/archive/2.6.0.tar.gz -> radare2-2.6.0.tar.gz
+_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=30e0ae7494cb68796826b3344e84b5ec
diff --git a/metadata/md5-cache/dev-util/shadowman-2 b/metadata/md5-cache/dev-util/shadowman-2
index defccaa8139a..faa510278665 100644
--- a/metadata/md5-cache/dev-util/shadowman-2
+++ b/metadata/md5-cache/dev-util/shadowman-2
@@ -3,9 +3,9 @@ DEPEND=app-admin/eselect
 DESCRIPTION=Unified compiler shadow link directory updater
 EAPI=6
 HOMEPAGE=https://github.com/mgorny/shadowman
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd
 LICENSE=GPL-2
 RDEPEND=app-admin/eselect
 SLOT=0
 SRC_URI=https://github.com/mgorny/shadowman/archive/v2.tar.gz -> shadowman-2.tar.gz
-_md5_=8947fb263208feab3dd961282609dda1
+_md5_=652d1607cfcacb295936663beec88785
diff --git a/metadata/md5-cache/games-emulation/Manifest.gz b/metadata/md5-cache/games-emulation/Manifest.gz
index 7fd4dfd42248..ad9f3f4b741f 100644
--- a/metadata/md5-cache/games-emulation/Manifest.gz
+++ b/metadata/md5-cache/games-emulation/Manifest.gz
diff --git a/metadata/md5-cache/games-emulation/mastergear-bin-4.2 b/metadata/md5-cache/games-emulation/mastergear-bin-4.3
index ad0e533b285d..526f9db3978e 100644
--- a/metadata/md5-cache/games-emulation/mastergear-bin-4.2
+++ b/metadata/md5-cache/games-emulation/mastergear-bin-4.3
@@ -7,5 +7,5 @@ LICENSE=all-rights-reserved
 RDEPEND=>=sys-libs/glibc-2.15 sys-libs/zlib x11-libs/libX11 x11-libs/libXext || ( media-sound/pulseaudio media-sound/apulse )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://fms.komkon.org/MG/MG42-Ubuntu-x86-bin.tgz
-_md5_=a3792fd25266f91bd855a808ada2c907
+SRC_URI=https://fms.komkon.org/MG/MG43-Ubuntu-x86-bin.tgz
+_md5_=88978a9ec5cff940deb45df4687f192d
diff --git a/metadata/md5-cache/games-simulation/Manifest.gz b/metadata/md5-cache/games-simulation/Manifest.gz
index 40c3dbe9ef3f..3fc2bef60334 100644
--- a/metadata/md5-cache/games-simulation/Manifest.gz
+++ b/metadata/md5-cache/games-simulation/Manifest.gz
diff --git a/metadata/md5-cache/games-simulation/flightgear-2018.1.1 b/metadata/md5-cache/games-simulation/flightgear-2018.1.1
index f5c5c8e6fc04..90e53e5ff3ca 100644
--- a/metadata/md5-cache/games-simulation/flightgear-2018.1.1
+++ b/metadata/md5-cache/games-simulation/flightgear-2018.1.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare pretend test
-DEPEND=dev-db/sqlite:3 >=dev-games/openscenegraph-3.2.0[png] ~dev-games/simgear-2018.1.1[gdal=] media-libs/openal >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 media-sound/gsm sys-libs/zlib virtual/glu x11-libs/libX11 dbus? ( >=sys-apps/dbus-1.6.18-r1 ) gdal? ( >=sci-libs/gdal-2.0.0:0 ) qt5? ( >=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 ) udev? ( virtual/udev ) utils? ( media-libs/freeglut media-libs/freetype:2 media-libs/glew:0 media-libs/libpng:0 virtual/opengl qt5? ( >=dev-qt/qtwebsockets-5.7.1:5 ) ) >=dev-libs/boost-1.44 >=media-libs/plib-1.8.5 utils? ( x11-libs/libXi x11-libs/libXmu ) sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=dev-db/sqlite:3 >=dev-games/openscenegraph-3.2.0[jpeg,png] ~dev-games/simgear-2018.1.1[gdal=] media-libs/openal >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 media-sound/gsm sys-libs/zlib virtual/glu x11-libs/libX11 dbus? ( >=sys-apps/dbus-1.6.18-r1 ) gdal? ( >=sci-libs/gdal-2.0.0:0 ) qt5? ( >=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 ) udev? ( virtual/udev ) utils? ( media-libs/freeglut media-libs/freetype:2 media-libs/glew:0 media-libs/libpng:0 virtual/opengl qt5? ( >=dev-qt/qtwebsockets-5.7.1:5 ) ) >=dev-libs/boost-1.44 >=media-libs/plib-1.8.5 utils? ( x11-libs/libXi x11-libs/libXmu ) sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Open Source Flight Simulator
 EAPI=6
 HOMEPAGE=http://www.flightgear.org/
 IUSE=dbus debug examples gdal openmp qt5 test +udev +utils vim-syntax
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=dev-db/sqlite:3 >=dev-games/openscenegraph-3.2.0[png] ~dev-games/simgear-2018.1.1[gdal=] media-libs/openal >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 media-sound/gsm sys-libs/zlib virtual/glu x11-libs/libX11 dbus? ( >=sys-apps/dbus-1.6.18-r1 ) gdal? ( >=sci-libs/gdal-2.0.0:0 ) qt5? ( >=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 ) udev? ( virtual/udev ) utils? ( media-libs/freeglut media-libs/freetype:2 media-libs/glew:0 media-libs/libpng:0 virtual/opengl qt5? ( >=dev-qt/qtwebsockets-5.7.1:5 ) ) ~games-simulation/flightgear-data-2018.1.1
+RDEPEND=dev-db/sqlite:3 >=dev-games/openscenegraph-3.2.0[jpeg,png] ~dev-games/simgear-2018.1.1[gdal=] media-libs/openal >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 media-sound/gsm sys-libs/zlib virtual/glu x11-libs/libX11 dbus? ( >=sys-apps/dbus-1.6.18-r1 ) gdal? ( >=sci-libs/gdal-2.0.0:0 ) qt5? ( >=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 ) udev? ( virtual/udev ) utils? ( media-libs/freeglut media-libs/freetype:2 media-libs/glew:0 media-libs/libpng:0 virtual/opengl qt5? ( >=dev-qt/qtwebsockets-5.7.1:5 ) ) ~games-simulation/flightgear-data-2018.1.1
 SLOT=0
 SRC_URI=mirror://sourceforge/flightgear/flightgear-2018.1.1.tar.bz2
 _eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	cmake-utils	49cd471f02483798c5068698836b7429	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=38e3d629a3bc734d85e0c2e63502dac5
+_md5_=6e0fd50a2fe96d27c794fc34dadca527
diff --git a/metadata/md5-cache/games-simulation/flightgear-9999 b/metadata/md5-cache/games-simulation/flightgear-9999
index 70e0720a149a..c2c8bf6121cd 100644
--- a/metadata/md5-cache/games-simulation/flightgear-9999
+++ b/metadata/md5-cache/games-simulation/flightgear-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install postinst prepare pretend test unpack
-DEPEND=dev-db/sqlite:3 >=dev-games/openscenegraph-3.2.0[png] ~dev-games/simgear-9999[gdal=] media-libs/openal >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 media-sound/gsm sys-libs/zlib virtual/glu x11-libs/libX11 dbus? ( >=sys-apps/dbus-1.6.18-r1 ) gdal? ( >=sci-libs/gdal-2.0.0:0 ) qt5? ( >=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 ) udev? ( virtual/udev ) utils? ( media-libs/freeglut media-libs/freetype:2 media-libs/glew:0 media-libs/libpng:0 virtual/opengl qt5? ( >=dev-qt/qtwebsockets-5.7.1:5 ) ) >=dev-libs/boost-1.44 >=media-libs/plib-1.8.5 utils? ( x11-libs/libXi x11-libs/libXmu ) sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1
+DEPEND=dev-db/sqlite:3 >=dev-games/openscenegraph-3.2.0[jpeg,png] ~dev-games/simgear-9999[gdal=] media-libs/openal >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 media-sound/gsm sys-libs/zlib virtual/glu x11-libs/libX11 dbus? ( >=sys-apps/dbus-1.6.18-r1 ) gdal? ( >=sci-libs/gdal-2.0.0:0 ) qt5? ( >=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 ) udev? ( virtual/udev ) utils? ( media-libs/freeglut media-libs/freetype:2 media-libs/glew:0 media-libs/libpng:0 virtual/opengl qt5? ( >=dev-qt/qtwebsockets-5.7.1:5 ) ) >=dev-libs/boost-1.44 >=media-libs/plib-1.8.5 utils? ( x11-libs/libXi x11-libs/libXmu ) sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Open Source Flight Simulator
 EAPI=6
 HOMEPAGE=http://www.flightgear.org/
 IUSE=dbus debug examples gdal openmp qt5 test +udev +utils vim-syntax
 LICENSE=GPL-2
-RDEPEND=dev-db/sqlite:3 >=dev-games/openscenegraph-3.2.0[png] ~dev-games/simgear-9999[gdal=] media-libs/openal >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 media-sound/gsm sys-libs/zlib virtual/glu x11-libs/libX11 dbus? ( >=sys-apps/dbus-1.6.18-r1 ) gdal? ( >=sci-libs/gdal-2.0.0:0 ) qt5? ( >=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 ) udev? ( virtual/udev ) utils? ( media-libs/freeglut media-libs/freetype:2 media-libs/glew:0 media-libs/libpng:0 virtual/opengl qt5? ( >=dev-qt/qtwebsockets-5.7.1:5 ) ) ~games-simulation/flightgear-data-9999
+RDEPEND=dev-db/sqlite:3 >=dev-games/openscenegraph-3.2.0[jpeg,png] ~dev-games/simgear-9999[gdal=] media-libs/openal >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 media-sound/gsm sys-libs/zlib virtual/glu x11-libs/libX11 dbus? ( >=sys-apps/dbus-1.6.18-r1 ) gdal? ( >=sci-libs/gdal-2.0.0:0 ) qt5? ( >=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 ) udev? ( virtual/udev ) utils? ( media-libs/freeglut media-libs/freetype:2 media-libs/glew:0 media-libs/libpng:0 virtual/opengl qt5? ( >=dev-qt/qtwebsockets-5.7.1:5 ) ) ~games-simulation/flightgear-data-9999
 SLOT=0
 _eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	cmake-utils	49cd471f02483798c5068698836b7429	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f83dbffe33c5dde04c0340639890f9ca
+_md5_=05a9d8e1182024bb3594b8b29e122bf8
diff --git a/metadata/md5-cache/games-strategy/0ad-0.0.23_alpha b/metadata/md5-cache/games-strategy/0ad-0.0.23_alpha
new file mode 100644
index 000000000000..f02f701899f7
--- /dev/null
+++ b/metadata/md5-cache/games-strategy/0ad-0.0.23_alpha
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst setup test
+DEPEND=dev-libs/boost:= dev-libs/icu:= dev-libs/libsodium dev-libs/libxml2 dev-libs/nspr ~games-strategy/0ad-data-0.0.23_alpha media-libs/libpng:0 media-libs/libsdl2[X,opengl,video] media-libs/libvorbis media-libs/openal net-libs/enet:1.3 net-libs/miniupnpc:= net-misc/curl sys-libs/zlib virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXcursor editor? ( x11-libs/wxGTK:3.0[X,opengl] ) lobby? ( >=net-libs/gloox-1.0.20 ) nvtt? ( media-gfx/nvidia-texture-tools ) || ( >=dev-lang/python-2.7.5-r2:2.7[threads,ssl] ) virtual/pkgconfig test? ( dev-lang/perl ) >=sys-apps/sed-4
+DESCRIPTION=A free, real-time strategy game
+EAPI=6
+HOMEPAGE=https://play0ad.com/
+IUSE=editor +lobby nvtt pch test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 LGPL-2.1 MIT CC-BY-SA-3.0 ZLIB
+RDEPEND=dev-libs/boost:= dev-libs/icu:= dev-libs/libsodium dev-libs/libxml2 dev-libs/nspr ~games-strategy/0ad-data-0.0.23_alpha media-libs/libpng:0 media-libs/libsdl2[X,opengl,video] media-libs/libvorbis media-libs/openal net-libs/enet:1.3 net-libs/miniupnpc:= net-misc/curl sys-libs/zlib virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXcursor editor? ( x11-libs/wxGTK:3.0[X,opengl] ) lobby? ( >=net-libs/gloox-1.0.20 ) nvtt? ( media-gfx/nvidia-texture-tools )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://releases.wildfiregames.com/0ad-0.0.23-alpha-unix-build.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=abc7af71b215f9d7334e907f192555d5
diff --git a/metadata/md5-cache/games-strategy/0ad-data-0.0.23_alpha b/metadata/md5-cache/games-strategy/0ad-data-0.0.23_alpha
new file mode 100644
index 000000000000..7b9579ca0564
--- /dev/null
+++ b/metadata/md5-cache/games-strategy/0ad-data-0.0.23_alpha
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=Data files for 0ad
+EAPI=6
+HOMEPAGE=https://play0ad.com/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 CC-BY-SA-3.0 LPPL-1.3c BitstreamVera
+SLOT=0
+SRC_URI=http://releases.wildfiregames.com/0ad-0.0.23-alpha-unix-data.tar.xz
+_md5_=24409256c806f1dba6c0baf4989b2e64
diff --git a/metadata/md5-cache/games-strategy/Manifest.gz b/metadata/md5-cache/games-strategy/Manifest.gz
index 0a114e49cc9c..8659cd4a067f 100644
--- a/metadata/md5-cache/games-strategy/Manifest.gz
+++ b/metadata/md5-cache/games-strategy/Manifest.gz
diff --git a/metadata/md5-cache/games-strategy/seven-kingdoms-2.14.4 b/metadata/md5-cache/games-strategy/seven-kingdoms-2.14.4
deleted file mode 100644
index d2b85506ce2c..000000000000
--- a/metadata/md5-cache/games-strategy/seven-kingdoms-2.14.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=media-libs/libsdl[X,video] media-libs/openal network? ( media-libs/sdl-net ) !games-strategy/seven-kingdoms-data >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Seven Kingdoms: Ancient Adversaries
-EAPI=5
-HOMEPAGE=http://7kfans.com/
-IUSE=network
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libsdl[X,video] media-libs/openal network? ( media-libs/sdl-net ) !games-strategy/seven-kingdoms-data games-misc/games-envd
-SLOT=0
-SRC_URI=mirror://sourceforge/skfans/7kaa-source-2.14.4.tar.bz2 https://dev.gentoo.org/~pinkbyte/distfiles/7kaa.png
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	games	2bb3ede665927a68ffdb7c41eec7efde	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1b5754b01ca8abdf02cd4f49f93e7658
diff --git a/metadata/md5-cache/kde-apps/Manifest.gz b/metadata/md5-cache/kde-apps/Manifest.gz
index d4f658c5ad1f..861d6671b8b1 100644
--- a/metadata/md5-cache/kde-apps/Manifest.gz
+++ b/metadata/md5-cache/kde-apps/Manifest.gz
diff --git a/metadata/md5-cache/kde-apps/ark-17.12.3 b/metadata/md5-cache/kde-apps/ark-17.12.3
index a4acaf892d31..e7b95c5bca7c 100644
--- a/metadata/md5-cache/kde-apps/ark-17.12.3
+++ b/metadata/md5-cache/kde-apps/ark-17.12.3
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.3/src/ark-17.12.3.tar.xz
 _eclasses_=cmake-utils	49cd471f02483798c5068698836b7429	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f3e9ff62803d404f362df21fe3e14f73
+_md5_=ee9253b597bcf939ff69d2fcaa0d369b
diff --git a/metadata/md5-cache/kde-apps/ark-18.04.1 b/metadata/md5-cache/kde-apps/ark-18.04.1
index 6a754a9d6204..49ffc17ccea1 100644
--- a/metadata/md5-cache/kde-apps/ark-18.04.1
+++ b/metadata/md5-cache/kde-apps/ark-18.04.1
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.1/src/ark-18.04.1.tar.xz
 _eclasses_=cmake-utils	49cd471f02483798c5068698836b7429	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=21740169a02ec651e415725830982aa7
+_md5_=e4d9e7790a7de94a5d1eccb833b3c368
diff --git a/metadata/md5-cache/kde-apps/dolphin-18.04.1 b/metadata/md5-cache/kde-apps/dolphin-18.04.1
index 4a043a39d0ea..34c2a8fbd0d6 100644
--- a/metadata/md5-cache/kde-apps/dolphin-18.04.1
+++ b/metadata/md5-cache/kde-apps/dolphin-18.04.1
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.1/src/dolphin-18.04.1.tar.xz
 _eclasses_=cmake-utils	49cd471f02483798c5068698836b7429	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=69c5b07614cb0863b9d7f2441feb4ae7
+_md5_=745044d641a71b8cd6420866376cc543
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index 5936f5e938af..15f2fec8a9fa 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/mutt-1.10.0 b/metadata/md5-cache/mail-client/mutt-1.10.0
new file mode 100644
index 000000000000..0d20d2d4bf5e
--- /dev/null
+++ b/metadata/md5-cache/mail-client/mutt-1.10.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=app-misc/mime-types berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm ) lmdb? ( dev-db/lmdb:= ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) ssl? ( gnutls? ( >=net-libs/gnutls-1.0.17:= ) !gnutls? ( libressl? ( dev-libs/libressl:= ) !libressl? ( >=dev-libs/openssl-0.9.6:0= ) ) ) nls? ( virtual/libintl ) sasl? ( >=dev-libs/cyrus-sasl-2 ) kerberos? ( virtual/krb5 ) idn? ( net-dns/libidn2 ) gpg? ( >=app-crypt/gpgme-0.9.0:= ) gpgme? ( >=app-crypt/gpgme-0.9.0:= ) notmuch? ( net-mail/notmuch:= ) slang? ( sys-libs/slang ) !slang? ( >=sys-libs/ncurses-5.2:0= ) net-mail/mailbase doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets || ( www-client/lynx www-client/w3m www-client/elinks ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A small but very powerful text-based mail client
+EAPI=6
+HOMEPAGE=http://www.mutt.org/
+IUSE=berkdb crypt debug doc gdbm gnutls gpg gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls nntp notmuch pgp_classic pop qdbm +sasl selinux slang smime smime_classic +smtp +ssl tokyocabinet vanilla prefix
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=app-misc/mime-types berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm ) lmdb? ( dev-db/lmdb:= ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) ssl? ( gnutls? ( >=net-libs/gnutls-1.0.17:= ) !gnutls? ( libressl? ( dev-libs/libressl:= ) !libressl? ( >=dev-libs/openssl-0.9.6:0= ) ) ) nls? ( virtual/libintl ) sasl? ( >=dev-libs/cyrus-sasl-2 ) kerberos? ( virtual/krb5 ) idn? ( net-dns/libidn2 ) gpg? ( >=app-crypt/gpgme-0.9.0:= ) gpgme? ( >=app-crypt/gpgme-0.9.0:= ) notmuch? ( net-mail/notmuch:= ) slang? ( sys-libs/slang ) !slang? ( >=sys-libs/ncurses-5.2:0= ) selinux? ( sec-policy/selinux-mutt ) smime? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) ) smime_classic? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) ) crypt? ( app-crypt/gnupg ) pgp_classic? ( app-crypt/gnupg )
+REQUIRED_USE=hcache? ( || ( berkdb gdbm lmdb qdbm tokyocabinet ) ) imap? ( ssl ) pop? ( ssl ) nntp? ( ssl ) smime? ( ssl !gnutls ) smime_classic? ( ssl !gnutls ) smtp? ( ssl sasl ) sasl? ( || ( imap pop smtp nntp ) ) kerberos? ( || ( imap pop smtp nntp ) )
+SLOT=0
+SRC_URI=ftp://ftp.mutt.org/pub/mutt/mutt-1.10.0.tar.gz https://bitbucket.org/mutt/mutt/downloads/mutt-1.10.0.tar.gz https://dev.gentoo.org/~grobian/distfiles/mutt-gentoo-1.10.0-patches-r0.tar.xz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=68045a47e6722a1f524d982892dcf32a
diff --git a/metadata/md5-cache/mail-client/mutt-1.9.4-r1 b/metadata/md5-cache/mail-client/mutt-1.9.4-r1
index 67395816f902..700631af060f 100644
--- a/metadata/md5-cache/mail-client/mutt-1.9.4-r1
+++ b/metadata/md5-cache/mail-client/mutt-1.9.4-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A small but very powerful text-based mail client
 EAPI=6
 HOMEPAGE=http://www.mutt.org/
 IUSE=berkdb crypt debug doc gdbm gnutls gpg gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls nntp notmuch pgp_classic pop qdbm +sasl selinux slang smime smime_classic +smtp +ssl tokyocabinet vanilla prefix
-KEYWORDS=alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=app-misc/mime-types berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm ) lmdb? ( dev-db/lmdb:= ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) ssl? ( gnutls? ( >=net-libs/gnutls-1.0.17:= ) !gnutls? ( libressl? ( dev-libs/libressl:= ) !libressl? ( >=dev-libs/openssl-0.9.6:0= ) ) ) nls? ( virtual/libintl ) sasl? ( >=dev-libs/cyrus-sasl-2 ) kerberos? ( virtual/krb5 ) idn? ( net-dns/libidn ) gpg? ( >=app-crypt/gpgme-0.9.0:= ) gpgme? ( >=app-crypt/gpgme-0.9.0:= ) notmuch? ( net-mail/notmuch:= ) slang? ( sys-libs/slang ) !slang? ( >=sys-libs/ncurses-5.2:0= ) selinux? ( sec-policy/selinux-mutt ) smime? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) ) smime_classic? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) ) crypt? ( app-crypt/gnupg ) pgp_classic? ( app-crypt/gnupg )
 REQUIRED_USE=hcache? ( || ( berkdb gdbm lmdb qdbm tokyocabinet ) ) imap? ( ssl ) pop? ( ssl ) nntp? ( ssl ) smime? ( ssl !gnutls ) smime_classic? ( ssl !gnutls ) smtp? ( ssl ) sasl? ( || ( imap pop smtp nntp ) ) kerberos? ( || ( imap pop smtp nntp ) )
 SLOT=0
 SRC_URI=ftp://ftp.mutt.org/pub/mutt/mutt-1.9.4.tar.gz https://bitbucket.org/mutt/mutt/downloads/mutt-1.9.4.tar.gz https://dev.gentoo.org/~grobian/distfiles/mutt-gentoo-1.9.4-patches-r1.tar.xz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7f690d28fa0eb0258ed78a626fc7bfb8
+_md5_=8166a76cb3d247dcee86b5b5d8e30e59
diff --git a/metadata/md5-cache/mail-client/thunderbird-52.8.0 b/metadata/md5-cache/mail-client/thunderbird-52.8.0
new file mode 100644
index 000000000000..a8aeb59cf922
--- /dev/null
+++ b/metadata/md5-cache/mail-client/thunderbird-52.8.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
+DEPEND=rust? ( dev-lang/rust ) amd64? ( >=dev-lang/yasm-1.1 virtual/opengl ) x86? ( >=dev-lang/yasm-1.1 virtual/opengl ) virtual/pkgconfig || ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,sqlite,ssl,threads] ) app-arch/zip app-arch/unzip >=sys-devel/binutils-2.16.1 sys-apps/findutils pulseaudio? ( media-sound/pulseaudio ) >=app-text/hunspell-1.2:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.25:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10 virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-cairo? ( >=x11-libs/cairo-1.12[X,xcb] >=x11-libs/pixman-0.19.2 ) system-icu? ( >=dev-libs/icu-58.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.17.0:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.3.3:0= >=media-gfx/graphite2-1.3.8 ) !gtk2? ( >=x11-libs/gtk+-3.4.0:3 ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 app-arch/unzip >=sys-apps/sed-4
+DESCRIPTION=Thunderbird Mail Client
+EAPI=6
+HOMEPAGE=http://www.mozilla.com/en-US/thunderbird/
+IUSE=bindist crypt hardened ldap lightning +minimal mozdom rust selinux custom-cflags custom-optimization dbus debug +jemalloc neon pulseaudio selinux startup-notification system-cairo system-harfbuzz system-icu system-jpeg system-libevent system-sqlite system-libvpx gtk2 wifi l10n_ar l10n_ast l10n_be l10n_bg l10n_bn-BD l10n_br l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_el l10n_en-GB l10n_es-AR l10n_es-ES l10n_et l10n_eu l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_ko l10n_lt l10n_nb l10n_nl l10n_nn l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_ta-LK l10n_tr l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW
+KEYWORDS=~alpha amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=>=dev-libs/nss-3.28.3 >=dev-libs/nspr-4.13.1 selinux? ( sec-policy/selinux-thunderbird ) crypt? ( >=x11-plugins/enigmail-2.0.5 ) >=app-text/hunspell-1.2:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.25:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10 virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-cairo? ( >=x11-libs/cairo-1.12[X,xcb] >=x11-libs/pixman-0.19.2 ) system-icu? ( >=dev-libs/icu-58.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.17.0:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.3.3:0= >=media-gfx/graphite2-1.3.8 ) !gtk2? ( >=x11-libs/gtk+-3.4.0:3 ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) selinux? ( sec-policy/selinux-mozilla )
+RESTRICT=!bindist? ( bindist )
+SLOT=0
+SRC_URI=l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/ar.xpi -> thunderbird-52.8.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/ast.xpi -> thunderbird-52.8.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/be.xpi -> thunderbird-52.8.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/bg.xpi -> thunderbird-52.8.0-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/bn-BD.xpi -> thunderbird-52.8.0-bn-BD.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/br.xpi -> thunderbird-52.8.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/ca.xpi -> thunderbird-52.8.0-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/cs.xpi -> thunderbird-52.8.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/cy.xpi -> thunderbird-52.8.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/da.xpi -> thunderbird-52.8.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/de.xpi -> thunderbird-52.8.0-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/el.xpi -> thunderbird-52.8.0-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/en-GB.xpi -> thunderbird-52.8.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/es-AR.xpi -> thunderbird-52.8.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/es-ES.xpi -> thunderbird-52.8.0-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/et.xpi -> thunderbird-52.8.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/eu.xpi -> thunderbird-52.8.0-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/fi.xpi -> thunderbird-52.8.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/fr.xpi -> thunderbird-52.8.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/fy-NL.xpi -> thunderbird-52.8.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/ga-IE.xpi -> thunderbird-52.8.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/gd.xpi -> thunderbird-52.8.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/gl.xpi -> thunderbird-52.8.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/he.xpi -> thunderbird-52.8.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/hr.xpi -> thunderbird-52.8.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/hsb.xpi -> thunderbird-52.8.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/hu.xpi -> thunderbird-52.8.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/hy-AM.xpi -> thunderbird-52.8.0-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/id.xpi -> thunderbird-52.8.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/is.xpi -> thunderbird-52.8.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/it.xpi -> thunderbird-52.8.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/ja.xpi -> thunderbird-52.8.0-ja.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/ko.xpi -> thunderbird-52.8.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/lt.xpi -> thunderbird-52.8.0-lt.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/nb-NO.xpi -> thunderbird-52.8.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/nl.xpi -> thunderbird-52.8.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/nn-NO.xpi -> thunderbird-52.8.0-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/pa-IN.xpi -> thunderbird-52.8.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/pl.xpi -> thunderbird-52.8.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/pt-BR.xpi -> thunderbird-52.8.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/pt-PT.xpi -> thunderbird-52.8.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/rm.xpi -> thunderbird-52.8.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/ro.xpi -> thunderbird-52.8.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/ru.xpi -> thunderbird-52.8.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/si.xpi -> thunderbird-52.8.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/sk.xpi -> thunderbird-52.8.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/sl.xpi -> thunderbird-52.8.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/sq.xpi -> thunderbird-52.8.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/sr.xpi -> thunderbird-52.8.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/sv-SE.xpi -> thunderbird-52.8.0-sv-SE.xpi ) l10n_ta-LK? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/ta-LK.xpi -> thunderbird-52.8.0-ta-LK.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/tr.xpi -> thunderbird-52.8.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/uk.xpi -> thunderbird-52.8.0-uk.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/vi.xpi -> thunderbird-52.8.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/zh-CN.xpi -> thunderbird-52.8.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/zh-TW.xpi -> thunderbird-52.8.0-zh-TW.xpi ) https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/source/thunderbird-52.8.0.source.tar.xz https://dev.gentoo.org/~axs/distfiles/lightning-5.4.8.tar.xz lightning? ( https://dev.gentoo.org/~axs/distfiles/gdata-provider-3.3.tar.xz ) https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-52.5-patches-02.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-52.5-patches-02.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-52.5-patches-02.tar.xz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	mozconfig-v6.52	aeba761913d03fc45f4d6ae2b89165ca	mozcoreconf-v5	602c3c0a642bafeabb149c49a6df941f	mozextension	89a560beaf496e7cb89f3d79d4aef09e	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=49891286f0240925ade5c6db5acbe84f
diff --git a/metadata/md5-cache/mail-client/thunderbird-bin-52.7.0 b/metadata/md5-cache/mail-client/thunderbird-bin-52.7.0
deleted file mode 100644
index 5982e1a167fc..000000000000
--- a/metadata/md5-cache/mail-client/thunderbird-bin-52.7.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=app-arch/unzip >=sys-apps/sed-4 app-arch/unzip
-DESCRIPTION=Thunderbird Mail Client
-EAPI=6
-HOMEPAGE=http://www.mozilla.com/thunderbird
-IUSE=+crashreporter +ffmpeg +pulseaudio selinux l10n_ar l10n_ast l10n_be l10n_bg l10n_bn-BD l10n_br l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_el l10n_en-GB l10n_es-AR l10n_es-ES l10n_et l10n_eu l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_ko l10n_lt l10n_nb l10n_nl l10n_nn l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_ta-LK l10n_tr l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW
-KEYWORDS=-* amd64 x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=virtual/freedesktop-icon-theme dev-libs/atk >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 >=dev-libs/glib-2.26:2 >=media-libs/alsa-lib-1.0.16 media-libs/fontconfig >=media-libs/freetype-2.4.10:2 >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXrender x11-libs/libXt >=x11-libs/pango-1.22.0 pulseaudio? ( !<media-sound/apulse-0.1.9 || ( media-sound/pulseaudio media-sound/apulse ) ) ffmpeg? ( media-video/ffmpeg ) crashreporter? ( net-misc/curl ) selinux? ( sec-policy/selinux-thunderbird )
-RESTRICT=strip mirror
-SLOT=0
-SRC_URI=l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/ar.xpi -> thunderbird-52.7.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/ast.xpi -> thunderbird-52.7.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/be.xpi -> thunderbird-52.7.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/bg.xpi -> thunderbird-52.7.0-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/bn-BD.xpi -> thunderbird-52.7.0-bn-BD.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/br.xpi -> thunderbird-52.7.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/ca.xpi -> thunderbird-52.7.0-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/cs.xpi -> thunderbird-52.7.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/cy.xpi -> thunderbird-52.7.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/da.xpi -> thunderbird-52.7.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/de.xpi -> thunderbird-52.7.0-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/el.xpi -> thunderbird-52.7.0-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/en-GB.xpi -> thunderbird-52.7.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/es-AR.xpi -> thunderbird-52.7.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/es-ES.xpi -> thunderbird-52.7.0-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/et.xpi -> thunderbird-52.7.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/eu.xpi -> thunderbird-52.7.0-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/fi.xpi -> thunderbird-52.7.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/fr.xpi -> thunderbird-52.7.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/fy-NL.xpi -> thunderbird-52.7.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/ga-IE.xpi -> thunderbird-52.7.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/gd.xpi -> thunderbird-52.7.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/gl.xpi -> thunderbird-52.7.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/he.xpi -> thunderbird-52.7.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/hr.xpi -> thunderbird-52.7.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/hsb.xpi -> thunderbird-52.7.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/hu.xpi -> thunderbird-52.7.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/hy-AM.xpi -> thunderbird-52.7.0-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/id.xpi -> thunderbird-52.7.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/is.xpi -> thunderbird-52.7.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/it.xpi -> thunderbird-52.7.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/ja.xpi -> thunderbird-52.7.0-ja.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/ko.xpi -> thunderbird-52.7.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/lt.xpi -> thunderbird-52.7.0-lt.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/nb-NO.xpi -> thunderbird-52.7.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/nl.xpi -> thunderbird-52.7.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/nn-NO.xpi -> thunderbird-52.7.0-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/pa-IN.xpi -> thunderbird-52.7.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/pl.xpi -> thunderbird-52.7.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/pt-BR.xpi -> thunderbird-52.7.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/pt-PT.xpi -> thunderbird-52.7.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/rm.xpi -> thunderbird-52.7.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/ro.xpi -> thunderbird-52.7.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/ru.xpi -> thunderbird-52.7.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/si.xpi -> thunderbird-52.7.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/sk.xpi -> thunderbird-52.7.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/sl.xpi -> thunderbird-52.7.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/sq.xpi -> thunderbird-52.7.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/sr.xpi -> thunderbird-52.7.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/sv-SE.xpi -> thunderbird-52.7.0-sv-SE.xpi ) l10n_ta-LK? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/ta-LK.xpi -> thunderbird-52.7.0-ta-LK.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/tr.xpi -> thunderbird-52.7.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/uk.xpi -> thunderbird-52.7.0-uk.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/vi.xpi -> thunderbird-52.7.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/zh-CN.xpi -> thunderbird-52.7.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/xpi/zh-TW.xpi -> thunderbird-52.7.0-zh-TW.xpi ) amd64? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/en-US/thunderbird-52.7.0.tar.bz2 -> thunderbird-bin_x86_64-52.7.0.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/en-US/thunderbird-52.7.0.tar.bz2 -> thunderbird-bin_i686-52.7.0.tar.bz2 ) https://dev.gentoo.org/~axs/distfiles/lightning-5.4.5.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	mozextension	89a560beaf496e7cb89f3d79d4aef09e	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8f32082f3f1980fa88531128c9afc9a6
diff --git a/metadata/md5-cache/mail-client/thunderbird-bin-52.8.0 b/metadata/md5-cache/mail-client/thunderbird-bin-52.8.0
new file mode 100644
index 000000000000..d4c04c92eea5
--- /dev/null
+++ b/metadata/md5-cache/mail-client/thunderbird-bin-52.8.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst unpack
+DEPEND=app-arch/unzip >=sys-apps/sed-4 app-arch/unzip
+DESCRIPTION=Thunderbird Mail Client
+EAPI=6
+HOMEPAGE=http://www.mozilla.com/thunderbird
+IUSE=+crashreporter +ffmpeg +pulseaudio selinux l10n_ar l10n_ast l10n_be l10n_bg l10n_bn-BD l10n_br l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_el l10n_en-GB l10n_es-AR l10n_es-ES l10n_et l10n_eu l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_ko l10n_lt l10n_nb l10n_nl l10n_nn l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_ta-LK l10n_tr l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW
+KEYWORDS=-* amd64 x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=virtual/freedesktop-icon-theme dev-libs/atk >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 >=dev-libs/glib-2.26:2 >=media-libs/alsa-lib-1.0.16 media-libs/fontconfig >=media-libs/freetype-2.4.10:2 >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXrender x11-libs/libXt >=x11-libs/pango-1.22.0 pulseaudio? ( !<media-sound/apulse-0.1.9 || ( media-sound/pulseaudio media-sound/apulse ) ) ffmpeg? ( media-video/ffmpeg ) crashreporter? ( net-misc/curl ) selinux? ( sec-policy/selinux-thunderbird )
+RESTRICT=strip mirror
+SLOT=0
+SRC_URI=l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/ar.xpi -> thunderbird-52.8.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/ast.xpi -> thunderbird-52.8.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/be.xpi -> thunderbird-52.8.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/bg.xpi -> thunderbird-52.8.0-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/bn-BD.xpi -> thunderbird-52.8.0-bn-BD.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/br.xpi -> thunderbird-52.8.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/ca.xpi -> thunderbird-52.8.0-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/cs.xpi -> thunderbird-52.8.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/cy.xpi -> thunderbird-52.8.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/da.xpi -> thunderbird-52.8.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/de.xpi -> thunderbird-52.8.0-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/el.xpi -> thunderbird-52.8.0-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/en-GB.xpi -> thunderbird-52.8.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/es-AR.xpi -> thunderbird-52.8.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/es-ES.xpi -> thunderbird-52.8.0-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/et.xpi -> thunderbird-52.8.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/eu.xpi -> thunderbird-52.8.0-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/fi.xpi -> thunderbird-52.8.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/fr.xpi -> thunderbird-52.8.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/fy-NL.xpi -> thunderbird-52.8.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/ga-IE.xpi -> thunderbird-52.8.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/gd.xpi -> thunderbird-52.8.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/gl.xpi -> thunderbird-52.8.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/he.xpi -> thunderbird-52.8.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/hr.xpi -> thunderbird-52.8.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/hsb.xpi -> thunderbird-52.8.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/hu.xpi -> thunderbird-52.8.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/hy-AM.xpi -> thunderbird-52.8.0-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/id.xpi -> thunderbird-52.8.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/is.xpi -> thunderbird-52.8.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/it.xpi -> thunderbird-52.8.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/ja.xpi -> thunderbird-52.8.0-ja.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/ko.xpi -> thunderbird-52.8.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/lt.xpi -> thunderbird-52.8.0-lt.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/nb-NO.xpi -> thunderbird-52.8.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/nl.xpi -> thunderbird-52.8.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/nn-NO.xpi -> thunderbird-52.8.0-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/pa-IN.xpi -> thunderbird-52.8.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/pl.xpi -> thunderbird-52.8.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/pt-BR.xpi -> thunderbird-52.8.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/pt-PT.xpi -> thunderbird-52.8.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/rm.xpi -> thunderbird-52.8.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/ro.xpi -> thunderbird-52.8.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/ru.xpi -> thunderbird-52.8.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/si.xpi -> thunderbird-52.8.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/sk.xpi -> thunderbird-52.8.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/sl.xpi -> thunderbird-52.8.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/sq.xpi -> thunderbird-52.8.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/sr.xpi -> thunderbird-52.8.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/sv-SE.xpi -> thunderbird-52.8.0-sv-SE.xpi ) l10n_ta-LK? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/ta-LK.xpi -> thunderbird-52.8.0-ta-LK.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/tr.xpi -> thunderbird-52.8.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/uk.xpi -> thunderbird-52.8.0-uk.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/vi.xpi -> thunderbird-52.8.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/zh-CN.xpi -> thunderbird-52.8.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/xpi/zh-TW.xpi -> thunderbird-52.8.0-zh-TW.xpi ) amd64? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/en-US/thunderbird-52.8.0.tar.bz2 -> thunderbird-bin_x86_64-52.8.0.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/en-US/thunderbird-52.8.0.tar.bz2 -> thunderbird-bin_i686-52.8.0.tar.bz2 ) https://dev.gentoo.org/~axs/distfiles/lightning-5.4.8.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	mozextension	89a560beaf496e7cb89f3d79d4aef09e	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=10b3bd2246a7f00420109a51330c8f3d
diff --git a/metadata/md5-cache/mail-filter/Manifest.gz b/metadata/md5-cache/mail-filter/Manifest.gz
index c284a1c0b147..3d226a1c156d 100644
--- a/metadata/md5-cache/mail-filter/Manifest.gz
+++ b/metadata/md5-cache/mail-filter/Manifest.gz
diff --git a/metadata/md5-cache/mail-filter/rspamd-1.7.5 b/metadata/md5-cache/mail-filter/rspamd-1.7.5
new file mode 100644
index 000000000000..024453e0ffc4
--- /dev/null
+++ b/metadata/md5-cache/mail-filter/rspamd-1.7.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-util/ragel !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) fann? ( sci-mathematics/fann ) pcre2? ( dev-libs/libpcre2[jit=] ) !pcre2? ( dev-libs/libpcre[jit=] ) jit? ( dev-lang/luajit:2 ) jemalloc? ( dev-libs/jemalloc ) dev-libs/libevent dev-db/sqlite:3 dev-libs/glib:2 <dev-util/ragel-7.0 sys-apps/file gd? ( media-libs/gd[jpeg] ) dev-libs/icu cpu_flags_x86_ssse3? ( dev-libs/hyperscan ) sys-devel/make >=dev-util/cmake-3.9.6 virtual/pkgconfig
+DESCRIPTION=Rapid spam filtering system
+EAPI=6
+HOMEPAGE=https://github.com/vstakhov/rspamd
+IUSE=cpu_flags_x86_ssse3 fann gd jemalloc +jit libressl pcre2 +torch
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=!libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) fann? ( sci-mathematics/fann ) pcre2? ( dev-libs/libpcre2[jit=] ) !pcre2? ( dev-libs/libpcre[jit=] ) jit? ( dev-lang/luajit:2 ) jemalloc? ( dev-libs/jemalloc ) dev-libs/libevent dev-db/sqlite:3 dev-libs/glib:2 <dev-util/ragel-7.0 sys-apps/file gd? ( media-libs/gd[jpeg] ) dev-libs/icu cpu_flags_x86_ssse3? ( dev-libs/hyperscan )
+REQUIRED_USE=torch? ( jit )
+SLOT=0
+SRC_URI=https://github.com/vstakhov/rspamd/archive/1.7.5.tar.gz -> rspamd-1.7.5.tar.gz
+_eclasses_=cmake-utils	49cd471f02483798c5068698836b7429	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=687b126d3e754c4291a5a5e8fd6dcf8e
diff --git a/metadata/md5-cache/mail-filter/rspamd-9999 b/metadata/md5-cache/mail-filter/rspamd-9999
index c1a2f4f8531d..7bfdf9e916d9 100644
--- a/metadata/md5-cache/mail-filter/rspamd-9999
+++ b/metadata/md5-cache/mail-filter/rspamd-9999
@@ -1,11 +1,12 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-util/ragel !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) fann? ( sci-mathematics/fann ) pcre2? ( dev-libs/libpcre2[jit=] ) !pcre2? ( dev-libs/libpcre[jit=] ) jit? ( dev-lang/luajit:2 ) jemalloc? ( dev-libs/jemalloc ) dev-libs/libevent dev-db/sqlite:3 dev-libs/glib:2 dev-util/ragel sys-apps/file gd? ( media-libs/gd[jpeg] ) dev-libs/icu sys-devel/make >=dev-util/cmake-3.9.6 virtual/pkgconfig >=dev-vcs/git-1.8.2.1
+DEPEND=dev-util/ragel !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) fann? ( sci-mathematics/fann ) pcre2? ( dev-libs/libpcre2[jit=] ) !pcre2? ( dev-libs/libpcre[jit=] ) jit? ( dev-lang/luajit:2 ) jemalloc? ( dev-libs/jemalloc ) dev-libs/libevent dev-db/sqlite:3 dev-libs/glib:2 <dev-util/ragel-7.0 sys-apps/file gd? ( media-libs/gd[jpeg] ) dev-libs/icu cpu_flags_x86_ssse3? ( dev-libs/hyperscan ) sys-devel/make >=dev-util/cmake-3.9.6 virtual/pkgconfig >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Rapid spam filtering system
-EAPI=5
+EAPI=6
 HOMEPAGE=https://github.com/vstakhov/rspamd
-IUSE=fann +gd jemalloc +jit libressl pcre2
+IUSE=cpu_flags_x86_ssse3 fann gd jemalloc +jit libressl pcre2 +torch
 LICENSE=Apache-2.0
-RDEPEND=!libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) fann? ( sci-mathematics/fann ) pcre2? ( dev-libs/libpcre2[jit=] ) !pcre2? ( dev-libs/libpcre[jit=] ) jit? ( dev-lang/luajit:2 ) jemalloc? ( dev-libs/jemalloc ) dev-libs/libevent dev-db/sqlite:3 dev-libs/glib:2 dev-util/ragel sys-apps/file gd? ( media-libs/gd[jpeg] ) dev-libs/icu
+RDEPEND=!libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) fann? ( sci-mathematics/fann ) pcre2? ( dev-libs/libpcre2[jit=] ) !pcre2? ( dev-libs/libpcre[jit=] ) jit? ( dev-lang/luajit:2 ) jemalloc? ( dev-libs/jemalloc ) dev-libs/libevent dev-db/sqlite:3 dev-libs/glib:2 <dev-util/ragel-7.0 sys-apps/file gd? ( media-libs/gd[jpeg] ) dev-libs/icu cpu_flags_x86_ssse3? ( dev-libs/hyperscan )
+REQUIRED_USE=torch? ( jit )
 SLOT=0
 _eclasses_=cmake-utils	49cd471f02483798c5068698836b7429	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b5be4adcdaa3a93123cdba2f6a30bc45
+_md5_=687b126d3e754c4291a5a5e8fd6dcf8e
diff --git a/metadata/md5-cache/media-fonts/Humor-Sans-1.0 b/metadata/md5-cache/media-fonts/Humor-Sans-1.0-r1
index 26b19883870b..f7ec017bc604 100644
--- a/metadata/md5-cache/media-fonts/Humor-Sans-1.0
+++ b/metadata/md5-cache/media-fonts/Humor-Sans-1.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=install postinst postrm setup unpack
 DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
 DESCRIPTION=A sanserif typeface in the style of xkcd
-EAPI=5
+EAPI=6
 HOMEPAGE=http://antiyawn.com/uploads/humorsans.html
 IUSE=X
 KEYWORDS=~amd64 ~x86
@@ -9,4 +9,4 @@ LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=http://www.antiyawn.com/uploads/Humor-Sans-1.0.ttf
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	font	82836641e7d4639329d8c195234ad0e3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cad6910d35ebbb9c8b161be6cc6712b9
+_md5_=a94f8d12c3103dee49cfcfd5104db0d1
diff --git a/metadata/md5-cache/media-fonts/Manifest.gz b/metadata/md5-cache/media-fonts/Manifest.gz
index 69252bcd6aaa..821003ccadaf 100644
--- a/metadata/md5-cache/media-fonts/Manifest.gz
+++ b/metadata/md5-cache/media-fonts/Manifest.gz
diff --git a/metadata/md5-cache/media-fonts/alegreya-sans-1.0.2 b/metadata/md5-cache/media-fonts/alegreya-sans-2.008
index 84ef610259d3..628c8cd78ed9 100644
--- a/metadata/md5-cache/media-fonts/alegreya-sans-1.0.2
+++ b/metadata/md5-cache/media-fonts/alegreya-sans-2.008
@@ -1,12 +1,12 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
 DESCRIPTION=A humanist sans-serif typeface with a calligraphic, dynamic feeling
-EAPI=5
-HOMEPAGE=http://www.huertatipografica.com/fonts/alegreya-sans-ht
+EAPI=6
+HOMEPAGE=https://www.huertatipografica.com/en/fonts/alegreya-sans-ht
 IUSE=X
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=OFL-1.1
 SLOT=0
-SRC_URI=http://www.huertatipografica.com/free_download/23 -> alegreya-sans-1.0.2.zip
+SRC_URI=https://github.com/huertatipografica/Alegreya-Sans/archive/v2.008.tar.gz -> alegreya-sans-2.008.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	font	82836641e7d4639329d8c195234ad0e3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1489d333e9beee8e85750c112011710c
+_md5_=ff7b3936b471bb7bc254298051cbd2b6
diff --git a/metadata/md5-cache/media-fonts/fira-code-1.205 b/metadata/md5-cache/media-fonts/fira-code-1.205
index 54e3b13bf538..1cb6f2c9b46e 100644
--- a/metadata/md5-cache/media-fonts/fira-code-1.205
+++ b/metadata/md5-cache/media-fonts/fira-code-1.205
@@ -4,9 +4,9 @@ DESCRIPTION=Monospaced font with programming ligatures
 EAPI=6
 HOMEPAGE=https://github.com/tonsky/FiraCode
 IUSE=X
-KEYWORDS=~amd64 ~arm arm64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~x86
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=https://github.com/tonsky/FiraCode/archive/1.205.tar.gz -> fira-code-1.205.tar.gz https://github.com/tonsky/FiraCode/files/412440/FiraCode-Regular-Symbol.zip
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	font	82836641e7d4639329d8c195234ad0e3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fe7e120e7eca73ac3e8c767d950acf3b
+_md5_=a66e33292daf5768a4fbf785c175b170
diff --git a/metadata/md5-cache/media-fonts/inconsolata-hellenic-1.19 b/metadata/md5-cache/media-fonts/inconsolata-hellenic-1.19-r1
index 137f788d3855..69e4d29df9b6 100644
--- a/metadata/md5-cache/media-fonts/inconsolata-hellenic-1.19
+++ b/metadata/md5-cache/media-fonts/inconsolata-hellenic-1.19-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=install postinst postrm setup
 DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings )
 DESCRIPTION=Hellenisation of the wonderful, monospace, open/free font Inconsolata
-EAPI=5
+EAPI=6
 HOMEPAGE=http://www.cosmix.org/software/
 IUSE=X
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
@@ -9,4 +9,4 @@ LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=http://www.cosmix.org/software/files/InconsolataHellenic.zip -> inconsolata-hellenic-1.19.zip
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	font	82836641e7d4639329d8c195234ad0e3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1d16740f67c127327cae4ccb9da51a19
+_md5_=823a40f1abb3604d16ef3edd8995fa4d
diff --git a/metadata/md5-cache/media-fonts/lklug-0.6 b/metadata/md5-cache/media-fonts/lklug-0.6
deleted file mode 100644
index 7fb7c986d57d..000000000000
--- a/metadata/md5-cache/media-fonts/lklug-0.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
-DESCRIPTION=Sinhala font
-EAPI=4
-HOMEPAGE=http://sinhala.sourceforge.net
-IUSE=X
-KEYWORDS=amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://sinhala.sourceforge.net/files/ttf-sinhala-lklug-0.6.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	font	82836641e7d4639329d8c195234ad0e3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fd608ea6529a83253bbe8661aea5b1ec
diff --git a/metadata/md5-cache/media-fonts/lklug-0.6-r1 b/metadata/md5-cache/media-fonts/lklug-0.6-r1
index 45ce61c7ab19..34079c521eea 100644
--- a/metadata/md5-cache/media-fonts/lklug-0.6-r1
+++ b/metadata/md5-cache/media-fonts/lklug-0.6-r1
@@ -4,9 +4,9 @@ DESCRIPTION=Sinhala font
 EAPI=6
 HOMEPAGE=http://sinhala.sourceforge.net
 IUSE=X
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://sinhala.sourceforge.net/files/ttf-sinhala-lklug-0.6.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	font	82836641e7d4639329d8c195234ad0e3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0926081de4733810f9cb60258f4cc298
+_md5_=6d31b686b6d20f59156ebd679652bef7
diff --git a/metadata/md5-cache/media-fonts/terminus-font-4.39-r1 b/metadata/md5-cache/media-fonts/terminus-font-4.39-r1
deleted file mode 100644
index 17b632ae19c3..000000000000
--- a/metadata/md5-cache/media-fonts/terminus-font-4.39-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=app-arch/gzip dev-lang/perl virtual/awk pcf? ( x11-apps/bdftopcf ) X? ( x11-apps/mkfontdir media-fonts/encodings )
-DESCRIPTION=A clean fixed font for the console and X11
-EAPI=5
-HOMEPAGE=http://terminus-font.sourceforge.net/
-IUSE=a-like-o +center-tilde distinct-l +pcf +pcf-unicode-only +psf quote raw-font-data ru-dv +ru-g ru-i ru-k X
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=OFL-1.1 GPL-2
-REQUIRED_USE=X? ( pcf )
-SLOT=0
-SRC_URI=mirror://sourceforge/terminus-font/terminus-font-4.39/terminus-font-4.39.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	font	82836641e7d4639329d8c195234ad0e3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=34963166848f42e27158283c9ce5c5f0
diff --git a/metadata/md5-cache/media-fonts/terminus-font-4.46 b/metadata/md5-cache/media-fonts/terminus-font-4.46
index ec6c92ca104b..5f9331d9c7dd 100644
--- a/metadata/md5-cache/media-fonts/terminus-font-4.46
+++ b/metadata/md5-cache/media-fonts/terminus-font-4.46
@@ -4,10 +4,10 @@ DESCRIPTION=A clean fixed font for the console and X11
 EAPI=6
 HOMEPAGE=http://terminus-font.sourceforge.net/
 IUSE=a-like-o +center-tilde distinct-l +pcf +pcf-unicode-only +psf quote ru-dv +ru-g ru-i ru-k X
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=OFL-1.1 GPL-2
 REQUIRED_USE=X? ( pcf )
 SLOT=0
 SRC_URI=mirror://sourceforge/terminus-font/terminus-font-4.46/terminus-font-4.46.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	font	82836641e7d4639329d8c195234ad0e3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4b74cc4309ed2c232a1309f13a158a35
+_md5_=cdb85a0770fcb9d83afc73435fb19a51
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index a53b473a16c9..294334d22281 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/inkscape-0.92.3 b/metadata/md5-cache/media-gfx/inkscape-0.92.3
index bb3b92fe534f..8c375dbecfb4 100644
--- a/metadata/md5-cache/media-gfx/inkscape-0.92.3
+++ b/metadata/md5-cache/media-gfx/inkscape-0.92.3
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://inkscape.global.ssl.fastly.net/media/resources/file/inkscape-0.92.3.tar.bz2
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=611f6fbba77649d9715ab3edbf321fa8
+_md5_=9d4f738583448f9e94b0514af81a7c61
diff --git a/metadata/md5-cache/media-gfx/shotwell-0.29.2 b/metadata/md5-cache/media-gfx/shotwell-0.29.2
new file mode 100644
index 000000000000..fc4754c1bfa7
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/shotwell-0.29.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=app-crypt/gcr-3[gtk] >=dev-db/sqlite-3.5.9:3 >=dev-libs/glib-2.40.0:2 >=dev-libs/json-glib-0.7.6 >=dev-libs/libgee-0.8.5:0.8 >=dev-libs/libxml2-2.6.32:2 gnome-base/dconf >=media-libs/gexiv2-0.10.4 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-libs/gstreamer:1.0 media-libs/lcms:2 >=media-libs/libexif-0.6.16:= >=media-libs/libgphoto2-2.5:= >=media-libs/libraw-0.13.2:= media-plugins/gst-plugins-gdkpixbuf:1.0 >=net-libs/libsoup-2.42.0:2.4 net-libs/webkit-gtk:4 virtual/libgudev:=[introspection] >=x11-libs/gtk+-3.14.0:3[X] dev-libs/libgdata || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) dev-util/itstool >=sys-devel/gettext-0.19.7 >=sys-devel/m4-1.4.13 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=Open source photo manager for GNOME
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Shotwell
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=app-crypt/gcr-3[gtk] >=dev-db/sqlite-3.5.9:3 >=dev-libs/glib-2.40.0:2 >=dev-libs/json-glib-0.7.6 >=dev-libs/libgee-0.8.5:0.8 >=dev-libs/libxml2-2.6.32:2 gnome-base/dconf >=media-libs/gexiv2-0.10.4 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-libs/gstreamer:1.0 media-libs/lcms:2 >=media-libs/libexif-0.6.16:= >=media-libs/libgphoto2-2.5:= >=media-libs/libraw-0.13.2:= media-plugins/gst-plugins-gdkpixbuf:1.0 >=net-libs/libsoup-2.42.0:2.4 net-libs/webkit-gtk:4 virtual/libgudev:=[introspection] >=x11-libs/gtk+-3.14.0:3[X] dev-libs/libgdata
+SLOT=0
+SRC_URI=mirror://gnome/sources/shotwell/0.29/shotwell-0.29.2.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7e37dddeb80a80e9732a2e803a61cc3c
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index ea0c0b867c1a..e331d797e2b3 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/chromaprint-1.4.3 b/metadata/md5-cache/media-libs/chromaprint-1.4.3
index 5b62c1a6e55d..e0d31e68ae59 100644
--- a/metadata/md5-cache/media-libs/chromaprint-1.4.3
+++ b/metadata/md5-cache/media-libs/chromaprint-1.4.3
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=libav? ( >=media-video/libav-11: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(-)?] ) !libav? ( >=media-video/ffmpeg-2.6: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(-)?] ) test? ( dev-cpp/gtest[abi_x86_32(-)?,abi_x86_64(-)?,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/boost[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=A client-side library that implements a custom algorithm for extracting fingerprints
 EAPI=6
-HOMEPAGE=http://acoustid.org/chromaprint
+HOMEPAGE=https://acoustid.org/chromaprint
 IUSE=libav test tools abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
 LICENSE=LGPL-2.1
@@ -10,4 +10,4 @@ RDEPEND=libav? ( >=media-video/libav-11:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86
 SLOT=0/1
 SRC_URI=https://github.com/acoustid/chromaprint/releases/download/v1.4.3/chromaprint-1.4.3.tar.gz test? ( https://github.com/google/googletest/archive/release-1.8.0.tar.gz -> gtest-1.8.0.tar.gz )
 _eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	49cd471f02483798c5068698836b7429	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6077825a6b89216c4738bc8b0eb91a17
+_md5_=cd59a55ce4b39c9d145210b382b292c3
diff --git a/metadata/md5-cache/media-libs/elles_icc_profiles-20160501.0932-r1 b/metadata/md5-cache/media-libs/elles_icc_profiles-20160501.0932-r1
new file mode 100644
index 000000000000..6ddc17da2c74
--- /dev/null
+++ b/metadata/md5-cache/media-libs/elles_icc_profiles-20160501.0932-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=Elle Stone's well-behaved RGB and grey ICC profiles
+EAPI=7
+HOMEPAGE=http://ninedegreesbelow.com/photography/lcms-make-icc-profiles.html
+KEYWORDS=~amd64
+LICENSE=CC-BY-SA-3.0
+SLOT=0
+SRC_URI=https://github.com/ellelstone/elles_icc_profiles/archive/20160501-0932EST.tar.gz -> elles_icc_profiles-20160501.0932.tar.gz
+_md5_=88f388c9e99665916abc16534edd4180
diff --git a/metadata/md5-cache/media-libs/freetype-2.9.1-r3 b/metadata/md5-cache/media-libs/freetype-2.9.1-r3
index 860d80ba0ecc..a9bb0e9baddd 100644
--- a/metadata/md5-cache/media-libs/freetype-2.9.1-r3
+++ b/metadata/md5-cache/media-libs/freetype-2.9.1-r3
@@ -4,7 +4,7 @@ DESCRIPTION=A high-quality and portable font engine
 EAPI=6
 HOMEPAGE=https://www.freetype.org/
 IUSE=X +adobe-cff bindist bzip2 +cleartype_hinting debug fontforge harfbuzz infinality png static-libs utils doc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~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 ~x86-winnt
 LICENSE=|| ( FTL GPL-2+ )
 PDEPEND=infinality? ( media-libs/fontconfig-infinality )
 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(-)?] bzip2? ( >=app-arch/bzip2-1.0.6-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(-)?] ) harfbuzz? ( >=media-libs/harfbuzz-1.3.0[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(-)?] ) png? ( >=media-libs/libpng-1.2.51: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(-)?] ) utils? ( X? ( >=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/libXau-1.0.7-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
@@ -12,4 +12,4 @@ RESTRICT=!bindist? ( bindist )
 SLOT=2
 SRC_URI=mirror://sourceforge/freetype/freetype-2.9.1.tar.bz2 mirror://nongnu/freetype/freetype-2.9.1.tar.bz2 utils? ( mirror://sourceforge/freetype/ft2demos-2.9.1.tar.bz2 mirror://nongnu/freetype/ft2demos-2.9.1.tar.bz2 ) doc? ( mirror://sourceforge/freetype/freetype-doc-2.9.1.tar.bz2 mirror://nongnu/freetype/freetype-doc-2.9.1.tar.bz2 )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bd3a5a6d088e0c17aa998e7afef43aa5
+_md5_=8a9253dea928de3fc6b0fc2923056574
diff --git a/metadata/md5-cache/media-libs/gexiv2-0.10.8 b/metadata/md5-cache/media-libs/gexiv2-0.10.8
index 06cea1d01eda..df42b7d1ca47 100644
--- a/metadata/md5-cache/media-libs/gexiv2-0.10.8
+++ b/metadata/md5-cache/media-libs/gexiv2-0.10.8
@@ -4,11 +4,11 @@ DESCRIPTION=GObject-based wrapper around the Exiv2 library
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/gexiv2
 IUSE=introspection python static-libs test vala python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-libs/glib-2.26.1:2 >=media-gfx/exiv2-0.21:0= introspection? ( dev-libs/gobject-introspection:= ) vala? ( || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) )
 REQUIRED_USE=python? ( introspection || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 ) ) test? ( python introspection ) vala? ( introspection )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gexiv2/0.10/gexiv2-0.10.8.tar.xz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a353375b1f5d8f2f52fe792d60b5a1cd
+_md5_=6d2f108d998e90cbe5fde44e5bd309ae
diff --git a/metadata/md5-cache/media-libs/gst-plugins-bad-1.12.4 b/metadata/md5-cache/media-libs/gst-plugins-bad-1.12.4
index bdf37b3352ef..de8043f6968a 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-bad-1.12.4
+++ b/metadata/md5-cache/media-libs/gst-plugins-bad-1.12.4
@@ -4,7 +4,7 @@ DESCRIPTION=Less plugins for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=X bzip2 +egl gles2 gtk +introspection +opengl +orc vcd vnc 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 nls test
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.40.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/gstreamer-1.12.4: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(-)?,introspection?] >=media-libs/gst-plugins-base-1.12.4: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(-)?,introspection?] introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) bzip2? ( >=app-arch/bzip2-1.0.6-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(-)?] ) egl? ( >=media-libs/mesa-9.1.6[egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gles2? ( >=media-libs/mesa-9.1.6[gles2,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=media-libs/mesa-9.1.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(-)?] virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-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(-)?] ) wayland? ( >=dev-libs/wayland-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(-)?] >=x11-libs/libdrm-2.4.55[abi_x86_32(-)?,abi_x86_64(-)?,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.4 ) gtk? ( >=x11-libs/gtk+-3.15:3[X?,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(-)?] ) orc? ( >=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 REQUIRED_USE=gles2? ( !opengl ) opengl? ( X ) wayland? ( egl ) egl? ( || ( opengl gles2 ) )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.12.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gstreamer	4afab3a8901eec34d0fb1877fae766ba	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=475714b95bf6dd5e99b07032a351638c
+_md5_=02c41d16ff382f0f6ca9b5736ca30aff
diff --git a/metadata/md5-cache/media-libs/gst-plugins-base-1.12.4 b/metadata/md5-cache/media-libs/gst-plugins-base-1.12.4
index 9a7f020c70cd..173ebfdbc305 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-base-1.12.4
+++ b/metadata/md5-cache/media-libs/gst-plugins-base-1.12.4
@@ -4,11 +4,11 @@ DESCRIPTION=Basepack of plugins for gstreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=alsa +introspection ivorbis +ogg +orc +pango theora +vorbis 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 nls
-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 ~x64-solaris ~x86-solaris
+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 ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+ LGPL-2+
 RDEPEND=app-text/iso-codes >=dev-libs/glib-2.40.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/gstreamer-1.12.4:1.0[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(-)?] >=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(-)?] alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) ivorbis? ( >=media-libs/tremor-0_pre20130223[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ogg? ( >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) orc? ( >=dev-lang/orc-0.4.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(-)?] ) pango? ( >=x11-libs/pango-1.36.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(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-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(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<media-libs/gst-plugins-bad-1.11.90:1.0 >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 REQUIRED_USE=ivorbis? ( ogg ) theora? ( ogg ) vorbis? ( ogg )
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.12.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gstreamer	4afab3a8901eec34d0fb1877fae766ba	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8a5a731baaa0bccb6642bae6c5464005
+_md5_=af8fc39ca70abb6a72af8f2d36fe82d8
diff --git a/metadata/md5-cache/media-libs/gst-plugins-good-1.12.4 b/metadata/md5-cache/media-libs/gst-plugins-good-1.12.4
index b7405a86adee..0c6837cefd6b 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-good-1.12.4
+++ b/metadata/md5-cache/media-libs/gst-plugins-good-1.12.4
@@ -4,10 +4,10 @@ DESCRIPTION=Basepack of plugins for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=+orc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 nls
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.40.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/gst-plugins-base-1.12.4: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/gstreamer-1.12.4: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(-)?] >=app-arch/bzip2-1.0.6-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(-)?] >=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(-)?] orc? ( >=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.12.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gstreamer	4afab3a8901eec34d0fb1877fae766ba	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c1bf00d5647a549bd1ca3ff624d74fd8
+_md5_=9e301193404016732e6407fa9a9835d8
diff --git a/metadata/md5-cache/media-libs/gst-plugins-ugly-1.12.4 b/metadata/md5-cache/media-libs/gst-plugins-ugly-1.12.4
index 3ab940b06cb0..28cb500f2b8a 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-ugly-1.12.4
+++ b/metadata/md5-cache/media-libs/gst-plugins-ugly-1.12.4
@@ -4,10 +4,10 @@ DESCRIPTION=Basepack of plugins for gstreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=+orc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 nls
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.40.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/gstreamer-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.12.4: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(-)?] orc? ( >=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.12.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gstreamer	4afab3a8901eec34d0fb1877fae766ba	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b0b1877e156f5ca167d4189f04e3b985
+_md5_=1dd747941b44598f94cc0c3f8206ba81
diff --git a/metadata/md5-cache/media-libs/gstreamer-1.12.4 b/metadata/md5-cache/media-libs/gstreamer-1.12.4
index 0feb58ccf30a..a1d0a27112d5 100644
--- a/metadata/md5-cache/media-libs/gstreamer-1.12.4
+++ b/metadata/md5-cache/media-libs/gstreamer-1.12.4
@@ -4,10 +4,10 @@ DESCRIPTION=Open source multimedia framework
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=+caps +introspection nls +orc test unwind abi_x86_32 abi_x86_64 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 ~x64-solaris ~x86-solaris
+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 ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.40.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(-)?] caps? ( sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) unwind? ( >=sys-libs/libunwind-1.2_rc1[abi_x86_32(-)?,abi_x86_64(-)?,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/elfutils[abi_x86_32(-)?,abi_x86_64(-)?,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=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.12.4.tar.xz
 _eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=02718a6befa401f02d765fd51a9a926a
+_md5_=5ef7e623db81cae4dc230fcf015b4eda
diff --git a/metadata/md5-cache/media-libs/jpeg-9c b/metadata/md5-cache/media-libs/jpeg-9c
index 8447123c256f..74d042044da0 100644
--- a/metadata/md5-cache/media-libs/jpeg-9c
+++ b/metadata/md5-cache/media-libs/jpeg-9c
@@ -4,10 +4,10 @@ DESCRIPTION=Library to load, handle and manipulate images in the JPEG format
 EAPI=6
 HOMEPAGE=http://jpegclub.org/ http://www.ijg.org/
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=IJG
 RDEPEND=!media-libs/libjpeg-turbo:0
 SLOT=0
 SRC_URI=http://www.ijg.org/files/jpegsrc.v9c.tar.gz mirror://debian/pool/main/libj/libjpeg8/libjpeg8_8d-1.debian.tar.gz
 _eclasses_=libtool	0081a71a261724730ec4c248494f044d	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=3f642de71c71017933074ebc686a91e3
+_md5_=4c2f8e5b00070ac99145b0d147b8153d
diff --git a/metadata/md5-cache/media-libs/libbluray-1.0.2 b/metadata/md5-cache/media-libs/libbluray-1.0.2
index e4c321d2e0d5..275a37212945 100644
--- a/metadata/md5-cache/media-libs/libbluray-1.0.2
+++ b/metadata/md5-cache/media-libs/libbluray-1.0.2
@@ -4,10 +4,10 @@ DESCRIPTION=Blu-ray playback libraries
 EAPI=6
 HOMEPAGE=https://www.videolan.org/developers/libbluray.html
 IUSE=aacs bdplus +fontconfig java static-libs +truetype utils +xml elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=LGPL-2.1
 RDEPEND=xml? ( >=dev-libs/libxml2-2.9.1-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(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] ) aacs? ( >=media-libs/libaacs-0.6.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(-)?] ) bdplus? ( media-libs/libbdplus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/2
 SRC_URI=https://downloads.videolan.org/pub/videolan/libbluray/1.0.2/libbluray-1.0.2.tar.bz2
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=2911da6e4887659601b8f8e9bf115d69
+_md5_=e311cc6f2bed8d974522d98e2eb11869
diff --git a/metadata/md5-cache/media-libs/libebur128-1.0.3 b/metadata/md5-cache/media-libs/libebur128-1.0.3
deleted file mode 100644
index adfb2a41bc13..000000000000
--- a/metadata/md5-cache/media-libs/libebur128-1.0.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=speex? ( media-libs/speex[abi_x86_32(-)?,abi_x86_64(-)?,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-libs/libsndfile[abi_x86_32(-)?,abi_x86_64(-)?,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-arch/unzip ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A library implementing the EBU R128 loudness standard
-EAPI=5
-HOMEPAGE=https://github.com/jiixyj/libebur128
-IUSE=+speex static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=speex? ( media-libs/speex[abi_x86_32(-)?,abi_x86_64(-)?,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/1
-SRC_URI=https://github.com/jiixyj/libebur128/archive/v1.0.3.tar.gz -> libebur128-1.0.3.tar.gz test? ( https://tech.ebu.ch/files/live/sites/tech/files/shared/testmaterial/ebu-loudness-test-setv03.zip )
-_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	49cd471f02483798c5068698836b7429	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1f05a7009e2dd4d935529c202be2199e
diff --git a/metadata/md5-cache/media-libs/libebur128-1.1.0 b/metadata/md5-cache/media-libs/libebur128-1.1.0
deleted file mode 100644
index a118f8896fc8..000000000000
--- a/metadata/md5-cache/media-libs/libebur128-1.1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=speex? ( media-libs/speex[abi_x86_32(-)?,abi_x86_64(-)?,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-libs/libsndfile[abi_x86_32(-)?,abi_x86_64(-)?,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-arch/unzip ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A library implementing the EBU R128 loudness standard
-EAPI=5
-HOMEPAGE=https://github.com/jiixyj/libebur128
-IUSE=+speex static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=speex? ( media-libs/speex[abi_x86_32(-)?,abi_x86_64(-)?,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/1
-SRC_URI=https://github.com/jiixyj/libebur128/archive/v1.1.0.tar.gz -> libebur128-1.1.0.tar.gz test? ( https://tech.ebu.ch/files/live/sites/tech/files/shared/testmaterial/ebu-loudness-test-setv03.zip )
-_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	49cd471f02483798c5068698836b7429	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=177b4ee754160e3c661d897846e0e33b
diff --git a/metadata/md5-cache/media-libs/libebur128-1.2.2 b/metadata/md5-cache/media-libs/libebur128-1.2.2
deleted file mode 100644
index bf0f11a3475c..000000000000
--- a/metadata/md5-cache/media-libs/libebur128-1.2.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( app-arch/unzip media-libs/libsndfile[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A library implementing the EBU R128 loudness standard
-EAPI=6
-HOMEPAGE=https://github.com/jiixyj/libebur128
-IUSE=static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=MIT
-SLOT=0/1
-SRC_URI=https://github.com/jiixyj/libebur128/archive/v1.2.2.tar.gz -> libebur128-1.2.2.tar.gz test? ( https://tech.ebu.ch/files/live/sites/tech/files/shared/testmaterial/ebu-loudness-test-setv05.zip )
-_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	49cd471f02483798c5068698836b7429	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1eb74d9cb8a152acd0bc3ed711184f5d
diff --git a/metadata/md5-cache/media-libs/libepoxy-1.5.1 b/metadata/md5-cache/media-libs/libepoxy-1.5.1
index e46c76b27783..3b1ffc05bead 100644
--- a/metadata/md5-cache/media-libs/libepoxy-1.5.1
+++ b/metadata/md5-cache/media-libs/libepoxy-1.5.1
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/anholt/libepoxy/archive/1.5.1.tar.gz -> libepoxy-1.5.1.tar.gz
-_eclasses_=meson	ecfaf615b512dc4ff2a50a35e6b26c09	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec
+_eclasses_=meson	53e3ab209402d5ad07a9c4580c423d1a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec
 _md5_=2f3cf767e79b61df1f7eae2263958d63
diff --git a/metadata/md5-cache/media-libs/libepoxy-1.5.2 b/metadata/md5-cache/media-libs/libepoxy-1.5.2
new file mode 100644
index 000000000000..9b84327f5a7b
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libepoxy-1.5.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install setup test unpack
+DEPEND=|| ( dev-lang/python:3.6[xml(+)] dev-lang/python:3.5[xml(+)] dev-lang/python:3.4[xml(+)] >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) media-libs/mesa[egl,abi_x86_32(-)?,abi_x86_64(-)?,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/meson-0.44.0 >=dev-util/meson-0.40.0 >=dev-util/ninja-1.7.2
+DESCRIPTION=Epoxy is a library for handling OpenGL function pointer management for you
+EAPI=6
+HOMEPAGE=https://github.com/anholt/libepoxy
+IUSE=test +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
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://github.com/anholt/libepoxy/archive/1.5.2.tar.gz -> libepoxy-1.5.2.tar.gz
+_eclasses_=meson	53e3ab209402d5ad07a9c4580c423d1a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec
+_md5_=df0aae54e9ace9bd191e84c6dce333b8
diff --git a/metadata/md5-cache/media-libs/libepoxy-9999 b/metadata/md5-cache/media-libs/libepoxy-9999
index 697d8d10a9d8..1fe42aa422e6 100644
--- a/metadata/md5-cache/media-libs/libepoxy-9999
+++ b/metadata/md5-cache/media-libs/libepoxy-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/anholt/libepoxy
 IUSE=test +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
 LICENSE=MIT
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	meson	ecfaf615b512dc4ff2a50a35e6b26c09	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	meson	53e3ab209402d5ad07a9c4580c423d1a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec
 _md5_=d8797c044a8b0da237b4d59ce876606b
diff --git a/metadata/md5-cache/media-libs/libmpdclient-2.13 b/metadata/md5-cache/media-libs/libmpdclient-2.13
index fb2ce106317c..18d3320f3403 100644
--- a/metadata/md5-cache/media-libs/libmpdclient-2.13
+++ b/metadata/md5-cache/media-libs/libmpdclient-2.13
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://www.musicpd.org/download/libmpdclient/2/libmpdclient-2.13.tar.xz
-_eclasses_=meson	ecfaf615b512dc4ff2a50a35e6b26c09	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec
+_eclasses_=meson	53e3ab209402d5ad07a9c4580c423d1a	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec
 _md5_=1220fbbae41d7f7f33b557de988e3601
diff --git a/metadata/md5-cache/media-libs/libpng-1.6.34 b/metadata/md5-cache/media-libs/libpng-1.6.34
index 2fadcf94b44c..47390ee85e00 100644
--- a/metadata/md5-cache/media-libs/libpng-1.6.34
+++ b/metadata/md5-cache/media-libs/libpng-1.6.34
@@ -4,10 +4,10 @@ DESCRIPTION=Portable Network Graphics library
 EAPI=6
 HOMEPAGE=http://www.libpng.org/
 IUSE=apng cpu_flags_x86_sse 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 ~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 ~x86-winnt
+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 ~x86-winnt
 LICENSE=libpng
 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(-)?]
 SLOT=0/16
 SRC_URI=mirror://sourceforge/libpng/libpng-1.6.34.tar.xz apng? ( mirror://sourceforge/apng/libpng-1.6.34-apng.patch.gz )
 _eclasses_=libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=f0d92b78aea1c82e81103f283ef0130d
+_md5_=83017ef57546fe28361c58ae55c0d6e4
diff --git a/metadata/md5-cache/media-libs/libraw-0.18.11 b/metadata/md5-cache/media-libs/libraw-0.18.11
new file mode 100644
index 000000000000..d009c04ea59a
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libraw-0.18.11
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install pretend setup test
+DEPEND=jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/jasper-1.900.1-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( >=media-libs/lcms-2.5: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
+DESCRIPTION=LibRaw is a library for reading RAW files obtained from digital photo cameras
+EAPI=6
+HOMEPAGE=https://www.libraw.org/ https://github.com/LibRaw/LibRaw
+IUSE=demosaic examples jpeg jpeg2k +lcms openmp abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1 CDDL demosaic? ( GPL-2 GPL-3 )
+RDEPEND=jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/jasper-1.900.1-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( >=media-libs/lcms-2.5: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=0/16
+SRC_URI=https://www.libraw.org/data/LibRaw-0.18.11.tar.gz demosaic? ( https://www.libraw.org/data/LibRaw-demosaic-pack-GPL2-0.18.8.tar.gz https://www.libraw.org/data/LibRaw-demosaic-pack-GPL3-0.18.8.tar.gz )
+_eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	fa02994d0beba88681127d93da4411ec
+_md5_=3d2b187c01f5a5a16e2700fdb5691f1d
diff --git a/metadata/md5-cache/media-libs/opencolorio-1.1.0-r1 b/metadata/md5-cache/media-libs/opencolorio-1.1.0-r1
index fd1df8a390a0..f9b557e1af26 100644
--- a/metadata/md5-cache/media-libs/opencolorio-1.1.0-r1
+++ b/metadata/md5-cache/media-libs/opencolorio-1.1.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=A color management framework for visual effects and animation
 EAPI=6
 HOMEPAGE=http://opencolorio.org/
 IUSE=cpu_flags_x86_sse2 doc opengl python static-libs test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=BSD
 RDEPEND=opengl? ( media-libs/lcms:2 media-libs/openimageio media-libs/glew:= media-libs/freeglut virtual/opengl ) 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(+)?] ) >=dev-cpp/yaml-cpp-0.5 dev-libs/tinyxml
 REQUIRED_USE=doc? ( python ) 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 ) )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/imageworks/OpenColorIO/archive/v1.1.0.tar.gz -> opencolorio-1.1.0.tar.gz
 _eclasses_=cmake-utils	49cd471f02483798c5068698836b7429	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7df2a017a067dbbb51f800b924d4192c
+_md5_=871a539f4f78fd3b13776362f3270798
diff --git a/metadata/md5-cache/media-libs/phonon-4.10.1 b/metadata/md5-cache/media-libs/phonon-4.10.1
index 42a259093fdd..3f7bd2d48105 100644
--- a/metadata/md5-cache/media-libs/phonon-4.10.1
+++ b/metadata/md5-cache/media-libs/phonon-4.10.1
@@ -4,11 +4,11 @@ DESCRIPTION=KDE multimedia API
 EAPI=6
 HOMEPAGE=https://phonon.kde.org/
 IUSE=debug designer gstreamer pulseaudio +vlc
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd
 LICENSE=|| ( LGPL-2.1 LGPL-3 )
 PDEPEND=gstreamer? ( >=media-libs/phonon-gstreamer-4.9.0[qt5(+)] ) vlc? ( >=media-libs/phonon-vlc-0.9.0[qt5(+)] )
 RDEPEND=!!dev-qt/qtphonon:4 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 designer? ( dev-qt/designer:5 ) pulseaudio? ( dev-libs/glib:2 >=media-sound/pulseaudio-0.9.21[glib] )
 SLOT=0
 SRC_URI=mirror://kde/stable/phonon/4.10.1/phonon-4.10.1.tar.xz
 _eclasses_=cmake-utils	49cd471f02483798c5068698836b7429	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e63aeb200391d21057be22447a9d08da
+_md5_=c8e9184d12e5376e82fb35ca6aeb308c
diff --git a/metadata/md5-cache/media-libs/phonon-gstreamer-4.9.0-r2 b/metadata/md5-cache/media-libs/phonon-gstreamer-4.9.0-r2
index b9dd41d98d83..b139e0998be2 100644
--- a/metadata/md5-cache/media-libs/phonon-gstreamer-4.9.0-r2
+++ b/metadata/md5-cache/media-libs/phonon-gstreamer-4.9.0-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Phonon GStreamer backend
 EAPI=6
 HOMEPAGE=https://phonon.kde.org/
 IUSE=alsa debug +network
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd
 LICENSE=LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )
 RDEPEND=dev-libs/glib:2 dev-libs/libxml2:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/phonon-4.10.0 media-plugins/gst-plugins-meta:1.0[alsa?,ogg,vorbis] virtual/opengl network? ( media-plugins/gst-plugins-soup:1.0 )
 SLOT=0
 SRC_URI=mirror://kde/stable/phonon/phonon-backend-gstreamer/4.9.0/phonon-backend-gstreamer-4.9.0.tar.xz
 _eclasses_=cmake-utils	49cd471f02483798c5068698836b7429	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f50c3e0a5857f6031b7c849ce57c6fdb
+_md5_=530992f94891b41bd65c93e58f1b97b2
diff --git a/metadata/md5-cache/media-libs/phonon-vlc-0.10.1 b/metadata/md5-cache/media-libs/phonon-vlc-0.10.1
index 35845e0d4d67..16c3bb9423d0 100644
--- a/metadata/md5-cache/media-libs/phonon-vlc-0.10.1
+++ b/metadata/md5-cache/media-libs/phonon-vlc-0.10.1
@@ -4,10 +4,10 @@ DESCRIPTION=Phonon VLC backend
 EAPI=6
 HOMEPAGE=https://phonon.kde.org/
 IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=media-libs/phonon-4.10.0 media-video/vlc:=[dbus,ogg,vorbis]
 SLOT=0
 SRC_URI=mirror://kde/stable/phonon/phonon-backend-vlc/0.10.1/phonon-backend-vlc-0.10.1.tar.xz
 _eclasses_=cmake-utils	49cd471f02483798c5068698836b7429	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=97201242909d093d21193f096868ba7b
+_md5_=6e306ea776e3b28978d2f9362366d2f0
diff --git a/metadata/md5-cache/media-libs/rubberband-1.8.1-r1 b/metadata/md5-cache/media-libs/rubberband-1.8.1-r1
index 2fd7d5b694af..d63536c7bd92 100644
--- a/metadata/md5-cache/media-libs/rubberband-1.8.1-r1
+++ b/metadata/md5-cache/media-libs/rubberband-1.8.1-r1
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=media-libs/vamp-plugin-sdk[abi_x86_32(-)?,abi_x86_64(-)?,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/libsamplerate[abi_x86_32(-)?,abi_x86_64(-)?,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/libsndfile media-libs/ladspa-sdk sci-libs/fftw:3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig
 DESCRIPTION=An audio time-stretching and pitch-shifting library and utility program
 EAPI=5
-HOMEPAGE=http://www.breakfastquay.com/rubberband/
+HOMEPAGE=https://www.breakfastquay.com/rubberband/
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=media-libs/vamp-plugin-sdk[abi_x86_32(-)?,abi_x86_64(-)?,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/libsamplerate[abi_x86_32(-)?,abi_x86_64(-)?,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/libsndfile media-libs/ladspa-sdk sci-libs/fftw:3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
-SRC_URI=http://code.breakfastquay.com/attachments/download/34/rubberband-1.8.1.tar.bz2
+SRC_URI=https://code.breakfastquay.com/attachments/download/34/rubberband-1.8.1.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2943176cd2e5a6d7a061698e610c07f0
+_md5_=56a5954734b2128751052826c8bea403
diff --git a/metadata/md5-cache/media-libs/svgalib-1.9.25-r4 b/metadata/md5-cache/media-libs/svgalib-1.9.25-r4
deleted file mode 100644
index ab0608c702db..000000000000
--- a/metadata/md5-cache/media-libs/svgalib-1.9.25-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-DESCRIPTION=A library for running svga graphics on the console
-EAPI=4
-HOMEPAGE=http://www.svgalib.org/
-IUSE=build +kernel-helper kernel_linux
-KEYWORDS=-* x86
-LICENSE=BSD
-RDEPEND=kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=http://www.arava.co.il/matan/svgalib/svgalib-1.9.25.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	ca370deef9d44125d829f2eb6ebc83e0	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=cf7d6b7f91a91b540b6878c15a7cb2a7
diff --git a/metadata/md5-cache/media-libs/vamp-plugin-sdk-2.6-r1 b/metadata/md5-cache/media-libs/vamp-plugin-sdk-2.6-r1
index 1f694e738c09..32c3664514b6 100644
--- a/metadata/md5-cache/media-libs/vamp-plugin-sdk-2.6-r1
+++ b/metadata/md5-cache/media-libs/vamp-plugin-sdk-2.6-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst prepare test
 DEPEND=media-libs/libsndfile media-libs/libsndfile[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] doc? ( app-doc/doxygen )
 DESCRIPTION=Audio processing system for plugins to extract information from audio data
 EAPI=5
-HOMEPAGE=http://www.vamp-plugins.org
+HOMEPAGE=https://www.vamp-plugins.org
 IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 x86
 LICENSE=BSD
@@ -10,4 +10,4 @@ RDEPEND=media-libs/libsndfile
 SLOT=0
 SRC_URI=https://code.soundsoftware.ac.uk/attachments/download/1514/vamp-plugin-sdk-2.6.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e63af34041ae9dda2b52290f091ccfa3
+_md5_=0917791fbf3f989e48737d84ed714fef
diff --git a/metadata/md5-cache/media-libs/vamp-plugin-sdk-2.7.1 b/metadata/md5-cache/media-libs/vamp-plugin-sdk-2.7.1
index eba50dd7e0ff..a9dc78c60d60 100644
--- a/metadata/md5-cache/media-libs/vamp-plugin-sdk-2.7.1
+++ b/metadata/md5-cache/media-libs/vamp-plugin-sdk-2.7.1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst prepare test
 DEPEND=media-libs/libsndfile media-libs/libsndfile[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] doc? ( app-doc/doxygen )
 DESCRIPTION=Audio processing system for plugins to extract information from audio data
 EAPI=5
-HOMEPAGE=http://www.vamp-plugins.org
+HOMEPAGE=https://www.vamp-plugins.org
 IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86
 LICENSE=BSD
@@ -10,4 +10,4 @@ RDEPEND=media-libs/libsndfile
 SLOT=0
 SRC_URI=https://code.soundsoftware.ac.uk/attachments/download/2206/vamp-plugin-sdk-2.7.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d6c7a7dff0ab68b94f54c43222f32390
+_md5_=67c6cb33fee44e6f430eda8d3f33b81d
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index f485dfad7aea..4c1b072df295 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/gst-plugins-a52dec-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-a52dec-1.12.4
index 4136de95b8dc..624b68dc9b26 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-a52dec-1.12.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-a52dec-1.12.4
@@ -4,11 +4,11 @@ DESCRIPTION=ATSC A/52 audio decoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=+orc abi_x86_32 abi_x86_64 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
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=media-libs/a52dec-0.7.4-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] orc? ( >=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-ugly-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.12.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gstreamer	4afab3a8901eec34d0fb1877fae766ba	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=735afba23d57fb38c209e4de2fe4c56d
+_md5_=a0c5aee2f7e0daf0e62abc9743a8232b
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-assrender-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-assrender-1.12.4
index 84670af95add..ed791f0ea29a 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-assrender-1.12.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-assrender-1.12.4
@@ -4,11 +4,11 @@ DESCRIPTION=ASS/SSA rendering with effects support plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libass-0.10.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.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.12.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gstreamer	4afab3a8901eec34d0fb1877fae766ba	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=35a7c02c03f638d1577c85f881d8bd77
+_md5_=a481ad702aa493293a99216c85b0ce80
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-cdio-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-cdio-1.12.4
index 443722700de9..eeb6f4e06f25 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-cdio-1.12.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-cdio-1.12.4
@@ -4,11 +4,11 @@ DESCRIPTION=CD Audio Source (cdda) plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/libcdio-0.90-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-ugly-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.12.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gstreamer	4afab3a8901eec34d0fb1877fae766ba	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a3b4fc308024e09e169c4c4d38f8443e
+_md5_=82eb748ef3858e266400cc8af6d91edb
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.12.4
index 03f7afc2ed61..221cda2cf3af 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.12.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.12.4
@@ -4,11 +4,11 @@ DESCRIPTION=CD Audio Source (cdda) plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-sound/cdparanoia-3.10.2-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.12.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gstreamer	4afab3a8901eec34d0fb1877fae766ba	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3a91633f58ba952701b6aafb3d93e17d
+_md5_=b49e5934ee907b36868d59d79169c0cb
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dv-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-dv-1.12.4
index 2a5018c71f40..77ff95ebfa09 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dv-1.12.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dv-1.12.4
@@ -4,11 +4,11 @@ DESCRIPTION=DV demuxer and decoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libdv-1.0.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(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.12.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gstreamer	4afab3a8901eec34d0fb1877fae766ba	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=45c9db105212c87b7e4e602b43a023ac
+_md5_=6a7c332a37d93d21f9d4dc5b774b96cc
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dvb-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-dvb-1.12.4
index 25f9b032f9bc..5bf19932e078 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dvb-1.12.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dvb-1.12.4
@@ -4,11 +4,11 @@ DESCRIPTION=plugin for gstreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 ~mips ~ppc ~ppc64 x86
+KEYWORDS=alpha amd64 arm ~arm64 ~mips ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.12.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gstreamer	4afab3a8901eec34d0fb1877fae766ba	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3c7775d43b0a13de3b2ee999e816e5fe
+_md5_=cb19960c81ed2facdf37be41343768d6
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dvdread-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-dvdread-1.12.4
index d8c9d05e40b0..7fd206be2cb8 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dvdread-1.12.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dvdread-1.12.4
@@ -4,11 +4,11 @@ DESCRIPTION=DVD read plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libdvdread-4.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-ugly-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.12.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gstreamer	4afab3a8901eec34d0fb1877fae766ba	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=93c5dcfc79c30a39902c2e8c379f1a76
+_md5_=0b557e4b32c986dfa61ee580fe4da9b6
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-faac-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-faac-1.12.4
index 32125a43eee2..26c393d19fbb 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-faac-1.12.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-faac-1.12.4
@@ -4,11 +4,11 @@ DESCRIPTION=AAC audio encoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=alpha amd64 ~arm ~ia64 ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/faac-1.28-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(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.12.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gstreamer	4afab3a8901eec34d0fb1877fae766ba	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=31188eff9580c7e516c81e34538d6042
+_md5_=0735f48c60c45857f2fec67123bacacb
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-faad-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-faad-1.12.4
index fbb5b683bc05..7694db1bbffa 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-faad-1.12.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-faad-1.12.4
@@ -4,11 +4,11 @@ DESCRIPTION=AAC audio decoder plugin.
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=media-libs/faad2-2.7-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(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.12.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gstreamer	4afab3a8901eec34d0fb1877fae766ba	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c01111af6a7b7617f6dab796f4aa6d9d
+_md5_=3cc425d711a7b4611286f6df48627b02
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-flac-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-flac-1.12.4
index 80d489f91515..b0dc544e8296 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-flac-1.12.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-flac-1.12.4
@@ -4,11 +4,11 @@ DESCRIPTION=FLAC encoder/decoder/tagger plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=media-libs/flac-1.2.1-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.12.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gstreamer	4afab3a8901eec34d0fb1877fae766ba	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4056713b5c7255c8e62dd5c1b3cc767d
+_md5_=a1299448d257f3c0f17001a6d06f0010
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-gdkpixbuf-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-gdkpixbuf-1.12.4
index 9758b22f6731..8646bca92ef6 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-gdkpixbuf-1.12.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-gdkpixbuf-1.12.4
@@ -4,11 +4,11 @@ DESCRIPTION=plugin for gstreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=x11-libs/gdk-pixbuf-2.30.7: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.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.12.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gstreamer	4afab3a8901eec34d0fb1877fae766ba	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a33f493423023aaaa0cc60b7bb714502
+_md5_=88cb9dc8f56357f2d3ca94ca98ed603d
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-jack-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-jack-1.12.4
index 344959d0f1eb..102d06974c3b 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-jack-1.12.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-jack-1.12.4
@@ -4,11 +4,11 @@ DESCRIPTION=plugin for gstreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=GPL-2
 RDEPEND=virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.12.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gstreamer	4afab3a8901eec34d0fb1877fae766ba	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1a3c6b925ab4be3fcb234cb7cb92fb2e
+_md5_=6d303f2cf5c3af99934412382d67dfbd
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-jpeg-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-jpeg-1.12.4
index a8a4393983f9..b78bac643794 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-jpeg-1.12.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-jpeg-1.12.4
@@ -4,11 +4,11 @@ DESCRIPTION=JPEG image encoder/decoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.12.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gstreamer	4afab3a8901eec34d0fb1877fae766ba	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=45c0e387b69691c77c8175c6272c78e8
+_md5_=58e243179b100e681bed9c43a9e1233d
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-lame-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-lame-1.12.4
index a43025d210f6..934bca3572c2 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-lame-1.12.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-lame-1.12.4
@@ -4,11 +4,11 @@ DESCRIPTION=MP3 encoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=media-sound/lame-3.99.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(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-ugly-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.12.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gstreamer	4afab3a8901eec34d0fb1877fae766ba	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=11607bbe80197ea34b12a73ff9ceef5c
+_md5_=d6bad6f152283ce1af346dd11d9a2ebe
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libav-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-libav-1.12.4
index 1d6d70e959b7..01604cd7ff75 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libav-1.12.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libav-1.12.4
@@ -4,11 +4,11 @@ DESCRIPTION=FFmpeg based gstreamer plugin
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/modules/gst-libav.html
 IUSE=libav +orc abi_x86_32 abi_x86_64 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 x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=app-arch/bzip2 app-arch/xz-utils >=dev-libs/glib-2.40.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/gstreamer-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.12.4: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(-)?] !libav? ( >=media-video/ffmpeg-3.2.6: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(-)?] ) orc? ( >=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.12.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8d85cfe2d681dff5e9d1c5b6a3560935
+_md5_=84a8f53dd6f4e3c522f865c653acf3c0
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libmms-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-libmms-1.12.4
index 4e19d5719d87..4ecb9605b6e0 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libmms-1.12.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libmms-1.12.4
@@ -4,11 +4,11 @@ DESCRIPTION=Microsoft Multi Media Server source plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libmms-0.6.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(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.12.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gstreamer	4afab3a8901eec34d0fb1877fae766ba	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5367e201d1644c5bdcf2fca457686fc5
+_md5_=a9636933b56a6cd0b2927859846e5d2c
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libpng-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-libpng-1.12.4
index 453f5da6285d..aa7e1d2c5f8f 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libpng-1.12.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libpng-1.12.4
@@ -4,11 +4,11 @@ DESCRIPTION=PNG image encoder/decoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm ~ppc ~ppc64 ~sparc x86
+KEYWORDS=alpha amd64 ~arm ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libpng-1.6.10:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.12.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gstreamer	4afab3a8901eec34d0fb1877fae766ba	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=03be708a93cd829b10fff7da07e0ed1d
+_md5_=b95254dc4ba950fcd5d01ab84972546e
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libvisual-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-libvisual-1.12.4
index 8e02cdc742c6..c4c542134f32 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libvisual-1.12.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libvisual-1.12.4
@@ -4,11 +4,11 @@ DESCRIPTION=Visualization elements for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
+KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libvisual-0.4.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(-)?] >=media-plugins/libvisual-plugins-0.4.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(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.12.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gstreamer	4afab3a8901eec34d0fb1877fae766ba	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a568f5b2e33d6a1486c40aea35a0d6fe
+_md5_=9252af08c98d7ffd3a991b17062051c8
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-meta-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-meta-1.12.4
index cbec3a8b673e..e613b9f25d9b 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-meta-1.12.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-meta-1.12.4
@@ -3,10 +3,10 @@ DESCRIPTION=Meta ebuild to pull in gst plugins for apps
 EAPI=6
 HOMEPAGE=https://www.gentoo.org
 IUSE=aac a52 alsa cdda dts dv dvb dvd ffmpeg flac http jack lame libass libvisual mms mp3 modplug mpeg ogg opus oss pulseaudio taglib theora v4l vaapi vcd vorbis vpx wavpack X x264 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=metapackage
 RDEPEND=>=media-libs/gstreamer-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.12.4:1.0[alsa?,ogg?,theora?,vorbis?,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(-)?] >=media-libs/gst-plugins-good-1.12.4: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(-)?] a52? ( >=media-plugins/gst-plugins-a52dec-1.12.4: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(-)?] ) aac? ( >=media-plugins/gst-plugins-faad-1.12.4: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(-)?] ) cdda? ( || ( >=media-plugins/gst-plugins-cdparanoia-1.12.4: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-plugins/gst-plugins-cdio-1.12.4: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(-)?] ) ) dts? ( >=media-plugins/gst-plugins-dts-1.12.4: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(-)?] ) dv? ( >=media-plugins/gst-plugins-dv-1.12.4: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(-)?] ) dvb? ( >=media-plugins/gst-plugins-dvb-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4: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(-)?] ) dvd? ( >=media-libs/gst-plugins-ugly-1.12.4: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-plugins/gst-plugins-a52dec-1.12.4: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-plugins/gst-plugins-dvdread-1.12.4: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-plugins/gst-plugins-mpeg2dec-1.12.4: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-plugins/gst-plugins-resindvd-1.12.4: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(-)?] ) ffmpeg? ( >=media-plugins/gst-plugins-libav-1.12.4: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(-)?] ) flac? ( >=media-plugins/gst-plugins-flac-1.12.4: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(-)?] ) http? ( >=media-plugins/gst-plugins-soup-1.12.4: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(-)?] ) jack? ( >=media-plugins/gst-plugins-jack-1.12.4: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(-)?] ) lame? ( >=media-plugins/gst-plugins-lame-1.12.4: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(-)?] ) libass? ( >=media-plugins/gst-plugins-assrender-1.12.4: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(-)?] ) libvisual? ( >=media-plugins/gst-plugins-libvisual-1.12.4: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(-)?] ) mms? ( >=media-plugins/gst-plugins-libmms-1.12.4: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(-)?] ) modplug? ( >=media-plugins/gst-plugins-modplug-1.12.4: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(-)?] ) mp3? ( >=media-libs/gst-plugins-ugly-1.12.4: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-plugins/gst-plugins-mpg123-1.12.4: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(-)?] ) mpeg? ( >=media-plugins/gst-plugins-mpeg2dec-1.12.4: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(-)?] ) opus? ( >=media-plugins/gst-plugins-opus-1.12.4: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(-)?] ) oss? ( >=media-plugins/gst-plugins-oss-1.12.4: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(-)?] ) pulseaudio? ( >=media-plugins/gst-plugins-pulse-1.12.4: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(-)?] ) taglib? ( >=media-plugins/gst-plugins-taglib-1.12.4: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(-)?] ) v4l? ( >=media-plugins/gst-plugins-v4l2-1.12.4: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(-)?] ) vaapi? ( >=media-plugins/gst-plugins-vaapi-1.12.4: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(-)?] ) vcd? ( >=media-plugins/gst-plugins-mplex-1.12.4: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-plugins/gst-plugins-mpeg2dec-1.12.4: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(-)?] ) vpx? ( >=media-plugins/gst-plugins-vpx-1.12.4: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(-)?] ) wavpack? ( >=media-plugins/gst-plugins-wavpack-1.12.4: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(-)?] ) x264? ( >=media-plugins/gst-plugins-x264-1.12.4: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(-)?] )
 REQUIRED_USE=opus? ( ogg ) theora? ( ogg ) vorbis? ( ogg )
 SLOT=1.0
 _eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=c194043cb3cc1fd0f3410edcca02ec92
+_md5_=fd7da008a0111efc38981304f51d1173
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-modplug-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-modplug-1.12.4
index 859fb9deaa77..882e32b3af9a 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-modplug-1.12.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-modplug-1.12.4
@@ -4,11 +4,11 @@ DESCRIPTION=MOD audio decoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm64 ~hppa ~mips ~ppc ~ppc64 x86
+KEYWORDS=~alpha amd64 ~arm64 ~hppa ~mips ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.12.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gstreamer	4afab3a8901eec34d0fb1877fae766ba	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=38646570b0da86604805f53c7cfa3398
+_md5_=950fc3bb3995a6f73024d965a9e57cd8
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-mpeg2dec-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-mpeg2dec-1.12.4
index 2fb442c82b79..920f840029f8 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-mpeg2dec-1.12.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-mpeg2dec-1.12.4
@@ -4,11 +4,11 @@ DESCRIPTION=MPEG2 decoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libmpeg2-0.5.1-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-ugly-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.12.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gstreamer	4afab3a8901eec34d0fb1877fae766ba	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e1979eef5a0c04fabb405b8100f1d8f1
+_md5_=9f6f891ce5e08101a3d22d6687276130
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-mpg123-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-mpg123-1.12.4
index a402b30adc4a..0f202035bd37 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-mpg123-1.12.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-mpg123-1.12.4
@@ -4,11 +4,11 @@ DESCRIPTION=MP3 decoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 x86 ~amd64-fbsd
 LICENSE=GPL-2
 RDEPEND=>=media-sound/mpg123-1.23[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-ugly-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.12.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gstreamer	4afab3a8901eec34d0fb1877fae766ba	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9065693e5f6ffa66b2c21dcfe5db37e9
+_md5_=dacc233612c82e41593e7afe29421a95
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-neon-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-neon-1.12.4
index 27fb22112700..ca64aa81de55 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-neon-1.12.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-neon-1.12.4
@@ -4,11 +4,11 @@ DESCRIPTION=HTTP client source plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~ppc ~ppc64 x86
+KEYWORDS=alpha amd64 ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=net-libs/neon-0.30.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/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.12.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gstreamer	4afab3a8901eec34d0fb1877fae766ba	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7b5b8718b521d0abb4f7623c4e95c1f6
+_md5_=4fae9e02d4e2838bdde0afa82e06d4ab
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-opus-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-opus-1.12.4
index af2c9e2b9c7a..4bc8bb9c67df 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-opus-1.12.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-opus-1.12.4
@@ -4,11 +4,11 @@ DESCRIPTION=Opus audio parser plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=GPL-2
 RDEPEND=>=media-libs/opus-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.12.4: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(-)?,ogg] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.12.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gstreamer	4afab3a8901eec34d0fb1877fae766ba	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cf7471a2dbc39aa82602d9b6e72fc6c1
+_md5_=947e105deb4b7b21af92e50b588843e1
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-oss-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-oss-1.12.4
index 6e17d3ffb1d4..8ace0eff5cbd 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-oss-1.12.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-oss-1.12.4
@@ -4,11 +4,11 @@ DESCRIPTION=OSS (Open Sound System) support plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.12.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gstreamer	4afab3a8901eec34d0fb1877fae766ba	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a28301f00550eb368c0d60422a3fcd84
+_md5_=dca8bd7746f4e38f711ba08a82a91077
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-pulse-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-pulse-1.12.4
index af79391af756..8af0b4e7d7e6 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-pulse-1.12.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-pulse-1.12.4
@@ -4,11 +4,11 @@ DESCRIPTION=PulseAudio sound server plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/gst-plugins-base-1.12.4: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-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.12.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gstreamer	4afab3a8901eec34d0fb1877fae766ba	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0e927a60f4da3368740ecf38262a856e
+_md5_=674abc458a91fc06a16e930bcfa2fd5d
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-raw1394-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-raw1394-1.12.4
index 4ba7fca97988..7ca397dfee69 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-raw1394-1.12.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-raw1394-1.12.4
@@ -4,11 +4,11 @@ DESCRIPTION=Fiwewire DV/HDV capture plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.12.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gstreamer	4afab3a8901eec34d0fb1877fae766ba	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2eb6d5a7763dd9b29b545cd3084709eb
+_md5_=77976440181ee4c5b2a2c89ea94aeee6
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-resindvd-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-resindvd-1.12.4
index 5b1902ea6859..83fdb5293cd2 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-resindvd-1.12.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-resindvd-1.12.4
@@ -4,11 +4,11 @@ DESCRIPTION=DVD playback support plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libdvdnav-4.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libdvdread-4.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.12.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gstreamer	4afab3a8901eec34d0fb1877fae766ba	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1960d82f8744d81990adbdb6c7b0dbc2
+_md5_=d63f93221f72d55e80b37cdb33de4db0
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-shout2-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-shout2-1.12.4
index 90c2991b0954..a45701413972 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-shout2-1.12.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-shout2-1.12.4
@@ -4,11 +4,11 @@ DESCRIPTION=Icecast server sink plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~ppc ~ppc64 x86
+KEYWORDS=alpha amd64 ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libshout-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-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.12.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gstreamer	4afab3a8901eec34d0fb1877fae766ba	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=547d01db44aaf0d93b237d8728caaed9
+_md5_=82d1027b86588dbf2c9623505a6ae15b
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-sidplay-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-sidplay-1.12.4
index 79619d096dc2..c5cba143fad7 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-sidplay-1.12.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-sidplay-1.12.4
@@ -4,11 +4,11 @@ DESCRIPTION=Sid decoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=alpha amd64 ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libsidplay-1.36.59-r1: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(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-ugly-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.12.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gstreamer	4afab3a8901eec34d0fb1877fae766ba	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=50b9d61535d51c526f3eed58f201da51
+_md5_=801cdac728a61d92cb0eeb3bbcaf70de
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-soup-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-soup-1.12.4
index 9933cd70326b..f745d37120c4 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-soup-1.12.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-soup-1.12.4
@@ -4,11 +4,11 @@ DESCRIPTION=HTTP client source/sink plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-macos
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-macos
 LICENSE=GPL-2
 RDEPEND=>=net-libs/libsoup-2.48:2.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-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.12.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gstreamer	4afab3a8901eec34d0fb1877fae766ba	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8c82bfcb41284d0101c60134930686c7
+_md5_=8abb873f39cdf7312bedc7fde33faa30
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-speex-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-speex-1.12.4
index 5a82a0f1b298..a7df5f1c6b30 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-speex-1.12.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-speex-1.12.4
@@ -4,11 +4,11 @@ DESCRIPTION=Speex encoder/decoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.12.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gstreamer	4afab3a8901eec34d0fb1877fae766ba	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3644f931061df15c5a98d5a9e9d72255
+_md5_=d41f702d634d4bf465b41b108946214c
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-taglib-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-taglib-1.12.4
index 24cf76d07cbd..78b2941dff07 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-taglib-1.12.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-taglib-1.12.4
@@ -4,11 +4,11 @@ DESCRIPTION=ID3v2/APEv2 tagger plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=media-libs/taglib-1.9.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(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.12.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gstreamer	4afab3a8901eec34d0fb1877fae766ba	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1755e6065b1da4f22ce18bc01d5f8b89
+_md5_=b33ec1686a990c25eea1c65cf7c02a34
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-twolame-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-twolame-1.12.4
index f721a646940b..1c7798fef3b3 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-twolame-1.12.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-twolame-1.12.4
@@ -4,11 +4,11 @@ DESCRIPTION=MPEG2 encoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=alpha amd64 ~arm ~ia64 ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-ugly-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.12.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gstreamer	4afab3a8901eec34d0fb1877fae766ba	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fe15375059a6476dd472c5566ac048e7
+_md5_=7f4ecfcae969f615a1ab6d05ecfd42d8
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-v4l2-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-v4l2-1.12.4
index 806b67322411..a30dfd5ac882 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-v4l2-1.12.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-v4l2-1.12.4
@@ -4,11 +4,11 @@ DESCRIPTION=plugin for gstreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=udev abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.12.4: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(-)?] udev? ( >=virtual/libgudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.12.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gstreamer	4afab3a8901eec34d0fb1877fae766ba	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=843006d26eab6c0ef62ebba28a2d3244
+_md5_=0a4f5e287e18ca8c660b1de1801c8240
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.12.4
index 69db1e3b4810..88b181031a8b 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.12.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.12.4
@@ -4,11 +4,11 @@ DESCRIPTION=VP8/VP9 video encoder/decoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libvpx-1.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.12.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gstreamer	4afab3a8901eec34d0fb1877fae766ba	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3a928e29335bd64b81bca4d6d6197dbc
+_md5_=8254b527f6a939bc539915d4693dfe55
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-wavpack-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-wavpack-1.12.4
index fc13ca89e63d..071c6c95ea70 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-wavpack-1.12.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-wavpack-1.12.4
@@ -4,11 +4,11 @@ DESCRIPTION=Wavpack audio encoder/decoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=GPL-2
 RDEPEND=>=media-sound/wavpack-4.60.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-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.12.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gstreamer	4afab3a8901eec34d0fb1877fae766ba	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e6b568190f59a56352d282b2a1ec23a0
+_md5_=6d2ea0a0788c4174e4517f0297024e27
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-x264-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-x264-1.12.4
index 04081f786353..2a023b83aab6 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-x264-1.12.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-x264-1.12.4
@@ -4,11 +4,11 @@ DESCRIPTION=H.264 encoder plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=GPL-2
 RDEPEND=>=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-ugly-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.12.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gstreamer	4afab3a8901eec34d0fb1877fae766ba	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1b36a518a6b4424cac73c0a3fb1166c7
+_md5_=579eb0df4c2e24e86a8615dc48b805b8
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.12.4
index d04fb39cdd62..81b70ce3168c 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.12.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.12.4
@@ -4,11 +4,11 @@ DESCRIPTION=X11 video capture stream plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/gst-plugins-base-1.12.4: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(-)?] >=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/libXdamage-1.1.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.12.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gstreamer	4afab3a8901eec34d0fb1877fae766ba	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c36b59b3e536e5a46e0cc95f1d8c5a26
+_md5_=fa5ea4decc2712ddcb5d006e14abdd5f
diff --git a/metadata/md5-cache/media-plugins/vamp-aubio-plugins-0.5.0 b/metadata/md5-cache/media-plugins/vamp-aubio-plugins-0.5.0
index 6898e6e4cdfb..e9edf006f6ba 100644
--- a/metadata/md5-cache/media-plugins/vamp-aubio-plugins-0.5.0
+++ b/metadata/md5-cache/media-plugins/vamp-aubio-plugins-0.5.0
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile install
 DEPEND=>=media-libs/aubio-0.4.1 media-libs/vamp-plugin-sdk =sci-libs/fftw-3*
 DESCRIPTION=Onset detection, pitch tracking, note tracking and tempo tracking plugins
 EAPI=5
-HOMEPAGE=http://www.vamp-plugins.org/
+HOMEPAGE=https://www.vamp-plugins.org/
 KEYWORDS=amd64 ~ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/aubio-0.4.1 media-libs/vamp-plugin-sdk =sci-libs/fftw-3*
 SLOT=0
-SRC_URI=http://aubio.org/pub/vamp-aubio-plugins/vamp-aubio-plugins-0.5.0.tar.bz2
+SRC_URI=https://aubio.org/pub/vamp-aubio-plugins/vamp-aubio-plugins-0.5.0.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3ebc2e987750a6ceed80a2ffb6982d91
+_md5_=d2b6808074bcd2c3ef5f9f4c6fb1205b
diff --git a/metadata/md5-cache/media-plugins/vamp-aubio-plugins-0.5.1 b/metadata/md5-cache/media-plugins/vamp-aubio-plugins-0.5.1
index bd2ad86a4e07..fbb52170c6c3 100644
--- a/metadata/md5-cache/media-plugins/vamp-aubio-plugins-0.5.1
+++ b/metadata/md5-cache/media-plugins/vamp-aubio-plugins-0.5.1
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install setup
 DEPEND=>=media-libs/aubio-0.4.1 media-libs/vamp-plugin-sdk =sci-libs/fftw-3* || ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] )
 DESCRIPTION=Onset detection, pitch tracking, note tracking and tempo tracking plugins
 EAPI=5
-HOMEPAGE=http://www.vamp-plugins.org/
+HOMEPAGE=https://www.vamp-plugins.org/
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/aubio-0.4.1 media-libs/vamp-plugin-sdk =sci-libs/fftw-3*
 SLOT=0
-SRC_URI=http://aubio.org/pub/vamp-aubio-plugins/vamp-aubio-plugins-0.5.1.tar.bz2
+SRC_URI=https://aubio.org/pub/vamp-aubio-plugins/vamp-aubio-plugins-0.5.1.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	d1ea2758053cbb7c5b38b8f88654468d
-_md5_=dd620e74a5a8153dd23960ac341b70e7
+_md5_=6108deca976560f516fe38cc53e11ddc
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index c8bcf6bf31bf..ce156b1ab633 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/ecasound-2.6.0-r1 b/metadata/md5-cache/media-sound/ecasound-2.6.0-r1
index 4bc7f673a2b3..1e7fbd12a9e5 100644
--- a/metadata/md5-cache/media-sound/ecasound-2.6.0-r1
+++ b/metadata/md5-cache/media-sound/ecasound-2.6.0-r1
@@ -2,13 +2,13 @@ DEFINED_PHASES=configure install setup
 DEPEND=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(+)] ) jack? ( media-sound/jack-audio-connection-kit ) media-libs/ladspa-sdk audiofile? ( media-libs/audiofile ) alsa? ( media-libs/alsa-lib ) vorbis? ( media-libs/libvorbis ) libsamplerate? ( media-libs/libsamplerate ) mikmod? ( media-libs/libmikmod:0 ) ruby? ( dev-lang/ruby ) python? ( dev-lang/python ) ncurses? ( sys-libs/ncurses ) sndfile? ( media-libs/libsndfile ) sys-libs/readline
 DESCRIPTION=a package for multitrack audio processing
 EAPI=6
-HOMEPAGE=http://ecasound.seul.org/ecasound
+HOMEPAGE=https://ecasound.seul.org/ecasound/
 IUSE=alsa audiofile debug doc jack libsamplerate mikmod ncurses vorbis oss python ruby sndfile python_targets_python2_7
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=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(+)] ) jack? ( media-sound/jack-audio-connection-kit ) media-libs/ladspa-sdk audiofile? ( media-libs/audiofile ) alsa? ( media-libs/alsa-lib ) vorbis? ( media-libs/libvorbis ) libsamplerate? ( media-libs/libsamplerate ) mikmod? ( media-libs/libmikmod:0 ) ruby? ( dev-lang/ruby ) python? ( dev-lang/python ) ncurses? ( sys-libs/ncurses ) sndfile? ( media-libs/libsndfile ) sys-libs/readline
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=1
-SRC_URI=http://ecasound.seul.org/download/ecasound-2.6.0.tar.gz
+SRC_URI=https://ecasound.seul.org/download/ecasound-2.6.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a24d862aa74ca27052525accd916be4e
+_md5_=6ccb02058d72ca369735487aa0dc7523
diff --git a/metadata/md5-cache/media-sound/ecasound-2.9.1-r1 b/metadata/md5-cache/media-sound/ecasound-2.9.1-r1
index 668e507e8668..cd3654b2af5f 100644
--- a/metadata/md5-cache/media-sound/ecasound-2.9.1-r1
+++ b/metadata/md5-cache/media-sound/ecasound-2.9.1-r1
@@ -2,13 +2,13 @@ DEFINED_PHASES=configure install prepare setup
 DEPEND=sys-libs/readline:0= alsa? ( media-libs/alsa-lib:= ) audiofile? ( media-libs/audiofile:= ) jack? ( virtual/jack:= ) libsamplerate? ( media-libs/libsamplerate:= ) lv2? ( >=media-libs/lilv-0.5.0:= ) media-libs/ladspa-sdk mikmod? ( media-libs/libmikmod:0= ) ncurses? ( sys-libs/ncurses:0= ) oil? ( dev-libs/liboil:= ) osc? ( media-libs/liblo:= ) 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(+)] ) ruby? ( dev-lang/ruby ) sndfile? ( media-libs/libsndfile:= ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=a package for multitrack audio processing
 EAPI=6
-HOMEPAGE=http://ecasound.seul.org/ecasound
+HOMEPAGE=https://ecasound.seul.org/ecasound/
 IUSE=alsa audiofile debug doc jack libsamplerate lv2 mikmod ncurses oil osc oss python ruby sndfile static-libs test python_targets_python2_7
 KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-2
 RDEPEND=sys-libs/readline:0= alsa? ( media-libs/alsa-lib:= ) audiofile? ( media-libs/audiofile:= ) jack? ( virtual/jack:= ) libsamplerate? ( media-libs/libsamplerate:= ) lv2? ( >=media-libs/lilv-0.5.0:= ) media-libs/ladspa-sdk mikmod? ( media-libs/libmikmod:0= ) ncurses? ( sys-libs/ncurses:0= ) oil? ( dev-libs/liboil:= ) osc? ( media-libs/liblo:= ) 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(+)] ) ruby? ( dev-lang/ruby ) sndfile? ( media-libs/libsndfile:= )
 REQUIRED_USE=test? ( lv2 ) python? ( python_targets_python2_7 )
 SLOT=1
-SRC_URI=http://ecasound.seul.org/download/ecasound-2.9.1.tar.gz
+SRC_URI=https://ecasound.seul.org/download/ecasound-2.9.1.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3fad9e7ac306532d17a3bc1eb6b660c1
+_md5_=a135f9c101c9cafee56efd654582a106
diff --git a/metadata/md5-cache/media-sound/grip-3.7.0 b/metadata/md5-cache/media-sound/grip-3.8.0
index 5ceb35c6b09d..eed5c65a628c 100644
--- a/metadata/md5-cache/media-sound/grip-3.7.0
+++ b/metadata/md5-cache/media-sound/grip-3.8.0
@@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=gnome-base/libgnome >=gnome-base/libgnomeui-2.2.0 >=media-libs/id3lib-3.8.3 media-sound/cdparanoia media-sound/lame net-misc/curl >=x11-libs/gtk+-2.2:2 x11-libs/libX11 x11-libs/pango x11-libs/vte:0 vorbis? ( media-sound/vorbis-tools )
 SLOT=0
-SRC_URI=mirror://sourceforge/grip/grip-3.7.0.tar.gz
+SRC_URI=mirror://sourceforge/grip/grip-3.8.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d0ca3b8c9b8c9f8094af0546017f5fe3
diff --git a/metadata/md5-cache/media-sound/pulseeffects-3.1.6 b/metadata/md5-cache/media-sound/pulseeffects-3.1.6
index 88d01b2e57c1..ee885a5f3067 100644
--- a/metadata/md5-cache/media-sound/pulseeffects-3.1.6
+++ b/metadata/md5-cache/media-sound/pulseeffects-3.1.6
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-python/configparser ) dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/gst-python-1.12.0:1.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-plugins/swh-plugins >=x11-libs/gtk+-3.18:3 dev-python/numpy[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sci-libs/scipy-0.18[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=media-libs/lilv-0.24.2-r1 >=media-plugins/calf-0.90.0[lv2] >=media-libs/gstreamer-1.12.0:1.0 >=media-libs/gst-plugins-good-1.12.0:1.0 >=media-libs/gst-plugins-bad-1.12.0:1.0 >=media-plugins/gst-plugins-ladspa-1.12.0:1.0 >=media-plugins/gst-plugins-lv2-1.12.0:1.0 >=media-plugins/gst-plugins-pulse-1.12.0:1.0 media-sound/pulseaudio[equalizer]
 SLOT=0
 SRC_URI=https://github.com/wwmm/pulseeffects/archive/v3.1.6.tar.gz -> pulseeffects-3.1.6.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	ecfaf615b512dc4ff2a50a35e6b26c09	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	53e3ab209402d5ad07a9c4580c423d1a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=21d2cf99afa7a6c246985eb6b44636e6
diff --git a/metadata/md5-cache/media-sound/pulseeffects-3.2.3 b/metadata/md5-cache/media-sound/pulseeffects-3.2.3
index 3293a6afe11c..ac717d1c3e48 100644
--- a/metadata/md5-cache/media-sound/pulseeffects-3.2.3
+++ b/metadata/md5-cache/media-sound/pulseeffects-3.2.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-python/configparser ) dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/gst-python-1.12.0:1.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=x11-libs/gtk+-3.18:3 dev-python/numpy[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sci-libs/scipy-0.18[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=media-libs/lilv-0.24.2-r1 >=media-plugins/calf-0.90.0[lv2] >=media-libs/gstreamer-1.12.0:1.0 >=media-libs/gst-plugins-good-1.12.0:1.0 >=media-libs/gst-plugins-bad-1.12.0:1.0 >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 >=media-plugins/gst-plugins-ladspa-1.12.0:1.0 >=media-plugins/gst-plugins-lv2-1.12.0:1.0 >=media-plugins/gst-plugins-pulse-1.12.0:1.0 media-sound/pulseaudio[equalizer]
 SLOT=0
 SRC_URI=https://github.com/wwmm/pulseeffects/archive/v3.2.3.tar.gz -> pulseeffects-3.2.3.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	ecfaf615b512dc4ff2a50a35e6b26c09	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	53e3ab209402d5ad07a9c4580c423d1a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=22478e778c4ef05f32bf0f85bac4d076
diff --git a/metadata/md5-cache/media-sound/pulseeffects-9999 b/metadata/md5-cache/media-sound/pulseeffects-9999
index 87570322e6b2..c301595b4834 100644
--- a/metadata/md5-cache/media-sound/pulseeffects-9999
+++ b/metadata/md5-cache/media-sound/pulseeffects-9999
@@ -7,5 +7,5 @@ IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 LICENSE=GPL-3
 RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-python/configparser ) dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/gst-python-1.12.0:1.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=x11-libs/gtk+-3.18:3 dev-python/numpy[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sci-libs/scipy-0.18[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=media-libs/lilv-0.24.2-r1 >=media-plugins/calf-0.90.0[lv2] >=media-libs/gstreamer-1.12.0:1.0 >=media-libs/gst-plugins-good-1.12.0:1.0 >=media-libs/gst-plugins-bad-1.12.0:1.0 >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 >=media-plugins/gst-plugins-ladspa-1.12.0:1.0 >=media-plugins/gst-plugins-lv2-1.12.0:1.0 >=media-plugins/gst-plugins-pulse-1.12.0:1.0 media-libs/rubberband media-sound/pulseaudio[equalizer]
 SLOT=0
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	git-r3	af51ccfceeb403ab80f1bf9209d372c8	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	ecfaf615b512dc4ff2a50a35e6b26c09	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	git-r3	af51ccfceeb403ab80f1bf9209d372c8	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	53e3ab209402d5ad07a9c4580c423d1a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=f00d07741e117aa6e7b06e723a84ee1a
diff --git a/metadata/md5-cache/media-sound/rosegarden-17.04 b/metadata/md5-cache/media-sound/rosegarden-17.04
index 9f5343f183b6..99f257ccb599 100644
--- a/metadata/md5-cache/media-sound/rosegarden-17.04
+++ b/metadata/md5-cache/media-sound/rosegarden-17.04
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/alsa-lib:= >=media-libs/dssi-1.0.0:= media-libs/ladspa-sdk:= media-libs/liblo:= media-libs/liblrdf:= media-libs/libsamplerate:= media-libs/libsndfile:= sci-libs/fftw:3.0 sys-libs/zlib:= virtual/jack x11-libs/libSM:= lirc? ( app-misc/lirc:= ) dev-qt/qttest:5 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
 DESCRIPTION=MIDI and audio sequencer and notation editor
 EAPI=6
-HOMEPAGE=http://www.rosegardenmusic.com/
+HOMEPAGE=https://www.rosegardenmusic.com/
 IUSE=lirc
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
@@ -10,4 +10,4 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:
 SLOT=0
 SRC_URI=mirror://sourceforge/rosegarden/rosegarden-17.04.tar.bz2
 _eclasses_=cmake-utils	49cd471f02483798c5068698836b7429	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b145f0a9d11116ce741ea78a6c4c61f2
+_md5_=3a2d563cbd7d1ffc0c8b809cc4a99efe
diff --git a/metadata/md5-cache/media-sound/rosegarden-17.12.1 b/metadata/md5-cache/media-sound/rosegarden-17.12.1
index 8265c391aa26..f213d2cadcae 100644
--- a/metadata/md5-cache/media-sound/rosegarden-17.12.1
+++ b/metadata/md5-cache/media-sound/rosegarden-17.12.1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/alsa-lib:= >=media-libs/dssi-1.0.0:= media-libs/ladspa-sdk:= media-libs/liblo:= media-libs/liblrdf:= media-libs/libsamplerate:= media-libs/libsndfile:= sci-libs/fftw:3.0 sys-libs/zlib:= virtual/jack x11-libs/libSM:= lirc? ( app-misc/lirc:= ) dev-qt/linguist-tools:5 dev-qt/qttest:5 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
 DESCRIPTION=MIDI and audio sequencer and notation editor
 EAPI=6
-HOMEPAGE=http://www.rosegardenmusic.com/
+HOMEPAGE=https://www.rosegardenmusic.com/
 IUSE=lirc
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
@@ -10,4 +10,4 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:
 SLOT=0
 SRC_URI=mirror://sourceforge/rosegarden/rosegarden-17.12.1.tar.bz2
 _eclasses_=cmake-utils	49cd471f02483798c5068698836b7429	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=adbde29b1cec969dd4488bf615aa6695
+_md5_=414076c1156d5f9f571c79a6108fabb5
diff --git a/metadata/md5-cache/media-sound/sonic-visualiser-2.5 b/metadata/md5-cache/media-sound/sonic-visualiser-2.5
index 9152241608d3..600f734904ae 100644
--- a/metadata/md5-cache/media-sound/sonic-visualiser-2.5
+++ b/metadata/md5-cache/media-sound/sonic-visualiser-2.5
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 dev-qt/qtwidgets:5 dev-qt/qtnetwork:5 dev-qt/qttest:5 media-libs/libsndfile media-libs/libsamplerate app-arch/bzip2 >=media-libs/dssi-0.9.1 media-libs/liblrdf media-libs/ladspa-sdk media-libs/speex >=media-libs/vamp-plugin-sdk-2.0 media-libs/rubberband dev-libs/sord dev-libs/serd sci-libs/fftw:3.0 osc? ( media-libs/liblo ) portaudio? ( >=media-libs/portaudio-19_pre20071207 ) jack? ( media-sound/jack-audio-connection-kit ) mad? ( media-libs/libmad ) id3tag? ( media-libs/libid3tag ) ogg? ( media-libs/libfishsound >=media-libs/liboggz-1.1.0 ) pulseaudio? ( media-sound/pulseaudio ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Music audio files viewer and analiser
 EAPI=4
-HOMEPAGE=http://www.sonicvisualiser.org/
+HOMEPAGE=https://www.sonicvisualiser.org/
 IUSE=id3tag jack mad ogg osc +portaudio pulseaudio
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( jack pulseaudio portaudio )
 SLOT=0
 SRC_URI=https://code.soundsoftware.ac.uk/attachments/download/1675/sonic-visualiser-2.5.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=680c50dc6e49ca365f59cb16f080ac38
+_md5_=3a5e3f1bb9fa514a1ab6e6253a8684a9
diff --git a/metadata/md5-cache/media-sound/sonic-visualiser-3.0.2 b/metadata/md5-cache/media-sound/sonic-visualiser-3.0.2
index b26c540830ab..54dec07c6d2f 100644
--- a/metadata/md5-cache/media-sound/sonic-visualiser-3.0.2
+++ b/metadata/md5-cache/media-sound/sonic-visualiser-3.0.2
@@ -2,7 +2,7 @@ DEFINED_PHASES=configure install postinst postrm prepare test
 DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 dev-qt/qtwidgets:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 media-libs/libsndfile media-libs/libsamplerate app-arch/bzip2 >=media-libs/dssi-0.9.1 media-libs/liblrdf media-libs/ladspa-sdk media-libs/speex >=media-libs/vamp-plugin-sdk-2.0 media-libs/rubberband dev-libs/sord dev-libs/serd sci-libs/fftw:3.0 >=dev-libs/capnproto-0.6:= osc? ( media-libs/liblo ) portaudio? ( >=media-libs/portaudio-19_pre20071207 ) jack? ( media-sound/jack-audio-connection-kit ) mad? ( media-libs/libmad ) id3tag? ( media-libs/libid3tag ) ogg? ( media-libs/libfishsound >=media-libs/liboggz-1.1.0 ) pulseaudio? ( media-sound/pulseaudio ) dev-qt/qttest:5 virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Music audio files viewer and analiser
 EAPI=5
-HOMEPAGE=http://www.sonicvisualiser.org/
+HOMEPAGE=https://www.sonicvisualiser.org/
 IUSE=id3tag jack mad ogg osc +portaudio pulseaudio
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( jack pulseaudio portaudio )
 SLOT=0
 SRC_URI=https://code.soundsoftware.ac.uk/attachments/download/2222/sonic-visualiser-3.0.2.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8a6bd708ac8f9ab1b6d39adc805a813b
+_md5_=1bcd77f302cf97f65042133cd5bd185f
diff --git a/metadata/md5-cache/media-tv/Manifest.gz b/metadata/md5-cache/media-tv/Manifest.gz
index 5e0957fb8f1f..0384a5b04167 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/kodi-9999 b/metadata/md5-cache/media-tv/kodi-9999
index 09a2e04e3e59..fe0821281f97 100644
--- a/metadata/md5-cache/media-tv/kodi-9999
+++ b/metadata/md5-cache/media-tv/kodi-9999
@@ -5,9 +5,9 @@ EAPI=6
 HOMEPAGE=https://kodi.tv/ https://kodi.wiki/
 IUSE=airplay alsa bluetooth bluray caps cec +css dbus debug dvd gbm gles lcms libressl libusb lirc mysql nfs +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf python_targets_python2_7
 LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=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(+)] airplay? ( >=app-pda/libplist-2.0.0[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.0.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat >=dev-libs/fribidi-0.19.7 cec? ( >=dev-libs/libcec-4.0 ) dev-libs/libpcre[cxx] >=dev-libs/libxml2-2.9.4 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-libs/libcdio-0.94 dev-libs/libfmt gbm? ( media-libs/mesa[gbm] ) gles? ( media-libs/mesa[gles2] ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.8 >=media-libs/libass-0.13.4 media-libs/mesa[egl] >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.0:=[encode,postproc] libressl? ( media-video/ffmpeg[libressl,-openssl] ) !libressl? ( media-video/ffmpeg[-libressl,openssl] ) ) mysql? ( virtual/mysql ) >=net-misc/curl-7.56.1 nfs? ( >=net-fs/libnfs-2.0.0:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2l:0= ) libressl? ( dev-libs/libressl:0= ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) sftp? ( net-libs/libssh[sftp] ) >=sys-libs/zlib-1.2.11 udev? ( virtual/udev ) vaapi? ( x11-libs/libva:= opengl? ( x11-libs/libva[opengl] ) system-ffmpeg? ( media-video/ffmpeg[vaapi] ) vdpau? ( x11-libs/libva[vdpau] ) wayland? ( x11-libs/libva[wayland] ) X? ( x11-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 >=x11-libs/libxkbcommon-0.4.1 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages] ) X? ( x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) lirc? ( || ( app-misc/lirc app-misc/inputlircd ) ) !media-tv/xbmc udisks? ( sys-fs/udisks:0 ) upower? ( systemd? ( sys-power/upower ) !systemd? ( || ( sys-power/upower-pm-utils sys-power/upower ) ) )
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=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(+)] airplay? ( >=app-pda/libplist-2.0.0[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.0.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat >=dev-libs/fribidi-0.19.7 cec? ( >=dev-libs/libcec-4.0 ) dev-libs/libpcre[cxx] >=dev-libs/libxml2-2.9.4 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-libs/libcdio-0.94 dev-libs/libfmt gbm? ( media-libs/mesa[gbm] ) gles? ( media-libs/mesa[gles2] ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.8 >=media-libs/libass-0.13.4 media-libs/mesa[egl] >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.0:=[encode,postproc] libressl? ( media-video/ffmpeg[libressl,-openssl] ) !libressl? ( media-video/ffmpeg[-libressl,openssl] ) ) mysql? ( virtual/mysql ) >=net-misc/curl-7.56.1 nfs? ( >=net-fs/libnfs-2.0.0:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2l:0= ) libressl? ( dev-libs/libressl:0= ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) sftp? ( net-libs/libssh[sftp] ) >=sys-libs/zlib-1.2.11 udev? ( virtual/udev ) vaapi? ( x11-libs/libva:= opengl? ( x11-libs/libva[opengl] ) system-ffmpeg? ( media-video/ffmpeg[vaapi] ) vdpau? ( x11-libs/libva[vdpau] ) wayland? ( x11-libs/libva[wayland] ) X? ( x11-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 >=x11-libs/libxkbcommon-0.4.1 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages] ) X? ( x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) lirc? ( || ( app-misc/lirc app-misc/inputlircd ) ) !media-tv/xbmc udisks? ( sys-fs/udisks:2 ) upower? ( systemd? ( sys-power/upower ) !systemd? ( || ( sys-power/upower-pm-utils sys-power/upower ) ) )
 REQUIRED_USE=python_targets_python2_7 gbm? ( gles ) || ( gles opengl ) ^^ ( gbm wayland X ) udev? ( !libusb ) udisks? ( dbus ) upower? ( dbus )
 SLOT=0
 SRC_URI=https://github.com/xbmc/libdvdcss/archive/1.4.1-Leia-Alpha-1.tar.gz -> libdvdcss-1.4.1-Leia-Alpha-1.tar.gz https://github.com/xbmc/libdvdread/archive/6.0.0-Leia-Alpha-1.tar.gz -> libdvdread-6.0.0-Leia-Alpha-1.tar.gz https://github.com/xbmc/libdvdnav/archive/6.0.0-Leia-Alpha-1.tar.gz -> libdvdnav-6.0.0-Leia-Alpha-1.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/4.0-Leia-Alpha-1.tar.gz -> ffmpeg-kodi-4.0-Leia-Alpha-1.tar.gz )
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	cmake-utils	49cd471f02483798c5068698836b7429	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7a68bde2038dbaebef161fd4d1ed0fa5
+_md5_=8e0fe706bb0517ccd724ca2ef2e1cd26
diff --git a/metadata/md5-cache/media-tv/xmltv-0.5.57 b/metadata/md5-cache/media-tv/xmltv-0.5.57
index b3b3296baeeb..df2b6a9c5070 100644
--- a/metadata/md5-cache/media-tv/xmltv-0.5.57
+++ b/metadata/md5-cache/media-tv/xmltv-0.5.57
@@ -4,11 +4,11 @@ DESCRIPTION=Set of utilities to manage TV listings stored in the XMLTV format
 EAPI=5
 HOMEPAGE=http://xmltv.org
 IUSE=ar ch dtvla uk_rt uk_bleb is it na_dd na_icons fi es_laguiatv es_miguiatv ee re huro dk se_swedb hr no_gf fr pt eu_epg tv_combiner tv_pick_cgi tv_check na_dtv za nl in il
-KEYWORDS=amd64 ppc x86 ~x86-linux
+KEYWORDS=amd64 ~ppc x86 ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-perl/libwww-perl-5.65 >=dev-perl/XML-Parser-2.34 >=dev-perl/XML-Twig-3.10 >=dev-perl/Date-Manip-5.42 >=dev-perl/XML-Writer-0.6 virtual/perl-Memoize virtual/perl-Storable >=dev-perl/Lingua-Preferred-0.2.4 >=dev-perl/Term-ProgressBar-2.03 virtual/perl-IO-Compress dev-perl/Unicode-String dev-perl/TermReadKey dev-perl/File-Slurp >=dev-lang/perl-5.6.1 dev-perl/XML-LibXML dev-lang/perl:=[-build(-)]
 REQUIRED_USE=na_icons? ( na_dd )
 SLOT=0
 SRC_URI=mirror://sourceforge/xmltv/xmltv-0.5.57.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7c333a3d11c1c1a2e3dc04c66cbe3cfb
+_md5_=a0a7957f6dd7c1ccf0252a0e1b8bc8b0
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 0eb9969ed3ff..8e1ef250bc2b 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/gnome-mpv-0.14 b/metadata/md5-cache/media-video/gnome-mpv-0.14
index 8471fdf43926..1765d1f7b35e 100644
--- a/metadata/md5-cache/media-video/gnome-mpv-0.14
+++ b/metadata/md5-cache/media-video/gnome-mpv-0.14
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.44 >=x11-libs/gtk+-3.20:3 >=media-video/mpv-0.27[libmpv] media-libs/libepoxy
 SLOT=0
 SRC_URI=https://github.com/gnome-mpv/gnome-mpv/releases/download/v0.14/gnome-mpv-0.14.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	ecfaf615b512dc4ff2a50a35e6b26c09	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	53e3ab209402d5ad07a9c4580c423d1a	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=fec7625ab79c92edbfac7175e5c28f2b
diff --git a/metadata/md5-cache/media-video/luvcview-0.2.6 b/metadata/md5-cache/media-video/luvcview-0.2.6
deleted file mode 100644
index 3aace471177b..000000000000
--- a/metadata/md5-cache/media-video/luvcview-0.2.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=media-libs/libsdl media-libs/libv4l virtual/pkgconfig
-DESCRIPTION=USB Video Class grabber
-EAPI=2
-HOMEPAGE=https://packages.qa.debian.org/l/luvcview.html
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libsdl media-libs/libv4l
-SLOT=0
-SRC_URI=mirror://debian/pool/main/l/luvcview/luvcview_0.2.6.orig.tar.gz mirror://debian/pool/main/l/luvcview/luvcview_0.2.6-4.diff.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5ca52f1b8ea77b0976a731d7fb33f52b
diff --git a/metadata/md5-cache/media-video/luvcview-0.2.6-r1 b/metadata/md5-cache/media-video/luvcview-0.2.6-r1
new file mode 100644
index 000000000000..c26ffd1033fc
--- /dev/null
+++ b/metadata/md5-cache/media-video/luvcview-0.2.6-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=media-libs/libsdl media-libs/libv4l x11-libs/libX11 virtual/pkgconfig
+DESCRIPTION=USB Video Class grabber
+EAPI=6
+HOMEPAGE=https://packages.qa.debian.org/l/luvcview.html
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl media-libs/libv4l x11-libs/libX11
+SLOT=0
+SRC_URI=mirror://debian/pool/main/l/luvcview/luvcview_0.2.6.orig.tar.gz mirror://debian/pool/main/l/luvcview/luvcview_0.2.6-4.diff.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec
+_md5_=19dd3ac1aeee4b72951035068a32c254
diff --git a/metadata/md5-cache/media-video/mjpegtools-2.1.0-r3 b/metadata/md5-cache/media-video/mjpegtools-2.1.0-r3
index 93a36f7eb324..b977422eb11e 100644
--- a/metadata/md5-cache/media-video/mjpegtools-2.1.0-r3
+++ b/metadata/md5-cache/media-video/mjpegtools-2.1.0-r3
@@ -4,11 +4,11 @@ DESCRIPTION=Tools for MJPEG video
 EAPI=6
 HOMEPAGE=http://mjpeg.sourceforge.net/
 IUSE=cpu_flags_x86_mmx dv gtk png quicktime sdl sdlgfx static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd
 LICENSE=GPL-2
 RDEPEND=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(-)?] dv? ( >=media-libs/libdv-1.0.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(-)?] ) gtk? ( x11-libs/gtk+:2 ) png? ( media-libs/libpng:0= ) quicktime? ( >=media-libs/libquicktime-1.2.4-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(-)?] ) sdl? ( >=media-libs/libsdl-1.2.15-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(-)?] >=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(-)?] sdlgfx? ( media-libs/sdl-gfx ) )
 REQUIRED_USE=sdlgfx? ( sdl )
 SLOT=1
 SRC_URI=mirror://sourceforge/mjpeg/mjpegtools-2.1.0.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9cb23d7deffe62715804ed3e5f5d40e9
+_md5_=48b7e3a992a62a0961fe5cd74daec567
diff --git a/metadata/md5-cache/media-video/pitivi-0.98.1 b/metadata/md5-cache/media-video/pitivi-0.98.1
index 1d44e78b46ef..b1d5e1d15390 100644
--- a/metadata/md5-cache/media-video/pitivi-0.98.1
+++ b/metadata/md5-cache/media-video/pitivi-0.98.1
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4[sqlite] ) python_s
 REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/pitivi/0.98/pitivi-0.98.1.tar.xz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	meson	ecfaf615b512dc4ff2a50a35e6b26c09	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	meson	53e3ab209402d5ad07a9c4580c423d1a	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=55cdce6b047ad6ec29bf29e968ab197b
diff --git a/metadata/md5-cache/media-video/simplescreenrecorder-0.3.11 b/metadata/md5-cache/media-video/simplescreenrecorder-0.3.11
new file mode 100644
index 000000000000..1fb363d5d472
--- /dev/null
+++ b/metadata/md5-cache/media-video/simplescreenrecorder-0.3.11
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/alsa-lib:0= media-libs/mesa[abi_x86_32(-)?,abi_x86_64(-)?,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-video/ffmpeg[vorbis?,vpx?,x264?,mp3?,theora?] media-video/libav[vorbis?,vpx?,x264?,mp3?,theora?] ) 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/libXext 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(-)?] virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] jack? ( virtual/jack ) pulseaudio? ( media-sound/pulseaudio ) dev-qt/linguist-tools:5 sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=A Simple Screen Recorder
+EAPI=6
+HOMEPAGE=https://www.maartenbaert.be/simplescreenrecorder
+IUSE=+asm jack mp3 pulseaudio theora vorbis vpx x264 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/alsa-lib:0= media-libs/mesa[abi_x86_32(-)?,abi_x86_64(-)?,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-video/ffmpeg[vorbis?,vpx?,x264?,mp3?,theora?] media-video/libav[vorbis?,vpx?,x264?,mp3?,theora?] ) 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/libXext 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(-)?] virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] jack? ( virtual/jack ) pulseaudio? ( media-sound/pulseaudio )
+SLOT=0
+SRC_URI=https://github.com/MaartenBaert/ssr/archive/0.3.11.tar.gz -> simplescreenrecorder-0.3.11.tar.gz
+_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	49cd471f02483798c5068698836b7429	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=89679332e719f5d8a81a827b84ff4adc
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 712f136501f5..1e8b5cfeb223 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/icinga2-2.8.2 b/metadata/md5-cache/net-analyzer/icinga2-2.8.2
deleted file mode 100644
index 2d2fc488ed2b..000000000000
--- a/metadata/md5-cache/net-analyzer/icinga2-2.8.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=dev-libs/boost-1.58-r1 console? ( dev-libs/libedit ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:= ) sys-devel/bison >=sys-devel/flex-2.5.35 apache2? ( =www-servers/apache-2* ) sys-devel/make >=dev-util/cmake-3.9.6 virtual/pkgconfig
-DESCRIPTION=Distributed, general purpose, network monitoring engine
-EAPI=6
-HOMEPAGE=http://icinga.org/icinga2
-IUSE=+mysql postgres classicui console libressl lto mail minimal nano-syntax +plugins studio +vim-syntax apache2
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=dev-libs/boost-1.58-r1 console? ( dev-libs/libedit ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:= ) plugins? ( || ( net-analyzer/monitoring-plugins net-analyzer/nagios-plugins ) ) mail? ( virtual/mailx ) classicui? ( net-analyzer/icinga[web] ) studio? ( x11-libs/wxGTK:3.0 ) apache2? ( =www-servers/apache-2* )
-REQUIRED_USE=!minimal? ( || ( mysql postgres ) )
-SLOT=0
-SRC_URI=https://github.com/Icinga/icinga2/archive/v2.8.2.tar.gz -> icinga2-2.8.2.tar.gz
-_eclasses_=cmake-utils	49cd471f02483798c5068698836b7429	depend.apache	0917334d570e07f9743a04ff85b3bf1b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b1e5ba709ebe917cd2595038ba6a6069
diff --git a/metadata/md5-cache/net-analyzer/icinga2-2.8.4 b/metadata/md5-cache/net-analyzer/icinga2-2.8.4
index 54a91a285531..40e91b6ad8c6 100644
--- a/metadata/md5-cache/net-analyzer/icinga2-2.8.4
+++ b/metadata/md5-cache/net-analyzer/icinga2-2.8.4
@@ -4,11 +4,11 @@ DESCRIPTION=Distributed, general purpose, network monitoring engine
 EAPI=6
 HOMEPAGE=http://icinga.org/icinga2
 IUSE=+mysql postgres classicui console libressl lto mail minimal nano-syntax +plugins studio +vim-syntax apache2
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=dev-libs/boost-1.58-r1 console? ( dev-libs/libedit ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:= ) plugins? ( || ( net-analyzer/monitoring-plugins net-analyzer/nagios-plugins ) ) mail? ( virtual/mailx ) classicui? ( net-analyzer/icinga[web] ) studio? ( x11-libs/wxGTK:3.0 ) apache2? ( =www-servers/apache-2* )
 REQUIRED_USE=!minimal? ( || ( mysql postgres ) )
 SLOT=0
 SRC_URI=https://github.com/Icinga/icinga2/archive/v2.8.4.tar.gz -> icinga2-2.8.4.tar.gz
 _eclasses_=cmake-utils	49cd471f02483798c5068698836b7429	depend.apache	0917334d570e07f9743a04ff85b3bf1b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cebc20df2b9306d7ee0eb2c6c55665c7
+_md5_=b1e5ba709ebe917cd2595038ba6a6069
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index 797093ecfcd9..f45c81e4b6b8 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/avahi-0.6.31-r10 b/metadata/md5-cache/net-dns/avahi-0.6.31-r10
deleted file mode 100644
index 3dccd625c5aa..000000000000
--- a/metadata/md5-cache/net-dns/avahi-0.6.31-r10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=dev-libs/libdaemon dev-libs/expat >=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(-)?] gdbm? ( >=sys-libs/gdbm-1.10-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] ) gtk? ( 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(-)?] ) gtk3? ( x11-libs/gtk+: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(-)?] ) dbus? ( >=sys-apps/dbus-1.6.18-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(-)?] ) kernel_linux? ( sys-libs/libcap ) introspection? ( dev-libs/gobject-introspection:= ) mono? ( dev-lang/mono gtk? ( dev-dotnet/gtk-sharp ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[gdbm] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] gtk? ( dev-python/pygtk ) dbus? ( dev-python/dbus-python ) ) bookmarks? ( dev-python/twisted-core dev-python/twisted-web ) dev-util/intltool >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.11* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=System which facilitates service discovery on a local network
-EAPI=5
-HOMEPAGE=http://avahi.org/
-IUSE=autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono nls python qt4 selinux test utils abi_x86_32 abi_x86_64 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_targets_python2_7
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/libdaemon dev-libs/expat >=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(-)?] gdbm? ( >=sys-libs/gdbm-1.10-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] ) gtk? ( 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(-)?] ) gtk3? ( x11-libs/gtk+: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(-)?] ) dbus? ( >=sys-apps/dbus-1.6.18-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(-)?] ) kernel_linux? ( sys-libs/libcap ) introspection? ( dev-libs/gobject-introspection:= ) mono? ( dev-lang/mono gtk? ( dev-dotnet/gtk-sharp ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[gdbm] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] gtk? ( dev-python/pygtk ) dbus? ( dev-python/dbus-python ) ) bookmarks? ( dev-python/twisted-core dev-python/twisted-web ) howl-compat? ( !net-misc/howl ) mdnsresponder-compat? ( !net-misc/mDNSResponder ) selinux? ( sec-policy/selinux-avahi )
-REQUIRED_USE=utils? ( || ( gtk gtk3 ) ) python? ( dbus gdbm || ( python_targets_python2_7 ) ) mono? ( dbus ) howl-compat? ( dbus ) mdnsresponder-compat? ( dbus )
-SLOT=0
-SRC_URI=http://avahi.org/download/avahi-0.6.31.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5b1f29626d7f84d67f89364dd6260dec
diff --git a/metadata/md5-cache/net-dns/avahi-0.6.31-r11 b/metadata/md5-cache/net-dns/avahi-0.6.31-r11
deleted file mode 100644
index cd9547819579..000000000000
--- a/metadata/md5-cache/net-dns/avahi-0.6.31-r11
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=dev-libs/libdaemon dev-libs/expat >=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(-)?] gdbm? ( >=sys-libs/gdbm-1.10-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] ) gtk? ( 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(-)?] ) gtk3? ( x11-libs/gtk+: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(-)?] ) dbus? ( >=sys-apps/dbus-1.6.18-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(-)?] ) kernel_linux? ( sys-libs/libcap ) introspection? ( dev-libs/gobject-introspection:= ) mono? ( dev-lang/mono gtk? ( dev-dotnet/gtk-sharp ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[gdbm] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] gtk? ( dev-python/pygtk ) dbus? ( dev-python/dbus-python ) ) bookmarks? ( dev-python/twisted-core dev-python/twisted-web ) dev-util/intltool >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.11* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=System which facilitates service discovery on a local network
-EAPI=5
-HOMEPAGE=http://avahi.org/
-IUSE=autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono nls python qt4 selinux test utils abi_x86_32 abi_x86_64 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_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/libdaemon dev-libs/expat >=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(-)?] gdbm? ( >=sys-libs/gdbm-1.10-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] ) gtk? ( 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(-)?] ) gtk3? ( x11-libs/gtk+: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(-)?] ) dbus? ( >=sys-apps/dbus-1.6.18-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(-)?] ) kernel_linux? ( sys-libs/libcap ) introspection? ( dev-libs/gobject-introspection:= ) mono? ( dev-lang/mono gtk? ( dev-dotnet/gtk-sharp ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[gdbm] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] gtk? ( dev-python/pygtk ) dbus? ( dev-python/dbus-python ) ) bookmarks? ( dev-python/twisted-core dev-python/twisted-web ) howl-compat? ( !net-misc/howl ) mdnsresponder-compat? ( !net-misc/mDNSResponder ) selinux? ( sec-policy/selinux-avahi )
-REQUIRED_USE=utils? ( || ( gtk gtk3 ) ) python? ( dbus gdbm || ( python_targets_python2_7 ) ) mono? ( dbus ) howl-compat? ( dbus ) mdnsresponder-compat? ( dbus )
-SLOT=0
-SRC_URI=http://avahi.org/download/avahi-0.6.31.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ec7c2ba021f47047055819538f73e6d2
diff --git a/metadata/md5-cache/net-dns/avahi-0.6.32 b/metadata/md5-cache/net-dns/avahi-0.6.32
index 6ad4b7c834df..1c1b2aed6cfd 100644
--- a/metadata/md5-cache/net-dns/avahi-0.6.32
+++ b/metadata/md5-cache/net-dns/avahi-0.6.32
@@ -4,11 +4,11 @@ DESCRIPTION=System which facilitates service discovery on a local network
 EAPI=5
 HOMEPAGE=http://avahi.org/
 IUSE=autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono nls python qt4 selinux test utils abi_x86_32 abi_x86_64 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_targets_python2_7
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86
+KEYWORDS=hppa
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/libdaemon dev-libs/expat 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(-)?] gdbm? ( sys-libs/gdbm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] ) gtk? ( 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(-)?] ) gtk3? ( x11-libs/gtk+: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(-)?] ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( sys-libs/libcap ) introspection? ( dev-libs/gobject-introspection:= ) mono? ( dev-lang/mono gtk? ( dev-dotnet/gtk-sharp ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[gdbm] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] gtk? ( dev-python/pygtk ) dbus? ( dev-python/dbus-python ) ) bookmarks? ( dev-python/twisted-core dev-python/twisted-web ) howl-compat? ( !net-misc/howl ) mdnsresponder-compat? ( !net-misc/mDNSResponder ) selinux? ( sec-policy/selinux-avahi )
 REQUIRED_USE=utils? ( || ( gtk gtk3 ) ) python? ( dbus gdbm || ( python_targets_python2_7 ) ) mono? ( dbus ) howl-compat? ( dbus ) mdnsresponder-compat? ( dbus )
 SLOT=0
 SRC_URI=https://github.com/lathiat/avahi/archive/v0.6.32.tar.gz -> avahi-0.6.32.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ed19c2dbd89ffbec944e2c191709a8e0
+_md5_=ad1b7e63887f30a8df6e14bcf1d7268e
diff --git a/metadata/md5-cache/net-dns/avahi-0.6.32-r1 b/metadata/md5-cache/net-dns/avahi-0.6.32-r1
deleted file mode 100644
index 7e36c2b29298..000000000000
--- a/metadata/md5-cache/net-dns/avahi-0.6.32-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=dev-libs/libdaemon dev-libs/expat 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(-)?] gdbm? ( sys-libs/gdbm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] ) gtk? ( 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(-)?] ) gtk3? ( x11-libs/gtk+: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(-)?] ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( sys-libs/libcap ) introspection? ( dev-libs/gobject-introspection:= ) mono? ( dev-lang/mono gtk? ( dev-dotnet/gtk-sharp ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[gdbm] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] gtk? ( dev-python/pygtk ) dbus? ( dev-python/dbus-python ) ) bookmarks? ( dev-python/twisted-core dev-python/twisted-web ) doc? ( app-doc/doxygen ) app-doc/xmltoman dev-util/intltool virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.11* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=System which facilitates service discovery on a local network
-EAPI=5
-HOMEPAGE=http://avahi.org/
-IUSE=autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono nls python qt4 selinux test utils abi_x86_32 abi_x86_64 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_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/libdaemon dev-libs/expat 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(-)?] gdbm? ( sys-libs/gdbm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] ) gtk? ( 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(-)?] ) gtk3? ( x11-libs/gtk+: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(-)?] ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( sys-libs/libcap ) introspection? ( dev-libs/gobject-introspection:= ) mono? ( dev-lang/mono gtk? ( dev-dotnet/gtk-sharp ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[gdbm] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] gtk? ( dev-python/pygtk ) dbus? ( dev-python/dbus-python ) ) bookmarks? ( dev-python/twisted-core dev-python/twisted-web ) howl-compat? ( !net-misc/howl ) mdnsresponder-compat? ( !net-misc/mDNSResponder ) selinux? ( sec-policy/selinux-avahi )
-REQUIRED_USE=utils? ( || ( gtk gtk3 ) ) python? ( dbus gdbm || ( python_targets_python2_7 ) ) mono? ( dbus ) howl-compat? ( dbus ) mdnsresponder-compat? ( dbus )
-SLOT=0
-SRC_URI=https://github.com/lathiat/avahi/archive/v0.6.32.tar.gz -> avahi-0.6.32.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=74a8ccd42d15c62eb20e6e32ad1b1244
diff --git a/metadata/md5-cache/net-dns/avahi-0.6.32-r2 b/metadata/md5-cache/net-dns/avahi-0.6.32-r2
deleted file mode 100644
index 130d89845669..000000000000
--- a/metadata/md5-cache/net-dns/avahi-0.6.32-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=dev-libs/libdaemon dev-libs/expat 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(-)?] gdbm? ( sys-libs/gdbm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] ) gtk? ( 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(-)?] ) gtk3? ( x11-libs/gtk+: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(-)?] ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( sys-libs/libcap ) introspection? ( dev-libs/gobject-introspection:= ) mono? ( dev-lang/mono gtk? ( dev-dotnet/gtk-sharp ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[gdbm] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] gtk? ( dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dbus? ( dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) bookmarks? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[gdbm] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/twisted-16.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) doc? ( app-doc/doxygen ) app-doc/xmltoman dev-util/intltool virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.11* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=System which facilitates service discovery on a local network
-EAPI=5
-HOMEPAGE=http://avahi.org/
-IUSE=autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono nls python qt4 selinux test utils abi_x86_32 abi_x86_64 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_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/libdaemon dev-libs/expat 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(-)?] gdbm? ( sys-libs/gdbm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] ) gtk? ( 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(-)?] ) gtk3? ( x11-libs/gtk+: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(-)?] ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( sys-libs/libcap ) introspection? ( dev-libs/gobject-introspection:= ) mono? ( dev-lang/mono gtk? ( dev-dotnet/gtk-sharp ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[gdbm] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] gtk? ( dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dbus? ( dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) bookmarks? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[gdbm] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/twisted-16.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) howl-compat? ( !net-misc/howl ) mdnsresponder-compat? ( !net-misc/mDNSResponder ) selinux? ( sec-policy/selinux-avahi )
-REQUIRED_USE=utils? ( || ( gtk gtk3 ) ) python? ( dbus gdbm || ( python_targets_python2_7 ) ) mono? ( dbus ) howl-compat? ( dbus ) mdnsresponder-compat? ( dbus )
-SLOT=0
-SRC_URI=https://github.com/lathiat/avahi/archive/v0.6.32.tar.gz -> avahi-0.6.32.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9123b7d4edabe99d3f4bcf5d24cd5f10
diff --git a/metadata/md5-cache/net-dns/avahi-0.7 b/metadata/md5-cache/net-dns/avahi-0.7
deleted file mode 100644
index 32c02ab44326..000000000000
--- a/metadata/md5-cache/net-dns/avahi-0.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=dev-libs/libdaemon dev-libs/expat 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(-)?] gdbm? ( sys-libs/gdbm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] ) gtk? ( 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(-)?] ) gtk3? ( x11-libs/gtk+: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(-)?] ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( sys-libs/libcap ) introspection? ( dev-libs/gobject-introspection:= ) mono? ( dev-lang/mono gtk? ( dev-dotnet/gtk-sharp ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[gdbm] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dbus? ( dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) introspection? ( dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) bookmarks? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[gdbm] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/twisted-16.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) doc? ( app-doc/doxygen ) app-doc/xmltoman dev-util/intltool virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.11* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=System which facilitates service discovery on a local network
-EAPI=6
-HOMEPAGE=http://avahi.org/
-IUSE=autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono nls python qt4 selinux 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 python_targets_python2_7
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/libdaemon dev-libs/expat 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(-)?] gdbm? ( sys-libs/gdbm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] ) gtk? ( 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(-)?] ) gtk3? ( x11-libs/gtk+: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(-)?] ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( sys-libs/libcap ) introspection? ( dev-libs/gobject-introspection:= ) mono? ( dev-lang/mono gtk? ( dev-dotnet/gtk-sharp ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[gdbm] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dbus? ( dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) introspection? ( dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) bookmarks? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[gdbm] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/twisted-16.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) howl-compat? ( !net-misc/howl ) mdnsresponder-compat? ( !net-misc/mDNSResponder ) selinux? ( sec-policy/selinux-avahi )
-REQUIRED_USE=python? ( dbus gdbm || ( python_targets_python2_7 ) ) mono? ( dbus ) howl-compat? ( dbus ) mdnsresponder-compat? ( dbus )
-SLOT=0
-SRC_URI=https://github.com/lathiat/avahi/archive/v0.7.tar.gz -> avahi-0.7.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9347007e826d13aec23a8f7ce287c402
diff --git a/metadata/md5-cache/net-dns/libidn-1.35 b/metadata/md5-cache/net-dns/libidn-1.35
index d58568ffe7a4..bfdacd893742 100644
--- a/metadata/md5-cache/net-dns/libidn-1.35
+++ b/metadata/md5-cache/net-dns/libidn-1.35
@@ -4,10 +4,10 @@ DESCRIPTION=Internationalized Domain Names (IDN) implementation
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/libidn/
 IUSE=doc emacs java mono nls static-libs elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 GPL-3 LGPL-3 java? ( Apache-2.0 )
 RDEPEND=emacs? ( virtual/emacs ) mono? ( >=dev-lang/mono-0.95 ) nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/12
 SRC_URI=mirror://gnu/libidn/libidn-1.35.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=3a7808629b0612de0b346dc4c674db7c
+_md5_=0a5ccdb7a8e6b245ccbb3cbc5e5dbd74
diff --git a/metadata/md5-cache/net-dns/pdns-4.1.3 b/metadata/md5-cache/net-dns/pdns-4.1.3
new file mode 100644
index 000000000000..823869cfa9ec
--- /dev/null
+++ b/metadata/md5-cache/net-dns/pdns-4.1.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst
+DEPEND=libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:= ) >=dev-libs/boost-1.35:= botan? ( dev-libs/botan:2= ) lua? ( !luajit? ( dev-lang/lua:= ) luajit? ( dev-lang/luajit:= ) ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:= ) ldap? ( >=net-nds/openldap-2.0.27-r4 app-crypt/mit-krb5 ) sqlite? ( dev-db/sqlite:3 ) opendbx? ( dev-db/opendbx ) geoip? ( >=dev-cpp/yaml-cpp-0.5.1 dev-libs/geoip ) sodium? ( dev-libs/libsodium:= ) tinydns? ( >=dev-db/tinycdb-0.77 ) protobuf? ( dev-libs/protobuf ) virtual/pkgconfig doc? ( app-doc/doxygen )
+DESCRIPTION=The PowerDNS Daemon
+EAPI=6
+HOMEPAGE=https://www.powerdns.com/
+IUSE=botan debug doc geoip ldap libressl lua luajit mydns mysql opendbx postgres protobuf remote sodium sqlite systemd tools tinydns test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:= ) >=dev-libs/boost-1.35:= botan? ( dev-libs/botan:2= ) lua? ( !luajit? ( dev-lang/lua:= ) luajit? ( dev-lang/luajit:= ) ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:= ) ldap? ( >=net-nds/openldap-2.0.27-r4 app-crypt/mit-krb5 ) sqlite? ( dev-db/sqlite:3 ) opendbx? ( dev-db/opendbx ) geoip? ( >=dev-cpp/yaml-cpp-0.5.1 dev-libs/geoip ) sodium? ( dev-libs/libsodium:= ) tinydns? ( >=dev-db/tinycdb-0.77 ) protobuf? ( dev-libs/protobuf )
+REQUIRED_USE=mydns? ( mysql )
+SLOT=0
+SRC_URI=https://downloads.powerdns.com/releases/pdns-4.1.3.tar.bz2
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b4f63d25cca4e5511ad01318eb885121
diff --git a/metadata/md5-cache/net-dns/pdns-recursor-4.1.3 b/metadata/md5-cache/net-dns/pdns-recursor-4.1.3
new file mode 100644
index 000000000000..b50906ccd044
--- /dev/null
+++ b/metadata/md5-cache/net-dns/pdns-recursor-4.1.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst setup
+DEPEND=!luajit? ( >=dev-lang/lua-5.1:= ) luajit? ( dev-lang/luajit:= ) protobuf? ( dev-libs/protobuf >=dev-libs/boost-1.42:= ) systemd? ( sys-apps/systemd:0= ) snmp? ( net-analyzer/net-snmp ) sodium? ( dev-libs/libsodium:= ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:= ) >=dev-libs/boost-1.35:= virtual/pkgconfig
+DESCRIPTION=The PowerDNS Recursor
+EAPI=6
+HOMEPAGE=https://www.powerdns.com/
+IUSE=libressl luajit protobuf snmp sodium systemd
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=!luajit? ( >=dev-lang/lua-5.1:= ) luajit? ( dev-lang/luajit:= ) protobuf? ( dev-libs/protobuf >=dev-libs/boost-1.42:= ) systemd? ( sys-apps/systemd:0= ) snmp? ( net-analyzer/net-snmp ) sodium? ( dev-libs/libsodium:= ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:= ) >=dev-libs/boost-1.35:= !<net-dns/pdns-2.9.20-r1
+SLOT=0
+SRC_URI=https://downloads.powerdns.com/releases/pdns-recursor-4.1.3.tar.bz2
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0527bf85c2874e25c56413f65c2fa0f4
diff --git a/metadata/md5-cache/net-fs/Manifest.gz b/metadata/md5-cache/net-fs/Manifest.gz
index 3a56b513bb53..66b1b19b8357 100644
--- a/metadata/md5-cache/net-fs/Manifest.gz
+++ b/metadata/md5-cache/net-fs/Manifest.gz
diff --git a/metadata/md5-cache/net-fs/samba-4.8.1 b/metadata/md5-cache/net-fs/samba-4.8.1
deleted file mode 100644
index d2a8208722f2..000000000000
--- a/metadata/md5-cache/net-fs/samba-4.8.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=app-arch/libarchive-3.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-lang/perl:= dev-libs/libaio[abi_x86_32(-)?,abi_x86_64(-)?,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/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,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/iniparser:0 dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,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-python/subunit[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(+),abi_x86_32(-)?,abi_x86_64(-)?,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/cmocka-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.3.2[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,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 sys-libs/ncurses: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/readline:0= >=sys-libs/talloc-2.1.11[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,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/tdb-1.3.15[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,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/tevent-0.9.36[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( virtual/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[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(+)] ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto !dev-db/ctdb ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) gpg? ( app-crypt/gpgme ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.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(-)?] ) systemd? ( sys-apps/systemd:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] ) >=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-text/docbook-xsl-stylesheets dev-libs/libxslt net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,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 || ( net-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) test? ( !system-mitkrb5? ( >=sys-libs/nss_wrapper-1.1.3 >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.7 >=sys-libs/uid_wrapper-1.2.1 ) ) virtual/pkgconfig
-DESCRIPTION=Samba Suite Version 4
-EAPI=6
-HOMEPAGE=http://www.samba.org/
-IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint ldap pam python quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_targets_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm64 ~hppa ~x86
-LICENSE=GPL-3
-RDEPEND=>=app-arch/libarchive-3.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-lang/perl:= dev-libs/libaio[abi_x86_32(-)?,abi_x86_64(-)?,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/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,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/iniparser:0 dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,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-python/subunit[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(+),abi_x86_32(-)?,abi_x86_64(-)?,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/cmocka-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.3.2[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,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 sys-libs/ncurses: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/readline:0= >=sys-libs/talloc-2.1.11[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,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/tdb-1.3.15[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,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/tevent-0.9.36[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( virtual/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[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(+)] ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto !dev-db/ctdb ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) gpg? ( app-crypt/gpgme ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.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(-)?] ) systemd? ( sys-apps/systemd:0= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] ) >=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(+)] ) client? ( net-fs/cifs-utils[ads?] ) selinux? ( sec-policy/selinux-samba ) !dev-perl/Parse-Yapp
-REQUIRED_USE=addc? ( python gnutls winbind ) addns? ( python ) ads? ( acl gnutls ldap winbind ) cluster? ( ads ) gpg? ( addc ) python? ( ldap ) test? ( python ) ?? ( system-heimdal system-mitkrb5 ) python_targets_python2_7
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://samba/stable/samba-4.8.1.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	ca370deef9d44125d829f2eb6ebc83e0	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	waf-utils	d1ea2758053cbb7c5b38b8f88654468d
-_md5_=6ad40c08836fa667b3ddacfce9b5bbe6
diff --git a/metadata/md5-cache/net-fs/samba-4.8.2 b/metadata/md5-cache/net-fs/samba-4.8.2
index 7b99e1f04f2a..7a127f2fcfc7 100644
--- a/metadata/md5-cache/net-fs/samba-4.8.2
+++ b/metadata/md5-cache/net-fs/samba-4.8.2
@@ -7,9 +7,9 @@ IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg ipri
 KEYWORDS=~amd64 ~arm64 ~hppa ~x86
 LICENSE=GPL-3
 RDEPEND=>=app-arch/libarchive-3.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-lang/perl:= dev-libs/libaio[abi_x86_32(-)?,abi_x86_64(-)?,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/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,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/iniparser:0 dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,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-python/subunit[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(+),abi_x86_32(-)?,abi_x86_64(-)?,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/cmocka-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.3.3[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,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 sys-libs/ncurses: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/readline:0= >=sys-libs/talloc-2.1.11[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,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/tdb-1.3.15[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,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/tevent-0.9.36[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( virtual/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[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(+)] ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto !dev-db/ctdb ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) gpg? ( app-crypt/gpgme ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.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(-)?] ) systemd? ( sys-apps/systemd:0= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] ) >=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(+)] ) client? ( net-fs/cifs-utils[ads?] ) selinux? ( sec-policy/selinux-samba ) !dev-perl/Parse-Yapp
-REQUIRED_USE=addc? ( python gnutls winbind ) addns? ( python ) ads? ( acl gnutls ldap winbind ) cluster? ( ads ) gpg? ( addc ) python? ( ldap ) test? ( python ) ?? ( system-heimdal system-mitkrb5 ) python_targets_python2_7
+REQUIRED_USE=addc? ( python gnutls winbind ) addns? ( python ) ads? ( acl gnutls ldap winbind ) cluster? ( ads ) gpg? ( addc ) test? ( python ) ?? ( system-heimdal system-mitkrb5 ) python_targets_python2_7
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://samba/stable/samba-4.8.2.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	ca370deef9d44125d829f2eb6ebc83e0	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	waf-utils	d1ea2758053cbb7c5b38b8f88654468d
-_md5_=7344f7044d8c151c4f7ee57210518c37
+_md5_=37257604b53d067fdeaa175ed27205be
diff --git a/metadata/md5-cache/net-fs/sshfs-3.3.1 b/metadata/md5-cache/net-fs/sshfs-3.3.1
index 761f4abbf60f..3ef799f00293 100644
--- a/metadata/md5-cache/net-fs/sshfs-3.3.1
+++ b/metadata/md5-cache/net-fs/sshfs-3.3.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-fs/fuse-3.1.0:3 >=dev-libs/glib-2.4.2 >=net-misc/openssh-4.4
 SLOT=0
 SRC_URI=https://github.com/libfuse/sshfs/releases/download/sshfs-3.3.1/sshfs-3.3.1.tar.xz
-_eclasses_=meson	ecfaf615b512dc4ff2a50a35e6b26c09	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec
+_eclasses_=meson	53e3ab209402d5ad07a9c4580c423d1a	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec
 _md5_=ded32a94a2b7cc68d5326d6c3e2c4cec
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index f2149690822f..810797b231df 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/hexchat-2.14.1 b/metadata/md5-cache/net-irc/hexchat-2.14.1
index 1570ebf4e8a8..eaf2b4fc45b5 100644
--- a/metadata/md5-cache/net-irc/hexchat-2.14.1
+++ b/metadata/md5-cache/net-irc/hexchat-2.14.1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/glib:2 dbus? ( dev-libs/dbus-glib ) gtk? ( x11-libs/gdk-pixbuf:
 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 ) )
 SLOT=0
 SRC_URI=https://dl.hexchat.net/hexchat/hexchat-2.14.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	ecfaf615b512dc4ff2a50a35e6b26c09	mono-env	1f24c032c78290b0d9a07d5b343051a7	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	53e3ab209402d5ad07a9c4580c423d1a	mono-env	1f24c032c78290b0d9a07d5b343051a7	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8e6b85647c6be92dcecccb44400d7350
diff --git a/metadata/md5-cache/net-irc/hexchat-9999 b/metadata/md5-cache/net-irc/hexchat-9999
index 89732eafea3e..fffebbce5615 100644
--- a/metadata/md5-cache/net-irc/hexchat-9999
+++ b/metadata/md5-cache/net-irc/hexchat-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2 plugin-fishlim? ( MIT )
 RDEPEND=dev-libs/glib:2 dbus? ( dev-libs/dbus-glib ) gtk? ( x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango ) libcanberra? ( media-libs/libcanberra ) libproxy? ( net-libs/libproxy ) libnotify? ( x11-libs/libnotify ) lua? ( dev-lang/lua:= ) perl? ( dev-lang/perl ) plugin-sysinfo? ( sys-apps/pciutils ) 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(+)?] ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) theme-manager? ( || ( ( dev-lang/mono[minimal] dev-dotnet/libgdiplus ) dev-lang/mono[-minimal] ) )
 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 ) )
 SLOT=0
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	git-r3	af51ccfceeb403ab80f1bf9209d372c8	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	ecfaf615b512dc4ff2a50a35e6b26c09	mono-env	1f24c032c78290b0d9a07d5b343051a7	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	git-r3	af51ccfceeb403ab80f1bf9209d372c8	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	53e3ab209402d5ad07a9c4580c423d1a	mono-env	1f24c032c78290b0d9a07d5b343051a7	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8e6b85647c6be92dcecccb44400d7350
diff --git a/metadata/md5-cache/net-irc/kvirc-5.0_pre20171001143427 b/metadata/md5-cache/net-irc/kvirc-5.0_pre20171001143427
deleted file mode 100644
index 9d799c909278..000000000000
--- a/metadata/md5-cache/net-irc/kvirc-5.0_pre20171001143427
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 sys-libs/zlib:0= x11-libs/libX11 x11-libs/libXScrnSaver audiofile? ( media-libs/audiofile ) dbus? ( dev-qt/qtdbus:5 ) dcc_video? ( dev-qt/qtmultimedia:5[widgets] ) kde? ( kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/knotifications:5 kde-frameworks/kservice:5 kde-frameworks/kwindowsystem:5 kde-frameworks/kxmlgui:5 ) perl? ( dev-lang/perl:0= ) phonon? ( media-libs/phonon[qt5(+)] ) 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(+)] ) spell? ( app-text/enchant:0= ) ssl? ( dev-libs/openssl:0= ) theora? ( media-libs/libogg media-libs/libtheora media-libs/libvorbis ) webkit? ( dev-qt/qtwebkit:5 ) virtual/pkgconfig doc? ( app-doc/doxygen ) kde? ( kde-frameworks/extra-cmake-modules:5 ) nls? ( sys-devel/gettext ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=Advanced IRC Client
-EAPI=5
-HOMEPAGE=http://www.kvirc.net/ https://github.com/kvirc/KVIrc
-IUSE=audiofile +dbus dcc_video debug doc gsm kde +nls oss +perl +phonon profile +python spell +ssl theora webkit python_targets_python2_7
-KEYWORDS=amd64 ~ppc ~ppc64 x86
-LICENSE=kvirc
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 sys-libs/zlib:0= x11-libs/libX11 x11-libs/libXScrnSaver audiofile? ( media-libs/audiofile ) dbus? ( dev-qt/qtdbus:5 ) dcc_video? ( dev-qt/qtmultimedia:5[widgets] ) kde? ( kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/knotifications:5 kde-frameworks/kservice:5 kde-frameworks/kwindowsystem:5 kde-frameworks/kxmlgui:5 ) perl? ( dev-lang/perl:0= ) phonon? ( media-libs/phonon[qt5(+)] ) 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(+)] ) spell? ( app-text/enchant:0= ) ssl? ( dev-libs/openssl:0= ) theora? ( media-libs/libogg media-libs/libtheora media-libs/libvorbis ) webkit? ( dev-qt/qtwebkit:5 ) gsm? ( media-sound/gsm )
-REQUIRED_USE=audiofile? ( oss ) python? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/kvirc/KVIrc/archive/150eeeab99ce7f340bf17e337b7ef1357ba375ad.tar.gz -> kvirc-5.0_pre20171001143427.tar.gz
-_eclasses_=cmake-utils	49cd471f02483798c5068698836b7429	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5d46002c5a0d9a718abd8f8f622ffacb
diff --git a/metadata/md5-cache/net-irc/kvirc-5.0_pre20171211100641 b/metadata/md5-cache/net-irc/kvirc-5.0_pre20171211100641
deleted file mode 100644
index 1d8c48f41751..000000000000
--- a/metadata/md5-cache/net-irc/kvirc-5.0_pre20171211100641
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 sys-libs/zlib:0= x11-libs/libX11 x11-libs/libXScrnSaver audiofile? ( media-libs/audiofile ) dbus? ( dev-qt/qtdbus:5 ) dcc_video? ( dev-qt/qtmultimedia:5[widgets] ) kde? ( kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/knotifications:5 kde-frameworks/kservice:5 kde-frameworks/kwindowsystem:5 kde-frameworks/kxmlgui:5 ) perl? ( dev-lang/perl:0= ) phonon? ( media-libs/phonon[qt5(+)] ) 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(+)] ) spell? ( app-text/enchant:0= ) ssl? ( dev-libs/openssl:0= ) theora? ( media-libs/libogg media-libs/libtheora media-libs/libvorbis ) webkit? ( dev-qt/qtwebkit:5 ) virtual/pkgconfig doc? ( app-doc/doxygen ) kde? ( kde-frameworks/extra-cmake-modules:5 ) nls? ( sys-devel/gettext ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=Advanced IRC Client
-EAPI=5
-HOMEPAGE=http://www.kvirc.net/ https://github.com/kvirc/KVIrc
-IUSE=audiofile +dbus dcc_video debug doc gsm kde +nls oss +perl +phonon profile +python spell +ssl theora webkit python_targets_python2_7
-KEYWORDS=amd64 ~ppc ~ppc64 x86
-LICENSE=kvirc
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 sys-libs/zlib:0= x11-libs/libX11 x11-libs/libXScrnSaver audiofile? ( media-libs/audiofile ) dbus? ( dev-qt/qtdbus:5 ) dcc_video? ( dev-qt/qtmultimedia:5[widgets] ) kde? ( kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/knotifications:5 kde-frameworks/kservice:5 kde-frameworks/kwindowsystem:5 kde-frameworks/kxmlgui:5 ) perl? ( dev-lang/perl:0= ) phonon? ( media-libs/phonon[qt5(+)] ) 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(+)] ) spell? ( app-text/enchant:0= ) ssl? ( dev-libs/openssl:0= ) theora? ( media-libs/libogg media-libs/libtheora media-libs/libvorbis ) webkit? ( dev-qt/qtwebkit:5 ) gsm? ( media-sound/gsm )
-REQUIRED_USE=audiofile? ( oss ) python? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/kvirc/KVIrc/archive/ed2a156892c5ce9a1ab54c50031ba59a9a34485f.tar.gz -> kvirc-5.0_pre20171211100641.tar.gz
-_eclasses_=cmake-utils	49cd471f02483798c5068698836b7429	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b8666a671db1e807f4955aee1d75fd8a
diff --git a/metadata/md5-cache/net-irc/kvirc-5.0_pre20180209140255 b/metadata/md5-cache/net-irc/kvirc-5.0_pre20180209140255
deleted file mode 100644
index fa6e96414eb9..000000000000
--- a/metadata/md5-cache/net-irc/kvirc-5.0_pre20180209140255
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 sys-libs/zlib:0= x11-libs/libX11 x11-libs/libXScrnSaver audiofile? ( media-libs/audiofile ) dbus? ( dev-qt/qtdbus:5 ) dcc_video? ( dev-qt/qtmultimedia:5[widgets] ) kde? ( kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/knotifications:5 kde-frameworks/kservice:5 kde-frameworks/kwindowsystem:5 kde-frameworks/kxmlgui:5 ) perl? ( dev-lang/perl:0= ) phonon? ( media-libs/phonon[qt5(+)] ) 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(+)] ) spell? ( app-text/enchant:0= ) ssl? ( dev-libs/openssl:0= ) theora? ( media-libs/libogg media-libs/libtheora media-libs/libvorbis ) webkit? ( dev-qt/qtwebkit:5 ) virtual/pkgconfig doc? ( app-doc/doxygen ) kde? ( kde-frameworks/extra-cmake-modules:5 ) nls? ( sys-devel/gettext ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=Advanced IRC Client
-EAPI=5
-HOMEPAGE=http://www.kvirc.net/ https://github.com/kvirc/KVIrc
-IUSE=audiofile +dbus dcc_video debug doc gsm kde +nls oss +perl +phonon profile +python spell +ssl theora webkit python_targets_python2_7
-KEYWORDS=amd64 ~ppc ~ppc64 x86
-LICENSE=kvirc
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 sys-libs/zlib:0= x11-libs/libX11 x11-libs/libXScrnSaver audiofile? ( media-libs/audiofile ) dbus? ( dev-qt/qtdbus:5 ) dcc_video? ( dev-qt/qtmultimedia:5[widgets] ) kde? ( kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/knotifications:5 kde-frameworks/kservice:5 kde-frameworks/kwindowsystem:5 kde-frameworks/kxmlgui:5 ) perl? ( dev-lang/perl:0= ) phonon? ( media-libs/phonon[qt5(+)] ) 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(+)] ) spell? ( app-text/enchant:0= ) ssl? ( dev-libs/openssl:0= ) theora? ( media-libs/libogg media-libs/libtheora media-libs/libvorbis ) webkit? ( dev-qt/qtwebkit:5 ) gsm? ( media-sound/gsm )
-REQUIRED_USE=audiofile? ( oss ) python? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/kvirc/KVIrc/archive/bed7de9c146055237f62b6dfcf6d68f04b2049dd.tar.gz -> kvirc-5.0_pre20180209140255.tar.gz
-_eclasses_=cmake-utils	49cd471f02483798c5068698836b7429	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=521e250548a52083daa1bf61568dd3e0
diff --git a/metadata/md5-cache/net-irc/kvirc-5.0_pre20180401054732 b/metadata/md5-cache/net-irc/kvirc-5.0_pre20180401054732
index 3b19feaf6944..2412a8637170 100644
--- a/metadata/md5-cache/net-irc/kvirc-5.0_pre20180401054732
+++ b/metadata/md5-cache/net-irc/kvirc-5.0_pre20180401054732
@@ -4,11 +4,11 @@ DESCRIPTION=Advanced IRC Client
 EAPI=5
 HOMEPAGE=http://www.kvirc.net/ https://github.com/kvirc/KVIrc
 IUSE=audiofile +dbus dcc_video debug doc gsm kde +nls oss +perl +phonon profile +python spell +ssl theora webkit python_targets_python2_7
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=kvirc
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 sys-libs/zlib:0= x11-libs/libX11 x11-libs/libXScrnSaver audiofile? ( media-libs/audiofile ) dbus? ( dev-qt/qtdbus:5 ) dcc_video? ( dev-qt/qtmultimedia:5[widgets] ) kde? ( kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/knotifications:5 kde-frameworks/kservice:5 kde-frameworks/kwindowsystem:5 kde-frameworks/kxmlgui:5 ) perl? ( dev-lang/perl:0= ) phonon? ( media-libs/phonon[qt5(+)] ) 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(+)] ) spell? ( app-text/enchant:0= ) ssl? ( dev-libs/openssl:0= ) theora? ( media-libs/libogg media-libs/libtheora media-libs/libvorbis ) webkit? ( dev-qt/qtwebkit:5 ) gsm? ( media-sound/gsm )
 REQUIRED_USE=audiofile? ( oss ) python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/kvirc/KVIrc/archive/e6915e5ed77aef19080aeab5ca76a61faf1d4e41.tar.gz -> kvirc-5.0_pre20180401054732.tar.gz
 _eclasses_=cmake-utils	49cd471f02483798c5068698836b7429	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bac2729c2a1bdf34593a83f295e0b02c
+_md5_=a960d899e455e50df3fc0251fe2eb411
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 7f91d5ae6416..1c4d8904a3f6 100644
--- a/metadata/md5-cache/net-libs/Manifest.gz
+++ b/metadata/md5-cache/net-libs/Manifest.gz
diff --git a/metadata/md5-cache/net-libs/libgadu-1.11.4 b/metadata/md5-cache/net-libs/libgadu-1.11.4
index 8901d0d9240b..edef0a4cca32 100644
--- a/metadata/md5-cache/net-libs/libgadu-1.11.4
+++ b/metadata/md5-cache/net-libs/libgadu-1.11.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/zlib ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( >=dev-libs/openssl-0.9.6m ) ) doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=sys-libs/zlib ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( >=dev-libs/openssl-0.9.6m:0 ) ) doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=This library implements the client side of the Gadu-Gadu protocol
 EAPI=5
 HOMEPAGE=http://toxygen.net/libgadu/
 IUSE=doc gnutls ssl static-libs threads
 KEYWORDS=alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=LGPL-2.1
-RDEPEND=sys-libs/zlib ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( >=dev-libs/openssl-0.9.6m ) ) !=net-im/kadu-0.6.0.2 !=net-im/kadu-0.6.0.1
+RDEPEND=sys-libs/zlib ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( >=dev-libs/openssl-0.9.6m:0 ) ) !=net-im/kadu-0.6.0.2 !=net-im/kadu-0.6.0.1
 REQUIRED_USE=gnutls? ( ssl )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/wojtekka/libgadu/archive/1.11.4.tar.gz -> libgadu-1.11.4.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d630538f48b0dac48c38dff417245a4f
+_md5_=f148f167b62524955a616ff10f4a97c1
diff --git a/metadata/md5-cache/net-libs/libgadu-1.12.0 b/metadata/md5-cache/net-libs/libgadu-1.12.0
deleted file mode 100644
index 37fb4961ccf4..000000000000
--- a/metadata/md5-cache/net-libs/libgadu-1.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/protobuf-c-0.15 sys-libs/zlib ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( >=dev-libs/openssl-0.9.6m ) ) doc? ( app-doc/doxygen ) test? ( dev-libs/expat dev-libs/libxml2:2 net-misc/curl ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=This library implements the client side of the Gadu-Gadu protocol
-EAPI=5
-HOMEPAGE=http://toxygen.net/libgadu/
-IUSE=doc gnutls ssl static-libs test threads
-KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/protobuf-c-0.15 sys-libs/zlib ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( >=dev-libs/openssl-0.9.6m ) ) !=net-im/kadu-0.6.0.2 !=net-im/kadu-0.6.0.1
-REQUIRED_USE=gnutls? ( ssl )
-SLOT=0
-SRC_URI=https://github.com/wojtekka/libgadu/archive/1.12.0.tar.gz -> libgadu-1.12.0.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5d8284123b19c7b0f85ca97b7b87f3a9
diff --git a/metadata/md5-cache/net-libs/libgadu-1.12.1 b/metadata/md5-cache/net-libs/libgadu-1.12.1
deleted file mode 100644
index 5d344878f454..000000000000
--- a/metadata/md5-cache/net-libs/libgadu-1.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/protobuf-c-0.15 sys-libs/zlib ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( >=dev-libs/openssl-0.9.6m ) ) doc? ( app-doc/doxygen ) test? ( dev-libs/expat dev-libs/libxml2:2 net-misc/curl ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=This library implements the client side of the Gadu-Gadu protocol
-EAPI=5
-HOMEPAGE=http://toxygen.net/libgadu/
-IUSE=doc gnutls ssl static-libs test threads
-KEYWORDS=amd64 arm ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/protobuf-c-0.15 sys-libs/zlib ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( >=dev-libs/openssl-0.9.6m ) ) !=net-im/kadu-0.6.0.2 !=net-im/kadu-0.6.0.1
-REQUIRED_USE=gnutls? ( ssl )
-SLOT=0
-SRC_URI=https://github.com/wojtekka/libgadu/archive/1.12.1.tar.gz -> libgadu-1.12.1.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=93ef6aa965e90e7402d796f6dfac63c8
diff --git a/metadata/md5-cache/net-libs/loudmouth-1.5.3-r1 b/metadata/md5-cache/net-libs/loudmouth-1.5.3-r1
index 9960ffced811..426668efa60a 100644
--- a/metadata/md5-cache/net-libs/loudmouth-1.5.3-r1
+++ b/metadata/md5-cache/net-libs/loudmouth-1.5.3-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Lightweight C Jabber library
 EAPI=6
 HOMEPAGE=https://github.com/mcabber/loudmouth
 IUSE=asyncns ssl openssl static-libs test
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos
+KEYWORDS=~alpha ~amd64 ~arm ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.16:2 net-dns/libidn ssl? ( !openssl? ( >=net-libs/gnutls-1.4.0:0= ) openssl? ( dev-libs/openssl:0= ) ) asyncns? ( >=net-libs/libasyncns-0.3 )
 SLOT=0
 SRC_URI=https://github.com/mcabber/loudmouth/archive/1.5.3.tar.gz -> loudmouth-1.5.3.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=4b041cf5e689731c26db08338abf5412
+_md5_=d1b80fff764a0a1cae065506c82c019d
diff --git a/metadata/md5-cache/net-libs/miniupnpc-2.0.20180222 b/metadata/md5-cache/net-libs/miniupnpc-2.0.20180222
index de369bdb0d89..25b51ef84d6e 100644
--- a/metadata/md5-cache/net-libs/miniupnpc-2.0.20180222
+++ b/metadata/md5-cache/net-libs/miniupnpc-2.0.20180222
@@ -4,9 +4,9 @@ DESCRIPTION=UPnP client library and a simple UPnP client
 EAPI=6
 HOMEPAGE=http://miniupnp.free.fr/
 IUSE=ipv6 kernel_linux static-libs
-KEYWORDS=amd64 arm ~arm64 hppa ~mips ~ppc ppc64 sparc x86 ~x86-fbsd
+KEYWORDS=amd64 arm ~arm64 hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=BSD
 SLOT=0/16
 SRC_URI=http://miniupnp.free.fr/files/miniupnpc-2.0.20180222.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=5ef4990371666cb9946b4a7bda35ef35
+_md5_=3d255a40b989d047a3be90493d3dd7f9
diff --git a/metadata/md5-cache/net-libs/pjproject-2.7.2 b/metadata/md5-cache/net-libs/pjproject-2.7.2
index a70ea13c9e72..5edfe4d431f9 100644
--- a/metadata/md5-cache/net-libs/pjproject-2.7.2
+++ b/metadata/md5-cache/net-libs/pjproject-2.7.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=alsa? ( media-libs/alsa-lib ) oss? ( media-libs/portaudio[oss] ) portaudio? ( media-libs/portaudio ) amr? ( media-libs/opencore-amr ) gsm? ( media-sound/gsm ) ilbc? ( dev-libs/ilbc-rfc3951 ) opus? ( media-libs/opus ) speex? ( media-libs/speexdsp ) ffmpeg? ( virtual/ffmpeg:= ) sdl? ( media-libs/libsdl ) openh264? ( media-libs/openh264 ) resample? ( media-libs/libsamplerate ) ssl? ( dev-libs/openssl:= ) net-libs/libsrtp:0 virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=alsa? ( media-libs/alsa-lib ) oss? ( media-libs/portaudio[oss] ) portaudio? ( media-libs/portaudio ) amr? ( media-libs/opencore-amr ) gsm? ( media-sound/gsm ) ilbc? ( dev-libs/ilbc-rfc3951 ) opus? ( media-libs/opus ) speex? ( media-libs/speexdsp ) ffmpeg? ( virtual/ffmpeg:= ) sdl? ( media-libs/libsdl ) openh264? ( media-libs/openh264 ) resample? ( media-libs/libsamplerate ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) net-libs/libsrtp:0 virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Open source SIP, Media, and NAT Traversal Library
 EAPI=6
 HOMEPAGE=http://www.pjsip.org/
-IUSE=amr debug doc epoll examples ipv6 opus resample silk ssl static-libs webrtc g711 g722 g7221 gsm ilbc speex l16 sdl ffmpeg v4l2 openh264 libyuv alsa oss portaudio
+IUSE=amr debug doc epoll examples ipv6 libressl opus resample silk ssl static-libs webrtc g711 g722 g7221 gsm ilbc speex l16 sdl ffmpeg v4l2 openh264 libyuv alsa oss portaudio
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=alsa? ( media-libs/alsa-lib ) oss? ( media-libs/portaudio[oss] ) portaudio? ( media-libs/portaudio ) amr? ( media-libs/opencore-amr ) gsm? ( media-sound/gsm ) ilbc? ( dev-libs/ilbc-rfc3951 ) opus? ( media-libs/opus ) speex? ( media-libs/speexdsp ) ffmpeg? ( virtual/ffmpeg:= ) sdl? ( media-libs/libsdl ) openh264? ( media-libs/openh264 ) resample? ( media-libs/libsamplerate ) ssl? ( dev-libs/openssl:= ) net-libs/libsrtp:0
+RDEPEND=alsa? ( media-libs/alsa-lib ) oss? ( media-libs/portaudio[oss] ) portaudio? ( media-libs/portaudio ) amr? ( media-libs/opencore-amr ) gsm? ( media-sound/gsm ) ilbc? ( dev-libs/ilbc-rfc3951 ) opus? ( media-libs/opus ) speex? ( media-libs/speexdsp ) ffmpeg? ( virtual/ffmpeg:= ) sdl? ( media-libs/libsdl ) openh264? ( media-libs/openh264 ) resample? ( media-libs/libsamplerate ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) net-libs/libsrtp:0
 REQUIRED_USE=?? ( alsa oss portaudio )
 SLOT=0
 SRC_URI=http://www.pjsip.org/release/2.7.2/pjproject-2.7.2.tar.bz2
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6b21d84cde662c1868b22a52cd54ddd9
+_md5_=1ae6fbc049502e1ab993d04db1a50967
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index 8d27b26e6ec7..0cb34a9dfe36 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/dovecot-2.2.36 b/metadata/md5-cache/net-mail/dovecot-2.2.36
new file mode 100644
index 000000000000..d8d4b6adff2c
--- /dev/null
+++ b/metadata/md5-cache/net-mail/dovecot-2.2.36
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= ssl? ( || ( dev-libs/openssl:0 dev-libs/libressl:0 ) ) virtual/pkgconfig
+DESCRIPTION=An IMAP and POP3 server written with security primarily in mind
+EAPI=6
+HOMEPAGE=https://www.dovecot.org/
+IUSE=kerberos ldap mysql pam postgres sqlite vpopmail bzip2 lzma lz4 zlib caps doc ipv6 libressl lucene managesieve selinux sieve solr +ssl static-libs suid tcpd textcat ssl
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=LGPL-2.1 MIT
+RDEPEND=bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= net-mail/mailbase
+REQUIRED_USE=ssl
+SLOT=0
+SRC_URI=https://dovecot.org/releases/2.2/dovecot-2.2.36.tar.gz sieve? ( https://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.24.tar.gz ) managesieve? ( https://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.24.tar.gz )
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	ssl-cert	b5e85f9a834c71d8bd532de477fe4ce2	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ee0f8f3bbde7083b490a744792c02c58
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index a370c2a121c0..ee5eeb60ebda 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/casync-2_p20180321-r1 b/metadata/md5-cache/net-misc/casync-2_p20180321-r1
index 9867010c93e6..d3e935c58098 100644
--- a/metadata/md5-cache/net-misc/casync-2_p20180321-r1
+++ b/metadata/md5-cache/net-misc/casync-2_p20180321-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=app-arch/xz-utils app-arch/zstd dev-libs/openssl:0 net-misc/curl virtual/acl fuse? ( sys-fs/fuse:0 ) selinux? ( sys-libs/libselinux ) udev? ( virtual/libudev )
 SLOT=0
 SRC_URI=https://github.com/systemd/casync/archive/a755da21d3ba5d9cbb002dfc86a3ab0d46b82176.tar.gz -> casync-2_p20180321.tar.gz
-_eclasses_=meson	ecfaf615b512dc4ff2a50a35e6b26c09	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
+_eclasses_=meson	53e3ab209402d5ad07a9c4580c423d1a	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
 _md5_=c8ca06db38561fe0d3a4da07b35a8605
diff --git a/metadata/md5-cache/net-misc/connman-gtk-1.0 b/metadata/md5-cache/net-misc/connman-gtk-1.0
deleted file mode 100644
index 0d44b56f0f42..000000000000
--- a/metadata/md5-cache/net-misc/connman-gtk-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=>=dev-util/intltool-0.35.0 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=GTK GUI for Connman
-EAPI=5
-HOMEPAGE=https://github.com/jgke/connman-gtk
-IUSE=openconnect
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.0:2 >=x11-libs/gtk+-3.10:3 openconnect? ( >=net-vpn/openconnect-5.99 ) net-misc/connman
-SLOT=0
-SRC_URI=https://github.com/jgke/connman-gtk/archive/v1.0.tar.gz -> connman-gtk-1.0.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=cf398cac7514eb72cf5ecbdb089dd203
diff --git a/metadata/md5-cache/net-misc/connman-gtk-1.0-r1 b/metadata/md5-cache/net-misc/connman-gtk-1.0-r1
deleted file mode 100644
index c28df11410e3..000000000000
--- a/metadata/md5-cache/net-misc/connman-gtk-1.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=>=dev-util/intltool-0.35.0 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=GTK GUI for Connman
-EAPI=6
-HOMEPAGE=https://github.com/jgke/connman-gtk
-IUSE=openconnect
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.0:2 >=x11-libs/gtk+-3.10:3 openconnect? ( >=net-vpn/openconnect-5.99 ) net-misc/connman
-SLOT=0
-SRC_URI=https://github.com/jgke/connman-gtk/archive/v1.0.tar.gz -> connman-gtk-1.0.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=942c4f776dfb50bcb7cb82e0523ac225
diff --git a/metadata/md5-cache/net-misc/curl-7.60.0 b/metadata/md5-cache/net-misc/curl-7.60.0
index 413b7ebb4054..265272d6b74b 100644
--- a/metadata/md5-cache/net-misc/curl-7.60.0
+++ b/metadata/md5-cache/net-misc/curl-7.60.0
@@ -4,7 +4,7 @@ DESCRIPTION=A Client that groks URLs
 EAPI=6
 HOMEPAGE=https://curl.haxx.se/
 IUSE=adns brotli http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl elibc_Winnt abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-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=MIT
 RDEPEND=ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) brotli? ( app-arch/brotli:= ) ssl? ( curl_ssl_axtls? ( net-libs/axtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) curl_ssl_gnutls? ( net-libs/gnutls:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) curl_ssl_libressl? ( dev-libs/libressl:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) curl_ssl_mbedtls? ( net-libs/mbedtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) curl_ssl_nss? ( dev-libs/nss:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) ) http2? ( net-libs/nghttp2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( net-dns/libidn2:0[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) adns? ( net-dns/c-ares:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) metalink? ( >=media-libs/libmetalink-0.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( net-libs/libssh2[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 REQUIRED_USE=curl_ssl_winssl? ( elibc_Winnt ) threads? ( !adns ) ssl? ( ^^ ( curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss curl_ssl_openssl curl_ssl_winssl ) )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://curl.haxx.se/download/curl-7.60.0.tar.bz2
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=533ce25fdd1534943c31e76507d71a0c
+_md5_=636e8a9b32cc9542f4e783b79d831e8e
diff --git a/metadata/md5-cache/net-misc/dropbear-2016.74 b/metadata/md5-cache/net-misc/dropbear-2016.74
deleted file mode 100644
index bfd9af788b42..000000000000
--- a/metadata/md5-cache/net-misc/dropbear-2016.74
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare
-DEPEND=!static? ( zlib? ( sys-libs/zlib ) dev-libs/libtommath ) pam? ( virtual/pam ) static? ( zlib? ( sys-libs/zlib[static-libs(+)] ) dev-libs/libtommath[static-libs(+)] )
-DESCRIPTION=small SSH 2 client/server designed for small memory environments
-EAPI=5
-HOMEPAGE=http://matt.ucc.asn.au/dropbear/dropbear.html
-IUSE=bsdpty minimal multicall pam +shadow static +syslog zlib savedconfig
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=!static? ( zlib? ( sys-libs/zlib ) dev-libs/libtommath ) pam? ( virtual/pam ) pam? ( >=sys-auth/pambase-20080219.1 )
-REQUIRED_USE=pam? ( !static )
-SLOT=0
-SRC_URI=http://matt.ucc.asn.au/dropbear/releases/dropbear-2016.74.tar.bz2 http://matt.ucc.asn.au/dropbear/testing/dropbear-2016.74.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c37779f27c23864cfb554adc7e9e64b9
diff --git a/metadata/md5-cache/net-misc/dropbear-2017.75 b/metadata/md5-cache/net-misc/dropbear-2017.75
index c76b7270f06b..2c575393846d 100644
--- a/metadata/md5-cache/net-misc/dropbear-2017.75
+++ b/metadata/md5-cache/net-misc/dropbear-2017.75
@@ -2,13 +2,13 @@ DEFINED_PHASES=compile configure install postinst preinst prepare
 DEPEND=!static? ( zlib? ( sys-libs/zlib ) dev-libs/libtommath ) pam? ( virtual/pam ) static? ( zlib? ( sys-libs/zlib[static-libs(+)] ) dev-libs/libtommath[static-libs(+)] )
 DESCRIPTION=small SSH 2 client/server designed for small memory environments
 EAPI=5
-HOMEPAGE=http://matt.ucc.asn.au/dropbear/dropbear.html
+HOMEPAGE=https://matt.ucc.asn.au/dropbear/dropbear.html
 IUSE=bsdpty minimal multicall pam +shadow static +syslog zlib savedconfig
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=!static? ( zlib? ( sys-libs/zlib ) dev-libs/libtommath ) pam? ( virtual/pam ) pam? ( >=sys-auth/pambase-20080219.1 )
 REQUIRED_USE=pam? ( !static )
 SLOT=0
-SRC_URI=http://matt.ucc.asn.au/dropbear/releases/dropbear-2017.75.tar.bz2 http://matt.ucc.asn.au/dropbear/testing/dropbear-2017.75.tar.bz2
+SRC_URI=https://matt.ucc.asn.au/dropbear/releases/dropbear-2017.75.tar.bz2 https://matt.ucc.asn.au/dropbear/testing/dropbear-2017.75.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=974de853326f7fb0d6b6e87a65580c34
+_md5_=0e8fa0eddda7b10ae75c8a1742e038bb
diff --git a/metadata/md5-cache/net-misc/dropbear-2018.76 b/metadata/md5-cache/net-misc/dropbear-2018.76
index cba3ef3daf23..bbeb2b17580a 100644
--- a/metadata/md5-cache/net-misc/dropbear-2018.76
+++ b/metadata/md5-cache/net-misc/dropbear-2018.76
@@ -2,13 +2,13 @@ DEFINED_PHASES=compile configure install postinst preinst prepare
 DEPEND=!static? ( zlib? ( sys-libs/zlib ) dev-libs/libtommath ) pam? ( virtual/pam ) static? ( zlib? ( sys-libs/zlib[static-libs(+)] ) dev-libs/libtommath[static-libs(+)] )
 DESCRIPTION=small SSH 2 client/server designed for small memory environments
 EAPI=5
-HOMEPAGE=http://matt.ucc.asn.au/dropbear/dropbear.html
+HOMEPAGE=https://matt.ucc.asn.au/dropbear/dropbear.html
 IUSE=bsdpty minimal multicall pam +shadow static +syslog zlib savedconfig
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=!static? ( zlib? ( sys-libs/zlib ) dev-libs/libtommath ) pam? ( virtual/pam ) pam? ( >=sys-auth/pambase-20080219.1 )
 REQUIRED_USE=pam? ( !static )
 SLOT=0
-SRC_URI=http://matt.ucc.asn.au/dropbear/releases/dropbear-2018.76.tar.bz2 http://matt.ucc.asn.au/dropbear/testing/dropbear-2018.76.tar.bz2
+SRC_URI=https://matt.ucc.asn.au/dropbear/releases/dropbear-2018.76.tar.bz2 https://matt.ucc.asn.au/dropbear/testing/dropbear-2018.76.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=26823e32dd0afa25f362f1e458be440b
+_md5_=7a58298ca7c5e7328bd6ef9eb1f09cdc
diff --git a/metadata/md5-cache/net-misc/eventd-0.24.1 b/metadata/md5-cache/net-misc/eventd-0.24.1
index a29de93d6161..8683e5c28f21 100644
--- a/metadata/md5-cache/net-misc/eventd-0.24.1
+++ b/metadata/md5-cache/net-misc/eventd-0.24.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.40:2 sys-apps/util-linux x11-libs/libxkbcommon introsp
 REQUIRED_USE=X? ( notification ) fbcon? ( notification ) notification? ( || ( X fbcon ) ) test? ( websocket )
 SLOT=0
 SRC_URI=https://www.eventd.org/download/eventd/eventd-0.24.1.tar.xz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	ca370deef9d44125d829f2eb6ebc83e0	meson	ecfaf615b512dc4ff2a50a35e6b26c09	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	ca370deef9d44125d829f2eb6ebc83e0	meson	53e3ab209402d5ad07a9c4580c423d1a	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b946fd17b816ec589e689459f74e4acb
diff --git a/metadata/md5-cache/net-misc/stunnel-5.43 b/metadata/md5-cache/net-misc/stunnel-5.43
index 60d84069ed77..711272ef9bdb 100644
--- a/metadata/md5-cache/net-misc/stunnel-5.43
+++ b/metadata/md5-cache/net-misc/stunnel-5.43
@@ -4,11 +4,11 @@ DESCRIPTION=TLS/SSL - Port Wrapper
 EAPI=6
 HOMEPAGE=http://www.stunnel.org/index.html
 IUSE=ipv6 libressl selinux stunnel3 tcpd ssl
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-2
 RDEPEND=tcpd? ( sys-apps/tcp-wrappers ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) stunnel3? ( dev-lang/perl ) selinux? ( sec-policy/selinux-stunnel )
 RESTRICT=test
 SLOT=0
 SRC_URI=ftp://ftp.stunnel.org/stunnel/archive/5.x/stunnel-5.43.tar.gz http://www.usenix.org.uk/mirrors/stunnel/archive/5.x/stunnel-5.43.tar.gz http://ftp.nluug.nl/pub/networking/stunnel/archive/5.x/stunnel-5.43.tar.gz http://www.namesdir.com/mirrors/stunnel/archive/5.x/stunnel-5.43.tar.gz http://stunnel.cybermirror.org/archive/5.x/stunnel-5.43.tar.gz http://mirrors.zerg.biz/stunnel/archive/5.x/stunnel-5.43.tar.gz ftp://mirrors.go-parts.com/stunnel/archive/5.x/stunnel-5.43.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	ssl-cert	b5e85f9a834c71d8bd532de477fe4ce2	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=fbbb44e0bc4f44df62a0eef7c2ea4131
+_md5_=8e21c906f25fdc0c94f7492d356d94ae
diff --git a/metadata/md5-cache/net-misc/stunnel-5.45 b/metadata/md5-cache/net-misc/stunnel-5.45
new file mode 100644
index 000000000000..69681ce6dd91
--- /dev/null
+++ b/metadata/md5-cache/net-misc/stunnel-5.45
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=tcpd? ( sys-apps/tcp-wrappers ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ssl? ( || ( dev-libs/openssl:0 dev-libs/libressl:0 ) ) virtual/pkgconfig
+DESCRIPTION=TLS/SSL - Port Wrapper
+EAPI=6
+HOMEPAGE=http://www.stunnel.org/index.html
+IUSE=ipv6 libressl selinux stunnel3 tcpd ssl
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=GPL-2
+RDEPEND=tcpd? ( sys-apps/tcp-wrappers ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) stunnel3? ( dev-lang/perl ) selinux? ( sec-policy/selinux-stunnel )
+RESTRICT=test
+SLOT=0
+SRC_URI=ftp://ftp.stunnel.org/stunnel/archive/5.x/stunnel-5.45.tar.gz http://www.usenix.org.uk/mirrors/stunnel/archive/5.x/stunnel-5.45.tar.gz http://ftp.nluug.nl/pub/networking/stunnel/archive/5.x/stunnel-5.45.tar.gz http://www.namesdir.com/mirrors/stunnel/archive/5.x/stunnel-5.45.tar.gz http://stunnel.cybermirror.org/archive/5.x/stunnel-5.45.tar.gz http://mirrors.zerg.biz/stunnel/archive/5.x/stunnel-5.45.tar.gz ftp://mirrors.go-parts.com/stunnel/archive/5.x/stunnel-5.45.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	ssl-cert	b5e85f9a834c71d8bd532de477fe4ce2	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=b1971a88a921aa63f606832254b823fb
diff --git a/metadata/md5-cache/net-misc/taylor-uucp-1.07-r3 b/metadata/md5-cache/net-misc/taylor-uucp-1.07-r3
index 19e89ca6fa94..81f60f1a0b36 100644
--- a/metadata/md5-cache/net-misc/taylor-uucp-1.07-r3
+++ b/metadata/md5-cache/net-misc/taylor-uucp-1.07-r3
@@ -3,9 +3,9 @@ DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >
 DESCRIPTION=Taylor UUCP
 EAPI=5
 HOMEPAGE=https://www.airs.com/ian/uucp.html
-KEYWORDS=alpha amd64 ~arm ia64 ~ppc sparc x86
+KEYWORDS=alpha amd64 ~arm ia64 ppc sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gnu/uucp/uucp-1.07.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=29624aeb4a6f7f507610706feff78aea
+_md5_=7f04aed0f1d31cc169ec1c7d89e4b99c
diff --git a/metadata/md5-cache/net-misc/whois-5.2.12 b/metadata/md5-cache/net-misc/whois-5.2.12
deleted file mode 100644
index e2eb0a7e967c..000000000000
--- a/metadata/md5-cache/net-misc/whois-5.2.12
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=iconv? ( virtual/libiconv ) idn? ( net-dns/libidn ) nls? ( virtual/libintl ) app-arch/xz-utils >=dev-lang/perl-5 nls? ( sys-devel/gettext )
-DESCRIPTION=improved Whois Client
-EAPI=5
-HOMEPAGE=https://www.linux.it/~md/software/
-IUSE=iconv idn nls
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=iconv? ( virtual/libiconv ) idn? ( net-dns/libidn ) nls? ( virtual/libintl )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://debian/pool/main/w/whois/whois_5.2.12.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=97e6d62bc2b4c136b5523a8089b8dcac
diff --git a/metadata/md5-cache/net-misc/whois-5.3.1 b/metadata/md5-cache/net-misc/whois-5.3.1
new file mode 100644
index 000000000000..2013fff0c440
--- /dev/null
+++ b/metadata/md5-cache/net-misc/whois-5.3.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=iconv? ( virtual/libiconv ) idn? ( net-dns/libidn2 ) nls? ( virtual/libintl ) app-arch/xz-utils >=dev-lang/perl-5 virtual/pkgconfig nls? ( sys-devel/gettext )
+DESCRIPTION=improved Whois Client
+EAPI=6
+HOMEPAGE=https://www.linux.it/~md/software/
+IUSE=iconv idn nls
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=iconv? ( virtual/libiconv ) idn? ( net-dns/libidn2 ) nls? ( virtual/libintl )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://debian/pool/main/w/whois/whois_5.3.1.tar.xz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec
+_md5_=2b14f82bcdf29838d5213dd745c0451c
diff --git a/metadata/md5-cache/net-print/Manifest.gz b/metadata/md5-cache/net-print/Manifest.gz
index 24f79d85f7ed..7457903018b1 100644
--- a/metadata/md5-cache/net-print/Manifest.gz
+++ b/metadata/md5-cache/net-print/Manifest.gz
diff --git a/metadata/md5-cache/net-print/hplip-3.18.3-r1 b/metadata/md5-cache/net-print/hplip-3.18.5
index dd37a61bd880..84f21e7fa5c3 100644
--- a/metadata/md5-cache/net-print/hplip-3.18.3-r1
+++ b/metadata/md5-cache/net-print/hplip-3.18.5
@@ -2,13 +2,13 @@ DEFINED_PHASES=configure install postinst prepare setup
 DEPEND=net-print/cups virtual/jpeg:0 hpijs? ( net-print/cups-filters[foomatic] ) !minimal? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] sys-apps/dbus !libusb0? ( virtual/libusb:1 ) libusb0? ( virtual/libusb:0 ) scanner? ( media-gfx/sane-backends ) snmp? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) net-analyzer/net-snmp ) ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.13* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DESCRIPTION=HP Linux Imaging and Printing - Print, scan, fax drivers and service tools
 EAPI=6
-HOMEPAGE=http://hplipopensource.com/hplip-web/index.html
+HOMEPAGE=https://developers.hp.com/hp-linux-imaging-and-printing
 IUSE=doc fax +hpcups hpijs kde libressl -libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=net-print/cups virtual/jpeg:0 hpijs? ( net-print/cups-filters[foomatic] ) !minimal? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] sys-apps/dbus !libusb0? ( virtual/libusb:1 ) libusb0? ( virtual/libusb:0 ) scanner? ( media-gfx/sane-backends ) snmp? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) net-analyzer/net-snmp ) ) app-text/ghostscript-gpl !minimal? ( >=dev-python/dbus-python-1.2.0-r1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] python_single_target_python2_7? ( dev-python/pygobject:2[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) python_single_target_python3_4? ( dev-python/pygobject:3[python_targets_python3_4(-)?,python_single_target_python3_4(+)?,python_targets_python3_5(-)?,python_single_target_python3_5(+)?,python_targets_python3_6(-)?,python_single_target_python3_6(+)?] ) python_single_target_python3_5? ( dev-python/pygobject:3[python_targets_python3_4(-)?,python_single_target_python3_4(+)?,python_targets_python3_5(-)?,python_single_target_python3_5(+)?,python_targets_python3_6(-)?,python_single_target_python3_6(+)?] ) python_single_target_python3_6? ( dev-python/pygobject:3[python_targets_python3_4(-)?,python_single_target_python3_4(+)?,python_targets_python3_5(-)?,python_single_target_python3_5(+)?,python_targets_python3_6(-)?,python_single_target_python3_6(+)?] ) fax? ( dev-python/reportlab[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) kernel_linux? ( virtual/udev ) qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) scanner? ( >=dev-python/reportlab-3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/pillow-3.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] X? ( || ( kde? ( kde-misc/skanlite ) media-gfx/xsane media-gfx/sane-frontends ) ) ) ) policykit? ( sys-auth/polkit )
 REQUIRED_USE=!minimal? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=0
-SRC_URI=mirror://sourceforge/hplip/hplip-3.18.3.tar.gz https://dev.gentoo.org/~billie/distfiles/hplip-3.18.3-patches-2.tar.xz
+SRC_URI=mirror://sourceforge/hplip/hplip-3.18.5.tar.gz https://dev.gentoo.org/~billie/distfiles/hplip-3.18.3-patches-2.tar.xz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	fa02994d0beba88681127d93da4411ec	udev	d91cac2c73b94629cad2daea66e0d182	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=4818315439d10c9328b25f4f9f201aa0
+_md5_=1ea7b810c01d701e312eded98416fce5
diff --git a/metadata/md5-cache/net-print/hplip-plugin-3.18.3 b/metadata/md5-cache/net-print/hplip-plugin-3.18.4
index d37bbad8397f..c7800f14661c 100644
--- a/metadata/md5-cache/net-print/hplip-plugin-3.18.3
+++ b/metadata/md5-cache/net-print/hplip-plugin-3.18.4
@@ -2,12 +2,12 @@ DEFINED_PHASES=install unpack
 DEPEND=virtual/pkgconfig
 DESCRIPTION=Proprietary plugins and firmware for HPLIP
 EAPI=6
-HOMEPAGE=http://hplipopensource.com/hplip-web/index.html
+HOMEPAGE=https://developers.hp.com/hp-linux-imaging-and-printing
 KEYWORDS=~amd64 ~x86
 LICENSE=hplip-plugin
-RDEPEND=~net-print/hplip-3.18.3 virtual/udev
+RDEPEND=~net-print/hplip-3.18.4 virtual/udev
 RESTRICT=mirror
 SLOT=0
-SRC_URI=http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/hplip-3.18.3-plugin.run
+SRC_URI=http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/hplip-3.18.4-plugin.run
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec	udev	d91cac2c73b94629cad2daea66e0d182	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=39336f0c42835f6399155c526fe5022c
+_md5_=355201163bd3cc6e4324af5f784d229a
diff --git a/metadata/md5-cache/net-voip/Manifest.gz b/metadata/md5-cache/net-voip/Manifest.gz
index 4bed4437dd0b..a050cd4591de 100644
--- a/metadata/md5-cache/net-voip/Manifest.gz
+++ b/metadata/md5-cache/net-voip/Manifest.gz
diff --git a/metadata/md5-cache/net-voip/linphone-3.6.1 b/metadata/md5-cache/net-voip/linphone-3.6.1
index bff26e454752..a35b6ed9c620 100644
--- a/metadata/md5-cache/net-voip/linphone-3.6.1
+++ b/metadata/md5-cache/net-voip/linphone-3.6.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=>=media-libs/mediastreamer-2.9.0[ipv6?,upnp?,video?] >=net-libs/libeXosip-4.0.0 >=net-libs/libosip-4.0.0 >=net-libs/ortp-0.22.0 virtual/udev gtk? ( dev-libs/glib:2 >=gnome-base/libglade-2.4.0:2.0 >=x11-libs/gtk+-2.4.0:2 assistant? ( >=net-libs/libsoup-2.26 ) libnotify? ( x11-libs/libnotify ) ) gsm-nonstandard? ( >=media-libs/mediastreamer-2.9.0[gsm] ) ncurses? ( sys-libs/readline:0 sys-libs/ncurses ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0 ) tools? ( dev-libs/libxml2 ) upnp? ( net-libs/libupnp ) video? ( >=media-libs/mediastreamer-2.9.0[v4l] ) virtual/pkgconfig doc? ( app-text/sgmltools-lite ) nls? ( dev-util/intltool ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=media-libs/mediastreamer-2.9.0[ipv6?,upnp?,video?] >=net-libs/libeXosip-4.0.0 >=net-libs/libosip-4.0.0 >=net-libs/ortp-0.22.0 virtual/udev gtk? ( dev-libs/glib:2 >=gnome-base/libglade-2.4.0:2.0 >=x11-libs/gtk+-2.4.0:2 assistant? ( >=net-libs/libsoup-2.26 ) libnotify? ( x11-libs/libnotify ) ) gsm-nonstandard? ( >=media-libs/mediastreamer-2.9.0[gsm] ) ncurses? ( sys-libs/readline:0 sys-libs/ncurses ) sqlite? ( dev-db/sqlite:3 ) ssl? ( libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) ) tools? ( dev-libs/libxml2 ) upnp? ( net-libs/libupnp ) video? ( >=media-libs/mediastreamer-2.9.0[v4l] ) virtual/pkgconfig doc? ( app-text/sgmltools-lite ) nls? ( dev-util/intltool ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Video softphone based on the SIP protocol
 EAPI=5
 HOMEPAGE=http://www.linphone.org/
-IUSE=assistant doc gsm-nonstandard gtk ipv6 libnotify ncurses nls sqlite ssl tools upnp video
+IUSE=assistant doc gsm-nonstandard gtk ipv6 libnotify libressl ncurses nls sqlite ssl tools upnp video
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-libs/mediastreamer-2.9.0[ipv6?,upnp?,video?] >=net-libs/libeXosip-4.0.0 >=net-libs/libosip-4.0.0 >=net-libs/ortp-0.22.0 virtual/udev gtk? ( dev-libs/glib:2 >=gnome-base/libglade-2.4.0:2.0 >=x11-libs/gtk+-2.4.0:2 assistant? ( >=net-libs/libsoup-2.26 ) libnotify? ( x11-libs/libnotify ) ) gsm-nonstandard? ( >=media-libs/mediastreamer-2.9.0[gsm] ) ncurses? ( sys-libs/readline:0 sys-libs/ncurses ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0 ) tools? ( dev-libs/libxml2 ) upnp? ( net-libs/libupnp ) video? ( >=media-libs/mediastreamer-2.9.0[v4l] )
+RDEPEND=>=media-libs/mediastreamer-2.9.0[ipv6?,upnp?,video?] >=net-libs/libeXosip-4.0.0 >=net-libs/libosip-4.0.0 >=net-libs/ortp-0.22.0 virtual/udev gtk? ( dev-libs/glib:2 >=gnome-base/libglade-2.4.0:2.0 >=x11-libs/gtk+-2.4.0:2 assistant? ( >=net-libs/libsoup-2.26 ) libnotify? ( x11-libs/libnotify ) ) gsm-nonstandard? ( >=media-libs/mediastreamer-2.9.0[gsm] ) ncurses? ( sys-libs/readline:0 sys-libs/ncurses ) sqlite? ( dev-db/sqlite:3 ) ssl? ( libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) ) tools? ( dev-libs/libxml2 ) upnp? ( net-libs/libupnp ) video? ( >=media-libs/mediastreamer-2.9.0[v4l] )
 SLOT=0
 SRC_URI=mirror://nongnu/linphone/3.6.x/sources/linphone-3.6.1.tar.gz https://dev.gentoo.org/~hasufell/distfiles/linphone-3.6.1-exosip-4.patch
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=4be868d461542fe85103dc9af2d68f77
+_md5_=eb6945737e15558fb05dfdd7a7921560
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index 4a20f3784855..463b7bedac3f 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.3.5_rc b/metadata/md5-cache/net-vpn/tor-0.3.3.6
index eab21564d471..4daef0abb509 100644
--- a/metadata/md5-cache/net-vpn/tor-0.3.3.5_rc
+++ b/metadata/md5-cache/net-vpn/tor-0.3.3.6
@@ -8,6 +8,6 @@ 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.3.5-rc.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.3.3.5-rc.tar.gz
+SRC_URI=https://www.torproject.org/dist/tor-0.3.3.6.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.3.3.6.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=003fc87c3b9c0df7ef3fbb812c32ab96
diff --git a/metadata/md5-cache/net-vpn/wireguard-0.0.20180519 b/metadata/md5-cache/net-vpn/wireguard-0.0.20180524
index 938f5fdf1b08..bc1e80439f6f 100644
--- a/metadata/md5-cache/net-vpn/wireguard-0.0.20180519
+++ b/metadata/md5-cache/net-vpn/wireguard-0.0.20180524
@@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
 LICENSE=GPL-2
 RDEPEND=tools? ( net-libs/libmnl ) module? ( kernel_linux? ( virtual/modutils ) )
 SLOT=0
-SRC_URI=https://git.zx2c4.com/WireGuard/snapshot/WireGuard-0.0.20180519.tar.xz
+SRC_URI=https://git.zx2c4.com/WireGuard/snapshot/WireGuard-0.0.20180524.tar.xz
 _eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	linux-info	ca370deef9d44125d829f2eb6ebc83e0	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=3816d811d64939cf33ab36721171ab36
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index 313a8b9ba914..11385c98068b 100644
--- a/metadata/md5-cache/net-wireless/Manifest.gz
+++ b/metadata/md5-cache/net-wireless/Manifest.gz
diff --git a/metadata/md5-cache/net-wireless/bluez-5.49-r1 b/metadata/md5-cache/net-wireless/bluez-5.49-r1
new file mode 100644
index 000000000000..92aefea43835
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/bluez-5.49-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=dev-libs/glib-2.28:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/dbus-1.6:=[user-session=] >=sys-apps/hwids-20121202.2 alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) mesh? ( dev-libs/json-c:= sys-libs/readline:0= ) obex? ( dev-libs/libical:= ) readline? ( sys-libs/readline:0= ) systemd? ( sys-apps/systemd ) udev? ( >=virtual/udev-172 ) virtual/pkgconfig 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(+)] >=dev-python/dbus-python-1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=Bluetooth Tools and System Daemons for Linux
+EAPI=6
+HOMEPAGE=http://www.bluez.org
+IUSE=alsa cups doc debug deprecated extra-tools experimental +mesh +obex +readline selinux systemd test test-programs +udev user-session python_targets_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.28:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/dbus-1.6:=[user-session=] >=sys-apps/hwids-20121202.2 alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) mesh? ( dev-libs/json-c:= sys-libs/readline:0= ) obex? ( dev-libs/libical:= ) readline? ( sys-libs/readline:0= ) systemd? ( sys-apps/systemd ) udev? ( >=virtual/udev-172 ) selinux? ( sec-policy/selinux-bluetooth ) test-programs? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/dbus-python-1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] )
+REQUIRED_USE=extra-tools? ( deprecated readline ) test? ( python_targets_python2_7 ) test-programs? ( python_targets_python2_7 ) user-session? ( systemd )
+SLOT=0/3
+SRC_URI=mirror://kernel/linux/bluetooth/bluez-5.49.tar.xz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=a4ac0938df79a5d5a31d946af1374cc8
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index 78107a465d49..9525e553148c 100644
--- a/metadata/md5-cache/sci-geosciences/Manifest.gz
+++ b/metadata/md5-cache/sci-geosciences/Manifest.gz
diff --git a/metadata/md5-cache/sci-geosciences/grass-7.2.0-r1 b/metadata/md5-cache/sci-geosciences/grass-7.2.0-r1
index 8a2090b99f51..463d37139ffc 100644
--- a/metadata/md5-cache/sci-geosciences/grass-7.2.0-r1
+++ b/metadata/md5-cache/sci-geosciences/grass-7.2.0-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=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-admin/eselect-1.2 dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] media-libs/libprojectm sci-libs/proj sci-libs/xdrfile sci-libs/gdal sys-libs/gdbm sys-libs/ncurses:0= sys-libs/zlib fftw? ( sci-libs/fftw:3.0 ) geos? ( sci-libs/geos ) blas? ( virtual/blas sci-libs/cblas-reference ) lapack? ( virtual/lapack ) liblas? ( sci-geosciences/liblas ) mysql? ( virtual/mysql ) netcdf? ( sci-libs/netcdf ) odbc? ( dev-db/unixODBC ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) png? ( media-libs/libpng:0= ) postgres? ( >=dev-db/postgresql-8.4:= ) readline? ( sys-libs/readline:0= ) sqlite? ( dev-db/sqlite:3 ) tiff? ( media-libs/tiff:0= ) truetype? ( media-libs/freetype:2 ) X? ( dev-python/wxpython:3.0[cairo,opengl?] x11-libs/cairo[X,opengl?] x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXt ) virtual/pkgconfig sys-devel/flex sys-devel/gettext sys-devel/bison X? ( dev-lang/swig x11-base/xorg-proto ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=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-admin/eselect-1.2 dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] media-libs/libprojectm sci-libs/proj sci-libs/xdrfile sci-libs/gdal sys-libs/gdbm sys-libs/ncurses:0= sys-libs/zlib:= fftw? ( sci-libs/fftw:3.0= ) geos? ( sci-libs/geos ) blas? ( virtual/blas sci-libs/cblas-reference ) lapack? ( virtual/lapack ) liblas? ( sci-geosciences/liblas ) mysql? ( virtual/mysql ) netcdf? ( sci-libs/netcdf ) odbc? ( dev-db/unixODBC ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) png? ( media-libs/libpng:0= ) postgres? ( >=dev-db/postgresql-8.4:= ) readline? ( sys-libs/readline:0= ) sqlite? ( dev-db/sqlite:3 ) tiff? ( media-libs/tiff:0= ) truetype? ( media-libs/freetype:2 ) X? ( dev-python/wxpython:3.0[cairo,opengl?] x11-libs/cairo[X,opengl?] x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXt ) virtual/pkgconfig sys-devel/flex sys-devel/gettext sys-devel/bison X? ( dev-lang/swig x11-base/xorg-proto ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A free GIS with raster and vector functionality, as well as 3D vizualization
 EAPI=6
 HOMEPAGE=http://grass.osgeo.org/
 IUSE=X blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype python_targets_python2_7
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=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-admin/eselect-1.2 dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] media-libs/libprojectm sci-libs/proj sci-libs/xdrfile sci-libs/gdal sys-libs/gdbm sys-libs/ncurses:0= sys-libs/zlib fftw? ( sci-libs/fftw:3.0 ) geos? ( sci-libs/geos ) blas? ( virtual/blas sci-libs/cblas-reference ) lapack? ( virtual/lapack ) liblas? ( sci-geosciences/liblas ) mysql? ( virtual/mysql ) netcdf? ( sci-libs/netcdf ) odbc? ( dev-db/unixODBC ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) png? ( media-libs/libpng:0= ) postgres? ( >=dev-db/postgresql-8.4:= ) readline? ( sys-libs/readline:0= ) sqlite? ( dev-db/sqlite:3 ) tiff? ( media-libs/tiff:0= ) truetype? ( media-libs/freetype:2 ) X? ( dev-python/wxpython:3.0[cairo,opengl?] x11-libs/cairo[X,opengl?] x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXt )
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=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-admin/eselect-1.2 dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] media-libs/libprojectm sci-libs/proj sci-libs/xdrfile sci-libs/gdal sys-libs/gdbm sys-libs/ncurses:0= sys-libs/zlib:= fftw? ( sci-libs/fftw:3.0= ) geos? ( sci-libs/geos ) blas? ( virtual/blas sci-libs/cblas-reference ) lapack? ( virtual/lapack ) liblas? ( sci-geosciences/liblas ) mysql? ( virtual/mysql ) netcdf? ( sci-libs/netcdf ) odbc? ( dev-db/unixODBC ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) png? ( media-libs/libpng:0= ) postgres? ( >=dev-db/postgresql-8.4:= ) readline? ( sys-libs/readline:0= ) sqlite? ( dev-db/sqlite:3 ) tiff? ( media-libs/tiff:0= ) truetype? ( media-libs/freetype:2 ) X? ( dev-python/wxpython:3.0[cairo,opengl?] x11-libs/cairo[X,opengl?] x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXt )
 REQUIRED_USE=python_targets_python2_7 opengl? ( X )
 SLOT=0/7.2.0
 SRC_URI=http://grass.osgeo.org/grass72/source/grass-7.2.0.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e47923cc1764f44d88addd005b667d63
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f40f6726377706b60f33b8d851bdaace
diff --git a/metadata/md5-cache/sci-geosciences/grass-7.4.0 b/metadata/md5-cache/sci-geosciences/grass-7.4.0
new file mode 100644
index 000000000000..4fc5785d91ec
--- /dev/null
+++ b/metadata/md5-cache/sci-geosciences/grass-7.4.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=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-admin/eselect-1.2 dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] media-libs/libprojectm sci-libs/proj sci-libs/xdrfile sci-libs/gdal sys-libs/gdbm sys-libs/ncurses:0= sys-libs/zlib:= fftw? ( sci-libs/fftw:3.0= ) geos? ( sci-libs/geos ) blas? ( virtual/blas sci-libs/cblas-reference ) lapack? ( virtual/lapack ) liblas? ( sci-geosciences/liblas ) mysql? ( virtual/mysql ) netcdf? ( sci-libs/netcdf ) odbc? ( dev-db/unixODBC ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) png? ( media-libs/libpng:0= ) postgres? ( >=dev-db/postgresql-8.4:= ) readline? ( sys-libs/readline:0= ) sqlite? ( dev-db/sqlite:3 ) tiff? ( media-libs/tiff:0= ) truetype? ( media-libs/freetype:2 ) X? ( dev-python/wxpython:3.0[cairo,opengl?] x11-libs/cairo[X,opengl?] x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXt ) virtual/pkgconfig sys-devel/flex sys-devel/gettext sys-devel/bison X? ( dev-lang/swig x11-base/xorg-proto ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A free GIS with raster and vector functionality, as well as 3D vizualization
+EAPI=6
+HOMEPAGE=http://grass.osgeo.org/
+IUSE=X blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype python_targets_python2_7
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=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-admin/eselect-1.2 dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] media-libs/libprojectm sci-libs/proj sci-libs/xdrfile sci-libs/gdal sys-libs/gdbm sys-libs/ncurses:0= sys-libs/zlib:= fftw? ( sci-libs/fftw:3.0= ) geos? ( sci-libs/geos ) blas? ( virtual/blas sci-libs/cblas-reference ) lapack? ( virtual/lapack ) liblas? ( sci-geosciences/liblas ) mysql? ( virtual/mysql ) netcdf? ( sci-libs/netcdf ) odbc? ( dev-db/unixODBC ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) png? ( media-libs/libpng:0= ) postgres? ( >=dev-db/postgresql-8.4:= ) readline? ( sys-libs/readline:0= ) sqlite? ( dev-db/sqlite:3 ) tiff? ( media-libs/tiff:0= ) truetype? ( media-libs/freetype:2 ) X? ( dev-python/wxpython:3.0[cairo,opengl?] x11-libs/cairo[X,opengl?] x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXt )
+REQUIRED_USE=python_targets_python2_7 opengl? ( X )
+SLOT=0/7.4.0
+SRC_URI=http://grass.osgeo.org/grass74/source/grass-7.4.0.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ba6df21b06c58c785ce176e436466d78
diff --git a/metadata/md5-cache/sci-geosciences/qgis-3.0.2 b/metadata/md5-cache/sci-geosciences/qgis-3.0.2
index 8db7db8289fb..876cad347d49 100644
--- a/metadata/md5-cache/sci-geosciences/qgis-3.0.2
+++ b/metadata/md5-cache/sci-geosciences/qgis-3.0.2
@@ -4,7 +4,7 @@ DESCRIPTION=User friendly Geographic Information System
 EAPI=6
 HOMEPAGE=https://www.qgis.org/
 IUSE=3d examples georeferencer grass mapserver oracle polar postgres python webkit python_targets_python3_5
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2+ GPL-3+
 RDEPEND=app-crypt/qca:2[qt5(+),ssl] >=dev-db/spatialite-4.2.0 dev-db/sqlite:3 dev-libs/expat dev-libs/libzip:= dev-libs/qtkeychain[qt5(+)] >=dev-qt/designer-5.9.4:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtcore-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5[ssl] >=dev-qt/qtpositioning-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=sci-libs/gdal-2.2.3:=[geos,python?,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_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] sci-libs/geos sci-libs/libspatialindex:= sci-libs/proj >=x11-libs/qscintilla-2.10.1:=[qt5(+)] >=x11-libs/qwt-6.1.2:6=[qt5(+),svg] 3d? ( >=dev-qt/qt3d-5.9.4:5 ) georeferencer? ( sci-libs/gsl:= ) grass? ( =sci-geosciences/grass-7*:= ) mapserver? ( dev-libs/fcgi ) oracle? ( dev-db/oracle-instantclient:= sci-libs/gdal:=[oracle] ) polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] ) postgres? ( dev-db/postgresql:= ) python? ( python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) >=dev-lang/python-exec-2:=[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_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/future[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_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/httplib2[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_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/jinja[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_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/markupsafe[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_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/owslib[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_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/pygments[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_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/PyQt5[designer,network,sql,svg,webkit?,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_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/python-dateutil[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_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/pytz[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_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/pyyaml[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_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] >=dev-python/qscintilla-python-2.10.1[qt5(+),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_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/requests[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_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/sip:=[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_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/six[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_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] postgres? ( dev-python/psycopg:2[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_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] ) ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) sci-geosciences/gpsbabel
 REQUIRED_USE=grass? ( python ) mapserver? ( python ) python? ( python_targets_python3_5 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://qgis.org/downloads/qgis-3.0.2.tar.bz2 examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )
 _eclasses_=cmake-utils	49cd471f02483798c5068698836b7429	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=87c840d11e7beb193214180a3102760b
+_md5_=dad36c2381224e692277db8c4ccfcf2c
diff --git a/metadata/md5-cache/sci-geosciences/qgis-3.0.3 b/metadata/md5-cache/sci-geosciences/qgis-3.0.3
new file mode 100644
index 000000000000..cc42c76aa251
--- /dev/null
+++ b/metadata/md5-cache/sci-geosciences/qgis-3.0.3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=app-crypt/qca:2[qt5(+),ssl] >=dev-db/spatialite-4.2.0 dev-db/sqlite:3 dev-libs/expat dev-libs/libzip:= dev-libs/qtkeychain[qt5(+)] >=dev-qt/designer-5.9.4:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtcore-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5[ssl] >=dev-qt/qtpositioning-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=sci-libs/gdal-2.2.3:=[geos,python?,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_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] sci-libs/geos sci-libs/libspatialindex:= sci-libs/proj >=x11-libs/qscintilla-2.10.1:=[qt5(+)] >=x11-libs/qwt-6.1.2:6=[qt5(+),svg] 3d? ( >=dev-qt/qt3d-5.9.4:5 ) georeferencer? ( sci-libs/gsl:= ) grass? ( =sci-geosciences/grass-7*:= ) mapserver? ( dev-libs/fcgi ) oracle? ( dev-db/oracle-instantclient:= sci-libs/gdal:=[oracle] ) polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] ) postgres? ( dev-db/postgresql:= ) python? ( python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) >=dev-lang/python-exec-2:=[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_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/future[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_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/httplib2[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_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/jinja[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_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/markupsafe[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_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/owslib[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_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/pygments[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_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/PyQt5[designer,network,sql,svg,webkit?,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_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/python-dateutil[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_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/pytz[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_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/pyyaml[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_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] >=dev-python/qscintilla-python-2.10.1[qt5(+),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_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/requests[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_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/sip:=[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_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/six[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_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] postgres? ( dev-python/psycopg:2[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_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] ) ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) >=dev-qt/linguist-tools-5.9.4:5 >=dev-qt/qttest-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 sys-devel/bison sys-devel/flex sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
+DESCRIPTION=User friendly Geographic Information System
+EAPI=6
+HOMEPAGE=https://www.qgis.org/
+IUSE=3d examples georeferencer grass mapserver oracle polar postgres python webkit python_targets_python3_5
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ GPL-3+
+RDEPEND=app-crypt/qca:2[qt5(+),ssl] >=dev-db/spatialite-4.2.0 dev-db/sqlite:3 dev-libs/expat dev-libs/libzip:= dev-libs/qtkeychain[qt5(+)] >=dev-qt/designer-5.9.4:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtcore-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5[ssl] >=dev-qt/qtpositioning-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=sci-libs/gdal-2.2.3:=[geos,python?,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_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] sci-libs/geos sci-libs/libspatialindex:= sci-libs/proj >=x11-libs/qscintilla-2.10.1:=[qt5(+)] >=x11-libs/qwt-6.1.2:6=[qt5(+),svg] 3d? ( >=dev-qt/qt3d-5.9.4:5 ) georeferencer? ( sci-libs/gsl:= ) grass? ( =sci-geosciences/grass-7*:= ) mapserver? ( dev-libs/fcgi ) oracle? ( dev-db/oracle-instantclient:= sci-libs/gdal:=[oracle] ) polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] ) postgres? ( dev-db/postgresql:= ) python? ( python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) >=dev-lang/python-exec-2:=[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_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/future[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_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/httplib2[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_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/jinja[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_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/markupsafe[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_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/owslib[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_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/pygments[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_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/PyQt5[designer,network,sql,svg,webkit?,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_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/python-dateutil[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_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/pytz[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_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/pyyaml[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_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] >=dev-python/qscintilla-python-2.10.1[qt5(+),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_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/requests[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_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/sip:=[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_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/six[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_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] postgres? ( dev-python/psycopg:2[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_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] ) ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) sci-geosciences/gpsbabel
+REQUIRED_USE=grass? ( python ) mapserver? ( python ) python? ( python_targets_python3_5 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://qgis.org/downloads/qgis-3.0.3.tar.bz2 examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )
+_eclasses_=cmake-utils	49cd471f02483798c5068698836b7429	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=87c840d11e7beb193214180a3102760b
diff --git a/metadata/md5-cache/sci-visualization/Manifest.gz b/metadata/md5-cache/sci-visualization/Manifest.gz
index cb715c9184da..d574c604a4ac 100644
--- a/metadata/md5-cache/sci-visualization/Manifest.gz
+++ b/metadata/md5-cache/sci-visualization/Manifest.gz
diff --git a/metadata/md5-cache/sci-visualization/paraview-5.5.0 b/metadata/md5-cache/sci-visualization/paraview-5.5.0
new file mode 100644
index 000000000000..823925b57a37
--- /dev/null
+++ b/metadata/md5-cache/sci-visualization/paraview-5.5.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND=app-arch/lz4 dev-libs/expat dev-libs/jsoncpp dev-libs/libxml2:2 dev-libs/protobuf dev-libs/pugixml media-libs/freetype media-libs/glew:0 media-libs/libpng:0 media-libs/libtheora media-libs/tiff:0= sci-libs/cgnslib sci-libs/hdf5[mpi=] >=sci-libs/netcdf-4.2[hdf5] >=sci-libs/netcdf-cxx-4.2:3 sci-libs/xdmf2 sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt coprocessing? ( plugins? ( dev-python/PyQt5 dev-qt/qtgui:5[-gles2] ) ) ffmpeg? ( virtual/ffmpeg ) mpi? ( virtual/mpi[cxx,romio] ) mysql? ( virtual/mysql ) 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/constantly[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/incremental[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/matplotlib[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pygments[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/sip[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/six[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/twisted-core[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/zope-interface[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(+)] mpi? ( dev-python/mpi4py ) qt5? ( dev-python/PyQt5[opengl,webkit,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) ) qt5? ( dev-qt/designer:5 dev-qt/qtgui:5[-gles2] dev-qt/qthelp:5 dev-qt/qtopengl:5[-gles2] dev-qt/qtsql:5 dev-qt/qttest:5 dev-qt/qtwebkit:5 dev-qt/qtx11extras:5 ) sqlite? ( dev-db/sqlite:3 ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) 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-util/cmake-3.4 boost? ( >=dev-libs/boost-1.40.0[mpi?,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(+)] ) doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=ParaView is a powerful scientific data visualization application
+EAPI=6
+HOMEPAGE=http://www.paraview.org
+IUSE=boost cg coprocessing development doc examples ffmpeg mpi mysql nvcontrol openmp plugins python +qt5 sqlite tcl test tk python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=paraview GPL-2
+RDEPEND=app-arch/lz4 dev-libs/expat dev-libs/jsoncpp dev-libs/libxml2:2 dev-libs/protobuf dev-libs/pugixml media-libs/freetype media-libs/glew:0 media-libs/libpng:0 media-libs/libtheora media-libs/tiff:0= sci-libs/cgnslib sci-libs/hdf5[mpi=] >=sci-libs/netcdf-4.2[hdf5] >=sci-libs/netcdf-cxx-4.2:3 sci-libs/xdmf2 sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt coprocessing? ( plugins? ( dev-python/PyQt5 dev-qt/qtgui:5[-gles2] ) ) ffmpeg? ( virtual/ffmpeg ) mpi? ( virtual/mpi[cxx,romio] ) mysql? ( virtual/mysql ) 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/constantly[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/incremental[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/matplotlib[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pygments[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/sip[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/six[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/twisted-core[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/zope-interface[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(+)] mpi? ( dev-python/mpi4py ) qt5? ( dev-python/PyQt5[opengl,webkit,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) ) qt5? ( dev-qt/designer:5 dev-qt/qtgui:5[-gles2] dev-qt/qthelp:5 dev-qt/qtopengl:5[-gles2] dev-qt/qtsql:5 dev-qt/qttest:5 dev-qt/qtwebkit:5 dev-qt/qtx11extras:5 ) sqlite? ( dev-db/sqlite:3 ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= )
+REQUIRED_USE=python? ( mpi python_targets_python2_7 ) mysql? ( sqlite )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://www.paraview.org/files/v5.5/ParaView-v5.5.0.tar.gz
+_eclasses_=cmake-utils	49cd471f02483798c5068698836b7429	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f81fcc77ba53091952740313dcfd2ee9
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 186f28ea3462..2557d3f9f5d8 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/baselayout-2.5-r1 b/metadata/md5-cache/sys-apps/baselayout-2.5-r1
new file mode 100644
index 000000000000..d71c591a1bce
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/baselayout-2.5-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst preinst prepare setup
+DESCRIPTION=Filesystem baselayout and init scripts
+EAPI=6
+HOMEPAGE=https://www.gentoo.org/
+IUSE=build kernel_FreeBSD kernel_linux +split-usr
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://gitweb.gentoo.org/proj/baselayout.git/snapshot/baselayout-2.5.tar.bz2
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	fa02994d0beba88681127d93da4411ec	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ca2e8dc7b25595978a4db9bc0d6aa22c
diff --git a/metadata/md5-cache/sys-apps/baselayout-9999 b/metadata/md5-cache/sys-apps/baselayout-9999
index fd2673511547..8ede1f88e5d2 100644
--- a/metadata/md5-cache/sys-apps/baselayout-9999
+++ b/metadata/md5-cache/sys-apps/baselayout-9999
@@ -3,8 +3,8 @@ DEPEND=>=dev-vcs/git-1.8.2.1
 DESCRIPTION=Filesystem baselayout and init scripts
 EAPI=6
 HOMEPAGE=https://www.gentoo.org/
-IUSE=build kernel_FreeBSD kernel_linux usrmerge
+IUSE=build kernel_FreeBSD kernel_linux +split-usr
 LICENSE=GPL-2
 SLOT=0
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	af51ccfceeb403ab80f1bf9209d372c8	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	fa02994d0beba88681127d93da4411ec	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=5ad02f69147c85df584e696e06677f19
+_md5_=ca2e8dc7b25595978a4db9bc0d6aa22c
diff --git a/metadata/md5-cache/sys-apps/checkpolicy-2.6 b/metadata/md5-cache/sys-apps/checkpolicy-2.6
deleted file mode 100644
index ac1a6c26f273..000000000000
--- a/metadata/md5-cache/sys-apps/checkpolicy-2.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst
-DEPEND=>=sys-libs/libsepol-2.6 >=sys-libs/libsemanage-2.6 sys-devel/flex sys-devel/bison
-DESCRIPTION=SELinux policy compiler
-EAPI=6
-HOMEPAGE=http://userspace.selinuxproject.org
-IUSE=debug
-KEYWORDS=amd64 ~arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-libs/libsemanage-2.6
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20161014/checkpolicy-2.6.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=ace4e6405d99b0df995890a86681e639
diff --git a/metadata/md5-cache/sys-apps/checkpolicy-2.8_rc3 b/metadata/md5-cache/sys-apps/checkpolicy-2.8
index 2336d5e7f525..1dc61a310c54 100644
--- a/metadata/md5-cache/sys-apps/checkpolicy-2.8_rc3
+++ b/metadata/md5-cache/sys-apps/checkpolicy-2.8
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install postinst
-DEPEND=>=sys-libs/libsepol-2.8_rc3 >=sys-libs/libsemanage-2.8_rc3 sys-devel/flex sys-devel/bison
+DEPEND=>=sys-libs/libsepol-2.8 >=sys-libs/libsemanage-2.8 sys-devel/flex sys-devel/bison
 DESCRIPTION=SELinux policy compiler
 EAPI=6
 HOMEPAGE=http://userspace.selinuxproject.org
 IUSE=debug
 KEYWORDS=~amd64 ~arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
-RDEPEND=>=sys-libs/libsemanage-2.8_rc3
+RDEPEND=>=sys-libs/libsemanage-2.8
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180510/checkpolicy-2.8-rc3.tar.gz
+SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180524/checkpolicy-2.8.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=80ef7dcf5da899c2c85e7f84b519be82
+_md5_=a53f371fd1777814908233bc76604a68
diff --git a/metadata/md5-cache/sys-apps/checkpolicy-2.8_rc1 b/metadata/md5-cache/sys-apps/checkpolicy-2.8_rc1
deleted file mode 100644
index 60bebf96d7fd..000000000000
--- a/metadata/md5-cache/sys-apps/checkpolicy-2.8_rc1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst
-DEPEND=>=sys-libs/libsepol-2.8_rc1 >=sys-libs/libsemanage-2.8_rc1 sys-devel/flex sys-devel/bison
-DESCRIPTION=SELinux policy compiler
-EAPI=6
-HOMEPAGE=http://userspace.selinuxproject.org
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-libs/libsemanage-2.8_rc1
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180419/checkpolicy-2.8-rc1.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=4baa7bebc6409a89a43266a1be2bf950
diff --git a/metadata/md5-cache/sys-apps/checkpolicy-2.8_rc2 b/metadata/md5-cache/sys-apps/checkpolicy-2.8_rc2
deleted file mode 100644
index 894ebbdfa0bb..000000000000
--- a/metadata/md5-cache/sys-apps/checkpolicy-2.8_rc2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst
-DEPEND=>=sys-libs/libsepol-2.8_rc2 >=sys-libs/libsemanage-2.8_rc2 sys-devel/flex sys-devel/bison
-DESCRIPTION=SELinux policy compiler
-EAPI=6
-HOMEPAGE=http://userspace.selinuxproject.org
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-libs/libsemanage-2.8_rc2
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180426/checkpolicy-2.8-rc2.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=02e21889e4182360ab40ae111db02fef
diff --git a/metadata/md5-cache/sys-apps/checkpolicy-9999 b/metadata/md5-cache/sys-apps/checkpolicy-9999
index 22ec011cd108..b291c4b81f5c 100644
--- a/metadata/md5-cache/sys-apps/checkpolicy-9999
+++ b/metadata/md5-cache/sys-apps/checkpolicy-9999
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/libsemanage-9999
 SLOT=0
 _eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=80ef7dcf5da899c2c85e7f84b519be82
+_md5_=a53f371fd1777814908233bc76604a68
diff --git a/metadata/md5-cache/sys-apps/coreutils-8.26 b/metadata/md5-cache/sys-apps/coreutils-8.26
deleted file mode 100644
index b3e7db6dd1ea..000000000000
--- a/metadata/md5-cache/sys-apps/coreutils-8.26
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare test
-DEPEND=!static? ( acl? ( sys-apps/acl ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp:= ) xattr? ( !userland_BSD? ( sys-apps/attr ) ) ) selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl ) static? ( acl? ( sys-apps/acl[static-libs] ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp:=[static-libs] ) xattr? ( !userland_BSD? ( sys-apps/attr[static-libs] ) ) ) app-arch/xz-utils
-DESCRIPTION=Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/coreutils/
-IUSE=acl caps gmp hostname kill multicall nls selinux static userland_BSD vanilla xattr
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=!static? ( acl? ( sys-apps/acl ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp:= ) xattr? ( !userland_BSD? ( sys-apps/attr ) ) ) selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl ) hostname? ( !sys-apps/net-tools[hostname] ) kill? ( !sys-apps/util-linux[kill] !sys-process/procps[kill] ) !app-misc/realpath !<sys-apps/util-linux-2.13 !sys-apps/stat !net-mail/base64 !sys-apps/mktemp !<app-forensics/tct-1.18-r1 !<net-fs/netatalk-2.0.3-r4
-SLOT=0
-SRC_URI=mirror://gnu/coreutils/coreutils-8.26.tar.xz mirror://gentoo/coreutils-8.26-patches-1.1.tar.xz https://dev.gentoo.org/~polynomial-c/dist/coreutils-8.26-patches-1.1.tar.xz mirror://gentoo/coreutils-8.26-man.tar.xz https://dev.gentoo.org/~polynomial-c/dist/coreutils-8.26-man.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=03c2db42b8e6dc7b8892c9ebfa560641
diff --git a/metadata/md5-cache/sys-apps/coreutils-8.28 b/metadata/md5-cache/sys-apps/coreutils-8.28
deleted file mode 100644
index aa2c2e9a35cc..000000000000
--- a/metadata/md5-cache/sys-apps/coreutils-8.28
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare test
-DEPEND=!static? ( acl? ( sys-apps/acl ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp:= ) xattr? ( !userland_BSD? ( sys-apps/attr ) ) ) selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl ) static? ( acl? ( sys-apps/acl[static-libs] ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp:=[static-libs] ) xattr? ( !userland_BSD? ( sys-apps/attr[static-libs] ) ) ) app-arch/xz-utils
-DESCRIPTION=Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/coreutils/
-IUSE=acl caps gmp hostname kill multicall nls selinux static userland_BSD vanilla xattr
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=!static? ( acl? ( sys-apps/acl ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp:= ) xattr? ( !userland_BSD? ( sys-apps/attr ) ) ) selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl ) hostname? ( !sys-apps/net-tools[hostname] ) kill? ( !sys-apps/util-linux[kill] !sys-process/procps[kill] ) !app-misc/realpath !<sys-apps/util-linux-2.13 !<sys-apps/sandbox-2.10-r4 !sys-apps/stat !net-mail/base64 !sys-apps/mktemp !<app-forensics/tct-1.18-r1 !<net-fs/netatalk-2.0.3-r4
-SLOT=0
-SRC_URI=mirror://gnu/coreutils/coreutils-8.28.tar.xz mirror://gentoo/coreutils-8.28-patches-1.0.tar.xz https://dev.gentoo.org/~polynomial-c/dist/coreutils-8.28-patches-1.0.tar.xz mirror://gentoo/coreutils-8.28-man.tar.xz https://dev.gentoo.org/~polynomial-c/dist/coreutils-8.28-man.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fd7b1bf80267b9b7c70977cedb310ddb
diff --git a/metadata/md5-cache/sys-apps/dbus-broker-11 b/metadata/md5-cache/sys-apps/dbus-broker-11
index b29a9861f7ff..7aa8ecdf16c6 100644
--- a/metadata/md5-cache/sys-apps/dbus-broker-11
+++ b/metadata/md5-cache/sys-apps/dbus-broker-11
@@ -9,5 +9,5 @@ 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
 SRC_URI=https://github.com/bus1/dbus-broker/archive/v11/dbus-broker-11.tar.gz https://github.com/c-util/c-dvar/archive/f0a525477142f64c45b0be9393cc3b5dc3a6d6f9/c-dvar-f0a525477142f64c45b0be9393cc3b5dc3a6d6f9.tar.gz https://github.com/c-util/c-list/archive/05bada3508c21027dbbbf1319f27ed65c7c03bc0/c-list-05bada3508c21027dbbbf1319f27ed65c7c03bc0.tar.gz https://github.com/c-util/c-rbtree/archive/ba0527e9157316cdb60522f23fb884ea196b1346/c-rbtree-ba0527e9157316cdb60522f23fb884ea196b1346.tar.gz https://github.com/c-util/c-sundry/archive/50c8ccf01b39b3f11e59c69d1cafea5bef5a9769/c-sundry-50c8ccf01b39b3f11e59c69d1cafea5bef5a9769.tar.gz https://github.com/c-util/c-utf8/archive/cc67174f455c9196ebffc37b4d4f249da3dbc66f/c-utf8-cc67174f455c9196ebffc37b4d4f249da3dbc66f.tar.gz
-_eclasses_=meson	ecfaf615b512dc4ff2a50a35e6b26c09	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec
+_eclasses_=meson	53e3ab209402d5ad07a9c4580c423d1a	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec
 _md5_=acf6ee9657f1e2d5a3c61e0bc7dba7bf
diff --git a/metadata/md5-cache/sys-apps/dbus-broker-9 b/metadata/md5-cache/sys-apps/dbus-broker-9
index 19e6604309ad..977cb1e0f417 100644
--- a/metadata/md5-cache/sys-apps/dbus-broker-9
+++ b/metadata/md5-cache/sys-apps/dbus-broker-9
@@ -9,5 +9,5 @@ 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
 SRC_URI=https://github.com/bus1/dbus-broker/archive/v9.tar.gz -> dbus-broker-9.tar.gz https://github.com/c-util/c-dvar/archive/7706828ecda2d8c508d6fc233dc9d198bab482ad.tar.gz -> c-dvar-7706828ecda2d8c508d6fc233dc9d198bab482ad.tar.gz https://github.com/c-util/c-list/archive/72c59181d677a3f50b201d51f190b1bff02d4279.tar.gz -> c-list-72c59181d677a3f50b201d51f190b1bff02d4279.tar.gz https://github.com/c-util/c-rbtree/archive/825f626a16257c5f0b0c523c11ce1bca16851180.tar.gz -> c-rbtree-825f626a16257c5f0b0c523c11ce1bca16851180.tar.gz https://github.com/c-util/c-sundry/archive/50c8ccf01b39b3f11e59c69d1cafea5bef5a9769.tar.gz -> c-sundry-50c8ccf01b39b3f11e59c69d1cafea5bef5a9769.tar.gz
-_eclasses_=meson	ecfaf615b512dc4ff2a50a35e6b26c09	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec
+_eclasses_=meson	53e3ab209402d5ad07a9c4580c423d1a	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec
 _md5_=50798d8458c4ca23bad7120339d34102
diff --git a/metadata/md5-cache/sys-apps/dbus-broker-9999 b/metadata/md5-cache/sys-apps/dbus-broker-9999
index 66e7afc3bfba..eb43d84e3079 100644
--- a/metadata/md5-cache/sys-apps/dbus-broker-9999
+++ b/metadata/md5-cache/sys-apps/dbus-broker-9999
@@ -7,5 +7,5 @@ IUSE=audit +launcher selinux
 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	af51ccfceeb403ab80f1bf9209d372c8	meson	ecfaf615b512dc4ff2a50a35e6b26c09	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	meson	53e3ab209402d5ad07a9c4580c423d1a	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec
 _md5_=acf6ee9657f1e2d5a3c61e0bc7dba7bf
diff --git a/metadata/md5-cache/sys-apps/ethtool-4.13 b/metadata/md5-cache/sys-apps/ethtool-4.13
index a92828130e09..73b1a5631ee7 100644
--- a/metadata/md5-cache/sys-apps/ethtool-4.13
+++ b/metadata/md5-cache/sys-apps/ethtool-4.13
@@ -3,8 +3,8 @@ DEPEND=app-arch/xz-utils
 DESCRIPTION=Utility for examining and tuning ethernet-based network interfaces
 EAPI=5
 HOMEPAGE=https://www.kernel.org/pub/software/network/ethtool/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ~ppc ppc64 ~sh sparc x86
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://kernel/software/network/ethtool/ethtool-4.13.tar.xz
-_md5_=5499e9d981c58f687cb2a391482918d3
+_md5_=ae0c90542450db23705d9b52a5bbf44e
diff --git a/metadata/md5-cache/sys-apps/fwupd-1.0.5 b/metadata/md5-cache/sys-apps/fwupd-1.0.5
index 83bd52a71f73..2d8edd6feb9c 100644
--- a/metadata/md5-cache/sys-apps/fwupd-1.0.5
+++ b/metadata/md5-cache/sys-apps/fwupd-1.0.5
@@ -11,5 +11,5 @@ REQUIRED_USE=dell? ( uefi )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hughsie/fwupd/archive/1.0.5.tar.gz -> fwupd-1.0.5.tar.gz
-_eclasses_=meson	ecfaf615b512dc4ff2a50a35e6b26c09	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=meson	53e3ab209402d5ad07a9c4580c423d1a	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=bd6f6684cd766d9274491855819c3336
diff --git a/metadata/md5-cache/sys-apps/fwupd-1.0.6 b/metadata/md5-cache/sys-apps/fwupd-1.0.6
index 04ec8fa00cea..5a7bb2ec5122 100644
--- a/metadata/md5-cache/sys-apps/fwupd-1.0.6
+++ b/metadata/md5-cache/sys-apps/fwupd-1.0.6
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_ta
 REQUIRED_USE=dell? ( uefi )
 SLOT=0
 SRC_URI=https://github.com/hughsie/fwupd/archive/1.0.6.tar.gz -> fwupd-1.0.6.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	ecfaf615b512dc4ff2a50a35e6b26c09	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	53e3ab209402d5ad07a9c4580c423d1a	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=db94b91ad469f6fcee7e8aa3ff9f7f1d
diff --git a/metadata/md5-cache/sys-apps/guix-0.14.0 b/metadata/md5-cache/sys-apps/guix-0.14.0
index 4b5c50a340ae..a459b7c5834f 100644
--- a/metadata/md5-cache/sys-apps/guix-0.14.0
+++ b/metadata/md5-cache/sys-apps/guix-0.14.0
@@ -10,4 +10,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnu-alpha/guix/guix-0.14.0.tar.gz mirror://gnu-alpha/guix/bootstrap/aarch64-linux/20170217/guile-2.0.14.tar.xz -> guix-bootstrap-aarch64-linux-20170217-guile-2.0.14.tar.xz.bootstrap mirror://gnu-alpha/guix/bootstrap/armhf-linux/20150101/guile-2.0.11.tar.xz -> guix-bootstrap-armhf-linux-20150101-guile-2.0.11.tar.xz.bootstrap mirror://gnu-alpha/guix/bootstrap/i686-linux/20131110/guile-2.0.9.tar.xz -> guix-bootstrap-i686-linux-20131110-guile-2.0.9.tar.xz.bootstrap mirror://gnu-alpha/guix/bootstrap/mips64el-linux/20131110/guile-2.0.9.tar.xz -> guix-bootstrap-mips64el-linux-20131110-guile-2.0.9.tar.xz.bootstrap mirror://gnu-alpha/guix/bootstrap/x86_64-linux/20131110/guile-2.0.9.tar.xz -> guix-bootstrap-x86_64-linux-20131110-guile-2.0.9.tar.xz.bootstrap
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=f64a12a0d1bfac83171748f5a4cf4299
+_md5_=b3a6c0d859733f15b11d899a145842b6
diff --git a/metadata/md5-cache/sys-apps/mcstrans-2.8_rc2 b/metadata/md5-cache/sys-apps/mcstrans-2.8
index b20c6c1d7ad4..5b27347319ef 100644
--- a/metadata/md5-cache/sys-apps/mcstrans-2.8_rc2
+++ b/metadata/md5-cache/sys-apps/mcstrans-2.8
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=>=sys-libs/libsepol-2.8_rc2:= >=sys-libs/libselinux-2.8_rc2:= dev-libs/libpcre:= >=sys-libs/libcap-1.10-r10:=
+DEPEND=>=sys-libs/libsepol-2.8:= >=sys-libs/libselinux-2.8:= dev-libs/libpcre:= >=sys-libs/libcap-1.10-r10:=
 DESCRIPTION=SELinux context translation to human readable names
 EAPI=6
 HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
 KEYWORDS=~amd64 ~arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
-RDEPEND=>=sys-libs/libsepol-2.8_rc2:= >=sys-libs/libselinux-2.8_rc2:= dev-libs/libpcre:= >=sys-libs/libcap-1.10-r10:= !<sys-apps/policycoreutils-2.7_pre
+RDEPEND=>=sys-libs/libsepol-2.8:= >=sys-libs/libselinux-2.8:= dev-libs/libpcre:= >=sys-libs/libcap-1.10-r10:= !<sys-apps/policycoreutils-2.7_pre
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180426/mcstrans-2.8-rc2.tar.gz
+SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180524/mcstrans-2.8.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=17a6b3e7e64a5bbbe78473dd98daf4fc
+_md5_=15a81ca040e2cc4dce17d8b5f50ddb84
diff --git a/metadata/md5-cache/sys-apps/mcstrans-2.8_rc1 b/metadata/md5-cache/sys-apps/mcstrans-2.8_rc1
deleted file mode 100644
index 96a74f5bfa0d..000000000000
--- a/metadata/md5-cache/sys-apps/mcstrans-2.8_rc1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=>=sys-libs/libsepol-2.8_rc1:= >=sys-libs/libselinux-2.8_rc1:= dev-libs/libpcre:= >=sys-libs/libcap-1.10-r10:=
-DESCRIPTION=SELinux context translation to human readable names
-EAPI=6
-HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-libs/libsepol-2.8_rc1:= >=sys-libs/libselinux-2.8_rc1:= dev-libs/libpcre:= >=sys-libs/libcap-1.10-r10:= !<sys-apps/policycoreutils-2.7_pre
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180419/mcstrans-2.8-rc1.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=f6d9dee028c49211e56f7670d84e58dc
diff --git a/metadata/md5-cache/sys-apps/mcstrans-2.8_rc3 b/metadata/md5-cache/sys-apps/mcstrans-2.8_rc3
deleted file mode 100644
index ea8bb6e07ed6..000000000000
--- a/metadata/md5-cache/sys-apps/mcstrans-2.8_rc3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=>=sys-libs/libsepol-2.8_rc3:= >=sys-libs/libselinux-2.8_rc3:= dev-libs/libpcre:= >=sys-libs/libcap-1.10-r10:=
-DESCRIPTION=SELinux context translation to human readable names
-EAPI=6
-HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-libs/libsepol-2.8_rc3:= >=sys-libs/libselinux-2.8_rc3:= dev-libs/libpcre:= >=sys-libs/libcap-1.10-r10:= !<sys-apps/policycoreutils-2.7_pre
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180510/mcstrans-2.8-rc3.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=1d72502892490a8a7eef38bbf7f545a4
diff --git a/metadata/md5-cache/sys-apps/mcstrans-9999 b/metadata/md5-cache/sys-apps/mcstrans-9999
index abec366d9883..329c13451832 100644
--- a/metadata/md5-cache/sys-apps/mcstrans-9999
+++ b/metadata/md5-cache/sys-apps/mcstrans-9999
@@ -7,4 +7,4 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/libsepol-9999:= >=sys-libs/libselinux-9999:= dev-libs/libpcre:= >=sys-libs/libcap-1.10-r10:= !<sys-apps/policycoreutils-2.7_pre
 SLOT=0
 _eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=1d72502892490a8a7eef38bbf7f545a4
+_md5_=15a81ca040e2cc4dce17d8b5f50ddb84
diff --git a/metadata/md5-cache/sys-apps/osinfo-db-20180514 b/metadata/md5-cache/sys-apps/osinfo-db-20180514
new file mode 100644
index 000000000000..00217f0b0351
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/osinfo-db-20180514
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install unpack
+DEPEND=sys-apps/osinfo-db-tools
+DESCRIPTION=osinfo database files
+EAPI=6
+HOMEPAGE=http://libosinfo.org/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+SLOT=0
+SRC_URI=https://releases.pagure.org/libosinfo/osinfo-db-20180514.tar.xz
+_md5_=be12560bf2655cd433a98d20a27e75b7
diff --git a/metadata/md5-cache/sys-apps/policycoreutils-2.8 b/metadata/md5-cache/sys-apps/policycoreutils-2.8
new file mode 100644
index 000000000000..38fdf7e47a70
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/policycoreutils-2.8
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=>=sys-libs/libselinux-2.8:=[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(-)] >=sys-libs/libcap-1.10-r10:= >=sys-libs/libsemanage-2.8:=[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(-)] sys-libs/libcap-ng:= >=sys-libs/libsepol-2.8:= >=app-admin/setools-4.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-devel/gettext dev-python/ipy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dbus? ( sys-apps/dbus dev-libs/dbus-glib:= ) audit? ( >=sys-process/audit-1.5.1[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(-)] ) pam? ( sys-libs/pam:= ) 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(-)] !<sec-policy/selinux-base-policy-2.20151208-r6
+DESCRIPTION=SELinux core utilities
+EAPI=6
+HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
+IUSE=audit pam dbus python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm64 ~mips ~x86
+LICENSE=GPL-2
+PDEPEND=sys-apps/semodule-utils sys-apps/selinux-python
+RDEPEND=>=sys-libs/libselinux-2.8:=[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(-)] >=sys-libs/libcap-1.10-r10:= >=sys-libs/libsemanage-2.8:=[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(-)] sys-libs/libcap-ng:= >=sys-libs/libsepol-2.8:= >=app-admin/setools-4.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-devel/gettext dev-python/ipy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dbus? ( sys-apps/dbus dev-libs/dbus-glib:= ) audit? ( >=sys-process/audit-1.5.1[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(-)] ) pam? ( sys-libs/pam:= ) 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(-)] !<sec-policy/selinux-base-policy-2.20151208-r6 app-misc/pax-utils !<sys-apps/openrc-0.14
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180524/policycoreutils-2.8.tar.gz https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-1.36.tar.bz2
+_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec
+_md5_=0945b358c85253d49c3bcef46424d9c7
diff --git a/metadata/md5-cache/sys-apps/policycoreutils-2.8_rc1 b/metadata/md5-cache/sys-apps/policycoreutils-2.8_rc1
deleted file mode 100644
index dbf2a87a89ac..000000000000
--- a/metadata/md5-cache/sys-apps/policycoreutils-2.8_rc1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare unpack
-DEPEND=>=sys-libs/libselinux-2.8_rc1:=[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(-)] >=sys-libs/glibc-2.4 >=sys-libs/libcap-1.10-r10:= >=sys-libs/libsemanage-2.8_rc1:=[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(-)] sys-libs/libcap-ng:= >=sys-libs/libsepol-2.8_rc1:= >=app-admin/setools-4.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-devel/gettext dev-python/ipy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dbus? ( sys-apps/dbus dev-libs/dbus-glib:= ) audit? ( >=sys-process/audit-1.5.1[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(-)] ) pam? ( sys-libs/pam:= ) 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(-)] !<sec-policy/selinux-base-policy-2.20151208-r6
-DESCRIPTION=SELinux core utilities
-EAPI=6
-HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
-IUSE=audit pam dbus python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm64 ~mips ~x86
-LICENSE=GPL-2
-PDEPEND=sys-apps/semodule-utils sys-apps/selinux-python
-RDEPEND=>=sys-libs/libselinux-2.8_rc1:=[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(-)] >=sys-libs/glibc-2.4 >=sys-libs/libcap-1.10-r10:= >=sys-libs/libsemanage-2.8_rc1:=[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(-)] sys-libs/libcap-ng:= >=sys-libs/libsepol-2.8_rc1:= >=app-admin/setools-4.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-devel/gettext dev-python/ipy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dbus? ( sys-apps/dbus dev-libs/dbus-glib:= ) audit? ( >=sys-process/audit-1.5.1[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(-)] ) pam? ( sys-libs/pam:= ) 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(-)] !<sec-policy/selinux-base-policy-2.20151208-r6 app-misc/pax-utils !<sys-apps/openrc-0.14
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180419/policycoreutils-2.8-rc1.tar.gz https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-1.36.tar.bz2
-_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=c8b379c3cb6751a9f0164b87b42d63ac
diff --git a/metadata/md5-cache/sys-apps/policycoreutils-2.8_rc2 b/metadata/md5-cache/sys-apps/policycoreutils-2.8_rc2
deleted file mode 100644
index 4144abaf7a12..000000000000
--- a/metadata/md5-cache/sys-apps/policycoreutils-2.8_rc2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare unpack
-DEPEND=>=sys-libs/libselinux-2.8_rc2:=[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(-)] >=sys-libs/glibc-2.4 >=sys-libs/libcap-1.10-r10:= >=sys-libs/libsemanage-2.8_rc2:=[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(-)] sys-libs/libcap-ng:= >=sys-libs/libsepol-2.8_rc2:= >=app-admin/setools-4.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-devel/gettext dev-python/ipy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dbus? ( sys-apps/dbus dev-libs/dbus-glib:= ) audit? ( >=sys-process/audit-1.5.1[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(-)] ) pam? ( sys-libs/pam:= ) 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(-)] !<sec-policy/selinux-base-policy-2.20151208-r6
-DESCRIPTION=SELinux core utilities
-EAPI=6
-HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
-IUSE=audit pam dbus python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm64 ~mips ~x86
-LICENSE=GPL-2
-PDEPEND=sys-apps/semodule-utils sys-apps/selinux-python
-RDEPEND=>=sys-libs/libselinux-2.8_rc2:=[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(-)] >=sys-libs/glibc-2.4 >=sys-libs/libcap-1.10-r10:= >=sys-libs/libsemanage-2.8_rc2:=[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(-)] sys-libs/libcap-ng:= >=sys-libs/libsepol-2.8_rc2:= >=app-admin/setools-4.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-devel/gettext dev-python/ipy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dbus? ( sys-apps/dbus dev-libs/dbus-glib:= ) audit? ( >=sys-process/audit-1.5.1[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(-)] ) pam? ( sys-libs/pam:= ) 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(-)] !<sec-policy/selinux-base-policy-2.20151208-r6 app-misc/pax-utils !<sys-apps/openrc-0.14
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180426/policycoreutils-2.8-rc2.tar.gz https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-1.36.tar.bz2
-_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=0676ce2424a2822100d51fd13a393e0a
diff --git a/metadata/md5-cache/sys-apps/policycoreutils-2.8_rc3 b/metadata/md5-cache/sys-apps/policycoreutils-2.8_rc3
deleted file mode 100644
index 84ef5d4a2531..000000000000
--- a/metadata/md5-cache/sys-apps/policycoreutils-2.8_rc3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare unpack
-DEPEND=>=sys-libs/libselinux-2.8_rc3:=[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(-)] >=sys-libs/glibc-2.4 >=sys-libs/libcap-1.10-r10:= >=sys-libs/libsemanage-2.8_rc3:=[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(-)] sys-libs/libcap-ng:= >=sys-libs/libsepol-2.8_rc3:= >=app-admin/setools-4.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-devel/gettext dev-python/ipy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dbus? ( sys-apps/dbus dev-libs/dbus-glib:= ) audit? ( >=sys-process/audit-1.5.1[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(-)] ) pam? ( sys-libs/pam:= ) 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(-)] !<sec-policy/selinux-base-policy-2.20151208-r6
-DESCRIPTION=SELinux core utilities
-EAPI=6
-HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
-IUSE=audit pam dbus python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm64 ~mips ~x86
-LICENSE=GPL-2
-PDEPEND=sys-apps/semodule-utils sys-apps/selinux-python
-RDEPEND=>=sys-libs/libselinux-2.8_rc3:=[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(-)] >=sys-libs/glibc-2.4 >=sys-libs/libcap-1.10-r10:= >=sys-libs/libsemanage-2.8_rc3:=[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(-)] sys-libs/libcap-ng:= >=sys-libs/libsepol-2.8_rc3:= >=app-admin/setools-4.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-devel/gettext dev-python/ipy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dbus? ( sys-apps/dbus dev-libs/dbus-glib:= ) audit? ( >=sys-process/audit-1.5.1[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(-)] ) pam? ( sys-libs/pam:= ) 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(-)] !<sec-policy/selinux-base-policy-2.20151208-r6 app-misc/pax-utils !<sys-apps/openrc-0.14
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180510/policycoreutils-2.8-rc3.tar.gz https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-1.36.tar.bz2
-_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=58852c7ef2309d8499197c4d6538bcc0
diff --git a/metadata/md5-cache/sys-apps/policycoreutils-9999 b/metadata/md5-cache/sys-apps/policycoreutils-9999
index e457ace9d94f..acd616620dc2 100644
--- a/metadata/md5-cache/sys-apps/policycoreutils-9999
+++ b/metadata/md5-cache/sys-apps/policycoreutils-9999
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-1.36.tar.bz2
 _eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	git-r3	af51ccfceeb403ab80f1bf9209d372c8	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=04eec088db941b8a45fe78866ff90132
+_md5_=0945b358c85253d49c3bcef46424d9c7
diff --git a/metadata/md5-cache/sys-apps/portage-2.3.39 b/metadata/md5-cache/sys-apps/portage-2.3.39
new file mode 100644
index 000000000000..e9c7c090389f
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/portage-2.3.39
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test
+DEPEND=!build? ( python_targets_pypy? ( >=virtual/pypy-5:0=[ssl(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[ssl(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[ssl(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[ssl(+)] ) ) >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/sed-4.0.5 sys-devel/patch doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) epydoc? ( >=dev-python/epydoc-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[bzip2(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/pkgconfig
+DESCRIPTION=Portage is the package management and distribution system for Gentoo
+EAPI=5
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
+IUSE=build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=GPL-2
+PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
+RDEPEND=>=app-arch/tar-1.27 dev-lang/python-exec:2 !build? ( >=sys-apps/sed-4.0.5 app-shells/bash:0[readline] >=app-admin/eselect-1.2 python_targets_pypy? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python2_7? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) rsync-verify? ( >=app-portage/gemato-12.1 app-crypt/openpgp-keys-gentoo-release >=app-crypt/gnupg-2.2.4-r2[ssl(-)] ) ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_musl? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) >=app-misc/pax-utils-0.1.17 selinux? ( >=sys-libs/libselinux-2.0.94[python,python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) xattr? ( kernel_linux? ( >=sys-apps/install-xattr-0.3 python_targets_pypy? ( dev-python/pyxattr[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pyxattr[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) ) !<app-admin/logrotate-3.8.0 python_targets_pypy? ( >=virtual/pypy-5:0=[bzip2(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=epydoc? ( python_targets_python2_7 ) || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://gentoo/portage-2.3.39.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-2.3.39.tar.bz2
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=efff361b1cc2cd9f9d615a35e99f1e03
diff --git a/metadata/md5-cache/sys-apps/restorecond-2.8 b/metadata/md5-cache/sys-apps/restorecond-2.8
new file mode 100644
index 000000000000..65340a1baa9d
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/restorecond-2.8
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=>=sys-libs/libsepol-2.8:= >=sys-libs/libselinux-2.8:= dev-libs/dbus-glib dev-libs/libpcre:= >=sys-libs/libcap-1.10-r10:=
+DESCRIPTION=Daemon to watch for creation and set default SELinux fcontexts
+EAPI=6
+HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-libs/libsepol-2.8:= >=sys-libs/libselinux-2.8:= dev-libs/dbus-glib dev-libs/libpcre:= >=sys-libs/libcap-1.10-r10:= !<sys-apps/policycoreutils-2.7_pre
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180524/restorecond-2.8.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec
+_md5_=9ca8985a7f9b39c0b2c4efe1a43dabee
diff --git a/metadata/md5-cache/sys-apps/restorecond-2.8_rc1 b/metadata/md5-cache/sys-apps/restorecond-2.8_rc1
deleted file mode 100644
index 12010a270089..000000000000
--- a/metadata/md5-cache/sys-apps/restorecond-2.8_rc1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=>=sys-libs/libsepol-2.8_rc1:= >=sys-libs/libselinux-2.8_rc1:= dev-libs/dbus-glib dev-libs/libpcre:= >=sys-libs/libcap-1.10-r10:=
-DESCRIPTION=Daemon to watch for creation and set default SELinux fcontexts
-EAPI=6
-HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-libs/libsepol-2.8_rc1:= >=sys-libs/libselinux-2.8_rc1:= dev-libs/dbus-glib dev-libs/libpcre:= >=sys-libs/libcap-1.10-r10:= !<sys-apps/policycoreutils-2.7_pre
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180419/restorecond-2.8-rc1.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=5fe93a1b26d4c7d4660e7322949e4e61
diff --git a/metadata/md5-cache/sys-apps/restorecond-2.8_rc2 b/metadata/md5-cache/sys-apps/restorecond-2.8_rc2
deleted file mode 100644
index c253a1a4fdf1..000000000000
--- a/metadata/md5-cache/sys-apps/restorecond-2.8_rc2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=>=sys-libs/libsepol-2.8_rc2:= >=sys-libs/libselinux-2.8_rc2:= dev-libs/dbus-glib dev-libs/libpcre:= >=sys-libs/libcap-1.10-r10:=
-DESCRIPTION=Daemon to watch for creation and set default SELinux fcontexts
-EAPI=6
-HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-libs/libsepol-2.8_rc2:= >=sys-libs/libselinux-2.8_rc2:= dev-libs/dbus-glib dev-libs/libpcre:= >=sys-libs/libcap-1.10-r10:= !<sys-apps/policycoreutils-2.7_pre
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180426/restorecond-2.8-rc2.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=9ccbcf7fe20b97384cb2a10280ecc95c
diff --git a/metadata/md5-cache/sys-apps/restorecond-2.8_rc3 b/metadata/md5-cache/sys-apps/restorecond-2.8_rc3
deleted file mode 100644
index 567b87b43abd..000000000000
--- a/metadata/md5-cache/sys-apps/restorecond-2.8_rc3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=>=sys-libs/libsepol-2.8_rc3:= >=sys-libs/libselinux-2.8_rc3:= dev-libs/dbus-glib dev-libs/libpcre:= >=sys-libs/libcap-1.10-r10:=
-DESCRIPTION=Daemon to watch for creation and set default SELinux fcontexts
-EAPI=6
-HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-libs/libsepol-2.8_rc3:= >=sys-libs/libselinux-2.8_rc3:= dev-libs/dbus-glib dev-libs/libpcre:= >=sys-libs/libcap-1.10-r10:= !<sys-apps/policycoreutils-2.7_pre
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180510/restorecond-2.8-rc3.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=ecb67dac1000e46edd829cee2db32e22
diff --git a/metadata/md5-cache/sys-apps/restorecond-9999 b/metadata/md5-cache/sys-apps/restorecond-9999
index 1a8ebeceeaf0..7c5808b239e1 100644
--- a/metadata/md5-cache/sys-apps/restorecond-9999
+++ b/metadata/md5-cache/sys-apps/restorecond-9999
@@ -7,4 +7,4 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/libsepol-9999:= >=sys-libs/libselinux-9999:= dev-libs/dbus-glib dev-libs/libpcre:= >=sys-libs/libcap-1.10-r10:= !<sys-apps/policycoreutils-2.7_pre
 SLOT=0
 _eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=ecb67dac1000e46edd829cee2db32e22
+_md5_=9ca8985a7f9b39c0b2c4efe1a43dabee
diff --git a/metadata/md5-cache/sys-apps/secilc-2.6 b/metadata/md5-cache/sys-apps/secilc-2.6
deleted file mode 100644
index 1279ade54015..000000000000
--- a/metadata/md5-cache/sys-apps/secilc-2.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=app-text/xmlto >=sys-libs/libsepol-2.6
-DESCRIPTION=SELinux Common Intermediate Language (CIL) Compiler
-EAPI=6
-HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=sys-libs/libsepol-2.6
-RESTRICT=test
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20161014/secilc-2.6.tar.gz
-_md5_=fdd98b53f52c13873e14950dee735ae5
diff --git a/metadata/md5-cache/sys-apps/secilc-2.8_rc1 b/metadata/md5-cache/sys-apps/secilc-2.8
index cf12360ab5ff..644f0106571e 100644
--- a/metadata/md5-cache/sys-apps/secilc-2.8_rc1
+++ b/metadata/md5-cache/sys-apps/secilc-2.8
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile
-DEPEND=app-text/xmlto >=sys-libs/libsepol-2.8_rc1
+DEPEND=app-text/xmlto >=sys-libs/libsepol-2.8
 DESCRIPTION=SELinux Common Intermediate Language (CIL) Compiler
 EAPI=6
 HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=sys-libs/libsepol-2.8_rc1
+RDEPEND=>=sys-libs/libsepol-2.8
 RESTRICT=test
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180419/secilc-2.8-rc1.tar.gz
+SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180524/secilc-2.8.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=fcc63bb27ceae751c0ca8d8e1d0e73f2
+_md5_=186cb4f6f522c5ccd539707c5dd27c49
diff --git a/metadata/md5-cache/sys-apps/secilc-2.8_rc2 b/metadata/md5-cache/sys-apps/secilc-2.8_rc2
deleted file mode 100644
index 76474f705466..000000000000
--- a/metadata/md5-cache/sys-apps/secilc-2.8_rc2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile
-DEPEND=app-text/xmlto >=sys-libs/libsepol-2.8_rc2
-DESCRIPTION=SELinux Common Intermediate Language (CIL) Compiler
-EAPI=6
-HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-libs/libsepol-2.8_rc2
-RESTRICT=test
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180426/secilc-2.8-rc2.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=bf637916945e9c7915a588b19d556032
diff --git a/metadata/md5-cache/sys-apps/secilc-2.8_rc3 b/metadata/md5-cache/sys-apps/secilc-2.8_rc3
deleted file mode 100644
index 8a1fde2e24cc..000000000000
--- a/metadata/md5-cache/sys-apps/secilc-2.8_rc3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile
-DEPEND=app-text/xmlto >=sys-libs/libsepol-2.8_rc3
-DESCRIPTION=SELinux Common Intermediate Language (CIL) Compiler
-EAPI=6
-HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-libs/libsepol-2.8_rc3
-RESTRICT=test
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180510/secilc-2.8-rc3.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=f83fd989c9581c691f888ce2be98b457
diff --git a/metadata/md5-cache/sys-apps/secilc-9999 b/metadata/md5-cache/sys-apps/secilc-9999
index 031d3c720694..a6b1475d78d6 100644
--- a/metadata/md5-cache/sys-apps/secilc-9999
+++ b/metadata/md5-cache/sys-apps/secilc-9999
@@ -8,4 +8,4 @@ RDEPEND=>=sys-libs/libsepol-9999
 RESTRICT=test
 SLOT=0
 _eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=f83fd989c9581c691f888ce2be98b457
+_md5_=186cb4f6f522c5ccd539707c5dd27c49
diff --git a/metadata/md5-cache/sys-apps/selinux-python-2.8 b/metadata/md5-cache/sys-apps/selinux-python-2.8
new file mode 100644
index 000000000000..df7f00ee9989
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/selinux-python-2.8
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=>=sys-libs/libselinux-2.8:=[python] >=sys-libs/libsemanage-2.8:=[python] >=sys-libs/libsepol-2.8:= >=app-admin/setools-4.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ipy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_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/sepolgen 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(-)]
+DESCRIPTION=SELinux core utilities
+EAPI=6
+HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-libs/libselinux-2.8:=[python] >=sys-libs/libsemanage-2.8:=[python] >=sys-libs/libsepol-2.8:= >=app-admin/setools-4.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ipy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_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/sepolgen 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=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180524/selinux-python-2.8.tar.gz
+_eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec
+_md5_=fd38bfad765a5ab8a04a06ddf549fead
diff --git a/metadata/md5-cache/sys-apps/selinux-python-2.8_rc1 b/metadata/md5-cache/sys-apps/selinux-python-2.8_rc1
deleted file mode 100644
index 2a663846a5c5..000000000000
--- a/metadata/md5-cache/sys-apps/selinux-python-2.8_rc1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=>=sys-libs/libselinux-2.8_rc1:=[python] >=sys-libs/libsemanage-2.8_rc1:=[python] >=sys-libs/libsepol-2.8_rc1:= >=app-admin/setools-4.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ipy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_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/sepolgen 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(-)]
-DESCRIPTION=SELinux core utilities
-EAPI=6
-HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-libs/libselinux-2.8_rc1:=[python] >=sys-libs/libsemanage-2.8_rc1:=[python] >=sys-libs/libsepol-2.8_rc1:= >=app-admin/setools-4.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ipy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_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/sepolgen 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=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180419/selinux-python-2.8-rc1.tar.gz
-_eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=42cad0f265107188e278552d970cca9b
diff --git a/metadata/md5-cache/sys-apps/selinux-python-2.8_rc2 b/metadata/md5-cache/sys-apps/selinux-python-2.8_rc2
deleted file mode 100644
index 7861d30400a0..000000000000
--- a/metadata/md5-cache/sys-apps/selinux-python-2.8_rc2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=>=sys-libs/libselinux-2.8_rc2:=[python] >=sys-libs/libsemanage-2.8_rc2:=[python] >=sys-libs/libsepol-2.8_rc2:= >=app-admin/setools-4.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ipy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_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/sepolgen 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(-)]
-DESCRIPTION=SELinux core utilities
-EAPI=6
-HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-libs/libselinux-2.8_rc2:=[python] >=sys-libs/libsemanage-2.8_rc2:=[python] >=sys-libs/libsepol-2.8_rc2:= >=app-admin/setools-4.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ipy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_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/sepolgen 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=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180426/selinux-python-2.8-rc2.tar.gz
-_eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=3793697c6f5bcc6da99437e5f2733319
diff --git a/metadata/md5-cache/sys-apps/selinux-python-2.8_rc3 b/metadata/md5-cache/sys-apps/selinux-python-2.8_rc3
deleted file mode 100644
index bd91cc4636da..000000000000
--- a/metadata/md5-cache/sys-apps/selinux-python-2.8_rc3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=>=sys-libs/libselinux-2.8_rc3:=[python] >=sys-libs/libsemanage-2.8_rc3:=[python] >=sys-libs/libsepol-2.8_rc3:= >=app-admin/setools-4.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ipy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_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/sepolgen 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(-)]
-DESCRIPTION=SELinux core utilities
-EAPI=6
-HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-libs/libselinux-2.8_rc3:=[python] >=sys-libs/libsemanage-2.8_rc3:=[python] >=sys-libs/libsepol-2.8_rc3:= >=app-admin/setools-4.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ipy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_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/sepolgen 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=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180510/selinux-python-2.8-rc3.tar.gz
-_eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=629dd101d415a2257f7dbebfd56bc2c9
diff --git a/metadata/md5-cache/sys-apps/selinux-python-9999 b/metadata/md5-cache/sys-apps/selinux-python-9999
index 9a5c09fde1f1..8521c9d588c1 100644
--- a/metadata/md5-cache/sys-apps/selinux-python-9999
+++ b/metadata/md5-cache/sys-apps/selinux-python-9999
@@ -9,4 +9,4 @@ RDEPEND=>=sys-libs/libselinux-9999:=[python] >=sys-libs/libsemanage-9999:=[pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 _eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=629dd101d415a2257f7dbebfd56bc2c9
+_md5_=fd38bfad765a5ab8a04a06ddf549fead
diff --git a/metadata/md5-cache/sys-apps/semodule-utils-2.8_rc2 b/metadata/md5-cache/sys-apps/semodule-utils-2.8
index 67ac98387696..a195ed0fe65e 100644
--- a/metadata/md5-cache/sys-apps/semodule-utils-2.8_rc2
+++ b/metadata/md5-cache/sys-apps/semodule-utils-2.8
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=>=sys-libs/libsepol-2.8_rc2:=
+DEPEND=>=sys-libs/libsepol-2.8:=
 DESCRIPTION=SELinux policy module utilities
 EAPI=6
 HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
 KEYWORDS=~amd64 ~arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
-RDEPEND=>=sys-libs/libsepol-2.8_rc2:= !<sys-apps/policycoreutils-2.7_pre
+RDEPEND=>=sys-libs/libsepol-2.8:= !<sys-apps/policycoreutils-2.7_pre
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180426/semodule-utils-2.8-rc2.tar.gz
+SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180524/semodule-utils-2.8.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=4c4b24967a13d72b2ea2a0e882da1fac
+_md5_=546998b9e16d3608b29e6250255dbb61
diff --git a/metadata/md5-cache/sys-apps/semodule-utils-2.8_rc1 b/metadata/md5-cache/sys-apps/semodule-utils-2.8_rc1
deleted file mode 100644
index d7895af61d91..000000000000
--- a/metadata/md5-cache/sys-apps/semodule-utils-2.8_rc1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=>=sys-libs/libsepol-2.8_rc1:=
-DESCRIPTION=SELinux policy module utilities
-EAPI=6
-HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-libs/libsepol-2.8_rc1:= !<sys-apps/policycoreutils-2.7_pre
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180419/semodule-utils-2.8-rc1.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=dcd8cf739df1dc85c073605c52dd90cb
diff --git a/metadata/md5-cache/sys-apps/semodule-utils-2.8_rc3 b/metadata/md5-cache/sys-apps/semodule-utils-2.8_rc3
deleted file mode 100644
index c342b1553233..000000000000
--- a/metadata/md5-cache/sys-apps/semodule-utils-2.8_rc3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=>=sys-libs/libsepol-2.8_rc3:=
-DESCRIPTION=SELinux policy module utilities
-EAPI=6
-HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-libs/libsepol-2.8_rc3:= !<sys-apps/policycoreutils-2.7_pre
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180510/semodule-utils-2.8-rc3.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=05e0d02b9e994b47f56772ca7559affd
diff --git a/metadata/md5-cache/sys-apps/semodule-utils-9999 b/metadata/md5-cache/sys-apps/semodule-utils-9999
index 3538c71c1edd..1e94a1987b0e 100644
--- a/metadata/md5-cache/sys-apps/semodule-utils-9999
+++ b/metadata/md5-cache/sys-apps/semodule-utils-9999
@@ -7,4 +7,4 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/libsepol-9999:= !<sys-apps/policycoreutils-2.7_pre
 SLOT=0
 _eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=05e0d02b9e994b47f56772ca7559affd
+_md5_=546998b9e16d3608b29e6250255dbb61
diff --git a/metadata/md5-cache/sys-apps/shadow-4.5 b/metadata/md5-cache/sys-apps/shadow-4.5
deleted file mode 100644
index 9017187faa73..000000000000
--- a/metadata/md5-cache/sys-apps/shadow-4.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst preinst prepare
-DEPEND=acl? ( sys-apps/acl:0= ) audit? ( >=sys-process/audit-2.6:0= ) cracklib? ( >=sys-libs/cracklib-2.7-r3:0= ) pam? ( virtual/pam:0= ) skey? ( sys-auth/skey:0= ) selinux? ( >=sys-libs/libselinux-1.28:0= sys-libs/libsemanage:0= ) nls? ( virtual/libintl ) xattr? ( sys-apps/attr:0= ) app-arch/xz-utils nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422
-DESCRIPTION=Utilities to deal with user accounts
-EAPI=5
-HOMEPAGE=https://github.com/shadow-maint/shadow http://pkg-shadow.alioth.debian.org/
-IUSE=acl audit +cracklib nls pam selinux skey xattr
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
-LICENSE=BSD GPL-2
-RDEPEND=acl? ( sys-apps/acl:0= ) audit? ( >=sys-process/audit-2.6:0= ) cracklib? ( >=sys-libs/cracklib-2.7-r3:0= ) pam? ( virtual/pam:0= ) skey? ( sys-auth/skey:0= ) selinux? ( >=sys-libs/libselinux-1.28:0= sys-libs/libsemanage:0= ) nls? ( virtual/libintl ) xattr? ( sys-apps/attr:0= ) pam? ( >=sys-auth/pambase-20150213 )
-SLOT=0
-SRC_URI=https://github.com/shadow-maint/shadow/releases/download/4.5/shadow-4.5.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3ecb52282ca16baec4bc889a4797dcdb
diff --git a/metadata/md5-cache/sys-apps/shadow-4.5-r1 b/metadata/md5-cache/sys-apps/shadow-4.5-r1
deleted file mode 100644
index dc275b6ce9b2..000000000000
--- a/metadata/md5-cache/sys-apps/shadow-4.5-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst preinst prepare
-DEPEND=acl? ( sys-apps/acl:0= ) audit? ( >=sys-process/audit-2.6:0= ) cracklib? ( >=sys-libs/cracklib-2.7-r3:0= ) pam? ( virtual/pam:0= ) skey? ( sys-auth/skey:0= ) selinux? ( >=sys-libs/libselinux-1.28:0= sys-libs/libsemanage:0= ) nls? ( virtual/libintl ) xattr? ( sys-apps/attr:0= ) app-arch/xz-utils nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422
-DESCRIPTION=Utilities to deal with user accounts
-EAPI=6
-HOMEPAGE=https://github.com/shadow-maint/shadow http://pkg-shadow.alioth.debian.org/
-IUSE=acl audit +cracklib nls pam selinux skey xattr
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=BSD GPL-2
-RDEPEND=acl? ( sys-apps/acl:0= ) audit? ( >=sys-process/audit-2.6:0= ) cracklib? ( >=sys-libs/cracklib-2.7-r3:0= ) pam? ( virtual/pam:0= ) skey? ( sys-auth/skey:0= ) selinux? ( >=sys-libs/libselinux-1.28:0= sys-libs/libsemanage:0= ) nls? ( virtual/libintl ) xattr? ( sys-apps/attr:0= ) pam? ( >=sys-auth/pambase-20150213 )
-SLOT=0
-SRC_URI=https://github.com/shadow-maint/shadow/releases/download/4.5/shadow-4.5.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=73bea2e3c8ed3cd6dc4f25e16deccbdd
diff --git a/metadata/md5-cache/sys-apps/shadow-4.6 b/metadata/md5-cache/sys-apps/shadow-4.6
index d22146f88dbf..1f42181f7013 100644
--- a/metadata/md5-cache/sys-apps/shadow-4.6
+++ b/metadata/md5-cache/sys-apps/shadow-4.6
@@ -4,10 +4,10 @@ DESCRIPTION=Utilities to deal with user accounts
 EAPI=6
 HOMEPAGE=https://github.com/shadow-maint/shadow http://pkg-shadow.alioth.debian.org/
 IUSE=acl audit +cracklib nls pam selinux skey xattr
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ~ppc64 s390 sh sparc x86
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 LICENSE=BSD GPL-2
 RDEPEND=acl? ( sys-apps/acl:0= ) audit? ( >=sys-process/audit-2.6:0= ) cracklib? ( >=sys-libs/cracklib-2.7-r3:0= ) pam? ( virtual/pam:0= ) skey? ( sys-auth/skey:0= ) selinux? ( >=sys-libs/libselinux-1.28:0= sys-libs/libsemanage:0= ) nls? ( virtual/libintl ) xattr? ( sys-apps/attr:0= ) pam? ( >=sys-auth/pambase-20150213 )
 SLOT=0
 SRC_URI=https://github.com/shadow-maint/shadow/releases/download/4.6/shadow-4.6.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6df2a90bdcd7086b4835df1a2b52b36c
+_md5_=a932d2924dd86cd1307815690cddff1f
diff --git a/metadata/md5-cache/sys-apps/systemd-236-r5 b/metadata/md5-cache/sys-apps/systemd-236-r5
index 8f1e3c8b8fb5..4da8f5df2456 100644
--- a/metadata/md5-cache/sys-apps/systemd-236-r5
+++ b/metadata/md5-cache/sys-apps/systemd-236-r5
@@ -3,7 +3,7 @@ DEPEND=>=sys-apps/util-linux-2.30:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 DESCRIPTION=System and service manager for Linux
 EAPI=6
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
-IUSE=acl apparmor audit build cryptsetup curl elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam policykit qrcode +seccomp selinux ssl +sysv-utils test usrmerge 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
+IUSE=acl apparmor audit build cryptsetup curl elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam policykit qrcode +seccomp selinux +split-usr 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 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 )
@@ -12,5 +12,5 @@ REQUIRED_USE=importd? ( curl gcrypt lzma )
 RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/systemd/systemd/archive/v236.tar.gz -> systemd-236.tar.gz https://dev.gentoo.org/~floppym/dist/systemd-236-patches-2.tar.gz
-_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	ecfaf615b512dc4ff2a50a35e6b26c09	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=6d8a014740ab9534b878a807fe0994aa
+_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	53e3ab209402d5ad07a9c4580c423d1a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f8c61e42536a9341244791197f369df3
diff --git a/metadata/md5-cache/sys-apps/systemd-238-r2 b/metadata/md5-cache/sys-apps/systemd-238-r2
deleted file mode 100644
index 008aba34e3da..000000000000
--- a/metadata/md5-cache/sys-apps/systemd-238-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare prerm pretend setup test unpack
-DEPEND=>=sys-apps/util-linux-2.30: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? ( libidn2? ( net-dns/libidn2 ) !libidn2? ( net-dns/libidn ) ) 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(-)?] ) pcre? ( dev-libs/libpcre2 ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) 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 || ( ( 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(+)] ) ) >=dev-util/meson-0.40.0 >=dev-util/ninja-1.7.2 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 elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +seccomp selinux ssl +sysv-utils test usrmerge 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 ~mips ~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.30: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? ( libidn2? ( net-dns/libidn2 ) !libidn2? ( net-dns/libidn ) ) 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(-)?] ) pcre? ( dev-libs/libpcre2 ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) >=sys-apps/baselayout-2.2 selinux? ( sec-policy/selinux-base-policy[systemd] ) sysv-utils? ( !sys-apps/sysvinit ) !sysv-utils? ( sys-apps/sysvinit ) !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 )
-RESTRICT=!test? ( test )
-SLOT=0/2
-SRC_URI=https://github.com/systemd/systemd/archive/v238/systemd-238.tar.gz
-_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	ecfaf615b512dc4ff2a50a35e6b26c09	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=b0f3395a43c9e7ad6807999a4f476831
diff --git a/metadata/md5-cache/sys-apps/systemd-238-r4 b/metadata/md5-cache/sys-apps/systemd-238-r4
deleted file mode 100644
index 0f624bb78e21..000000000000
--- a/metadata/md5-cache/sys-apps/systemd-238-r4
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare prerm pretend setup test unpack
-DEPEND=>=sys-apps/util-linux-2.30: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? ( libidn2? ( net-dns/libidn2 ) !libidn2? ( net-dns/libidn ) ) 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(-)?] ) pcre? ( dev-libs/libpcre2 ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) 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 || ( ( 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(+)] ) ) >=dev-util/meson-0.40.0 >=dev-util/ninja-1.7.2 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 elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +seccomp selinux ssl +sysv-utils test usrmerge 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 ~mips ~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.30: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? ( libidn2? ( net-dns/libidn2 ) !libidn2? ( net-dns/libidn ) ) 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(-)?] ) pcre? ( dev-libs/libpcre2 ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) >=sys-apps/baselayout-2.2 selinux? ( sec-policy/selinux-base-policy[systemd] ) sysv-utils? ( !sys-apps/sysvinit ) !sysv-utils? ( sys-apps/sysvinit ) !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 )
-RESTRICT=!test? ( test )
-SLOT=0/2
-SRC_URI=https://github.com/systemd/systemd/archive/v238/systemd-238.tar.gz https://dev.gentoo.org/~floppym/dist/systemd-238-patches-0.tar.gz
-_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	ecfaf615b512dc4ff2a50a35e6b26c09	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=ed7700510773b741173ba5ec08013cd4
diff --git a/metadata/md5-cache/sys-apps/systemd-238-r6 b/metadata/md5-cache/sys-apps/systemd-238-r7
index a1921fa437b1..fa4ef3efbec8 100644
--- a/metadata/md5-cache/sys-apps/systemd-238-r6
+++ b/metadata/md5-cache/sys-apps/systemd-238-r7
@@ -3,7 +3,7 @@ DEPEND=>=sys-apps/util-linux-2.30:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 DESCRIPTION=System and service manager for Linux
 EAPI=6
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
-IUSE=acl apparmor audit build cryptsetup curl elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +seccomp selinux ssl +sysv-utils test usrmerge 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
+IUSE=acl apparmor audit build cryptsetup curl elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +seccomp selinux +split-usr 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 ~mips ~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 )
@@ -12,5 +12,5 @@ REQUIRED_USE=importd? ( curl gcrypt lzma )
 RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/systemd/systemd/archive/v238/systemd-238.tar.gz https://dev.gentoo.org/~floppym/dist/systemd-238-patches-1.tar.gz
-_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	ecfaf615b512dc4ff2a50a35e6b26c09	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=7884e62ad635e04aa616bb0f65481660
+_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	53e3ab209402d5ad07a9c4580c423d1a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=eab9eaf484ab2ea4488ef8c5c2c2bf83
diff --git a/metadata/md5-cache/sys-apps/systemd-9999 b/metadata/md5-cache/sys-apps/systemd-9999
index 49977498e87a..c31456615050 100644
--- a/metadata/md5-cache/sys-apps/systemd-9999
+++ b/metadata/md5-cache/sys-apps/systemd-9999
@@ -3,12 +3,12 @@ DEPEND=>=sys-apps/util-linux-2.30:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 DESCRIPTION=System and service manager for Linux
 EAPI=6
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
-IUSE=acl apparmor audit build cryptsetup curl elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux ssl +sysv-utils test usrmerge 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
+IUSE=acl apparmor audit build cryptsetup curl elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux +split-usr 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
 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.30: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? ( libidn2? ( net-dns/libidn2:= ) !libidn2? ( net-dns/libidn:= ) ) 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(-)?] ) pcre? ( dev-libs/libpcre2 ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) >=sys-apps/baselayout-2.2 selinux? ( sec-policy/selinux-base-policy[systemd] ) sysv-utils? ( !sys-apps/sysvinit ) !sysv-utils? ( sys-apps/sysvinit ) resolvconf? ( !net-dns/openresolv ) !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 )
 RESTRICT=!test? ( test )
 SLOT=0/2
-_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	ecfaf615b512dc4ff2a50a35e6b26c09	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=b0b14146fec3574534edfaded5e8f0b6
+_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	53e3ab209402d5ad07a9c4580c423d1a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ab9e0740bf5f9a4442af5f7ca76fd82b
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index 316707ee3349..648032cc7ce1 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/elogind-235.2-r2 b/metadata/md5-cache/sys-auth/elogind-235.2-r2
index 2a1a9fb6a7b1..17a8f99862e5 100644
--- a/metadata/md5-cache/sys-auth/elogind-235.2-r2
+++ b/metadata/md5-cache/sys-auth/elogind-235.2-r2
@@ -10,5 +10,5 @@ PDEPEND=sys-apps/dbus policykit? ( sys-auth/polkit )
 RDEPEND=sys-apps/util-linux sys-libs/libcap virtual/libudev:= acl? ( sys-apps/acl ) pam? ( virtual/pam ) selinux? ( sys-libs/libselinux ) !sys-apps/systemd
 SLOT=0
 SRC_URI=https://github.com/elogind/elogind/archive/v235.2.tar.gz -> elogind-235.2.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	ecfaf615b512dc4ff2a50a35e6b26c09	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	udev	d91cac2c73b94629cad2daea66e0d182	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	53e3ab209402d5ad07a9c4580c423d1a	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	udev	d91cac2c73b94629cad2daea66e0d182	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=fb5605f6056614ba4309ea90ed09932f
diff --git a/metadata/md5-cache/sys-auth/elogind-236.1 b/metadata/md5-cache/sys-auth/elogind-236.1
index 019e8087ed9c..fe4bd48869fd 100644
--- a/metadata/md5-cache/sys-auth/elogind-236.1
+++ b/metadata/md5-cache/sys-auth/elogind-236.1
@@ -10,5 +10,5 @@ PDEPEND=sys-apps/dbus policykit? ( sys-auth/polkit )
 RDEPEND=sys-apps/util-linux sys-libs/libcap virtual/libudev:= acl? ( sys-apps/acl ) pam? ( virtual/pam ) selinux? ( sys-libs/libselinux ) !sys-apps/systemd
 SLOT=0
 SRC_URI=https://github.com/elogind/elogind/archive/v236.1.tar.gz -> elogind-236.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	ecfaf615b512dc4ff2a50a35e6b26c09	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	udev	d91cac2c73b94629cad2daea66e0d182	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	53e3ab209402d5ad07a9c4580c423d1a	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	udev	d91cac2c73b94629cad2daea66e0d182	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=34ce009c67b0f3577b384456bd3e85f9
diff --git a/metadata/md5-cache/sys-auth/rtkit-0.11-r1 b/metadata/md5-cache/sys-auth/rtkit-0.11-r1
deleted file mode 100644
index fa6e6f75cad1..000000000000
--- a/metadata/md5-cache/sys-auth/rtkit-0.11-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=sys-apps/dbus sys-auth/polkit sys-libs/libcap virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Realtime Policy and Watchdog Daemon
-EAPI=5
-HOMEPAGE=http://0pointer.de/blog/projects/rtkit
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86
-LICENSE=GPL-3 BSD
-RDEPEND=sys-apps/dbus sys-auth/polkit sys-libs/libcap
-SLOT=0
-SRC_URI=http://0pointer.de/public/rtkit-0.11.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=aaa1bc455c714e95653a294d813c261b
diff --git a/metadata/md5-cache/sys-boot/Manifest.gz b/metadata/md5-cache/sys-boot/Manifest.gz
index 814f26a869f2..32d234d81203 100644
--- a/metadata/md5-cache/sys-boot/Manifest.gz
+++ b/metadata/md5-cache/sys-boot/Manifest.gz
diff --git a/metadata/md5-cache/sys-boot/systemd-boot-235 b/metadata/md5-cache/sys-boot/systemd-boot-235
index e3756b4b0d9d..4ada81def8c7 100644
--- a/metadata/md5-cache/sys-boot/systemd-boot-235
+++ b/metadata/md5-cache/sys-boot/systemd-boot-235
@@ -9,5 +9,5 @@ RDEPEND=>=sys-apps/util-linux-2.30 !sys-apps/systemd
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd/archive/v235.tar.gz -> systemd-235.tar.gz
-_eclasses_=meson	ecfaf615b512dc4ff2a50a35e6b26c09	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec
+_eclasses_=meson	53e3ab209402d5ad07a9c4580c423d1a	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec
 _md5_=0e8f207e74923b79c4bc3d1d8fb86b27
diff --git a/metadata/md5-cache/sys-boot/systemd-boot-237 b/metadata/md5-cache/sys-boot/systemd-boot-237
index cb1ee78cb421..9e70d491c6d2 100644
--- a/metadata/md5-cache/sys-boot/systemd-boot-237
+++ b/metadata/md5-cache/sys-boot/systemd-boot-237
@@ -9,5 +9,5 @@ RDEPEND=>=sys-apps/util-linux-2.30 !sys-apps/systemd
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd/archive/v237.tar.gz -> systemd-237.tar.gz
-_eclasses_=meson	ecfaf615b512dc4ff2a50a35e6b26c09	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec
+_eclasses_=meson	53e3ab209402d5ad07a9c4580c423d1a	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec
 _md5_=048a34ad3162179c5aaa83c86d919095
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index 9f13b136835b..cf276f28cc61 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/cinder-12.0.0 b/metadata/md5-cache/sys-cluster/cinder-12.0.0
deleted file mode 100644
index 513ffbc54727..000000000000
--- a/metadata/md5-cache/sys-cluster/cinder-12.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pbr-2.1.0 app-admin/sudo python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-vcs/git-1.8.2.1
-DESCRIPTION=Cinder is the OpenStack Block storage service, a spin out of nova-volumes
-EAPI=6
-HOMEPAGE=https://launchpad.net/cinder
-IUSE=+api +scheduler +volume infiniband iscsi lvm mysql +memcached postgres rdma sqlite +tcp test +tgt python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pbr-2.1.0 >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/Babel-2.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/decorator-3.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/defusedxml-0.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/eventlet-0.20.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/eventlet-0.21.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/greenlet-0.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/httplib2-0.9.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/iso8601-0.1.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/jsonschema-2.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/jsonschema-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] virtual/python-ipaddress[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/keystoneauth-3.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/keystonemiddleware-4.17.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/lxml-3.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/lxml-3.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oauth2client-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-config-5.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-concurrency-3.25.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-context-2.19.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-db-4.27.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-log-3.36.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-messaging-5.29.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-policy-1.30.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-privsep-1.23.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-reports-1.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-rootwrap-5.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-serialization-2.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-service-1.24.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-service-1.28.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-versionedobjects-1.31.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/osprofiler-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/paramiko-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/paste-2.0.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/prettytable-0.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/psutil-3.2.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pyparsing-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-barbicanclient-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/python-barbicanclient-4.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/python-barbicanclient-4.5.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-glanceclient-2.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-keystoneclient-3.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-novaclient-9.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-swiftclient-3.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pytz-2013.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/retrying-1.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/retrying-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/routes-2.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/taskflow-2.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/rtslib-fb-2.1.43[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/rtslib-fb-2.1.60[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/rtslib-fb-2.1.61[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/rtslib-fb-2.1.64[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/simplejson-3.5.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) >=dev-python/sqlalchemy-migrate-0.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ~dev-python/suds-0.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/webob-1.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-vmware-2.17.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/os-brick-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/os-win-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/tooz-1.58.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/google-api-python-client-1.4.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/castellan-0.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/cryptography-1.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/cryptography-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] iscsi? ( tgt? ( sys-block/tgt ) sys-block/open-iscsi ) lvm? ( sys-fs/lvm2 ) memcached? ( net-misc/memcached ) app-emulation/qemu sys-fs/sysfsutils python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/queens/cinder.conf.sample -> queens-cinder.conf.sample https://tarballs.openstack.org/cinder/cinder-12.0.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	git-r3	af51ccfceeb403ab80f1bf9209d372c8	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6e41e0ace2409ae4343f3badbce064fe
diff --git a/metadata/md5-cache/sys-cluster/cinder-12.0.1 b/metadata/md5-cache/sys-cluster/cinder-12.0.1
index 32ce4f66b5a4..3fa453b69ead 100644
--- a/metadata/md5-cache/sys-cluster/cinder-12.0.1
+++ b/metadata/md5-cache/sys-cluster/cinder-12.0.1
@@ -10,4 +10,4 @@ REQUIRED_USE=|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma ) ||
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/queens/cinder.conf.sample -> queens-cinder.conf.sample https://tarballs.openstack.org/cinder/cinder-12.0.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	git-r3	af51ccfceeb403ab80f1bf9209d372c8	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a01bb947b1609ec95bf609bfa3d683d8
+_md5_=6e41e0ace2409ae4343f3badbce064fe
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.10.3 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.10.3
new file mode 100644
index 000000000000..f1f83f43c549
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-apiserver-1.10.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
+DESCRIPTION=Kubernetes API server
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.10.3.tar.gz -> kubernetes-1.10.3.tar.gz
+_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=95632e2567f463df79549abd7de26243
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.9.8 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.9.8
new file mode 100644
index 000000000000..4a520b40e52d
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-apiserver-1.9.8
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
+DESCRIPTION=Kubernetes API server
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.9.8.tar.gz -> kubernetes-1.9.8.tar.gz
+_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=95632e2567f463df79549abd7de26243
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.10.3 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.10.3
new file mode 100644
index 000000000000..621eeb8daf37
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.10.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
+DESCRIPTION=Kubernetes Controller Manager
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.10.3.tar.gz -> kubernetes-1.10.3.tar.gz
+_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=183de1f6b1b10cbfe7ab70ce8d6545c8
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.9.8 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.9.8
new file mode 100644
index 000000000000..0459820c4be1
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.9.8
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
+DESCRIPTION=Kubernetes Controller Manager
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.9.8.tar.gz -> kubernetes-1.9.8.tar.gz
+_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=183de1f6b1b10cbfe7ab70ce8d6545c8
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.10.3 b/metadata/md5-cache/sys-cluster/kube-proxy-1.10.3
new file mode 100644
index 000000000000..e80b20b13b5a
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-proxy-1.10.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
+DESCRIPTION=Kubernetes Proxy service
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.10.3.tar.gz -> kubernetes-1.10.3.tar.gz
+_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_md5_=219d34de6bde115d0ca48eae17c8e5b6
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.9.8 b/metadata/md5-cache/sys-cluster/kube-proxy-1.9.8
new file mode 100644
index 000000000000..0fe830f373f6
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-proxy-1.9.8
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
+DESCRIPTION=Kubernetes Proxy service
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.9.8.tar.gz -> kubernetes-1.9.8.tar.gz
+_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_md5_=219d34de6bde115d0ca48eae17c8e5b6
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.10.3 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.10.3
new file mode 100644
index 000000000000..09ca1c010d11
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-scheduler-1.10.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
+DESCRIPTION=Kubernetes Scheduler
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.10.3.tar.gz -> kubernetes-1.10.3.tar.gz
+_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=d388863db97db759634e4973f6ce604b
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.9.8 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.9.8
new file mode 100644
index 000000000000..9e28f9c028a9
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-scheduler-1.9.8
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
+DESCRIPTION=Kubernetes Controller Manager
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.9.8.tar.gz -> kubernetes-1.9.8.tar.gz
+_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=d2125ab119a2ee26ae9d7f733ebea577
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.10.3 b/metadata/md5-cache/sys-cluster/kubectl-1.10.3
new file mode 100644
index 000000000000..7c07101792f0
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubectl-1.10.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
+DESCRIPTION=CLI to run commands against Kubernetes clusters
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.10.3.tar.gz -> kubernetes-1.10.3.tar.gz
+_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec
+_md5_=6a654132e79a1fd0328537aae8e33b2e
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.9.8 b/metadata/md5-cache/sys-cluster/kubectl-1.9.8
new file mode 100644
index 000000000000..2903033d69b2
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubectl-1.9.8
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
+DESCRIPTION=CLI to run commands against Kubernetes clusters
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.9.8.tar.gz -> kubernetes-1.9.8.tar.gz
+_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec
+_md5_=6a654132e79a1fd0328537aae8e33b2e
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.10.3 b/metadata/md5-cache/sys-cluster/kubelet-1.10.3
new file mode 100644
index 000000000000..b598664c0b99
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubelet-1.10.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
+DESCRIPTION=Kubernetes Node Agent
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.10.3.tar.gz -> kubernetes-1.10.3.tar.gz
+_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_md5_=f7d406f92663bea2f1367aa0d248834d
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.9.8 b/metadata/md5-cache/sys-cluster/kubelet-1.9.8
new file mode 100644
index 000000000000..1a0eeb67f998
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubelet-1.9.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
+DESCRIPTION=Kubernetes Node Agent
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.9.8.tar.gz -> kubernetes-1.9.8.tar.gz
+_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_md5_=f7d406f92663bea2f1367aa0d248834d
diff --git a/metadata/md5-cache/sys-cluster/minikube-0.25.2 b/metadata/md5-cache/sys-cluster/minikube-0.25.2
deleted file mode 100644
index 995fe93d747e..000000000000
--- a/metadata/md5-cache/sys-cluster/minikube-0.25.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-go/go-bindata || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/go-1.9
-DESCRIPTION=Single Node Kubernetes Cluster
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/minikube https://kubernetes.io
-IUSE=hardened
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=>=sys-cluster/kubectl-1.9.4
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/minikube/archive/v0.25.2.tar.gz -> minikube-0.25.2.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=35130a72fcea133b05cf7dde622965aa
diff --git a/metadata/md5-cache/sys-cluster/minikube-0.26.0 b/metadata/md5-cache/sys-cluster/minikube-0.26.0
deleted file mode 100644
index fb7baf9ca283..000000000000
--- a/metadata/md5-cache/sys-cluster/minikube-0.26.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-go/go-bindata || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/go-1.9
-DESCRIPTION=Single Node Kubernetes Cluster
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/minikube https://kubernetes.io
-IUSE=hardened
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=>=sys-cluster/kubectl-1.9.4
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/minikube/archive/v0.26.0.tar.gz -> minikube-0.26.0.tar.gz
-_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=43ef6b9096d5e2fd0f4c2cd4fc09445c
diff --git a/metadata/md5-cache/sys-cluster/nova-16.1.0 b/metadata/md5-cache/sys-cluster/nova-16.1.0
deleted file mode 100644
index 29b6a506fef9..000000000000
--- a/metadata/md5-cache/sys-cluster/nova-16.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=dev-python/setuptools-16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-24.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.0.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.0.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-36.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pbr-2.1.0 app-admin/sudo python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Cloud computing fabric controller (main part of an IaaS system) in Python
-EAPI=6
-HOMEPAGE=https://launchpad.net/nova
-IUSE=+compute compute-only iscsi +memcached mysql +novncproxy openvswitch postgres +rabbitmq sqlite python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/setuptools-16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-24.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.0.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.0.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-36.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pbr-2.1.0 compute-only? ( >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) >=dev-python/decorator-3.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/eventlet-0.20.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/eventlet-0.21.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/jinja-2.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/keystonemiddleware-4.12.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/lxml-2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/lxml-3.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/routes-2.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/cryptography-1.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/cryptography-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/webob-1.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/greenlet-0.3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pastedeploy-1.5.0-r1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/paste[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/prettytable-0.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-migrate-0.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/netaddr-0.7.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/netaddr-0.7.16[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/netifaces-0.10.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/paramiko-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/Babel-2.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/iso8601-0.1.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/jsonschema-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jsonschema-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/jsonschema-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-cinderclient-3.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/keystoneauth-3.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-neutronclient-6.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-glanceclient-2.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/websockify-0.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-cache-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-concurrency-3.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-config-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-config-4.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-config-4.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-context-2.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-log-3.22.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-reports-0.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-db-4.24.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-rootwrap-5.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-messaging-5.24.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-messaging-5.25.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-policy-1.23.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-privsep-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-privsep-1.17.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-i18n-3.15.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-service-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/rfc3986-0.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-middleware-3.27.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/psutil-3.2.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-versionedobjects-1.17.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/os-brick-1.15.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/os-traits-0.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/os-vif-1.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/os-win-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/castellan-0.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/microversion-parse-0.1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/os-xenapi-0.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/tooz-1.47.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/cursive-0.1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pypowervm-1.1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/libvirt-python[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] app-emulation/libvirt[iscsi?] novncproxy? ( www-apps/novnc ) sys-apps/iproute2 openvswitch? ( net-misc/openvswitch ) rabbitmq? ( net-misc/rabbitmq-server ) memcached? ( net-misc/memcached >=dev-python/python-memcached-1.58 ) sys-fs/sysfsutils sys-fs/multipath-tools net-misc/bridge-utils compute? ( app-cdr/cdrtools sys-fs/dosfstools app-emulation/qemu ) iscsi? ( sys-fs/lsscsi >=sys-block/open-iscsi-2.0.873-r1 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/pike/nova.conf.sample -> nova.conf.sample-16.1.0 https://tarballs.openstack.org/nova/nova-16.1.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c120d7380d7a9dbaae3218a83deb9eef
diff --git a/metadata/md5-cache/sys-cluster/nova-16.1.2 b/metadata/md5-cache/sys-cluster/nova-16.1.2
deleted file mode 100644
index 8af98caf207e..000000000000
--- a/metadata/md5-cache/sys-cluster/nova-16.1.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=dev-python/setuptools-16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-24.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.0.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.0.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-36.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pbr-2.1.0 app-admin/sudo python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Cloud computing fabric controller (main part of an IaaS system) in Python
-EAPI=6
-HOMEPAGE=https://launchpad.net/nova
-IUSE=+compute compute-only iscsi +memcached mysql +novncproxy openvswitch postgres +rabbitmq sqlite python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/setuptools-16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-24.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.0.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.0.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-36.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pbr-2.1.0 compute-only? ( >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) >=dev-python/decorator-3.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/eventlet-0.20.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/eventlet-0.21.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/jinja-2.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/keystonemiddleware-4.12.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/lxml-2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/lxml-3.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/routes-2.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/cryptography-1.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/cryptography-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/webob-1.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/greenlet-0.3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pastedeploy-1.5.0-r1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/paste[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/prettytable-0.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-migrate-0.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/netaddr-0.7.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/netaddr-0.7.16[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/netifaces-0.10.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/paramiko-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/Babel-2.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/iso8601-0.1.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/jsonschema-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jsonschema-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/jsonschema-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-cinderclient-3.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/keystoneauth-3.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-neutronclient-6.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-glanceclient-2.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/websockify-0.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-cache-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-concurrency-3.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-config-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-config-4.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-config-4.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-context-2.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-log-3.22.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-reports-0.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-db-4.24.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-rootwrap-5.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-messaging-5.24.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-messaging-5.25.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-policy-1.23.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-privsep-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-privsep-1.17.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-i18n-3.15.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-service-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/rfc3986-0.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-middleware-3.27.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/psutil-3.2.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-versionedobjects-1.17.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/os-brick-1.15.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/os-traits-0.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/os-vif-1.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/os-win-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/castellan-0.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/microversion-parse-0.1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/os-xenapi-0.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/tooz-1.47.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/cursive-0.1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pypowervm-1.1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/libvirt-python[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] app-emulation/libvirt[iscsi?] novncproxy? ( www-apps/novnc ) sys-apps/iproute2 openvswitch? ( net-misc/openvswitch ) rabbitmq? ( net-misc/rabbitmq-server ) memcached? ( net-misc/memcached >=dev-python/python-memcached-1.58 ) sys-fs/sysfsutils sys-fs/multipath-tools net-misc/bridge-utils compute? ( app-cdr/cdrtools sys-fs/dosfstools app-emulation/qemu ) iscsi? ( sys-fs/lsscsi >=sys-block/open-iscsi-2.0.873-r1 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/pike/nova.conf.sample -> nova.conf.sample-16.1.2 https://tarballs.openstack.org/nova/nova-16.1.2.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1eca314ecd8e66d88032e7dc45b7ef1f
diff --git a/metadata/md5-cache/sys-cluster/nova-16.1.3 b/metadata/md5-cache/sys-cluster/nova-16.1.3
index c2b854b815de..c4520c6cdea7 100644
--- a/metadata/md5-cache/sys-cluster/nova-16.1.3
+++ b/metadata/md5-cache/sys-cluster/nova-16.1.3
@@ -4,11 +4,11 @@ DESCRIPTION=Cloud computing fabric controller (main part of an IaaS system) in P
 EAPI=6
 HOMEPAGE=https://launchpad.net/nova
 IUSE=+compute compute-only iscsi +memcached mysql +novncproxy openvswitch postgres +rabbitmq sqlite python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/setuptools-16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-24.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.0.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.0.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-36.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pbr-2.1.0 compute-only? ( >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) >=dev-python/decorator-3.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/eventlet-0.20.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/eventlet-0.21.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/jinja-2.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/keystonemiddleware-4.12.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/lxml-2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/lxml-3.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/routes-2.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/cryptography-1.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/cryptography-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/webob-1.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/greenlet-0.3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pastedeploy-1.5.0-r1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/paste[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/prettytable-0.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-migrate-0.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/netaddr-0.7.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/netaddr-0.7.16[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/netifaces-0.10.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/paramiko-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/Babel-2.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/iso8601-0.1.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/jsonschema-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jsonschema-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/jsonschema-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-cinderclient-3.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/keystoneauth-3.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-neutronclient-6.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-glanceclient-2.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/websockify-0.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-cache-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-concurrency-3.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-config-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-config-4.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-config-4.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-context-2.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-log-3.22.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-reports-0.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-db-4.24.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-rootwrap-5.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-messaging-5.24.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-messaging-5.25.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-policy-1.23.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-privsep-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-privsep-1.17.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-i18n-3.15.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-service-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/rfc3986-0.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-middleware-3.27.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/psutil-3.2.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-versionedobjects-1.17.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/os-brick-1.15.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/os-traits-0.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/os-vif-1.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/os-win-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/castellan-0.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/microversion-parse-0.1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/os-xenapi-0.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/tooz-1.47.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/cursive-0.1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pypowervm-1.1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/libvirt-python[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] app-emulation/libvirt[iscsi?] novncproxy? ( www-apps/novnc ) sys-apps/iproute2 openvswitch? ( net-misc/openvswitch ) rabbitmq? ( net-misc/rabbitmq-server ) memcached? ( net-misc/memcached >=dev-python/python-memcached-1.58 ) sys-fs/sysfsutils sys-fs/multipath-tools net-misc/bridge-utils compute? ( app-cdr/cdrtools sys-fs/dosfstools app-emulation/qemu ) iscsi? ( sys-fs/lsscsi >=sys-block/open-iscsi-2.0.873-r1 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/pike/nova.conf.sample -> nova.conf.sample-16.1.3 https://tarballs.openstack.org/nova/nova-16.1.3.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1eca314ecd8e66d88032e7dc45b7ef1f
+_md5_=c120d7380d7a9dbaae3218a83deb9eef
diff --git a/metadata/md5-cache/sys-cluster/nova-17.0.1 b/metadata/md5-cache/sys-cluster/nova-17.0.1
deleted file mode 100644
index e634695db9b4..000000000000
--- a/metadata/md5-cache/sys-cluster/nova-17.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=dev-python/setuptools-16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-24.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.0.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.0.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-36.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pbr-2.1.0 app-admin/sudo python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Cloud computing fabric controller (main part of an IaaS system) in Python
-EAPI=6
-HOMEPAGE=https://launchpad.net/nova
-IUSE=+compute compute-only iscsi +memcached mysql +novncproxy openvswitch postgres +rabbitmq sqlite python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/setuptools-16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-24.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.0.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.0.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-36.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pbr-2.1.0 compute-only? ( >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) >=dev-python/decorator-3.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/eventlet-0.20.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/eventlet-0.21.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/jinja-2.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/keystonemiddleware-4.17.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/lxml-2.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/lxml-3.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/routes-2.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/cryptography-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/cryptography-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/webob-1.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/greenlet-0.4.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pastedeploy-1.5.0-r1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/paste-2.0.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/prettytable-0.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-migrate-0.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/netaddr-0.7.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/netifaces-0.10.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/paramiko-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/Babel-2.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/iso8601-0.1.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/jsonschema-2.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/jsonschema-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-cinderclient-3.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/keystoneauth-3.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-neutronclient-6.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-glanceclient-2.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/websockify-0.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-cache-1.26.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-concurrency-3.25.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-config-5.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-context-2.19.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-log-3.36.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-reports-1.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-serialization-1.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-db-4.27.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-rootwrap-5.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-messaging-5.29.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-policy-1.30.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-privsep-1.23.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-service-1.24.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-service-1.28.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/rfc3986-0.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/psutil-3.2.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-versionedobjects-1.31.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/os-brick-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/os-traits-0.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/os-vif-1.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/os-vif-1.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/os-win-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/castellan-0.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/microversion-parse-0.1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/os-xenapi-0.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/tooz-1.58.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/cursive-0.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pypowervm-1.1.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/os-service-types-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/taskflow-2.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/libvirt-python[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] app-emulation/libvirt[iscsi?] novncproxy? ( www-apps/novnc ) sys-apps/iproute2 openvswitch? ( net-misc/openvswitch ) rabbitmq? ( net-misc/rabbitmq-server ) memcached? ( net-misc/memcached >=dev-python/python-memcached-1.58 ) sys-fs/sysfsutils sys-fs/multipath-tools net-misc/bridge-utils compute? ( app-cdr/cdrtools sys-fs/dosfstools app-emulation/qemu ) iscsi? ( sys-fs/lsscsi >=sys-block/open-iscsi-2.0.873-r1 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/queens/nova.conf.sample -> nova.conf.sample-17.0.1 https://tarballs.openstack.org/nova/nova-17.0.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f6a619621dadbafe954623e595f46ce7
diff --git a/metadata/md5-cache/sys-cluster/nova-17.0.3 b/metadata/md5-cache/sys-cluster/nova-17.0.3
deleted file mode 100644
index 984e882ed1a2..000000000000
--- a/metadata/md5-cache/sys-cluster/nova-17.0.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=dev-python/setuptools-16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-24.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.0.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.0.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-36.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pbr-2.1.0 app-admin/sudo python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Cloud computing fabric controller (main part of an IaaS system) in Python
-EAPI=6
-HOMEPAGE=https://launchpad.net/nova
-IUSE=+compute compute-only iscsi +memcached mysql +novncproxy openvswitch postgres +rabbitmq sqlite python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/setuptools-16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-24.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.0.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.0.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-36.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pbr-2.1.0 compute-only? ( >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) >=dev-python/decorator-3.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/eventlet-0.20.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/eventlet-0.21.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/jinja-2.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/keystonemiddleware-4.17.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/lxml-2.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/lxml-3.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/routes-2.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/cryptography-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/cryptography-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/webob-1.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/greenlet-0.4.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pastedeploy-1.5.0-r1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/paste-2.0.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/prettytable-0.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-migrate-0.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/netaddr-0.7.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/netifaces-0.10.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/paramiko-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/Babel-2.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/iso8601-0.1.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/jsonschema-2.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/jsonschema-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-cinderclient-3.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/keystoneauth-3.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-neutronclient-6.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-glanceclient-2.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/websockify-0.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-cache-1.26.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-concurrency-3.25.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-config-5.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-context-2.19.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-log-3.36.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-reports-1.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-serialization-1.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-db-4.27.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-rootwrap-5.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-messaging-5.29.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-policy-1.30.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-privsep-1.23.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-service-1.24.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-service-1.28.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/rfc3986-0.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/psutil-3.2.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-versionedobjects-1.31.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/os-brick-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/os-traits-0.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/os-vif-1.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/os-vif-1.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/os-win-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/castellan-0.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/microversion-parse-0.1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/os-xenapi-0.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/tooz-1.58.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/cursive-0.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pypowervm-1.1.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/os-service-types-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/taskflow-2.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/libvirt-python[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] app-emulation/libvirt[iscsi?] novncproxy? ( www-apps/novnc ) sys-apps/iproute2 openvswitch? ( net-misc/openvswitch ) rabbitmq? ( net-misc/rabbitmq-server ) memcached? ( net-misc/memcached >=dev-python/python-memcached-1.58 ) sys-fs/sysfsutils sys-fs/multipath-tools net-misc/bridge-utils compute? ( app-cdr/cdrtools sys-fs/dosfstools app-emulation/qemu ) iscsi? ( sys-fs/lsscsi >=sys-block/open-iscsi-2.0.873-r1 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/queens/nova.conf.sample -> nova.conf.sample-17.0.3 https://tarballs.openstack.org/nova/nova-17.0.3.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f8cc839283356b980ee3e7cb5428d7bc
diff --git a/metadata/md5-cache/sys-cluster/nova-17.0.4 b/metadata/md5-cache/sys-cluster/nova-17.0.4
index 74166a1a164f..1142af585e4e 100644
--- a/metadata/md5-cache/sys-cluster/nova-17.0.4
+++ b/metadata/md5-cache/sys-cluster/nova-17.0.4
@@ -4,11 +4,11 @@ DESCRIPTION=Cloud computing fabric controller (main part of an IaaS system) in P
 EAPI=6
 HOMEPAGE=https://launchpad.net/nova
 IUSE=+compute compute-only iscsi +memcached mysql +novncproxy openvswitch postgres +rabbitmq sqlite python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/setuptools-16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-24.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.0.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.0.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-34.3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/setuptools-36.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pbr-2.1.0 compute-only? ( >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) >=dev-python/decorator-3.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/eventlet-0.20.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/eventlet-0.21.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/jinja-2.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jinja-2.9.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/keystonemiddleware-4.17.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/lxml-2.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/lxml-3.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/routes-2.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/cryptography-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/cryptography-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/webob-1.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/greenlet-0.4.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pastedeploy-1.5.0-r1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/paste-2.0.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/prettytable-0.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-migrate-0.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/netaddr-0.7.18[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/netifaces-0.10.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/paramiko-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/Babel-2.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/iso8601-0.1.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/jsonschema-2.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/jsonschema-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-cinderclient-3.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/keystoneauth-3.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-neutronclient-6.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-glanceclient-2.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/websockify-0.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-cache-1.26.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-concurrency-3.25.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-config-5.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-context-2.19.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-log-3.36.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-reports-1.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-serialization-1.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-db-4.27.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-rootwrap-5.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-messaging-5.29.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-policy-1.30.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-privsep-1.23.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-service-1.24.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-service-1.28.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/rfc3986-0.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/psutil-3.2.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-versionedobjects-1.31.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/os-brick-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/os-traits-0.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/os-vif-1.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/os-vif-1.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/os-win-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/castellan-0.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/microversion-parse-0.1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/os-xenapi-0.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/tooz-1.58.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/cursive-0.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pypowervm-1.1.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/os-service-types-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/taskflow-2.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/libvirt-python[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] app-emulation/libvirt[iscsi?] novncproxy? ( www-apps/novnc ) sys-apps/iproute2 openvswitch? ( net-misc/openvswitch ) rabbitmq? ( net-misc/rabbitmq-server ) memcached? ( net-misc/memcached >=dev-python/python-memcached-1.58 ) sys-fs/sysfsutils sys-fs/multipath-tools net-misc/bridge-utils compute? ( app-cdr/cdrtools sys-fs/dosfstools app-emulation/qemu ) iscsi? ( sys-fs/lsscsi >=sys-block/open-iscsi-2.0.873-r1 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/queens/nova.conf.sample -> nova.conf.sample-17.0.4 https://tarballs.openstack.org/nova/nova-17.0.4.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f8cc839283356b980ee3e7cb5428d7bc
+_md5_=f6a619621dadbafe954623e595f46ce7
diff --git a/metadata/md5-cache/sys-cluster/openmpi-1.10.7 b/metadata/md5-cache/sys-cluster/openmpi-1.10.7
index ba587697ef46..4976b8796682 100644
--- a/metadata/md5-cache/sys-cluster/openmpi-1.10.7
+++ b/metadata/md5-cache/sys-cluster/openmpi-1.10.7
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi !sys-cluster/mpiexec >=dev-libs/libevent-2.0.21[abi_x86_32(-)?,abi_x86_64(-)?,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/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwloc-1.10.0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,numa?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* ) java? ( >=virtual/jdk-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi !sys-cluster/mpiexec !sys-cluster/pmix >=dev-libs/libevent-2.0.21[abi_x86_32(-)?,abi_x86_64(-)?,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/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwloc-1.10.0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,numa?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* ) java? ( >=virtual/jdk-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=A high-performance message passing library (MPI)
 EAPI=6
 HOMEPAGE=http://www.open-mpi.org
 IUSE=cma cuda +cxx elibc_FreeBSD fortran heterogeneous ipv6 java mpi-threads numa romio threads vt openmpi_fabrics_ofed openmpi_fabrics_knem openmpi_fabrics_psm openmpi_rm_pbs openmpi_rm_slurm openmpi_ofed_features_control-hdr-padding openmpi_ofed_features_connectx-xrc openmpi_ofed_features_udcm openmpi_ofed_features_rdmacm openmpi_ofed_features_dynamic-sl openmpi_ofed_features_failover elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
 LICENSE=BSD
-RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi !sys-cluster/mpiexec >=dev-libs/libevent-2.0.21[abi_x86_32(-)?,abi_x86_64(-)?,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/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwloc-1.10.0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,numa?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* ) java? ( >=virtual/jre-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi !sys-cluster/mpiexec !sys-cluster/pmix >=dev-libs/libevent-2.0.21[abi_x86_32(-)?,abi_x86_64(-)?,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/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwloc-1.10.0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,numa?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* ) java? ( >=virtual/jre-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=openmpi_rm_slurm? ( !openmpi_rm_pbs ) openmpi_rm_pbs? ( !openmpi_rm_slurm ) openmpi_fabrics_psm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed ) openmpi_ofed_features_connectx-xrc? ( openmpi_fabrics_ofed ) openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed ) openmpi_ofed_features_failover? ( openmpi_fabrics_ofed )
 SLOT=0
 SRC_URI=http://www.open-mpi.org/software/ompi/v1.10/downloads/openmpi-1.10.7.tar.bz2
 _eclasses_=cuda	626969678b9c5735753d8a380c6f295b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=fa95a9a64e70d1c30469a5c93bb5f8d1
+_md5_=07c54e8493b82124d4b602cfe6559ea1
diff --git a/metadata/md5-cache/sys-cluster/openmpi-1.4.3 b/metadata/md5-cache/sys-cluster/openmpi-1.4.3
index 383df78ce9a6..87c4d1a97632 100644
--- a/metadata/md5-cache/sys-cluster/openmpi-1.4.3
+++ b/metadata/md5-cache/sys-cluster/openmpi-1.4.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install prepare setup test
-DEPEND=pbs? ( sys-cluster/torque ) vt? ( !dev-libs/libotf !app-text/lcdf-typetools ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) !sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/mpiexec fortran? ( virtual/fortran )
+DEPEND=pbs? ( sys-cluster/torque ) vt? ( !dev-libs/libotf !app-text/lcdf-typetools ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) !sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/mpiexec !sys-cluster/pmix fortran? ( virtual/fortran )
 DESCRIPTION=A high-performance message passing library (MPI)
 EAPI=5
 HOMEPAGE=http://www.open-mpi.org
 IUSE=+cxx elibc_FreeBSD fortran heterogeneous ipv6 mpi-threads pbs romio threads vt
 KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
 LICENSE=BSD
-RDEPEND=pbs? ( sys-cluster/torque ) vt? ( !dev-libs/libotf !app-text/lcdf-typetools ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) !sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/mpiexec fortran? ( virtual/fortran )
+RDEPEND=pbs? ( sys-cluster/torque ) vt? ( !dev-libs/libotf !app-text/lcdf-typetools ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) !sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/mpiexec !sys-cluster/pmix fortran? ( virtual/fortran )
 RESTRICT=mpi-threads? ( test )
 SLOT=0
 SRC_URI=http://www.open-mpi.org/software/ompi/v1.4/downloads/openmpi-1.4.3.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=094a8afce4f365d9e196b0df6a105673
+_md5_=4c8312e512913abf59365232bdd2091c
diff --git a/metadata/md5-cache/sys-cluster/openmpi-1.4.5 b/metadata/md5-cache/sys-cluster/openmpi-1.4.5
index 669a4ff8e645..f232ec536324 100644
--- a/metadata/md5-cache/sys-cluster/openmpi-1.4.5
+++ b/metadata/md5-cache/sys-cluster/openmpi-1.4.5
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install prepare setup test
-DEPEND=pbs? ( sys-cluster/torque ) vt? ( !dev-libs/libotf !app-text/lcdf-typetools ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) !sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/mpiexec fortran? ( virtual/fortran )
+DEPEND=pbs? ( sys-cluster/torque ) vt? ( !dev-libs/libotf !app-text/lcdf-typetools ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) !sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/mpiexec !sys-cluster/pmix fortran? ( virtual/fortran )
 DESCRIPTION=A high-performance message passing library (MPI)
 EAPI=5
 HOMEPAGE=http://www.open-mpi.org
 IUSE=+cxx elibc_FreeBSD fortran heterogeneous ipv6 mpi-threads pbs romio threads vt
 KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD
-RDEPEND=pbs? ( sys-cluster/torque ) vt? ( !dev-libs/libotf !app-text/lcdf-typetools ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) !sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/mpiexec fortran? ( virtual/fortran )
+RDEPEND=pbs? ( sys-cluster/torque ) vt? ( !dev-libs/libotf !app-text/lcdf-typetools ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) !sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/mpiexec !sys-cluster/pmix fortran? ( virtual/fortran )
 RESTRICT=mpi-threads? ( test )
 SLOT=0
 SRC_URI=http://www.open-mpi.org/software/ompi/v1.4/downloads/openmpi-1.4.5.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d8c7342fd403a09cde9678d1323606bc
+_md5_=fd393d67535190544b461ae88346ba65
diff --git a/metadata/md5-cache/sys-cluster/openmpi-1.6.5-r1 b/metadata/md5-cache/sys-cluster/openmpi-1.6.5-r1
index ae9a32b35478..8a4afd43f44f 100644
--- a/metadata/md5-cache/sys-cluster/openmpi-1.6.5-r1
+++ b/metadata/md5-cache/sys-cluster/openmpi-1.6.5-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install prepare setup test
-DEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/mpiexec >=sys-apps/hwloc-1.3 dev-libs/libltdl:0 elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_dapl? ( sys-fabric/dapl ) openmpi_fabrics_ofed? ( sys-fabric/ofed ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_open-mx? ( sys-cluster/open-mx ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm ) openmpi_fabrics_sctp? ( net-misc/lksctp-tools ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm ) vt? ( !dev-libs/libotf !app-text/lcdf-typetools ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 fortran? ( virtual/fortran )
+DEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/mpiexec !sys-cluster/pmix >=sys-apps/hwloc-1.3 dev-libs/libltdl:0 elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_dapl? ( sys-fabric/dapl ) openmpi_fabrics_ofed? ( sys-fabric/ofed ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_open-mx? ( sys-cluster/open-mx ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm ) openmpi_fabrics_sctp? ( net-misc/lksctp-tools ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm ) vt? ( !dev-libs/libotf !app-text/lcdf-typetools ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 fortran? ( virtual/fortran )
 DESCRIPTION=A high-performance message passing library (MPI)
 EAPI=5
 HOMEPAGE=http://www.open-mpi.org
 IUSE=+cxx elibc_FreeBSD fortran heterogeneous ipv6 mpi-threads romio threads vt openmpi_fabrics_dapl openmpi_fabrics_ofed openmpi_fabrics_knem openmpi_fabrics_open-mx openmpi_fabrics_psm openmpi_fabrics_sctp openmpi_rm_pbs openmpi_rm_slurm openmpi_ofed_features_control-hdr-padding openmpi_ofed_features_connectx-xrc openmpi_ofed_features_rdmacm openmpi_ofed_features_dynamic-sl openmpi_ofed_features_failover
 KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
 LICENSE=BSD
-RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/mpiexec >=sys-apps/hwloc-1.3 dev-libs/libltdl:0 elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_dapl? ( sys-fabric/dapl ) openmpi_fabrics_ofed? ( sys-fabric/ofed ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_open-mx? ( sys-cluster/open-mx ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm ) openmpi_fabrics_sctp? ( net-misc/lksctp-tools ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm ) vt? ( !dev-libs/libotf !app-text/lcdf-typetools ) fortran? ( virtual/fortran )
+RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/mpiexec !sys-cluster/pmix >=sys-apps/hwloc-1.3 dev-libs/libltdl:0 elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_dapl? ( sys-fabric/dapl ) openmpi_fabrics_ofed? ( sys-fabric/ofed ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_open-mx? ( sys-cluster/open-mx ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm ) openmpi_fabrics_sctp? ( net-misc/lksctp-tools ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm ) vt? ( !dev-libs/libotf !app-text/lcdf-typetools ) fortran? ( virtual/fortran )
 REQUIRED_USE=openmpi_rm_slurm? ( !openmpi_rm_pbs ) openmpi_rm_pbs? ( !openmpi_rm_slurm ) openmpi_fabrics_psm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed ) openmpi_ofed_features_connectx-xrc? ( openmpi_fabrics_ofed ) openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed ) openmpi_ofed_features_failover? ( openmpi_fabrics_ofed )
 SLOT=0
 SRC_URI=http://www.open-mpi.org/software/ompi/v1.6/downloads/openmpi-1.6.5.tar.bz2
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=41eeb6031cb993ee4ca3b4c9fc9bd61f
+_md5_=9e2ccaf934026202e94a04baac862216
diff --git a/metadata/md5-cache/sys-cluster/openmpi-1.7.5-r1 b/metadata/md5-cache/sys-cluster/openmpi-1.7.5-r1
index d218146e61e2..3de763f1eddf 100644
--- a/metadata/md5-cache/sys-cluster/openmpi-1.7.5-r1
+++ b/metadata/md5-cache/sys-cluster/openmpi-1.7.5-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install prepare setup test
-DEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/mpiexec dev-libs/libevent dev-libs/libltdl:0 >=sys-apps/hwloc-1.7.2 cuda? ( dev-util/nvidia-cuda-toolkit ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_open-mx? ( sys-cluster/open-mx ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 fortran? ( virtual/fortran )
+DEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/mpiexec !sys-cluster/pmix dev-libs/libevent dev-libs/libltdl:0 >=sys-apps/hwloc-1.7.2 cuda? ( dev-util/nvidia-cuda-toolkit ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_open-mx? ( sys-cluster/open-mx ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 fortran? ( virtual/fortran )
 DESCRIPTION=A high-performance message passing library (MPI)
 EAPI=5
 HOMEPAGE=http://www.open-mpi.org
 IUSE=cma cuda +cxx elibc_FreeBSD fortran heterogeneous ipv6 mpi-threads romio threads vt openmpi_fabrics_ofed openmpi_fabrics_knem openmpi_fabrics_open-mx openmpi_fabrics_psm openmpi_rm_pbs openmpi_rm_slurm openmpi_ofed_features_control-hdr-padding openmpi_ofed_features_connectx-xrc openmpi_ofed_features_rdmacm openmpi_ofed_features_dynamic-sl openmpi_ofed_features_failover
 KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
 LICENSE=BSD
-RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/mpiexec dev-libs/libevent dev-libs/libltdl:0 >=sys-apps/hwloc-1.7.2 cuda? ( dev-util/nvidia-cuda-toolkit ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_open-mx? ( sys-cluster/open-mx ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm ) fortran? ( virtual/fortran )
+RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/mpiexec !sys-cluster/pmix dev-libs/libevent dev-libs/libltdl:0 >=sys-apps/hwloc-1.7.2 cuda? ( dev-util/nvidia-cuda-toolkit ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_open-mx? ( sys-cluster/open-mx ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm ) fortran? ( virtual/fortran )
 REQUIRED_USE=openmpi_rm_slurm? ( !openmpi_rm_pbs ) openmpi_rm_pbs? ( !openmpi_rm_slurm ) openmpi_fabrics_psm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed ) openmpi_ofed_features_connectx-xrc? ( openmpi_fabrics_ofed ) openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed ) openmpi_ofed_features_failover? ( openmpi_fabrics_ofed )
 SLOT=0
 SRC_URI=http://www.open-mpi.org/software/ompi/v1.7/downloads/openmpi-1.7.5.tar.bz2
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	cuda	626969678b9c5735753d8a380c6f295b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=cf487039155a56b929513b9b139bc3bf
+_md5_=97c0e1be17d79ef6d81888f1dbc26f6a
diff --git a/metadata/md5-cache/sys-cluster/openmpi-1.8.4-r4 b/metadata/md5-cache/sys-cluster/openmpi-1.8.4-r4
index c1450c413f5e..e01493239d24 100644
--- a/metadata/md5-cache/sys-cluster/openmpi-1.8.4-r4
+++ b/metadata/md5-cache/sys-cluster/openmpi-1.8.4-r4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install prepare setup test
-DEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/mpiexec dev-libs/libevent dev-libs/libltdl:0 >=sys-apps/hwloc-1.9.1[numa?] sys-libs/zlib cuda? ( dev-util/nvidia-cuda-toolkit ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_open-mx? ( sys-cluster/open-mx ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 fortran? ( virtual/fortran )
+DEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/mpiexec !sys-cluster/pmix dev-libs/libevent dev-libs/libltdl:0 >=sys-apps/hwloc-1.9.1[numa?] sys-libs/zlib cuda? ( dev-util/nvidia-cuda-toolkit ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_open-mx? ( sys-cluster/open-mx ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 fortran? ( virtual/fortran )
 DESCRIPTION=A high-performance message passing library (MPI)
 EAPI=5
 HOMEPAGE=http://www.open-mpi.org
 IUSE=cma cuda +cxx elibc_FreeBSD fortran heterogeneous ipv6 mpi-threads numa romio threads vt openmpi_fabrics_ofed openmpi_fabrics_knem openmpi_fabrics_open-mx openmpi_fabrics_psm openmpi_rm_pbs openmpi_rm_slurm openmpi_ofed_features_control-hdr-padding openmpi_ofed_features_connectx-xrc openmpi_ofed_features_udcm openmpi_ofed_features_rdmacm openmpi_ofed_features_dynamic-sl openmpi_ofed_features_failover
 KEYWORDS=alpha ~amd64 ~ia64 ppc ppc64 sparc ~x86 ~amd64-linux
 LICENSE=BSD
-RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/mpiexec dev-libs/libevent dev-libs/libltdl:0 >=sys-apps/hwloc-1.9.1[numa?] sys-libs/zlib cuda? ( dev-util/nvidia-cuda-toolkit ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_open-mx? ( sys-cluster/open-mx ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm ) fortran? ( virtual/fortran )
+RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/mpiexec !sys-cluster/pmix dev-libs/libevent dev-libs/libltdl:0 >=sys-apps/hwloc-1.9.1[numa?] sys-libs/zlib cuda? ( dev-util/nvidia-cuda-toolkit ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_open-mx? ( sys-cluster/open-mx ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm ) fortran? ( virtual/fortran )
 REQUIRED_USE=openmpi_rm_slurm? ( !openmpi_rm_pbs ) openmpi_rm_pbs? ( !openmpi_rm_slurm ) openmpi_fabrics_psm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed ) openmpi_ofed_features_connectx-xrc? ( openmpi_fabrics_ofed ) openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed ) openmpi_ofed_features_failover? ( openmpi_fabrics_ofed )
 SLOT=0
 SRC_URI=http://www.open-mpi.org/software/ompi/v1.8/downloads/openmpi-1.8.4.tar.bz2
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	cuda	626969678b9c5735753d8a380c6f295b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=74f49398290d1d915fc3a20693d3fefb
+_md5_=54a7fbfc8e707ba9b092dd92432c5ceb
diff --git a/metadata/md5-cache/sys-cluster/openmpi-1.8.7-r1 b/metadata/md5-cache/sys-cluster/openmpi-1.8.7-r1
index dd87eddf5476..75ee10350abf 100644
--- a/metadata/md5-cache/sys-cluster/openmpi-1.8.7-r1
+++ b/metadata/md5-cache/sys-cluster/openmpi-1.8.7-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install preinst prepare setup test
-DEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/mpiexec dev-libs/libevent dev-libs/libltdl:0 >=sys-apps/hwloc-1.9.1[numa?] sys-libs/zlib cuda? ( dev-util/nvidia-cuda-toolkit ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_open-mx? ( sys-cluster/open-mx ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm ) java? ( >=virtual/jdk-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/mpiexec !sys-cluster/pmix dev-libs/libevent dev-libs/libltdl:0 >=sys-apps/hwloc-1.9.1[numa?] sys-libs/zlib cuda? ( dev-util/nvidia-cuda-toolkit ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_open-mx? ( sys-cluster/open-mx ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm ) java? ( >=virtual/jdk-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=A high-performance message passing library (MPI)
 EAPI=5
 HOMEPAGE=http://www.open-mpi.org
 IUSE=cma cuda +cxx elibc_FreeBSD fortran heterogeneous ipv6 java mpi-threads numa romio threads vt openmpi_fabrics_ofed openmpi_fabrics_knem openmpi_fabrics_open-mx openmpi_fabrics_psm openmpi_rm_pbs openmpi_rm_slurm openmpi_ofed_features_control-hdr-padding openmpi_ofed_features_connectx-xrc openmpi_ofed_features_udcm openmpi_ofed_features_rdmacm openmpi_ofed_features_dynamic-sl openmpi_ofed_features_failover elibc_FreeBSD java
 KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
 LICENSE=BSD
-RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/mpiexec dev-libs/libevent dev-libs/libltdl:0 >=sys-apps/hwloc-1.9.1[numa?] sys-libs/zlib cuda? ( dev-util/nvidia-cuda-toolkit ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_open-mx? ( sys-cluster/open-mx ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm ) java? ( >=virtual/jre-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/mpiexec !sys-cluster/pmix dev-libs/libevent dev-libs/libltdl:0 >=sys-apps/hwloc-1.9.1[numa?] sys-libs/zlib cuda? ( dev-util/nvidia-cuda-toolkit ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_open-mx? ( sys-cluster/open-mx ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm ) java? ( >=virtual/jre-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=openmpi_rm_slurm? ( !openmpi_rm_pbs ) openmpi_rm_pbs? ( !openmpi_rm_slurm ) openmpi_fabrics_psm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed ) openmpi_ofed_features_connectx-xrc? ( openmpi_fabrics_ofed ) openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed ) openmpi_ofed_features_failover? ( openmpi_fabrics_ofed )
 SLOT=0
 SRC_URI=http://www.open-mpi.org/software/ompi/v1.8/downloads/openmpi-1.8.7.tar.bz2
 _eclasses_=cuda	626969678b9c5735753d8a380c6f295b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=bbbca39dcfdc5692d773a5441e6471ce
+_md5_=60edcc9a5d4041e76dea06e83e34e5e8
diff --git a/metadata/md5-cache/sys-cluster/openmpi-1.8.8 b/metadata/md5-cache/sys-cluster/openmpi-1.8.8
index c72d014f5211..6cfed746d6d0 100644
--- a/metadata/md5-cache/sys-cluster/openmpi-1.8.8
+++ b/metadata/md5-cache/sys-cluster/openmpi-1.8.8
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install preinst prepare setup test
-DEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/mpiexec dev-libs/libevent dev-libs/libltdl:0 >=sys-apps/hwloc-1.9.1[numa?] sys-libs/zlib cuda? ( dev-util/nvidia-cuda-toolkit ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_open-mx? ( sys-cluster/open-mx ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* ) java? ( >=virtual/jdk-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/mpiexec !sys-cluster/pmix dev-libs/libevent dev-libs/libltdl:0 >=sys-apps/hwloc-1.9.1[numa?] sys-libs/zlib cuda? ( dev-util/nvidia-cuda-toolkit ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_open-mx? ( sys-cluster/open-mx ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* ) java? ( >=virtual/jdk-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=A high-performance message passing library (MPI)
 EAPI=5
 HOMEPAGE=http://www.open-mpi.org
 IUSE=cma cuda +cxx elibc_FreeBSD fortran heterogeneous ipv6 java mpi-threads numa romio threads vt openmpi_fabrics_ofed openmpi_fabrics_knem openmpi_fabrics_open-mx openmpi_fabrics_psm openmpi_rm_pbs openmpi_rm_slurm openmpi_ofed_features_control-hdr-padding openmpi_ofed_features_connectx-xrc openmpi_ofed_features_udcm openmpi_ofed_features_rdmacm openmpi_ofed_features_dynamic-sl openmpi_ofed_features_failover elibc_FreeBSD java
 KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
 LICENSE=BSD
-RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/mpiexec dev-libs/libevent dev-libs/libltdl:0 >=sys-apps/hwloc-1.9.1[numa?] sys-libs/zlib cuda? ( dev-util/nvidia-cuda-toolkit ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_open-mx? ( sys-cluster/open-mx ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* ) java? ( >=virtual/jre-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/mpiexec !sys-cluster/pmix dev-libs/libevent dev-libs/libltdl:0 >=sys-apps/hwloc-1.9.1[numa?] sys-libs/zlib cuda? ( dev-util/nvidia-cuda-toolkit ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_open-mx? ( sys-cluster/open-mx ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* ) java? ( >=virtual/jre-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=openmpi_rm_slurm? ( !openmpi_rm_pbs ) openmpi_rm_pbs? ( !openmpi_rm_slurm ) openmpi_fabrics_psm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed ) openmpi_ofed_features_connectx-xrc? ( openmpi_fabrics_ofed ) openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed ) openmpi_ofed_features_failover? ( openmpi_fabrics_ofed )
 SLOT=0
 SRC_URI=http://www.open-mpi.org/software/ompi/v1.8/downloads/openmpi-1.8.8.tar.bz2
 _eclasses_=cuda	626969678b9c5735753d8a380c6f295b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=1b979bdb3de19eb3c96f1bde3448e366
+_md5_=6cedeae4634d3e05ca07e5d61a8e2466
diff --git a/metadata/md5-cache/sys-cluster/openmpi-2.0.2 b/metadata/md5-cache/sys-cluster/openmpi-2.0.2
index f9d6152a0d25..aefb0c789061 100644
--- a/metadata/md5-cache/sys-cluster/openmpi-2.0.2
+++ b/metadata/md5-cache/sys-cluster/openmpi-2.0.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi !sys-cluster/mpiexec >=dev-libs/libevent-2.0.22[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwloc-1.11.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,numa?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* ) java? ( >=virtual/jdk-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi !sys-cluster/mpiexec !sys-cluster/pmix >=dev-libs/libevent-2.0.22[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwloc-1.11.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,numa?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* ) java? ( >=virtual/jdk-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=A high-performance message passing library (MPI)
 EAPI=6
 HOMEPAGE=http://www.open-mpi.org
 IUSE=cma cuda cxx elibc_FreeBSD fortran heterogeneous ipv6 java mpi-threads numa romio threads openmpi_fabrics_ofed openmpi_fabrics_knem openmpi_fabrics_psm openmpi_rm_pbs openmpi_rm_slurm openmpi_ofed_features_control-hdr-padding openmpi_ofed_features_connectx-xrc openmpi_ofed_features_udcm openmpi_ofed_features_rdmacm openmpi_ofed_features_dynamic-sl openmpi_ofed_features_failover elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux
 LICENSE=BSD
-RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi !sys-cluster/mpiexec >=dev-libs/libevent-2.0.22[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwloc-1.11.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,numa?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* ) java? ( >=virtual/jre-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi !sys-cluster/mpiexec !sys-cluster/pmix >=dev-libs/libevent-2.0.22[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwloc-1.11.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,numa?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* ) java? ( >=virtual/jre-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=openmpi_rm_slurm? ( !openmpi_rm_pbs ) openmpi_rm_pbs? ( !openmpi_rm_slurm ) openmpi_fabrics_psm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed ) openmpi_ofed_features_connectx-xrc? ( openmpi_fabrics_ofed ) openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed ) openmpi_ofed_features_failover? ( openmpi_fabrics_ofed )
 SLOT=0
 SRC_URI=http://www.open-mpi.org/software/ompi/v2.0/downloads/openmpi-2.0.2.tar.bz2
 _eclasses_=cuda	626969678b9c5735753d8a380c6f295b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=b49b1768fa65cc440c40e1f629795cff
+_md5_=764c471e7175b7b9be256e2acd2aef94
diff --git a/metadata/md5-cache/sys-cluster/openmpi-2.0.4 b/metadata/md5-cache/sys-cluster/openmpi-2.0.4
index bf966eef6623..0613e0dead2a 100644
--- a/metadata/md5-cache/sys-cluster/openmpi-2.0.4
+++ b/metadata/md5-cache/sys-cluster/openmpi-2.0.4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi !sys-cluster/mpiexec >=dev-libs/libevent-2.0.22[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-apps/hwloc-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,numa?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* ) java? ( >=virtual/jdk-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi !sys-cluster/mpiexec !sys-cluster/pmix >=dev-libs/libevent-2.0.22[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-apps/hwloc-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,numa?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* ) java? ( >=virtual/jdk-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=A high-performance message passing library (MPI)
 EAPI=6
 HOMEPAGE=http://www.open-mpi.org
 IUSE=cma cuda cxx elibc_FreeBSD fortran heterogeneous ipv6 java mpi-threads numa romio threads openmpi_fabrics_ofed openmpi_fabrics_knem openmpi_fabrics_psm openmpi_rm_pbs openmpi_rm_slurm openmpi_ofed_features_control-hdr-padding openmpi_ofed_features_connectx-xrc openmpi_ofed_features_udcm openmpi_ofed_features_rdmacm openmpi_ofed_features_dynamic-sl openmpi_ofed_features_failover elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
 LICENSE=BSD
-RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi !sys-cluster/mpiexec >=dev-libs/libevent-2.0.22[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-apps/hwloc-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,numa?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* ) java? ( >=virtual/jre-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi !sys-cluster/mpiexec !sys-cluster/pmix >=dev-libs/libevent-2.0.22[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-apps/hwloc-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,numa?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* ) java? ( >=virtual/jre-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=openmpi_rm_slurm? ( !openmpi_rm_pbs ) openmpi_rm_pbs? ( !openmpi_rm_slurm ) openmpi_fabrics_psm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed ) openmpi_ofed_features_connectx-xrc? ( openmpi_fabrics_ofed ) openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed ) openmpi_ofed_features_failover? ( openmpi_fabrics_ofed )
 SLOT=0
 SRC_URI=http://www.open-mpi.org/software/ompi/v2.0/downloads/openmpi-2.0.4.tar.bz2
 _eclasses_=cuda	626969678b9c5735753d8a380c6f295b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=65fd7cf9c50a575cd688641b83c0f03e
+_md5_=fc8107e52d2c3e757e48e15c0d886ccd
diff --git a/metadata/md5-cache/sys-cluster/openmpi-2.1.3 b/metadata/md5-cache/sys-cluster/openmpi-2.1.3
index 72d7d3c44d86..8cb70197fa11 100644
--- a/metadata/md5-cache/sys-cluster/openmpi-2.1.3
+++ b/metadata/md5-cache/sys-cluster/openmpi-2.1.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi !sys-cluster/mpiexec >=dev-libs/libevent-2.0.22[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwloc-1.11.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,numa?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* ) java? ( >=virtual/jdk-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi !sys-cluster/mpiexec !sys-cluster/pmix >=dev-libs/libevent-2.0.22[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwloc-1.11.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,numa?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* ) java? ( >=virtual/jdk-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=A high-performance message passing library (MPI)
 EAPI=6
 HOMEPAGE=http://www.open-mpi.org
 IUSE=cma cuda cxx elibc_FreeBSD fortran heterogeneous ipv6 java mpi-threads numa romio threads openmpi_fabrics_ofed openmpi_fabrics_knem openmpi_fabrics_psm openmpi_rm_pbs openmpi_rm_slurm openmpi_ofed_features_control-hdr-padding openmpi_ofed_features_udcm openmpi_ofed_features_rdmacm openmpi_ofed_features_dynamic-sl elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
 LICENSE=BSD
-RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi !sys-cluster/mpiexec >=dev-libs/libevent-2.0.22[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwloc-1.11.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,numa?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* ) java? ( >=virtual/jre-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi !sys-cluster/mpiexec !sys-cluster/pmix >=dev-libs/libevent-2.0.22[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwloc-1.11.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,numa?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* ) java? ( >=virtual/jre-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=openmpi_rm_slurm? ( !openmpi_rm_pbs ) openmpi_rm_pbs? ( !openmpi_rm_slurm ) openmpi_fabrics_psm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed ) openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed )
 SLOT=0
 SRC_URI=http://www.open-mpi.org/software/ompi/v2.1/downloads/openmpi-2.1.3.tar.bz2
 _eclasses_=cuda	626969678b9c5735753d8a380c6f295b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=c33087adc49240ebd7da843a36d95115
+_md5_=f5cb1b8e2d993ed5f015cba7a9e5aa16
diff --git a/metadata/md5-cache/sys-cluster/openmpi-3.0.0-r1 b/metadata/md5-cache/sys-cluster/openmpi-3.0.0-r1
deleted file mode 100644
index ac83ebd863df..000000000000
--- a/metadata/md5-cache/sys-cluster/openmpi-3.0.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi !sys-cluster/mpiexec >=dev-libs/libevent-2.0.22[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwloc-1.11.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,numa?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* ) java? ( >=virtual/jdk-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=A high-performance message passing library (MPI)
-EAPI=6
-HOMEPAGE=http://www.open-mpi.org
-IUSE=cma cuda cxx elibc_FreeBSD fortran heterogeneous ipv6 java numa romio openmpi_fabrics_ofed openmpi_fabrics_knem openmpi_fabrics_psm openmpi_rm_pbs openmpi_rm_slurm openmpi_ofed_features_control-hdr-padding openmpi_ofed_features_udcm openmpi_ofed_features_rdmacm openmpi_ofed_features_dynamic-sl elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
-LICENSE=BSD
-RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi !sys-cluster/mpiexec >=dev-libs/libevent-2.0.22[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwloc-1.11.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,numa?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* ) java? ( >=virtual/jre-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=openmpi_rm_slurm? ( !openmpi_rm_pbs ) openmpi_rm_pbs? ( !openmpi_rm_slurm ) openmpi_fabrics_psm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed ) openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed )
-SLOT=0
-SRC_URI=http://www.open-mpi.org/software/ompi/v3.0/downloads/openmpi-3.0.0.tar.bz2
-_eclasses_=cuda	626969678b9c5735753d8a380c6f295b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=ef1fbca6520be1296fd86eb0e0acbe01
diff --git a/metadata/md5-cache/sys-cluster/openmpi-3.0.1 b/metadata/md5-cache/sys-cluster/openmpi-3.0.1
index 3e947502d713..fb82fa8969c2 100644
--- a/metadata/md5-cache/sys-cluster/openmpi-3.0.1
+++ b/metadata/md5-cache/sys-cluster/openmpi-3.0.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi !sys-cluster/mpiexec >=dev-libs/libevent-2.0.22[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwloc-1.11.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,numa?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* ) java? ( >=virtual/jdk-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi !sys-cluster/mpiexec !sys-cluster/pmix >=dev-libs/libevent-2.0.22[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwloc-1.11.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,numa?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* ) java? ( >=virtual/jdk-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=A high-performance message passing library (MPI)
 EAPI=6
 HOMEPAGE=http://www.open-mpi.org
 IUSE=cma cuda cxx elibc_FreeBSD fortran heterogeneous ipv6 java numa romio openmpi_fabrics_ofed openmpi_fabrics_knem openmpi_fabrics_psm openmpi_rm_pbs openmpi_rm_slurm openmpi_ofed_features_control-hdr-padding openmpi_ofed_features_udcm openmpi_ofed_features_rdmacm openmpi_ofed_features_dynamic-sl elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
 LICENSE=BSD
-RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi !sys-cluster/mpiexec >=dev-libs/libevent-2.0.22[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwloc-1.11.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,numa?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* ) java? ( >=virtual/jre-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi !sys-cluster/mpiexec !sys-cluster/pmix >=dev-libs/libevent-2.0.22[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwloc-1.11.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,numa?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* ) java? ( >=virtual/jre-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=openmpi_rm_slurm? ( !openmpi_rm_pbs ) openmpi_rm_pbs? ( !openmpi_rm_slurm ) openmpi_fabrics_psm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed ) openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed )
 SLOT=0
 SRC_URI=http://www.open-mpi.org/software/ompi/v3.0/downloads/openmpi-3.0.1.tar.bz2
 _eclasses_=cuda	626969678b9c5735753d8a380c6f295b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=ef1fbca6520be1296fd86eb0e0acbe01
+_md5_=84223b6d07cf4916fe2b62e2a6c2400c
diff --git a/metadata/md5-cache/sys-cluster/openmpi-3.1.0 b/metadata/md5-cache/sys-cluster/openmpi-3.1.0
new file mode 100644
index 000000000000..cac67585a13d
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/openmpi-3.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi !sys-cluster/mpiexec !sys-cluster/pmix >=dev-libs/libevent-2.0.22[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwloc-1.11.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,numa?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* ) java? ( >=virtual/jdk-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=A high-performance message passing library (MPI)
+EAPI=6
+HOMEPAGE=http://www.open-mpi.org
+IUSE=cma cuda cxx elibc_FreeBSD fortran heterogeneous ipv6 java numa romio openmpi_fabrics_ofed openmpi_fabrics_knem openmpi_fabrics_psm openmpi_rm_pbs openmpi_rm_slurm openmpi_ofed_features_control-hdr-padding openmpi_ofed_features_udcm openmpi_ofed_features_rdmacm openmpi_ofed_features_dynamic-sl elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
+LICENSE=BSD
+RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi !sys-cluster/mpiexec !sys-cluster/pmix >=dev-libs/libevent-2.0.22[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwloc-1.11.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,numa?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* ) java? ( >=virtual/jre-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=openmpi_rm_slurm? ( !openmpi_rm_pbs ) openmpi_rm_pbs? ( !openmpi_rm_slurm ) openmpi_fabrics_psm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed ) openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed )
+SLOT=0
+SRC_URI=http://www.open-mpi.org/software/ompi/v3.1/downloads/openmpi-3.1.0.tar.bz2
+_eclasses_=cuda	626969678b9c5735753d8a380c6f295b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=84223b6d07cf4916fe2b62e2a6c2400c
diff --git a/metadata/md5-cache/sys-firmware/Manifest.gz b/metadata/md5-cache/sys-firmware/Manifest.gz
index cd92e92c0984..4c83360100f1 100644
--- a/metadata/md5-cache/sys-firmware/Manifest.gz
+++ b/metadata/md5-cache/sys-firmware/Manifest.gz
diff --git a/metadata/md5-cache/sys-firmware/intel-microcode-20180426-r1 b/metadata/md5-cache/sys-firmware/intel-microcode-20180426-r1
new file mode 100644
index 000000000000..c27a9cf994e6
--- /dev/null
+++ b/metadata/md5-cache/sys-firmware/intel-microcode-20180426-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare prerm pretend setup
+DEPEND=sys-apps/iucode_tool
+DESCRIPTION=Intel IA32/IA64 microcode update data
+EAPI=6
+HOMEPAGE=http://inertiawar.com/microcode/ https://downloadcenter.intel.com/Detail_Desc.aspx?DwnldID=27776
+IUSE=initramfs +split-ucode vanilla
+LICENSE=intel-ucode
+RDEPEND=!<sys-apps/microcode-ctl-1.17-r2
+REQUIRED_USE=|| ( initramfs split-ucode )
+SLOT=0
+SRC_URI=https://downloadmirror.intel.com/27776/eng/microcode-20180425.tgz https://dev.gentoo.org/~whissi/dist/intel-microcode/intel-microcode-collection-20180426.tar.xz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	ca370deef9d44125d829f2eb6ebc83e0	mount-boot	1e82d96b7a7dcb483b412497a90bb646	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=7a28f0f03a6e99c4443c4dd5093bc14c
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index b67011902071..8d8590caaddc 100644
--- a/metadata/md5-cache/sys-fs/Manifest.gz
+++ b/metadata/md5-cache/sys-fs/Manifest.gz
diff --git a/metadata/md5-cache/sys-fs/e2fsprogs-1.43.9 b/metadata/md5-cache/sys-fs/e2fsprogs-1.43.9
index 5c1197d29917..c7b71917cc88 100644
--- a/metadata/md5-cache/sys-fs/e2fsprogs-1.43.9
+++ b/metadata/md5-cache/sys-fs/e2fsprogs-1.43.9
@@ -4,10 +4,10 @@ DESCRIPTION=Standard EXT2/EXT3/EXT4 filesystem utilities
 EAPI=6
 HOMEPAGE=http://e2fsprogs.sourceforge.net/
 IUSE=fuse nls static-libs elibc_FreeBSD
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint
 LICENSE=GPL-2 BSD
 RDEPEND=~sys-libs/e2fsprogs-libs-1.43.9 >=sys-apps/util-linux-2.16 fuse? ( sys-fs/fuse:0 ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://sourceforge/e2fsprogs/e2fsprogs-1.43.9.tar.gz mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v1.43.9/e2fsprogs-1.43.9.tar.gz elibc_mintlib? ( mirror://gentoo/e2fsprogs-1.42.9-mint-r1.patch.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7b4b3b9ca77acab2d201fdc165360325
+_md5_=bfa1505952bb1b44a2eeacbe8dacb83c
diff --git a/metadata/md5-cache/sys-fs/fuse-3.2.1 b/metadata/md5-cache/sys-fs/fuse-3.2.1
index e50f6150d052..74ae89ec0317 100644
--- a/metadata/md5-cache/sys-fs/fuse-3.2.1
+++ b/metadata/md5-cache/sys-fs/fuse-3.2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=sys-fs/fuse-common
 SLOT=3
 SRC_URI=https://github.com/libfuse/libfuse/releases/download/fuse-3.2.1/fuse-3.2.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	ecfaf615b512dc4ff2a50a35e6b26c09	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	udev	d91cac2c73b94629cad2daea66e0d182	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	53e3ab209402d5ad07a9c4580c423d1a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	udev	d91cac2c73b94629cad2daea66e0d182	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=68ade9b2bd36d430ab98b3cdeb3eb253
diff --git a/metadata/md5-cache/sys-fs/fuse-3.2.2 b/metadata/md5-cache/sys-fs/fuse-3.2.2
index aa36ea98977f..c7a0b4ab05dd 100644
--- a/metadata/md5-cache/sys-fs/fuse-3.2.2
+++ b/metadata/md5-cache/sys-fs/fuse-3.2.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=sys-fs/fuse-common
 SLOT=3
 SRC_URI=https://github.com/libfuse/libfuse/releases/download/fuse-3.2.2/fuse-3.2.2.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	ecfaf615b512dc4ff2a50a35e6b26c09	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	udev	d91cac2c73b94629cad2daea66e0d182	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	53e3ab209402d5ad07a9c4580c423d1a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	udev	d91cac2c73b94629cad2daea66e0d182	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=68ade9b2bd36d430ab98b3cdeb3eb253
diff --git a/metadata/md5-cache/sys-fs/fuse-common-3.2.1 b/metadata/md5-cache/sys-fs/fuse-common-3.2.1
index 88611f14c87d..1deff8422a2f 100644
--- a/metadata/md5-cache/sys-fs/fuse-common-3.2.1
+++ b/metadata/md5-cache/sys-fs/fuse-common-3.2.1
@@ -9,5 +9,5 @@ RDEPEND=!<sys-fs/fuse-2.9.7-r1:0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/libfuse/libfuse/releases/download/fuse-3.2.1/fuse-3.2.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	ecfaf615b512dc4ff2a50a35e6b26c09	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	udev	d91cac2c73b94629cad2daea66e0d182	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	53e3ab209402d5ad07a9c4580c423d1a	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	udev	d91cac2c73b94629cad2daea66e0d182	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=82c376e48a6682b488715dcbaddfd5b4
diff --git a/metadata/md5-cache/sys-fs/fuse-common-3.2.2 b/metadata/md5-cache/sys-fs/fuse-common-3.2.2
index 2f9a3b1d4eae..2e6e37534c19 100644
--- a/metadata/md5-cache/sys-fs/fuse-common-3.2.2
+++ b/metadata/md5-cache/sys-fs/fuse-common-3.2.2
@@ -9,5 +9,5 @@ RDEPEND=!<sys-fs/fuse-2.9.7-r1:0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/libfuse/libfuse/releases/download/fuse-3.2.2/fuse-3.2.2.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	ecfaf615b512dc4ff2a50a35e6b26c09	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	udev	d91cac2c73b94629cad2daea66e0d182	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	53e3ab209402d5ad07a9c4580c423d1a	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	udev	d91cac2c73b94629cad2daea66e0d182	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=bf587c968b0b081195389e77441659d1
diff --git a/metadata/md5-cache/sys-fs/udev-236-r1 b/metadata/md5-cache/sys-fs/udev-236-r1
index fed368318b23..435f65c04cc6 100644
--- a/metadata/md5-cache/sys-fs/udev-236-r1
+++ b/metadata/md5-cache/sys-fs/udev-236-r1
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd/archive/v236.tar.gz -> systemd-236.tar.gz
-_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	ca370deef9d44125d829f2eb6ebc83e0	meson	ecfaf615b512dc4ff2a50a35e6b26c09	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	ca370deef9d44125d829f2eb6ebc83e0	meson	53e3ab209402d5ad07a9c4580c423d1a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=f17be813122ebd8c7c08193ae0dcfdc5
diff --git a/metadata/md5-cache/sys-fs/udev-238 b/metadata/md5-cache/sys-fs/udev-238
index 7051e65b29bc..f728e8af7b4c 100644
--- a/metadata/md5-cache/sys-fs/udev-238
+++ b/metadata/md5-cache/sys-fs/udev-238
@@ -4,12 +4,12 @@ DESCRIPTION=Linux dynamic and persistent device naming support (aka userspace de
 EAPI=6
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
 IUSE=acl +kmod selinux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86
+KEYWORDS=alpha amd64 ~arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 LICENSE=LGPL-2.1 MIT GPL-2
 PDEPEND=>=sys-apps/hwids-20140304[udev] >=sys-fs/udev-init-scripts-26
 RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd !<sys-fs/lvm2-2.02.103 !<sec-policy/selinux-base-2.20120725-r10
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd/archive/v238.tar.gz -> systemd-238.tar.gz
-_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	ca370deef9d44125d829f2eb6ebc83e0	meson	ecfaf615b512dc4ff2a50a35e6b26c09	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=430553cc1b0c4b887bc1a4ed762cb69c
+_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	ca370deef9d44125d829f2eb6ebc83e0	meson	53e3ab209402d5ad07a9c4580c423d1a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=d2a9a412a5cc7dc397123103c658dc39
diff --git a/metadata/md5-cache/sys-fs/udev-9999 b/metadata/md5-cache/sys-fs/udev-9999
index 64eb10f9ae52..ced7fdd4365c 100644
--- a/metadata/md5-cache/sys-fs/udev-9999
+++ b/metadata/md5-cache/sys-fs/udev-9999
@@ -9,5 +9,5 @@ PDEPEND=>=sys-apps/hwids-20140304[udev] >=sys-fs/udev-init-scripts-26
 RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd !<sys-fs/lvm2-2.02.103 !<sec-policy/selinux-base-2.20120725-r10
 RESTRICT=test
 SLOT=0
-_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	af51ccfceeb403ab80f1bf9209d372c8	linux-info	ca370deef9d44125d829f2eb6ebc83e0	meson	ecfaf615b512dc4ff2a50a35e6b26c09	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	af51ccfceeb403ab80f1bf9209d372c8	linux-info	ca370deef9d44125d829f2eb6ebc83e0	meson	53e3ab209402d5ad07a9c4580c423d1a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=1c9f2ce87f3fe65b7301691f7b5121f9
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index fea5556b2734..412fdfaca958 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/ck-sources-4.14.43 b/metadata/md5-cache/sys-kernel/ck-sources-4.14.43
new file mode 100644
index 000000000000..10cbc2d3c2bd
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.14.43
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=Con Kolivas' high performance patchset and Gentoo's genpatches for Linux 4.14
+EAPI=6
+HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://dev.gentoo.org/~mpagano/genpatches/ http://kernel.kolivas.org/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
+IUSE=experimental symlink build deblob
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 !deblob? ( linux-firmware )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.14.43
+SRC_URI=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://gentoo/genpatches-4.14-48.base.tar.xz mirror://gentoo/genpatches-4.14-48.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-48.experimental.tar.xz ) http://ck.kolivas.org/patches/4.0/4.14/4.14-ck1/patch-4.14-ck1.xz https://github.com/ckolivas/linux/commit/25849740d77dfc089fdbfb53623e50d38a972aff.patch -> ck-sources-4.14-blkio-fix.patch
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=52e97ef39b33faa797c6140c2d345453
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.16.11 b/metadata/md5-cache/sys-kernel/ck-sources-4.16.11
new file mode 100644
index 000000000000..1886bdaa85ab
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.16.11
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=Con Kolivas' high performance patchset and Gentoo's genpatches for Linux 4.16
+EAPI=6
+HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://dev.gentoo.org/~mpagano/genpatches/ http://kernel.kolivas.org/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
+IUSE=experimental symlink build deblob
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 !deblob? ( linux-firmware )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.16.11
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.16.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.16-gnu/deblob-4.16 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.16-gnu/deblob-check -> deblob-check-4.16 ) mirror://gentoo/genpatches-4.16-12.base.tar.xz mirror://gentoo/genpatches-4.16-12.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.16-12.experimental.tar.xz ) http://ck.kolivas.org/patches/4.0/4.16/4.16-ck1/patch-4.16-ck1.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=c7d6be0e74da9d2f000df95594b6f40b
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.9.102 b/metadata/md5-cache/sys-kernel/ck-sources-4.9.102
new file mode 100644
index 000000000000..f49a801436d0
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.9.102
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=Con Kolivas' high performance patchset and Gentoo's genpatches for Linux 4.9
+EAPI=6
+HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://dev.gentoo.org/~mpagano/genpatches/ http://kernel.kolivas.org/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
+IUSE=symlink build deblob
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 !deblob? ( linux-firmware )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.9.102
+SRC_URI=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://gentoo/genpatches-4.9-105.base.tar.xz mirror://gentoo/genpatches-4.9-105.extras.tar.xz mirror://gentoo/genpatches-4.9-105.experimental.tar.xz http://ck.kolivas.org/patches/4.0/4.9/4.9-ck1/patch-4.9-ck1.xz https://github.com/ckolivas/linux/commit/7de569950716147ed436b27936628ee3ab5b45cc.patch -> ck-sources-4.9-freezer-fix.patch
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=e98c2091e0768ddc31601d865508277d
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.43 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.43
new file mode 100644
index 000000000000..c8e975bf7a95
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.43
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.14 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.14.43
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz mirror://gentoo/genpatches-4.14-48.base.tar.xz mirror://gentoo/genpatches-4.14-48.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-48.experimental.tar.xz )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=cf05099e96650bcdbebb48250402469c
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.16.11 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.16.11
new file mode 100644
index 000000000000..0bbe1d6b945e
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.16.11
@@ -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.16 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.16.11
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.16.tar.xz mirror://gentoo/genpatches-4.16-12.base.tar.xz mirror://gentoo/genpatches-4.16-12.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.16-12.experimental.tar.xz )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=75b97a3269c2fa01c5551ac4c2b75ea3
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.102 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.102
new file mode 100644
index 000000000000..0524258135d2
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.102
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.9 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.9.102
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/genpatches-4.9-105.base.tar.xz mirror://gentoo/genpatches-4.9-105.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-105.experimental.tar.xz )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=576982f0de79fc8b2519dcc89bc423e8
diff --git a/metadata/md5-cache/sys-kernel/kpatch-0.6.0 b/metadata/md5-cache/sys-kernel/kpatch-0.6.0
new file mode 100644
index 000000000000..032d36ce0ef7
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/kpatch-0.6.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare pretend setup
+DEPEND=app-crypt/pesign dev-libs/openssl:0= sys-libs/zlib sys-apps/pciutils dev-libs/elfutils sys-devel/bison kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
+DESCRIPTION=Dynamic kernel patching for Linux
+EAPI=6
+HOMEPAGE=https://github.com/dynup/kpatch
+IUSE=examples +modules test kernel_linux
+KEYWORDS=~amd64
+LICENSE=GPL-2+
+RDEPEND=app-crypt/pesign dev-libs/openssl:0= sys-libs/zlib sys-apps/pciutils kernel_linux? ( virtual/modutils )
+SLOT=0
+SRC_URI=https://github.com/dynup/kpatch/archive/v0.6.0.tar.gz -> kpatch-0.6.0.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	ca370deef9d44125d829f2eb6ebc83e0	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=8b37b9232ba8ed070be0669e863d12d7
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.42 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.43
index 4d846bd7c8f6..ef2be2b3f694 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.42
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.43
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2 linux-firmware
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
 RESTRICT=binchecks strip
-SLOT=4.14.42
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.42.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz
+SLOT=4.14.43
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.43.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=8f4238b1a7ebc7da5b83472577770508
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.16.10 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.16.11
index 38b322a2ee27..e38b503c3c39 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.16.10
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.16.11
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2 linux-firmware
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
 RESTRICT=binchecks strip
-SLOT=4.16.10
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.16.10.xz mirror://kernel/linux/kernel/v4.x/linux-4.16.tar.xz
+SLOT=4.16.11
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.16.11.xz mirror://kernel/linux/kernel/v4.x/linux-4.16.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=8f4238b1a7ebc7da5b83472577770508
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.101 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.102
index 46661f58bb24..99d3899eb063 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.101
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.102
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2 linux-firmware
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
 RESTRICT=binchecks strip
-SLOT=4.9.101
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.9.101.xz mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz
+SLOT=4.9.102
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.9.102.xz mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
 _md5_=8f4238b1a7ebc7da5b83472577770508
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 37e1a815300c..ba2de19d34f1 100644
--- a/metadata/md5-cache/sys-libs/Manifest.gz
+++ b/metadata/md5-cache/sys-libs/Manifest.gz
diff --git a/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.43.9 b/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.43.9
index 695c41578c25..57c768af3e59 100644
--- a/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.43.9
+++ b/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.43.9
@@ -4,10 +4,10 @@ DESCRIPTION=e2fsprogs libraries (common error and subsystem)
 EAPI=6
 HOMEPAGE=http://e2fsprogs.sourceforge.net/
 IUSE=nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=!sys-libs/com_err !sys-libs/ss !<sys-fs/e2fsprogs-1.41.8
 SLOT=0
 SRC_URI=mirror://sourceforge/e2fsprogs/e2fsprogs-libs-1.43.9.tar.gz mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v1.43.9/e2fsprogs-libs-1.43.9.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=14586373980ac915384aaf526de86fe5
+_md5_=cad9a180bf215d5e791d9e4747801fdd
diff --git a/metadata/md5-cache/sys-libs/glibc-2.23-r4 b/metadata/md5-cache/sys-libs/glibc-2.23-r4
index 93447a83eb67..70444ed053ec 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.23-r4
+++ b/metadata/md5-cache/sys-libs/glibc-2.23-r4
@@ -4,7 +4,7 @@ DESCRIPTION=GNU libc6 (also called glibc2) C library
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/libc/libc.html
 IUSE=audit caps debug gd hardened multilib nscd +rpc selinux systemtap profile suid vanilla headers-only
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 LICENSE=LGPL-2.1+ 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 ) !sys-kernel/ps3-sources sys-apps/gentoo-functions !sys-libs/nss-db vanilla? ( !sys-libs/timezone-data )
@@ -12,4 +12,4 @@ RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.23.tar.xz ftp://sourceware.org/pub/glibc/releases/glibc-2.23.tar.xz ftp://sourceware.org/pub/glibc/snapshots/glibc-2.23.tar.xz mirror://gentoo/glibc-2.23.tar.xz mirror://gentoo/glibc-2.23-patches-8.tar.bz2 https://dev.gentoo.org/~vapier/dist/glibc-2.23-patches-8.tar.bz2 https://dev.gentoo.org/~azarah/glibc/glibc-2.23-patches-8.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/glibc-2.23-patches-8.tar.bz2 multilib? ( mirror://gentoo/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~azarah/glibc/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	toolchain-glibc	52fbfc8770f7b8bb9588dcc5ac907cd1	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=a45cea077c6a3981efd06e251857a930
+_md5_=b608ef413c4f073f7f787fa5d8b43707
diff --git a/metadata/md5-cache/sys-libs/glibc-2.25-r11 b/metadata/md5-cache/sys-libs/glibc-2.25-r11
index 1e6616fee7d6..69fe51f34a92 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.25-r11
+++ b/metadata/md5-cache/sys-libs/glibc-2.25-r11
@@ -4,7 +4,7 @@ DESCRIPTION=GNU libc6 (also called glibc2) C library
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/libc/libc.html
 IUSE=audit caps debug gd hardened multilib nscd +rpc selinux systemtap profile suid vanilla headers-only
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 LICENSE=LGPL-2.1+ 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 )
@@ -12,4 +12,4 @@ RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.25.tar.xz ftp://sourceware.org/pub/glibc/releases/glibc-2.25.tar.xz ftp://sourceware.org/pub/glibc/snapshots/glibc-2.25.tar.xz mirror://gentoo/glibc-2.25.tar.xz mirror://gentoo/glibc-2.25-patches-15.tar.bz2 https://dev.gentoo.org/~vapier/dist/glibc-2.25-patches-15.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.25-patches-15.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/glibc-2.25-patches-15.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/glibc-2.25-patches-15.tar.bz2 multilib? ( mirror://gentoo/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	toolchain-glibc	52fbfc8770f7b8bb9588dcc5ac907cd1	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=f67b1bd5778e36e4af7260ad37606144
+_md5_=d1f10865e5242e844404644ab7d8438f
diff --git a/metadata/md5-cache/sys-libs/libselinux-2.6 b/metadata/md5-cache/sys-libs/libselinux-2.8
index 600f9e76d9c2..e361651ce268 100644
--- a/metadata/md5-cache/sys-libs/libselinux-2.6
+++ b/metadata/md5-cache/sys-libs/libselinux-2.8
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=sys-libs/libsepol-2.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(-)?] !pcre2? ( >=dev-libs/libpcre-8.33-r1:=[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(-)?] ) pcre2? ( dev-libs/libpcre2:=[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(-)?] ) python? ( 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(-)] ) ruby? ( ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ) virtual/pkgconfig python? ( >=dev-lang/swig-2.0.9 )
+DEPEND=>=sys-libs/libsepol-2.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(-)?] !pcre2? ( >=dev-libs/libpcre-8.33-r1:=[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(-)?] ) pcre2? ( dev-libs/libpcre2:=[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(-)?] ) python? ( 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(-)] ) ruby? ( ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ) elibc_musl? ( sys-libs/fts-standalone ) virtual/pkgconfig python? ( >=dev-lang/swig-2.0.9 ) ruby? ( >=dev-lang/swig-2.0.9 )
 DESCRIPTION=SELinux userland library
 EAPI=6
 HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
 IUSE=pcre2 python ruby static-libs ruby_targets_ruby23 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=amd64 ~arm ~arm64 ~mips x86
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~x86
 LICENSE=public-domain
-RDEPEND=>=sys-libs/libsepol-2.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(-)?] !pcre2? ( >=dev-libs/libpcre-8.33-r1:=[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(-)?] ) pcre2? ( dev-libs/libpcre2:=[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(-)?] ) python? ( 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(-)] ) ruby? ( ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) )
+RDEPEND=>=sys-libs/libsepol-2.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(-)?] !pcre2? ( >=dev-libs/libpcre-8.33-r1:=[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(-)?] ) pcre2? ( dev-libs/libpcre2:=[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(-)?] ) python? ( 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(-)] ) ruby? ( ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ) elibc_musl? ( sys-libs/fts-standalone )
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20161014/libselinux-2.6.tar.gz
+SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180524/libselinux-2.8.tar.gz
 _eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=e45e63ad11ec7fb71f46f09dbe9eede7
+_md5_=4a27a94b8ca9ca6b53cca32303efaf23
diff --git a/metadata/md5-cache/sys-libs/libselinux-2.8_rc1 b/metadata/md5-cache/sys-libs/libselinux-2.8_rc1
deleted file mode 100644
index 4f229c850c5d..000000000000
--- a/metadata/md5-cache/sys-libs/libselinux-2.8_rc1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=sys-libs/libsepol-2.8_rc1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !pcre2? ( >=dev-libs/libpcre-8.33-r1:=[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(-)?] ) pcre2? ( dev-libs/libpcre2:=[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(-)?] ) python? ( 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(-)] ) ruby? ( ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ) virtual/pkgconfig python? ( >=dev-lang/swig-2.0.9 )
-DESCRIPTION=SELinux userland library
-EAPI=6
-HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
-IUSE=pcre2 python ruby static-libs ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 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=~amd64 ~arm ~arm64 ~mips ~x86
-LICENSE=public-domain
-RDEPEND=>=sys-libs/libsepol-2.8_rc1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !pcre2? ( >=dev-libs/libpcre-8.33-r1:=[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(-)?] ) pcre2? ( dev-libs/libpcre2:=[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(-)?] ) python? ( 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(-)] ) ruby? ( ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) )
-REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180419/libselinux-2.8-rc1.tar.gz
-_eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=a1bd2497c2eb72b91b55153dd4cc2a3c
diff --git a/metadata/md5-cache/sys-libs/libselinux-2.8_rc2 b/metadata/md5-cache/sys-libs/libselinux-2.8_rc2
deleted file mode 100644
index 92d8be126e1a..000000000000
--- a/metadata/md5-cache/sys-libs/libselinux-2.8_rc2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=sys-libs/libsepol-2.8_rc2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !pcre2? ( >=dev-libs/libpcre-8.33-r1:=[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(-)?] ) pcre2? ( dev-libs/libpcre2:=[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(-)?] ) python? ( 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(-)] ) ruby? ( ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ) virtual/pkgconfig python? ( >=dev-lang/swig-2.0.9 )
-DESCRIPTION=SELinux userland library
-EAPI=6
-HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
-IUSE=pcre2 python ruby static-libs ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 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=~amd64 ~arm ~arm64 ~mips ~x86
-LICENSE=public-domain
-RDEPEND=>=sys-libs/libsepol-2.8_rc2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !pcre2? ( >=dev-libs/libpcre-8.33-r1:=[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(-)?] ) pcre2? ( dev-libs/libpcre2:=[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(-)?] ) python? ( 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(-)] ) ruby? ( ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) )
-REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180426/libselinux-2.8-rc2.tar.gz
-_eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=bb6e44849cadfe7b92de380b3bb9f930
diff --git a/metadata/md5-cache/sys-libs/libselinux-2.8_rc3 b/metadata/md5-cache/sys-libs/libselinux-2.8_rc3
deleted file mode 100644
index 8ba2b99ef819..000000000000
--- a/metadata/md5-cache/sys-libs/libselinux-2.8_rc3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=sys-libs/libsepol-2.8_rc3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !pcre2? ( >=dev-libs/libpcre-8.33-r1:=[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(-)?] ) pcre2? ( dev-libs/libpcre2:=[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(-)?] ) python? ( 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(-)] ) ruby? ( ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ) virtual/pkgconfig python? ( >=dev-lang/swig-2.0.9 ) ruby? ( >=dev-lang/swig-2.0.9 )
-DESCRIPTION=SELinux userland library
-EAPI=6
-HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
-IUSE=pcre2 python ruby static-libs ruby_targets_ruby23 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=~amd64 ~arm ~arm64 ~mips ~x86
-LICENSE=public-domain
-RDEPEND=>=sys-libs/libsepol-2.8_rc3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !pcre2? ( >=dev-libs/libpcre-8.33-r1:=[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(-)?] ) pcre2? ( dev-libs/libpcre2:=[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(-)?] ) python? ( 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(-)] ) ruby? ( ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) )
-REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180510/libselinux-2.8-rc3.tar.gz
-_eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=c806bccfaacb159870773489e83f6b77
diff --git a/metadata/md5-cache/sys-libs/libselinux-9999 b/metadata/md5-cache/sys-libs/libselinux-9999
index 31a2ab2e4dd0..83b46a14e784 100644
--- a/metadata/md5-cache/sys-libs/libselinux-9999
+++ b/metadata/md5-cache/sys-libs/libselinux-9999
@@ -9,4 +9,4 @@ RDEPEND=>=sys-libs/libsepol-9999:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=0
 _eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=f375d8923512697797c8eb322b28f782
+_md5_=4a27a94b8ca9ca6b53cca32303efaf23
diff --git a/metadata/md5-cache/sys-libs/libsemanage-2.6 b/metadata/md5-cache/sys-libs/libsemanage-2.8
index d7dbf9cf517f..5c2f6a323ce9 100644
--- a/metadata/md5-cache/sys-libs/libsemanage-2.6
+++ b/metadata/md5-cache/sys-libs/libsemanage-2.8
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=sys-libs/libsepol-2.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(-)?] >=sys-libs/libselinux-2.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(-)?] >=sys-process/audit-2.2.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/ustr-1.0.4-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python? ( 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(-)] ) sys-devel/bison sys-devel/flex python? ( >=dev-lang/swig-2.0.4-r1 virtual/pkgconfig )
+DEPEND=>=sys-libs/libsepol-2.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(-)?] >=sys-libs/libselinux-2.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(-)?] >=sys-process/audit-2.2.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/ustr-1.0.4-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python? ( 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(-)] ) sys-devel/bison sys-devel/flex python? ( >=dev-lang/swig-2.0.4-r1 virtual/pkgconfig )
 DESCRIPTION=SELinux kernel and policy management library
 EAPI=6
 HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
 IUSE=python 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=amd64 ~arm ~arm64 ~mips x86
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
-RDEPEND=>=sys-libs/libsepol-2.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(-)?] >=sys-libs/libselinux-2.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(-)?] >=sys-process/audit-2.2.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/ustr-1.0.4-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
+RDEPEND=>=sys-libs/libsepol-2.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(-)?] >=sys-libs/libselinux-2.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(-)?] >=sys-process/audit-2.2.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/ustr-1.0.4-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python? ( 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? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 RESTRICT=test
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20161014/libsemanage-2.6.tar.gz
+SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180524/libsemanage-2.8.tar.gz
 _eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=f9da304b4126c26cf7f307523f55d77a
+_md5_=ea002a910f65a51663d70becaa99efe4
diff --git a/metadata/md5-cache/sys-libs/libsemanage-2.8_rc1 b/metadata/md5-cache/sys-libs/libsemanage-2.8_rc1
deleted file mode 100644
index 96e3fc6df612..000000000000
--- a/metadata/md5-cache/sys-libs/libsemanage-2.8_rc1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=sys-libs/libsepol-2.8_rc1[abi_x86_32(-)?,abi_x86_64(-)?,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/libselinux-2.8_rc1[abi_x86_32(-)?,abi_x86_64(-)?,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-process/audit-2.2.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/ustr-1.0.4-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python? ( 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(-)] ) sys-devel/bison sys-devel/flex python? ( >=dev-lang/swig-2.0.4-r1 virtual/pkgconfig )
-DESCRIPTION=SELinux kernel and policy management library
-EAPI=6
-HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
-IUSE=python 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=~amd64 ~arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-libs/libsepol-2.8_rc1[abi_x86_32(-)?,abi_x86_64(-)?,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/libselinux-2.8_rc1[abi_x86_32(-)?,abi_x86_64(-)?,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-process/audit-2.2.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/ustr-1.0.4-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python? ( 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? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180419/libsemanage-2.8-rc1.tar.gz
-_eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=164196e7fc53e9702efdb084e42a111e
diff --git a/metadata/md5-cache/sys-libs/libsemanage-2.8_rc2 b/metadata/md5-cache/sys-libs/libsemanage-2.8_rc2
deleted file mode 100644
index c7a325e6892d..000000000000
--- a/metadata/md5-cache/sys-libs/libsemanage-2.8_rc2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=sys-libs/libsepol-2.8_rc2[abi_x86_32(-)?,abi_x86_64(-)?,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/libselinux-2.8_rc2[abi_x86_32(-)?,abi_x86_64(-)?,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-process/audit-2.2.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/ustr-1.0.4-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python? ( 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(-)] ) sys-devel/bison sys-devel/flex python? ( >=dev-lang/swig-2.0.4-r1 virtual/pkgconfig )
-DESCRIPTION=SELinux kernel and policy management library
-EAPI=6
-HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
-IUSE=python 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=~amd64 ~arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-libs/libsepol-2.8_rc2[abi_x86_32(-)?,abi_x86_64(-)?,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/libselinux-2.8_rc2[abi_x86_32(-)?,abi_x86_64(-)?,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-process/audit-2.2.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/ustr-1.0.4-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python? ( 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? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180426/libsemanage-2.8-rc2.tar.gz
-_eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=a7d46dd5ab819f399338e9fc0158badf
diff --git a/metadata/md5-cache/sys-libs/libsemanage-2.8_rc3 b/metadata/md5-cache/sys-libs/libsemanage-2.8_rc3
deleted file mode 100644
index 6a2e09379d87..000000000000
--- a/metadata/md5-cache/sys-libs/libsemanage-2.8_rc3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=sys-libs/libsepol-2.8_rc3[abi_x86_32(-)?,abi_x86_64(-)?,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/libselinux-2.8_rc3[abi_x86_32(-)?,abi_x86_64(-)?,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-process/audit-2.2.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/ustr-1.0.4-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python? ( 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(-)] ) sys-devel/bison sys-devel/flex python? ( >=dev-lang/swig-2.0.4-r1 virtual/pkgconfig )
-DESCRIPTION=SELinux kernel and policy management library
-EAPI=6
-HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
-IUSE=python 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=~amd64 ~arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-libs/libsepol-2.8_rc3[abi_x86_32(-)?,abi_x86_64(-)?,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/libselinux-2.8_rc3[abi_x86_32(-)?,abi_x86_64(-)?,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-process/audit-2.2.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/ustr-1.0.4-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python? ( 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? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180510/libsemanage-2.8-rc3.tar.gz
-_eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=2454321bfe8650ce562f1c168f32a197
diff --git a/metadata/md5-cache/sys-libs/libsemanage-9999 b/metadata/md5-cache/sys-libs/libsemanage-9999
index d44f20c3bad5..e3d1ec68a8f5 100644
--- a/metadata/md5-cache/sys-libs/libsemanage-9999
+++ b/metadata/md5-cache/sys-libs/libsemanage-9999
@@ -10,4 +10,4 @@ REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 py
 RESTRICT=test
 SLOT=0
 _eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=2454321bfe8650ce562f1c168f32a197
+_md5_=ea002a910f65a51663d70becaa99efe4
diff --git a/metadata/md5-cache/sys-libs/libsepol-2.6 b/metadata/md5-cache/sys-libs/libsepol-2.6
deleted file mode 100644
index 57d99bec5918..000000000000
--- a/metadata/md5-cache/sys-libs/libsepol-2.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=SELinux binary policy representation library
-EAPI=6
-HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RESTRICT=test
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20161014/libsepol-2.6.tar.gz
-_eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=ff96f4c68157f4db905f64e0194a74eb
diff --git a/metadata/md5-cache/sys-libs/libsepol-2.8_rc1 b/metadata/md5-cache/sys-libs/libsepol-2.8
index db7b5439f3f8..f1ec8b8c1c89 100644
--- a/metadata/md5-cache/sys-libs/libsepol-2.8_rc1
+++ b/metadata/md5-cache/sys-libs/libsepol-2.8
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 ~arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RESTRICT=test
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180419/libsepol-2.8-rc1.tar.gz
+SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180524/libsepol-2.8.tar.gz
 _eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=6dc7a3106847ba0cf7e10d74db1f79ed
+_md5_=d4ec6f205d67aeb62d4e62e48b208bb7
diff --git a/metadata/md5-cache/sys-libs/libsepol-2.8_rc2 b/metadata/md5-cache/sys-libs/libsepol-2.8_rc2
deleted file mode 100644
index 025c69718a6b..000000000000
--- a/metadata/md5-cache/sys-libs/libsepol-2.8_rc2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=SELinux binary policy representation library
-EAPI=6
-HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RESTRICT=test
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180426/libsepol-2.8-rc2.tar.gz
-_eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=e0085c3c805c651099332a0c528a0e09
diff --git a/metadata/md5-cache/sys-libs/libsepol-2.8_rc3 b/metadata/md5-cache/sys-libs/libsepol-2.8_rc3
deleted file mode 100644
index fc82b51fee11..000000000000
--- a/metadata/md5-cache/sys-libs/libsepol-2.8_rc3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=SELinux binary policy representation library
-EAPI=6
-HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RESTRICT=test
-SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180510/libsepol-2.8-rc3.tar.gz
-_eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=f70f00f5042234f622835e000d4ec65e
diff --git a/metadata/md5-cache/sys-libs/libsepol-9999 b/metadata/md5-cache/sys-libs/libsepol-9999
index c10c43107b6b..6a62b4cf7dd4 100644
--- a/metadata/md5-cache/sys-libs/libsepol-9999
+++ b/metadata/md5-cache/sys-libs/libsepol-9999
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 RESTRICT=test
 SLOT=0
 _eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=f70f00f5042234f622835e000d4ec65e
+_md5_=d4ec6f205d67aeb62d4e62e48b208bb7
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index 33d54ca7bf46..610b36c1de9e 100644
--- a/metadata/md5-cache/sys-process/Manifest.gz
+++ b/metadata/md5-cache/sys-process/Manifest.gz
diff --git a/metadata/md5-cache/sys-process/procps-3.3.15-r1 b/metadata/md5-cache/sys-process/procps-3.3.15-r1
index d8ef8113e32e..f016b3a1a5a9 100644
--- a/metadata/md5-cache/sys-process/procps-3.3.15-r1
+++ b/metadata/md5-cache/sys-process/procps-3.3.15-r1
@@ -4,10 +4,10 @@ DESCRIPTION=standard informational utilities and process-handling tools
 EAPI=6
 HOMEPAGE=http://procps-ng.sourceforge.net/ https://gitlab.com/procps-ng/procps
 IUSE=elogind +kill modern-top +ncurses nls selinux static-libs systemd test unicode
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=elogind? ( sys-auth/elogind ) ncurses? ( >=sys-libs/ncurses-5.7-r7:=[unicode?] ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd ) kill? ( !sys-apps/coreutils[kill] !sys-apps/util-linux[kill] ) !<sys-apps/sysvinit-2.88-r6
 SLOT=0/6
 SRC_URI=mirror://sourceforge/procps-ng/procps-ng-3.3.15.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2a196a792d3302a891c5248d976304c5
+_md5_=6a774a6ff5aa79ee13a519f68cbb93c3
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index 11fa475bb0cf..967b5d688382 100644
--- a/metadata/md5-cache/virtual/Manifest.gz
+++ b/metadata/md5-cache/virtual/Manifest.gz
diff --git a/metadata/md5-cache/virtual/notification-daemon-0 b/metadata/md5-cache/virtual/notification-daemon-0
index eb78299e8c60..d005335a5732 100644
--- a/metadata/md5-cache/virtual/notification-daemon-0
+++ b/metadata/md5-cache/virtual/notification-daemon-0
@@ -1,8 +1,8 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for notification daemon dbus service
-EAPI=5
+EAPI=6
 IUSE=gnome kde
 KEYWORDS=alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
-RDEPEND=gnome? ( || ( x11-misc/notification-daemon gnome-base/gnome-shell ) ) kde? ( kde-plasma/plasma-workspace ) !gnome? ( !kde? ( || ( x11-misc/notification-daemon gnome-extra/cinnamon xfce-extra/xfce4-notifyd x11-misc/qtnotifydaemon x11-misc/notify-osd x11-misc/dunst >=x11-wm/awesome-3.4.4 x11-wm/enlightenment[enlightenment_modules_notification] x11-wm/enlightenment[e_modules_notification] x11-misc/mate-notification-daemon lxqt-base/lxqt-notificationd net-misc/eventd[notification] kde-misc/colibri ) ) )
+RDEPEND=gnome? ( || ( x11-misc/notification-daemon gnome-base/gnome-shell ) ) kde? ( kde-plasma/plasma-workspace ) !gnome? ( !kde? ( || ( x11-misc/notification-daemon gnome-extra/cinnamon xfce-extra/xfce4-notifyd x11-misc/notify-osd x11-misc/dunst >=x11-wm/awesome-3.4.4 x11-wm/enlightenment[enlightenment_modules_notification] x11-wm/enlightenment[e_modules_notification] x11-misc/mate-notification-daemon lxqt-base/lxqt-notificationd net-misc/eventd[notification] ) ) )
 SLOT=0
-_md5_=2455fef4b8828ac88edc6b10f25aed3a
+_md5_=7ecbbf7a7ddd0a73278f0b6088563fe8
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 91657a7c8947..7037df4d81a2 100644
--- a/metadata/md5-cache/www-apps/Manifest.gz
+++ b/metadata/md5-cache/www-apps/Manifest.gz
diff --git a/metadata/md5-cache/www-apps/grafana-bin-5.0.4 b/metadata/md5-cache/www-apps/grafana-bin-5.0.4
index 6f89d070b8f0..d55934a76135 100644
--- a/metadata/md5-cache/www-apps/grafana-bin-5.0.4
+++ b/metadata/md5-cache/www-apps/grafana-bin-5.0.4
@@ -1,11 +1,11 @@
 DEFINED_PHASES=install setup
 DEPEND=virtual/pkgconfig
 DESCRIPTION=Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB
-EAPI=5
+EAPI=6
 HOMEPAGE=https://grafana.org
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-5.0.4.linux-x64.tar.gz -> grafana-bin-5.0.4.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=86241239850506b72aa1c53a12ad40a1
+_md5_=7107845cc6b8f78ee1e2650d2df5cd77
diff --git a/metadata/md5-cache/www-apps/grafana-bin-5.1.2 b/metadata/md5-cache/www-apps/grafana-bin-5.1.3
index acde04af6409..a669d5a6d40a 100644
--- a/metadata/md5-cache/www-apps/grafana-bin-5.1.2
+++ b/metadata/md5-cache/www-apps/grafana-bin-5.1.3
@@ -1,11 +1,11 @@
 DEFINED_PHASES=install setup
 DEPEND=virtual/pkgconfig
 DESCRIPTION=Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB
-EAPI=5
+EAPI=6
 HOMEPAGE=https://grafana.org
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
 SLOT=0
-SRC_URI=https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-5.1.2.linux-x64.tar.gz -> grafana-bin-5.1.2.tar.gz
+SRC_URI=https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-5.1.3.linux-x64.tar.gz -> grafana-bin-5.1.3.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=86241239850506b72aa1c53a12ad40a1
+_md5_=7107845cc6b8f78ee1e2650d2df5cd77
diff --git a/metadata/md5-cache/www-apps/icingaweb2-2.5.1 b/metadata/md5-cache/www-apps/icingaweb2-2.5.1
deleted file mode 100644
index 7bdff5782556..000000000000
--- a/metadata/md5-cache/www-apps/icingaweb2-2.5.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=config install postinst setup
-DEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/imagemagick[png] ) apache2? ( >=www-servers/apache-2.4.0 || ( dev-lang/php:5.6[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.0[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.1[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) ) nginx? ( >=www-servers/nginx-1.7.0:* || ( dev-lang/php:5.6[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.0[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.1[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) ) apache2? ( =www-servers/apache-2* )
-DESCRIPTION=Icinga Web 2 - Frontend for icinga2
-EAPI=6
-HOMEPAGE=http://www.icinga.org/
-IUSE=apache2 ldap mysql nginx pdf postgres apache2
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/imagemagick[png] ) apache2? ( >=www-servers/apache-2.4.0 || ( dev-lang/php:5.6[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.0[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.1[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) ) nginx? ( >=www-servers/nginx-1.7.0:* || ( dev-lang/php:5.6[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.0[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.1[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) ) apache2? ( =www-servers/apache-2* )
-REQUIRED_USE=^^ ( apache2 nginx )
-SLOT=0
-SRC_URI=https://codeload.github.com/Icinga/icingaweb2/tar.gz/v2.5.1 -> icingaweb2-2.5.1.tar.gz
-_eclasses_=depend.apache	0917334d570e07f9743a04ff85b3bf1b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=872bd6032b37e799e15055600a33ac73
diff --git a/metadata/md5-cache/www-apps/icingaweb2-2.5.2 b/metadata/md5-cache/www-apps/icingaweb2-2.5.2
deleted file mode 100644
index d8c616d0aa95..000000000000
--- a/metadata/md5-cache/www-apps/icingaweb2-2.5.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=config install postinst setup
-DEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/imagemagick[png] ) apache2? ( >=www-servers/apache-2.4.0 || ( dev-lang/php:5.6[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.0[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.1[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) ) nginx? ( >=www-servers/nginx-1.7.0:* || ( dev-lang/php:5.6[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.0[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.1[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) ) apache2? ( =www-servers/apache-2* )
-DESCRIPTION=Icinga Web 2 - Frontend for icinga2
-EAPI=6
-HOMEPAGE=http://www.icinga.org/
-IUSE=apache2 ldap mysql nginx pdf postgres apache2
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/imagemagick[png] ) apache2? ( >=www-servers/apache-2.4.0 || ( dev-lang/php:5.6[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.0[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.1[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) ) nginx? ( >=www-servers/nginx-1.7.0:* || ( dev-lang/php:5.6[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.0[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.1[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) ) apache2? ( =www-servers/apache-2* )
-REQUIRED_USE=^^ ( apache2 nginx )
-SLOT=0
-SRC_URI=https://codeload.github.com/Icinga/icingaweb2/tar.gz/v2.5.2 -> icingaweb2-2.5.2.tar.gz
-_eclasses_=depend.apache	0917334d570e07f9743a04ff85b3bf1b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a06ad82c86b12f897900228a335e4cd3
diff --git a/metadata/md5-cache/www-apps/icingaweb2-2.5.3 b/metadata/md5-cache/www-apps/icingaweb2-2.5.3
index de5ce484e750..2e8aa29f94de 100644
--- a/metadata/md5-cache/www-apps/icingaweb2-2.5.3
+++ b/metadata/md5-cache/www-apps/icingaweb2-2.5.3
@@ -4,11 +4,11 @@ DESCRIPTION=Icinga Web 2 - Frontend for icinga2
 EAPI=6
 HOMEPAGE=http://www.icinga.org/
 IUSE=apache2 ldap mysql nginx pdf postgres apache2
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/imagemagick[png] ) apache2? ( >=www-servers/apache-2.4.0 || ( dev-lang/php:5.6[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.0[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.1[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) ) nginx? ( >=www-servers/nginx-1.7.0:* || ( dev-lang/php:5.6[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.0[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.1[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) ) apache2? ( =www-servers/apache-2* )
 REQUIRED_USE=^^ ( apache2 nginx )
 SLOT=0
 SRC_URI=https://codeload.github.com/Icinga/icingaweb2/tar.gz/v2.5.3 -> icingaweb2-2.5.3.tar.gz
 _eclasses_=depend.apache	0917334d570e07f9743a04ff85b3bf1b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a06ad82c86b12f897900228a335e4cd3
+_md5_=872bd6032b37e799e15055600a33ac73
diff --git a/metadata/md5-cache/www-apps/icingaweb2-module-graphite-1.0.1 b/metadata/md5-cache/www-apps/icingaweb2-module-graphite-1.0.1
new file mode 100644
index 000000000000..46506da87b6b
--- /dev/null
+++ b/metadata/md5-cache/www-apps/icingaweb2-module-graphite-1.0.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=>=net-analyzer/icinga2-2.4.0 >=www-apps/icingaweb2-2.5.0
+DESCRIPTION=Icinga Web 2 plugin for pnp4nagios
+EAPI=6
+HOMEPAGE=http://www.icinga.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=net-analyzer/icinga2-2.4.0 >=www-apps/icingaweb2-2.5.0
+SLOT=0
+SRC_URI=https://codeload.github.com/Icinga/icingaweb2-module-pnp/tar.gz/v1.0.1 -> icingaweb2-module-graphite-1.0.1.tar.gz
+_md5_=38fea1c5150122da24cd66984317477e
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 6435beef4852..7a11f81dbbb3 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/firefox-60.0 b/metadata/md5-cache/www-client/firefox-60.0
deleted file mode 100644
index 0d57c5ae2e9b..000000000000
--- a/metadata/md5-cache/www-client/firefox-60.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
-DEPEND=system-icu? ( >=dev-libs/icu-60.2 ) jack? ( virtual/jack ) >=dev-libs/nss-3.36.1 >=dev-libs/nspr-4.19 selinux? ( sec-policy/selinux-mozilla ) >=sys-devel/llvm-4.0.1 >=sys-devel/clang-4.0.1 amd64? ( >=dev-lang/yasm-1.1 virtual/opengl ) x86? ( >=dev-lang/yasm-1.1 virtual/opengl ) >=sys-apps/sed-4 virtual/pkgconfig || ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,sqlite,ssl,threads] ) app-arch/zip app-arch/unzip >=sys-devel/binutils-2.16.1 sys-apps/findutils pulseaudio? ( media-sound/pulseaudio ) || ( ( >=dev-lang/rust-1.24.0[-extended(-)] >=dev-util/cargo-0.25.0 ) >=dev-lang/rust-1.24.0[extended] ( >=dev-lang/rust-bin-1.24.0 >=dev-util/cargo-0.25.0 ) ) >=app-text/hunspell-1.5.4:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.34:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10 virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-icu? ( >=dev-libs/icu-59.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.20.1:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.4.2:0= >=media-gfx/graphite2-1.3.9-r1 ) >=x11-libs/gtk+-3.4.0:3 wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 app-arch/unzip
-DESCRIPTION=Firefox Web Browser
-EAPI=6
-HOMEPAGE=http://www.mozilla.com/firefox
-IUSE=bindist eme-free +gmp-autoupdate hardened hwaccel jack +screenshot selinux test custom-cflags custom-optimization dbus debug neon pulseaudio selinux startup-notification system-harfbuzz system-icu system-jpeg system-libevent system-sqlite system-libvpx wifi l10n_ach l10n_af l10n_an l10n_ar l10n_as l10n_ast l10n_az l10n_bg l10n_bn-BD l10n_bn-IN l10n_br l10n_bs l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-GB l10n_en-ZA l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mai l10n_mk l10n_ml l10n_mr l10n_ms l10n_nb l10n_nl l10n_nn l10n_or l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW
-KEYWORDS=~amd64 ~x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=system-icu? ( >=dev-libs/icu-60.2 ) jack? ( virtual/jack ) >=dev-libs/nss-3.36.1 >=dev-libs/nspr-4.19 selinux? ( sec-policy/selinux-mozilla ) >=app-text/hunspell-1.5.4:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.34:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10 virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-icu? ( >=dev-libs/icu-59.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.20.1:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.4.2:0= >=media-gfx/graphite2-1.3.9-r1 ) >=x11-libs/gtk+-3.4.0:3 wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) selinux? ( sec-policy/selinux-mozilla )
-RESTRICT=!bindist? ( bindist )
-SLOT=0
-SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/ach.xpi -> firefox-60.0-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/af.xpi -> firefox-60.0-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/an.xpi -> firefox-60.0-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/ar.xpi -> firefox-60.0-ar.xpi ) l10n_as? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/as.xpi -> firefox-60.0-as.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/ast.xpi -> firefox-60.0-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/az.xpi -> firefox-60.0-az.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/bg.xpi -> firefox-60.0-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/bn-BD.xpi -> firefox-60.0-bn-BD.xpi ) l10n_bn-IN? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/bn-IN.xpi -> firefox-60.0-bn-IN.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/br.xpi -> firefox-60.0-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/bs.xpi -> firefox-60.0-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/ca.xpi -> firefox-60.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/cak.xpi -> firefox-60.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/cs.xpi -> firefox-60.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/cy.xpi -> firefox-60.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/da.xpi -> firefox-60.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/de.xpi -> firefox-60.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/dsb.xpi -> firefox-60.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/el.xpi -> firefox-60.0-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/en-GB.xpi -> firefox-60.0-en-GB.xpi ) l10n_en-ZA? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/en-ZA.xpi -> firefox-60.0-en-ZA.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/eo.xpi -> firefox-60.0-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/es-AR.xpi -> firefox-60.0-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/es-CL.xpi -> firefox-60.0-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/es-ES.xpi -> firefox-60.0-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/es-MX.xpi -> firefox-60.0-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/et.xpi -> firefox-60.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/eu.xpi -> firefox-60.0-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/fa.xpi -> firefox-60.0-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/ff.xpi -> firefox-60.0-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/fi.xpi -> firefox-60.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/fr.xpi -> firefox-60.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/fy-NL.xpi -> firefox-60.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/ga-IE.xpi -> firefox-60.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/gd.xpi -> firefox-60.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/gl.xpi -> firefox-60.0-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/gn.xpi -> firefox-60.0-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/gu-IN.xpi -> firefox-60.0-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/he.xpi -> firefox-60.0-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/hi-IN.xpi -> firefox-60.0-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/hr.xpi -> firefox-60.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/hsb.xpi -> firefox-60.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/hu.xpi -> firefox-60.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/hy-AM.xpi -> firefox-60.0-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/id.xpi -> firefox-60.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/is.xpi -> firefox-60.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/it.xpi -> firefox-60.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/ja.xpi -> firefox-60.0-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/ka.xpi -> firefox-60.0-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/kab.xpi -> firefox-60.0-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/kk.xpi -> firefox-60.0-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/km.xpi -> firefox-60.0-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/kn.xpi -> firefox-60.0-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/ko.xpi -> firefox-60.0-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/lij.xpi -> firefox-60.0-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/lt.xpi -> firefox-60.0-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/lv.xpi -> firefox-60.0-lv.xpi ) l10n_mai? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/mai.xpi -> firefox-60.0-mai.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/mk.xpi -> firefox-60.0-mk.xpi ) l10n_ml? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/ml.xpi -> firefox-60.0-ml.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/mr.xpi -> firefox-60.0-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/ms.xpi -> firefox-60.0-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/nb-NO.xpi -> firefox-60.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/nl.xpi -> firefox-60.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/nn-NO.xpi -> firefox-60.0-nn-NO.xpi ) l10n_or? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/or.xpi -> firefox-60.0-or.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/pa-IN.xpi -> firefox-60.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/pl.xpi -> firefox-60.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/pt-BR.xpi -> firefox-60.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/pt-PT.xpi -> firefox-60.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/rm.xpi -> firefox-60.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/ro.xpi -> firefox-60.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/ru.xpi -> firefox-60.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/si.xpi -> firefox-60.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/sk.xpi -> firefox-60.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/sl.xpi -> firefox-60.0-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/son.xpi -> firefox-60.0-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/sq.xpi -> firefox-60.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/sr.xpi -> firefox-60.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/sv-SE.xpi -> firefox-60.0-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/ta.xpi -> firefox-60.0-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/te.xpi -> firefox-60.0-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/th.xpi -> firefox-60.0-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/tr.xpi -> firefox-60.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/uk.xpi -> firefox-60.0-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/uz.xpi -> firefox-60.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/vi.xpi -> firefox-60.0-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/xh.xpi -> firefox-60.0-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/zh-CN.xpi -> firefox-60.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xpi/zh-TW.xpi -> firefox-60.0-zh-TW.xpi ) https://archive.mozilla.org/pub/firefox/releases/60.0/source/firefox-60.0.source.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-60.0-patches-01.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-60.0-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-60.0-patches-01.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	mozconfig-v6.60	f445ee9649de631c6db418eea26c1309	mozcoreconf-v6	f4fae1830a38e4942d970237883259fc	mozextension	89a560beaf496e7cb89f3d79d4aef09e	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=181c6032b31a4aa8811435fb23a12ae8
diff --git a/metadata/md5-cache/www-client/firefox-60.0.1 b/metadata/md5-cache/www-client/firefox-60.0.1
new file mode 100644
index 000000000000..e9d2bc5cda32
--- /dev/null
+++ b/metadata/md5-cache/www-client/firefox-60.0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
+DEPEND=system-icu? ( >=dev-libs/icu-60.2 ) jack? ( virtual/jack ) >=dev-libs/nss-3.36.1 >=dev-libs/nspr-4.19 selinux? ( sec-policy/selinux-mozilla ) >=sys-devel/llvm-4.0.1 >=sys-devel/clang-4.0.1 amd64? ( >=dev-lang/yasm-1.1 virtual/opengl ) x86? ( >=dev-lang/yasm-1.1 virtual/opengl ) >=sys-apps/sed-4 virtual/pkgconfig || ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,sqlite,ssl,threads] ) app-arch/zip app-arch/unzip >=sys-devel/binutils-2.16.1 sys-apps/findutils pulseaudio? ( media-sound/pulseaudio ) elibc_glibc? ( || ( ( >=dev-lang/rust-1.24.0[-extended(-)] >=dev-util/cargo-0.25.0 ) >=dev-lang/rust-1.24.0[extended] ( >=dev-lang/rust-bin-1.24.0 >=dev-util/cargo-0.25.0 ) ) ) elibc_musl? ( || ( >=dev-lang/rust-1.24.0 >=dev-util/cargo-0.25.0 ) ) >=app-text/hunspell-1.5.4:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.34:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10 virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-icu? ( >=dev-libs/icu-59.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.20.1:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.4.2:0= >=media-gfx/graphite2-1.3.9-r1 ) >=x11-libs/gtk+-3.4.0:3 wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 app-arch/unzip
+DESCRIPTION=Firefox Web Browser
+EAPI=6
+HOMEPAGE=http://www.mozilla.com/firefox
+IUSE=bindist eme-free +gmp-autoupdate hardened hwaccel jack +screenshot selinux test custom-cflags custom-optimization dbus debug neon pulseaudio selinux startup-notification system-harfbuzz system-icu system-jpeg system-libevent system-sqlite system-libvpx wifi l10n_ach l10n_af l10n_an l10n_ar l10n_as l10n_ast l10n_az l10n_bg l10n_bn-BD l10n_bn-IN l10n_br l10n_bs l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-GB l10n_en-ZA l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mai l10n_mk l10n_ml l10n_mr l10n_ms l10n_nb l10n_nl l10n_nn l10n_or l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW
+KEYWORDS=~amd64 ~x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=system-icu? ( >=dev-libs/icu-60.2 ) jack? ( virtual/jack ) >=dev-libs/nss-3.36.1 >=dev-libs/nspr-4.19 selinux? ( sec-policy/selinux-mozilla ) >=app-text/hunspell-1.5.4:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.34:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10 virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-icu? ( >=dev-libs/icu-59.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.20.1:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.4.2:0= >=media-gfx/graphite2-1.3.9-r1 ) >=x11-libs/gtk+-3.4.0:3 wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) selinux? ( sec-policy/selinux-mozilla )
+RESTRICT=!bindist? ( bindist )
+SLOT=0
+SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/ach.xpi -> firefox-60.0.1-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/af.xpi -> firefox-60.0.1-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/an.xpi -> firefox-60.0.1-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/ar.xpi -> firefox-60.0.1-ar.xpi ) l10n_as? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/as.xpi -> firefox-60.0.1-as.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/ast.xpi -> firefox-60.0.1-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/az.xpi -> firefox-60.0.1-az.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/bg.xpi -> firefox-60.0.1-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/bn-BD.xpi -> firefox-60.0.1-bn-BD.xpi ) l10n_bn-IN? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/bn-IN.xpi -> firefox-60.0.1-bn-IN.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/br.xpi -> firefox-60.0.1-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/bs.xpi -> firefox-60.0.1-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/ca.xpi -> firefox-60.0.1-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/cak.xpi -> firefox-60.0.1-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/cs.xpi -> firefox-60.0.1-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/cy.xpi -> firefox-60.0.1-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/da.xpi -> firefox-60.0.1-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/de.xpi -> firefox-60.0.1-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/dsb.xpi -> firefox-60.0.1-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/el.xpi -> firefox-60.0.1-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/en-GB.xpi -> firefox-60.0.1-en-GB.xpi ) l10n_en-ZA? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/en-ZA.xpi -> firefox-60.0.1-en-ZA.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/eo.xpi -> firefox-60.0.1-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/es-AR.xpi -> firefox-60.0.1-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/es-CL.xpi -> firefox-60.0.1-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/es-ES.xpi -> firefox-60.0.1-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/es-MX.xpi -> firefox-60.0.1-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/et.xpi -> firefox-60.0.1-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/eu.xpi -> firefox-60.0.1-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/fa.xpi -> firefox-60.0.1-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/ff.xpi -> firefox-60.0.1-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/fi.xpi -> firefox-60.0.1-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/fr.xpi -> firefox-60.0.1-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/fy-NL.xpi -> firefox-60.0.1-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/ga-IE.xpi -> firefox-60.0.1-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/gd.xpi -> firefox-60.0.1-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/gl.xpi -> firefox-60.0.1-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/gn.xpi -> firefox-60.0.1-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/gu-IN.xpi -> firefox-60.0.1-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/he.xpi -> firefox-60.0.1-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/hi-IN.xpi -> firefox-60.0.1-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/hr.xpi -> firefox-60.0.1-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/hsb.xpi -> firefox-60.0.1-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/hu.xpi -> firefox-60.0.1-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/hy-AM.xpi -> firefox-60.0.1-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/id.xpi -> firefox-60.0.1-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/is.xpi -> firefox-60.0.1-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/it.xpi -> firefox-60.0.1-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/ja.xpi -> firefox-60.0.1-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/ka.xpi -> firefox-60.0.1-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/kab.xpi -> firefox-60.0.1-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/kk.xpi -> firefox-60.0.1-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/km.xpi -> firefox-60.0.1-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/kn.xpi -> firefox-60.0.1-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/ko.xpi -> firefox-60.0.1-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/lij.xpi -> firefox-60.0.1-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/lt.xpi -> firefox-60.0.1-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/lv.xpi -> firefox-60.0.1-lv.xpi ) l10n_mai? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/mai.xpi -> firefox-60.0.1-mai.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/mk.xpi -> firefox-60.0.1-mk.xpi ) l10n_ml? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/ml.xpi -> firefox-60.0.1-ml.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/mr.xpi -> firefox-60.0.1-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/ms.xpi -> firefox-60.0.1-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/nb-NO.xpi -> firefox-60.0.1-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/nl.xpi -> firefox-60.0.1-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/nn-NO.xpi -> firefox-60.0.1-nn-NO.xpi ) l10n_or? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/or.xpi -> firefox-60.0.1-or.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/pa-IN.xpi -> firefox-60.0.1-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/pl.xpi -> firefox-60.0.1-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/pt-BR.xpi -> firefox-60.0.1-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/pt-PT.xpi -> firefox-60.0.1-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/rm.xpi -> firefox-60.0.1-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/ro.xpi -> firefox-60.0.1-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/ru.xpi -> firefox-60.0.1-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/si.xpi -> firefox-60.0.1-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/sk.xpi -> firefox-60.0.1-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/sl.xpi -> firefox-60.0.1-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/son.xpi -> firefox-60.0.1-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/sq.xpi -> firefox-60.0.1-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/sr.xpi -> firefox-60.0.1-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/sv-SE.xpi -> firefox-60.0.1-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/ta.xpi -> firefox-60.0.1-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/te.xpi -> firefox-60.0.1-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/th.xpi -> firefox-60.0.1-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/tr.xpi -> firefox-60.0.1-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/uk.xpi -> firefox-60.0.1-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/uz.xpi -> firefox-60.0.1-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/vi.xpi -> firefox-60.0.1-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/xh.xpi -> firefox-60.0.1-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/zh-CN.xpi -> firefox-60.0.1-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xpi/zh-TW.xpi -> firefox-60.0.1-zh-TW.xpi ) https://archive.mozilla.org/pub/firefox/releases/60.0.1/source/firefox-60.0.1.source.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-60.0-patches-02.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-60.0-patches-02.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-60.0-patches-02.tar.xz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	mozconfig-v6.60	6e50ef9c43ba6d6a8edb89393ad56ad0	mozcoreconf-v6	f4fae1830a38e4942d970237883259fc	mozextension	89a560beaf496e7cb89f3d79d4aef09e	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c98a9a31ee10ef6477df09db596a4801
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-67.0.3396.48 b/metadata/md5-cache/www-client/google-chrome-beta-67.0.3396.56
index 714f16663174..77ed49257082 100644
--- a/metadata/md5-cache/www-client/google-chrome-beta-67.0.3396.48
+++ b/metadata/md5-cache/www-client/google-chrome-beta-67.0.3396.56
@@ -9,6 +9,6 @@ LICENSE=google-chrome
 RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 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_67.0.3396.48-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_67.0.3396.56-1_amd64.deb
 _eclasses_=chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	fa02994d0beba88681127d93da4411ec	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8a2fdea3123145b076af657b483bb997
diff --git a/metadata/md5-cache/www-client/opera-beta-53.0.2907.31 b/metadata/md5-cache/www-client/opera-beta-54.0.2952.8
index cdaef51a7534..5abb55d08a67 100644
--- a/metadata/md5-cache/www-client/opera-beta-53.0.2907.31
+++ b/metadata/md5-cache/www-client/opera-beta-54.0.2952.8
@@ -8,6 +8,6 @@ KEYWORDS=~amd64
 LICENSE=OPERA-2014
 RDEPEND=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 net-misc/curl net-print/cups sys-apps/dbus 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/libnotify x11-libs/pango[X]
 SLOT=0
-SRC_URI=amd64? ( http://download1.operacdn.com/pub/opera-beta/53.0.2907.31/linux/opera-beta_53.0.2907.31_amd64.deb http://download2.operacdn.com/pub/opera-beta/53.0.2907.31/linux/opera-beta_53.0.2907.31_amd64.deb http://download3.operacdn.com/pub/opera-beta/53.0.2907.31/linux/opera-beta_53.0.2907.31_amd64.deb http://download4.operacdn.com/pub/opera-beta/53.0.2907.31/linux/opera-beta_53.0.2907.31_amd64.deb )
+SRC_URI=amd64? ( http://download1.operacdn.com/pub/opera-beta/54.0.2952.8/linux/opera-beta_54.0.2952.8_amd64.deb http://download2.operacdn.com/pub/opera-beta/54.0.2952.8/linux/opera-beta_54.0.2952.8_amd64.deb http://download3.operacdn.com/pub/opera-beta/54.0.2952.8/linux/opera-beta_54.0.2952.8_amd64.deb http://download4.operacdn.com/pub/opera-beta/54.0.2952.8/linux/opera-beta_54.0.2952.8_amd64.deb )
 _eclasses_=chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=70606416ac2911b0691c3d0d0018e07a
diff --git a/metadata/md5-cache/www-client/seamonkey-2.49.8.0_p0 b/metadata/md5-cache/www-client/seamonkey-2.49.8.0_p0
new file mode 100644
index 000000000000..875d7854a132
--- /dev/null
+++ b/metadata/md5-cache/www-client/seamonkey-2.49.8.0_p0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup unpack
+DEPEND=>=dev-libs/nss-3.28.3 >=dev-libs/nspr-4.13.1 jack? ( virtual/jack ) crypt? ( >=x11-plugins/enigmail-2.0.5 ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( dev-libs/libexecinfo ) ) ) amd64? ( >=dev-lang/yasm-1.1 virtual/opengl ) x86? ( >=dev-lang/yasm-1.1 virtual/opengl ) virtual/pkgconfig || ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,sqlite,ssl,threads] ) app-arch/zip app-arch/unzip >=sys-devel/binutils-2.16.1 sys-apps/findutils pulseaudio? ( media-sound/pulseaudio ) >=app-text/hunspell-1.2:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.25:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10 virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-cairo? ( >=x11-libs/cairo-1.12[X,xcb] >=x11-libs/pixman-0.19.2 ) system-icu? ( >=dev-libs/icu-58.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.17.0:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.3.3:0= >=media-gfx/graphite2-1.3.8 ) force-gtk3? ( >=x11-libs/gtk+-3.4.0:3 ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 app-arch/unzip
+DESCRIPTION=Seamonkey Web Browser
+EAPI=6
+HOMEPAGE=http://www.seamonkey-project.org
+IUSE=+calendar +chatzilla +crypt +gmp-autoupdate +ipc jack minimal pulseaudio +roaming selinux test custom-cflags custom-optimization dbus debug +jemalloc neon pulseaudio selinux startup-notification system-cairo system-harfbuzz system-icu system-jpeg system-libevent system-sqlite system-libvpx force-gtk3 wifi l10n_cs l10n_de l10n_en-GB l10n_es-AR l10n_es-ES l10n_fr l10n_hu l10n_it l10n_ja l10n_lt l10n_nl l10n_pl l10n_pt-PT l10n_ru l10n_sk l10n_sv l10n_zh-CN l10n_zh-TW
+KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=>=dev-libs/nss-3.28.3 >=dev-libs/nspr-4.13.1 jack? ( virtual/jack ) crypt? ( >=x11-plugins/enigmail-2.0.5 ) >=app-text/hunspell-1.2:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.25:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10 virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-cairo? ( >=x11-libs/cairo-1.12[X,xcb] >=x11-libs/pixman-0.19.2 ) system-icu? ( >=dev-libs/icu-58.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.17.0:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.3.3:0= >=media-gfx/graphite2-1.3.8 ) force-gtk3? ( >=x11-libs/gtk+-3.4.0:3 ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) selinux? ( sec-policy/selinux-mozilla )
+SLOT=0
+SRC_URI=https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/source/thunderbird-52.8.0.source.tar.xz https://hg.mozilla.org/chatzilla/archive/SEA2_48_RELBRANCH.tar.bz2 -> chatzilla-SEA2_48_RELBRANCH.tar.bz2 https://hg.mozilla.org/dom-inspector/archive/DOMI_2_0_17.tar.bz2 -> dom-inspector-DOMI_2_0_17.tar.bz2 l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/cs.xpi -> seamonkey-2.49.8.0-cs.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/de.xpi -> seamonkey-2.49.8.0-de.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/en-GB.xpi -> seamonkey-2.49.8.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/es-AR.xpi -> seamonkey-2.49.8.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/es-ES.xpi -> seamonkey-2.49.8.0-es-ES.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/fr.xpi -> seamonkey-2.49.8.0-fr.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/hu.xpi -> seamonkey-2.49.8.0-hu.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/it.xpi -> seamonkey-2.49.8.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/ja.xpi -> seamonkey-2.49.8.0-ja.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/lt.xpi -> seamonkey-2.49.8.0-lt.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/nl.xpi -> seamonkey-2.49.8.0-nl.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/pl.xpi -> seamonkey-2.49.8.0-pl.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/pt-PT.xpi -> seamonkey-2.49.8.0-pt-PT.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/ru.xpi -> seamonkey-2.49.8.0-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/sk.xpi -> seamonkey-2.49.8.0-sk.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/sv-SE.xpi -> seamonkey-2.49.8.0-sv-SE.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/zh-CN.xpi -> seamonkey-2.49.8.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/52.8.0/../../../seamonkey/releases/2.49.1/linux-i686/xpi/zh-TW.xpi -> seamonkey-2.49.8.0-zh-TW.xpi ) https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-52.4-patches-02.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-52.4-patches-02.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-52.4-patches-02.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/seamonkey-2.46-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/seamonkey-2.46-patches-01.tar.xz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	mozconfig-v6.52	aeba761913d03fc45f4d6ae2b89165ca	mozcoreconf-v5	602c3c0a642bafeabb149c49a6df941f	mozextension	89a560beaf496e7cb89f3d79d4aef09e	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=2444c30a567b0547599a17e0d1e671b8
diff --git a/metadata/md5-cache/www-plugins/Manifest.gz b/metadata/md5-cache/www-plugins/Manifest.gz
index dac6d9dc464c..990776da09b6 100644
--- a/metadata/md5-cache/www-plugins/Manifest.gz
+++ b/metadata/md5-cache/www-plugins/Manifest.gz
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-67.0.3396.48_beta b/metadata/md5-cache/www-plugins/chrome-binary-plugins-67.0.3396.56_beta
index a184059b5158..e0a59d454cb4 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-67.0.3396.48_beta
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-67.0.3396.56_beta
@@ -8,6 +8,6 @@ LICENSE=google-chrome
 RDEPEND=widevine? ( !<www-client/chromium-57[widevine(-)] ) !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:stable !www-plugins/chrome-binary-plugins:unstable
 RESTRICT=bindist mirror strip
 SLOT=beta
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_67.0.3396.48-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_67.0.3396.56-1_amd64.deb
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
 _md5_=7131ce27f785d7c907cab46d78451946
diff --git a/metadata/md5-cache/x11-apps/Manifest.gz b/metadata/md5-cache/x11-apps/Manifest.gz
index 6fe6f4a22e85..7f72654731e5 100644
--- a/metadata/md5-cache/x11-apps/Manifest.gz
+++ b/metadata/md5-cache/x11-apps/Manifest.gz
diff --git a/metadata/md5-cache/x11-apps/listres-1.0.3 b/metadata/md5-cache/x11-apps/listres-1.0.3
deleted file mode 100644
index c3119a2eb979..000000000000
--- a/metadata/md5-cache/x11-apps/listres-1.0.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libXaw >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=list resources in widgets
-EAPI=4
-HOMEPAGE=https://www.x.org/wiki/
-KEYWORDS=amd64 arm hppa ~mips ppc ppc64 s390 sh sparc x86
-LICENSE=MIT
-RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libXaw
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/listres-1.0.3.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	e6c67cb6104b30a51e5ceea5e9f741eb
-_md5_=6acdc149e03c92616a032fab43fd7caa
diff --git a/metadata/md5-cache/x11-apps/oclock-1.0.3 b/metadata/md5-cache/x11-apps/oclock-1.0.3
deleted file mode 100644
index f078aff9c894..000000000000
--- a/metadata/md5-cache/x11-apps/oclock-1.0.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt x11-libs/libxkbfile >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=round X clock
-EAPI=4
-HOMEPAGE=https://www.x.org/wiki/
-KEYWORDS=alpha amd64 arm ~ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt x11-libs/libxkbfile
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/oclock-1.0.3.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	e6c67cb6104b30a51e5ceea5e9f741eb
-_md5_=69018dfd586151d46c08cbd565ce673b
diff --git a/metadata/md5-cache/x11-apps/setxkbmap-1.3.0 b/metadata/md5-cache/x11-apps/setxkbmap-1.3.0
deleted file mode 100644
index 25f02782c697..000000000000
--- a/metadata/md5-cache/x11-apps/setxkbmap-1.3.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libxkbfile x11-libs/libX11 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=Controls the keyboard layout of a running X server
-EAPI=4
-HOMEPAGE=https://www.x.org/wiki/
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=x11-misc/xkeyboard-config
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/setxkbmap-1.3.0.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	e6c67cb6104b30a51e5ceea5e9f741eb
-_md5_=92f9aebd9d469544b6ae33a37b5491f9
diff --git a/metadata/md5-cache/x11-apps/smproxy-1.0.5 b/metadata/md5-cache/x11-apps/smproxy-1.0.5
deleted file mode 100644
index a4af46f1fc40..000000000000
--- a/metadata/md5-cache/x11-apps/smproxy-1.0.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libXt x11-libs/libXmu >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=Session Manager Proxy
-EAPI=4
-HOMEPAGE=https://www.x.org/wiki/
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=MIT
-RDEPEND=x11-libs/libXt x11-libs/libXmu
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/smproxy-1.0.5.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	e6c67cb6104b30a51e5ceea5e9f741eb
-_md5_=142d7281d37220b365956c0bb0b23bef
diff --git a/metadata/md5-cache/x11-apps/x11perf-1.5.4 b/metadata/md5-cache/x11-apps/x11perf-1.5.4
deleted file mode 100644
index b63f0a3fc3f8..000000000000
--- a/metadata/md5-cache/x11-apps/x11perf-1.5.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXft x11-libs/libXrender x11-libs/libXext >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=X rendering operation stress test utility
-EAPI=4
-HOMEPAGE=https://www.x.org/wiki/
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=MIT
-RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXft x11-libs/libXrender x11-libs/libXext
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/x11perf-1.5.4.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	e6c67cb6104b30a51e5ceea5e9f741eb
-_md5_=42a000dfa406000c0e0e19a96adc4630
diff --git a/metadata/md5-cache/x11-apps/xcmsdb-1.0.4 b/metadata/md5-cache/x11-apps/xcmsdb-1.0.4
deleted file mode 100644
index 62248a155a13..000000000000
--- a/metadata/md5-cache/x11-apps/xcmsdb-1.0.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=Device Color Characterization utility for X Color Management System
-EAPI=4
-HOMEPAGE=https://www.x.org/wiki/
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=MIT
-RDEPEND=x11-libs/libX11
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/xcmsdb-1.0.4.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	e6c67cb6104b30a51e5ceea5e9f741eb
-_md5_=8a08e901f611f56eb5df98cc08b17284
diff --git a/metadata/md5-cache/x11-apps/xgamma-1.0.5 b/metadata/md5-cache/x11-apps/xgamma-1.0.5
deleted file mode 100644
index 501b446cc4ba..000000000000
--- a/metadata/md5-cache/x11-apps/xgamma-1.0.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libXxf86vm x11-libs/libX11 x11-base/xorg-proto >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=Alter a monitor's gamma correction through the X server
-EAPI=4
-HOMEPAGE=https://www.x.org/wiki/
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=MIT
-RDEPEND=x11-libs/libXxf86vm x11-libs/libX11
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/xgamma-1.0.5.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	e6c67cb6104b30a51e5ceea5e9f741eb
-_md5_=0c61f104db369b784642520d4c586b70
diff --git a/metadata/md5-cache/x11-apps/xkbevd-1.1.3 b/metadata/md5-cache/x11-apps/xkbevd-1.1.3
deleted file mode 100644
index 26c34d002edf..000000000000
--- a/metadata/md5-cache/x11-apps/xkbevd-1.1.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libxkbfile sys-devel/bison >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=XKB event daemon
-EAPI=4
-HOMEPAGE=https://www.x.org/wiki/
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=MIT
-RDEPEND=x11-libs/libX11 x11-libs/libxkbfile
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/xkbevd-1.1.3.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	e6c67cb6104b30a51e5ceea5e9f741eb
-_md5_=5bd381620553ee18191784fcf5d35b5c
diff --git a/metadata/md5-cache/x11-apps/xlsatoms-1.1.1 b/metadata/md5-cache/x11-apps/xlsatoms-1.1.1
deleted file mode 100644
index e6d0748d8f39..000000000000
--- a/metadata/md5-cache/x11-apps/xlsatoms-1.1.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libxcb >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=list interned atoms defined on server
-EAPI=4
-HOMEPAGE=https://www.x.org/wiki/
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=MIT
-RDEPEND=x11-libs/libxcb
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/xlsatoms-1.1.1.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	e6c67cb6104b30a51e5ceea5e9f741eb
-_md5_=2fed263a5f26d5e62eeb83f232198fa8
diff --git a/metadata/md5-cache/x11-apps/xlsclients-1.1.2 b/metadata/md5-cache/x11-apps/xlsclients-1.1.2
deleted file mode 100644
index 67bc8b2249ac..000000000000
--- a/metadata/md5-cache/x11-apps/xlsclients-1.1.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-libs/libxcb-1.7 >=x11-libs/xcb-util-0.3.8 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=X.Org xlsclients application
-EAPI=4
-HOMEPAGE=https://www.x.org/wiki/
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=MIT
-RDEPEND=>=x11-libs/libxcb-1.7 >=x11-libs/xcb-util-0.3.8
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/xlsclients-1.1.2.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	e6c67cb6104b30a51e5ceea5e9f741eb
-_md5_=d0050aad41a7523fe11bd1291a8e1356
diff --git a/metadata/md5-cache/x11-apps/xlsclients-1.1.3 b/metadata/md5-cache/x11-apps/xlsclients-1.1.3
deleted file mode 100644
index 69575e91785d..000000000000
--- a/metadata/md5-cache/x11-apps/xlsclients-1.1.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-libs/libxcb-1.7 >=x11-libs/xcb-util-0.3.8 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=X.Org xlsclients application
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=MIT
-RDEPEND=>=x11-libs/libxcb-1.7 >=x11-libs/xcb-util-0.3.8
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/xlsclients-1.1.3.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	e6c67cb6104b30a51e5ceea5e9f741eb
-_md5_=a18df85756a9ac37a879855db672c661
diff --git a/metadata/md5-cache/x11-apps/xlsfonts-1.0.4 b/metadata/md5-cache/x11-apps/xlsfonts-1.0.4
deleted file mode 100644
index ff480ba80d7b..000000000000
--- a/metadata/md5-cache/x11-apps/xlsfonts-1.0.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=X.Org xlsfonts application
-EAPI=4
-HOMEPAGE=https://www.x.org/wiki/
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=x11-libs/libX11
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/xlsfonts-1.0.4.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	e6c67cb6104b30a51e5ceea5e9f741eb
-_md5_=4a4a0417488bf248299f50d30def279d
diff --git a/metadata/md5-cache/x11-apps/xlsfonts-1.0.5 b/metadata/md5-cache/x11-apps/xlsfonts-1.0.5
deleted file mode 100644
index 6f02dcd6d925..000000000000
--- a/metadata/md5-cache/x11-apps/xlsfonts-1.0.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=X.Org xlsfonts application
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=x11-libs/libX11
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/xlsfonts-1.0.5.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	e6c67cb6104b30a51e5ceea5e9f741eb
-_md5_=a364e04fb4950f6d06e5878ab4ba9cc7
diff --git a/metadata/md5-cache/x11-apps/xpr-1.0.4 b/metadata/md5-cache/x11-apps/xpr-1.0.4
deleted file mode 100644
index b58395c8c8c1..000000000000
--- a/metadata/md5-cache/x11-apps/xpr-1.0.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libXmu x11-libs/libX11 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=X.Org xpr application
-EAPI=4
-HOMEPAGE=https://www.x.org/wiki/
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=MIT
-RDEPEND=x11-libs/libXmu x11-libs/libX11
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/xpr-1.0.4.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	e6c67cb6104b30a51e5ceea5e9f741eb
-_md5_=0089562904a8ddea23713d2796cec1ac
diff --git a/metadata/md5-cache/x11-apps/xvidtune-1.0.2-r1 b/metadata/md5-cache/x11-apps/xvidtune-1.0.2-r1
deleted file mode 100644
index bd460814f134..000000000000
--- a/metadata/md5-cache/x11-apps/xvidtune-1.0.2-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXxf86vm x11-base/xorg-proto >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=video mode tuner for Xorg
-EAPI=4
-HOMEPAGE=https://www.x.org/wiki/
-KEYWORDS=alpha amd64 arm hppa ~mips ppc ppc64 s390 sh sparc x86
-LICENSE=MIT
-RDEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXxf86vm
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/xvidtune-1.0.2.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	e6c67cb6104b30a51e5ceea5e9f741eb
-_md5_=a2a2baaa06df2a9817a8b33a88e35424
diff --git a/metadata/md5-cache/x11-apps/xwud-1.0.4 b/metadata/md5-cache/x11-apps/xwud-1.0.4
deleted file mode 100644
index 40bc1eca3eea..000000000000
--- a/metadata/md5-cache/x11-apps/xwud-1.0.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=image displayer for X
-EAPI=4
-HOMEPAGE=https://www.x.org/wiki/
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=MIT
-RDEPEND=x11-libs/libX11
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/xwud-1.0.4.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	e6c67cb6104b30a51e5ceea5e9f741eb
-_md5_=180f509ecc2c5dc725fd3da46c92fe48
diff --git a/metadata/md5-cache/x11-base/Manifest.gz b/metadata/md5-cache/x11-base/Manifest.gz
index 749b5ca966c4..4d18ec3e2675 100644
--- a/metadata/md5-cache/x11-base/Manifest.gz
+++ b/metadata/md5-cache/x11-base/Manifest.gz
diff --git a/metadata/md5-cache/x11-base/xorg-proto-2018.4 b/metadata/md5-cache/x11-base/xorg-proto-2018.4
index 7be422625149..71babc02cab7 100644
--- a/metadata/md5-cache/x11-base/xorg-proto-2018.4
+++ b/metadata/md5-cache/x11-base/xorg-proto-2018.4
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=!<x11-proto/bigreqsproto-1.1.2-r1 !<x11-proto/compositeproto-0.4.2-r2 !<x11-proto/damageproto-1.2.1-r2 !<x11-proto/dmxproto-2.3.1-r2 !<x11-proto/dri2proto-2.8-r2 !<x11-proto/dri3proto-1.0-r1 !<x11-proto/fixesproto-5.0-r2 !<x11-proto/fontsproto-2.1.3-r1 !<x11-proto/glproto-1.4.17-r2 !<x11-proto/inputproto-2.3.2-r1 !<x11-proto/kbproto-1.0.7-r1 !<x11-proto/presentproto-1.1-r1 !<x11-proto/randrproto-1.5.0-r1 !<x11-proto/recordproto-1.14.2-r2 !<x11-proto/renderproto-0.11.1-r2 !<x11-proto/resourceproto-1.2.0-r1 !<x11-proto/scrnsaverproto-1.2.2-r2 !<x11-proto/trapproto-3.4.3-r1 !<x11-proto/videoproto-2.3.3-r1 !<x11-proto/xcmiscproto-1.2.2-r1 !<x11-proto/xextproto-7.3.0-r1 !<x11-proto/xf86bigfontproto-1.2.0-r2 !<x11-proto/xf86dgaproto-2.1-r3 !<x11-proto/xf86driproto-2.1.1-r2 !<x11-proto/xf86miscproto-0.9.3-r1 !<x11-proto/xf86vidmodeproto-2.3.1-r2 !<x11-proto/xineramaproto-1.2.1-r2 !<x11-proto/xproto-7.0.31-r1 !x11-proto/fontcacheproto !x11-proto/xf86rushproto
 SLOT=0
 SRC_URI=https://xorg.freedesktop.org/archive/individual/proto/xorgproto-2018.4.tar.gz
-_eclasses_=meson	ecfaf615b512dc4ff2a50a35e6b26c09	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec
+_eclasses_=meson	53e3ab209402d5ad07a9c4580c423d1a	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec
 _md5_=c5125e074dca97e3b2d748f708622fe9
diff --git a/metadata/md5-cache/x11-base/xorg-proto-9999 b/metadata/md5-cache/x11-base/xorg-proto-9999
index b4cdd6b068e7..69780cdc1dcc 100644
--- a/metadata/md5-cache/x11-base/xorg-proto-9999
+++ b/metadata/md5-cache/x11-base/xorg-proto-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://cgit.freedesktop.org/xorg/proto/xorgproto/
 LICENSE=MIT
 RDEPEND=!<x11-proto/bigreqsproto-1.1.2-r1 !<x11-proto/compositeproto-0.4.2-r2 !<x11-proto/damageproto-1.2.1-r2 !<x11-proto/dmxproto-2.3.1-r2 !<x11-proto/dri2proto-2.8-r2 !<x11-proto/dri3proto-1.0-r1 !<x11-proto/fixesproto-5.0-r2 !<x11-proto/fontsproto-2.1.3-r1 !<x11-proto/glproto-1.4.17-r2 !<x11-proto/inputproto-2.3.2-r1 !<x11-proto/kbproto-1.0.7-r1 !<x11-proto/presentproto-1.1-r1 !<x11-proto/randrproto-1.5.0-r1 !<x11-proto/recordproto-1.14.2-r2 !<x11-proto/renderproto-0.11.1-r2 !<x11-proto/resourceproto-1.2.0-r1 !<x11-proto/scrnsaverproto-1.2.2-r2 !<x11-proto/trapproto-3.4.3-r1 !<x11-proto/videoproto-2.3.3-r1 !<x11-proto/xcmiscproto-1.2.2-r1 !<x11-proto/xextproto-7.3.0-r1 !<x11-proto/xf86bigfontproto-1.2.0-r2 !<x11-proto/xf86dgaproto-2.1-r3 !<x11-proto/xf86driproto-2.1.1-r2 !<x11-proto/xf86miscproto-0.9.3-r1 !<x11-proto/xf86vidmodeproto-2.3.1-r2 !<x11-proto/xineramaproto-1.2.1-r2 !<x11-proto/xproto-7.0.31-r1 !x11-proto/fontcacheproto !x11-proto/xf86rushproto
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	meson	ecfaf615b512dc4ff2a50a35e6b26c09	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	meson	53e3ab209402d5ad07a9c4580c423d1a	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec
 _md5_=35d5c853c132d3604ff515613bb427b2
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index 6bac977b1c08..e1b28eae7d74 100644
--- a/metadata/md5-cache/x11-drivers/Manifest.gz
+++ b/metadata/md5-cache/x11-drivers/Manifest.gz
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-mtrack-0.3.0 b/metadata/md5-cache/x11-drivers/xf86-input-mtrack-0.3.0
deleted file mode 100644
index f8a051bec6c7..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-input-mtrack-0.3.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=sys-libs/mtdev-1.0 x11-base/xorg-proto >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 virtual/pkgconfig x11-base/xorg-proto x11-base/xorg-server[xorg]
-DESCRIPTION=Xorg Driver for Multitouch Trackpads
-EAPI=4
-HOMEPAGE=https://github.com/BlueDragonX/xf86-input-mtrack
-IUSE=debug
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=>=sys-libs/mtdev-1.0 x11-base/xorg-server[xorg]
-SLOT=0
-SRC_URI=https://github.com/BlueDragonX/xf86-input-mtrack/tarball/v0.3.0 -> xf86-input-mtrack-0.3.0.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	xorg-2	e6c67cb6104b30a51e5ceea5e9f741eb
-_md5_=f86c4ea55ca5210954cbb9c71a9bfced
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-mtrack-0.3.1 b/metadata/md5-cache/x11-drivers/xf86-input-mtrack-0.3.1
deleted file mode 100644
index 8892b03f03c9..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-input-mtrack-0.3.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=sys-libs/mtdev-1.0 x11-base/xorg-proto >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 virtual/pkgconfig x11-base/xorg-proto x11-base/xorg-server[xorg]
-DESCRIPTION=Xorg Driver for Multitouch Trackpads
-EAPI=5
-HOMEPAGE=https://github.com/BlueDragonX/xf86-input-mtrack
-IUSE=debug
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=>=sys-libs/mtdev-1.0 x11-base/xorg-server:= x11-base/xorg-server[xorg]
-SLOT=0
-SRC_URI=https://github.com/BlueDragonX/xf86-input-mtrack/tarball/v0.3.1 -> xf86-input-mtrack-0.3.1.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	xorg-2	e6c67cb6104b30a51e5ceea5e9f741eb
-_md5_=834224fe487923b73a3af7f81b8a7f77
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-tslib-0.0.6-r2 b/metadata/md5-cache/x11-drivers/xf86-input-tslib-0.0.6-r2
deleted file mode 100644
index 7efcecd94a57..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-input-tslib-0.0.6-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/tslib x11-base/xorg-proto >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-base/xorg-proto x11-base/xorg-server[xorg]
-DESCRIPTION=xorg input driver for use of tslib based touchscreen devices
-EAPI=4
-HOMEPAGE=http://www.pengutronix.de/software/xf86-input-tslib/index_en.html
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/tslib x11-base/xorg-server[xorg]
-SLOT=0
-SRC_URI=ftp://cdn.debian.net/debian/pool/main/x/xf86-input-tslib/xf86-input-tslib_0.0.6-3.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	e6c67cb6104b30a51e5ceea5e9f741eb
-_md5_=a444d84d17e00c40ce41a0c51a34dd6a
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-void-1.4.0 b/metadata/md5-cache/x11-drivers/xf86-input-void-1.4.0
deleted file mode 100644
index 9bda5d88c04c..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-input-void-1.4.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-base/xorg-server-1.9.99.1 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-base/xorg-proto x11-base/xorg-server[xorg]
-DESCRIPTION=null input driver
-EAPI=4
-HOMEPAGE=https://www.x.org/wiki/
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=>=x11-base/xorg-server-1.9.99.1 x11-base/xorg-server[xorg]
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/driver/xf86-input-void-1.4.0.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	e6c67cb6104b30a51e5ceea5e9f741eb
-_md5_=629b7434ee4d53cb8e1684276accc1e6
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-dummy-0.3.6 b/metadata/md5-cache/x11-drivers/xf86-video-dummy-0.3.6
deleted file mode 100644
index 065f8f86e91e..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-video-dummy-0.3.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 dga? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-base/xorg-proto x11-base/xorg-server[xorg] x11-libs/libpciaccess
-DESCRIPTION=X.Org driver for dummy cards
-EAPI=4
-HOMEPAGE=https://www.x.org/wiki/
-IUSE=dga
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-dummy-0.3.6.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	e6c67cb6104b30a51e5ceea5e9f741eb
-_md5_=dc66fa701aea0d748fac4422bce88627
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-dummy-0.3.7 b/metadata/md5-cache/x11-drivers/xf86-video-dummy-0.3.7
deleted file mode 100644
index ad81471bbd19..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-video-dummy-0.3.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=x11-base/xorg-server-1.0.99 dga? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-base/xorg-proto x11-base/xorg-server[xorg] x11-libs/libpciaccess
-DESCRIPTION=X.Org driver for dummy cards
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/
-IUSE=dga
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server:= x11-base/xorg-server[xorg] x11-libs/libpciaccess
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-dummy-0.3.7.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	e6c67cb6104b30a51e5ceea5e9f741eb
-_md5_=18b779f25c7beb9122a8d22c1c557e2d
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-newport-0.2.3 b/metadata/md5-cache/x11-drivers/xf86-video-newport-0.2.3
deleted file mode 100644
index ec4aac7df9c9..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-video-newport-0.2.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-base/xorg-proto x11-base/xorg-server[xorg] x11-libs/libpciaccess
-DESCRIPTION=Newport video driver
-EAPI=4
-HOMEPAGE=https://www.x.org/wiki/
-KEYWORDS=-* ~mips
-LICENSE=MIT
-RDEPEND=x11-base/xorg-server[xorg] x11-libs/libpciaccess
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-newport-0.2.3.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	e6c67cb6104b30a51e5ceea5e9f741eb
-_md5_=437889a98a4ffc55c1ecccf9bb84e0e1
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index ed801bc83f67..be95ca019129 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/gtkglext-1.2.0-r4 b/metadata/md5-cache/x11-libs/gtkglext-1.2.0-r4
index a564902b85f0..2fdb168703c1 100644
--- a/metadata/md5-cache/x11-libs/gtkglext-1.2.0-r4
+++ b/metadata/md5-cache/x11-libs/gtkglext-1.2.0-r4
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=>=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(-)?] >=x11-libs/gtk+-2.24.23: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/pango-1.36.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/pangox-compat-0.0.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/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/libXmu-1.1.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/glu-9.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/autoconf-archive-2014.02.28 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=GL extensions for Gtk+ 2.0
-EAPI=5
+EAPI=6
 HOMEPAGE=http://gtkglext.sourceforge.net/
-IUSE=debug abi_x86_32 abi_x86_64 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=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=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(-)?] >=x11-libs/gtk+-2.24.23: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/pango-1.36.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/pangox-compat-0.0.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/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/libXmu-1.1.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/glu-9.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=mirror://sourceforge/gtkglext/gtkglext-1.2.0.tar.bz2
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3432e71df80d7764d08a8b85ed1deaaf
+_md5_=541342fe241ea93a20fbcbf5b5e521ca
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.91 b/metadata/md5-cache/x11-libs/libdrm-2.4.91
index e66d70a53727..3e1d2b19205e 100644
--- a/metadata/md5-cache/x11-libs/libdrm-2.4.91
+++ b/metadata/md5-cache/x11-libs/libdrm-2.4.91
@@ -10,5 +10,5 @@ RDEPEND=elibc_FreeBSD? ( >=dev-libs/libpthread-stubs-0.4:=[abi_x86_32(-)?,abi_x8
 RESTRICT=test
 SLOT=0
 SRC_URI=https://dri.freedesktop.org/libdrm/libdrm-2.4.91.tar.bz2
-_eclasses_=meson	ecfaf615b512dc4ff2a50a35e6b26c09	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec
+_eclasses_=meson	53e3ab209402d5ad07a9c4580c423d1a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec
 _md5_=a241fe7b45b9042448240177aa39f5ed
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.92 b/metadata/md5-cache/x11-libs/libdrm-2.4.92
index b5546b44fa4f..195fdc7e3d13 100644
--- a/metadata/md5-cache/x11-libs/libdrm-2.4.92
+++ b/metadata/md5-cache/x11-libs/libdrm-2.4.92
@@ -10,5 +10,5 @@ RDEPEND=elibc_FreeBSD? ( >=dev-libs/libpthread-stubs-0.4:=[abi_x86_32(-)?,abi_x8
 RESTRICT=test
 SLOT=0
 SRC_URI=https://dri.freedesktop.org/libdrm/libdrm-2.4.92.tar.bz2
-_eclasses_=meson	ecfaf615b512dc4ff2a50a35e6b26c09	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec
+_eclasses_=meson	53e3ab209402d5ad07a9c4580c423d1a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec
 _md5_=ab0a93308d6849818660b194e3c109ec
diff --git a/metadata/md5-cache/x11-libs/libdrm-9999 b/metadata/md5-cache/x11-libs/libdrm-9999
index 5a420e153ab3..9c7abab6a398 100644
--- a/metadata/md5-cache/x11-libs/libdrm-9999
+++ b/metadata/md5-cache/x11-libs/libdrm-9999
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=elibc_FreeBSD? ( >=dev-libs/libpthread-stubs-0.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(-)?] ) video_cards_intel? ( >=x11-libs/libpciaccess-0.13.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(-)?] )
 RESTRICT=test
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	meson	ecfaf615b512dc4ff2a50a35e6b26c09	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	meson	53e3ab209402d5ad07a9c4580c423d1a	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec
 _md5_=ab0a93308d6849818660b194e3c109ec
diff --git a/metadata/md5-cache/x11-libs/libxshmfence-1.3 b/metadata/md5-cache/x11-libs/libxshmfence-1.3-r1
index 36603013c2b8..36603013c2b8 100644
--- a/metadata/md5-cache/x11-libs/libxshmfence-1.3
+++ b/metadata/md5-cache/x11-libs/libxshmfence-1.3-r1
diff --git a/metadata/md5-cache/x11-libs/rep-gtk-0.90.8.3 b/metadata/md5-cache/x11-libs/rep-gtk-0.90.8.3
index 0a2328695b39..5b3b68512e50 100644
--- a/metadata/md5-cache/x11-libs/rep-gtk-0.90.8.3
+++ b/metadata/md5-cache/x11-libs/rep-gtk-0.90.8.3
@@ -4,10 +4,10 @@ DESCRIPTION=GTK+/libglade/GNOME bindings for the librep Lisp environment
 EAPI=6
 HOMEPAGE=http://sawfish.wikia.com/wiki/Main_Page
 IUSE=examples
-KEYWORDS=alpha amd64 ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 ia64 ppc ~ppc64 sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/librep-0.90.5 >=dev-libs/glib-2.6:2 >=x11-libs/gtk+-2.24.0:2 >=x11-libs/gdk-pixbuf-2.23:2
 SLOT=gtk-2.0
 SRC_URI=http://download.tuxfamily.org/librep/rep-gtk/rep-gtk_0.90.8.3.tar.xz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=eacfaec01f3c3a1b9043efe22795c681
+_md5_=dfd6f98a052a9028a6217a6b1f8a1302
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 4e541494bbd5..080b6b30bc7c 100644
--- a/metadata/md5-cache/x11-misc/Manifest.gz
+++ b/metadata/md5-cache/x11-misc/Manifest.gz
diff --git a/metadata/md5-cache/x11-misc/dunst-1.2.0 b/metadata/md5-cache/x11-misc/dunst-1.2.0
index 369142016c27..0fae93e8a251 100644
--- a/metadata/md5-cache/x11-misc/dunst-1.2.0
+++ b/metadata/md5-cache/x11-misc/dunst-1.2.0
@@ -4,10 +4,10 @@ DESCRIPTION=customizable and lightweight notification-daemon
 EAPI=6
 HOMEPAGE=http://www.knopwob.org/dunst/ https://github.com/dunst-project/dunst
 IUSE=dunstify
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
 RDEPEND=dev-libs/glib:2 dev-libs/libxdg-basedir sys-apps/dbus x11-libs/cairo[X,glib] x11-libs/gdk-pixbuf x11-libs/gtk+:2= x11-libs/libXScrnSaver x11-libs/libXft x11-libs/libXinerama x11-libs/pango[X] dunstify? ( x11-libs/libnotify )
 SLOT=0
 SRC_URI=https://github.com/dunst-project/dunst/archive/v1.2.0.tar.gz -> dunst-1.2.0.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=d22546a71f0f67d5fae19f9bc11ef7d4
+_md5_=7fed80d3412141175ca650a099a458b7
diff --git a/metadata/md5-cache/x11-misc/dunst-1.3.2 b/metadata/md5-cache/x11-misc/dunst-1.3.2
new file mode 100644
index 000000000000..3ef2a7fd572b
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/dunst-1.3.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=dev-libs/glib:2 dev-libs/libxdg-basedir sys-apps/dbus x11-libs/cairo[X,glib] x11-libs/gdk-pixbuf x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXinerama x11-libs/libXrandr x11-libs/pango[X] dunstify? ( x11-libs/libnotify ) dev-lang/perl virtual/pkgconfig
+DESCRIPTION=Customizable and lightweight notification-daemon
+EAPI=6
+HOMEPAGE=http://www.knopwob.org/dunst/ https://github.com/dunst-project/dunst
+IUSE=dunstify
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=BSD
+RDEPEND=dev-libs/glib:2 dev-libs/libxdg-basedir sys-apps/dbus x11-libs/cairo[X,glib] x11-libs/gdk-pixbuf x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXinerama x11-libs/libXrandr x11-libs/pango[X] dunstify? ( x11-libs/libnotify )
+SLOT=0
+SRC_URI=https://github.com/dunst-project/dunst/archive/v1.3.2.tar.gz -> dunst-1.3.2.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec
+_md5_=990dde1b80ebb8cb6068479007bbdfb6
diff --git a/metadata/md5-cache/x11-misc/gmrun-0.9.2-r2 b/metadata/md5-cache/x11-misc/gmrun-0.9.2-r2
new file mode 100644
index 000000000000..a4ecf2e99575
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/gmrun-0.9.2-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=prepare
+DEPEND=dev-libs/glib:2 dev-libs/popt x11-libs/gtk+:2 elibc_glibc? ( >=sys-libs/glibc-2.10 ) sys-apps/sed virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A GTK-2 based launcher box with bash style auto completion!
+EAPI=6
+HOMEPAGE=https://sourceforge.net/projects/gmrun/
+KEYWORDS=~amd64 ~mips ~ppc ~x86
+LICENSE=GPL-1
+RDEPEND=dev-libs/glib:2 dev-libs/popt x11-libs/gtk+:2
+SLOT=0
+SRC_URI=mirror://sourceforge/gmrun/gmrun-0.9.2.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec
+_md5_=6d47d0dd6a5fe7d6708f63fede838814
diff --git a/metadata/md5-cache/x11-misc/shared-mime-info-1.9 b/metadata/md5-cache/x11-misc/shared-mime-info-1.9
index bca6909ba854..34ccc49c961e 100644
--- a/metadata/md5-cache/x11-misc/shared-mime-info-1.9
+++ b/metadata/md5-cache/x11-misc/shared-mime-info-1.9
@@ -4,10 +4,10 @@ DESCRIPTION=The Shared MIME-info Database specification
 EAPI=6
 HOMEPAGE=https://freedesktop.org/wiki/Software/shared-mime-info
 IUSE=test
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2 dev-libs/libxml2
 SLOT=0
 SRC_URI=https://people.freedesktop.org/~hadess/shared-mime-info-1.9.tar.xz
 _eclasses_=xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=347a0e589d49821120b8cc462cd84788
+_md5_=cc47ee01d16fbcd6b4aa99bfd467ff1f
diff --git a/metadata/md5-cache/x11-misc/xiccd-0.2.3 b/metadata/md5-cache/x11-misc/xiccd-0.2.3
deleted file mode 100644
index a96b53ba86bd..000000000000
--- a/metadata/md5-cache/x11-misc/xiccd-0.2.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=dev-libs/glib:2 x11-apps/xrandr x11-misc/colord >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A desktop environment-independent bridge between colord and X
-EAPI=6
-HOMEPAGE=https://github.com/agalakhov/xiccd
-KEYWORDS=~amd64
-LICENSE=GPL-3+
-RDEPEND=dev-libs/glib:2 x11-apps/xrandr x11-misc/colord
-SLOT=0
-SRC_URI=https://github.com/agalakhov/xiccd/archive/v0.2.3.tar.gz -> xiccd-0.2.3.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=20be4ff4e7d1463c8478cccb261a40c6
diff --git a/metadata/md5-cache/x11-misc/zim-0.68 b/metadata/md5-cache/x11-misc/zim-0.68
new file mode 100644
index 000000000000..129983b8aab6
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/zim-0.68
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-python/pygtk[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:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] x11-misc/xdg-utils test? ( dev-vcs/bzr dev-vcs/git dev-vcs/mercurial ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=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(+)] >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=A desktop wiki
+EAPI=6
+HOMEPAGE=http://zim-wiki.org/
+IUSE=test python_targets_python2_7 test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD GPL-2+
+RDEPEND=dev-python/pygtk[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: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(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=http://zim-wiki.org/downloads/zim-0.68.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f7e98b697080c95feddcc76aceb9365f
diff --git a/metadata/md5-cache/x11-plugins/Manifest.gz b/metadata/md5-cache/x11-plugins/Manifest.gz
index 70bce9df9b17..506bb36a0eb8 100644
--- a/metadata/md5-cache/x11-plugins/Manifest.gz
+++ b/metadata/md5-cache/x11-plugins/Manifest.gz
diff --git a/metadata/md5-cache/x11-plugins/enigmail-2.0.5 b/metadata/md5-cache/x11-plugins/enigmail-2.0.5
index 8b5ee9081243..55e44b3d3ce0 100644
--- a/metadata/md5-cache/x11-plugins/enigmail-2.0.5
+++ b/metadata/md5-cache/x11-plugins/enigmail-2.0.5
@@ -3,10 +3,10 @@ DEPEND=|| ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk(-)] app-crypt/pi
 DESCRIPTION=Mozilla extension to provide GPG support in mail clients
 EAPI=6
 HOMEPAGE=http://www.enigmail.net/
-KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=MPL-2.0 GPL-3
 RDEPEND=|| ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk(-)] app-crypt/pinentry[qt4(-)] app-crypt/pinentry[qt5(-)] ) ) =app-crypt/gnupg-1.4* ) !<mail-client/thunderbird-52.5.0 !<www-client/seamonkey-2.49.5.0_p0
 SLOT=0
 SRC_URI=http://www.enigmail.net/download/source/enigmail-2.0.5.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec
-_md5_=f5513e8258e634026f1a988f350dfc31
+_md5_=d66bdae8b185996b44a4d288e16b172c
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index e25e7dfa4d78..801111c08195 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/terminology-1.2.1 b/metadata/md5-cache/x11-terms/terminology-1.2.1
index 654cc78cdd26..37ff87364f1d 100644
--- a/metadata/md5-cache/x11-terms/terminology-1.2.1
+++ b/metadata/md5-cache/x11-terms/terminology-1.2.1
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=dev-libs/efl-1.20.0[eet,fontconfig,opengl,X]
 SLOT=0
 SRC_URI=https://download.enlightenment.org/rel/apps/terminology/terminology-1.2.1.tar.xz
-_eclasses_=meson	ecfaf615b512dc4ff2a50a35e6b26c09	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=meson	53e3ab209402d5ad07a9c4580c423d1a	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=f47b22f10b77b3bdcc194d16e92957c4
diff --git a/metadata/md5-cache/x11-terms/terminology-9999 b/metadata/md5-cache/x11-terms/terminology-9999
index bc6d48d719ac..d8a98ee64d1d 100644
--- a/metadata/md5-cache/x11-terms/terminology-9999
+++ b/metadata/md5-cache/x11-terms/terminology-9999
@@ -7,5 +7,5 @@ IUSE=nls
 LICENSE=BSD-2
 RDEPEND=>=dev-libs/efl-1.20.0[eet,fontconfig,opengl,X]
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	meson	ecfaf615b512dc4ff2a50a35e6b26c09	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	meson	53e3ab209402d5ad07a9c4580c423d1a	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec
 _md5_=b49dfc2dd92aacbd9fa4df37e8c9d27f
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index 6b32c62af45a..591adcb04278 100644
--- a/metadata/md5-cache/x11-wm/Manifest.gz
+++ b/metadata/md5-cache/x11-wm/Manifest.gz
diff --git a/metadata/md5-cache/x11-wm/enlightenment-0.22.3 b/metadata/md5-cache/x11-wm/enlightenment-0.22.3
index e6c206fb7689..5892bd2d0610 100644
--- a/metadata/md5-cache/x11-wm/enlightenment-0.22.3
+++ b/metadata/md5-cache/x11-wm/enlightenment-0.22.3
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=dev-libs/efl-1.20.5[eet,X] virtual/udev x11-libs/libXext x11-libs/libxcb x11-libs/xcb-util-keysyms x11-misc/xkeyboard-config pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd ) udisks? ( sys-fs/udisks:2 ) wayland? ( dev-libs/efl[drm,wayland] >=dev-libs/wayland-1.12.0 x11-libs/libxkbcommon x11-libs/pixman )
 SLOT=0.17/0.22.3
 SRC_URI=https://download.enlightenment.org/rel/apps/enlightenment/enlightenment-0.22.3.tar.xz
-_eclasses_=meson	ecfaf615b512dc4ff2a50a35e6b26c09	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=meson	53e3ab209402d5ad07a9c4580c423d1a	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	fa02994d0beba88681127d93da4411ec	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=64c6a8e01947b0308610beb1ff10c3c2
diff --git a/metadata/md5-cache/x11-wm/oroborus-2.0.20-r1 b/metadata/md5-cache/x11-wm/oroborus-2.0.20-r1
index 4e67f803d89c..76a50b8260e7 100644
--- a/metadata/md5-cache/x11-wm/oroborus-2.0.20-r1
+++ b/metadata/md5-cache/x11-wm/oroborus-2.0.20-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=-
 DEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-base/xorg-proto
 DESCRIPTION=Small and fast window manager
 EAPI=6
-HOMEPAGE=http://www.oroborus.org
+HOMEPAGE=https://www.oroborus.org
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
 SLOT=0
 SRC_URI=mirror://debian/pool/main/o/oroborus/oroborus_2.0.20.tar.gz
-_md5_=a7619d5a7367c2366f9ce4c492c7a57f
+_md5_=882a19d0f5693ecef57c158e922aac0e
diff --git a/metadata/news/2018-05-22-python3-6/2018-05-22-python3-6.en.txt b/metadata/news/2018-05-22-python3-6/2018-05-22-python3-6.en.txt
new file mode 100644
index 000000000000..c8901e970a7f
--- /dev/null
+++ b/metadata/news/2018-05-22-python3-6/2018-05-22-python3-6.en.txt
@@ -0,0 +1,61 @@
+Title: Python 3.6 to become the default target
+Author: Michał Górny <mgorny@gentoo.org>
+Posted: 2018-05-22
+Revision: 1
+News-Item-Format: 2.0
+Display-If-Installed: dev-lang/python:3.4
+Display-If-Installed: dev-lang/python:3.5
+
+On 2018-06-22, Python 3.6 will replace Python 3.5 in the default Python
+targets for Gentoo systems.  The new default targets will be:
+
+    PYTHON_TARGETS="python2_7 python3_6"
+    PYTHON_SINGLE_TARGET="python3_6"
+
+If you have not overriden the value of those variables on your system,
+then your package manager will want to use the new targets immediately.
+In order to prevent dependency conflicts, please clean stray packages
+and rebuild/upgrade all packages with USE flag changes after the change,
+e.g.:
+
+    emerge --depclean
+    emerge -1vUD @world
+    emerge --depclean
+
+Please note that upgrading dependencies in place may cause some
+of the package dependencies to be temporarily missing.  While this
+should not affect scripts that are already fully loaded, it may cause
+ImportErrors while starting Python scripts or loading additional
+modules (only scripts running Python 3.5 are affected).
+
+In order to improve stability of the upgrade, you may choose to
+temporarily enable both targets, i.e. set in /etc/portage/make.conf
+or its equivalent:
+
+    PYTHON_TARGETS="python2_7 python3_5 python3_6"
+    PYTHON_SINGLE_TARGET="python3_5"
+
+This will cause the dependencies to include both Python 3.5 and 3.6
+support on the next system upgrade.  Once all packages are updated,
+you can restart your scripts, remove the custom setting and run another
+upgrade to remove support for Python 3.5.
+
+If you would like to postpone the switch to Python 3.6, you can copy
+the current value of PYTHON_TARGETS and/or PYTHON_SINGLE_TARGET
+to /etc/portage/make.conf or its equivalent:
+
+    PYTHON_TARGETS="python2_7 python3_5"
+    PYTHON_SINGLE_TARGET="python3_5"
+
+If you would like to migrate your systems earlier, you can do the same
+with the new value.
+
+If you are still using Python 3.4, please consider switching to a newer
+version as it is reaching its end-of-life.  The end-of-life dates
+for the currently used versions are:
+
+  Python 3.4        2019-03-16
+  Python 2.7        2020-01-01
+  Python 3.5        2020-09-13 [1]
+
+[1]:https://devguide.python.org/#status-of-python-branches
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index ffd7d56ab353..d6fa28d68abd 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 19582 BLAKE2B 9fc9cbe8fb3f91d1121694d9f65c77dccaa3a5e942d3fa2a476b09eb5b656361f8847037b308aac86b7cae934fd70e0ddbfc94f0ee35cfa6b27451814b6b7b33 SHA512 f9fc52a2e65e760677796caf947ff4692963718a9e344281000add570f0a8304f93abf5af66aac9201160caa4f01a92aedbd46f4fe2c171b0ba908e6dc390956
-TIMESTAMP 2018-05-22T12:08:39Z
+MANIFEST Manifest.files.gz 19761 BLAKE2B 851bd0e17305c38a177a42b80b1a89b0ca99add42dad8fa975ce0752b34aea6ad1a6bad714f0de316d8dd42cd1abbc45a7e7ea98aa182d7c527c7ced227ed9db SHA512 c4661dd0996945ee8bec7e333266902c18e9c534f4e79ebde22e80dffcea1351164ef9712b507585819b758cd1acd788423441e091bdaab31f0b7ee4681eeacd
+TIMESTAMP 2018-05-25T13:38:48Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlsECEhfFIAAAAAALgAo
+iQKSBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlsIEehfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCb+BAArvPh+rgod6PlTa6Cvaowdi1a8tm/0CPowjy3hJEYVnX2FbEDPVdd94gq
-RxYeVADjLBJ1Wyk3R3C2hxPHiNgs0Jz0WBAUPBKcmXm4b2ene81O6lHUipCrk619
-eUm1IP8fd3gjaFrfMinSRGvgwIi6hgPkqgkidQDFiEWCrtk9yJ5OhS0J4ZNVBDps
-HAgLYIUaSfvNiN94NDLPnkE6sTwu5COSWymJsb5egLmg4olATv5NxkhtY3HpCYcJ
-PSp57oeV+hAJBwgcX3Ij7bYCee5DRInVv4Ww0eXx76uq0sD12z0j7sKseJCYIbfj
-ExUAEqDlzXs4QCxc7LQ19eHrKDi2IDiuLnE/vO4nqEVGFsWmgenSiOW6DYAN6oMZ
-AG9tuva+oOSijDsPLYkOK0o8pRLiUh8nXvAoFaAIy1Bg/UZyMmg5shPlHE95pE+P
-6eWPMklD72fey2H+Ff2YI16MDSYXKY2m48hzNmmHuZd9ALfmY4lB7K/EIU5/hIpb
-I9gPO6s8e0o6oGZ+RvDxBUeQCqt9HTJksxD/D/sJTGNJB+bWHgD7JYC4TT1n0Tcx
-EPJ5DO7wYpHRF1GhlOTe2HgHGB+XOxPiAPVj+bN5pJqwCUGh854hOY+/CA7Vz8uS
-t3NqFUfo7ExRi8WTthiYJkjjJcSSw8Rjfc9+uhqL9Hto3fF0/AM=
-=aeNx
+klDJNA/3YglNYBdxYdT/4wE2IzGywumg5vjbvgonb2jE7vwdsSmgaLRl1QD6p8Qp
+AVbt3TjEvik06EpRKrZ1g0LKzLvXK4UBGUgo7KsbtAd5CrhrA0rImLsGAbAuDuNQ
+Bl8c5yvgaQcnO9CNd6oyYhDMusfSnCNCoUCDNvV4Bgkr2IhDqS7+gU2y53PW2Id/
+XsvskP7qeIJh/BXGoTjAxyDko2iHTYtD+tmQovXM/LJNDgS3sklKHKcrnCm6uW/f
+bjL3/fB3s7TkBFqzCXtewyY6IadcUO+6d82CERcDrVk5LhZ6lfReSe/cVLWFysci
+AOwDpyY0r/GT7vNa7Z6nmNmOpCWM18dXPgJ2msLiDTIzNPjUYU/o4TLBy33q5lgG
+4w+8sQIby1cq0/2KP76GsifKqsfYSD3yKcnMg7SZleuQ63hItpYGdIsnHV6SqnTd
+B4P4sj7EiXM3Z4elr0GBb4KNWzuGRN0N9oCFtEjkF5LLozOMohpNM/XyRxdUDQZv
+1b75xVRJsd2fLrZC0UpGSp8ASf3E6DZn2jNpZ0mrUiWDYXTKDebI5f5OcBAXQH6P
+AXU8pz0/+KMNsBvQSG4RXsUxCppfn1/k4ctOttklowIfw9PJ5K0qVWyv/rd4KDkU
+yIhPga2QWFFc4cr20slBcu8ds0kZuavIQ0MugSknnAN/Z0yf0A==
+=0WF4
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/Manifest.files.gz b/metadata/news/Manifest.files.gz
index 5b68c2e529bc..b49d3b71ed28 100644
--- a/metadata/news/Manifest.files.gz
+++ b/metadata/news/Manifest.files.gz
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 9c2593d3e940..82049acb5f24 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 22 May 2018 12:08:36 +0000
+Fri, 25 May 2018 13:38:44 +0000
diff --git a/metadata/news/timestamp.commit b/metadata/news/timestamp.commit
index 1c64220c3214..62e944283032 100644
--- a/metadata/news/timestamp.commit
+++ b/metadata/news/timestamp.commit
@@ -1 +1 @@
-7ecf72b7445ad7cd0c9a875b4607f282b140fccd 1523178926 2018-04-08T09:15:26+00:00
+226f7edc8ca431f523e014cfc98751780ec0994c 1527006439 2018-05-22T16:27:19+00:00
diff --git a/metadata/timestamp b/metadata/timestamp
index 3e0117ce1a06..97d45b31688b 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue May 22 12:08:36 UTC 2018
+Fri May 25 13:38:44 UTC 2018
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 1c2b40fd44a4..5e6f835651b3 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 22 May 2018 12:15:01 +0000
+Fri, 25 May 2018 13:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 035b2e7a7587..e21d751f5470 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-c8db93643969f86705699322499b7de072ce34e9 1526989834 2018-05-22T11:50:34+00:00
+5aba6790b2be028415d93da4bf9f47a31ba0a96b 1527254041 2018-05-25T13:14:01+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 8a817b714b99..e549d6310b00 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1526990701 Tue 22 May 2018 12:05:01 PM UTC
+1527255301 Fri 25 May 2018 01:35:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 9c2593d3e940..82049acb5f24 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Tue, 22 May 2018 12:08:36 +0000
+Fri, 25 May 2018 13:38:44 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 2b0006a7cc67..fbc946f220e0 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 0690e92c17d8..a657ff2003c3 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,7 +1,5 @@
 AUX icinga2.initd 2276 BLAKE2B 9573c876cb1fc6ff641d4503d5446840725d94ac2a824cd124872af84032519a5ee1237b0ebc38783e673cb87169feb48b7690978e9b7d2e38549a7272f403fc SHA512 5b31f748eda8f52d8efe2c744c3c1adacffdb40c04d93cdaf7ee82129d632783362f6ea51b5a4c05ca9cd98d3343abfcfc86c98e99afd429d6bce390b9ffd082
-DIST icinga2-2.8.2.tar.gz 2507304 BLAKE2B 0f2cc58fff6d9f648b302c3af07e24fcf20e0c10c140d4052991477e1dbf5c158157f0c64e8d3aa26a6fadc46db25eb26d7b5d5c791a8a7d91445be10f0cecea SHA512 55a9791fa14d0e3e559b3083ec83ad301b62a677a1b56ad30227b1a3591612e2fe536a34a25705fb935a6ca8e42f45ff006f9856b47103da054db15582455579
 DIST icinga2-2.8.4.tar.gz 2510333 BLAKE2B f551a5eadc93d8455612af40e34a0922bc75f41b8064f9989c8f0c28dc2c3fb18963cf9b3272efa29f03973e7cf5824762bebff1bfa1a23c4ba39c93fc29c8e5 SHA512 b2cb5989962ac65da927cbdbac1b3345c913321d507b5113f32dd90bf969b2513478e68d52b9cd4cf255057d74428f9e42067288b7ddc59ad060ca7b84f4f114
-EBUILD icinga2-2.8.2.ebuild 4604 BLAKE2B 074505319ffdb68d93df79dbfe6c2a88a971b1a188e28526dd97e131d7494e6076173cbe9b8ee3599c7deecb62610f23828f0c107460555d47394d29f81eedbe SHA512 be570d2178c8750227b1dfb46c682a1805696fe9b46241f6ef9f59fa1e6ac9886d7e88cc14bcd5e094cd3671f49dfa1ad91046d3e08288b8266f888fde37a2a1
-EBUILD icinga2-2.8.4.ebuild 4608 BLAKE2B 01c0eadcb5ff07ab19315aa5243859531830ac1c43a252ade687a7ae2a621acbd16f80059ab43cacd16374490755b10166858f90767e84d8c1b9006831761c80 SHA512 50333c932859db9d872e4617ad97fda03017449d3cc50a5d1d548994e0e1564ba42302ec23f10903976361f306d494c3671e65d6d4b167e2e4158d02cd22c23b
+EBUILD icinga2-2.8.4.ebuild 4604 BLAKE2B 074505319ffdb68d93df79dbfe6c2a88a971b1a188e28526dd97e131d7494e6076173cbe9b8ee3599c7deecb62610f23828f0c107460555d47394d29f81eedbe SHA512 be570d2178c8750227b1dfb46c682a1805696fe9b46241f6ef9f59fa1e6ac9886d7e88cc14bcd5e094cd3671f49dfa1ad91046d3e08288b8266f888fde37a2a1
 EBUILD icinga2-9999.ebuild 4608 BLAKE2B e3c3b8c7c93458ee579764b087395cc004855dee56cc463a22d2787c541661e5963cf8d7b9d70374c302d1a82e3453a750c16d51d55daed81496b998335d9cc8 SHA512 d6d1d15e9e3e7bfb461c9eee901448cd489bb2fd86575291790e463c16d133ec1ecf15f72f3a67e5a9ee3de4dba450ad51b6940c5b966ae688d8a9d51ba4d5fc
 MISC metadata.xml 816 BLAKE2B 6d820358c90a580be01149ae631f40dbeb5f50ce0df937ac484269c9a58f21a450d3861dce3b34ee0882b3b61d981da8162af735c5a3de90bb7b74dae9523d08 SHA512 0d3ac2d9233f7ce53a8105caed0231cefa402861e26c760de3fb23163ea68c21b97f5ec0de65bc6953aaf2dd8fa90a9edc045a2fea8b622efdd1336959e9e60b
diff --git a/net-analyzer/icinga2/icinga2-2.8.2.ebuild b/net-analyzer/icinga2/icinga2-2.8.2.ebuild
deleted file mode 100644
index 525aa185b124..000000000000
--- a/net-analyzer/icinga2/icinga2-2.8.2.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-if [[ ${PV} != 9999 ]]; then
-	inherit cmake-utils depend.apache eutils systemd toolchain-funcs user wxwidgets
-	SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
-else
-	inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs user wxwidgets
-	EGIT_REPO_URI="https://github.com/Icinga/icinga2.git"
-	EGIT_BRANCH="master"
-	KEYWORDS=""
-fi
-
-DESCRIPTION="Distributed, general purpose, network monitoring engine"
-HOMEPAGE="http://icinga.org/icinga2"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+mysql postgres classicui console libressl lto mail minimal nano-syntax +plugins studio +vim-syntax"
-WX_GTK_VER="3.0"
-
-CDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	>=dev-libs/boost-1.58-r1
-	console? ( dev-libs/libedit )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql:= )"
-
-DEPEND="
-	${CDEPEND}
-	sys-devel/bison
-	>=sys-devel/flex-2.5.35"
-
-RDEPEND="
-	${CDEPEND}
-	plugins? ( || (
-		net-analyzer/monitoring-plugins
-		net-analyzer/nagios-plugins
-	) )
-	mail? ( virtual/mailx )
-	classicui? ( net-analyzer/icinga[web] )
-	studio? ( x11-libs/wxGTK:3.0 )"
-
-REQUIRED_USE="!minimal? ( || ( mysql postgres ) )"
-
-want_apache2
-
-pkg_setup() {
-	depend.apache_pkg_setup
-	if use studio ; then
-		setup-wxwidgets
-	fi
-	enewgroup icinga
-	enewgroup icingacmd
-	enewgroup nagios  # for plugins
-	enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios"
-}
-
-src_configure() {
-	sed -i 's/FLAGS\}\ \-g/FLAGS\}\ \-lpthread\ /g' CMakeLists.txt || die
-	local mycmakeargs=(
-		-DICINGA2_UNITY_BUILD=FALSE
-		-DCMAKE_VERBOSE_MAKEFILE=ON
-		-DCMAKE_BUILD_TYPE=None
-		-DCMAKE_INSTALL_PREFIX=/usr
-		-DCMAKE_INSTALL_SYSCONFDIR=/etc
-		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
-		-DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
-		-DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
-		-DICINGA2_USER=icinga
-		-DICINGA2_GROUP=icingacmd
-		-DICINGA2_COMMAND_GROUP=icingacmd
-		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
-		-DLOGROTATE_HAS_SU=ON
-	)
-	# default to off if minimal, allow the flags to be set otherwise
-	if use minimal; then
-		mycmakeargs+=(
-			-DICINGA2_WITH_MYSQL=OFF
-			-DICINGA2_WITH_PGSQL=OFF
-		)
-	else
-		mycmakeargs+=(
-			-DICINGA2_WITH_PGSQL=$(usex postgres ON OFF)
-			-DICINGA2_WITH_MYSQL=$(usex mysql ON OFF)
-		)
-	fi
-	# LTO
-	if use lto; then
-		mycmakeargs+=(
-			-DICINGA2_LTO_BUILD=ON
-		)
-	else
-		mycmakeargs+=(
-			-DICINGA2_LTO_BUILD=OFF
-		)
-	fi
-	# STUDIO
-	if use studio; then
-		mycmakeargs+=(
-			-DICINGA2_WITH_STUDIO=ON
-		)
-	else
-		mycmakeargs+=(
-			-DICINGA2_WITH_STUDIO=OFF
-		)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	BUILDDIR="${WORKDIR}"/icinga2-${PV}_build
-	cd "${BUILDDIR}" || die
-
-	emake DESTDIR="${D}" install
-
-	einstalldocs
-
-	newinitd "${FILESDIR}"/icinga2.initd icinga2
-
-	if use mysql ; then
-		docinto schema
-		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
-		docinto schema/upgrade
-		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
-	elif use postgres ; then
-		docinto schema
-		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
-		docinto schema/upgrade
-		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/upgrade/*
-	fi
-
-	keepdir /etc/icinga2
-	keepdir /var/lib/icinga2/api/zones
-	keepdir /var/lib/icinga2/api/repository
-	keepdir /var/lib/icinga2/api/log
-	keepdir /var/spool/icinga2/perfdata
-
-	rm -r "${D}/var/run" || die "failed to remove /var/run"
-	rm -r "${D}/var/cache" || die "failed to remove /var/cache"
-
-	fowners root:icinga /etc/icinga2
-	fperms 0750 /etc/icinga2
-	fowners icinga:icinga /var/lib/icinga2
-	fowners icinga:icinga /var/spool/icinga2
-	fowners -R icinga:icingacmd /var/lib/icinga2/api
-	fowners icinga:icinga /var/spool/icinga2/perfdata
-	fowners icinga:icingacmd /var/log/icinga2
-
-	fperms ug+rwX,o-rwx /etc/icinga2
-	fperms ug+rwX,o-rwx /var/lib/icinga2
-	fperms ug+rwX,o-rwx /var/spool/icinga2
-	fperms ug+rwX,o-rwx /var/log/icinga2
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles
-		doins -r "${WORKDIR}"/${P}/tools/syntax/vim/ftdetect
-		doins -r "${WORKDIR}"/${P}/tools/syntax/vim/syntax
-	fi
-
-	if use nano-syntax; then
-		insinto /usr/share/nano
-		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
-		elog "DB IDO schema upgrade may be required required.
-		http://docs.icinga.org/icinga2/snapshot/doc/module/icinga2/chapter/upgrading-icinga-2"
-	fi
-}
diff --git a/net-analyzer/icinga2/icinga2-2.8.4.ebuild b/net-analyzer/icinga2/icinga2-2.8.4.ebuild
index 4108f14e4147..525aa185b124 100644
--- a/net-analyzer/icinga2/icinga2-2.8.4.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.8.4.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 if [[ ${PV} != 9999 ]]; then
 	inherit cmake-utils depend.apache eutils systemd toolchain-funcs user wxwidgets
 	SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
 else
 	inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs user wxwidgets
 	EGIT_REPO_URI="https://github.com/Icinga/icinga2.git"
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 0b02e42bc2d1..e5839ab0cf46 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index 41dc18bbbf98..19b44697928b 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -1,25 +1,11 @@
 AUX autoipd-openrc.sh 700 BLAKE2B e71e5583db890f8ee1bbe9c03fc42285871089b2ea2d4549d553f14a20a3aa97c519b298bfaaccf02346c911f65f8e3f8bab7b2dc8270a5d35c471cc6bf31f6b SHA512 a5dbbac4d6d1959db3a07a63acb7569dbeba33d2274a1dd3253dc27687549371611cf08bad3998d89efb3ace63b5541a4d225e484274450e0c82661f5a1dbc32
 AUX autoipd.sh 1271 BLAKE2B 815c5776afff71489826eb8338535df1af6fbf02f3d42eedb6ebb69e5fff181e7252060818dd2dd67141a40c097ded8b7ac4210cb9929bab4b68ea99533bcf26 SHA512 0bff9ca7e32212aef0246db5baf10ee4f7e93a987b7c591b21ed9f116a1c662a84be9d784fc919205c1fecb5cd8421b81a0eb590c3cc066c6b1b9265b98f1ea3
 AUX avahi-0.6.30-optional-gtk-utils.patch 2422 BLAKE2B 2fb0362fdf6cf150ec92d9912981f59267c3da2b752e75a62409e75b09ce1a63fa6d24c99c0ffad1acec959d47250615b7eb406c34af49c144cfbddd8d87d4d8 SHA512 3ea7f7cd0074286bbe474f783ea9638abef7f68d9466d4f5d4d3a0bc6624a43e48bb293f02f2dd08413d5dcf3f99161e0f45537c5f922b1a326375d40b574596
-AUX avahi-0.6.31-build-client-without-daemon.patch 738 BLAKE2B 836524c0204aebcc3d9858c35cd80e89e67f4aa8b57b6a98a9c97a69df34a0c477bd549d55fa9549615084b1e6a46bd889d22ccc9b530b0f82dab7b7d2c50457 SHA512 0d7ab88560eed40bb04360442b4daba6aa58d9f7f7d60b64c0e47b86ff0e6f2fcc8ccc7fbeab9ed87f77eedfde3814d37f82da9ae010223ef0e81e5b64d34b04
 AUX avahi-0.6.31-fix-install-avahi-discover.patch 715 BLAKE2B 49cf6f68f0b98685f3f95ae54fbe064850723f5b64e1ca72eb79ac94198481f59f1ba7f226df4914c8efd8fb1bd31327d5177a049a3fa1e4b98d850fef0ccfb4 SHA512 0cdcf41bbd25caea84a62054c4081dfdba1d421cef56babebe33f480a8ba9af1362c7b698803c17132ee78716439ec70cd5d71f7c85b5d49ba9bda471466cb79
 AUX avahi-0.6.31-fix-locale-build.patch 866 BLAKE2B 7c33b13670331ed1d89a88653790f1a15944d766a8edc2b3a674b39fc66ba2efe63dacf57a79fa2ba30915a8e33e01f30d1881d110e04ff12c310fa5ec11c3d2 SHA512 c970cd5d199024699e3345d59fb03d0966b62c859e9dd2107a1adef4cb7433a2ebcf2cd6331f4726d84a3ec973b45d7e93824fb80a8c8dcf3fcf6a610a67b337
-AUX avahi-0.6.31-host-name-from-machine-id.patch 3001 BLAKE2B 9ea5e9c26c3603517d4a8f2bcf595b86b224e945a68092d1075956bdde79957f4bbba9cf7c8880d17059502db379f8ab15f0313fabec18fe905c24f6718fc661 SHA512 659d36b06bf721664105bf51a1610186700004dea2af5dc43e29a8d688e903fb0c69416b1b98957de902901fc5ed04fdd252d30e23f680608608e6f633b94b17
-AUX avahi-0.6.31-install-exec-hook.patch 507 BLAKE2B 06e1da7773299f903658a24d4bf412ed8e08c59e62786b6d91ec0b76d7bcf8c43748945a0779b880a54878f4dde0262277b8809a359daf2af42e4648c25c049a SHA512 c25802f78b5c2f6cc15705c6e426b6590dbcdf30d33e239bd919e9592c5e72c7fb244726e74addfeff4b81fa41cc62afb3ddb880232fea66f3cc9470bb5940b1
-AUX avahi-0.6.31-invalid_packet.patch 1073 BLAKE2B a6ae5008e20f620c2314616483cc97f0b41b9bbcfee1f84721c31fb960b8446151260f1fa0a18265cbdb6eb5314b490e1aca6592dc2bf9cd64e84ffb06c30ef4 SHA512 1582efd8c3474e7f675d86449974ae29db6ee28bd61642d37ae3efbe3903183e5f005051de400d28c116d791a6be00d90c61f3eb1d74e0650119269ca04dab4d
-AUX avahi-0.6.31-so_reuseport-may-not-exist-in-running-kernel.patch 1265 BLAKE2B 093a68402eee840ea72b9c09e1cfff5ba9c2c75df385dc483bca0381bdff4e5e01b6a64aff988448b71e5bb50e4dbcf28c96b10932be1964469ec8755a03f301 SHA512 f575e3ba1c704ec3bf92ffd8344a104f35026e6738720955caa23549f602f491c5e209188c5c00189b269e79e6120021d02cc07fbdea22a7c99ce7682f017fe7
-AUX avahi-0.6.32-mocqt4.patch 537 BLAKE2B f03ad497d4d94989a61b38e99cd74977760bd6046dc8c5bf5336062fd3327bbcae8df4c2d5c4d3c613f593ed7cd63075dc861b44aa627940228f6440a8365e37 SHA512 047d1083f9bcf24ded0a8dcffc508dc465f490da72108b9ca1b88bb217a10bcbb0678c8e5cea47869c7e33deb639edcfea2da6e3902d97b0817a67a8b7572890
-AUX avahi-0.6.32-openrc-0.21.7-fix-init-scripts.patch 918 BLAKE2B 3ed83f437b82bc98253df8a72dbd9e5a2d018e3b3e7711f04919b4926d6c8e8b0ec9531c9021453ae576cbb9919a8daaec85b721b5858355f9f6fd2fd609bffd SHA512 c62167c538af81362abba5a4012336f5d12aa20edc3cbb69f305ba89be90e4c62e1ce1613779d3ad0cbfba99e4ff46b803e4a26fe72cefefd628827a610318a3
-AUX avahi-0.6.x-openrc-0.9.x-init-scripts-fixes.patch 633 BLAKE2B 900926dbe6a0716ef37d95bc37c0115d02e48d3cfdda26ce86dc020ae0ab3b5fedbe6f5a50631b17fb210621839ac25a1bd43bfdd95a908e248a226670153d95 SHA512 c2d11b243acdc058cde03b872dccbbbd44a7a584adf168f16016f29c7a5d9d8668095b781f53102feba8b9c80b2cbbd788c9b327d9d1e2e552fbdcf3c2960517
 AUX avahi-0.7-qt5.patch 6033 BLAKE2B 10c7879f6e28942a32497c84dcf523f742cb13112d9e9c23f74967c2d6c05e6f463406716c144edc1bd4588c8c76693473765d9d678f6517c4a57615d0364b91 SHA512 cd8b900a5a068add3b7aa9080491938d469795c26e1a1869ee581b95d877ded4d120cb4db768fb4d97535a72e66c3fabf6617cdca2c9bdb50ff54e24d17b1f51
-DIST avahi-0.6.31.tar.gz 1268686 BLAKE2B 959526c69855495948222709227c7c0d07653bb91f223d80e3d1b6ee16b03952015634984fe754c2c828f76035cd966131eeb047fe4c922493c129a77b14d2be SHA512 53eb00d570a274d841e1e6ad07da077950089ae39b4f7aa21fcd21cc5320b30b506b43e7e57e56198e155cc7bd289b779a48b2b2fc002dc6194a946110451858
 DIST avahi-0.6.32.tar.gz 934004 BLAKE2B 76bbff65075bbc49d52b1e406373c4856622c22364cb5f1a4ccc0bf04a6dc7d54c58753a8cce6622e4fc62dc22086659ffbd157aeb1a6a30de353d08fd08a307 SHA512 e6dc788cc8691288ef001007006719b5eb022d484ee6fc84e68a7d227af5993e4d09484b824998155e5b25fc0ffc014beb8961d312982f63b82b10a6e2edee18
 DIST avahi-0.7.tar.gz 940047 BLAKE2B 8299577bf27ee65fad5d743dbf94202b148a6fc86825cae303f94c44482eea07cf6570d970ca286e81a787d6a64598b7123f2ac17a259ddc50ef431b9c94b530 SHA512 61f656da7614d8cca1862180038f571db3474c84f05db4d3509f614cdbf8b1a1047661b7e24d63682d5b48ed1bfa1b08b3c9e6dbe9222bcd62d99bc168a11abe
-EBUILD avahi-0.6.31-r10.ebuild 6444 BLAKE2B deee480926a554f671ba7d6a3425ac1292b429581952c377f440fae12da2f0896037dbe885a8c7991b8c55329098d07c2fcbf87bca8a1bb2c1ef9427378003b2 SHA512 231567dcc74fbe09a4d18cc52074430b2f8c552c2e1212207af5879d6234f0067eebef495872c0c589d77f8fad177d05247f9927dc648963ee9f1e792335da81
-EBUILD avahi-0.6.31-r11.ebuild 6261 BLAKE2B a11de83cced8adec29e5a3df8ad09fc2dd16d8247dc2e72b208ddb3de86a695d8d164920e2f3e96086d5ead5b251a49c380f2a61764bbdb6b3500dd39e98c7d4 SHA512 0a0645d1c38fcde7d34dfdd38f21ab177cfac21bbc01def180ec9fb0f311ce0273565f425c096c6ee29ec20651818136da166d4c3b26d29c8d7f8473a0cd4ed1
-EBUILD avahi-0.6.32-r1.ebuild 5732 BLAKE2B 6b17c7e9d223e288e309ef3f51326bff5d3e895e12a1db585f0fe3a086ba0a80bfaccb0d9ef79b769200fe985be92826efb64eb071ca93c79d82a4addde91b98 SHA512 d26256a031d5d7ce6cf58ff4c98d5a88ed93498d0383e1a425e88bc9f1de4ee18c0b2ab6e987163b5a27acc807199c8f91276e449dc6d951607c1dfddfaa74c4
-EBUILD avahi-0.6.32-r2.ebuild 5971 BLAKE2B 97aa22378ee9791dddb866a097b4c1fe69152e90939d67b1a95c890488b297dcf80e2df1f4435af0d69f798c9fc7d6365329ff481b6f24af50dbe37dcf2fe1d5 SHA512 e25666354328ba52955b938d4cfd1d0ff661cd6c536fddfc8cfc84afdaaebdafc8091bd99d17d737e79242c45b858df23a3cfbed8cf0c5491bb70ff7ed192b93
-EBUILD avahi-0.6.32.ebuild 5584 BLAKE2B 48672b141bd86b76838acae05f4d6e3f4fffeb686e42e058b8b8c3c771568df7ca12bee6a215079729d585d6415c30146787e73aeb1b84abafbff5da00ec9b48 SHA512 031b6ea7962717de7f984c78a2814312610b86ce391a2474117b34b2e8c542a6de49b75998c99639f866f415b878ed58f807a12ea713d3b1d15ef0657013e4a0
+EBUILD avahi-0.6.32.ebuild 5537 BLAKE2B 6709f83bb7f9edf048442085d37e6763d895919466efbc8dd129845876a487139e692b1ee129dc0256bb5bec3e8ec98e821abbf4aae025cd14a4b379d6781f14 SHA512 4f22dbf5f1b0ae6a96a84bc03bfaa96a797b686ea1b72e18884989a7f1c16707b6f239b4eb4c367573a6264d40fcc256ca13abb5730c9f31fba82ccbcad2da83
 EBUILD avahi-0.7-r1.ebuild 5137 BLAKE2B e25de1aba20e1f42e45c4816c7ec8e9e8edc51b5b2d68077419a23672d67656482ecc817140bbe44dc858113a52186f0dad2d6c48a0b0378c8e9cb41b56aba3d SHA512 b2fc8f47a98d255d6db0c7fe1f6da485c1cbd3f043790510c21ce88d7341f15219ea1668830435380c98d676c455ea1b1d4d33a0974b66b77dec84afa894e8ae
-EBUILD avahi-0.7.ebuild 5196 BLAKE2B 52aedbfc13e47012a986fdab7d5138006e117cd4c9c625b2331b109a17fafa2b7a586ed0fb31bef3ed2c277366165ce79a98dc57f2577772e3d3eb7beab0e1db SHA512 bf6c1bdb61e1bdfacdc6236275128680d7f03b6d36440249d8112417937f09151cdbd3f864365bad1af1c9f1dce8e61f8202f7785bc76c76c5219008afb46bbd
 MISC metadata.xml 970 BLAKE2B 26904ceb3a89833caa77e2315d99be8ef729277a021faa3800a1cd0abe94c516d53176e65668d00687a6bb6ee807a2011106268f14a4d5012c27132e4fca4f3c SHA512 b9498d4757b6bd793846e4cbdd5c37da601a8e1430cafd1a6039ff54f8ff10576684c58801ebc679061f975cefa5909c94c30976e84354a5fcc7d2a586f7fa8e
diff --git a/net-dns/avahi/avahi-0.6.31-r10.ebuild b/net-dns/avahi/avahi-0.6.31-r10.ebuild
deleted file mode 100644
index 081dddfdab9a..000000000000
--- a/net-dns/avahi/avahi-0.6.31-r10.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="gdbm"
-
-WANT_AUTOMAKE=1.11
-
-inherit autotools eutils flag-o-matic multilib multilib-minimal mono-env \
-	python-r1 systemd user
-
-DESCRIPTION="System which facilitates service discovery on a local network"
-HOMEPAGE="http://avahi.org/"
-SRC_URI="http://avahi.org/download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
-IUSE="autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono nls python qt4 selinux test utils"
-
-REQUIRED_USE="
-	utils? ( || ( gtk gtk3 ) )
-	python? ( dbus gdbm ${PYTHON_REQUIRED_USE} )
-	mono? ( dbus )
-	howl-compat? ( dbus )
-	mdnsresponder-compat? ( dbus )
-"
-
-COMMON_DEPEND="
-	dev-libs/libdaemon
-	dev-libs/expat
-	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-	gdbm? ( >=sys-libs/gdbm-1.10-r1[${MULTILIB_USEDEP}] )
-	qt4? ( dev-qt/qtcore:4[${MULTILIB_USEDEP}] )
-	gtk? ( x11-libs/gtk+:2[${MULTILIB_USEDEP}] )
-	gtk3? ( x11-libs/gtk+:3[${MULTILIB_USEDEP}] )
-	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
-	kernel_linux? ( sys-libs/libcap )
-	introspection? ( dev-libs/gobject-introspection:= )
-	mono? (
-		dev-lang/mono
-		gtk? ( dev-dotnet/gtk-sharp )
-	)
-	python? (
-		${PYTHON_DEPS}
-		gtk? ( dev-python/pygtk )
-		dbus? ( dev-python/dbus-python )
-	)
-	bookmarks? (
-		dev-python/twisted-core
-		dev-python/twisted-web
-	)
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	dev-util/intltool
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	doc? (
-		app-doc/doxygen
-	)
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	howl-compat? ( !net-misc/howl )
-	mdnsresponder-compat? ( !net-misc/mDNSResponder )
-	selinux? ( sec-policy/selinux-avahi )
-"
-
-pkg_preinst() {
-	enewgroup netdev
-	enewgroup avahi
-	enewuser avahi -1 -1 -1 avahi
-
-	if use autoipd; then
-		enewgroup avahi-autoipd
-		enewuser avahi-autoipd -1 -1 -1 avahi-autoipd
-	fi
-}
-
-pkg_setup() {
-	use mono && mono-env_pkg_setup
-}
-
-src_prepare() {
-	if use ipv6; then
-		sed -i \
-			-e s/use-ipv6=no/use-ipv6=yes/ \
-			avahi-daemon/avahi-daemon.conf || die
-	fi
-
-	sed -i\
-		-e "s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/:" \
-		doxygen_to_devhelp.xsl || die
-
-	# Make gtk utils optional
-	epatch "${FILESDIR}"/${PN}-0.6.30-optional-gtk-utils.patch
-
-	# Fix init scripts for >=openrc-0.9.0, bug #383641
-	epatch "${FILESDIR}"/${PN}-0.6.x-openrc-0.9.x-init-scripts-fixes.patch
-
-	# install-exec-local -> install-exec-hook
-	epatch "${FILESDIR}"/${P}-install-exec-hook.patch
-
-	# Backport host-name-from-machine-id patch, bug #466134
-	epatch "${FILESDIR}"/${P}-host-name-from-machine-id.patch
-
-	# Don't install avahi-discover unless ENABLE_GTK_UTILS, bug #359575
-	epatch "${FILESDIR}"/${P}-fix-install-avahi-discover.patch
-
-	epatch "${FILESDIR}"/${P}-so_reuseport-may-not-exist-in-running-kernel.patch
-
-	# allow building client without the daemon
-	epatch "${FILESDIR}"/${P}-build-client-without-daemon.patch
-
-	# Fix build under various locales, bug #501664
-	epatch "${FILESDIR}"/${P}-fix-locale-build.patch
-
-	# Fix "Invalid response packet from host", bug #559408.
-	epatch "${FILESDIR}"/${P}-invalid_packet.patch
-
-	# Drop DEPRECATED flags, bug #384743
-	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED=1::g' avahi-ui/Makefile.am || die
-
-	# Fix references to Lennart's home directory, bug #466210
-	sed -i -e 's/\/home\/lennart\/tmp\/avahi//g' man/* || die
-
-	# Bug #525832
-	epatch_user
-
-	# Prevent .pyc files in DESTDIR
-	>py-compile
-
-	eautoreconf
-
-	# bundled manpages
-	multilib_copy_sources
-}
-
-src_configure() {
-	# those steps should be done once-per-ebuild rather than per-ABI
-	use sh && replace-flags -O? -O0
-	use python && python_export_best
-
-	# We need to unset DISPLAY, else the configure script might have problems detecting the pygtk module
-	unset DISPLAY
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myconf=( --disable-static )
-
-	if use python; then
-		myconf+=(
-			$(multilib_native_use_enable dbus python-dbus)
-			$(multilib_native_use_enable gtk pygtk)
-		)
-	fi
-
-	if use mono; then
-		myconf+=( $(multilib_native_use_enable doc monodoc) )
-	fi
-
-	if ! multilib_is_native_abi; then
-		myconf+=(
-			# used by daemons only
-			--disable-libdaemon
-			--with-xml=none
-		)
-	fi
-
-	econf \
-		--localstatedir="${EPREFIX}/var" \
-		--with-distro=gentoo \
-		--disable-python-dbus \
-		--disable-pygtk \
-		--disable-xmltoman \
-		--disable-monodoc \
-		--enable-glib \
-		--enable-gobject \
-		$(multilib_native_use_enable test tests) \
-		$(multilib_native_use_enable autoipd) \
-		$(use_enable mdnsresponder-compat compat-libdns_sd) \
-		$(use_enable howl-compat compat-howl) \
-		$(multilib_native_use_enable doc doxygen-doc) \
-		$(multilib_native_use_enable mono) \
-		$(use_enable dbus) \
-		$(multilib_native_use_enable python) \
-		$(use_enable gtk) \
-		$(use_enable gtk3) \
-		$(use_enable nls) \
-		$(multilib_native_use_enable introspection) \
-		$(multilib_native_use_enable utils gtk-utils) \
-		--disable-qt3 \
-		$(use_enable qt4) \
-		$(use_enable gdbm) \
-		$(systemd_with_unitdir) \
-		"${myconf[@]}"
-}
-
-multilib_src_compile() {
-	emake
-
-	multilib_is_native_abi && use doc && emake avahi.devhelp
-}
-
-multilib_src_install() {
-	emake install DESTDIR="${D}"
-	use bookmarks && use python && use dbus && use gtk || \
-		rm -f "${ED}"/usr/bin/avahi-bookmarks
-
-	use howl-compat && dosym avahi-compat-howl.pc /usr/$(get_libdir)/pkgconfig/howl.pc
-	use mdnsresponder-compat && dosym avahi-compat-libdns_sd/dns_sd.h /usr/include/dns_sd.h
-
-	# Needed for running on systemd properly, bug #537000
-	if multilib_is_native_abi; then
-		ln -s avahi-daemon.service "${D}$(systemd_get_unitdir)"/dbus-org.freedesktop.Avahi.service || die
-	fi
-
-	if multilib_is_native_abi && use doc; then
-		dohtml -r doxygen/html/. || die
-		insinto /usr/share/devhelp/books/avahi
-		doins avahi.devhelp || die
-	fi
-}
-
-multilib_src_install_all() {
-	if use autoipd; then
-		insinto /$(get_libdir)/rcscripts/net
-		doins "${FILESDIR}"/autoipd.sh
-
-		insinto /$(get_libdir)/netifrc/net
-		newins "${FILESDIR}"/autoipd-openrc.sh autoipd.sh
-	fi
-
-	dodoc docs/{AUTHORS,NEWS,README,TODO}
-
-	prune_libtool_files --all
-}
-
-pkg_postinst() {
-	if use autoipd; then
-		elog
-		elog "To use avahi-autoipd to configure your interfaces with IPv4LL (RFC3927)"
-		elog "addresses, just set config_<interface>=( autoipd ) in /etc/conf.d/net!"
-		elog
-	fi
-}
diff --git a/net-dns/avahi/avahi-0.6.31-r11.ebuild b/net-dns/avahi/avahi-0.6.31-r11.ebuild
deleted file mode 100644
index 94f7006549c2..000000000000
--- a/net-dns/avahi/avahi-0.6.31-r11.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="gdbm"
-
-WANT_AUTOMAKE=1.11
-
-inherit autotools eutils flag-o-matic multilib multilib-minimal mono-env \
-	python-r1 systemd user
-
-DESCRIPTION="System which facilitates service discovery on a local network"
-HOMEPAGE="http://avahi.org/"
-SRC_URI="http://avahi.org/download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
-IUSE="autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono nls python qt4 selinux test utils"
-
-REQUIRED_USE="
-	utils? ( || ( gtk gtk3 ) )
-	python? ( dbus gdbm ${PYTHON_REQUIRED_USE} )
-	mono? ( dbus )
-	howl-compat? ( dbus )
-	mdnsresponder-compat? ( dbus )
-"
-
-COMMON_DEPEND="
-	dev-libs/libdaemon
-	dev-libs/expat
-	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-	gdbm? ( >=sys-libs/gdbm-1.10-r1[${MULTILIB_USEDEP}] )
-	qt4? ( dev-qt/qtcore:4[${MULTILIB_USEDEP}] )
-	gtk? ( x11-libs/gtk+:2[${MULTILIB_USEDEP}] )
-	gtk3? ( x11-libs/gtk+:3[${MULTILIB_USEDEP}] )
-	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
-	kernel_linux? ( sys-libs/libcap )
-	introspection? ( dev-libs/gobject-introspection:= )
-	mono? (
-		dev-lang/mono
-		gtk? ( dev-dotnet/gtk-sharp )
-	)
-	python? (
-		${PYTHON_DEPS}
-		gtk? ( dev-python/pygtk )
-		dbus? ( dev-python/dbus-python )
-	)
-	bookmarks? (
-		dev-python/twisted-core
-		dev-python/twisted-web
-	)
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	dev-util/intltool
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	doc? (
-		app-doc/doxygen
-	)
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	howl-compat? ( !net-misc/howl )
-	mdnsresponder-compat? ( !net-misc/mDNSResponder )
-	selinux? ( sec-policy/selinux-avahi )
-"
-
-pkg_preinst() {
-	enewgroup netdev
-	enewgroup avahi
-	enewuser avahi -1 -1 -1 avahi
-
-	if use autoipd; then
-		enewgroup avahi-autoipd
-		enewuser avahi-autoipd -1 -1 -1 avahi-autoipd
-	fi
-}
-
-pkg_setup() {
-	use mono && mono-env_pkg_setup
-}
-
-src_prepare() {
-	if use ipv6; then
-		sed -i \
-			-e s/use-ipv6=no/use-ipv6=yes/ \
-			avahi-daemon/avahi-daemon.conf || die
-	fi
-
-	sed -i\
-		-e "s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/:" \
-		doxygen_to_devhelp.xsl || die
-
-	# Make gtk utils optional
-	epatch "${FILESDIR}"/${PN}-0.6.30-optional-gtk-utils.patch
-
-	# Fix init scripts for >=openrc-0.9.0, bug #383641
-	epatch "${FILESDIR}"/${PN}-0.6.x-openrc-0.9.x-init-scripts-fixes.patch
-
-	# install-exec-local -> install-exec-hook
-	epatch "${FILESDIR}"/${P}-install-exec-hook.patch
-
-	# Backport host-name-from-machine-id patch, bug #466134
-	epatch "${FILESDIR}"/${P}-host-name-from-machine-id.patch
-
-	# Don't install avahi-discover unless ENABLE_GTK_UTILS, bug #359575
-	epatch "${FILESDIR}"/${P}-fix-install-avahi-discover.patch
-
-	epatch "${FILESDIR}"/${P}-so_reuseport-may-not-exist-in-running-kernel.patch
-
-	# allow building client without the daemon
-	epatch "${FILESDIR}"/${P}-build-client-without-daemon.patch
-
-	# Fix build under various locales, bug #501664
-	epatch "${FILESDIR}"/${P}-fix-locale-build.patch
-
-	# Fix "Invalid response packet from host", bug #559408.
-	epatch "${FILESDIR}"/${P}-invalid_packet.patch
-
-	# Drop DEPRECATED flags, bug #384743
-	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED=1::g' avahi-ui/Makefile.am || die
-
-	# Fix references to Lennart's home directory, bug #466210
-	sed -i -e 's/\/home\/lennart\/tmp\/avahi//g' man/* || die
-
-	# Bug #525832
-	epatch_user
-
-	# Prevent .pyc files in DESTDIR
-	>py-compile
-
-	eautoreconf
-
-	# bundled manpages
-	multilib_copy_sources
-}
-
-src_configure() {
-	# those steps should be done once-per-ebuild rather than per-ABI
-	use sh && replace-flags -O? -O0
-	use python && python_export_best
-
-	# We need to unset DISPLAY, else the configure script might have problems detecting the pygtk module
-	unset DISPLAY
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myconf=( --disable-static )
-
-	if use python; then
-		myconf+=(
-			$(multilib_native_use_enable dbus python-dbus)
-			$(multilib_native_use_enable gtk pygtk)
-		)
-	fi
-
-	if use mono; then
-		myconf+=( $(multilib_native_use_enable doc monodoc) )
-	fi
-
-	if ! multilib_is_native_abi; then
-		myconf+=(
-			# used by daemons only
-			--disable-libdaemon
-			--with-xml=none
-		)
-	fi
-
-	econf \
-		--localstatedir="${EPREFIX}/var" \
-		--with-distro=gentoo \
-		--disable-python-dbus \
-		--disable-pygtk \
-		--disable-xmltoman \
-		--disable-monodoc \
-		--enable-glib \
-		--enable-gobject \
-		$(multilib_native_use_enable test tests) \
-		$(multilib_native_use_enable autoipd) \
-		$(use_enable mdnsresponder-compat compat-libdns_sd) \
-		$(use_enable howl-compat compat-howl) \
-		$(multilib_native_use_enable doc doxygen-doc) \
-		$(multilib_native_use_enable mono) \
-		$(use_enable dbus) \
-		$(multilib_native_use_enable python) \
-		$(use_enable gtk) \
-		$(use_enable gtk3) \
-		$(use_enable nls) \
-		$(multilib_native_use_enable introspection) \
-		$(multilib_native_use_enable utils gtk-utils) \
-		--disable-qt3 \
-		$(use_enable qt4) \
-		$(use_enable gdbm) \
-		$(systemd_with_unitdir) \
-		"${myconf[@]}"
-}
-
-multilib_src_compile() {
-	emake
-
-	multilib_is_native_abi && use doc && emake avahi.devhelp
-}
-
-multilib_src_install() {
-	emake install DESTDIR="${D}"
-	use bookmarks && use python && use dbus && use gtk || \
-		rm -f "${ED}"/usr/bin/avahi-bookmarks
-
-	use howl-compat && dosym avahi-compat-howl.pc /usr/$(get_libdir)/pkgconfig/howl.pc
-	use mdnsresponder-compat && dosym avahi-compat-libdns_sd/dns_sd.h /usr/include/dns_sd.h
-
-	if multilib_is_native_abi && use doc; then
-		dohtml -r doxygen/html/. || die
-		insinto /usr/share/devhelp/books/avahi
-		doins avahi.devhelp || die
-	fi
-}
-
-multilib_src_install_all() {
-	if use autoipd; then
-		insinto /$(get_libdir)/rcscripts/net
-		doins "${FILESDIR}"/autoipd.sh
-
-		insinto /$(get_libdir)/netifrc/net
-		newins "${FILESDIR}"/autoipd-openrc.sh autoipd.sh
-	fi
-
-	dodoc docs/{AUTHORS,NEWS,README,TODO}
-
-	prune_libtool_files --all
-}
-
-pkg_postinst() {
-	if use autoipd; then
-		elog
-		elog "To use avahi-autoipd to configure your interfaces with IPv4LL (RFC3927)"
-		elog "addresses, just set config_<interface>=( autoipd ) in /etc/conf.d/net!"
-		elog
-	fi
-}
diff --git a/net-dns/avahi/avahi-0.6.32-r1.ebuild b/net-dns/avahi/avahi-0.6.32-r1.ebuild
deleted file mode 100644
index 71f6d18d0495..000000000000
--- a/net-dns/avahi/avahi-0.6.32-r1.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="gdbm"
-
-WANT_AUTOMAKE=1.11
-
-inherit autotools eutils flag-o-matic multilib multilib-minimal mono-env python-r1 systemd user
-
-DESCRIPTION="System which facilitates service discovery on a local network"
-HOMEPAGE="http://avahi.org/"
-SRC_URI="https://github.com/lathiat/avahi/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-S="${WORKDIR}/${P}"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono nls python qt4 selinux test utils"
-
-REQUIRED_USE="
-	utils? ( || ( gtk gtk3 ) )
-	python? ( dbus gdbm ${PYTHON_REQUIRED_USE} )
-	mono? ( dbus )
-	howl-compat? ( dbus )
-	mdnsresponder-compat? ( dbus )
-"
-
-COMMON_DEPEND="
-	dev-libs/libdaemon
-	dev-libs/expat
-	dev-libs/glib:2[${MULTILIB_USEDEP}]
-	gdbm? ( sys-libs/gdbm[${MULTILIB_USEDEP}] )
-	qt4? ( dev-qt/qtcore:4[${MULTILIB_USEDEP}] )
-	gtk? ( x11-libs/gtk+:2[${MULTILIB_USEDEP}] )
-	gtk3? ( x11-libs/gtk+:3[${MULTILIB_USEDEP}] )
-	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	kernel_linux? ( sys-libs/libcap )
-	introspection? ( dev-libs/gobject-introspection:= )
-	mono? (
-		dev-lang/mono
-		gtk? ( dev-dotnet/gtk-sharp )
-	)
-	python? (
-		${PYTHON_DEPS}
-		gtk? ( dev-python/pygtk )
-		dbus? ( dev-python/dbus-python )
-	)
-	bookmarks? (
-		dev-python/twisted-core
-		dev-python/twisted-web
-	)
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	doc? ( app-doc/doxygen )
-	app-doc/xmltoman
-	dev-util/intltool
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	howl-compat? ( !net-misc/howl )
-	mdnsresponder-compat? ( !net-misc/mDNSResponder )
-	selinux? ( sec-policy/selinux-avahi )
-"
-
-pkg_preinst() {
-	enewgroup netdev
-	enewgroup avahi
-	enewuser avahi -1 -1 -1 avahi
-
-	if use autoipd; then
-		enewgroup avahi-autoipd
-		enewuser avahi-autoipd -1 -1 -1 avahi-autoipd
-	fi
-}
-
-pkg_setup() {
-	use mono && mono-env_pkg_setup
-}
-
-src_prepare() {
-	if ! use ipv6; then
-		sed -i \
-			-e s/use-ipv6=yes/use-ipv6=no/ \
-			avahi-daemon/avahi-daemon.conf || die
-	fi
-
-	sed -i\
-		-e "s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/:" \
-		doxygen_to_devhelp.xsl || die
-
-	# Make gtk utils optional
-	# https://github.com/lathiat/avahi/issues/24
-	epatch "${FILESDIR}"/${PN}-0.6.30-optional-gtk-utils.patch
-
-	# Don't install avahi-discover unless ENABLE_GTK_UTILS, bug #359575
-	# https://github.com/lathiat/avahi/issues/24
-	epatch "${FILESDIR}"/${PN}-0.6.31-fix-install-avahi-discover.patch
-
-	# Fix build under various locales, bug #501664
-	# https://github.com/lathiat/avahi/issues/27
-	epatch "${FILESDIR}"/${PN}-0.6.31-fix-locale-build.patch
-
-	# Update the init scripts for the new openrc, bug #594622
-	epatch "${FILESDIR}"/${PN}-0.6.32-openrc-0.21.7-fix-init-scripts.patch
-
-	# Bug #525832
-	epatch_user
-
-	# Prevent .pyc files in DESTDIR
-	>py-compile
-
-	eautoreconf
-
-	# bundled manpages
-	multilib_copy_sources
-}
-
-src_configure() {
-	# those steps should be done once-per-ebuild rather than per-ABI
-	use sh && replace-flags -O? -O0
-	use python && python_export_best
-
-	# We need to unset DISPLAY, else the configure script might have problems detecting the pygtk module
-	unset DISPLAY
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myconf=( --disable-static )
-
-	if use python; then
-		myconf+=(
-			$(multilib_native_use_enable dbus python-dbus)
-			$(multilib_native_use_enable gtk pygtk)
-		)
-	fi
-
-	if use mono; then
-		myconf+=( $(multilib_native_use_enable doc monodoc) )
-	fi
-
-	if ! multilib_is_native_abi; then
-		myconf+=(
-			# used by daemons only
-			--disable-libdaemon
-			--with-xml=none
-		)
-	fi
-
-	econf \
-		--localstatedir="${EPREFIX}/var" \
-		--with-distro=gentoo \
-		--disable-python-dbus \
-		--disable-pygtk \
-		--enable-manpages \
-		--enable-xmltoman \
-		--disable-monodoc \
-		--enable-glib \
-		--enable-gobject \
-		$(multilib_native_use_enable test tests) \
-		$(multilib_native_use_enable autoipd) \
-		$(use_enable mdnsresponder-compat compat-libdns_sd) \
-		$(use_enable howl-compat compat-howl) \
-		$(multilib_native_use_enable doc doxygen-doc) \
-		$(multilib_native_use_enable mono) \
-		$(use_enable dbus) \
-		$(multilib_native_use_enable python) \
-		$(use_enable gtk) \
-		$(use_enable gtk3) \
-		$(use_enable nls) \
-		$(multilib_native_use_enable introspection) \
-		$(multilib_native_use_enable utils gtk-utils) \
-		--disable-qt3 \
-		$(use_enable qt4) \
-		$(use_enable gdbm) \
-		$(systemd_with_unitdir) \
-		"${myconf[@]}"
-}
-
-multilib_src_compile() {
-	emake
-
-	multilib_is_native_abi && use doc && emake avahi.devhelp
-}
-
-multilib_src_install() {
-	emake install DESTDIR="${D}"
-	use bookmarks && use python && use dbus && use gtk || \
-		rm -f "${ED}"/usr/bin/avahi-bookmarks
-
-	# https://github.com/lathiat/avahi/issues/28
-	use howl-compat && dosym avahi-compat-howl.pc /usr/$(get_libdir)/pkgconfig/howl.pc
-	use mdnsresponder-compat && dosym avahi-compat-libdns_sd/dns_sd.h /usr/include/dns_sd.h
-
-	if multilib_is_native_abi && use doc; then
-		dohtml -r doxygen/html/. || die
-		insinto /usr/share/devhelp/books/avahi
-		doins avahi.devhelp || die
-	fi
-}
-
-multilib_src_install_all() {
-	if use autoipd; then
-		insinto /$(get_libdir)/rcscripts/net
-		doins "${FILESDIR}"/autoipd.sh
-
-		insinto /$(get_libdir)/netifrc/net
-		newins "${FILESDIR}"/autoipd-openrc.sh autoipd.sh
-	fi
-
-	dodoc docs/{AUTHORS,NEWS,README,TODO}
-
-	prune_libtool_files --all
-}
-
-pkg_postinst() {
-	if use autoipd; then
-		elog
-		elog "To use avahi-autoipd to configure your interfaces with IPv4LL (RFC3927)"
-		elog "addresses, just set config_<interface>=( autoipd ) in /etc/conf.d/net!"
-		elog
-	fi
-}
diff --git a/net-dns/avahi/avahi-0.6.32-r2.ebuild b/net-dns/avahi/avahi-0.6.32-r2.ebuild
deleted file mode 100644
index 876f83bcf2d8..000000000000
--- a/net-dns/avahi/avahi-0.6.32-r2.ebuild
+++ /dev/null
@@ -1,236 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="gdbm"
-
-WANT_AUTOMAKE=1.11
-
-inherit autotools eutils flag-o-matic multilib multilib-minimal mono-env python-r1 systemd user
-
-DESCRIPTION="System which facilitates service discovery on a local network"
-HOMEPAGE="http://avahi.org/"
-SRC_URI="https://github.com/lathiat/avahi/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-S="${WORKDIR}/${P}"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86"
-IUSE="autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono nls python qt4 selinux test utils"
-
-REQUIRED_USE="
-	utils? ( || ( gtk gtk3 ) )
-	python? ( dbus gdbm ${PYTHON_REQUIRED_USE} )
-	mono? ( dbus )
-	howl-compat? ( dbus )
-	mdnsresponder-compat? ( dbus )
-"
-
-COMMON_DEPEND="
-	dev-libs/libdaemon
-	dev-libs/expat
-	dev-libs/glib:2[${MULTILIB_USEDEP}]
-	gdbm? ( sys-libs/gdbm[${MULTILIB_USEDEP}] )
-	qt4? ( dev-qt/qtcore:4[${MULTILIB_USEDEP}] )
-	gtk? ( x11-libs/gtk+:2[${MULTILIB_USEDEP}] )
-	gtk3? ( x11-libs/gtk+:3[${MULTILIB_USEDEP}] )
-	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	kernel_linux? ( sys-libs/libcap )
-	introspection? ( dev-libs/gobject-introspection:= )
-	mono? (
-		dev-lang/mono
-		gtk? ( dev-dotnet/gtk-sharp )
-	)
-	python? (
-		${PYTHON_DEPS}
-		gtk? ( dev-python/pygtk[${PYTHON_USEDEP}] )
-		dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
-	)
-	bookmarks? (
-		${PYTHON_DEPS}
-		>=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
-	)
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	doc? ( app-doc/doxygen )
-	app-doc/xmltoman
-	dev-util/intltool
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	howl-compat? ( !net-misc/howl )
-	mdnsresponder-compat? ( !net-misc/mDNSResponder )
-	selinux? ( sec-policy/selinux-avahi )
-"
-
-pkg_preinst() {
-	enewgroup netdev
-	enewgroup avahi
-	enewuser avahi -1 -1 -1 avahi
-
-	if use autoipd; then
-		enewgroup avahi-autoipd
-		enewuser avahi-autoipd -1 -1 -1 avahi-autoipd
-	fi
-}
-
-pkg_setup() {
-	use mono && mono-env_pkg_setup
-}
-
-src_prepare() {
-	if ! use ipv6; then
-		sed -i \
-			-e s/use-ipv6=yes/use-ipv6=no/ \
-			avahi-daemon/avahi-daemon.conf || die
-	fi
-
-	sed -i\
-		-e "s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/:" \
-		doxygen_to_devhelp.xsl || die
-
-	# Make gtk utils optional
-	# https://github.com/lathiat/avahi/issues/24
-	epatch "${FILESDIR}"/${PN}-0.6.30-optional-gtk-utils.patch
-
-	# Don't install avahi-discover unless ENABLE_GTK_UTILS, bug #359575
-	# https://github.com/lathiat/avahi/issues/24
-	epatch "${FILESDIR}"/${PN}-0.6.31-fix-install-avahi-discover.patch
-
-	# Fix build under various locales, bug #501664
-	# https://github.com/lathiat/avahi/issues/27
-	epatch "${FILESDIR}"/${PN}-0.6.31-fix-locale-build.patch
-
-	# Update the init scripts for the new openrc, bug #594622
-	epatch "${FILESDIR}"/${PN}-0.6.32-openrc-0.21.7-fix-init-scripts.patch
-
-	# Don't pick up wrong moc based on qtchooser default, bug #587830
-	epatch "${FILESDIR}"/${PN}-0.6.32-mocqt4.patch
-
-	# Bug #525832
-	epatch_user
-
-	# Prevent .pyc files in DESTDIR
-	>py-compile
-
-	eautoreconf
-
-	# bundled manpages
-	multilib_copy_sources
-}
-
-src_configure() {
-	# those steps should be done once-per-ebuild rather than per-ABI
-	use sh && replace-flags -O? -O0
-	use python && python_export_best
-
-	# We need to unset DISPLAY, else the configure script might have problems detecting the pygtk module
-	unset DISPLAY
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myconf=( --disable-static )
-
-	if use python; then
-		myconf+=(
-			$(multilib_native_use_enable dbus python-dbus)
-			$(multilib_native_use_enable gtk pygtk)
-		)
-	fi
-
-	if use mono; then
-		myconf+=( $(multilib_native_use_enable doc monodoc) )
-	fi
-
-	if ! multilib_is_native_abi; then
-		myconf+=(
-			# used by daemons only
-			--disable-libdaemon
-			--with-xml=none
-		)
-	fi
-
-	econf \
-		--localstatedir="${EPREFIX}/var" \
-		--with-distro=gentoo \
-		--disable-python-dbus \
-		--disable-pygtk \
-		--enable-manpages \
-		--enable-xmltoman \
-		--disable-monodoc \
-		--enable-glib \
-		--enable-gobject \
-		$(multilib_native_use_enable test tests) \
-		$(multilib_native_use_enable autoipd) \
-		$(use_enable mdnsresponder-compat compat-libdns_sd) \
-		$(use_enable howl-compat compat-howl) \
-		$(multilib_native_use_enable doc doxygen-doc) \
-		$(multilib_native_use_enable mono) \
-		$(use_enable dbus) \
-		$(multilib_native_use_enable python) \
-		$(use_enable gtk) \
-		$(use_enable gtk3) \
-		$(use_enable nls) \
-		$(multilib_native_use_enable introspection) \
-		$(multilib_native_use_enable utils gtk-utils) \
-		--disable-qt3 \
-		$(use_enable qt4) \
-		$(use_enable gdbm) \
-		$(systemd_with_unitdir) \
-		"${myconf[@]}"
-}
-
-multilib_src_compile() {
-	emake
-
-	multilib_is_native_abi && use doc && emake avahi.devhelp
-}
-
-multilib_src_install() {
-	emake install DESTDIR="${D}"
-	use bookmarks && use python && use dbus && use gtk || \
-		rm -f "${ED}"/usr/bin/avahi-bookmarks
-
-	# https://github.com/lathiat/avahi/issues/28
-	use howl-compat && dosym avahi-compat-howl.pc /usr/$(get_libdir)/pkgconfig/howl.pc
-	use mdnsresponder-compat && dosym avahi-compat-libdns_sd/dns_sd.h /usr/include/dns_sd.h
-
-	if multilib_is_native_abi && use doc; then
-		dohtml -r doxygen/html/. || die
-		insinto /usr/share/devhelp/books/avahi
-		doins avahi.devhelp || die
-	fi
-}
-
-multilib_src_install_all() {
-	if use autoipd; then
-		insinto /$(get_libdir)/rcscripts/net
-		doins "${FILESDIR}"/autoipd.sh
-
-		insinto /$(get_libdir)/netifrc/net
-		newins "${FILESDIR}"/autoipd-openrc.sh autoipd.sh
-	fi
-
-	dodoc docs/{AUTHORS,NEWS,README,TODO}
-
-	prune_libtool_files --all
-}
-
-pkg_postinst() {
-	if use autoipd; then
-		elog
-		elog "To use avahi-autoipd to configure your interfaces with IPv4LL (RFC3927)"
-		elog "addresses, just set config_<interface>=( autoipd ) in /etc/conf.d/net!"
-		elog
-	fi
-}
diff --git a/net-dns/avahi/avahi-0.6.32.ebuild b/net-dns/avahi/avahi-0.6.32.ebuild
index dfb6fef26f2b..6e42b980484e 100644
--- a/net-dns/avahi/avahi-0.6.32.ebuild
+++ b/net-dns/avahi/avahi-0.6.32.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -18,7 +18,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="hppa"
 IUSE="autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono nls python qt4 selinux test utils"
 
 REQUIRED_USE="
diff --git a/net-dns/avahi/avahi-0.7.ebuild b/net-dns/avahi/avahi-0.7.ebuild
deleted file mode 100644
index 973151c0501b..000000000000
--- a/net-dns/avahi/avahi-0.7.ebuild
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="gdbm"
-
-WANT_AUTOMAKE=1.11
-
-inherit autotools eutils flag-o-matic multilib multilib-minimal mono-env python-r1 systemd user
-
-DESCRIPTION="System which facilitates service discovery on a local network"
-HOMEPAGE="http://avahi.org/"
-SRC_URI="https://github.com/lathiat/avahi/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-S="${WORKDIR}/${P}"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE="autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono nls python qt4 selinux test"
-
-REQUIRED_USE="
-	python? ( dbus gdbm ${PYTHON_REQUIRED_USE} )
-	mono? ( dbus )
-	howl-compat? ( dbus )
-	mdnsresponder-compat? ( dbus )
-"
-
-COMMON_DEPEND="
-	dev-libs/libdaemon
-	dev-libs/expat
-	dev-libs/glib:2[${MULTILIB_USEDEP}]
-	gdbm? ( sys-libs/gdbm[${MULTILIB_USEDEP}] )
-	qt4? ( dev-qt/qtcore:4[${MULTILIB_USEDEP}] )
-	gtk? ( x11-libs/gtk+:2[${MULTILIB_USEDEP}] )
-	gtk3? ( x11-libs/gtk+:3[${MULTILIB_USEDEP}] )
-	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	kernel_linux? ( sys-libs/libcap )
-	introspection? ( dev-libs/gobject-introspection:= )
-	mono? (
-		dev-lang/mono
-		gtk? ( dev-dotnet/gtk-sharp )
-	)
-	python? (
-		${PYTHON_DEPS}
-		dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
-		introspection? ( dev-python/pygobject:3[${PYTHON_USEDEP}] )
-	)
-	bookmarks? (
-		${PYTHON_DEPS}
-		>=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
-	)
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	doc? ( app-doc/doxygen )
-	app-doc/xmltoman
-	dev-util/intltool
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	howl-compat? ( !net-misc/howl )
-	mdnsresponder-compat? ( !net-misc/mDNSResponder )
-	selinux? ( sec-policy/selinux-avahi )
-"
-
-pkg_preinst() {
-	enewgroup netdev
-	enewgroup avahi
-	enewuser avahi -1 -1 -1 avahi
-
-	if use autoipd; then
-		enewgroup avahi-autoipd
-		enewuser avahi-autoipd -1 -1 -1 avahi-autoipd
-	fi
-}
-
-pkg_setup() {
-	use mono && mono-env_pkg_setup
-}
-
-src_prepare() {
-	if ! use ipv6; then
-		sed -i \
-			-e s/use-ipv6=yes/use-ipv6=no/ \
-			avahi-daemon/avahi-daemon.conf || die
-	fi
-
-	sed -i\
-		-e "s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/:" \
-		doxygen_to_devhelp.xsl || die
-
-	# Don't pick up wrong moc based on qtchooser default, bug #587830
-	eapply "${FILESDIR}"/${PN}-0.6.32-mocqt4.patch
-
-	eapply_user
-
-	# Prevent .pyc files in DESTDIR
-	>py-compile
-
-	eautoreconf
-
-	# bundled manpages
-	multilib_copy_sources
-}
-
-src_configure() {
-	# those steps should be done once-per-ebuild rather than per-ABI
-	use sh && replace-flags -O? -O0
-	use python && python_setup
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myconf=( --disable-static )
-
-	if use python; then
-		myconf+=(
-			$(multilib_native_use_enable dbus python-dbus)
-			$(multilib_native_use_enable introspection pygobject)
-		)
-	fi
-
-	if use mono; then
-		myconf+=( $(multilib_native_use_enable doc monodoc) )
-	fi
-
-	if ! multilib_is_native_abi; then
-		myconf+=(
-			# used by daemons only
-			--disable-libdaemon
-			--with-xml=none
-		)
-	fi
-
-	econf \
-		--localstatedir="${EPREFIX}/var" \
-		--with-distro=gentoo \
-		--disable-python-dbus \
-		--enable-manpages \
-		--enable-xmltoman \
-		--disable-monodoc \
-		--enable-glib \
-		--enable-gobject \
-		$(multilib_native_use_enable test tests) \
-		$(multilib_native_use_enable autoipd) \
-		$(use_enable mdnsresponder-compat compat-libdns_sd) \
-		$(use_enable howl-compat compat-howl) \
-		$(multilib_native_use_enable doc doxygen-doc) \
-		$(multilib_native_use_enable mono) \
-		$(use_enable dbus) \
-		$(multilib_native_use_enable python) \
-		$(use_enable gtk) \
-		$(use_enable gtk3) \
-		$(use_enable nls) \
-		$(multilib_native_use_enable introspection) \
-		--disable-qt3 \
-		$(use_enable qt4) \
-		$(use_enable gdbm) \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		"${myconf[@]}"
-}
-
-multilib_src_compile() {
-	emake
-
-	multilib_is_native_abi && use doc && emake avahi.devhelp
-}
-
-multilib_src_install() {
-	emake install DESTDIR="${D}"
-	use bookmarks && use python && use dbus && use gtk || \
-		rm -f "${ED}"/usr/bin/avahi-bookmarks
-
-	# https://github.com/lathiat/avahi/issues/28
-	use howl-compat && dosym avahi-compat-howl.pc /usr/$(get_libdir)/pkgconfig/howl.pc
-	use mdnsresponder-compat && dosym avahi-compat-libdns_sd/dns_sd.h /usr/include/dns_sd.h
-
-	if multilib_is_native_abi && use doc; then
-		docinto html
-		dodoc -r doxygen/html/.
-		insinto /usr/share/devhelp/books/avahi
-		doins avahi.devhelp || die
-	fi
-}
-
-multilib_src_install_all() {
-	if use autoipd; then
-		insinto /$(get_libdir)/rcscripts/net
-		doins "${FILESDIR}"/autoipd.sh
-
-		insinto /$(get_libdir)/netifrc/net
-		newins "${FILESDIR}"/autoipd-openrc.sh autoipd.sh
-	fi
-
-	dodoc docs/{AUTHORS,NEWS,README,TODO}
-
-	prune_libtool_files --all
-}
-
-pkg_postinst() {
-	if use autoipd; then
-		elog
-		elog "To use avahi-autoipd to configure your interfaces with IPv4LL (RFC3927)"
-		elog "addresses, just set config_<interface>=( autoipd ) in /etc/conf.d/net!"
-		elog
-	fi
-}
diff --git a/net-dns/avahi/files/avahi-0.6.31-build-client-without-daemon.patch b/net-dns/avahi/files/avahi-0.6.31-build-client-without-daemon.patch
deleted file mode 100644
index df0c420fa62a..000000000000
--- a/net-dns/avahi/files/avahi-0.6.31-build-client-without-daemon.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From ce3b83de6aa689c0cefe0b1e85c03a627b537099 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Mon, 12 May 2014 19:46:22 +0200
-Subject: [PATCH] Allow building client without the daemon.
-
-There's no good reason to disallow that, and that's what we specifically
-want to do for multilib.
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 0e190ba..c56cf01 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1185,7 +1185,7 @@ fi
- 
- BUILD_CLIENT="no   (You need avahi-daemon and D-Bus!)"
- 
--if test "x$BUILD_DAEMON" = "xyes" -a "x$HAVE_DBUS" = "xyes" ; then
-+if "x$HAVE_DBUS" = "xyes" ; then
-     BUILD_CLIENT=yes
- fi
- 
--- 
-1.9.3
-
diff --git a/net-dns/avahi/files/avahi-0.6.31-host-name-from-machine-id.patch b/net-dns/avahi/files/avahi-0.6.31-host-name-from-machine-id.patch
deleted file mode 100644
index 17ecba52534b..000000000000
--- a/net-dns/avahi/files/avahi-0.6.31-host-name-from-machine-id.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From: David Zeuthen <zeuthen@chromium.org>
-Date: Tue, 5 Mar 2013 19:52:38 +0000 (-0800)
-Subject: avahi-daemon: add option "host-name-from-machine-id="
-X-Git-Url: http://git.0pointer.de/?p=avahi.git;a=commitdiff_plain;h=147cdce70b22ae7cee9fb4fe123db40952f31c9e
-
-avahi-daemon: add option "host-name-from-machine-id="
-
-Signed-off-by: David Zeuthen <zeuthen@chromium.org>
----
-
-diff --git a/avahi-daemon/main.c b/avahi-daemon/main.c
-index d46f40a..8c28fd6 100644
---- a/avahi-daemon/main.c
-+++ b/avahi-daemon/main.c
-@@ -65,6 +65,7 @@
- #include <avahi-core/publish.h>
- #include <avahi-core/dns-srv-rr.h>
- #include <avahi-core/log.h>
-+#include <avahi-core/util.h>
- 
- #ifdef ENABLE_CHROOT
- #include "chroot.h"
-@@ -576,6 +577,29 @@ static int parse_usec(const char *s, AvahiUsec *u) {
-     return 0;
- }
- 
-+static char *get_machine_id(void) {
-+    int fd;
-+    char buf[32];
-+
-+    fd = open("/etc/machine-id", O_RDONLY|O_CLOEXEC|O_NOCTTY);
-+    if (fd == -1 && errno == ENOENT)
-+        fd = open("/var/lib/dbus/machine-id", O_RDONLY|O_CLOEXEC|O_NOCTTY);
-+    if (fd == -1)
-+        return NULL;
-+
-+    /* File is on a filesystem so we never get EINTR or partial reads */
-+    if (read(fd, buf, sizeof buf) != sizeof buf) {
-+        close(fd);
-+        return NULL;
-+    }
-+    close(fd);
-+
-+    /* Contents can be lower, upper and even mixed case so normalize */
-+    avahi_strdown(buf);
-+
-+    return avahi_strndup(buf, sizeof buf);
-+}
-+
- static int load_config_file(DaemonConfig *c) {
-     int r = -1;
-     AvahiIniFile *f;
-@@ -631,6 +655,15 @@ static int load_config_file(DaemonConfig *c) {
-                     c->server_config.use_iff_running = is_yes(p->value);
-                 else if (strcasecmp(p->key, "disallow-other-stacks") == 0)
-                     c->server_config.disallow_other_stacks = is_yes(p->value);
-+                else if (strcasecmp(p->key, "host-name-from-machine-id") == 0) {
-+                    if (*(p->value) == 'y' || *(p->value) == 'Y') {
-+                        char *machine_id = get_machine_id();
-+                        if (machine_id != NULL) {
-+                            avahi_free(c->server_config.host_name);
-+                            c->server_config.host_name = machine_id;
-+                        }
-+                    }
-+                }
- #ifdef HAVE_DBUS
-                 else if (strcasecmp(p->key, "enable-dbus") == 0) {
- 
-diff --git a/man/avahi-daemon.conf.5.xml.in b/man/avahi-daemon.conf.5.xml.in
-index bea7ed5..2d15017 100644
---- a/man/avahi-daemon.conf.5.xml.in
-+++ b/man/avahi-daemon.conf.5.xml.in
-@@ -40,6 +40,12 @@
-     </option>
- 
-     <option>
-+      <p><opt>host-name-from-machine-id=</opt> Takes a boolean
-+      value ("yes" or "no"). If set to "yes" avahi-daemon
-+      will use the machine-id as name on the LAN.</p>
-+    </option>
-+
-+    <option>
-       <p><opt>domain-name=</opt> Set the default domain name avahi-daemon
-       tries to register its host name and services on the LAN in. If
-       omitted defaults to ".local".</p>
diff --git a/net-dns/avahi/files/avahi-0.6.31-install-exec-hook.patch b/net-dns/avahi/files/avahi-0.6.31-install-exec-hook.patch
deleted file mode 100644
index d9a7bc3434c7..000000000000
--- a/net-dns/avahi/files/avahi-0.6.31-install-exec-hook.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- avahi-0.6.31/avahi-utils/Makefile.am
-+++ avahi-0.6.31/avahi-utils/Makefile.am
-@@ -53,7 +53,7 @@
- avahi_set_host_name_CFLAGS = $(AM_CFLAGS)
- avahi_set_host_name_LDADD = $(AM_LDADD) ../avahi-client/libavahi-client.la ../avahi-common/libavahi-common.la
- 
--install-exec-local:
-+install-exec-hook:
- 	cd $(DESTDIR)/$(bindir) && \
- 		rm -f avahi-resolve-host-name avahi-resolve-address avahi-browse-domains avahi-publish-address avahi-publish-service && \
- 		$(LN_S) avahi-resolve avahi-resolve-host-name && \
diff --git a/net-dns/avahi/files/avahi-0.6.31-invalid_packet.patch b/net-dns/avahi/files/avahi-0.6.31-invalid_packet.patch
deleted file mode 100644
index 5cfb4659bee6..000000000000
--- a/net-dns/avahi/files/avahi-0.6.31-invalid_packet.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Fix "Invalid response packet from host".  Bug #559408.
-
-See http://pkgs.fedoraproject.org/cgit/avahi.git/plain/avahi-0.6.31-invalid_packet.patch
-
-diff -up avahi-0.6.31/avahi-core/server.c.invalid_packet avahi-0.6.31/avahi-core/server.c
---- avahi-0.6.31/avahi-core/server.c.invalid_packet	2015-09-22 08:12:58.544588701 -0500
-+++ avahi-0.6.31/avahi-core/server.c	2015-09-22 08:13:39.743862403 -0500
-@@ -972,11 +972,9 @@ static void dispatch_packet(AvahiServer
-             return;
-         }
- 
--        if (avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_QDCOUNT) != 0 ||
--            avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_ANCOUNT) == 0 ||
--            avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_NSCOUNT) != 0) {
-+        if (avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_ANCOUNT) == 0) {
- 
--            avahi_log_warn("Invalid response packet from host %s.", avahi_address_snprint(t, sizeof(t), src_address));
-+            avahi_log_debug("Invalid response packet from host %s.", avahi_address_snprint(t, sizeof(t), src_address));
-             return;
-         }
- 
diff --git a/net-dns/avahi/files/avahi-0.6.31-so_reuseport-may-not-exist-in-running-kernel.patch b/net-dns/avahi/files/avahi-0.6.31-so_reuseport-may-not-exist-in-running-kernel.patch
deleted file mode 100644
index 9c23ca5e4554..000000000000
--- a/net-dns/avahi/files/avahi-0.6.31-so_reuseport-may-not-exist-in-running-kernel.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-https://bugs.gentoo.org/484212
-
-Description: SO_REUSEPORT may not exist in running kernel
- When userspace defines SO_REUSEPORT we will attempt to enable socket
- port number reuse.  However if the running kernel does not support
- this call it will fail preventing daemon startup.  If this call is
- present but fails ENOPROTOOPT then we know that actually the kernel
- does not support it and we should continue as if we did not have the
- call at all.  (LP: #1228204)
- .
- This patch could be removed from the debian package after jessie release.
-Author: Andy Whitcroft <apw@canonical.com>
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/1228204
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=732009
-Last-Update: 2013-09-20
-
-Index: avahi-0.6.31/avahi-core/socket.c
-===================================================================
---- avahi-0.6.31.orig/avahi-core/socket.c	2013-09-20 16:36:50.000000000 +0100
-+++ avahi-0.6.31/avahi-core/socket.c	2013-09-20 16:38:23.781863644 +0100
-@@ -177,7 +177,8 @@
-     yes = 1;
-     if (setsockopt(fd, SOL_SOCKET, SO_REUSEPORT, &yes, sizeof(yes)) < 0) {
-         avahi_log_warn("SO_REUSEPORT failed: %s", strerror(errno));
--        return -1;
-+        if (errno != ENOPROTOOPT)
-+            return -1;
-     }
- #endif
- 
diff --git a/net-dns/avahi/files/avahi-0.6.32-mocqt4.patch b/net-dns/avahi/files/avahi-0.6.32-mocqt4.patch
deleted file mode 100644
index bba25e971630..000000000000
--- a/net-dns/avahi/files/avahi-0.6.32-mocqt4.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/configure.ac	2018-01-11 23:00:47.503309612 +0100
-+++ b/configure.ac	2018-01-11 23:10:04.373295395 +0100
-@@ -516,8 +516,7 @@
-         PKG_CHECK_MODULES( QT4, [ QtCore >= 4.0.0 ])
-         AC_SUBST(QT4_CFLAGS)
-         AC_SUBST(QT4_LIBS)
--	    QT4_PREFIX="`$PKG_CONFIG --variable=prefix QtCore`/bin"
--        AC_PATH_PROGS(MOC_QT4, [moc-qt4 moc], no, [$QT4_PREFIX])
-+        MOC_QT4="`$PKG_CONFIG --variable=moc_location QtCore`"
-         if test "$MOC_QT4" = no; then
-             AC_MSG_ERROR([Could not find QT4 moc])
-         fi
diff --git a/net-dns/avahi/files/avahi-0.6.32-openrc-0.21.7-fix-init-scripts.patch b/net-dns/avahi/files/avahi-0.6.32-openrc-0.21.7-fix-init-scripts.patch
deleted file mode 100644
index 2b91179dd65f..000000000000
--- a/net-dns/avahi/files/avahi-0.6.32-openrc-0.21.7-fix-init-scripts.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Naur avahi-0.6.32.orig/initscript/gentoo/avahi-daemon.in avahi-0.6.32/initscript/gentoo/avahi-daemon.in
---- avahi-0.6.32.orig/initscript/gentoo/avahi-daemon.in	2016-02-15 21:13:45.000000000 -0500
-+++ avahi-0.6.32/initscript/gentoo/avahi-daemon.in	2016-09-21 20:58:01.999109439 -0400
-@@ -1,4 +1,4 @@
--#!/sbin/runscript
-+#!/sbin/openrc-run
- # Copyright 1999-2007 Gentoo Foundation
- # Distributed under the terms of the GNU General Public License v2
- 
-diff -Naur avahi-0.6.32.orig/initscript/gentoo/avahi-dnsconfd.in avahi-0.6.32/initscript/gentoo/avahi-dnsconfd.in
---- avahi-0.6.32.orig/initscript/gentoo/avahi-dnsconfd.in	2016-02-15 21:13:45.000000000 -0500
-+++ avahi-0.6.32/initscript/gentoo/avahi-dnsconfd.in	2016-09-21 20:58:12.683109618 -0400
-@@ -1,4 +1,4 @@
--#!/sbin/runscript
-+#!/sbin/openrc-run
- # Copyright 1999-2007 Gentoo Foundation
- # Distributed under the terms of the GNU General Public License v2
- 
diff --git a/net-dns/avahi/files/avahi-0.6.x-openrc-0.9.x-init-scripts-fixes.patch b/net-dns/avahi/files/avahi-0.6.x-openrc-0.9.x-init-scripts-fixes.patch
deleted file mode 100644
index 394f6d34d0f0..000000000000
--- a/net-dns/avahi/files/avahi-0.6.x-openrc-0.9.x-init-scripts-fixes.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- avahi-0.6.30/initscript/gentoo/avahi-daemon.in
-+++ avahi-0.6.30/initscript/gentoo/avahi-daemon.in
-@@ -2,7 +2,7 @@
- # Copyright 1999-2007 Gentoo Foundation
- # Distributed under the terms of the GNU General Public License v2
- 
--opts="reload"
-+extra_started_commands="reload"
- 
- depend() {
- 	before netmount nfsmount
---- avahi-0.6.30/initscript/gentoo/avahi-dnsconfd.in
-+++ avahi-0.6.30/initscript/gentoo/avahi-dnsconfd.in
-@@ -2,7 +2,7 @@
- # Copyright 1999-2007 Gentoo Foundation
- # Distributed under the terms of the GNU General Public License v2
- 
--opts="reload"
-+extra_started_commands="reload"
- 
- depend() {
- 	need avahi-daemon
diff --git a/net-dns/libidn/Manifest b/net-dns/libidn/Manifest
index 2cef3f4e9917..fcb399eb7cbf 100644
--- a/net-dns/libidn/Manifest
+++ b/net-dns/libidn/Manifest
@@ -4,5 +4,5 @@ AUX libidn-1.33-parallel-make.patch 3584 BLAKE2B fbd1f372b11bc1da38bdeb3a8c0f017
 DIST libidn-1.33.tar.gz 3501056 BLAKE2B ce6319dc61dd825cf7ddb33f4279c178709e16ce2815c3d1a464bba6b5c6cc493107a10a686f349247a0d6023b1b834a650046e68da9f2f559870dba13a59384 SHA512 38dd459eaeda0c9e3cc2d24d967113515a499747550a2a9157f32357def90d71a3a3b52398e96a44a28cd5948dc353b0473c4ff0453a69720191c4cb49cac2c6
 DIST libidn-1.35.tar.gz 4169217 BLAKE2B 809f9e854a4f2fcd3b2d5f7cdb34e2c68a0f00f5fcffc9002ead2d2d3dcee38022b3288f29716437f65f09e259e35cc98679d9c9d943423190cebb76fcbc94fa SHA512 782260f73b1fd8ebea8a40e2b3a6866c4f67494b2b3df03748daa9c0f842a9578932e746eb4bbf2547fccb1d65d7fc99a7977759dbe58f87f2fdd26d0fe45a09
 EBUILD libidn-1.33-r2.ebuild 2882 BLAKE2B 882b4421c020f431c6c3be5f0e64ea1f2b0111c2214b49d7940f9a9dff54f6780a4efef71f6469e1d02aa0e4300d4fc5ef13911f4b10ddc4090a3e1f0c925356 SHA512 b91e73753ee12dc9d73b455f962010716cde98a56b9b8c436350383ced5bd4095ded41ba804723cdc7d2cc0e107f57ea840385c0d2110e5e43016d454031208e
-EBUILD libidn-1.35.ebuild 2657 BLAKE2B 263f29ded5ccd2a54f65c588ef29a374dd316fd4d8b83b9113ef374b67ba60fbc503b1277009e5b2e086e55458db5a9bd27e03de86a53f08b25e89b9e3f91f53 SHA512 27b8ff08663f287c82dad500fe3cfaf641d585faf9ac57fb44d065f75132384838f93cee91ab7edee0f37363a4d3fd07d7a68b4619c2df045e48d8c98b0f5507
+EBUILD libidn-1.35.ebuild 2655 BLAKE2B 3a19295760a5f8c145db6bad8895e9b0d47d832b0619425451d48745d9743e36fcedadc3fc9a4a41b9039215c0184037eee854acfabbc170ce59750240f62e29 SHA512 861eae15baaa87789ffd2a8a4d62b9316f4631f48f490fa915973162acc6d2ca741e94804de963d64f20a77922f72d64bba5f2880cddab4434d1d6fb4ac33837
 MISC metadata.xml 244 BLAKE2B 9c6750147c240d7416fad33e04b53730dc89cbb615648a7f3defeed3ec058aeee6dbed55a1f81241417b42ca9f7daec177c725692166a5ba08765b5dcf5a6bc5 SHA512 1da71f4fae0251c97a8fcfa1e13b0a3f8b95a856fa919ebd30bf4f2f1b8fa900841db09ebc2a0ae9fe0d91f786ac40b63290382668412fcb05bca15b0746f1db
diff --git a/net-dns/libidn/libidn-1.35.ebuild b/net-dns/libidn/libidn-1.35.ebuild
index 6d5aefbe230f..f08a6c65b429 100644
--- a/net-dns/libidn/libidn-1.35.ebuild
+++ b/net-dns/libidn/libidn-1.35.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/libidn/${P}.tar.gz"
 
 LICENSE="GPL-2 GPL-3 LGPL-3 java? ( Apache-2.0 )"
 SLOT="0/12"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs java mono nls static-libs"
 
 DOCS=( AUTHORS ChangeLog FAQ NEWS README THANKS TODO )
diff --git a/net-dns/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest
index 2e43acae4acf..392945dc3597 100644
--- a/net-dns/pdns-recursor/Manifest
+++ b/net-dns/pdns-recursor/Manifest
@@ -2,7 +2,9 @@ AUX pdns-recursor-r1 1135 BLAKE2B 90f28d33c126882e5b5e29209ec12f336797720832f775
 DIST pdns-recursor-4.0.8.tar.bz2 1071831 BLAKE2B d9ab0dada8efa4b05c136650b9a2eab3aec4acab28ffb6da5bb4f627dc085b2c2d046d1f0dac5cf6e7054b47d76b8d7b95f56cc096b613891a4422b77e9abe9d SHA512 9886fccd3042904b7133e03a7b45479c8f2f57ecb33e4a043703b5e84816cd04a331503870e16030c86b353c1e14d9283dba767c1247e46ed6e14b7e0e93a5ef
 DIST pdns-recursor-4.1.1.tar.bz2 1224544 BLAKE2B 886353fabed5795696e84c6f70872577ff3832e449c5b88c81fec007777eb39b764091b92c9c8b5dfc7aa0af2fdb305a3ec3578ccaff469e9c305903bcea8089 SHA512 a8561bf0688752f30c4c997930f13d55c506b2a2113d22b074443757a51cde9be182ef948e61eb8c4d639bbf8679d8a4139aafb6983f483b3a917e049fa64e45
 DIST pdns-recursor-4.1.2.tar.bz2 1219927 BLAKE2B 3db5d383ad75406925c7196ad0b9552c938a60238fa60e4317c5f4037d716d2faf2ac897dac18661df809211129950a2988846a1c7aa1d24f89c5a682448abfc SHA512 eaf28ce424f1367e548cb78c09de9d39154dddd87e2f19ed238197b6304b20bd9fef599d7df44ca128d89d8cd04d3b7fdd455241bb34ecd688c8042a020c4a36
+DIST pdns-recursor-4.1.3.tar.bz2 1223928 BLAKE2B a4896504768073576d3fa9070e661ea55540321ba3823d62971a4fdd088d6b3394e5a123ad9e071addb6c36d9344296494bac60623f91972bb5f2f0c1d79ebfc SHA512 5ea7e027131143b3ca45ca4a97316f52207a55cf5498a136e44cf5ee78bee00efecf3cd7c9c46261002cbd6e4ea0cd2af62c456b71fd2366729242950b7c060d
 EBUILD pdns-recursor-4.0.8.ebuild 1698 BLAKE2B bf67849d5f47c1f0d148596aea3fbc4268ad6696761f76f7fdb3b3b574708b01a464f12ae2a6c1df8979d60ec0cb877542dbf927af91bb2709e4510ce675a691 SHA512 358312b26fad4c6f2c473b7756f9c6d71c77045d6c7d0e92a10555848bc1643d9fc59454f61f8286d0891d181a1f6b20eeae055598dc7b150ba06faa0af44650
 EBUILD pdns-recursor-4.1.1.ebuild 1826 BLAKE2B dc2c0474c4d91a7b50732a2f58833d5cb24762c1d27905506fb805f68de4378a9f6aca9dc35d9eb022dcd218f3c128b50bc022ba03606f136d6a4d528a1aa073 SHA512 b8f1f253ee793c7a5b97e4007ec513b798da985e945fccf931f366d8d42c8aac30462c40627974a128ffc3fb5beb2f779a2b98f27ce8bbbeb3351974b136e5b7
 EBUILD pdns-recursor-4.1.2.ebuild 1826 BLAKE2B dc2c0474c4d91a7b50732a2f58833d5cb24762c1d27905506fb805f68de4378a9f6aca9dc35d9eb022dcd218f3c128b50bc022ba03606f136d6a4d528a1aa073 SHA512 b8f1f253ee793c7a5b97e4007ec513b798da985e945fccf931f366d8d42c8aac30462c40627974a128ffc3fb5beb2f779a2b98f27ce8bbbeb3351974b136e5b7
+EBUILD pdns-recursor-4.1.3.ebuild 1826 BLAKE2B dc2c0474c4d91a7b50732a2f58833d5cb24762c1d27905506fb805f68de4378a9f6aca9dc35d9eb022dcd218f3c128b50bc022ba03606f136d6a4d528a1aa073 SHA512 b8f1f253ee793c7a5b97e4007ec513b798da985e945fccf931f366d8d42c8aac30462c40627974a128ffc3fb5beb2f779a2b98f27ce8bbbeb3351974b136e5b7
 MISC metadata.xml 954 BLAKE2B 91824dd5b63f8533d2f0a9df87df133ba87f54d6ede9dfd1b1e920251081372fa659dbeb75e2252d91804a2fe269508693ef507c7e070a3cca5ba18711ea8d70 SHA512 1ade9c243b0bdaf70146c344bc318f8c042f846bd91c8e42706d803638c2132bc9ecc9f83db5b862e6e6aff65be9c7437250ac831264a640367d1308c8e3fcfe
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.1.3.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.1.3.ebuild
new file mode 100644
index 000000000000..7e2d4e9bfdb5
--- /dev/null
+++ b/net-dns/pdns-recursor/pdns-recursor-4.1.3.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs flag-o-matic eutils versionator
+
+DESCRIPTION="The PowerDNS Recursor"
+HOMEPAGE="https://www.powerdns.com/"
+SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="libressl luajit protobuf snmp sodium systemd"
+
+DEPEND="!luajit? ( >=dev-lang/lua-5.1:= )
+	luajit? ( dev-lang/luajit:= )
+	protobuf? (
+		dev-libs/protobuf
+		>=dev-libs/boost-1.42:=
+	)
+	systemd? ( sys-apps/systemd:0= )
+	snmp? ( net-analyzer/net-snmp )
+	sodium? ( dev-libs/libsodium:= )
+	libressl? ( dev-libs/libressl:= )
+	!libressl? ( dev-libs/openssl:= )
+	>=dev-libs/boost-1.35:="
+RDEPEND="${DEPEND}
+	!<net-dns/pdns-2.9.20-r1"
+DEPEND="${DEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}"/${P/_/-}
+
+pkg_setup() {
+	filter-flags -ftree-vectorize
+}
+
+src_configure() {
+	econf \
+		--sysconfdir=/etc/powerdns \
+		$(use_enable systemd) \
+		$(use_enable sodium libsodium) \
+		$(use_with !luajit lua) \
+		$(use_with luajit luajit) \
+		$(use_with protobuf) \
+		$(use_with snmp net-snmp)
+}
+
+src_install() {
+	default
+
+	mv "${D}"/etc/powerdns/recursor.conf{-dist,}
+
+	# set defaults: setuid=nobody, setgid=nobody
+	sed -i \
+		-e 's/^# set\([ug]\)id=$/set\1id=nobody/' \
+		-e 's/^# quiet=$/quiet=on/' \
+		-e 's/^# chroot=$/chroot=\/var\/lib\/powerdns/' \
+		"${D}"/etc/powerdns/recursor.conf
+
+	newinitd "${FILESDIR}"/pdns-recursor-r1 pdns-recursor
+
+	keepdir /var/lib/powerdns
+}
+
+pkg_postinst() {
+	local old
+
+	for old in ${REPLACING_VERSIONS}; do
+		version_compare ${old} 4.0.0-r1
+		[[ $? -eq 1 ]] || continue
+
+		ewarn "Starting with 4.0.0-r1 the init script has been renamed from precursor"
+		ewarn "to pdns-recursor, please update your runlevels accordingly."
+
+		break
+	done
+}
diff --git a/net-dns/pdns/Manifest b/net-dns/pdns/Manifest
index 36932ad6af0a..a901c74d7b1f 100644
--- a/net-dns/pdns/Manifest
+++ b/net-dns/pdns/Manifest
@@ -4,8 +4,10 @@ DIST pdns-4.0.5.tar.bz2 1323468 BLAKE2B 7e10cc98177bfa4f81888e2598ab4f0ce83ee45e
 DIST pdns-4.1.0.tar.bz2 1116905 BLAKE2B 91ec0f0cfa70966ff71dfb6302ed01355120ca1429d3c610c4abfb1b964cff78a6332700991bc259387e9095be03d3850da41750e93bb3ffe3db0e23562d156c SHA512 4b2b42f4893f8aac3cf07a6c8a3c999cb728a5907a710f1a5c9c8d08377ecb63e202e5eececbefc069c8f1d97a29b2aa607da7cf2bcc6335a72222418e409e77
 DIST pdns-4.1.1.tar.bz2 1113659 BLAKE2B 916dd6ad815a867580d36668e70ec62991ccd45abafdcaa282a2d3edf7ea1b1ae4fc8add8f6b1ce5c8a8d76fc5bf6a6fa458202b7623842afabf7da593333585 SHA512 23e62ec39007e39a289945457e9b950cbeabf8581f477397341dfbd3592b7ccdede8f4c9ce653a47add07784d1a23116f9013c755eb11af1df383b49a8ca341d
 DIST pdns-4.1.2.tar.bz2 1117225 BLAKE2B 6a4ffc7ea6ccf4dcde63f78c203efe4c17d3769785173211f4d98b9a1891d3d747b95f686c41c6197f28931302eb8389d4fe899409a98d5d83f71fbd15c36d78 SHA512 3fe9f5d8d87bfc77e98915d9019000b6bc0b91ed7ed363ba00a64321cc534290e23627f18a6ba87797a954f7c82b777f746f4f45eb70efb30fa2aa1a80c67a68
+DIST pdns-4.1.3.tar.bz2 1114829 BLAKE2B d379dafc438402df57674686073469aabaa442b174cd6e217d80878a64d103f753cae6b96be32efd841f3ae46cb333b4136b0a33e332f420e83553815f4024e0 SHA512 a5201cf48911188db0c70cb44a27b9a6cebc16f6b740abdadd283dd53feedeed9cfa16ab833b8230f24790f349a0f2ebcca653ca502bb9b2c75d08bd7c60140c
 EBUILD pdns-4.0.5.ebuild 4176 BLAKE2B db646faa496fafab122cf77cb4dd1a697387a571c6f391a5b5214f6fdef5573a736d95a657d408ccfc03cef8eebdc3512ca121e459445d3c210d2191b31077eb SHA512 4dfaba7ea90af3ddb448523a662423f8bf8d06d16c6f58433b2879848af6af214992b978ec821faec4bad5e93882743554ac18ce868d59e4f9cb92eb3f24223e
 EBUILD pdns-4.1.0.ebuild 4194 BLAKE2B d36e0ca27b16b0361b8d477b313031fd93627bcf9d5905e0d9bf798a26e5bb2529cc26bed22c09acf8e887e20da3ff4bae50beb45a36b40f9658babec78f27b8 SHA512 8e895af66faa50e850c5adc6fe297a869681b3e0fbdee1aedcb1b00ae50aa8de1058dfd1b4561b9d046aacf51d58080f5f055915d3f30114def4e89a27303556
 EBUILD pdns-4.1.1.ebuild 4194 BLAKE2B 9d29aa61473bb3de727fb1dff54d40a572ead8bc7f6f9dffda2d8404dedb3c2ff563321946235771cc58e2e9c1df09e6124917368441800b4f8b0f5af71e45f2 SHA512 14fd8ef1301faebf6af08c7c67bb6a28b019d5cd0bae7a614eb8d04f5841805713f14629d7a3ea48e4cd40736e35708f31addc803f1f3d6e26457ee6b09c5dc8
 EBUILD pdns-4.1.2.ebuild 4194 BLAKE2B 9d29aa61473bb3de727fb1dff54d40a572ead8bc7f6f9dffda2d8404dedb3c2ff563321946235771cc58e2e9c1df09e6124917368441800b4f8b0f5af71e45f2 SHA512 14fd8ef1301faebf6af08c7c67bb6a28b019d5cd0bae7a614eb8d04f5841805713f14629d7a3ea48e4cd40736e35708f31addc803f1f3d6e26457ee6b09c5dc8
+EBUILD pdns-4.1.3.ebuild 4194 BLAKE2B 9d29aa61473bb3de727fb1dff54d40a572ead8bc7f6f9dffda2d8404dedb3c2ff563321946235771cc58e2e9c1df09e6124917368441800b4f8b0f5af71e45f2 SHA512 14fd8ef1301faebf6af08c7c67bb6a28b019d5cd0bae7a614eb8d04f5841805713f14629d7a3ea48e4cd40736e35708f31addc803f1f3d6e26457ee6b09c5dc8
 MISC metadata.xml 1330 BLAKE2B 17be53a41fc13a3739905f8409b49996b1958cfd04baf1d2982c923ee7b39ef5b8be627017a6efb1261f158f45660337eb22157ceaadc7b07ed5b5b3da7c7cdf SHA512 fb13690059baceefc1366423c524427655d54313f5690e12709c9e1dd4b9567d111d7d748c530286dcd24dc78acfa38baac88a5cfc9a2b01996baae6b47f39dc
diff --git a/net-dns/pdns/pdns-4.1.3.ebuild b/net-dns/pdns/pdns-4.1.3.ebuild
new file mode 100644
index 000000000000..1dd30fc18958
--- /dev/null
+++ b/net-dns/pdns/pdns-4.1.3.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils multilib user toolchain-funcs versionator
+
+DESCRIPTION="The PowerDNS Daemon"
+HOMEPAGE="https://www.powerdns.com/"
+SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# other possible flags:
+# db2: we lack the dep
+# oracle: dito (need Oracle Client Libraries)
+# xdb: (almost) dead, surely not supported
+
+IUSE="botan debug doc geoip ldap libressl lua luajit mydns mysql opendbx postgres protobuf remote sodium sqlite systemd tools tinydns test"
+
+REQUIRED_USE="mydns? ( mysql )"
+
+RDEPEND="
+	libressl? ( dev-libs/libressl:= )
+	!libressl? ( dev-libs/openssl:= )
+	>=dev-libs/boost-1.35:=
+	botan? ( dev-libs/botan:2= )
+	lua? (
+		!luajit? ( dev-lang/lua:= )
+		luajit? ( dev-lang/luajit:= )
+	)
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql:= )
+	ldap? ( >=net-nds/openldap-2.0.27-r4 app-crypt/mit-krb5 )
+	sqlite? ( dev-db/sqlite:3 )
+	opendbx? ( dev-db/opendbx )
+	geoip? ( >=dev-cpp/yaml-cpp-0.5.1 dev-libs/geoip )
+	sodium? ( dev-libs/libsodium:= )
+	tinydns? ( >=dev-db/tinycdb-0.77 )
+	protobuf? ( dev-libs/protobuf )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+S="${WORKDIR}"/${P/_/-}
+
+src_configure() {
+	local dynmodules="pipe bind" # the default backends, always enabled
+
+	#use db2 && dynmodules+=" db2"
+	use ldap && dynmodules+=" ldap"
+	use lua && dynmodules+=" lua"
+	use mydns && dynmodules+=" mydns"
+	use mysql && dynmodules+=" gmysql"
+	use opendbx && dynmodules+=" opendbx"
+	#use oracle && dynmodules+=" goracle oracle"
+	use postgres && dynmodules+=" gpgsql"
+	use remote && dynmodules+=" remote"
+	use sqlite && dynmodules+=" gsqlite3"
+	use tinydns && dynmodules+=" tinydns"
+	use geoip && dynmodules+=" geoip"
+	#use xdb && dynmodules+=" xdb"
+
+	econf \
+		--disable-static \
+		--sysconfdir=/etc/powerdns \
+		--libdir=/usr/$(get_libdir)/powerdns \
+		--with-modules= \
+		--with-dynmodules="${dynmodules}" \
+		--with-mysql-lib=/usr/$(get_libdir) \
+		$(use_enable botan) \
+		$(use_enable debug verbose-logging) \
+		$(use_enable test unit-tests) \
+		$(use_enable tools) \
+		$(use_enable systemd) \
+		$(use_enable sodium libsodium) \
+		$(usex lua "$(use_with !luajit lua) $(use_with luajit)" \
+			'--without-lua --without-luajit') \
+		$(use_with protobuf) \
+		${myconf}
+}
+
+src_compile() {
+	default
+	use doc && emake -C codedocs codedocs
+}
+
+src_install() {
+	default
+
+	mv "${D}"/etc/powerdns/pdns.conf{-dist,}
+
+	fperms 0700 /etc/powerdns
+	fperms 0600 /etc/powerdns/pdns.conf
+
+	# set defaults: setuid=pdns, setgid=pdns
+	sed -i \
+		-e 's/^# set\([ug]\)id=$/set\1id=pdns/g' \
+		"${D}"/etc/powerdns/pdns.conf
+
+	newinitd "${FILESDIR}"/pdns-r1 pdns
+
+	keepdir /var/empty
+
+	use doc && dohtml -r codedocs/html/.
+
+	# Install development headers
+	insinto /usr/include/pdns
+	doins pdns/*.hh
+	insinto /usr/include/pdns/backends/gsql
+	doins pdns/backends/gsql/*.hh
+
+	if use ldap ; then
+		insinto /etc/openldap/schema
+		doins "${FILESDIR}"/dnsdomain2.schema
+	fi
+
+	prune_libtool_files --all
+}
+
+pkg_preinst() {
+	enewgroup pdns
+	enewuser pdns -1 -1 /var/empty pdns
+}
+
+pkg_postinst() {
+	elog "PowerDNS provides multiple instances support. You can create more instances"
+	elog "by symlinking the pdns init script to another name."
+	elog
+	elog "The name must be in the format pdns.<suffix> and PowerDNS will use the"
+	elog "/etc/powerdns/pdns-<suffix>.conf configuration file instead of the default."
+
+	if use ldap ; then
+		ewarn "The official LDAP backend module is only compile-tested by upstream."
+		ewarn "Try net-dns/pdns-ldap-backend if you have problems with it."
+	fi
+
+	local old
+	for old in ${REPLACING_VERSIONS}; do
+		version_compare ${old} 3.2
+		[[ $? -eq 1 ]] || continue
+
+		ewarn "To fix a security bug (bug #458018) had the following"
+		ewarn "files/directories the world-readable bit removed (if set):"
+		ewarn "  ${EPREFIX}/etc/powerdns"
+		ewarn "  ${EPREFIX}/etc/powerdns/pdns.conf"
+		ewarn "Check if this is correct for your setup"
+		ewarn "This is a one-time change and will not happen on subsequent updates."
+		chmod o-rwx "${EPREFIX}"/etc/powerdns/{,pdns.conf}
+
+		break
+	done
+}
diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index f723400951b1..23158bcc5976 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 67aa0d741d6c..398614aff602 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -9,6 +9,7 @@ AUX samba-4.4.0-pam.patch 895 BLAKE2B bdc0601527a932424d55946b2eeaa288420ce90a8f
 AUX samba-4.5.1-compile_et_fix.patch 762 BLAKE2B 432d8380e3511c3dbb408479d0152fb0760e9e487a3033718fa39b9ca4a87a04c9cf8ac41a4b9268020a1d41dee9efa5bde3f0e71498483102fcae80749ad62c SHA512 9605751653dcbbce41be807a9b4f8e5f657db6622f843e91c4df9c4b3e4ad621b6e8e3891f2b970208d55a80801355988f253e3c844ca51a658cd6de8c373e24
 AUX samba-4.6-no_ads.patch 1102 BLAKE2B 34d7f4364a1eb5dc93cfdba3fe011d71361c134bcc7ed15f07731a8dbfc57d8b555b6942b3a1fb7ff1ae082d609849c0b8191613ed3880318102a03588a2d2ce SHA512 a077711b51801d7af215dec62782ef166e45fdc007a9a8f3ae724638d3d7f6e3177ace5be549d327964b787b1d64b7e0d4485fa4a2a013617824d991c547c780
 AUX samba-4.7.3-krb-cross-compile.patch 1590 BLAKE2B 34cf304441731556556e40ed386f110dd8aa26a49680fa106b550edede86842e736c5652cd4aa54f0da7955600442cbc41350031dc8b67deae11f68050a6cf7c SHA512 0f762326f5b72d10e4c553630a8c4c433de884d80024c26e4f0e46b26bc24ac53c07642d833bb327f0010b7ee0ce2df05a94dc8868f3f363f68f9851b76265c5
+AUX samba-4.8-without_ads_build_fix.patch 1325 BLAKE2B 3a203397c4cc860f9681bf5015dcf36e2c4ba2672714fc95151548855790e7d0b517ca0568494a8915d02e492c02d3cbf07d5e4fc74a44acfe0153ffb62f2a5a SHA512 1947ec4a1d98c52e223763a7e3981642d3faa38c0e11e8f947c369b7e4ecde17d657e96fc8eeb3dd1ef8fa688c930c77a67e240d9176728583a9d8f55cf9a490
 AUX samba-glibc-2.26-no_rpc.patch 631 BLAKE2B 22e414bcd329d7d32381c61ad4341de69a07235447dc4116855cca9ce99d32a5ffe111602fdf6ea02c6fe9c5b3331ecaec974faa5e22e009f15964296b53825a SHA512 18a466cbe42313f096ebeb635e5738b59672e96fd5c7db80cff5aa96c0edeb359b6833967bfac09eb5c010eec4309b3b73c0f941173b520918939974fa599541
 AUX samba.conf 61 BLAKE2B fff77908503f3718cdcf04b60eda6bf717fb37628107676ed66133da235af95ac91d6209f97830de7a5bfdee9e25f850334bb445ee22110d14eb82e1b399694c SHA512 4a75185762c90d110c399215fbfc939d30804b558ffdb11cc68dee6f87a94c86cadbcd63935884db1266cf40fe24fefb75f9067fe4751ad9838d7a43e8973b9e
 AUX samba.service 199 BLAKE2B 5949503c588684a48ab0a26f5811bb053d8527eb9da2ecc8b4bd911ea6d51969bc9607b14f3f72394127ff24967849d3e829a05b6584ba3f3de5e640d240c204 SHA512 eb277917f15de958f4a0404b66c6d2cc82ae4319b85f2f442489988d523bf92e2a9d23a6051ee693cd4bcfbc67947e8028c59906ad3e537578daf5caee8a6f16
@@ -23,13 +24,11 @@ DIST samba-4.5.16.tar.gz 21024396 BLAKE2B e737559fb748044076608fa233700eb54c7e1c
 DIST samba-4.6.15.tar.gz 21175479 BLAKE2B 40751be51e5ae1368b66d5e0919092935749a749dbb469dd503864acb9d5caf1c26c0894ac3a5294ed8b2c79de31366d80f1b565bffb4f18a7ba659872748feb SHA512 7b55e305c41380ba6dd4df94bdd88aa2d4ebbe27ec258331c04a9610ee820e4c290a3dfdcd04fa89e100b115a674380881699d6cd565f08d753d1b23036c4986
 DIST samba-4.6.7-disable-python-patches.tar.xz 8896 BLAKE2B 99496f91d015f10d111e2a8738c9e66b3c1f1958c0e0894d8e9d8f3ff141fbedaa25d93699b702ab69130fda770c80c3ed4280de0af1090dedbcfd5784b72222 SHA512 c45e548a49735e17b568bebf07dc7409de3de0f93256d1dcf345d2723a27d22a51d860ed921785354fda691f83be4eca3b9d618d5c332438ebf97518a01983eb
 DIST samba-4.7.7.tar.gz 16875059 BLAKE2B 05ecf13562e847070498e923df0cc85836b2fb98d4618942f60e4f28d6c5110b382cfe494e6578bbc06e14052c5d87b0f542ada186e4f132375c4360eaa8bb9f SHA512 78f180f602f08ab9e3000ae016f667e44f059a865b606c21e18857efb89af469c2cb2f9c1316e658badf1a1f41826ba87ccb23f38dc31fe82bf9e5b8fb93daad
-DIST samba-4.8.1.tar.gz 17675747 BLAKE2B 109692c46e87bcf8a0573c8523943e31086665f6683e4fd634dc5ed93d71da15f82c5354b10883067ea662f947e49b7139208490ae482df6fe3a8209ed77341e SHA512 0c48ca0efc2b5b456e4c77ba7d21cacda9e02534e9715b07f712951e47af1959deb3e30d733324b997573feb1aefd81d1eec1c0b691e417a89d81f302ed9e568
 DIST samba-4.8.2.tar.gz 17675145 BLAKE2B 3ae5c33c85d7f0e4cf7fe45fbef55cd0d5aec2e77355297be31c4a32de41ff40338f58843a3e31942ca2c2a086829ed4f339485a7dd39693f1e433526eb23af1 SHA512 061b968c81c2272b5e353444ef53372ae5caa66f5af0b28b422e7d33a32ed0d321900c13636729c0e21a4d8dedcaff7ca7a5f6fe682b71c292f9a66a497a2766
 DIST samba-disable-python-patches-4.2.12.tar.xz 6052 BLAKE2B 0ae755cbbd8921f4e2f5adf797cd3a77f81bb15ac2d1a65645bc9b53184c397a2bb35f83b88a0de680cc834a63b263e883e91206a7df99735f5ef8f091f54bb0 SHA512 c527d0a052d3211e5b12c17bc94db56cc5e5545189ed65a760c0656c94c22e27a4b159e6439eb0370873e1619873a741f3b3bd10d3876b38eb3914a87eace372
 EBUILD samba-4.2.14.ebuild 7128 BLAKE2B ec7d757f67ed562b5376c317bb6a0a03b66cac9941400a65829c8e2608164d7a78d0c0704289101d7f38a1b43527518c47b2c44f9836c57294719fef1226b7bc SHA512 2c9139f97a5dbe76d78ed82b85ba1fbae7d37e2da48939942f69f546bd0b2a9403e2167cc1cb4ad998e680c524684615e5c87c92f424a767b038d7b911e5b217
 EBUILD samba-4.5.16.ebuild 8163 BLAKE2B 5425cd0deee01d5bd2ea33ce1e3e3c826f21ddf73050d653b90216b8797e15528706abcce5850eade5eaf3a1baad3456e6344146979e2baba110c3e53520d5da SHA512 d595cc925dd4d8aca99d0b0b2b0bfa77a265c8d1df345fe22acb1a56e1dc1db6fdefc7f6cf49b9147cbef54f8eb1d7172f896906217394871f7f91d8a924646d
 EBUILD samba-4.6.15.ebuild 8728 BLAKE2B 522bb8590e18c696853fb2e87106c8275cd855b330660c25918d754ab0ac9013b28b1517af7147cda64135958cd0a79087b5ff7365e48b20eb5d1c6f0cdd6460 SHA512 4d48c665ee9708cdc3fbd290c56e6eba41cf878a2f4130f994bbfdc5ea6194a98c286cd5ee0ea7f9c41409bf783acf395add7ad36491d223742ed816bf6b2652
 EBUILD samba-4.7.7.ebuild 8724 BLAKE2B 72fd87b0411656a99a43382d6c7a72741c1751aad5277d5a969887656fb98e301c5f831b3bc51986f776f273e16208450c65d226482c8691d3f1b174bd154afb SHA512 9db5c86a3c208a9336057411a944b63cfed811cf5115e26746fff4511fbe2f7fe7ecc5fb41443489873aaa7703987df4381bcdefa044208c718f8d3ce5274afb
-EBUILD samba-4.8.1.ebuild 8323 BLAKE2B 808c5b997a723a9148798be098171d9d44d493aac64bd042c5b4b30426395d2766c90a0bacfcb08017828c30826a8531ae4a00e3e5224fc6d074aa6db2a86d5c SHA512 a89ee5a24d7989a2effe655d536a4472b223010d437c9bec3b3a212f752ba79a58941e8c4879bf5c4f5fd9b04773a71f1471e09eeb7e8236a60a20885d2f93c2
-EBUILD samba-4.8.2.ebuild 8323 BLAKE2B eb4bfcb32c2c80abc4b9facd250b201847826a859335c992ddadea123fcfbc4a9f523ebf9c4ef0e2cd90d20a144585b223d249d7ee5c324e69c44233084b5114 SHA512 e36fe30d69c5077ee41803769b573b4e1b44a37154d513d02663127d80c6175bfe1d44aa39a46f4d6b1ebd91217efcd48890b0e5a1fe3f9f4c19dcf2cad36651
+EBUILD samba-4.8.2.ebuild 8358 BLAKE2B ad1e4e508755838c91586b364680557430478bdda8ce29be8278b95f336a0dbaa547191fca18727e546884b247fb3021cf18943daba94ed45f56fadddec098ae SHA512 d51fc7cd90a80b27b80a87990120a33b4bc6764734ce81df481bc437a600f7f410f2b41b0c5da5de973659ef9c321271868c10762beaa97f9f410e300296cba0
 MISC metadata.xml 1641 BLAKE2B d360b1d43e278d71dfcaacd749a730a55998a3f7e7676a113015eb93c1a30480f237705d93b8d22d0733a852bbe320397fcabe2d9c517330c1a24aa0e47ca1c6 SHA512 9e6bf4cb2b711f48a3f730f2e4e9cc8c460b46013fe78ad376855748bdff0d8e44beb05798de551c0c22cd2b40d74c2c30799393d05bd7c7a9161a74eb0e98be
diff --git a/net-fs/samba/files/samba-4.8-without_ads_build_fix.patch b/net-fs/samba/files/samba-4.8-without_ads_build_fix.patch
new file mode 100644
index 000000000000..a2a4702d0075
--- /dev/null
+++ b/net-fs/samba/files/samba-4.8-without_ads_build_fix.patch
@@ -0,0 +1,49 @@
+From 223d3f1ed782af2b251962ada8cce190933fff7e Mon Sep 17 00:00:00 2001
+From: Volker Lendecke <vl@samba.org>
+Date: Sat, 3 Feb 2018 07:07:55 +0100
+Subject: [PATCH] libgpo: Fix the build --without-ads
+
+Signed-off-by: Volker Lendecke <vl@samba.org>
+Reviewed-by: David Disseldorp <ddiss@samba.org>
+
+Autobuild-User(master): David Disseldorp <ddiss@samba.org>
+Autobuild-Date(master): Tue Feb  6 15:36:01 CET 2018 on sn-devel-144
+
+Bug: https://bugzilla.samba.org/show_bug.cgi?id=13331
+
+(cherry picked from commit a222b7506b53e689708834237f18877231dca589)
+---
+ libgpo/pygpo.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/libgpo/pygpo.c b/libgpo/pygpo.c
+index 7a02a0d..b6b53b7 100644
+--- a/libgpo/pygpo.c
++++ b/libgpo/pygpo.c
+@@ -319,6 +319,7 @@ static PyObject *py_gpo_get_sysvol_gpt_version(PyObject * self,
+ 	return result;
+ }
+ 
++#ifdef HAVE_ADS
+ static ADS_STATUS find_samaccount(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx,
+ 				  const char *samaccountname,
+ 				  uint32_t *uac_ret, const char **dn_ret)
+@@ -468,11 +469,15 @@ out:
+ 	return ret;
+ }
+ 
++#endif
++
+ static PyMethodDef ADS_methods[] = {
+ 	{ "connect", (PyCFunction)py_ads_connect, METH_NOARGS,
+ 		"Connect to the LDAP server" },
++#ifdef HAVE_ADS
+ 	{ "get_gpo_list", (PyCFunction)py_ads_get_gpo_list, METH_KEYWORDS,
+ 		NULL },
++#endif
+ 	{ NULL }
+ };
+ 
+-- 
+1.9.1
+
diff --git a/net-fs/samba/samba-4.8.1.ebuild b/net-fs/samba/samba-4.8.1.ebuild
deleted file mode 100644
index 30c1346e24f0..000000000000
--- a/net-fs/samba/samba-4.8.1.ebuild
+++ /dev/null
@@ -1,286 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+),xml(+)'
-
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd
-
-MY_PV="${PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-
-SRC_PATH="stable"
-[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
-
-SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
-[[ ${PV} = *_rc* ]] || \
-KEYWORDS="~amd64 ~arm64 ~hppa ~x86"
-
-DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="http://www.samba.org/"
-LICENSE="GPL-3"
-
-SLOT="0"
-
-IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint ldap pam python
-quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/samba-4.0/policy.h
-	/usr/include/samba-4.0/dcerpc_server.h
-	/usr/include/samba-4.0/ctdb.h
-	/usr/include/samba-4.0/ctdb_client.h
-	/usr/include/samba-4.0/ctdb_protocol.h
-	/usr/include/samba-4.0/ctdb_private.h
-	/usr/include/samba-4.0/ctdb_typesafe_cb.h
-	/usr/include/samba-4.0/ctdb_version.h
-)
-
-# sys-apps/attr is an automagic dependency (see bug #489748)
-CDEPEND="
-	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
-	dev-lang/perl:=
-	dev-libs/libaio[${MULTILIB_USEDEP}]
-	dev-libs/libbsd[${MULTILIB_USEDEP}]
-	dev-libs/iniparser:0
-	dev-libs/popt[${MULTILIB_USEDEP}]
-	dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
-	net-libs/libnsl:=[${MULTILIB_USEDEP}]
-	sys-apps/attr[${MULTILIB_USEDEP}]
-	>=sys-libs/ldb-1.3.2[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	sys-libs/libcap
-	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
-	sys-libs/readline:0=
-	>=sys-libs/talloc-2.1.11[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.3.15[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.9.36[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	virtual/libiconv
-	pam? ( virtual/pam )
-	acl? ( virtual/acl )
-	addns? (
-		net-dns/bind-tools[gssapi]
-		dev-python/dnspython:=[${PYTHON_USEDEP}]
-	)
-	ceph? ( sys-cluster/ceph )
-	cluster? (
-		net-libs/rpcsvc-proto
-		!dev-db/ctdb
-	)
-	cups? ( net-print/cups )
-	debug? ( dev-util/lttng-ust )
-	dmapi? ( sys-apps/dmapi )
-	fam? ( virtual/fam )
-	gnutls? (
-		dev-libs/libgcrypt:0
-		>=net-libs/gnutls-1.4.0
-	)
-	gpg? ( app-crypt/gpgme )
-	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
-	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
-	system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
-	systemd? ( sys-apps/systemd:0= )
-"
-DEPEND="${CDEPEND}
-	${PYTHON_DEPS}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	net-libs/libtirpc[${MULTILIB_USEDEP}]
-	virtual/pkgconfig
-	|| (
-		net-libs/rpcsvc-proto
-		<sys-libs/glibc-2.26[rpc(+)]
-	)
-	test? (
-		!system-mitkrb5? (
-			>=sys-libs/nss_wrapper-1.1.3
-			>=net-dns/resolv_wrapper-1.1.4
-			>=net-libs/socket_wrapper-1.1.7
-			>=sys-libs/uid_wrapper-1.2.1
-		)
-	)"
-RDEPEND="${CDEPEND}
-	python? ( ${PYTHON_DEPS} )
-	client? ( net-fs/cifs-utils[ads?] )
-	selinux? ( sec-policy/selinux-samba )
-	!dev-perl/Parse-Yapp
-"
-
-REQUIRED_USE="
-	addc? ( python gnutls winbind )
-	addns? ( python )
-	ads? ( acl gnutls ldap winbind )
-	cluster? ( ads )
-	gpg? ( addc )
-	python? ( ldap )
-	test? ( python )
-	?? ( system-heimdal system-mitkrb5 )
-	${PYTHON_REQUIRED_USE}
-"
-
-# the test suite is messed, it uses system-installed samba
-# bits instead of what was built, tests things disabled via use
-# flags, and generally just fails to work in a way ebuilds could
-# rely on in its current state
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.4.0-pam.patch"
-	"${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
-)
-
-#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-CONFDIR="${FILESDIR}/4.4"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-SHAREDMODS=""
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	if use cluster ; then
-		SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
-	elif use ads ; then
-		SHAREDMODS="idmap_ad"
-	fi
-}
-
-src_prepare() {
-	default
-
-	# un-bundle dnspython
-	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
-
-	# unbundle iso8601 unless tests are enabled
-	use test || sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
-
-	# ugly hackaround for bug #592502
-	cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
-
-	sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
-		-i source4/dsdb/samdb/ldb_modules/password_hash.c \
-		|| die
-
-	# Friggin' WAF shit
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	# when specifying libs for samba build you must append NONE to the end to
-	# stop it automatically including things
-	local bundled_libs="NONE"
-	if ! use system-heimdal && ! use system-mitkrb5 ; then
-		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
-	fi
-
-	local myconf=(
-		--enable-fhs
-		--sysconfdir="${EPREFIX}/etc"
-		--localstatedir="${EPREFIX}/var"
-		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
-		--with-piddir="${EPREFIX}/run/${PN}"
-		--bundled-libraries="${bundled_libs}"
-		--builtin-libraries=NONE
-		--disable-rpath
-		--disable-rpath-install
-		--nopyc
-		--nopyo
-		$(multilib_native_use_with acl acl-support)
-		$(multilib_native_usex addc '' '--without-ad-dc')
-		$(multilib_native_use_with addns dnsupdate)
-		$(multilib_native_use_with ads)
-		$(multilib_native_use_enable ceph cephfs)
-		$(multilib_native_use_with cluster cluster-support)
-		$(multilib_native_use_enable cups)
-		$(multilib_native_use_with dmapi)
-		$(multilib_native_use_with fam)
-		$(multilib_native_use_with gpg gpgme)
-		$(multilib_native_use_enable iprint)
-		$(multilib_native_use_with pam)
-		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
-		$(multilib_native_use_with quota quotas)
-		$(multilib_native_use_with syslog)
-		$(multilib_native_use_with systemd)
-		$(multilib_native_use_with winbind)
-		$(multilib_native_usex python '' '--disable-python')
-		$(multilib_native_use_enable zeroconf avahi)
-		$(multilib_native_usex test '--enable-selftest' '')
-		$(usex system-mitkrb5 '--with-system-mitkrb5' '')
-		$(use_enable gnutls)
-		$(use_with debug lttng)
-		$(use_with ldap)
-	)
-	multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} )
-
-	CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
-		waf-utils_src_configure ${myconf[@]}
-}
-
-multilib_src_compile() {
-	waf-utils_src_compile
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-
-	# Make all .so files executable
-	find "${ED}" -type f -name "*.so" -exec chmod +x {} +
-
-	if multilib_is_native_abi ; then
-		# install ldap schema for server (bug #491002)
-		if use ldap ; then
-			insinto /etc/openldap/schema
-			doins examples/LDAP/samba.schema
-		fi
-
-		# create symlink for cups (bug #552310)
-		if use cups ; then
-			dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
-		fi
-
-		# install example config file
-		insinto /etc/samba
-		doins examples/smb.conf.default
-
-		# Fix paths in example file (#603964)
-		sed \
-			-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
-			-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
-			-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
-			-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
-			-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
-			-i "${ED%/}"/etc/samba/smb.conf.default || die
-
-		# Install init script and conf.d file
-		newinitd "${CONFDIR}/samba4.initd-r1" samba
-		newconfd "${CONFDIR}/samba4.confd" samba
-
-		systemd_dotmpfilesd "${FILESDIR}"/samba.conf
-		systemd_dounit "${FILESDIR}"/nmbd.service
-		systemd_dounit "${FILESDIR}"/smbd.{service,socket}
-		systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
-		systemd_dounit "${FILESDIR}"/winbindd.service
-		systemd_dounit "${FILESDIR}"/samba.service
-	fi
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi ; then
-		"${WAF_BINARY}" test || die "test failed"
-	fi
-}
-
-pkg_postinst() {
-	ewarn "Be aware the this release contains the best of all of Samba's"
-	ewarn "technology parts, both a file server (that you can reasonably expect"
-	ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
-	ewarn "controller work previously known as 'samba4'."
-
-	elog "For further information and migration steps make sure to read "
-	elog "http://samba.org/samba/history/${P}.html "
-	elog "http://wiki.samba.org/index.php/Samba4/HOWTO "
-}
diff --git a/net-fs/samba/samba-4.8.2.ebuild b/net-fs/samba/samba-4.8.2.ebuild
index 3bfb4b1af5ba..cd603d27bdea 100644
--- a/net-fs/samba/samba-4.8.2.ebuild
+++ b/net-fs/samba/samba-4.8.2.ebuild
@@ -114,7 +114,6 @@ REQUIRED_USE="
 	ads? ( acl gnutls ldap winbind )
 	cluster? ( ads )
 	gpg? ( addc )
-	python? ( ldap )
 	test? ( python )
 	?? ( system-heimdal system-mitkrb5 )
 	${PYTHON_REQUIRED_USE}
@@ -131,6 +130,7 @@ S="${WORKDIR}/${MY_P}"
 PATCHES=(
 	"${FILESDIR}/${PN}-4.4.0-pam.patch"
 	"${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
+	"${FILESDIR}/${PN}-4.8-without_ads_build_fix.patch"
 )
 
 #CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 768ef1d0b747..84843d317264 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/kvirc/Manifest b/net-irc/kvirc/Manifest
index f4b5df790839..0bfb3367b8e3 100644
--- a/net-irc/kvirc/Manifest
+++ b/net-irc/kvirc/Manifest
@@ -1,10 +1,4 @@
-DIST kvirc-5.0_pre20171001143427.tar.gz 6035319 BLAKE2B 764b079b2d991f3b80b48eaf4119ac9cbfef3429d97e990fdc9c95a23561d3efc553c876a8eac17465cf14533f3230af24695f834dd985d73f89d45103457eb2 SHA512 ccf9b032737ce24cc98c23f3e1363b7ad874452837805b9a240dfd0d5e067da556dcd6003398f3cb2826f144656540592189e7f88d68608d6fbb2e8294535640
-DIST kvirc-5.0_pre20171211100641.tar.gz 6035018 BLAKE2B 0da30cbd0ac7443b994f4f8f4b8b39255219d99a34dd026cc59d119bec11985e261f281928f817ffe0865427a2f59b2a25abbe20d9d4a391086c26c507f83074 SHA512 599ea40faac97ad0604e29fe8f77a92f36a9f52fdee118dead712e1cea8d03d2b2791cb121dcd7efd39d5719e9133ff79e45ea1ffefa5886b0b11709ae41f814
-DIST kvirc-5.0_pre20180209140255.tar.gz 6035048 BLAKE2B 1141fb73b2498f931b8e2b28368cbae8b94d6268e2f5548e38f5a5a6c0776a9ffe4c7c2d5139eda7166c1cae73fb61ebc894cc085ec1ad20edc1f53136a21492 SHA512 c9dc3d257dcb9446c91be07d490fc76418eaaa93bd133dfec5b659949baae68383e04cbfbab9624db8bf6f1908fd93a190a74f95b6d1b929a75739c3032f82e6
 DIST kvirc-5.0_pre20180401054732.tar.gz 6040980 BLAKE2B fa023ef84f5c84e92b11ed043be0a2e52316fc92f206c41bcb7216760e0473e13e118398445137aeafd657c856cdccfa2f5202f9534904771d8a049d5139f41a SHA512 6d3a9bb06018e2d54369139bbf0a768d3c4e39754b908c1e4294c79707c8b5b751141ae10bdf8456465bd9bf6e4e426a91bc6bef5a1c3563bf32adecc10582eb
-EBUILD kvirc-5.0_pre20171001143427.ebuild 3846 BLAKE2B eb9572bdde0e10d7758987cf8b8f047499c1143b90e317d7b67b0a22cc6bcf76a04f8fb032e1a63a0fa18ae31d9deb641498869a22cf75431cb0f24af9418f71 SHA512 7986bde6410f1125c28cc05899ce155a9614b3ebba0fc4402035ef80868dc25c1a62be4f9685aea4a0f7ea7eb2e36a78abaff68167be908c3126afcf748d8122
-EBUILD kvirc-5.0_pre20171211100641.ebuild 3846 BLAKE2B aa287984c675d7a17f14ff03a118e4ee2378a826f81f309065b33c4583b83d5a3e441b44dbd9d0eefeea5c4b46044b8b02a8bc0040dca6be30f2226ec18b3756 SHA512 f714f2c7646f85bb4f8aa9125e4651e44b47bb09c045d6078d36cee356ff26023916646c584100fb3040e72964532dbb6b0ae93c39ee2228725afaa7644e17e3
-EBUILD kvirc-5.0_pre20180209140255.ebuild 3846 BLAKE2B a6aabafde47401e190308dc180f2c12e09344a5b9b3c282a412fca70e8ed0a6bc384d252e2f5ae498d04f42f2c9ab7256f112bbc2281aa6841fe03465398cfea SHA512 41022eedbf2eac3fc82dce6f56d9652823a1d284e48d14c7457ce7d299a3880e4a2d9b771d56854cfd79f82c02ce2e1ff12b950154eb370859da874778b3af64
-EBUILD kvirc-5.0_pre20180401054732.ebuild 3848 BLAKE2B 1ce648c715257966f3147178411df5ca628e2b0d5b9c6d116f6e247366bcf5041ad7bd19b027cc66a5d1e0d4eef69d3605086eaac75c143b9558bddd4b77a10d SHA512 a4942b049de2b62181fd490de898af628bd77f402d40f1fc4ee5f42e3cda65070f3cf6b71b8071589895880fe0b96092a499bc03a8548a5e2465a71e2d9f6b71
+EBUILD kvirc-5.0_pre20180401054732.ebuild 3846 BLAKE2B bcf1f6bfc7687005977af9269c3c1eff57ad9f9656523dd2d8b7f21e6ccc8b92ff40f8228de23301fb8179bf6eb363439a791a62b0dbdaf802564bb0635b4874 SHA512 01182fdbc39f58c9709b507da28d805e1cd1bd9bb1856def96afcae390176a107528672649c70c8c4cca00a81bdba1a3d1fd2732f870a8a8d58314eda728fd91
 EBUILD kvirc-9999.ebuild 3768 BLAKE2B 6f94994a1892c1a1d40302a97f0d273c1458254696da5d22695e93bcf831399fae0eda70c257bc2e77f2ff04c1f57ba9bcafdd38745f49db922c5914a0ebc682 SHA512 64140f53a6c5df09d3c62a9df7eb45bae65728d61fedec3849d9d3c9af7e0ab850cc185193a021c535fc610f2981a974623cfc2ddbac1b81e1daf96caba915bc
 MISC metadata.xml 618 BLAKE2B 5a6a28876a22cedbca154051a389fed0e7ef25039319786ed2303b580b1e421b648038237e0157678fb96e1b45839e725299e56584bcb770593f60f305932145 SHA512 af08ad67affb8dbe4ae6afbb2a251e5bd44e5fb30f9332dddebbb6dd504fa25b449b5b4c3a5c1f0337c6a7751b2395eb049cf94206a44cce2a7ab1df1d1b3eae
diff --git a/net-irc/kvirc/kvirc-5.0_pre20171001143427.ebuild b/net-irc/kvirc/kvirc-5.0_pre20171001143427.ebuild
deleted file mode 100644
index c3ab9c10508a..000000000000
--- a/net-irc/kvirc/kvirc-5.0_pre20171001143427.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=(python2_7)
-
-inherit cmake-utils flag-o-matic gnome2-utils multilib python-single-r1 xdg-utils
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/kvirc/KVIrc"
-	KVIRC_GIT_REVISION=""
-	KVIRC_GIT_SOURCES_DATE=""
-else
-	inherit vcs-snapshot
-
-	KVIRC_GIT_REVISION="150eeeab99ce7f340bf17e337b7ef1357ba375ad"
-	KVIRC_GIT_SOURCES_DATE="${PV#*_pre}"
-	KVIRC_GIT_SOURCES_DATE="${KVIRC_GIT_SOURCES_DATE:0:4}-${KVIRC_GIT_SOURCES_DATE:4:2}-${KVIRC_GIT_SOURCES_DATE:6:2}"
-fi
-
-DESCRIPTION="Advanced IRC Client"
-HOMEPAGE="http://www.kvirc.net/ https://github.com/kvirc/KVIrc"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/kvirc/KVIrc/archive/${KVIRC_GIT_REVISION}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="kvirc"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="audiofile +dbus dcc_video debug doc gsm kde +nls oss +perl +phonon profile +python spell +ssl theora webkit"
-REQUIRED_USE="audiofile? ( oss ) python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsql:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	sys-libs/zlib:0=
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	audiofile? ( media-libs/audiofile )
-	dbus? ( dev-qt/qtdbus:5 )
-	dcc_video? ( dev-qt/qtmultimedia:5[widgets] )
-	kde? (
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/ki18n:5
-		kde-frameworks/knotifications:5
-		kde-frameworks/kservice:5
-		kde-frameworks/kwindowsystem:5
-		kde-frameworks/kxmlgui:5
-	)
-	perl? ( dev-lang/perl:0= )
-	phonon? ( media-libs/phonon[qt5(+)] )
-	python? ( ${PYTHON_DEPS} )
-	spell? ( app-text/enchant:0= )
-	ssl? ( dev-libs/openssl:0= )
-	theora? (
-		media-libs/libogg
-		media-libs/libtheora
-		media-libs/libvorbis
-	)
-	webkit? ( dev-qt/qtwebkit:5 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	kde? ( kde-frameworks/extra-cmake-modules:5 )
-	nls? ( sys-devel/gettext )"
-RDEPEND="${RDEPEND}
-	gsm? ( media-sound/gsm )"
-
-DOCS=(ChangeLog doc/FAQ)
-
-pkg_setup() {
-	if use python; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	if [[ "${PV}" == "9999" ]]; then
-		KVIRC_GIT_REVISION="$(git show -s --format=%H)"
-		KVIRC_GIT_SOURCES_DATE="$(git show -s --format=%cd --date=short)"
-	fi
-	einfo "Setting of revision number to ${KVIRC_GIT_REVISION} ${KVIRC_GIT_SOURCES_DATE}"
-	sed -e "/#define KVI_DEFAULT_FRAME_CAPTION/s/KVI_VERSION/& \" (${KVIRC_GIT_REVISION} ${KVIRC_GIT_SOURCES_DATE})\"/" -i src/kvirc/ui/KviMainWindow.cpp || die "Setting of revision number failed"
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-
-	local libdir="$(get_libdir)"
-	local mycmakeargs=(
-		-DLIB_SUFFIX=${libdir#lib}
-		-DMANUAL_REVISION=${KVIRC_GIT_REVISION}
-		-DMANUAL_SOURCES_DATE=${KVIRC_GIT_SOURCES_DATE//-/}
-		-DWANT_ENV_FLAGS=yes
-		-DWANT_VERBOSE=yes
-
-		-DWANT_CRYPT=yes
-		-DWANT_DCC_VOICE=yes
-		-DWANT_IPC=yes
-		-DWANT_IPV6=yes
-		-DWANT_TRANSPARENCY=yes
-
-		-DWANT_AUDIOFILE=$(usex audiofile)
-		-DWANT_DCC_VIDEO=$(usex dcc_video)
-		-DWANT_DEBUG=$(usex debug)
-		-DWANT_DOXYGEN=$(usex doc)
-		-DWANT_GETTEXT=$(usex nls)
-		-DWANT_GSM=$(usex gsm)
-		-DWANT_KDE=$(usex kde)
-		-DWANT_MEMORY_PROFILE=$(usex profile)
-		-DWANT_OGG_THEORA=$(usex theora)
-		-DWANT_OPENSSL=$(usex ssl)
-		-DWANT_OSS=$(usex oss)
-		-DWANT_PERL=$(usex perl)
-		-DWANT_PHONON=$(usex phonon)
-		-DWANT_PYTHON=$(usex python)
-		-DWANT_QTDBUS=$(usex dbus)
-		-DWANT_QTWEBKIT=$(usex webkit)
-		-DWANT_SPELLCHECKER=$(usex spell)
-
-		# COMPILE_SVG_SUPPORT not used in source code.
-		-DWANT_QTSVG=no
-	)
-
-	cmake-utils_src_configure
-}
-
-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/kvirc/kvirc-5.0_pre20171211100641.ebuild b/net-irc/kvirc/kvirc-5.0_pre20171211100641.ebuild
deleted file mode 100644
index 6a024dd1f62e..000000000000
--- a/net-irc/kvirc/kvirc-5.0_pre20171211100641.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=(python2_7)
-
-inherit cmake-utils flag-o-matic gnome2-utils multilib python-single-r1 xdg-utils
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/kvirc/KVIrc"
-	KVIRC_GIT_REVISION=""
-	KVIRC_GIT_SOURCES_DATE=""
-else
-	inherit vcs-snapshot
-
-	KVIRC_GIT_REVISION="ed2a156892c5ce9a1ab54c50031ba59a9a34485f"
-	KVIRC_GIT_SOURCES_DATE="${PV#*_pre}"
-	KVIRC_GIT_SOURCES_DATE="${KVIRC_GIT_SOURCES_DATE:0:4}-${KVIRC_GIT_SOURCES_DATE:4:2}-${KVIRC_GIT_SOURCES_DATE:6:2}"
-fi
-
-DESCRIPTION="Advanced IRC Client"
-HOMEPAGE="http://www.kvirc.net/ https://github.com/kvirc/KVIrc"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/kvirc/KVIrc/archive/${KVIRC_GIT_REVISION}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="kvirc"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="audiofile +dbus dcc_video debug doc gsm kde +nls oss +perl +phonon profile +python spell +ssl theora webkit"
-REQUIRED_USE="audiofile? ( oss ) python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsql:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	sys-libs/zlib:0=
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	audiofile? ( media-libs/audiofile )
-	dbus? ( dev-qt/qtdbus:5 )
-	dcc_video? ( dev-qt/qtmultimedia:5[widgets] )
-	kde? (
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/ki18n:5
-		kde-frameworks/knotifications:5
-		kde-frameworks/kservice:5
-		kde-frameworks/kwindowsystem:5
-		kde-frameworks/kxmlgui:5
-	)
-	perl? ( dev-lang/perl:0= )
-	phonon? ( media-libs/phonon[qt5(+)] )
-	python? ( ${PYTHON_DEPS} )
-	spell? ( app-text/enchant:0= )
-	ssl? ( dev-libs/openssl:0= )
-	theora? (
-		media-libs/libogg
-		media-libs/libtheora
-		media-libs/libvorbis
-	)
-	webkit? ( dev-qt/qtwebkit:5 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	kde? ( kde-frameworks/extra-cmake-modules:5 )
-	nls? ( sys-devel/gettext )"
-RDEPEND="${RDEPEND}
-	gsm? ( media-sound/gsm )"
-
-DOCS=(ChangeLog doc/FAQ)
-
-pkg_setup() {
-	if use python; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	if [[ "${PV}" == "9999" ]]; then
-		KVIRC_GIT_REVISION="$(git show -s --format=%H)"
-		KVIRC_GIT_SOURCES_DATE="$(git show -s --format=%cd --date=short)"
-	fi
-	einfo "Setting of revision number to ${KVIRC_GIT_REVISION} ${KVIRC_GIT_SOURCES_DATE}"
-	sed -e "/#define KVI_DEFAULT_FRAME_CAPTION/s/KVI_VERSION/& \" (${KVIRC_GIT_REVISION} ${KVIRC_GIT_SOURCES_DATE})\"/" -i src/kvirc/ui/KviMainWindow.cpp || die "Setting of revision number failed"
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-
-	local libdir="$(get_libdir)"
-	local mycmakeargs=(
-		-DLIB_SUFFIX=${libdir#lib}
-		-DMANUAL_REVISION=${KVIRC_GIT_REVISION}
-		-DMANUAL_SOURCES_DATE=${KVIRC_GIT_SOURCES_DATE//-/}
-		-DWANT_ENV_FLAGS=yes
-		-DWANT_VERBOSE=yes
-
-		-DWANT_CRYPT=yes
-		-DWANT_DCC_VOICE=yes
-		-DWANT_IPC=yes
-		-DWANT_IPV6=yes
-		-DWANT_TRANSPARENCY=yes
-
-		-DWANT_AUDIOFILE=$(usex audiofile)
-		-DWANT_DCC_VIDEO=$(usex dcc_video)
-		-DWANT_DEBUG=$(usex debug)
-		-DWANT_DOXYGEN=$(usex doc)
-		-DWANT_GETTEXT=$(usex nls)
-		-DWANT_GSM=$(usex gsm)
-		-DWANT_KDE=$(usex kde)
-		-DWANT_MEMORY_PROFILE=$(usex profile)
-		-DWANT_OGG_THEORA=$(usex theora)
-		-DWANT_OPENSSL=$(usex ssl)
-		-DWANT_OSS=$(usex oss)
-		-DWANT_PERL=$(usex perl)
-		-DWANT_PHONON=$(usex phonon)
-		-DWANT_PYTHON=$(usex python)
-		-DWANT_QTDBUS=$(usex dbus)
-		-DWANT_QTWEBKIT=$(usex webkit)
-		-DWANT_SPELLCHECKER=$(usex spell)
-
-		# COMPILE_SVG_SUPPORT not used in source code.
-		-DWANT_QTSVG=no
-	)
-
-	cmake-utils_src_configure
-}
-
-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/kvirc/kvirc-5.0_pre20180209140255.ebuild b/net-irc/kvirc/kvirc-5.0_pre20180209140255.ebuild
deleted file mode 100644
index 15e77b426f63..000000000000
--- a/net-irc/kvirc/kvirc-5.0_pre20180209140255.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=(python2_7)
-
-inherit cmake-utils flag-o-matic gnome2-utils multilib python-single-r1 xdg-utils
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/kvirc/KVIrc"
-	KVIRC_GIT_REVISION=""
-	KVIRC_GIT_SOURCES_DATE=""
-else
-	inherit vcs-snapshot
-
-	KVIRC_GIT_REVISION="bed7de9c146055237f62b6dfcf6d68f04b2049dd"
-	KVIRC_GIT_SOURCES_DATE="${PV#*_pre}"
-	KVIRC_GIT_SOURCES_DATE="${KVIRC_GIT_SOURCES_DATE:0:4}-${KVIRC_GIT_SOURCES_DATE:4:2}-${KVIRC_GIT_SOURCES_DATE:6:2}"
-fi
-
-DESCRIPTION="Advanced IRC Client"
-HOMEPAGE="http://www.kvirc.net/ https://github.com/kvirc/KVIrc"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/kvirc/KVIrc/archive/${KVIRC_GIT_REVISION}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="kvirc"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="audiofile +dbus dcc_video debug doc gsm kde +nls oss +perl +phonon profile +python spell +ssl theora webkit"
-REQUIRED_USE="audiofile? ( oss ) python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsql:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	sys-libs/zlib:0=
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	audiofile? ( media-libs/audiofile )
-	dbus? ( dev-qt/qtdbus:5 )
-	dcc_video? ( dev-qt/qtmultimedia:5[widgets] )
-	kde? (
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/ki18n:5
-		kde-frameworks/knotifications:5
-		kde-frameworks/kservice:5
-		kde-frameworks/kwindowsystem:5
-		kde-frameworks/kxmlgui:5
-	)
-	perl? ( dev-lang/perl:0= )
-	phonon? ( media-libs/phonon[qt5(+)] )
-	python? ( ${PYTHON_DEPS} )
-	spell? ( app-text/enchant:0= )
-	ssl? ( dev-libs/openssl:0= )
-	theora? (
-		media-libs/libogg
-		media-libs/libtheora
-		media-libs/libvorbis
-	)
-	webkit? ( dev-qt/qtwebkit:5 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	kde? ( kde-frameworks/extra-cmake-modules:5 )
-	nls? ( sys-devel/gettext )"
-RDEPEND="${RDEPEND}
-	gsm? ( media-sound/gsm )"
-
-DOCS=(ChangeLog doc/FAQ)
-
-pkg_setup() {
-	if use python; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	if [[ "${PV}" == "9999" ]]; then
-		KVIRC_GIT_REVISION="$(git show -s --format=%H)"
-		KVIRC_GIT_SOURCES_DATE="$(git show -s --format=%cd --date=short)"
-	fi
-	einfo "Setting of revision number to ${KVIRC_GIT_REVISION} ${KVIRC_GIT_SOURCES_DATE}"
-	sed -e "/#define KVI_DEFAULT_FRAME_CAPTION/s/KVI_VERSION/& \" (${KVIRC_GIT_REVISION} ${KVIRC_GIT_SOURCES_DATE})\"/" -i src/kvirc/ui/KviMainWindow.cpp || die "Setting of revision number failed"
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-
-	local libdir="$(get_libdir)"
-	local mycmakeargs=(
-		-DLIB_SUFFIX=${libdir#lib}
-		-DMANUAL_REVISION=${KVIRC_GIT_REVISION}
-		-DMANUAL_SOURCES_DATE=${KVIRC_GIT_SOURCES_DATE//-/}
-		-DWANT_ENV_FLAGS=yes
-		-DWANT_VERBOSE=yes
-
-		-DWANT_CRYPT=yes
-		-DWANT_DCC_VOICE=yes
-		-DWANT_IPC=yes
-		-DWANT_IPV6=yes
-		-DWANT_TRANSPARENCY=yes
-
-		-DWANT_AUDIOFILE=$(usex audiofile)
-		-DWANT_DCC_VIDEO=$(usex dcc_video)
-		-DWANT_DEBUG=$(usex debug)
-		-DWANT_DOXYGEN=$(usex doc)
-		-DWANT_GETTEXT=$(usex nls)
-		-DWANT_GSM=$(usex gsm)
-		-DWANT_KDE=$(usex kde)
-		-DWANT_MEMORY_PROFILE=$(usex profile)
-		-DWANT_OGG_THEORA=$(usex theora)
-		-DWANT_OPENSSL=$(usex ssl)
-		-DWANT_OSS=$(usex oss)
-		-DWANT_PERL=$(usex perl)
-		-DWANT_PHONON=$(usex phonon)
-		-DWANT_PYTHON=$(usex python)
-		-DWANT_QTDBUS=$(usex dbus)
-		-DWANT_QTWEBKIT=$(usex webkit)
-		-DWANT_SPELLCHECKER=$(usex spell)
-
-		# COMPILE_SVG_SUPPORT not used in source code.
-		-DWANT_QTSVG=no
-	)
-
-	cmake-utils_src_configure
-}
-
-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/kvirc/kvirc-5.0_pre20180401054732.ebuild b/net-irc/kvirc/kvirc-5.0_pre20180401054732.ebuild
index 37a0e7d775e3..7e4d9bfe234f 100644
--- a/net-irc/kvirc/kvirc-5.0_pre20180401054732.ebuild
+++ b/net-irc/kvirc/kvirc-5.0_pre20180401054732.ebuild
@@ -30,7 +30,7 @@ fi
 
 LICENSE="kvirc"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="audiofile +dbus dcc_video debug doc gsm kde +nls oss +perl +phonon profile +python spell +ssl theora webkit"
 REQUIRED_USE="audiofile? ( oss ) python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 20e815517e48..a09aab977471 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libgadu/Manifest b/net-libs/libgadu/Manifest
index 126a38282d32..700a121d2ba0 100644
--- a/net-libs/libgadu/Manifest
+++ b/net-libs/libgadu/Manifest
@@ -1,10 +1,5 @@
-AUX libgadu-1.12.0-tests.patch 453 BLAKE2B 6d2111cd4e59ca2aa971734ed817b17011ac26d783dc9535c3cf769b84d7ed34bad0308c189ce0ba172b991d3c3867550bb4978ecb5b8dd00701a740c70ad6a5 SHA512 e024677ac361675e02518c692c9ecf2b1ea2a74fba3ed55506c67f70c911821421128214691487b09a8c315776f11afe5390135afcc7c33e04175f419ee69b39
 DIST libgadu-1.11.4.tar.gz 210937 BLAKE2B 05719b31f1d3ffd7df059d33597943787c1f10ac1dea89dce893050719394e1f2c7b5858b4ff3d0d2421bf68c977d4dfafd20689b3a7c0dc2c0593cb4d49599c SHA512 3fc8e414470864eb953d6d0d7dc6071679907c435d76e05a0b95a2e58365fc795427679f893d337dbf9896611a6bf68047c36806b977643cf4a773d930916639
-DIST libgadu-1.12.0.tar.gz 290361 BLAKE2B 7dc517b0704bd525aa2e71dc49bd64daee65cff6c4084776c01a48f806cebe57ce933a8be557ecf94648de0920765efeb293ba8d30d8a46cd1590f97fa40a877 SHA512 62d1db0e0a59ce7e9a27a2002eea26e69b476a5bddeec129ec6e37d6141dc74e51b177a2cacd232031253d19d223f20ae68df1981f1f673485447950a0bc6670
-DIST libgadu-1.12.1.tar.gz 296079 BLAKE2B 0420e3a4e0d7180f0fd78fb8c5dd19c406d8f0d9880adca643301410c261ca9367f31ed72a3f9d27c07a4b6dcf0f3d6d5dd0e6b1025082f70c9442a5518557b3 SHA512 4786bcc517dcead278fed05c35e254d963ee42f029b09a59bfe01052cbe438fa4a0d86c17dcfa2ee39d2365f28864f887d28772a5e70ce2ece190714bec45590
 DIST libgadu-1.12.2.tar.gz 298884 BLAKE2B eee364204e9106b080a62ed4e180739b4dd9f2699fe3ddcb36493e3e29cc4e8074df17601900372c0a68da4b119f938521d4dd33baf730b279a13d80f74dbbee SHA512 d3b4fde94327ef312b1df668b8eb73fea9325c9258d85aa65e2746b73f00c2606ebe23f3330493a135a0fec1d0f24988f0cec607d4d899d880853ee8bf60e677
-EBUILD libgadu-1.11.4.ebuild 1299 BLAKE2B 8ae4199cdefee341d9593eec668ec6d4fe53d340863869399a866c38d22810f117ce33fd58473caa19a2c02cacd46167c34800e52279866316877abebec9814c SHA512 77fce206ce7324e7a10b6c7e1c4e49fcc3815b3c4442ff9ba1b80460fef971f487aaf6504cbeb4f2162e912f87d565f052f5e859d22806bd122cace801a969bb
-EBUILD libgadu-1.12.0.ebuild 1421 BLAKE2B fa83fb7b137cae397024abde603e8839cbfffe0e54130298eda458b1354cae08fe3b9bb875bf4179cc39fba5d4c10b92ce57b8918a07958c06331ba862207706 SHA512 1601544bbd6e29c6c134bdb7e2e94e4dafce2b845d6e5d13bdb6ab2f955b718bb90b91217c2c42460834997be3d0c216e8df4a3ea84ec0ed0ff1257aa868add0
-EBUILD libgadu-1.12.1.ebuild 1435 BLAKE2B 56ab1bc6b8f003354096b25290a17af6245331cee34dfbb676fa37f478aa03cfc6510a2f785dd84569b60cfdad63310a0004ce751753a28e1756a338128d4a7e SHA512 6a2f97e833816e212202b8e21a45fe9505371e4c1060670000fffc9ac77852baefb729dc46f2431b9e63acbc4759caebcbfdec650e84a7c0e32d8252314e8531
+EBUILD libgadu-1.11.4.ebuild 1301 BLAKE2B c5e78bcf29f9cf44871f66bbac467d5af33abae86c2ac456c8bfdb760fd8a6b1d589df7db6eb389b82d226c696222edbf90b69db358f5a0b3e521ae73d78ed0e SHA512 513bc3032113c4edaba532198eff84c04e34d158f68a6477a7cd7521ad7cbe99f04f33811f56a5c8fcca448b19fed97579fb519e12779874b8de031e62ad5324
 EBUILD libgadu-1.12.2.ebuild 1393 BLAKE2B ae6c1bc6c49b3d2e5c0800ba0bf72240141154830a15b3dc609a64c91b0ffa04d4c33f5dc0052d8bee443b27d39b852d72e7878768541838f6616fd99b2d20ce SHA512 944b3d1f2f70ef67e154415edaec6c044bd777771473de7d1b464a7ad51622e7ac7665e1bfaab053729fe77b7ae9f9ee1286ee5139577211d3096ddac2332f74
 MISC metadata.xml 332 BLAKE2B d29e6205dff565647900434cfab8660dcc980bdccec03dccd6b16070659bec0b36c7030de139e6d0d0179c1ff36186d386b16cbb878cb82f5821f04ca615e73f SHA512 1b4a93d0fce0c628f5e85500c8f325423c961cb755eac978627abbdb039cd56de08b48afcc443b0a52b84c1ea82fe75758770dcfa0efe7639a530ee80262135e
diff --git a/net-libs/libgadu/files/libgadu-1.12.0-tests.patch b/net-libs/libgadu/files/libgadu-1.12.0-tests.patch
deleted file mode 100644
index 56e1da45b096..000000000000
--- a/net-libs/libgadu/files/libgadu-1.12.0-tests.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN libgadu-1.12.0/test/manual/lib/base64.c my/test/manual/lib/base64.c
---- libgadu-1.12.0/test/manual/lib/base64.c	2014-06-13 20:41:37.000000000 +0200
-+++ my/test/manual/lib/base64.c	2014-08-13 03:08:00.612006311 +0200
-@@ -30,7 +30,7 @@
- #include <openssl/bio.h>
- #include <openssl/buffer.h>
- 
--char *gg_base64_encode(const char *input, ssize_t len)
-+char *gg_base64_encode2(const char *input, ssize_t len)
- {
- 	BIO *bmem, *b64;
- 	BUF_MEM *bptr;
diff --git a/net-libs/libgadu/libgadu-1.11.4.ebuild b/net-libs/libgadu/libgadu-1.11.4.ebuild
index 7c85cae4fd94..e269958d970a 100644
--- a/net-libs/libgadu/libgadu-1.11.4.ebuild
+++ b/net-libs/libgadu/libgadu-1.11.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -26,7 +26,7 @@ COMMON_DEPEND="
 	sys-libs/zlib
 	ssl? (
 		gnutls? ( net-libs/gnutls )
-		!gnutls? ( >=dev-libs/openssl-0.9.6m )
+		!gnutls? ( >=dev-libs/openssl-0.9.6m:0 )
 	)
 "
 DEPEND="${COMMON_DEPEND}
diff --git a/net-libs/libgadu/libgadu-1.12.0.ebuild b/net-libs/libgadu/libgadu-1.12.0.ebuild
deleted file mode 100644
index 1448b9f64340..000000000000
--- a/net-libs/libgadu/libgadu-1.12.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils
-
-DESCRIPTION="This library implements the client side of the Gadu-Gadu protocol"
-HOMEPAGE="http://toxygen.net/libgadu/"
-SRC_URI="https://github.com/wojtekka/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
-SLOT="0"
-IUSE="doc gnutls ssl static-libs test threads"
-
-REQUIRED_USE="
-	gnutls? ( ssl )
-"
-COMMON_DEPEND="
-	>=dev-libs/protobuf-c-0.15
-	sys-libs/zlib
-	ssl? (
-		gnutls? ( net-libs/gnutls )
-		!gnutls? ( >=dev-libs/openssl-0.9.6m )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	doc? ( app-doc/doxygen )
-	test? (
-		dev-libs/expat
-		dev-libs/libxml2:2
-		net-misc/curl
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!=net-im/kadu-0.6.0.2
-	!=net-im/kadu-0.6.0.1
-"
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-PATCHES=(
-	"${FILESDIR}/${P}-tests.patch"
-)
-
-DOCS=(AUTHORS ChangeLog NEWS README)
-
-src_configure() {
-	local myeconfargs=(
-		--with-protobuf
-		$(use_enable test tests)
-		$(use_with threads pthread)
-	)
-
-	if use ssl; then
-		myeconfargs+=(
-			$(use_with gnutls gnutls)
-			$(use_with !gnutls openssl)
-		)
-	else
-		myeconfargs+=(
-			--without-gnutls
-			--without-openssl
-		)
-	fi
-
-	autotools-utils_src_configure
-}
-
-src_install() {
-	use doc && HTML_DOCS=(docs/html/)
-	autotools-utils_src_install
-}
diff --git a/net-libs/libgadu/libgadu-1.12.1.ebuild b/net-libs/libgadu/libgadu-1.12.1.ebuild
deleted file mode 100644
index bde28ad49fc6..000000000000
--- a/net-libs/libgadu/libgadu-1.12.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils
-
-DESCRIPTION="This library implements the client side of the Gadu-Gadu protocol"
-HOMEPAGE="http://toxygen.net/libgadu/"
-SRC_URI="https://github.com/wojtekka/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 arm ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
-SLOT="0"
-IUSE="doc gnutls ssl static-libs test threads"
-
-REQUIRED_USE="
-	gnutls? ( ssl )
-"
-COMMON_DEPEND="
-	>=dev-libs/protobuf-c-0.15
-	sys-libs/zlib
-	ssl? (
-		gnutls? ( net-libs/gnutls )
-		!gnutls? ( >=dev-libs/openssl-0.9.6m )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	doc? ( app-doc/doxygen )
-	test? (
-		dev-libs/expat
-		dev-libs/libxml2:2
-		net-misc/curl
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!=net-im/kadu-0.6.0.2
-	!=net-im/kadu-0.6.0.1
-"
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.12.0-tests.patch"
-)
-
-DOCS=(AUTHORS ChangeLog NEWS README)
-
-src_configure() {
-	local myeconfargs=(
-		--with-protobuf
-		$(use_enable test tests)
-		$(use_with threads pthread)
-	)
-
-	if use ssl; then
-		myeconfargs+=(
-			$(use_with gnutls gnutls)
-			$(use_with !gnutls openssl)
-		)
-	else
-		myeconfargs+=(
-			--without-gnutls
-			--without-openssl
-		)
-	fi
-
-	autotools-utils_src_configure
-}
-
-src_install() {
-	use doc && HTML_DOCS=(docs/html/)
-	autotools-utils_src_install
-}
diff --git a/net-libs/loudmouth/Manifest b/net-libs/loudmouth/Manifest
index 420483ae4a17..a751b03c4762 100644
--- a/net-libs/loudmouth/Manifest
+++ b/net-libs/loudmouth/Manifest
@@ -2,6 +2,6 @@ AUX loudmouth-1.5.3-gcc7.patch 919 BLAKE2B 085cc7bd0c1eabe91f45c8f1fce8f52518a58
 DIST loudmouth-1.5.2.tar.gz 115940 BLAKE2B cf9134fb68e09c4f03e605227a42b9fc092d5f4f5524a39e044f6bd573e7b9a0e7ba1161cda2655cdc513a05673dfa3600d0548209230314a9455c7a912123b7 SHA512 54c3eb7ef99604d7e2d5560dc6e5be176a188e6a0d82ae6c2f488e30f06553039aa03d6f818cec25f354479a2624f60f2233d7e63b54f331e934d554de9bfc87
 DIST loudmouth-1.5.3.tar.gz 114676 BLAKE2B 7a73e4e65046608fc8ec571b5448ab8344a8aed554fee1ecf7badd2ca5ed382ddb27e6ba7bd5d0a76d978d3079415b307f1b4ca77da450003ae936191cdbd33e SHA512 afae8b4ad1e9e5558cffa8f6b9f25331b01cfa09ea0b3defb74cac7d39477744e6d9181d3adefe242038020759df43558de0e61305fbc8e12a3b293b82856bf7
 EBUILD loudmouth-1.5.2-r1.ebuild 1159 BLAKE2B e36ed32efdf19275bc74694a814c814e92f0533da216d8a8a80cf731b40fa51f63377db99bbebf5900810be0b4d69d4dbb81c6d18c18ba5932fb5b59be35a68f SHA512 e53ddf6fa0c513671fddca1996c51f70b7cb4d83910ee9754b70d040872f38d63b54a054350e3b542869ba87140243a29af8e7e724c2102b75873b7004887b8e
-EBUILD loudmouth-1.5.3-r1.ebuild 1158 BLAKE2B 56cc3a368c123cd614c53c8b52f722adea26c4b8aceac95c88a9a5eed2107f1697e91659c38ec9665017ea78eeb31c6217d3dc7a813244cad94e0d1ac6f82862 SHA512 5bf39cbf261b4c63a039cb56cd6508376fd0d5d23d864709e0c465e0b1599a52d720f575208691b3c890ccea116526aa54abe123c09e2269f8284a747901f7fa
+EBUILD loudmouth-1.5.3-r1.ebuild 1157 BLAKE2B ca5ff3d2eaeacf823355a74ad2bb50aa8e7c1c3d0e50b6e988d834f03e238e0127b91ee1a1527dde7bffd1a828b9ec09952606babc752fbabe103daa8da2f09a SHA512 d1c4dcba6ebfd4a54119e69063ba45bfd66f906aff39aabc7bdc93c0efccc3b9d5be1c213464d18a163e806ee572a38a79b08c461c21fb0da8709817fedbc14c
 EBUILD loudmouth-1.5.3.ebuild 1204 BLAKE2B 3e5c33e9408cc1f1ecc93dcb7c05c4e6e407b79661f18d9e6c2cb3f5ef00c1d4363d5411e78669e868947e8aab1dd0675b98ee7c4a69f81402da0574f908b8b1 SHA512 3a8814478be13d64ef265ad92f5400638299d9497391bf36e40424b079dcf963e69dae6e08fee83adb9a6df196025daa6ad23bf232fb6490774d2aeb5a2a0d96
 MISC metadata.xml 561 BLAKE2B 25fe241cbe49f3c8a85c331659dde548dc8dc3dd4e7f904921ee7cf75ad3ef4f794823b937ff5d32c11260fdab1ec0f6162a9f90707e7d6abcfe7e0c7e004383 SHA512 69e89d7b5ffc2045a760a8b094bdc6fd230c10539550f9c0efb657a480bdee487f3e6cd5c87b2e037a1b1078274ebaa25efde6535aed4dfe57876a60a2faf4aa
diff --git a/net-libs/loudmouth/loudmouth-1.5.3-r1.ebuild b/net-libs/loudmouth/loudmouth-1.5.3-r1.ebuild
index 46433a1d78f2..76ee3d614710 100644
--- a/net-libs/loudmouth/loudmouth-1.5.3-r1.ebuild
+++ b/net-libs/loudmouth/loudmouth-1.5.3-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/mcabber/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~arm ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
 
 IUSE="asyncns ssl openssl static-libs test"
 
diff --git a/net-libs/miniupnpc/Manifest b/net-libs/miniupnpc/Manifest
index 3e6c61d6aa49..d5ec956f8f36 100644
--- a/net-libs/miniupnpc/Manifest
+++ b/net-libs/miniupnpc/Manifest
@@ -6,6 +6,6 @@ DIST miniupnpc-2.0.20180503.tar.gz 88207 BLAKE2B 1d6c6396e805eae3c53263a6856cc11
 EBUILD miniupnpc-2.0.20170509.ebuild 1266 BLAKE2B 275a77b2813007c8055df57d2e8d74c05c02e7f81af1b1ad766a4c9f274f955c7d56779184983a1e45962bbc38e9ff58f15f4bfc076ed86cc1400eabac4f2dcb SHA512 aeeaba172f38162342256afc17223e1efce42f149561ca0e19bcd8336d32dd74d51a55951f4df79663d1999702930eb4dcd6ceebeea9afe82d9f376432dd7271
 EBUILD miniupnpc-2.0.20171212.ebuild 1266 BLAKE2B 0fec3f1639a678ca9a119713e62dfde5b8d3b361a6887a85a16d4f202376423a3fbe8910400467e3da91cf368b3628d001a1c5450d4c624471202a56d57d5139 SHA512 5f46f5b41a88c39d560eb8db872b8e3266142dbce18024fd05761f4be8c144475d8b444eef0848db1ad51934f39924b71950b39f660bc47d523d7186f05b158d
 EBUILD miniupnpc-2.0.20180203.ebuild 1339 BLAKE2B be0965e64f83087fffb495b3c3de74d691b2575fd8d14b36c56284404e912b623baea93027c61d58d354ef00c8fb31f4581b01959606683e1d23563e75b72891 SHA512 af3b05b0af780f4b8707209b7d1bbd26c8952c0f9314f613569f6da6e03a5bac9961d19e16e6c0876abee7006401c909b02e5c058daba7e2dbd6922aba98110e
-EBUILD miniupnpc-2.0.20180222.ebuild 1333 BLAKE2B f762b531021f78f3aa93475585e8a1e487904c9dc3318bac1e909583082b5a83016fe7133729da4adfdcd25ed8d7140ebc285f6462e763abbe10793730b949e8 SHA512 c26e847103ae46119663cc66674104b19a32b6c12294572701862e1315b40c299b35944de2d3c505d6805246b13685a436e7a9d2fc8eaaea41826ca84fa685d3
+EBUILD miniupnpc-2.0.20180222.ebuild 1332 BLAKE2B b4ff98efe5a1e52ac0e10cfb0b4b46df1e3ac2d5916054de4a83737232e29cd548d2a873338379b88eb353122133688c2cb76c039af0cd34d1b257575f3c5498 SHA512 e19fb20718123716197a8a857759cd8dfc791662289e55a1014e9fd647a3384c3bcb78912375bf3176ed844d666c5947a8385581053c270c2c320a081de8ba44
 EBUILD miniupnpc-2.0.20180503.ebuild 1339 BLAKE2B 697f1d38525ead8b41b0b5ad8b88b59bcb5281ebb1e5685e1caa94b9b0d350c2b2d9c3f2e46b37a4a2b74214079fe8d9c4c52c3dc81d1072f2d603f1f4d2e9f3 SHA512 93714f9e816f487b4d130c81e5149af4126245b8901a4e669026956e00510e465a098d92bc85b574c8b576f6b81bc42616fe1e220aa58256dcd7ffb93dd092b2
 MISC metadata.xml 243 BLAKE2B 997913e51bb9c2ba601c78673246d3845d1078f5be11ff209532c5afc9f433d4cfe7a0066ba23677d23ffe368d7ee718df71d28301d45c0473f50e931f674165 SHA512 ded2bb7e056d9081e11b0470aa2874fbe9b5e63f0178bec611291f639763a9bd85a076dbc526e01df1403dea4d0eb28913addb346b676084e690e063b68eca28
diff --git a/net-libs/miniupnpc/miniupnpc-2.0.20180222.ebuild b/net-libs/miniupnpc/miniupnpc-2.0.20180222.ebuild
index adca70a097dd..93cbb63e9b2e 100644
--- a/net-libs/miniupnpc/miniupnpc-2.0.20180222.ebuild
+++ b/net-libs/miniupnpc/miniupnpc-2.0.20180222.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/16"
-KEYWORDS="amd64 arm ~arm64 hppa ~mips ~ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 arm ~arm64 hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="ipv6 kernel_linux static-libs"
 
 RDEPEND=""
diff --git a/net-libs/pjproject/Manifest b/net-libs/pjproject/Manifest
index 44f641535dd5..8acd0f0e8cf7 100644
--- a/net-libs/pjproject/Manifest
+++ b/net-libs/pjproject/Manifest
@@ -1,7 +1,8 @@
 AUX pjproject-2.7.1-ssl-flipflop.patch 4345 BLAKE2B b52f5a2cb86abdae86e9cfe58fe63b187f615b39ea4991768d0937e8b6e353a8496f1ad24f3cbaff92a09847c1ec444b81f9e470f1e78325ea26ca04456579e7 SHA512 00e7b8b347f73929f52015e102286f0631699de4c0e3631c53df6b00130d5b6760492748454ae7315eb9df0b182019901c59b9ed15c8fdd578548f9039080050
+AUX pjproject-2.7.2-libressl.patch 3446 BLAKE2B 47b21f621ffd1990e276459d9692ed7e8a083b93fc8dd0f44225af7cbf8f8390f9790efd61c8c790a0f20da64cb7f47db4fd83a8f0604de9a1bce30d54b3079f SHA512 173fc80e85673c4036b433cbf8152c58862d4716d4d98688cfaebf4c5ed3df76b8d4893709577c1dfff82a02baeeb0220dcae1dafc2e69ea9472056727b0d0fc
 AUX pjproject-2.7.2-ssl-flipflop.patch 4336 BLAKE2B 999150475bd24989f64bb718d082ff1c40d5ba383103371550d2c682578a9c57d58b4029e512ac5a064fae3a526bd6e62fb645ba45b4067c47fd148bcce668aa SHA512 438a61353c0200d3f230b81cc13f565a178d078b4580aa468a9241b5b95f5a2336d039f4aaf99cd57e7b1042f4c0a1cafd00c29191e36c08f2194d984811b8d6
 DIST pjproject-2.7.1.tar.bz2 4880007 BLAKE2B 33fca89f07abc0b9662b1070c96b903c236a60149734755286dad3111411dbeef5779077a77d21112be6db2957cb7e18c5c833b3c5fd32c26be44d4550fb215e SHA512 cd15afee2a02659668ff228b2652d2bd179393e3b5031afae1c326354fb9676babc08eb689e466165536abc360684299b4fdb41dbb1148aed89afe1ce7e5d979
 DIST pjproject-2.7.2.tar.bz2 4994233 BLAKE2B 44ecaf0997d5dd9b18e0b811cead7c9104e63894fa06fb1d64e79b60fa4210968fd90ef47e5f5be3629675363c8756ce3bc1834caa9700654ab4c53efe676ee7 SHA512 3d355ffcbbeed62cfc711e574a987dc06043ccf4f2625820adffa89167022b8306fcee3fada71d3d45e7b902fc9c65ac8221de101cbafed25362a3921f702afd
 EBUILD pjproject-2.7.1.ebuild 2610 BLAKE2B a67e4c4c21bea82aba8fd25cdc152329734d6d9aa6550c8bcba951b997e6ee9db0e509ff344ab296dc401422ce6d2fcc4c675cd8101dae30bf254b99aee621f9 SHA512 d0d93d97ac40394416ad4e7286e226160ccb9652922a318e1293610361355130f95cabc4133e2144b62bb59d57fa8bfc2d3e5742832dbd420b87c7a7ee48ed75
-EBUILD pjproject-2.7.2.ebuild 2612 BLAKE2B 54521f7df9bda11dd925820bf39c0136bf5850f89ddc9a2cab517fa86be2a3eb93c8bf0c277109ea6d6fd47fb5a11aedbd944178a481258996ab5e3eab329326 SHA512 c4842f91ecce45548929f2504829a68bb00d7eb2e45c4a1cddc80a8acea4ef215ae32f5c7a17540f4fbabe89b90b79b68d86dad6aa40071da74f561f2780bb44
+EBUILD pjproject-2.7.2.ebuild 2713 BLAKE2B b319682f4850080fe47828e291ade7eb27a182f80c26deb5be81d85c55e23335e085f0a3a5053cc435fbbf2c6491bfa05614e75592b56328c30225ef7239cbe0 SHA512 4603a1fa9a66e27d203d4d2f2c6f72224935762477f1b59e77eca24c300beb16edea39a58b78c456aaf9d3b136e1eba82b5b55bc688619172ec4000c14e20a97
 MISC metadata.xml 1157 BLAKE2B 1b40ee1b635cb8cdafaf001ad458264c4e55344393fd76ac7263521069bd355e4febd7ef534b24bd3879a75e5229863d8b93b8d89019639c49bb7511e1044ca5 SHA512 1171e638d0320d07b0bf3d6a6d31a75722dd659b296d9f451cfe1d3cc12016ff5b1c94b690054bb3772462d7a8d70b47fcb8b5c760c8677a727743ecebb57dce
diff --git a/net-libs/pjproject/files/pjproject-2.7.2-libressl.patch b/net-libs/pjproject/files/pjproject-2.7.2-libressl.patch
new file mode 100644
index 000000000000..07efa9ccb8fd
--- /dev/null
+++ b/net-libs/pjproject/files/pjproject-2.7.2-libressl.patch
@@ -0,0 +1,98 @@
+Index: /third_party/srtp/crypto/hash/hmac_ossl.c
+===================================================================
+--- /third_party/srtp/crypto/hash/hmac_ossl.c	(revision 5725)
++++ /third_party/srtp/crypto/hash/hmac_ossl.c	(revision 5726)
+@@ -52,6 +52,8 @@
+ #include <openssl/evp.h>
+ #include <openssl/hmac.h>
++#include <openssl/opensslv.h>
+ 
+ #define SHA1_DIGEST_SIZE		20
++#define USING_LIBRESSL (defined(LIBRESSL_VERSION_NUMBER))
+ 
+ /* the debug module for authentiation */
+@@ -77,5 +79,5 @@
+ /* OpenSSL 1.1.0 made HMAC_CTX an opaque structure, which must be allocated
+    using HMAC_CTX_new.  But this function doesn't exist in OpenSSL 1.0.x. */
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if USING_LIBRESSL || OPENSSL_VERSION_NUMBER < 0x10100000L
+     {
+         /* allocate memory for auth and HMAC_CTX structures */
+@@ -122,5 +124,5 @@
+     hmac_ctx = (HMAC_CTX*)a->state;
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if USING_LIBRESSL || OPENSSL_VERSION_NUMBER < 0x10100000L
+     HMAC_CTX_cleanup(hmac_ctx);
+ 
+Index: /pjlib/src/pj/ssl_sock_ossl.c
+===================================================================
+--- /pjlib/src/pj/ssl_sock_ossl.c	(revision 5725)
++++ /pjlib/src/pj/ssl_sock_ossl.c	(revision 5726)
+@@ -56,6 +56,10 @@
+ #include <openssl/rand.h>
+ #include <openssl/opensslconf.h>
+-
+-#if !defined(OPENSSL_NO_EC) && OPENSSL_VERSION_NUMBER >= 0x1000200fL
++#include <openssl/opensslv.h>
++
++#define USING_LIBRESSL (defined(LIBRESSL_VERSION_NUMBER))
++
++#if !USING_LIBRESSL && !defined(OPENSSL_NO_EC) \
++	&& OPENSSL_VERSION_NUMBER >= 0x1000200fL
+ 
+ #   include <openssl/obj_mac.h>
+@@ -115,5 +119,5 @@
+ 
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if !USING_LIBRESSL && OPENSSL_VERSION_NUMBER >= 0x10100000L
+ #  define OPENSSL_NO_SSL2	    /* seems to be removed in 1.1.0 */
+ #  define M_ASN1_STRING_data(x)	    ASN1_STRING_get0_data(x)
+@@ -539,5 +543,5 @@
+ 
+     /* Init OpenSSL lib */
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if USING_LIBRESSL || OPENSSL_VERSION_NUMBER < 0x10100000L
+     SSL_library_init();
+     SSL_load_error_strings();
+@@ -560,5 +564,7 @@
+ 	const char *cname;
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if (USING_LIBRESSL && LIBRESSL_VERSION_NUMBER < 0x2020100fL)\
++    || OPENSSL_VERSION_NUMBER < 0x10100000L
++
+ 	meth = (SSL_METHOD*)SSLv23_server_method();
+ 	if (!meth)
+@@ -603,5 +609,6 @@
+ 	SSL_set_session(ssl, SSL_SESSION_new());
+ 
+-#if !defined(OPENSSL_NO_EC) && OPENSSL_VERSION_NUMBER >= 0x1000200fL
++#if !USING_LIBRESSL && !defined(OPENSSL_NO_EC) \
++    && OPENSSL_VERSION_NUMBER >= 0x1000200fL
+ 	openssl_curves_num = SSL_get_shared_curve(ssl,-1);
+ 	if (openssl_curves_num > PJ_ARRAY_SIZE(openssl_curves))
+@@ -795,5 +802,6 @@
+ 
+     /* Determine SSL method to use */
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if (USING_LIBRESSL && LIBRESSL_VERSION_NUMBER < 0x2020100fL)\
++    || OPENSSL_VERSION_NUMBER < 0x10100000L
+     switch (ssock->param.proto) {
+     case PJ_SSL_SOCK_PROTO_TLS1:
+@@ -1232,5 +1240,6 @@
+ static pj_status_t set_curves_list(pj_ssl_sock_t *ssock)
+ {
+-#if !defined(OPENSSL_NO_EC) && OPENSSL_VERSION_NUMBER >= 0x1000200fL
++#if !USING_LIBRESSL && !defined(OPENSSL_NO_EC) \
++    && OPENSSL_VERSION_NUMBER >= 0x1000200fL
+     int ret;
+     int curves[PJ_SSL_SOCK_MAX_CURVES];
+@@ -1263,5 +1272,5 @@
+ static pj_status_t set_sigalgs(pj_ssl_sock_t *ssock)
+ {
+-#if OPENSSL_VERSION_NUMBER >= 0x1000200fL
++#if !USING_LIBRESSL && OPENSSL_VERSION_NUMBER >= 0x1000200fL
+     int ret;
+ 
diff --git a/net-libs/pjproject/pjproject-2.7.2.ebuild b/net-libs/pjproject/pjproject-2.7.2.ebuild
index e4d25565824a..ee569db2b4e1 100644
--- a/net-libs/pjproject/pjproject-2.7.2.ebuild
+++ b/net-libs/pjproject/pjproject-2.7.2.ebuild
@@ -15,9 +15,12 @@ SLOT="0"
 CODEC_FLAGS="g711 g722 g7221 gsm ilbc speex l16"
 VIDEO_FLAGS="sdl ffmpeg v4l2 openh264 libyuv"
 SOUND_FLAGS="alsa oss portaudio"
-IUSE="amr debug doc epoll examples ipv6 opus resample silk ssl static-libs webrtc ${CODEC_FLAGS} ${VIDEO_FLAGS} ${SOUND_FLAGS}"
+IUSE="amr debug doc epoll examples ipv6 libressl opus resample silk ssl static-libs webrtc ${CODEC_FLAGS} ${VIDEO_FLAGS} ${SOUND_FLAGS}"
 
-PATCHES=( "${FILESDIR}"/${P}-ssl-flipflop.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-ssl-flipflop.patch
+	"${FILESDIR}"/${P}-libressl.patch
+)
 
 RDEPEND="alsa? ( media-libs/alsa-lib )
 	oss? ( media-libs/portaudio[oss] )
@@ -34,7 +37,10 @@ RDEPEND="alsa? ( media-libs/alsa-lib )
 	openh264? ( media-libs/openh264 )
 	resample? ( media-libs/libsamplerate )
 
-	ssl? ( dev-libs/openssl:= )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
 
 	net-libs/libsrtp:0"
 DEPEND="${RDEPEND}
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index c14b1e159184..5a90669cfed1 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index ad7365661adc..98088a54efd2 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -4,12 +4,14 @@ DIST dovecot-2.2-pigeonhole-0.4.18.tar.gz 1742357 BLAKE2B 8f9fc54e6effb233f7e854
 DIST dovecot-2.2-pigeonhole-0.4.20.tar.gz 1745121 BLAKE2B 4a320d7340f3a7fbb92f911c16abb49561692310c7c9224842065b9830f057e442e6ae27010232d615a06f6fdd889ef8619c555516e2d843802297644b935a27 SHA512 84a28842be206e05cb96c07cf1c1b62c9c378ba4c952caa47cf79a44b9428e076f4182eadd9c4fb8f45d3605b881f91e8e520c41705017ac4039240d4bcace39
 DIST dovecot-2.2-pigeonhole-0.4.21.tar.gz 1774887 BLAKE2B ebf2601e7b087d655713f985b72442496e36543ec32881d3bc84d2c6b132f58082aee6c5fae3747f756b72a3c9a2e11f78350bc34c398214de13dfc83cffdef1 SHA512 4751f449ede1b05173c706b414ebf9f7f670ff78589ce6f0b687c32c9abe6dae8b3064ed1b20e893d9ec0147b0139ce479e1d74ebe94747c33f2d8ca177912de
 DIST dovecot-2.2-pigeonhole-0.4.23.tar.gz 1787189 BLAKE2B 5ba20f6943dad508a655a5ba48c8d9a61d1bd40ddcbc8c037a4cda629fc7f87abe0abd8858d1d50324d7003f3997df27e9fc81ca83c76f465bc3bcbb3e023fae SHA512 24dae1f7a52fdb37f644e9c0a5c30dcbb95018e8dd43f18af56e7ee813723cad36b74d6c22ddff281e140e4c0bbb61900baf23116a980dcda5244ae8a5b544f8
+DIST dovecot-2.2-pigeonhole-0.4.24.tar.gz 1808131 BLAKE2B e8a19b5c3b4876e71556e52ba6a984f6ed0abe93a222f692303fd41cd7a1e6e4e8fd0e5ab0821e9e179b595694752813689a07b428b2590582c3ca7dbb99a08f SHA512 2e21c95ece475ffcb78e5b5d4efa29e61471faf90b80b44a49963fb287de2784ebfb4c2b7ddfc66732fd073e9f02995d5950840336f6babe618b3d7d5166059f
 DIST dovecot-2.2-pigeonhole-0.4.9.tar.gz 1577127 BLAKE2B 7e6f11bf74d56887b640ab5ebffd6e2ad7878d47da808f81b2f21ab4de02495f6ca79453ab5867568afee7f2d9a0915601ceccf5c6a9581d38994c4d35f692e7 SHA512 9e7a18b43d59ed955b142d16696ca221822a547ea59ac70c1bb374eedb28b6ed99ea49f34ead1f9a16ded4573605e410a5cc8e038e1bdf5f943a65588b5d3af2
 DIST dovecot-2.2.19.tar.gz 5256627 BLAKE2B 0b7fe57ced1b1f7eb5e29e8d6723d237cc107752286995d8e5f6857f24b45ab40c4a38b03935b228e8530c3b254509124a7b6ce4e0a8a9be0ea87f0c529db935 SHA512 1b9d605a6a5862ade9d1ca634a9e0171b7c212ab025fc2059051c3795470685b66516fa9fbe5ad91d84388268ea15795f2dcd70ffdf81736ce4d80fd284835e9
 DIST dovecot-2.2.29.1.tar.gz 5972119 BLAKE2B 9b05e9976369757de07471c2e499a863efbd94b51d8aefdeb2144c01596f03f9ea02670ee9cac9590615e4139dc754c11eb4777d791f87a2e6031302155d9f05 SHA512 1e5ea6080ebe7dd4afe6fcfe8e98ed6d2ad2735655a18cc96e439dd044ccc3a1a6a80428bc746b4d6250820895d6a62121562e97e4b46c8b1cf88a19443bc111
 DIST dovecot-2.2.32.tar.gz 6100268 BLAKE2B e7d79f81fe06565d254c46de5cd7f4565883a029f4fa409d9f3c6ff75d599fb3f1ce5f8a32b96b9bebe4654de2be4998d0e178f1784e00d246186727324c6e80 SHA512 a26ce763fdea7d72ff9801d3b7d57a1f0d00278e4a1aa60d1be070fe5a6d2c6a15f266a519119492bee7a3e7a6b7d0732e9879e5c5841adbab8c0952cd1b7c7c
 DIST dovecot-2.2.34.tar.gz 6181270 BLAKE2B dfdb1e6812574e79595202e830167400569adf61155aa5ddaae443e798c4a05ccec2acd2975e00e9e7ffc63ee1dcf7e4e2a9288b1e6e1e1427d1e89790a8fa13 SHA512 9f08a7116a08a08495aa0e7b4cb6b11a924ea61006970487946e338bc79bba7fd7619c345cbf278a74de285d548af04fc66eaaee508185b8b9d7335cf5612055
 DIST dovecot-2.2.35.tar.gz 6185237 BLAKE2B 7ad08816553683126c4c8d494770730c49c2912a5437ba6dcb21e418d636c0d03280425e8a55b420a4500ebcf459da8be11deffccefdbc60811393e2044a4e4d SHA512 002ceea7f17018bcd438edda5a36a782606f291264ef63cebb8b4f72b094e812bf5553686c9e1e0d8c1354af54c1174f3670d1b1fc498ec4cddb3f731bf00c56
+DIST dovecot-2.2.36.tar.gz 6239707 BLAKE2B 702bb24265b5fefec9c484b3cca890fb1536ff94d1f2d6c99ee8c294ee4e38091eef5a727f0d4bd03700263286361f55747a22fa74def350710f9e49a4b10580 SHA512 327c50971e276f6013ca7f7bb59498ee88d76c9f8419bd18ee531cf10142214350fb81c6d64eaef73ee01765dd0fcf4142ab146ed67d9d7d86d5a58d41cf8db5
 DIST dovecot-2.3-pigeonhole-0.5.0.1.tar.gz 1783039 BLAKE2B 8452c11d1c5f26d2ee9a0c54a2c30642bce5117f1ad140db8a8509a2bcc03236361a99c6f622267279eb75c19c68de7d96947557b595c345db34e34a135b492c SHA512 60016145caa444eeba13b49735f87ab2ebe7f178f104ad57283b5aa7e5119920d9f579032b775547e0866e86045a4ab653fd084068187d0cbe2e088cc15fc288
 DIST dovecot-2.3-pigeonhole-0.5.1.tar.gz 1792702 BLAKE2B 219bc6b3182e303b7f3784cca0fb7fcc9d9aae62e60cc490d7f0a94fa4f9b805933d9fd67c4927cd8f9c864c3b73e28bfde1866848960c71dc47d5e36196b748 SHA512 5d65c3c9f3131c4e82287d054bd8b963d7c56c3e0677d7384881cf109ca82080d6222f672d8f973447d98be823a4df5bf43760d4ba87b76447d13abab30130c4
 DIST dovecot-2.3.0.1.tar.gz 6499984 BLAKE2B 4bfb38ba8bed154e58db03c53c0a6958632841fd66a118571c341be90f9d20a570a22699d4b8d117b72d4599fe074248c96cf4e7fc78ddd65c69662b4275cf97 SHA512 2b30c46c1660f425f6303a15cf638388439fd7a8065c91d28caf41d9a6403a4fccb530df3f69037a634bc3b0b9e498037da6b0b93c176f5e3b5808907d3f759d
@@ -19,6 +21,7 @@ EBUILD dovecot-2.2.29.1.ebuild 9215 BLAKE2B 4797bfb9f28d498d156d75e5837211ffba13
 EBUILD dovecot-2.2.32.ebuild 8655 BLAKE2B 9f500ad24385b63fe899c6c66e546d6e3f68f9059af9d7c10d406e3df75a4085a38ce19dfaaab7a7b1d022d07fef4bdcb033d1d20fed5752a5f864f0a0ff8a0e SHA512 f4ca664c39c32400528b5e01a8c0e58ef71d51f4ef52c827ec58b66bffd96281ddd91dad388be496ab78f887746f4c1ac9deb272ed108854e542ce5d4ae2348d
 EBUILD dovecot-2.2.34.ebuild 8653 BLAKE2B 64e6349d3c3ffd2b884bb41e27b87d6fc2d678241f5826e3c80c6b99f20a7d4ea2da707c99ce7b215da3120f51decb5f28439399e3582f66ef65c65f03702e3e SHA512 0d8512e55d31a30a3629e595b1b4fe0e7ba6bac413173e8741399f47daea7c7eabba01ab54040049d254f982ec5e2ffc909c568aed86c107e0632ecc12749b4a
 EBUILD dovecot-2.2.35.ebuild 8680 BLAKE2B ee3b5978fcda5ffe294bfa7dde81c6018a4023edaeb3d8fc74ce14edcc414ffeb41f87807cf1a25f4e07b2d563ca32e0a5fe57f565c3268455fcdee69205b74f SHA512 d65e27a65e31e9d1cbd4745c5bf46c73d0d4bd7e1d073f26490b4473ed9b4ea5b0cfaeefcf271cefe909b9a4d932d52f85b937e9a6de3430e9b20ed70c604933
+EBUILD dovecot-2.2.36.ebuild 8680 BLAKE2B 72a70c2452e8bfd0364abafe74c6adaf466ef8ff1b73fee0738e75584515ec934ea13b00db597fc69aa9a42f3b0857321efc426f02a828adad8a31165eabbd1e SHA512 186ff159dbee204d75df7acf04001aa7c10c11ce87a05e89aff4d010233b9da27b51f59b0eec4a0535d3f404fcf330c391eb0e843d1d6de4d1bb73a9ce7f8740
 EBUILD dovecot-2.3.0.1.ebuild 8678 BLAKE2B 6ba17ac442f7d88698444bae891690e4fe840d0b3fb0ab17033639f3c38b9a7da3041fe8dfaf42dab6269519a23b0300773b89a9b5dd9129a89e02a25b9e3e6f SHA512 6f058b5793c9c1ffe2cd1894fb4f40508befd87a36a66c00d6f5d202e99b014a638ff873eb68ffd7ccf59ff3941cb27f2981a4658ce7b8402d3c24449ff1fcf5
 EBUILD dovecot-2.3.1.ebuild 8676 BLAKE2B ea98fd811bdfec3f54d867a82598c46b0853c370ee06df43aa033eb4ea272385b2783ae91a577856e3a975ffabb251ca2073789612b66259b1f0216a51297219 SHA512 aa2b5e14e32fa6392a193b987eef13dbdddd725b61aba22e45b4bc3e466086d55ebfda58bd2d8ed93dc55ec7823eccfd5de311955693e9a0c362a8723aac4a48
 MISC metadata.xml 1374 BLAKE2B 629969318c5bcbdf0521d2293c6ead5e735ba5a113db3166e4df82103a3a84cbc62f3a2843082c9d5bdb635f25353ac7d3a4fcdf80d45e07b11b98754e744506 SHA512 16bdf15120dd8c957cd6e4957910acf21440dd0b8774cac9d9c5a48635cd46c7093850974b592ebbcd49085607fff2051691a42112f4ab9df44c51b9fea6d180
diff --git a/net-mail/dovecot/dovecot-2.2.36.ebuild b/net-mail/dovecot/dovecot-2.2.36.ebuild
new file mode 100644
index 000000000000..86321f4a85d5
--- /dev/null
+++ b/net-mail/dovecot/dovecot-2.2.36.ebuild
@@ -0,0 +1,290 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit ssl-cert systemd user versionator
+
+MY_P="${P/_/.}"
+major_minor="$(get_version_component_range 1-2)"
+sieve_version="0.4.24"
+if [[ ${PV} == *_rc* ]] ; then
+	rc_dir="rc/"
+else
+	rc_dir=""
+fi
+SRC_URI="https://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
+	sieve? (
+	https://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
+	)
+	managesieve? (
+	https://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
+	) "
+DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
+HOMEPAGE="https://www.dovecot.org/"
+
+SLOT="0"
+LICENSE="LGPL-2.1 MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
+IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
+IUSE_DOVECOT_OTHER="caps doc ipv6 libressl lucene managesieve selinux sieve solr +ssl static-libs suid tcpd textcat"
+
+IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
+
+DEPEND="bzip2? ( app-arch/bzip2 )
+	caps? ( sys-libs/libcap )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	lucene? ( >=dev-cpp/clucene-2.3 )
+	lzma? ( app-arch/xz-utils )
+	lz4? ( app-arch/lz4 )
+	mysql? ( virtual/mysql )
+	pam? ( virtual/pam )
+	postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
+	selinux? ( sec-policy/selinux-dovecot )
+	solr? ( net-misc/curl dev-libs/expat )
+	sqlite? ( dev-db/sqlite:* )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0 )
+		libressl? ( dev-libs/libressl )
+	)
+	tcpd? ( sys-apps/tcp-wrappers )
+	textcat? ( app-text/libexttextcat )
+	vpopmail? ( net-mail/vpopmail )
+	zlib? ( sys-libs/zlib )
+	virtual/libiconv
+	dev-libs/icu:="
+
+RDEPEND="${DEPEND}
+	net-mail/mailbase"
+
+# Dovecot does not support building without ssl.  Force it for now
+REQUIRED_USE="ssl"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	if use managesieve && ! use sieve; then
+		ewarn "managesieve USE flag selected but sieve USE flag unselected"
+		ewarn "sieve USE flag will be turned on"
+	fi
+	# default internal user
+	enewgroup dovecot 97
+	enewuser dovecot 97 -1 /dev/null dovecot
+	# default login user
+	enewuser dovenull -1 -1 /dev/null
+	# add "mail" group for suid'ing. Better security isolation.
+	if use suid; then
+		enewgroup mail
+	fi
+}
+
+src_prepare() {
+	eapply -p0 "${FILESDIR}/${PN}-10-ssl.patch"
+	eapply_user
+}
+
+src_configure() {
+	local conf=""
+
+	if use postgres || use mysql || use sqlite; then
+		conf="${conf} --with-sql"
+	fi
+
+	# turn valgrind tests off. Bug #340791
+	VALGRIND=no econf \
+		--with-statedir="${EPREFIX}/var/lib/dovecot" \
+		--with-rundir="${EPREFIX}/run/dovecot" \
+		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
+		--without-stemmer \
+		--disable-rpath \
+		--with-icu \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+		$( use_with bzip2 bzlib ) \
+		$( use_with caps libcap ) \
+		$( use_with kerberos gssapi ) \
+		$( use_with ldap ) \
+		$( use_with lucene ) \
+		$( use_with lz4 ) \
+		$( use_with lzma ) \
+		$( use_with mysql ) \
+		$( use_with pam ) \
+		$( use_with postgres pgsql ) \
+		$( use_with sqlite ) \
+		$( use_with solr ) \
+		$( use_with ssl ) \
+		$( use_with tcpd libwrap ) \
+		$( use_with textcat ) \
+		$( use_with vpopmail ) \
+		$( use_with zlib ) \
+		$( use_enable static-libs static ) \
+		${conf}
+
+	if use sieve || use managesieve ; then
+		# The sieve plugin needs this file to be build to determine the plugin
+		# directory and the list of libraries to link to.
+		emake dovecot-config
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		econf \
+			$( use_enable static-libs static ) \
+			--localstatedir="${EPREFIX}/var" \
+			--enable-shared \
+			--with-dovecot="../${MY_P}" \
+			$( use_with managesieve )
+	fi
+}
+
+src_compile() {
+	default
+	if use sieve || use managesieve ; then
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+	fi
+}
+
+src_test() {
+	default
+	if use sieve || use managesieve ; then
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		default
+	fi
+}
+
+src_install () {
+	default
+
+	# insecure:
+	# use suid && fperms u+s /usr/libexec/dovecot/deliver
+	# better:
+	if use suid;then
+		einfo "Changing perms to allow deliver to be suided"
+		fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
+		fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
+	fi
+
+	newinitd "${FILESDIR}"/dovecot.init-r4 dovecot
+
+	rm -rf "${ED}"/usr/share/doc/dovecot
+
+	dodoc AUTHORS NEWS README TODO
+	dodoc doc/*.{txt,cnf,xml,sh}
+	docinto example-config
+	dodoc doc/example-config/*.{conf,ext}
+	docinto example-config/conf.d
+	dodoc doc/example-config/conf.d/*.{conf,ext}
+	docinto wiki
+	dodoc doc/wiki/*
+	doman doc/man/*.{1,7}
+
+	# Create the dovecot.conf file from the dovecot-example.conf file that
+	# the dovecot folks nicely left for us....
+	local conf="${ED}/etc/dovecot/dovecot.conf"
+	local confd="${ED}/etc/dovecot/conf.d"
+
+	insinto /etc/dovecot
+	doins doc/example-config/*.{conf,ext}
+	insinto /etc/dovecot/conf.d
+	doins doc/example-config/conf.d/*.{conf,ext}
+	fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext
+	rm -f "${confd}/../README"
+
+	# .maildir is the Gentoo default
+	local mail_location="maildir:~/.maildir"
+	sed -i -e \
+		"s|#mail_location =|mail_location = ${mail_location}|" \
+		"${confd}/10-mail.conf" \
+		|| die "failed to update mail location settings in 10-mail.conf"
+
+	# We're using pam files (imap and pop3) provided by mailbase
+	if use pam; then
+		sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
+			"${confd}/auth-system.conf.ext" \
+			|| die "failed to update PAM settings in auth-system.conf.ext"
+		# mailbase does not provide a sieve pam file
+		use managesieve && dosym imap /etc/pam.d/sieve
+		sed -i -e \
+			's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
+			"${confd}/10-auth.conf" \
+			|| die "failed to update PAM settings in 10-auth.conf"
+	fi
+
+	# Disable ipv6 if necessary
+	if ! use ipv6; then
+		sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
+			|| die "failed to update listen settings in dovecot.conf"
+	fi
+
+	# Update ssl cert locations
+	if use ssl; then
+		sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
+		|| die "ssl conf failed"
+		sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
+			-e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
+			"${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
+	fi
+
+	# Install SQL configuration
+	if use mysql || use postgres; then
+		sed -i -e \
+			's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
+			"${confd}/10-auth.conf" || die "failed to update SQL settings in \
+			10-auth.conf"
+	fi
+
+	# Install LDAP configuration
+	if use ldap; then
+		sed -i -e \
+			's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
+			"${confd}/10-auth.conf" \
+			|| die "failed to update ldap settings in 10-auth.conf"
+	fi
+
+	if use vpopmail; then
+		sed -i -e \
+			's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \
+			"${confd}/10-auth.conf" \
+			|| die "failed to update vpopmail settings in 10-auth.conf"
+	fi
+
+	if use sieve || use managesieve ; then
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		emake DESTDIR="${ED}" install
+		sed -i -e \
+			's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
+			|| die "failed to update sieve settings in 15-lda.conf"
+		rm -rf "${ED}"/usr/share/doc/dovecot
+		docinto example-config/conf.d
+		dodoc doc/example-config/conf.d/*.conf
+		insinto /etc/dovecot/conf.d
+		doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
+		use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
+		docinto sieve/rfc
+		dodoc doc/rfc/*.txt
+		docinto sieve/devel
+		dodoc doc/devel/DESIGN
+		docinto plugins
+		dodoc doc/plugins/*.txt
+		docinto extensions
+		dodoc doc/extensions/*.txt
+		docinto locations
+		dodoc doc/locations/*.txt
+		doman doc/man/*.{1,7}
+	fi
+
+	use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
+}
+
+pkg_postinst() {
+	if use ssl; then
+	# Let's not make a new certificate if we already have one
+		if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
+		-e "${ROOT}"/etc/ssl/dovecot/server.key ]];	then
+			einfo "Creating SSL	certificate"
+			SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
+			install_cert /etc/ssl/dovecot/server
+		fi
+	fi
+
+	elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade notes."
+}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index f7f13fd6713e..3f8d1d39fd6a 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/connman-gtk/Manifest b/net-misc/connman-gtk/Manifest
index 81b2e263da7c..5febe08dbaaf 100644
--- a/net-misc/connman-gtk/Manifest
+++ b/net-misc/connman-gtk/Manifest
@@ -1,6 +1,3 @@
-DIST connman-gtk-1.0.tar.gz 50428 BLAKE2B bcba246411b80db9a3321854ff091d93e65ab9db3578413fdcafbcf9688dd57e033f2d0939d0a425938c128aa021f7e8704d66d02c40fc40770c099c23aa1323 SHA512 61f3004950f5905c62ff8c71afffbba9797e398b332679d495846ecfd2adce693b4ce7026adc72676868a3bdefbf3df5be93090abca215d4b0baf784324c5577
 DIST connman-gtk-1.1.1.tar.gz 61789 BLAKE2B d04d508b5bb03abe78c9b6734df919b6589cea9e7f38c41059210e62795ce79a17b6ba8b3ab1b0c403a43fa2712893bc0d00b1e5f15d9910ca45108b9e760e12 SHA512 78fd41a37370c76f118e3fb8a707b96fd6bf1234a8832d047302d4b0fa350f87316f6e2e749860b2cdf0ff6e6eb76e4d7d398dc7fc084403ca2f8682d2907553
-EBUILD connman-gtk-1.0-r1.ebuild 696 BLAKE2B c6d9941cf9a09666e35b35fc8cf86e7a32805899a0b7c8301a6495a95187424638d0ffce35f96d7f965eecc42090584cfd98b479b5cbd4fa740dae6b432a1687 SHA512 e4e2c69a7fdfa74ed3e9d1cc7e402f5fd2dc4b56c56d3d31511659c2bf47d0cdc92703eef408470d8bde951a22969ef21766ab0b061b472bc64996b3681732d3
-EBUILD connman-gtk-1.0.ebuild 687 BLAKE2B 64b34b55aa0108b543136d6fcc6f39856f04e3bcb13702fc949ec26a2e6963d98edc2de82dee79ee4a201fd7d7886e190ec8434e7a5dc32a982ad253e385bbef SHA512 4175ab3408837d4af115877ad6336ebf489aeb6c0aa39bc8786ae81602f85cd7824246d018e5d7d38fbf3eb812028c6126845d8ba83d3ae0620e7d177a9a4382
 EBUILD connman-gtk-1.1.1.ebuild 939 BLAKE2B fbf8d281f22cbddfcac61b734121df5479d89e3c4c8027751d49d5bec9cb835a9afa81143cea2986db16ca44e0567ba618898d85be6be070ea66f5e462211aa6 SHA512 628b59ca685ec0d8007fa244cf893f7b05ba44e89ad1d10f5cedb7ae9b02a58ebf3151f0dd2e2f532bf8d3f429f75f5d31651dea086257450756bb40270f5296
 MISC metadata.xml 488 BLAKE2B d55fe987103c9440307fc9db557cbb4c6add9b960e642b0d6f5735aafec2a29156a0a4ca6d51bb71c4e238bd897430e4e4065383b88ffde803bf53aae99d1314 SHA512 f84f35958b032afd49633c59fac3474148d01becdf968d62747c8a2d99aeec4f90cae7242b7f7fc00cee2903a9188bdc206308a7d692e136317959ebf9019867
diff --git a/net-misc/connman-gtk/connman-gtk-1.0-r1.ebuild b/net-misc/connman-gtk/connman-gtk-1.0-r1.ebuild
deleted file mode 100644
index aec310f408f8..000000000000
--- a/net-misc/connman-gtk/connman-gtk-1.0-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="GTK GUI for Connman"
-HOMEPAGE="https://github.com/jgke/connman-gtk"
-SRC_URI="https://github.com/jgke/connman-gtk/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="openconnect"
-
-CDEPEND="
-	>=dev-libs/glib-2.0:2
-	>=x11-libs/gtk+-3.10:3
-	openconnect? ( >=net-vpn/openconnect-5.99 )
-"
-RDEPEND="${CDEPEND}
-	net-misc/connman
-"
-DEPEND="${CDEOEND}
-	>=dev-util/intltool-0.35.0
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with openconnect)
-}
diff --git a/net-misc/connman-gtk/connman-gtk-1.0.ebuild b/net-misc/connman-gtk/connman-gtk-1.0.ebuild
deleted file mode 100644
index 3b4065d4628f..000000000000
--- a/net-misc/connman-gtk/connman-gtk-1.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools
-
-DESCRIPTION="GTK GUI for Connman"
-HOMEPAGE="https://github.com/jgke/connman-gtk"
-SRC_URI="https://github.com/jgke/connman-gtk/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="openconnect"
-
-CDEPEND="
-	>=dev-libs/glib-2.0:2
-	>=x11-libs/gtk+-3.10:3
-	openconnect? ( >=net-vpn/openconnect-5.99 )
-"
-RDEPEND="${CDEPEND}
-	net-misc/connman
-"
-DEPEND="${CDEOEND}
-	>=dev-util/intltool-0.35.0
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with openconnect)
-}
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index d1c29dd5f88c..744e7d5fc54e 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -10,5 +10,5 @@ EBUILD curl-7.57.0-r1.ebuild 7103 BLAKE2B eb3b2a5181284c2e63d57d45e20692adf3e07d
 EBUILD curl-7.57.0.ebuild 7050 BLAKE2B ac2b9ef326caec4e07e89ea30f07140856a4ae62177c1ef7fef78a5a968f8095dbbb82e455d0f309ac35dfbbf57720d013fcb411bbaa523964da124bf0e3f140 SHA512 3b496a5d3159150b6ab7b45fe5145b97a64a9f8909f05f09604634aaf5750ed560941c17be249d7cc5c27a0e03ab353fb913795d47f285ccda7c5e3ad48c786a
 EBUILD curl-7.58.0.ebuild 7093 BLAKE2B 98eaa108a6d55f5a969fe0898e31f0a2af4b7fcb15ca993eb3d238d0a73c6a60d010ada1b1c5d6cd21b117832f8bab1e43fd9e3ff2072457144e4f5df254fc3d SHA512 a31269371ccf0948b1413cd256d6ad4df609b89c40c44a54cc1b83282353b45ea314322fc12fba279c27bfc7513a8c5ced8c09df065230ff833c7b13eebc87a5
 EBUILD curl-7.59.0.ebuild 7267 BLAKE2B 4fadca87badfa6435f391f19508a8a8818b47bf755746f9cb9597858923ea2205daa9661cf1af5cfc65e479205c03662524e18e0ef9d1dd2d2187226f5f93117 SHA512 eaf229ab649e47e2743f1d1217309df883d3513e4f3f0b7be9d1e1a5fbc04f9b0491b6be0a43c6202b0cb17dd03a3381185f5d8f9c256576173cf282dd91c411
-EBUILD curl-7.60.0.ebuild 7196 BLAKE2B f19dfe1eb84e7235d072965462044879d7eaa5e18bc6e779ab621536dd190daefed3dda77b6fd1adb5dfb20ce70130fbeaa9d32e3c31bad5fb53027bbf7b61b1 SHA512 f3edf0424f4e9b7df5acfffe0a5c49c112716c3d1f45e7737894d7a045bf66b175a8327fdb659bfabf3b49293617462458fada5ccd36df96d55b190043b3b6b3
+EBUILD curl-7.60.0.ebuild 7194 BLAKE2B ebdf0cc8c790e0c90bd764d12724a1a80b8e4fb4cc9f5cb87087d9ce2e2efaf6275344b17457faecf474852f4c80f72872007c15aa3683ac8520c7e09811c76d SHA512 846b0fba00a1d6ffcc72cf0dc2cf2a3b985b4d7d5514902511ed854c85d837ba690f20a91737e9385535f6557b1fb631291b122d6aa12d1f872b506a5b30e356
 MISC metadata.xml 900 BLAKE2B a370dc14334bd729842d0ac979d804d0ff35332dc1fade6e2fbc33649a02db17ef04897c61727d786a4bc3d8acc2a20ddcfe97abdc350b65d9ecfdfe4509f9ef SHA512 ff16407a74d8688f4ed0d7158ea5bd31bc47e828672c874e2f43f4cda1fcd741922c98c5ff5d7f114154b149983e252319f0e812197b4ca7a0979683b5cec8ad
diff --git a/net-misc/curl/curl-7.60.0.ebuild b/net-misc/curl/curl-7.60.0.ebuild
index d29f81320764..634359741379 100644
--- a/net-misc/curl/curl-7.60.0.ebuild
+++ b/net-misc/curl/curl-7.60.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://curl.haxx.se/download/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-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="adns brotli http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads"
 IUSE+=" curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
 IUSE+=" elibc_Winnt"
diff --git a/net-misc/dropbear/Manifest b/net-misc/dropbear/Manifest
index 1a9036041757..36421cd3cece 100644
--- a/net-misc/dropbear/Manifest
+++ b/net-misc/dropbear/Manifest
@@ -1,10 +1,8 @@
 AUX dropbear-0.46-dbscp.patch 500 BLAKE2B 268b3a065ff9a9d52659c969195a712e8bfcbc6984e201b69f2a2cc04956220bcda766c932e46fdf4d75f379d1f5a9dcbab842d66a9f6c62fc7f0dd03024d1ed SHA512 33596d1b59ba266eade106e8fe058cc9d20d1657db88d51fb11c2111835f7887b3fa5714b3feb9767c48ed94d3af0c539864886e0a2586b6f58a38bb9f741210
 AUX dropbear.conf.d 190 BLAKE2B b89e59ae84f23f00162d78cb900e4fef05fe01123a6ee7533ed3d39625f43580012591b2cf8dcc9ea5f093a64d3ed81fa590c44389bacb369b9123929ca2bb69 SHA512 83f2c1eaf7687917a4b2bae7d599d4378c4bd64f9126ba42fc5d235f2b3c9a474d1b3168d70ed64bb4101cc251d30bc9ae20604da9b5d819fcd635ee4d0ebb0f
 AUX dropbear.init.d 731 BLAKE2B d858b35872eb72dacb85baed47882a9909a2530e3a9537a10adaeaf3d77da49808fdb8490124d29379c7b61272ea7d1867477046c1700d3cf216b4fc4f8c8f25 SHA512 5087cdb36194d55bf6d5ce27852b17f1ebe06840bbed37789cf162a618fb3c56c9dffce01a8a75f8574f8d9800a12fc2e1b725ca35352a836324579c8b704fd8
-DIST dropbear-2016.74.tar.bz2 1622234 BLAKE2B c729a2c1afd13e1ca07f3c9cfe3ff0ea7888cc1687ea2793275134b3224118164ef81583f55dbec53d6322be53eaa7a7324216133919722390d0e2dfbd929f07 SHA512 c0f4ea7840077b8302b48e27b5b588a4babac6583740dfdb845c40f633aa3ec96174d1d2ade81d2c3e23ea99b75e906312c512d8c7580e6e4105b2dbd37e5e22
 DIST dropbear-2017.75.tar.bz2 1623392 BLAKE2B c024037d3ebcb3f16aed2a5f24e07c06699a510b327a0ea528db7160ad2a8e554af2a233a266f869e0e30c78f3b0b7792a817d9c07f058f605dbf2dc749a4fda SHA512 9c2f2a5e718339f83abc0ad7719bda12bfc75e5bcb87a7c0eec0afefc743e5c0a1575d290d5fde152ff2100b0f0e6fd5ef4431f7bbcb5ca9a332d93c20f5a8f4
 DIST dropbear-2018.76.tar.bz2 2688697 BLAKE2B 1c22d38487e94427b2678d070f8d370eb09bb2d69253fd6f76d8d80fd637ff86a44b00ab42e1f6d84042c72cbcbd4bb6cbb415f961502e0437c7c8c1b812f059 SHA512 82323279f7e78c366ba1ea07ff242259132b2576122429f54326518dd6092aba8ae5de4a0b8a3cef7efc3507015741abe2ac23376c03b40b247527da7a88120e
-EBUILD dropbear-2016.74.ebuild 2476 BLAKE2B 41d21f7aecf0d056a63ab5150af700d2fd36659dd25f29dc67cbb7acf852ee4e583b5ef1c7f2c74710d5409988ed91a4e3eecb2e9821911cf5a8c67cfef41795 SHA512 a1bf33919cce4fab7c1b23dac884db81883555eb9c249f30e5ff96cc856375e3849b18350a52abf7e78bcb3fc12418ad2d86508cd396562230cb155fb15f9420
-EBUILD dropbear-2017.75.ebuild 2481 BLAKE2B b7c8e0d00bc8f2a545d69b698d4b7f8e628e325268542e82933a8721d8753b6dfbff088318ad4af13b93771f085b3d011a93fee4e7fa4c8524742b5ab73404f2 SHA512 b362022bef74be9bdeb397c71bd21f1c72fecf5b672f398bf1b94fefd1ca267ee77688600d54a2600d3a2cb7d2e8ce9f7d1b2f8af426402808d895990edfbe4e
-EBUILD dropbear-2018.76.ebuild 2624 BLAKE2B be125d92c97eca0b2798caeb6357a854683af3ed62353aac7c988fb1dc6ac722d92a7a1a72ddee5d5d16b7e4b2f0707dd5498b27c9999b94b8ea25254e40ee2c SHA512 77a7488f5b18d326f504ea71219d4c38d8a48f45cdd0a846df8c882516413404983f7b60740b43f679c329622355bbcd4183f72f7032633fa4409ca74d46131c
+EBUILD dropbear-2017.75.ebuild 2479 BLAKE2B b200fd9ce16df2cfcfe197bbaa4d23b86fd65ac28e3a91b2b9b38780ccab35333cc946b71dc67826932dc39dd67f7c0cf4cb3f026bbded140b306c5ab464f42c SHA512 7ff7df1daccbadc9a855ade363dd8158fced88e779ac9764136ed8c42e54380cbbdba2ad6392e859c974a4c81cf54ff7af240c54ee7a03094880528b21ada6c1
+EBUILD dropbear-2018.76.ebuild 2627 BLAKE2B d558e88e05a0169795e8885003f3d3ed6e82b18199a717ab55cc144067b65b0d9fe5f4988ca4b514ab84085779ae7609c05d615fe43e65a9c23d304e2fcb922b SHA512 993b7e76ab0a6746e42f81c94fc7a5e5de07cb76a745c0161ea0d8c1f0e96c5081b785ff68aa173240d753c0bd51576e2734f2394fc8f9af4534e6008db5cf78
 MISC metadata.xml 1791 BLAKE2B d5816e2173f3fe0177562b1ef7e36c6ec56c4d596c27231f02eaedd41eba091abcff7cb0e0114d5431d735b011fcaaabf01e5e70ff61478c669232243bc7e244 SHA512 1f99332f1f194f989838dc5c04fa1c7661e13da3efa7b98fa6392ab3c3e6887a4a9c7319fdb43f102b2fb3cbc0ee70e79792b595c2f49d2bbf4e50be3f362314
diff --git a/net-misc/dropbear/dropbear-2016.74.ebuild b/net-misc/dropbear/dropbear-2016.74.ebuild
deleted file mode 100644
index ef89e09d0f11..000000000000
--- a/net-misc/dropbear/dropbear-2016.74.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils savedconfig pam user
-
-DESCRIPTION="small SSH 2 client/server designed for small memory environments"
-HOMEPAGE="http://matt.ucc.asn.au/dropbear/dropbear.html"
-SRC_URI="http://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2
-	http://matt.ucc.asn.au/dropbear/testing/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE="bsdpty minimal multicall pam +shadow static +syslog zlib"
-
-LIB_DEPEND="zlib? ( sys-libs/zlib[static-libs(+)] )
-	dev-libs/libtommath[static-libs(+)]"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	pam? ( virtual/pam )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )"
-RDEPEND+=" pam? ( >=sys-auth/pambase-20080219.1 )"
-
-REQUIRED_USE="pam? ( !static )"
-
-set_options() {
-	progs=(
-		dropbear dbclient dropbearkey
-		$(usex minimal "" "dropbearconvert scp")
-	)
-	makeopts=(
-		MULTI=$(usex multicall 1 0)
-		STATIC=$(usex static 1 0)
-	)
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.46-dbscp.patch
-	sed -i \
-		-e '/SFTPSERVER_PATH/s:".*":"/usr/lib/misc/sftp-server":' \
-		options.h || die
-	sed -i \
-		-e '/pam_start/s:sshd:dropbear:' \
-		svr-authpam.c || die
-	restore_config options.h
-}
-
-src_configure() {
-	# XXX: Need to add libtomcrypt to the tree and re-enable this.
-	#	--disable-bundled-libtom
-	econf \
-		$(use_enable zlib) \
-		$(use_enable pam) \
-		$(use_enable !bsdpty openpty) \
-		$(use_enable shadow) \
-		$(use_enable syslog)
-}
-
-src_compile() {
-	set_options
-	emake "${makeopts[@]}" PROGRAMS="${progs[*]}"
-}
-
-src_install() {
-	set_options
-	emake "${makeopts[@]}" PROGRAMS="${progs[*]}" DESTDIR="${D}" install
-	doman *.8
-	newinitd "${FILESDIR}"/dropbear.init.d dropbear
-	newconfd "${FILESDIR}"/dropbear.conf.d dropbear
-	dodoc CHANGES README TODO SMALL MULTI
-
-	# The multi install target does not install the links right.
-	if use multicall ; then
-		cd "${ED}"/usr/bin
-		local x
-		for x in "${progs[@]}" ; do
-			ln -sf dropbearmulti ${x} || die "ln -s dropbearmulti to ${x} failed"
-		done
-		rm -f dropbear
-		dodir /usr/sbin
-		dosym ../bin/dropbearmulti /usr/sbin/dropbear
-		cd "${S}"
-	fi
-	save_config options.h
-
-	if ! use minimal ; then
-		mv "${ED}"/usr/bin/{,db}scp || die
-	fi
-
-	pamd_mimic system-remote-login dropbear auth account password session
-}
-
-pkg_preinst() {
-	enewgroup sshd 22
-	enewuser sshd 22 -1 /var/empty sshd
-}
diff --git a/net-misc/dropbear/dropbear-2017.75.ebuild b/net-misc/dropbear/dropbear-2017.75.ebuild
index 7e8d1c97a5bd..ad5c7c8986c2 100644
--- a/net-misc/dropbear/dropbear-2017.75.ebuild
+++ b/net-misc/dropbear/dropbear-2017.75.ebuild
@@ -6,13 +6,13 @@ EAPI="5"
 inherit eutils savedconfig pam user
 
 DESCRIPTION="small SSH 2 client/server designed for small memory environments"
-HOMEPAGE="http://matt.ucc.asn.au/dropbear/dropbear.html"
-SRC_URI="http://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2
-	http://matt.ucc.asn.au/dropbear/testing/${P}.tar.bz2"
+HOMEPAGE="https://matt.ucc.asn.au/dropbear/dropbear.html"
+SRC_URI="https://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2
+	https://matt.ucc.asn.au/dropbear/testing/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="bsdpty minimal multicall pam +shadow static +syslog zlib"
 
 LIB_DEPEND="zlib? ( sys-libs/zlib[static-libs(+)] )
diff --git a/net-misc/dropbear/dropbear-2018.76.ebuild b/net-misc/dropbear/dropbear-2018.76.ebuild
index d2800db5b260..f73f40c403a4 100644
--- a/net-misc/dropbear/dropbear-2018.76.ebuild
+++ b/net-misc/dropbear/dropbear-2018.76.ebuild
@@ -6,9 +6,9 @@ EAPI="5"
 inherit eutils savedconfig pam user
 
 DESCRIPTION="small SSH 2 client/server designed for small memory environments"
-HOMEPAGE="http://matt.ucc.asn.au/dropbear/dropbear.html"
-SRC_URI="http://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2
-	http://matt.ucc.asn.au/dropbear/testing/${P}.tar.bz2"
+HOMEPAGE="https://matt.ucc.asn.au/dropbear/dropbear.html"
+SRC_URI="https://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2
+	https://matt.ucc.asn.au/dropbear/testing/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index 9ba41ac9723c..8b1568d6259d 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -9,8 +9,10 @@ DIST stunnel-5.36.tar.gz 645205 BLAKE2B 6287794b162212783c54fe199fde43d72347f7ae
 DIST stunnel-5.40.tar.gz 648828 BLAKE2B ce0e9cdd1d6c9ec2eb318e1a31307a4e4f27849b548ba755272c71c49b164cc1a6fb31a5dbec56c399349e590232aff84251670b6d8738c2b00ff182fdbb5dd7 SHA512 2dd403f212f701370775516d25ea441fe41564daf1460f8a9ba4eb960adfb5f007ebfb51a90503fa168c420f06e17a6d20f1b0eab697e2abb6a42dc6f1f898b2
 DIST stunnel-5.43.tar.gz 698715 BLAKE2B 21ac7014e571e1c22b1b21b6dc5c4f22ec91197c7088756fb65dd4dd22541538179d5b389cbd1c3bd8f8d61436eab36e23f6317757229035cd8e9f04ba536f0e SHA512 3158ab7573d8c548ee71aecb3f94e141bd80e123a62848945263004e28668050a8a08c904dbf61df28c4f5c1d94eb380943ab39835ccd18273a6acf05a3488a8
 DIST stunnel-5.44.tar.gz 699117 BLAKE2B 956c7ce8987f79efab3baaa5071263466ec01f0475bd7e66dff41e8de66811a10be3a5f14bd6430e26159682bd3c2abe93a0d5824a854ae0243e6bbfae14a664 SHA512 a1aa4f234926208bf1b2c9acc0bf83dc0f2c8f575bc57f5ce89b32b4e3fde0412ea0ef7c2edb364fbe0b52fdd89773fab4df53950c58797c11b7668f3e4e7638
+DIST stunnel-5.45.tar.gz 706423 BLAKE2B 81c5355419de3b0bc88d59ea8c98d1a4523d7a1ae6a3d12464f7ab6a1df1f5dd798d2f50ec7adce7515e68a650149321f13e34791781620ad071824246502dce SHA512 653fea6e5002983bb9231a542ab1bab078428821910b8e257adbeea88e583e84d080615f232d5d3086e8d6069c43ddbdfc7923c4b50071ab0c0be547e76d8983
 EBUILD stunnel-5.36.ebuild 2899 BLAKE2B a4c62a1a79157b5b24a8904dacbe45a44b22b53710b44a5bb5c3823e29df666024e8300d82cc6fc5e52a9f8cedad0beaaadc5ee4bec4d366f2544587009c73db SHA512 ffeac1d20a4a83fcda56ae36b81e7a230ae18ad786fdbd51024b0f87b013c9988538cb92d8757869b3337fc78cf25e605fa31fe3d54b437df59c3f1d4a8ec595
 EBUILD stunnel-5.40.ebuild 2930 BLAKE2B b18d32b276cb28e83b8f99b5c495c929c3c6ddff54a7580be3387aa4d5e114feed917bdf4a7faa4136850cdea0ba019fdc3c86fb28268f23f23a125ceb7b896e SHA512 6034f34af01ed21b16474f1ec4a76249d9ee2f14e4312ecf8d7cb75f66f49e9e641328fa4904cc9adec6d9cb480e63187ed9bb9a6263846ef2eaf7a2d8f3eb20
-EBUILD stunnel-5.43.ebuild 2930 BLAKE2B 2f027288047c1efa62cbcff7869b492422b925576e2f672a851f8c101de4c9a8dbe87d6746050eb5d6115ccaab81c5006b5ee046b3356cf161142c99c6ee6372 SHA512 af327981e004f8a56473fcfa88d8f5027991461a6ffc791db6a840919513dd0e0d3de47828e7a4d6425bef432b76d2d8a05b3a6ab742668e5da4051d44aead7d
+EBUILD stunnel-5.43.ebuild 2929 BLAKE2B 2a995a0d14865b98816e60bcd64527df796f00a3ab0c1b12d98d5dcf21eecd63b907be0d6adcb68ad75be565907ef0e24a9a22da3fb2dc0d5cc84eedb529b0ef SHA512 760053ada4475fd78c48c751c86d1c40e4acd47e5b22fd868ae271f68844fd553c13d4ef12c44fcf6349d22d6ceeb82c4e70c74cd115f06fd63c453927df6928
 EBUILD stunnel-5.44.ebuild 2930 BLAKE2B 2f027288047c1efa62cbcff7869b492422b925576e2f672a851f8c101de4c9a8dbe87d6746050eb5d6115ccaab81c5006b5ee046b3356cf161142c99c6ee6372 SHA512 af327981e004f8a56473fcfa88d8f5027991461a6ffc791db6a840919513dd0e0d3de47828e7a4d6425bef432b76d2d8a05b3a6ab742668e5da4051d44aead7d
+EBUILD stunnel-5.45.ebuild 2930 BLAKE2B 95ade179eb9d81e66ea6fe7523a299c8e6dd58d43867568b8e22d22125f6a6111d1f8b988df153cb438afba2736db811507d87acf0f2b5b00469904c12657f34 SHA512 c8fca15345e1a955af0824d847dc0e06a220da7dcdff9a5144e567f54ea7e6c36a14d74fb407b5981249c3076811e7da2fcb668855cdcbca019aa27e464c9229
 MISC metadata.xml 712 BLAKE2B 2e112f8a1f4fb41bd678a7e845e109923f00c281b5673e87cf2c06e68e8c1ee79e6230150cf911f4c28085ab22dc76eff54c80d201ef2709d5ee58a70f1a0084 SHA512 03c867389e13ef2596e97bc64b47209fe445eb5f4b2012d78f426f5eec96ad8359a735d9fe981109502d297837fa6ad50c43e0fe0b618aa9aed3f30fbd01e362
diff --git a/net-misc/stunnel/stunnel-5.43.ebuild b/net-misc/stunnel/stunnel-5.43.ebuild
index cb4aa4447841..d5432ff30286 100644
--- a/net-misc/stunnel/stunnel-5.43.ebuild
+++ b/net-misc/stunnel/stunnel-5.43.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="ipv6 libressl selinux stunnel3 tcpd"
 
 DEPEND="tcpd? ( sys-apps/tcp-wrappers )
diff --git a/net-misc/stunnel/stunnel-5.45.ebuild b/net-misc/stunnel/stunnel-5.45.ebuild
new file mode 100644
index 000000000000..d30f1845da1c
--- /dev/null
+++ b/net-misc/stunnel/stunnel-5.45.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit ssl-cert multilib systemd user
+
+DESCRIPTION="TLS/SSL - Port Wrapper"
+HOMEPAGE="http://www.stunnel.org/index.html"
+SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
+	http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="ipv6 libressl selinux stunnel3 tcpd"
+
+DEPEND="tcpd? ( sys-apps/tcp-wrappers )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
+RDEPEND="${DEPEND}
+	stunnel3? ( dev-lang/perl )
+	selinux? ( sec-policy/selinux-stunnel )"
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup stunnel
+	enewuser stunnel -1 -1 -1 stunnel
+}
+
+src_prepare() {
+	# Hack away generation of certificate
+	sed -i -e "s/^install-data-local:/do-not-run-this:/" \
+		tools/Makefile.in || die "sed failed"
+
+	# libressl compat
+	eapply "${FILESDIR}"/${PN}-5.43-compat-libressl.patch
+
+	echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel
+
+	eapply_user
+}
+
+src_configure() {
+	econf \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		$(use_enable ipv6) \
+		$(use_enable tcpd libwrap) \
+		--with-ssl="${EPREFIX}"/usr \
+		--disable-fips
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	rm -rf "${ED}"/usr/share/doc/${PN}
+	rm -f "${ED}"/etc/stunnel/stunnel.conf-sample \
+		"${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8
+	use stunnel3 || rm -f "${ED}"/usr/bin/stunnel3
+
+	# The binary was moved to /usr/bin with 4.21,
+	# symlink for backwards compatibility
+	dosym ../bin/stunnel /usr/sbin/stunnel
+
+	dodoc AUTHORS BUGS CREDITS PORTS README TODO ChangeLog
+	docinto html
+	dodoc doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
+		tools/importCA.html
+
+	insinto /etc/stunnel
+	doins "${FILESDIR}"/stunnel.conf
+	newinitd "${FILESDIR}"/stunnel-r1 stunnel
+
+	doenvd "${T}"/20stunnel
+
+	systemd_dounit "${S}/tools/stunnel.service"
+	systemd_newtmpfilesd "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf
+}
+
+pkg_postinst() {
+	if [ ! -f "${EROOT}"/etc/stunnel/stunnel.key ]; then
+		install_cert /etc/stunnel/stunnel
+		chown stunnel:stunnel "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
+		chmod 0640 "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
+	fi
+
+	einfo "If you want to run multiple instances of stunnel, create a new config"
+	einfo "file ending with .conf in /etc/stunnel/. **Make sure** you change "
+	einfo "\'pid= \' with a unique filename."
+}
diff --git a/net-misc/taylor-uucp/Manifest b/net-misc/taylor-uucp/Manifest
index df44df549e21..071a5f05af4f 100644
--- a/net-misc/taylor-uucp/Manifest
+++ b/net-misc/taylor-uucp/Manifest
@@ -2,5 +2,5 @@ AUX taylor-uucp-1.07-fprintf.patch 188 BLAKE2B 13900fdaffd964d5e38a4bc3d2acce267
 AUX taylor-uucp-1.07-gentoo.patch 5049 BLAKE2B 3d010ff0841df59196d38e7450b85c4d36c2ccd770a4c31d29962e3c3f87d5a264977fa2f715a9bb91fec44f60dd5e045eed440e0fb482be525702497f3ad2a1 SHA512 8d259ddf10c80ff6c349d3bec531f858d561f3f488fd6066d69ddb8d2242e9f22ff8781ce47dcdb10f3dbf4a073bc4bf3492f6fced30d8d129e6f81e860f971a
 DIST uucp-1.07.tar.gz 1013234 BLAKE2B 5734bd1b8afcc9cb9b0dcc25afe73ee89b6007249a73d286bc39975bc0cd7a1907e360dfaa050175d87e34a7d468a70a7cae75124c920f00f03ff52f16629bb3 SHA512 13d215890234e638bed53dce7bab6eb78e0ce6b658f23ac1d7f8abc6e1d97963bef76aa4148ca644f450d5a1678fac940b73fbcd5845d7f5bea3afbd8055229b
 EBUILD taylor-uucp-1.07-r2.ebuild 1336 BLAKE2B 4ab6366c61aa8c1ea815a3c5a02616ca0d7a08b496d114efedf78069f2f632c9908dfcd7f93bdda6c36c2ac905f5886b85ef7f2fd7f4436b8a2c34931393239c SHA512 e499cea422bb755a588a98991bb00acb466db6b55d85a8b8d495c1fab2c5cbb6d70b527df95ec9914f2c773c05b5e804f86ecfecf3cf540099434f5143447194
-EBUILD taylor-uucp-1.07-r3.ebuild 1370 BLAKE2B 4525bc6154c0ee2f667e02e54fcdc7041718fc7ffde2ec7a050a2a63fe0cf83ed3238b9ec1cc68e71d44c2ee3f52adabf1ebabfea7928b55fc75aad56e9b16e2 SHA512 cecd33904ad314e7b3f58c38c8bc0e2a428833a2bf371ab6fcb3e4cb1041f66037889b3ba786b6ac6264d214e0dceb18ca03be3c744fc314ef48f17194729861
+EBUILD taylor-uucp-1.07-r3.ebuild 1369 BLAKE2B 7b9f6ad62d03d980157178077e02388596121728c346c18f75d740f89ecb8f64a76b15367dde165a8eeb4b4cdc05bbefbd19c8107ec3ef8a8b32d322195420f5 SHA512 87e29758cdcdd4badc190e18643a1b0e668c60254d9f27df9262daab34f643605219e5100d989169d13f684a5d6d4e5c3122979cef7c242b0e8c4c87a5d26217
 MISC metadata.xml 319 BLAKE2B f7bd226c6082b2d19d38b6d20aa6d859e6076e226cf2ae3a4013ee5ff558f7dba27cee1fcd159785679fe03b37082d57232d7ecf6f86e832a60e3d8c4f528d57 SHA512 14fddbb3e6a6f0defe184c909d8ae29072782e3060dd5c91f852572039ca81be95f9cae98f6a4a011711cd991bcfa886638d725372463b3af4ee7f15654ad22d
diff --git a/net-misc/taylor-uucp/taylor-uucp-1.07-r3.ebuild b/net-misc/taylor-uucp/taylor-uucp-1.07-r3.ebuild
index 43fa15c222c2..14488693e4c2 100644
--- a/net-misc/taylor-uucp/taylor-uucp-1.07-r3.ebuild
+++ b/net-misc/taylor-uucp/taylor-uucp-1.07-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/uucp/uucp-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ia64 ~ppc sparc x86"
+KEYWORDS="alpha amd64 ~arm ia64 ppc sparc x86"
 
 S="${WORKDIR}/uucp-${PV}"
 
diff --git a/net-misc/whois/Manifest b/net-misc/whois/Manifest
index 445ef53eef23..79c22814c247 100644
--- a/net-misc/whois/Manifest
+++ b/net-misc/whois/Manifest
@@ -1,9 +1,9 @@
 AUX whois-4.7.2-config-file.patch 202 BLAKE2B b5c421655f40c22fcb9c9ac3194821e6e4100657bd11013ed220cea3c81c77e3c7e50432361c8e08274b59d96ff04ca22d8f500436fbefef981d587e26ef75a7 SHA512 932ce9dd51b29750a88da3082bdb1f3fd994e1d859fbdef45fadd3c833ee24d12acb6530989db60f4df3df9481d34cc5cabbdad4bf5150389a06ef7c832daf65
 AUX whois-5.3.0-libidn_automagic.patch 778 BLAKE2B b9214f6f0c081abf6141057ee9f82db30dad7306fe611b1cb70d256b235d0ba544887f8b084d7b71a21486ad68d312ad98075aed51765f59ecbf7ced45684772 SHA512 8df8c99320ee4a4327f35a62dbaca0b071a3472d398604304d772f2424d607d109d87056b1a138b041c4c391409828cc7397dc62ed973dee500b2eb9f1735676
-DIST whois_5.2.12.tar.xz 80428 BLAKE2B 53aa08d4e45ab417585aaaff03beb588a01e88c35d508f96e0738e6934659df6ab78c21d5794d86ce90c775fe5a32242710e8cf93b9f46c52dc32597ad113f40 SHA512 df40e2e7cbd11d00984f865e122ad4ece882a6a45e2f75ad5ea24ce937b7e9452b01fd886f43bae55fd065a6556cfc4577e7126151b5fd43fa806c4b0c886ced
 DIST whois_5.2.20.tar.xz 82336 BLAKE2B b10d7e22f41bfb68cdd1264016bbfeeb93436a5c46b0ddcfc79834d0446ea8c21cd8ff95bc440bbe4fda0d5b08a16c50fe9504c98c3de3cf4ce18892203518e1 SHA512 3308d9f5562babe007e46b7764718f13c1e7cd8ef7f501161353e4b1b81efacec9742ec25dec3b1cc80940898c785c1920a1aa68af10081f952ebde320075808
 DIST whois_5.3.0.tar.xz 82728 BLAKE2B ac5e9bdd070c3a79306f79709d6450455ff74fc7c3a8c81380f79b98cdd36d25932032673710a39ec55da2220f1d0a21221e1a2b70c36e8798affe9b7f46f3bb SHA512 a507f38254d826a9112d1f5a7888fbd4b79eeaa372977c02e4e8235509d133540ba647ddece95376f6ac704f9b1042d276051d4a3a36d10906ad11f69561432f
-EBUILD whois-5.2.12.ebuild 1494 BLAKE2B b84e9fa6367d3f977423ff590d54d094f2d2cf218937f410619646f574b7810029a7b587a8d8600baed31cf050f19f67e5cb56f189175f516dad5af1cf9dce52 SHA512 ca9371338ccbba81f3a60a611e82b6702c4a43166d57c02cb029d1303fc2cee92cf2173f9381d888a48785191dd05719f66d3eb687bf90e4d987377d092700ff
+DIST whois_5.3.1.tar.xz 82920 BLAKE2B b4e58ae3f58c8e5de8bca5be3c0e753e0de91651bea1aa4789d389bc65e5155cddb1e87a2adc39340f33360533ef2b86eb9b7b13116a2d64e8a68496529e65e5 SHA512 4840ceecaef1d47bda436f8de8b539ff2b1446dd99ec0867d0bb2b478c13fac190a4a265ab31abb30a779f1a221062f298cd01a1b19ce873221b39dbd3a4a3d7
 EBUILD whois-5.2.20.ebuild 1503 BLAKE2B 7796f9e7992a0179441bd428ec512290aceb4f0a6b616c5990713a09c5a099658a26d4d5f6c41f1310271befeb8c91da9d33ad1ede8438c07f23d3fb01dc7575 SHA512 78cd52f619d4665decb06c6ce40ffc845ca949980a76d8b7e996c1aec28ace1217d76aaa1803f06b25e778ee057ff9031b5faeebe371530927e077106e669a49
 EBUILD whois-5.3.0.ebuild 1588 BLAKE2B 4518cbf6d72192faa8ac482d752571d9df527cdf61e856c9c4c572e307e334269c00e031d80beeab44b4ecab207eb9e6428b0e8b3fb5979c197c317cd02dc39f SHA512 fe7028e212fc0a1062e081b46c4c16ff57622b95062ef7533cee5ecaafdfda8200b047e2f24670058652f5c1c2ba7e07fd6c244dfa039cc7716d647da23c64f2
+EBUILD whois-5.3.1.ebuild 1591 BLAKE2B 7d9add8c38f90d2fd1ea587f5cdd8ca4647eef05baff86dac641c5c28277200ff80d7aa031ce97797d52a3f694bc4212a52bdced8800f8aea905a2fb01095dbe SHA512 3c7f7c289ac6aa0df9de40ec17b19caff55c3b1943050365be1ba85b642f622b4cf125ffb63fb28012ab6b71543e7af894bedccbb37a86f74fdb697d430595a1
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/net-misc/whois/whois-5.2.12.ebuild b/net-misc/whois/whois-5.3.1.ebuild
index b29486572d8b..c1b043c47406 100644
--- a/net-misc/whois/whois-5.2.12.ebuild
+++ b/net-misc/whois/whois-5.3.1.ebuild
@@ -1,31 +1,36 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils toolchain-funcs
+EAPI=6
+inherit toolchain-funcs
 
-MY_P=${P/-/_}
+MY_P="${P/-/_}"
 DESCRIPTION="improved Whois Client"
 HOMEPAGE="https://www.linux.it/~md/software/"
 SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="iconv idn nls"
 RESTRICT="test" #59327
 
 RDEPEND="iconv? ( virtual/libiconv )
-	idn? ( net-dns/libidn )
+	idn? ( net-dns/libidn2 )
 	nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}
 	app-arch/xz-utils
 	>=dev-lang/perl-5
+	virtual/pkgconfig
 	nls? ( sys-devel/gettext )"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.7.2-config-file.patch
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.7.2-config-file.patch
+	"${FILESDIR}"/${PN}-5.3.0-libidn_automagic.patch
+)
 
+src_prepare() {
+	default
 	if use nls ; then
 		sed -i -e 's:#\(.*pos\):\1:' Makefile || die
 	else
@@ -37,7 +42,7 @@ src_prepare() {
 	fi
 }
 
-src_configure() { :;} # expected no-op
+src_configure() { :; } # expected no-op
 
 src_compile() {
 	unset HAVE_ICONV HAVE_LIBIDN
@@ -54,7 +59,7 @@ src_install() {
 	dodoc README debian/changelog
 
 	if [[ ${USERLAND} != "GNU" ]]; then
-		mv "${ED}"/usr/share/man/man1/{whois,mdwhois}.1 || die
-		mv "${ED}"/usr/bin/{whois,mdwhois} || die
+		mv "${ED%/}"/usr/share/man/man1/{whois,mdwhois}.1 || die
+		mv "${ED%/}"/usr/bin/{whois,mdwhois} || die
 	fi
 }
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index 3f30a7537877..5166941a98e4 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
diff --git a/net-print/hplip-plugin/Manifest b/net-print/hplip-plugin/Manifest
index 868e7c368054..7743cf27effc 100644
--- a/net-print/hplip-plugin/Manifest
+++ b/net-print/hplip-plugin/Manifest
@@ -1,5 +1,5 @@
 DIST hplip-3.17.10-plugin.run 2062947 BLAKE2B 86f15193a751794eb64acfbaf1b42151c34336603d4d592cc84a375ccca4e7be4177d3dda76fc153ac0a6898eff24174df43256450cd81ae8ad4d4f6abd69ade SHA512 98eef413b122527c4a7860b621baf11c04ec9d7f4e43ce4f36e7822a633c64b3d98cbc86cd7d305c74d9a49a4159ebd7280d652e1ba430cad4cc70f66d23ee07
-DIST hplip-3.18.3-plugin.run 2065610 BLAKE2B 820f390c7c5f66943b12545ebe33742909b41f3f2d9389a811f4aed983e88dec22d44288692a9de5014f9093173b726c3e792124327e4bd774cbc66070e113c4 SHA512 d1bf83476aa56748f9e808f6ae9dd66b761c7674fdc0c960636102e7f263347fe8553a14e9ddbe6dfacc52fddbe4e47b5a9c1c01f07010444e656751272d73f2
+DIST hplip-3.18.4-plugin.run 2065541 BLAKE2B 0e7af5eaf3059c4e77b5213e2fcb240da898f1bb68162fedf4b36e0f47cb1fa060f908a617f7ca1d10aadf6fa59f9617fdf91374c709c3439a59ca27560f186c SHA512 8e8aaa9703b12806ebcaa10ec764489baa02ce48a3f73f82a6ae964c6ed01882e1ae315b4ccd923e96792217765d6f8ac9c01e9b6ea41af86b13ba6100229fb9
 EBUILD hplip-plugin-3.17.10.ebuild 1545 BLAKE2B 31f321fa6f038a90c5f2487b9d6242d7fea58fe9cf6af69ac8dc2eabd3788d09e57ab325737ca71ea5e7b26a686c83bb39448d3bba71f47500c16f2aae855d6c SHA512 e9c19899a37e95c2a61cf432e0c2557dbe8a8ff302da5f39475f97c89d362ab0da51a28818f457633c7d1b2a782703349d798d0e9526f2ef31346f39ed77a6cf
-EBUILD hplip-plugin-3.18.3.ebuild 1545 BLAKE2B caad3c84d51702bf101bdb240e4e10bca75923dd5ba2d94fa8ac034495aa088fca40f1ad39e102e17c3227ab918792cff4349d128c08b89cf362951d853d4d7c SHA512 167d560a9cc88ca1fed36fae85fad9ceec7186e61d6f2504e07afd82bb6afedab040bb93241f352e425e1fd67f982fd81bacb86a922c534ad34600e6bfcc7d1f
+EBUILD hplip-plugin-3.18.4.ebuild 1553 BLAKE2B 79d9f5f3892dd3f1f08a5c6111bd336fd5b95d1457c52cf46c8349950e83fc26daead599d039acc5aee24bec931a311e8a1af7d97061cf2b5b564b90194fd67a SHA512 bf2563690e81384e8c521e08234966af3332324e4cb892bb320fdc8017ecf3182b9496d2e2fe09f767054f80511b27bbfef2af3094f7afd7ad36500dfb2a3b52
 MISC metadata.xml 334 BLAKE2B 8f1a0784c57af6204db98f443bdb09df2a6432674d711a5ecf577c20e29f04a030549ea19c6e04f51cd9a36e60a6da94bebafbfcc10d52da87109e59c32d42ee SHA512 105a5442ba05b94b2886f9075bd89268d4f2e0567ad69a637a1bd7d7d0eafdc280dfdb198aab5d72525300a9be0d4ad78f6bfe6398c896cc9de0f591651d102c
diff --git a/net-print/hplip-plugin/hplip-plugin-3.18.3.ebuild b/net-print/hplip-plugin/hplip-plugin-3.18.4.ebuild
index b96c3ec3601d..906e4c9f061b 100644
--- a/net-print/hplip-plugin/hplip-plugin-3.18.3.ebuild
+++ b/net-print/hplip-plugin/hplip-plugin-3.18.4.ebuild
@@ -6,7 +6,7 @@ EAPI="6"
 inherit udev unpacker
 
 DESCRIPTION="Proprietary plugins and firmware for HPLIP"
-HOMEPAGE="http://hplipopensource.com/hplip-web/index.html"
+HOMEPAGE="https://developers.hp.com/hp-linux-imaging-and-printing"
 SRC_URI="http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/hplip-${PV}-plugin.run"
 
 LICENSE="hplip-plugin"
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 1805b6e64e1f..2511020d4e1d 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -1,9 +1,9 @@
 DIST hplip-3.17.10.tar.gz 23878364 BLAKE2B 0165bcb00159572a16277624db0de4b2ca8421d5cf42418bf406548dd68a7d5087142a74a0e6ca332936b006f6ffeaa4d9202c5332fd1f971923bb142adb244f SHA512 0c1c78730d269ec41f95bbde887a490aebb4c9c3dcb9784052a1c3b537c12093cbc426e1f79266c63dd5e7adecdda0735b9bf964ddc1307b2c6603f3fa0462a8
 DIST hplip-3.17.9-patches-1.tar.xz 8484 BLAKE2B 3a1f25d0554af5597266eb5ed3ff9f594560671784a89ade6246e9287661bf17fa16c555391c3f685e59aec8c548560911065a9c4188906c2f00c755f503fe49 SHA512 125f9cfd1c3cad662ce33954b8ab9ab1898368b449c4ad78dfe99f29de8025183773272b9865cd22b976a30c502e38254ce0ac59d685299dff7f9314927d546a
 DIST hplip-3.18.3-patches-2.tar.xz 8936 BLAKE2B 58c17f3b6332de1edd88a3b458f1e9f856bc917842f62eee0808469ec14ff5793cd33c7a2ba30593eba624e58c12a6d426fa43a7d375d6ac50b985b895a85b4c SHA512 cbafcd9616f9c86318007b703325d3429ed0698c3fc9d3eddd422e4cd7a16c77320ac168bfa01b5874213e1740cfaae1867d31c3cf96cd57573ad33651a674ed
-DIST hplip-3.18.3.tar.gz 22178733 BLAKE2B 2d5c30d884cd04314ef3727e88abd1a2621e39916c0fa9a558e72ed2d040a5d11847cd82237da33efccd41b23eeb0fad69c84b36fbb736af3def4aa60f00ba71 SHA512 cb51e357cc9def3c087231b01752941b469e5fc4508ec83c6f5875352694249ef72339f2f20c4a6831c49ace7c1f6b902cc11a961c0e1f43ce098b2bf800728f
 DIST hplip-3.18.4.tar.gz 22185532 BLAKE2B dceb0213b67a4842db9d30b45d1eb9796ceb5065d0495901af89f359016cc2febb47fd80610d13f2aada69ef8701a56bc6c52065bc68b200f488fcfd739a0d7c SHA512 dfe0e21606498112d57fd76763bcc9457a130896bd86508736422c1d82a8be5b5e4b4277b07e2efd2c777cedb9f573ac9fe8198afcf425386c7d8ac0cd62d086
+DIST hplip-3.18.5.tar.gz 22437406 BLAKE2B d32c38209b8a60c6ca7fe89512409d4d32bf095097cdc499a1afeb985c9add2da5e99b12b307f1cf0c4513071f2d4b62291d7624fe982579e8781ace5f533f6a SHA512 2c99bb446af604a2f011f9dd5ddf4bf5019b7cd36a0ecb1cbe6dce0c0358b8472a695ad85d09e52c3e63de8a69e2a3e7081c61ec36f44aae2770b5fef0f67516
 EBUILD hplip-3.17.10.ebuild 7417 BLAKE2B 6a79d111d6b6c19a2b18b3d0995ba56828ed64f47fc9ce2098916303dd4c239f51dec295852a9a850dd93eb5e80f7421f35165585caecebd710e1175ff3deeb9 SHA512 855943629bf3dd0fdd85013e71b00fe40ea7414403cc3b761f93f63f7c4a7f2deab8f3d464c724ea1f585317ded9d855b99411d54872d96005241981aa6fc54a
-EBUILD hplip-3.18.3-r1.ebuild 7814 BLAKE2B 83aa08ceb21bebb3c9cf535412bf1a593e9c8a74df51650da0416aa0b167bf9f0e2e7a4ff5869b983eb2281211b142d6e3b5e8123f4f3c23b3e8d2047c54be78 SHA512 9cc2d3f80e12b16061cd439a08e5373860b1ca7e934e8c6a72f0b595dab52751ebf6bd6849a287a8c2632031e99b92281ec211bb88850bb58ea47e7bb11cd5b0
 EBUILD hplip-3.18.4.ebuild 7814 BLAKE2B 83aa08ceb21bebb3c9cf535412bf1a593e9c8a74df51650da0416aa0b167bf9f0e2e7a4ff5869b983eb2281211b142d6e3b5e8123f4f3c23b3e8d2047c54be78 SHA512 9cc2d3f80e12b16061cd439a08e5373860b1ca7e934e8c6a72f0b595dab52751ebf6bd6849a287a8c2632031e99b92281ec211bb88850bb58ea47e7bb11cd5b0
+EBUILD hplip-3.18.5.ebuild 7822 BLAKE2B d2d2f630089de97c290d9573657f581daa6867b26a012a1952c438c6dc121bf69a97fab22321ccee25d9734217870a2a108f4c970bba1581159bfb37e4a48766 SHA512 0f0c743f6c749b9f1b6de5fe284c95cf1a6e97ef9533ae62df615224ce562994e09e8c3a41b04771217b77a16c84a6c0af67725016a07b07757b9b48b7d6b319
 MISC metadata.xml 1767 BLAKE2B 67ab6b778637b42f5849699aa506c48844ea510a6528c2e62e54164a1d4502def06f0461bb79e9ea525b09026b502039719dfb42d9168738822e4fd588989196 SHA512 eab26de132a410104ad260bf09962702fdc0c554261511264d4d95375a7afa07fa5b902115e4a500d5371e54f483c6f655f6d0c1fbc387e46f10e98d20b842b3
diff --git a/net-print/hplip/hplip-3.18.3-r1.ebuild b/net-print/hplip/hplip-3.18.5.ebuild
index c1bd7d6cc228..00309e5ab471 100644
--- a/net-print/hplip/hplip-3.18.3-r1.ebuild
+++ b/net-print/hplip/hplip-3.18.5.ebuild
@@ -12,7 +12,7 @@ WANT_AUTOMAKE="1.13"
 inherit autotools linux-info python-single-r1 readme.gentoo-r1 udev
 
 DESCRIPTION="HP Linux Imaging and Printing - Print, scan, fax drivers and service tools"
-HOMEPAGE="http://hplipopensource.com/hplip-web/index.html"
+HOMEPAGE="https://developers.hp.com/hp-linux-imaging-and-printing"
 SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
 		https://dev.gentoo.org/~billie/distfiles/${PN}-3.18.3-patches-2.tar.xz"
 
diff --git a/net-print/mtink/Manifest b/net-print/mtink/Manifest
index e730a6c3f0e5..91fbb17ef4c1 100644
--- a/net-print/mtink/Manifest
+++ b/net-print/mtink/Manifest
@@ -1,5 +1,4 @@
 AUX mtink-1.0.16-flags.patch 10583 BLAKE2B aeddc279ca436ccbefd182f4f1a27e2ac2e0a9f171fe90cd4c44a424ea6d6a9f4c9d200238d320e0b0e47252793e0fe30ffa7249bad53c59d080991dc7689c11 SHA512 a4a6767139e1bf0d0ab8efaf82a1cb7abfa084505a3ef6ecfe6ef43aa9fa813ebd8e81aeae5be0582ff1fb9938e8c3f72611c2b7a898c9290d6b98508a93201f
-AUX mtink-1.0.16-options.patch 1424 BLAKE2B 0b0636dcd9ee08a1a12461485f6b498e921d6de2feb520f4113cf18db21427833365d034fc0c7fcb44fcf928125d118f3731210fcd876d1cf24dd9ca91274d15 SHA512 11fa05f2cb6e512a18a0d43a838197fa96f22fac74fd7565387351132c0a879fd9f90076fb88cc876d3ac81920b14dd9e6ab80c1325a89e8fa631cd6ce1279aa
 AUX mtink-1.0.16-overflow.patch 421 BLAKE2B 6588f9d2025e866a3fda2eb518e19c4cabf5540eec503759a902d67f80b4bc148880042d2510d18b758d134abc63c64fe6f4afaa475734fbc2279e77b5b61a8b SHA512 801e7fa935b965398f2d2cb9b5384d5868485b09879636fb385c5d84be80a725b51a3fde8c94253749bc35e1dece4f879d1a292b4b557d592a26a3f7fc731159
 AUX mtinkd.confd 383 BLAKE2B f407d4f3302d027f8bc2208554100ef427e9fa0735d488b75447b87a3fd0588978ff25425b384da33edfd38c02e0e66cb3e8433a9a7ef97d0e03042616bec8e5 SHA512 83bdc7aa3947c0f4f2161288fe634d355205a9e097cac6e82c2bc7f55afd6ae8bbee15c1871089ddf1c718b587a0f6929ad4be0590c601b7e3428c0ef79ed331
 AUX mtinkd.rc 332 BLAKE2B ba7902b7d2e2aa00530ba1466d78eb9f91311ea164c242e2980cf5139624e9fbd607d26e824925acfa4fa7c8a6f29c76435c05b5ad143268119aa5d1677f4e7d SHA512 764cf45bf56f2fa50b3b927422e2374e1142ac1b29022b0f44cd462618587fa568200b08f56d802d3754698928a6f65a39d05d3cfde51c32b57db3b85fbca034
diff --git a/net-print/mtink/files/mtink-1.0.16-options.patch b/net-print/mtink/files/mtink-1.0.16-options.patch
deleted file mode 100644
index c173a4c762c1..000000000000
--- a/net-print/mtink/files/mtink-1.0.16-options.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -ruN mtink-1.0.16.orig/Makefile.ORG mtink-1.0.16/Makefile.ORG
---- mtink-1.0.16.orig/Makefile.ORG	2007-08-28 12:52:30.000000000 +0200
-+++ mtink-1.0.16/Makefile.ORG	2011-06-05 21:29:23.000000000 +0200
-@@ -4,7 +4,7 @@
- setUid=1
- gimpVersion=
- 
--DBG = -s -O
-+DBG =
- 
- # comment this out for Solaris
- 
-@@ -235,7 +235,7 @@
- 
- ttink: $(TTYOBJ) $(SRCDIR)/d4lib.h $(SRCDIR)/cmd.h $(SRCDIR)/mtink.h $(SRCDIR)/model.h $(SRCDIR)/version.h Makefile
- 	@echo Link ttink
--	@$(CC) -o ttink $(TTYOBJ) $(CFLAGS) $(MTINK_CFLAGS) $(RDTIMEOUT) $(DEVICE) $(WRTIMEOUT) $(DEBUG) $(KERNEL_USB_BUG) $(MACOSLDFLG) -DWITH_X=0
-+	@$(CC) -o ttink $(LDFLAGS) $(TTYOBJ) $(CFLAGS) $(MTINK_CFLAGS) $(RDTIMEOUT) $(DEVICE) $(WRTIMEOUT) $(DEBUG) $(KERNEL_USB_BUG) $(MACOSLDFLG) -DWITH_X=0
- 
- ############# PLUG-IN #######################
- gimp-mtink: $(SRCDIR)/gimp-mtink.c Makefile
-@@ -257,7 +257,7 @@
- 
- mtinkd: $(SVR_OBJ) Makefile
- 	@echo Link mtinkd
--	@$(CC) -o mtinkd $(SVR_OBJ) $(CFLAGS) $(MTINK_CFLAGS) $(MACOSLDFLG) 
-+	@$(CC) -o mtinkd $(LDFLAGS) $(SVR_OBJ) $(CFLAGS) $(MTINK_CFLAGS) $(MACOSLDFLG) 
- 
- ########### Chooser ##############
- 
-@@ -269,7 +269,7 @@
- 
- $(DETDIR)/askPrinter: $(DETDIR)/askPrinter.c
- 	@echo Compile and link askPrinter.c
--	@$(CC) -o $(DETDIR)/askPrinter $(DETDIR)/askPrinter.c -I. -I$(DETDIR)
-+	@$(CC) -o $(DETDIR)/askPrinter $(LDFLAGS) $(DETDIR)/askPrinter.c -I. -I$(DETDIR)
- 
- ########### utilities ######################
- 
diff --git a/net-voip/Manifest.gz b/net-voip/Manifest.gz
index 3d99ed42f03e..c9bed1bf9cbd 100644
--- a/net-voip/Manifest.gz
+++ b/net-voip/Manifest.gz
diff --git a/net-voip/linphone/Manifest b/net-voip/linphone/Manifest
index 918ae92df7cf..c717899bdb48 100644
--- a/net-voip/linphone/Manifest
+++ b/net-voip/linphone/Manifest
@@ -5,5 +5,5 @@ DIST linphone-3.5.2.tar.gz 8338517 BLAKE2B df44f2885a7ef1c2ccdfcb5755b947ff27ef8
 DIST linphone-3.6.1-exosip-4.patch 89376 BLAKE2B 128b0406fb382dcc0e683777322d6ae2230de8fb09e8d0e1b35ecd6bd0d8518b6e9759c703545fc0bc2e1b1ee754eaf7d5bd6396a58b9d638de6de4fcf3a09f3 SHA512 bdab74336cb8235b3396230278fd8eb465defac1175b00ff9cf273ef2dbc4e05f63d2574de599618e4d963b42ad17ac4f0c8c9013e40a497c99211041317313d
 DIST linphone-3.6.1.tar.gz 11458586 BLAKE2B e89576eb313e5707c83e8df66a20e630f4244cadfec580f58fd0a9f2f3fe9600b85b17049af0a89ddc2059b932f9d3af9abecda45500b6689f1a09ca1b3f6c28 SHA512 688ccfb333b2302ca20c2c77e38b20deee8b1c5f3c31f7a4b666d81114ea3e5cbe38bac6d88116d635ac3fcb7f38d013e35c7c076549cc3d7ae900456d51b5e4
 EBUILD linphone-3.5.2.ebuild 2847 BLAKE2B 481545c2490811fe43c1f207892cd7ce20a5f89191e32ce589c45b9aebbbf2e613dd9a43e2851e145f3fe3c301d0c02dc5c171a3e39682f98d0e1fc3e8085e34 SHA512 6eee0b019ddbd7e1b71a241e92a143f47ad5e5385e367a75edaf99db16a6d5554eb665b2c804c1f27aabaa0d4b1f23e6263437bce2b4a6d0beb4a83d672cffb3
-EBUILD linphone-3.6.1.ebuild 3029 BLAKE2B 696e3763d4786390ac7599a1c9d807d7e4bd8f660d6c1ef05d9eacf63344ec2ad990e0f88279a4b04fbc15508f53b5801593d1d241a3e7de05ff27a072ba4be7 SHA512 2759f73c924aa177e4d511272b31445d0e28b8e341c8989a218407ed3084ab4957c3008bec6fa90e94dc5b86cfa11257743579fd425fdc8f906c2131f4209fb2
+EBUILD linphone-3.6.1.ebuild 3094 BLAKE2B f166e4036eb6df710d881834f06865646d4e0cdffaeadd2323b734c851888820a4c5cd7e8e92dc62188d12d738686a0cc390469d9ccf0af20dd354bd279d2bb4 SHA512 99d88c6c5219a54dee9b71de44aa85590c2dba54306d3bd66767774194b275d196b6523e40cf9d7c3bb38f8fd323332cec0bd4a60bbb28668a6fee2590b24d87
 MISC metadata.xml 603 BLAKE2B 1b975319f0bd3066f96027efd2f8bbdd92c906c0c91054f86a790f595975d91620546c99075046e0cd6298955c84efcdda01ff66362d7ec287bb918b88972a41 SHA512 5d48b510b798090b2ebfed2197570ac045462dbd424aeac2a8aae8b01c04c7620fe7f8eb5480f12d813b0c55fc15db475f2128de7d6ffb9fcbc1c158711143fd
diff --git a/net-voip/linphone/linphone-3.6.1.ebuild b/net-voip/linphone/linphone-3.6.1.ebuild
index 0a2589565a9c..b5eb024d7c66 100644
--- a/net-voip/linphone/linphone-3.6.1.ebuild
+++ b/net-voip/linphone/linphone-3.6.1.ebuild
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 # TODO: run-time test for ipv6: does it need mediastreamer[ipv6]?
-IUSE="assistant doc gsm-nonstandard gtk ipv6 libnotify ncurses nls sqlite ssl tools upnp video"
+IUSE="assistant doc gsm-nonstandard gtk ipv6 libnotify libressl ncurses nls sqlite ssl tools upnp video"
 
 RDEPEND="
 	>=media-libs/mediastreamer-2.9.0[ipv6?,upnp?,video?]
@@ -35,7 +35,10 @@ RDEPEND="
 		sys-libs/ncurses
 	)
 	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( dev-libs/openssl:0 )
+	ssl? (
+		libressl? ( dev-libs/libressl:0= )
+		!libressl? ( dev-libs/openssl:0= )
+	)
 	tools? ( dev-libs/libxml2 )
 	upnp? ( net-libs/libupnp )
 	video? ( >=media-libs/mediastreamer-2.9.0[v4l] )
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 336ca219f57b..44d631968325 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index 701cb68c2a54..160fb4a7f895 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -6,10 +6,10 @@ AUX tor.initd-r8 953 BLAKE2B 7af04f23c95b7edd90bfb6989741973cb63a846ad8a34be9a07
 AUX torrc-r1 140 BLAKE2B 4b7e0795c09e737c5dda014c2b87811757bb8d68d581ece49f5002a2c42ee29c64899c635daf27b3465194a73ca5fd21a3a7ca655682fa5f5ffc7f4b2360b125 SHA512 6e3c481b34f2cb6f48bf87fe10565daded00415cc233332d43e18206d46eb7b32f92c55035584b5992e7a056e79e862124a573a9724f7762f76d4c4f0824de82
 DIST tor-0.3.1.10.tar.gz 6192183 BLAKE2B 4c1b57a3b19d18d735bb7362a08e4c2330350f2e31d52a8eb6d837cebc45ad6e64f3364e368f72d59bb8f51f652d4029a3e237a26efe580551811f5812e8dac4 SHA512 92af34a96bea2a99ab51d766d932da697409e404da4318ba6b3360ff0c2e9369b9afa652445a1651940f5a0502f4137141cc87cff14eba180539ea81be0c21a3
 DIST tor-0.3.2.10.tar.gz 6421984 BLAKE2B bab8031982f05ee29b14d22fdd9c4912e35342e6ac57a1c3fe1d5de3c4f394e0211607d20917b705a5f489109511a7ed7761e1dd7b4310c3d112c5e7cf9964bb SHA512 b916173b13fbca71a1b859d0cb1b090a063b27039ce88cedcf4b17ab282bfaa2edf0bb9f213fc20f82af856c880e0747a593e3d8fe1bc17319dc5cd8ac4490df
-DIST tor-0.3.3.5-rc.tar.gz 6511634 BLAKE2B 5eb4a4ac31b55340967e99243cd9af2b631e76932c1a5d3bcb2374c6a24d7288f635c1f5bfb6f9c31467bb46e659e0a039f80a08ddc6eb934f3d4c3604dbb5fd SHA512 d2e1a12bf5a4d2f99b94978d952215df54347e91e46c05adcfa749df489f030048ba67ddcda96258bc36815977ed4677235588909023552dfe986227bc004ef6
+DIST tor-0.3.3.6.tar.gz 6547166 BLAKE2B 6fe88b991cacf14541c264629fb916d049f73c13c70a1e82d6e5683edc42f3f6093df3ff3a3a313ba6373f36f4eb9b6a8fd92e678517cfcb0b0c5a9ec54494e1 SHA512 ab2a6324844c0015c58b65faf61e9b72fe1aca2c90dc3c2970939f962f7d999483e223b980f3088207035d2ad1dc6a5628a253a486e048a072b4c5022b9cb0d3
 DIST tor-0.3.4.1-alpha.tar.gz 6603160 BLAKE2B 9fc0049ddd367198174fe612709cd61eabc6052153cbdc49c65090a364e3042331cd7c221ebac6cb4aa55f06f18dc7f57ad882d41b21154ef7bfab9e564936d9 SHA512 d27e65a2b9d2505051a3d5b95955010eae8cca0d220cb9de75f5d59eeeebf2484b11fd1d27f5fffa80917e1f3ff255ed674ab821af1403b6d6795617b1a9557f
 EBUILD tor-0.3.1.10.ebuild 2018 BLAKE2B 5c001ed0ad1fd3f0d6a3dee6bcc53bc3590a90a5c0aa931c0e67e0cbceb000ef710fa33fe11b06fc08798c6286ffa877376ef6ebf2cbd426e7a26c94311e19c2 SHA512 65f6054ac7b50c46679d88ed1a5b556f5e3c40fe44e784e6b4de324bd317e3d118a8d0d4574ac62bcd17131412c3ad1cbdd0c27f4afd53568091ce400b171244
 EBUILD tor-0.3.2.10.ebuild 2088 BLAKE2B 5e238b5f899f3f899eef005466e79f2db41ee0c5b49d57182124e3e8ac8c8a59c55ef1c8b9a2072a9221e365af9004dcd3759c4ba5767fd69b7eb7adf3396723 SHA512 464962ecf54e706489cc2bc0c902f86db648a15854949865d8ce5e14187893499354de64d4458b2bef82b510fe1de97e676417706e45a16485305ed3beac8905
-EBUILD tor-0.3.3.5_rc.ebuild 2198 BLAKE2B ecf7736891d979df6d9001c53012f56797b9a9815f78b8ebb910594ee85ba24c9a7af2ee0da0d30a1577ecb88bb473a2bae6f6ed0c3f6cb770470707ff5b1649 SHA512 a00807b2e2703a0fd2fd1a8a469241da6d3c864ff0ecaac944e1b88c8c0dcc8f649fbe3da3ebab94789a7be5e036207de818cfc6ce5bf6229f3bf6cfb411560f
+EBUILD tor-0.3.3.6.ebuild 2198 BLAKE2B ecf7736891d979df6d9001c53012f56797b9a9815f78b8ebb910594ee85ba24c9a7af2ee0da0d30a1577ecb88bb473a2bae6f6ed0c3f6cb770470707ff5b1649 SHA512 a00807b2e2703a0fd2fd1a8a469241da6d3c864ff0ecaac944e1b88c8c0dcc8f649fbe3da3ebab94789a7be5e036207de818cfc6ce5bf6229f3bf6cfb411560f
 EBUILD tor-0.3.4.1_alpha.ebuild 2227 BLAKE2B aaf77e98cc42a8c1242369461588ff79c03178ae6a9d0d26c3fad005ce1b82df65839c69bf213e07d8d65ed0f54dc5e01c2d28d96caef1da3a0f33ef9566c1bd SHA512 6af1b997f67e65e66c4ca8423319efc4c3e86145748e1247d42337fc4f273d647daecc2da6e4671355eabcaac64c8c444373b43a228746f2b5fa675e41df17c7
 MISC metadata.xml 594 BLAKE2B 006e1ebc9876f83cb7cc3dcb7cea9ff0dfc763e9eb47c025e38b7588e1e4fef7c26ab130c61cdd3200b8d3d9be886b3aab377585972be178c93b758aff48c4c3 SHA512 011f77654a507d13c0542e6983df8ec86c5f2cff7cd1408f99c9d4da9d00ffb4b432317b2fd21500e62131e6f7c9bc60235cf55f2b8082391b9fe3bcf924ab2b
diff --git a/net-vpn/tor/tor-0.3.3.5_rc.ebuild b/net-vpn/tor/tor-0.3.3.6.ebuild
index 655250741364..655250741364 100644
--- a/net-vpn/tor/tor-0.3.3.5_rc.ebuild
+++ b/net-vpn/tor/tor-0.3.3.6.ebuild
diff --git a/net-vpn/wireguard/Manifest b/net-vpn/wireguard/Manifest
index bedd5536ca83..67cf01ba62ae 100644
--- a/net-vpn/wireguard/Manifest
+++ b/net-vpn/wireguard/Manifest
@@ -1,5 +1,5 @@
 AUX wireguard-openrc.sh 915 BLAKE2B 1185374a61591b0d6917f7c15f2040b9dd0fb76b5fd007f24cd25396a2814bcd323935c5d642ca2120f60fa16e82cf21ecb723741ecfc012f5404714b203e60d SHA512 dd21d8558b4c5ff0fb02a35b6996f1f89ea0e59c885523b9443aafdebcfb23cab3e60f248594d416245a5829b36103566a7a59f41183a9990451c35aa6933dcb
-DIST WireGuard-0.0.20180519.tar.xz 267784 BLAKE2B 69fc0256f27a583331625e9cf107f355c9ecfc0c04c780bf5bc4423fa9d9efa8c9e9c8cab007191b2e458d0bf9c3adb4844c5abe12806545216fb9ad81c42513 SHA512 587a1371edd4a7fdf167154398f8a51da8c70f55e86a4be4b0b830a2f00a1421710017d954ad1aeda4df3a36ca8c9a911ba5fb407a851235257176291af3ee15
-EBUILD wireguard-0.0.20180519.ebuild 4779 BLAKE2B f00789a53e3f1bd2e4d875288ee35f08570d9c36d47194796483c4837c870c23214d01bfc0b44233b78116190d631cb1b659fa6778a3b30746384521a1fe4508 SHA512 9b1dd9ab6126da583ceec9b6969a8cae8afe27a748bc61f9bd1ff2141cf093b481158c0619e2cdb89b56d9c1a707768d43c242b81fe957548949affbd9abbe8e
+DIST WireGuard-0.0.20180524.tar.xz 268996 BLAKE2B 44721a2654c2ee274abf95e3aaf060c50c72fb3eb158e53f0ce252ca4a0d6d7e18a562e42560a3032008721d2485284439908d2ccedc333a0bb8900e7472d5a5 SHA512 0e961333459bd4523c5190d73e8ec5473f79cf65717429b675e055695ba3f5d30fd93b7801f2ad64cce0a8118df40233ef6318de5248a811ecc24d0bfdccfdf9
+EBUILD wireguard-0.0.20180524.ebuild 4779 BLAKE2B f00789a53e3f1bd2e4d875288ee35f08570d9c36d47194796483c4837c870c23214d01bfc0b44233b78116190d631cb1b659fa6778a3b30746384521a1fe4508 SHA512 9b1dd9ab6126da583ceec9b6969a8cae8afe27a748bc61f9bd1ff2141cf093b481158c0619e2cdb89b56d9c1a707768d43c242b81fe957548949affbd9abbe8e
 EBUILD wireguard-9999.ebuild 4779 BLAKE2B f64e60a843e4c5d6a6941b6af9821f5904e9f969dbadb1ec9281fdd81a24c76612899431da0104236ada44df9cb8a0dbd8aac803f864a0a892971a7f3f928fb0 SHA512 4f64c13d75ddaa611c545b1a65b1b3d5aa61298ffbf32de436287b1c898b77e807ffb4da3949d3a1a073c38d9e2609df885954f9a2d57388e86babab85c9b80f
 MISC metadata.xml 765 BLAKE2B 4b3a03aea5271da19dddddfc4f7fa180c4b3b846bbe434786c3b3e7bbfb51424cf3be55877cf6b2af60559a456978946ed68354600e43fbb461d2000bd655b70 SHA512 794ffdecbc09f27080cade3a5753e0d1e9021edb400282ee6db7099d4583ab4d4ed28a343e2b8c2227ab39b8bc4182938d6c82ae4a4f7e9980f21348d8d8c805
diff --git a/net-vpn/wireguard/wireguard-0.0.20180519.ebuild b/net-vpn/wireguard/wireguard-0.0.20180524.ebuild
index b8f4649d874e..b8f4649d874e 100644
--- a/net-vpn/wireguard/wireguard-0.0.20180519.ebuild
+++ b/net-vpn/wireguard/wireguard-0.0.20180524.ebuild
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index f6a624ef3794..b4ec3818183c 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index 3b619cee7f8d..01484e6504ec 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -4,11 +4,13 @@ AUX 0002-autopair-Don-t-handle-the-iCade.patch 1412 BLAKE2B e90239917c0772155e36
 AUX 0004-agent-Assert-possible-infinite-loop.patch 583 BLAKE2B 22cd0d0b4c6c1859631e31bba434f368a1cec07128aa69ecb9003734292aa1349b5dfad87b0ac35e79d089459dd24ecc8cb8f7bd0147c52b2284c2340884ee93 SHA512 f3af46b27180f500c3f978799633b7a01a9d7720eafdb7a9fb108684161616b976b42d135a2358785830c26642ef7c2175d0f1fa3d6df898fe3bd5e77f6a191d
 AUX bluetooth-init.d-r4 283 BLAKE2B 639679bb0156538e63e5e401a3063f8e72c2096b9ff9558e2e3289bd337dfb11c228010a50e40dd0a84ab2bb6f9cba69eb59b51b018d4983638dba4e3635e20c SHA512 155ec9c0deb82b1fc2218a0d23297ea1390b1ce0bcfffaf4b5ffbf5ee13fe4179b763edfcc6dec48c7a731a852d5307966090f35cc5caf28bbb8bee7dd01714a
 AUX bluez-5.39-systemd-quote.patch 1298 BLAKE2B c06a96ffee4f40d574765f7f5b58ba3544fe9862bf4d64d45be0dcbfe1446cb8cdca150402e44117f44b973d7041fd66f01088d843d35d0d6538ccf169551923 SHA512 a31a93934b3ad5d55633ab8ac0878f3cd8bda0ca7836a8912b444f88fe8c71183d25a6e3f36d962cc68da6d2776837b4bf660efb17d379c4003a092c313e69ba
+AUX bluez-5.49-crash-non-LE.patch 2281 BLAKE2B c9615f8f326980cc9cbcbefa3441a4aaa6a0390915a15de7af5a4b1b1bd533af0dde130d429dfed275df7fad2c24931ded91afb27f8631b77cbcb701423516a7 SHA512 0db340640a85c85d54afd257e4e9067e06073e071ff0215848fa8982ac1707fd0c9d21cbf634c5bfc38869a00598cf781fd91b073a6a933980e777fd1b0c5578
 AUX bluez-plugdev.patch 469 BLAKE2B 611a9971e4614ab32ab62e8d2dc23e4a98b59c02ad8303ed0dc10831ab9023665436cfa9c47f8ccab7f83ab2b46ca8369ce53c5084ba7bf649c3ea89779882af SHA512 b7e23b6f52e6f638e6d5deed4e901136c40bc1cbfb302ada8d85873e1792b4e3605802a2c5f786d5d6d53bf4651fc5b611396aaafe5eff90578650c448a5a7a2
 AUX bluez-udevadm-path.patch 568 BLAKE2B 7c9d6fad4779cec9ee110c9f0723fe669e5990750674cfdf6fd7395db3c0bf4520f4d81896d802cf62a25d1abbf46784f09c581a1fb0b72ef8a27131d4cf65d8 SHA512 a1af572809ec71a1796ec66fa1d2fcea6fb7624bdb9a629791707b182310bf41d1a109cc19e0fe034f4b4ae5e5816d809ece2eb4410e7f47827ec1b86c82b3a1
 AUX rfcomm-init.d-r2 546 BLAKE2B c487e51fcd4837c1cfce8b630062d1a882c084691266fd00a43d5ee7aca045fb566ab39638664bc37ec54c516aa327c6ba54b046ed18696cabf3228ad0e28588 SHA512 bcbb6a78c4c25ad797dc1d45180382909a052e9be32439eec85772082a01799f45181e8a90be89b952a68b7276f6ac1cef98fc3f4d0a5e5c8075089a29f3ddd1
 DIST bluez-5.47.tar.xz 1718920 BLAKE2B e5863181ba9b19b81bc430fb900e1a8752749a02dac122a57bd44c41a1aeeb21b4c1476cab2ce89a7d3570fc1b592f1a2ed9e1f96c289faee942d203d1e3aa85 SHA512 86fa1baae1593d4824038db8418358b0be624c81fc23ee8f96ec08979d309a2377be3924ab53cc0fcb712aec8e696360e9a9f4de4c12cc31b14de5cf495a11a6
 DIST bluez-5.49.tar.xz 1744860 BLAKE2B 25b350debb016f93d23a2ecf14183197a3b8e8c0496b82b22a51ccc00ccf0241fb43d7d8d9ed04bdfcc0a1111078b8394e8b9ff23963854e51b6a19cf769811f SHA512 bc2988649420232b92e2c6836857027369f05ace005972f575ed0601c02cc97a07a3b7a0707a8bad72be73df7e8096c8bf023530443556e87c2ccb667981b37d
 EBUILD bluez-5.47-r1.ebuild 8003 BLAKE2B d4bf09bdd60cc7bb4069a5cadccdebf31a04bba1d31f4374e394b8dd79a5901ae7e8881435cfe1790dc5882daeef43fae43263c03b9415795ee7694c89c5e5e2 SHA512 e307de7b0805f1d37755ae1355a25f993ac1e870bdc0276e582e66f26a7916c0cd829cceb185796930ecb95ea26b8c74c45f6bf8c47673b90ff922eb72fe2baf
+EBUILD bluez-5.49-r1.ebuild 8106 BLAKE2B 8d0549940b38c9cd147ebe1059d1516db6af41fa5136387432fed269a6f4d9d757587f208711227a408f3a08b04dbe8c7d8ff4e2bfeb610f3c6764ca59a38d61 SHA512 278be668c58e608bba6a6cd222d7c185b7f5aa9385a5fbee026c831ea995fce696f5a07c9c09bc1ce860854e064f7fdc9a1716a5f72a55b23d06bd6a67776d25
 EBUILD bluez-5.49.ebuild 7932 BLAKE2B f9c6a66914d52f6e08d4d40ac27cf8b88c554865e10ade87cf66342489c18a514394eba0b0bca71e4fd37a8a90316a9a3296630b5c45da713c10241b5564e55d SHA512 c7bfd84e13fb86070dd5cdb9ccb1fdec8692973d9775c3b82d4ede76316fc98aaf7bf659acfc9027b049097ff9dc155640d3c1b336adedbe322061ba34a85f9e
 MISC metadata.xml 1123 BLAKE2B 87f3bc5c6709f1d82237c9ef91b30491f8854b79a9d661e7788496361cff763ec510368d08e832df58ad474802619a5b1434acd4c2c20f41a42fd12f2c946b96 SHA512 be4e0c9c8e589d9c2c1f1f8bc2119da6239d726201ce35979996a6364b02fae8782a9b44742a601e14342eb1501734d68b032bceb26d1f2628782dc9ab5d7f93
diff --git a/net-wireless/bluez/bluez-5.49-r1.ebuild b/net-wireless/bluez/bluez-5.49-r1.ebuild
new file mode 100644
index 000000000000..7708108720fd
--- /dev/null
+++ b/net-wireless/bluez/bluez-5.49-r1.ebuild
@@ -0,0 +1,263 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools multilib python-single-r1 readme.gentoo-r1 systemd udev user multilib-minimal
+
+DESCRIPTION="Bluetooth Tools and System Daemons for Linux"
+HOMEPAGE="http://www.bluez.org"
+SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.xz"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0/3"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86"
+IUSE="alsa cups doc debug deprecated extra-tools experimental +mesh +obex +readline selinux systemd test test-programs +udev user-session"
+
+# Since this release all remaining extra-tools need readline support, but this could
+# change in the future, hence, this REQUIRED_USE constraint could be dropped
+# again in the future.
+REQUIRED_USE="
+	extra-tools? ( deprecated readline )
+	test? ( ${PYTHON_REQUIRED_USE} )
+	test-programs? ( ${PYTHON_REQUIRED_USE} )
+	user-session? ( systemd )
+"
+
+CDEPEND="
+	>=dev-libs/glib-2.28:2[${MULTILIB_USEDEP}]
+	>=sys-apps/dbus-1.6:=[user-session=]
+	>=sys-apps/hwids-20121202.2
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups:= )
+	mesh? (
+		dev-libs/json-c:=
+		sys-libs/readline:0= )
+	obex? ( dev-libs/libical:= )
+	readline? ( sys-libs/readline:0= )
+	systemd? ( sys-apps/systemd )
+	udev? ( >=virtual/udev-172 )
+"
+TEST_DEPS="${PYTHON_DEPS}
+	>=dev-python/dbus-python-1[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+"
+
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	test? (	${TEST_DEPS} )
+"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-bluetooth )
+	test-programs? ( ${TEST_DEPS} )
+"
+DOC_CONTENTS="
+	If you want to control your bluetooth devices as a non-root user,
+	please remember to add you to plugdev group.
+"
+
+PATCHES=(
+	# Use static group "plugdev" to not force people to become root for
+	# controlling the devices.
+	"${FILESDIR}"/${PN}-plugdev.patch
+
+	# Try both udevadm paths to cover udev/systemd vs. eudev locations (#539844)
+	# http://www.spinics.net/lists/linux-bluetooth/msg58739.html
+	"${FILESDIR}"/${PN}-udevadm-path.patch
+
+	# build: Quote systemd variable names, bug #527432
+	# http://article.gmane.org/gmane.linux.bluez.kernel/67230
+	"${FILESDIR}"/${PN}-5.39-systemd-quote.patch
+
+	# Fedora patches
+	# http://www.spinics.net/lists/linux-bluetooth/msg40136.html
+	"${FILESDIR}"/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
+
+	# ???
+	"${FILESDIR}"/0004-agent-Assert-possible-infinite-loop.patch
+
+	# https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=2c3bba7b38be03834162e34069156f1fd49f0528
+	# Fixed in next version
+	"${FILESDIR}"/${P}-crash-non-LE.patch
+)
+
+pkg_setup() {
+	enewgroup plugdev
+
+	if use test || use test-programs; then
+		python-single-r1_pkg_setup
+	fi
+
+	if ! use udev; then
+		ewarn
+		ewarn "You are installing ${PN} with USE=-udev. This means various bluetooth"
+		ewarn "devices and adapters from Apple, Dell, Logitech etc. will not work,"
+		ewarn "and hid2hci will not be available."
+		ewarn
+	fi
+}
+
+src_prepare() {
+	default
+
+	# http://www.spinics.net/lists/linux-bluetooth/msg38490.html
+	! use user-session && eapply "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch
+
+	if use cups; then
+		sed -i \
+			-e "s:cupsdir = \$(libdir)/cups:cupsdir = $(cups-config --serverbin):" \
+			Makefile.{in,tools} || die
+	fi
+
+	# Broken test https://bugzilla.kernel.org/show_bug.cgi?id=196621
+	sed -i -e '/unit_tests += unit\/test-gatt\b/d' Makefile.am || die
+
+	eautoreconf
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myconf=(
+		# readline is automagic when client is enabled
+		# --enable-client always needs readline, bug #504038
+		# --enable-mesh is handled in the same way
+		ac_cv_header_readline_readline_h=$(multilib_native_usex readline)
+		ac_cv_header_readline_readline_h=$(multilib_native_usex mesh)
+	)
+
+	if ! multilib_is_native_abi; then
+		myconf+=(
+			# deps not used for the library
+			{DBUS,GLIB}_{CFLAGS,LIBS}=' '
+		)
+	fi
+
+	# btpclient disabled because we don't have ell library in the tree
+	econf \
+		--localstatedir=/var \
+		--disable-android \
+		--disable-btpclient \
+		--enable-datafiles \
+		--enable-experimental \
+		--enable-optimization \
+		$(use_enable debug) \
+		--enable-pie \
+		--enable-threads \
+		--enable-library \
+		--enable-tools \
+		--enable-manpages \
+		--enable-monitor \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+		--with-systemduserunitdir="$(systemd_get_userunitdir)" \
+		$(multilib_native_use_enable alsa midi) \
+		$(multilib_native_use_enable cups) \
+		$(multilib_native_use_enable deprecated) \
+		$(multilib_native_use_enable experimental) \
+		$(multilib_native_use_enable mesh) \
+		$(multilib_native_use_enable obex) \
+		$(multilib_native_use_enable readline client) \
+		$(multilib_native_use_enable systemd) \
+		$(multilib_native_use_enable test-programs test) \
+		$(multilib_native_use_enable udev) \
+		$(multilib_native_use_enable udev sixaxis)
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		default
+	else
+		emake -f Makefile -f - libs \
+			<<<'libs: $(lib_LTLIBRARIES)'
+	fi
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && default
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		emake DESTDIR="${D}" install
+
+		# Only install extra-tools when relevant USE flag is enabled
+		if use extra-tools; then
+			ewarn "Upstream doesn't support using this tools and their bugs are"
+			ewarn "likely to be ignored forever, also that tools can break"
+			ewarn "without previous announcement."
+			ewarn "Upstream also states all this tools are not really needed,"
+			ewarn "then, if you still need to rely on them, you must ask them"
+			ewarn "to either install that tool by default or add the needed"
+			ewarn "functionality to the existing 'official' tools."
+			ewarn "Please report this issues to:"
+			ewarn "http://www.bluez.org/development/lists/"
+
+			# Upstream doesn't install this, bug #524640
+			# http://permalink.gmane.org/gmane.linux.bluez.kernel/53115
+			# http://comments.gmane.org/gmane.linux.bluez.kernel/54564
+			# gatttool is only built with readline, bug #530776
+			dobin attrib/gatttool
+			dobin tools/btmgmt
+		fi
+
+		# Unittests are not that useful once installed, so make them optional
+		if use test-programs; then
+			# example-gatt-client is the only one needing
+			# python3, the others are python2 only. Remove
+			# until we see how to pull in python2 and python3
+			# for runtime
+			rm "${ED}"/usr/$(get_libdir)/bluez/test/example-gatt-server || die
+			rm "${ED}"/usr/$(get_libdir)/bluez/test/example-gatt-client || die
+			python_fix_shebang "${ED}"/usr/$(get_libdir)/bluez/test
+			for i in $(find "${ED}"/usr/$(get_libdir)/bluez/test -maxdepth 1 -type f ! -name "*.*"); do
+				dosym "${i}" /usr/bin/bluez-"${i##*/}"
+			done
+		fi
+	else
+		emake DESTDIR="${D}" \
+			install-includeHEADERS \
+			install-libLTLIBRARIES \
+			install-pkgconfigDATA
+	fi
+}
+
+multilib_src_install_all() {
+	# We need to ensure obexd can be spawned automatically by systemd
+	# when user-session is enabled:
+	# http://marc.info/?l=linux-bluetooth&m=148096094716386&w=2
+	# https://bugs.gentoo.org/show_bug.cgi?id=577842
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=804908
+	# https://bugs.archlinux.org/task/45816
+	# https://bugzilla.redhat.com/show_bug.cgi?id=1318441
+	# https://bugzilla.redhat.com/show_bug.cgi?id=1389347
+	use user-session && ln -s "${ED}"/usr/lib/systemd/user/obex.service "${ED}"/usr/lib/systemd/user/dbus-org.bluez.obex.service
+
+	find "${D}" -name '*.la' -delete || die
+
+	keepdir /var/lib/bluetooth
+
+	# Upstream don't want people to play with them
+	# But we keep installing them due to 'historical' reasons
+	insinto /etc/bluetooth
+	local d
+	for d in input network; do
+		doins profiles/${d}/${d}.conf
+	done
+	doins src/main.conf
+
+	newinitd "${FILESDIR}"/bluetooth-init.d-r4 bluetooth
+
+	einstalldocs
+	use doc && dodoc doc/*.txt
+	! use systemd && readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	! use systemd && readme.gentoo_print_elog
+
+	use udev && udev_reload
+	systemd_reenable bluetooth.service
+
+	has_version net-dialup/ppp || elog "To use dial up networking you must install net-dialup/ppp."
+}
diff --git a/net-wireless/bluez/files/bluez-5.49-crash-non-LE.patch b/net-wireless/bluez/files/bluez-5.49-crash-non-LE.patch
new file mode 100644
index 000000000000..b66868e7140d
--- /dev/null
+++ b/net-wireless/bluez/files/bluez-5.49-crash-non-LE.patch
@@ -0,0 +1,51 @@
+From 2c3bba7b38be03834162e34069156f1fd49f0528 Mon Sep 17 00:00:00 2001
+From: "antoine.belvire@laposte.net" <antoine.belvire@laposte.net>
+Date: Tue, 27 Mar 2018 20:30:26 +0200
+Subject: adapter: Don't refresh adv_manager for non-LE devices
+
+btd_adv_manager_refresh is called upon MGMT_SETTING_DISCOVERABLE setting change
+but as only LE adapters have an adv_manager, this leads to segmentation fault
+for non-LE devices:
+
+0  btd_adv_manager_refresh (manager=0x0) at src/advertising.c:1176
+1  0x0000556fe45fcb02 in settings_changed (settings=<optimized out>,
+    adapter=0x556fe53f7c70) at src/adapter.c:543
+2  new_settings_callback (index=<optimized out>, length=<optimized out>,
+    param=<optimized out>, user_data=0x556fe53f7c70) at src/adapter.c:573
+3  0x0000556fe462c278 in request_complete (mgmt=mgmt@entry=0x556fe53f20c0,
+    status=<optimized out>, opcode=opcode@entry=7, index=index@entry=0,
+    length=length@entry=4, param=0x556fe53eb5f9) at src/shared/mgmt.c:261
+4  0x0000556fe462cd9d in can_read_data (io=<optimized out>,
+    user_data=0x556fe53f20c0) at src/shared/mgmt.c:353
+5  0x0000556fe46396e3 in watch_callback (channel=<optimized out>,
+    cond=<optimized out>, user_data=<optimized out>)
+    at src/shared/io-glib.c:170
+6  0x00007fe351c980e5 in g_main_context_dispatch ()
+   from /usr/lib64/libglib-2.0.so.0
+7  0x00007fe351c984b0 in ?? () from /usr/lib64/libglib-2.0.so.0
+8  0x00007fe351c987c2 in g_main_loop_run () from /usr/lib64/libglib-2.0.so.0
+9  0x0000556fe45abc75 in main (argc=<optimized out>, argv=<optimized out>)
+    at src/main.c:770
+
+This commit prevents the call to btd_adv_manager_refresh for non-LE devices.
+---
+ src/adapter.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/adapter.c b/src/adapter.c
+index 6b9222b..daccfdc 100644
+--- a/src/adapter.c
++++ b/src/adapter.c
+@@ -540,7 +540,8 @@ static void settings_changed(struct btd_adapter *adapter, uint32_t settings)
+ 		g_dbus_emit_property_changed(dbus_conn, adapter->path,
+ 					ADAPTER_INTERFACE, "Discoverable");
+ 		store_adapter_info(adapter);
+-		btd_adv_manager_refresh(adapter->adv_manager);
++		if (adapter->supported_settings & MGMT_SETTING_LE)
++			btd_adv_manager_refresh(adapter->adv_manager);
+ 	}
+ 
+ 	if (changed_mask & MGMT_SETTING_BONDABLE) {
+-- 
+cgit v1.1
+
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index fe60b3ccde79..2eb96869a2ff 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index ddfdd8f215b0..bfb6fd69d208 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -121,7 +121,9 @@ PYTHONDONTWRITEBYTECODE="1"
 # Add default USE value for bootstrap and rename it from STAGE1_USE to BOOTSTRAP_USE
 # Add in expanded PYTHON_TARGETS or stage1 builds break because of USE="-* ${BOOTSTRAP_USE}"
 # This MUST be kept in sync with the PYTHON_TARGETS below
-BOOTSTRAP_USE="cxx unicode internal-glib python_targets_python3_5 python_targets_python2_7"
+# Mike Gilbert <floppym@gentoo.org> (23 May 2018)
+# sys-apps/baslayout-2.5 needs split-usr enabled.
+BOOTSTRAP_USE="cxx unicode internal-glib split-usr python_targets_python3_5 python_targets_python2_7"
 
 # Mike Gilbert <floppym@gentoo.org> (15 May 2012)
 # Default target(s) for python-r1.eclass
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 53273ad59cb4..518a65f3f352 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -7,14 +7,22 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Andreas Sturmlechner <asturm@gentoo.org> (24 May 2018)
+# kdelibs4 is dead and going away. Bug #645558
+<app-office/libreoffice-6.0 kde
+<app-office/libreoffice-bin-6.0 kde
+<app-office/libreoffice-bin-debug-6.0 kde
+
+# Andreas Sturmlechner <asturm@gentoo.org> (24 May 2018)
+# Qt4 is dead and going away.
+kde-plasma/plasma-desktop qt4
+kde-plasma/breeze qt4
+kde-plasma/oxygen qt4
+
 # Michał Górny <mgorny@gentoo.org> (16 May 2018)
 # Depends on last-rited sci-libs/coinhsl.
 sci-libs/ipopt hsl
 
-# Andreas Sturmlechner <asturm@gentoo.org> (10 May 2018)
-# Depends on obsolete dev-libs/sni-qt and dead Qt4.
-kde-plasma/plasma-desktop qt4
-
 # Mike Gilbert <floppym@gentoo.org> (01 May 2018)
 # Requires >=media-video/ffmpeg-4 (bug 654208).
 >=www-client/chromium-67 system-ffmpeg
diff --git a/profiles/default/bsd/use.force b/profiles/default/bsd/use.force
index 8602cb496077..706719015f84 100644
--- a/profiles/default/bsd/use.force
+++ b/profiles/default/bsd/use.force
@@ -1 +1,2 @@
+split-usr
 userland_BSD
diff --git a/profiles/features/selinux/package.mask b/profiles/features/selinux/package.mask
index 99c776791b51..cce0476c2e4f 100644
--- a/profiles/features/selinux/package.mask
+++ b/profiles/features/selinux/package.mask
@@ -35,3 +35,8 @@ sys-apps/gentoo-systemd-integration
 sys-apps/systemd-readahead
 sys-process/systemd-cron
 sys-apps/dbus-broker
+
+# Gilles Dartiguelongue <eva@gentoo.org> (24 May 2018)
+# Packages use systemd unconditionally for now
+>=app-admin/abrt-2.10
+>=dev-libs/libreport-2.9
diff --git a/profiles/package.mask b/profiles/package.mask
index c4c8951ebdf1..266d437ec5f2 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,10 +29,12 @@
 
 #--- END OF EXAMPLES ---
 
-# Lars Wendler <polynomial-c@gentoo.org> (22 May 2018)
-# Breaks revdeps (most likely because of GooHash removal).
-# See tracker bug https://bugs.gentoo.org/656264
->=app-text/poppler-0.65.0
+# Andreas Sturmlechner <asturm@gentoo.org> (24 May 2018)
+# Depends on dead Qt4. Masked for removal in 30 days. Bug #629018
+dev-libs/libattica
+kde-frameworks/kdelibs
+kde-frameworks/kdelibs-env
+kde-plasma/qguiplatformplugin_kde
 
 # Matt Turner <mattst88@gentoo.org> (20 May 2018)
 # Removal in 30 days. Bug #655102
@@ -271,10 +273,6 @@ dev-python/kiwi
 # instead of its own.  Removal in 30 days.  Bug #526552.
 dev-python/tdaemon
 
-# Andreas Sturmlechner <asturm@gentoo.org> (26 Apr 2018)
-# Depends on dead Qt4, no more revdeps. Masked for removal in 30 days.
-dev-libs/qjson
-
 # Michał Górny <mgorny@gentoo.org> (22 Apr 2018)
 # Unmaintained buggy package with unresearched segfaults.  No support
 # for Python 3.  No reverse dependencies.
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index a7537a67e841..3b4969cec42e 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -2528,7 +2528,6 @@ dev-python/markdown:pygments - Enable fancy pygments support
 dev-python/matplotlib:excel - Pull dev-python/xlwt for the exceltools toolkit
 dev-python/matplotlib:gtk2 - Enable x11-libs/gtk+:2 support
 dev-python/matplotlib:gtk3 - Enable x11-libs/gtk+:3 support
-dev-python/matplotlib:pyside - Qt support via dev-python/pyside
 dev-python/mpmath:matplotlib - Add support for dev-python/matplotlib
 dev-python/msgpack:native-extensions - Compiles native "C" extensions (speedups, instead of using python fallback code).
 dev-python/nbdime:webtools - Install web-based diff and merge tools.
@@ -3317,7 +3316,6 @@ games-strategy/megaglest:tools - Build model import/export tools
 games-strategy/megaglest:unicode - Use unicode strings for wxwidgets
 games-strategy/megaglest:wxuniversal - Use the wxUniversal port which implements the various GUI controls by drawing them itself
 games-strategy/naev:mixer - Enables media-libs/sdl-mixer sound backend in addition to media-libs/openal one.
-games-strategy/seven-kingdoms:network - Enable support for multiplayer via media-libs/sdl-net
 games-strategy/ufo-ai:editor - Build map editor
 games-strategy/uqm:music - download and install music files (large)
 games-strategy/uqm:remix - download and install music remix files (large)
@@ -3415,7 +3413,7 @@ kde-apps/cantor:R - Enable dev-lang/R backend support
 kde-apps/cantor:analitza - Enable kde-apps/analitza backend support
 kde-apps/cantor:julia - Enable dev-lang/julia backend support
 kde-apps/cantor:qalculate - Enable sci-libs/libqalculate backend support
-kde-apps/dolphin:thumbnail - Enables video thumbnail generation
+kde-apps/dolphin:thumbnail - Enables thumbnail generation
 kde-apps/dolphin-plugins:bazaar - Enable support for the bazaar VCS
 kde-apps/dolphin-plugins:dropbox - Enable support for the dropbox fileviewer plugin
 kde-apps/dolphin-plugins:git - Enable support for the git VCS
@@ -3451,6 +3449,7 @@ kde-apps/kio-extras:htmlthumbs - Enable HTML thumbnail previews via dev-qt/qtweb
 kde-apps/kio-extras:man - Enable manpages kioslave
 kde-apps/kio-extras:phonon - Enable file audio preview plugin using media-libs/phonon
 kde-apps/kio-extras:sftp - Enable SFTP protocol support using net-libs/libssh
+kde-apps/kio-extras:taglib - Enable audio thumbnails via media-libs/taglib
 kde-apps/kmag:keyboardfocus - Enable keyboard focus tracking
 kde-apps/konqueror:activities - Enable kactivities support
 kde-apps/konqueror:speech - Build text-to-speech plugin
@@ -3563,7 +3562,7 @@ kde-plasma/plasma-meta:crypt - Pull in kde-plasma/plasma-vault for encrypted vau
 kde-plasma/plasma-meta:display-manager - Pull in a graphical display manager
 kde-plasma/plasma-meta:grub - Pull in Breeze theme for sys-boot/grub
 kde-plasma/plasma-meta:gtk - Enable Breeze widget style and KCM for GTK2 and GTK3
-kde-plasma/plasma-meta:legacy-systray - Add support for applications using legacy xembed systray icons, depending on USE qt4 or gtk.
+kde-plasma/plasma-meta:legacy-systray - Add support for GTK+ applications using legacy xembed systray icons
 kde-plasma/plasma-meta:pam - Enable support for kwallet auto-unlocking
 kde-plasma/plasma-meta:plymouth - Pull in Breeze theme for sys-boot/plymouth
 kde-plasma/plasma-meta:pulseaudio - Install Plasma applet for PulseAudio volume management
@@ -7493,7 +7492,7 @@ sec-policy/selinux-base:unconfined - Enable support for the unconfined SELinux m
 sec-policy/selinux-base-policy:unconfined - Enable support for the unconfined SELinux policy module
 sys-apps/accountsservice:elogind - Use sys-auth/elogind instead of sys-auth/consolekit for session tracking
 sys-apps/accountsservice:systemd - Use sys-apps/systemd instead of sys-auth/consolekit for session tracking
-sys-apps/baselayout:usrmerge - Activate the /usr merge when stages are built
+sys-apps/baselayout:split-usr - Enable this if /bin and /usr/bin are separate directories
 sys-apps/busybox:make-symlinks - Create all the appropriate symlinks in /bin and /sbin.
 sys-apps/busybox:math - Enable math support in gawk (requires libm)
 sys-apps/busybox:mdev - Create the appropriate symlink in /sbin and install mdev.conf and support files
@@ -7680,8 +7679,8 @@ sys-apps/systemd:lz4 - Enable lz4 compression for the journal
 sys-apps/systemd:nat - Enable support for network address translation in networkd
 sys-apps/systemd:qrcode - Enable qrcode output support in journal
 sys-apps/systemd:resolvconf - Install resolvconf symlink for systemd-resolve
+sys-apps/systemd:split-usr - Enable this if /bin and /usr/bin are separate directories
 sys-apps/systemd:sysv-utils - Install sysvinit compatibility symlinks and manpages for init, telinit, halt, poweroff, reboot, runlevel, and shutdown
-sys-apps/systemd:usrmerge - Enable /usr merge (experimental)
 sys-apps/systemd:vanilla - Disable Gentoo-specific behavior and compatibility quirks
 sys-apps/systemd:xkb - Depend on x11-libs/libxkbcommon to allow logind to control the X11 keymap
 sys-apps/tcp-wrappers:netgroups - Support matching NIS (host) netgroup names via the @netgroup syntax (if you don't know what this means, you most likely do not need it)
@@ -8006,6 +8005,7 @@ sys-firmware/edk2-ovmf:binary - Use pre-built binaries
 sys-firmware/intel-microcode:initramfs - install a small initramfs for use with CONFIG_MICROCODE_EARLY
 sys-firmware/intel-microcode:monolithic - install the large text microcode.dat (used by older kernels via microcode_ctl)
 sys-firmware/intel-microcode:split-ucode - install the split binary ucode files (used by the kernel directly)
+sys-firmware/intel-microcode:vanilla - install only microcode updates from Intel's official microcode tarball
 sys-firmware/ipxe:binary - Use pre-built binaries
 sys-firmware/ipxe:efi - Build an EFI program for using PXE
 sys-firmware/ipxe:iso - Build a bootable ISO for using PXE
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 84c85f1ef441..e9ff5aff9fe6 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index 367d4b69b2f8..a95fbbcfa394 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -3,5 +3,7 @@ AUX grass-7.2.0-gcc7.patch 8766 BLAKE2B f380b60ae11f11193920f87bd5f3dd83b39e5341
 AUX grass-7.2.0-glibc-2.26-1.patch 329 BLAKE2B 4168b4ea26f3cbf608b8eb106f77b762ad7d28a8a9f69e5a24dbd6247014a70a2c027445b2e6e4c23d22ca412078012440648c80977058190f5f4ac3413db743 SHA512 90a44add13556e3780ec394db2f7fcbdae88904be4a72248bcc177545a6b6400683a91ab3088b87cd45c6a1507a41e701b99f8a224e8872f3dc2b685421daa93
 AUX grass-7.2.0-glibc-2.26-2.patch 1238 BLAKE2B 93dca4f61321f7d721171a0eb079d805c31d28a8e83942380f826f8f04a9ad23a4c22e00198a62df971091521008a994ef8a9f7fd0dd3cd1a25317882cc7364d SHA512 a199c029b1dcc4362dae1fd2bfbc82e6fb7245e001095ad149fa76d8a0bf20f72e5869ff8ef48f14cd6a2ba2546e7b73d030aeb096bb565562b249e511eaa5fd
 DIST grass-7.2.0.tar.gz 48315008 BLAKE2B 927da2119e199cee7cbf55a172141abfe9ce86499e307b355fec2cdf79ec3424acddc4410e3049e7cade5dd3da39e618af7e1003093f87de5735a981984b46c6 SHA512 b1aa17ec554c2f0473df3726993b0891df4589c60ca9362405932a4c479b5883245b0a0ba9e787ce2e9de210b6307f34883e4e63ddfbf04eb5d75e8583bc2c5b
-EBUILD grass-7.2.0-r1.ebuild 6889 BLAKE2B e2faac30ea4bfa21d7b8650146c9c5f339b21e4592e977f529e37216ae3599c41f13d4f48ef4a1ed9e5c079148cb93a781a369c12426668ea22becf025c90628 SHA512 39e2f2f170b402b96aea4537d9b2a46196aff5089a0f00e3e65dc8e8b2c7fb9856b0f31b2bb777b9446ed83fd56f9975e9415b34cf0a0b228fa60ed398cf5fe9
+DIST grass-7.4.0.tar.gz 56329374 BLAKE2B 924ecd9ad073dd3c59542a871780397a2516e1f0d912b4644978154ea6305ccf50229655aa7f38ab20f2bf85e4a4783cd793fff5101423dd6c212108d638d1df SHA512 b0393ec5d149e2146cc1f30cdcea00e31039bf0a2541486ab0ecd5debe260d267d74e60761b45ce306ad9942264cce9134dbafbf3c75a55df1c610499877d321
+EBUILD grass-7.2.0-r1.ebuild 6838 BLAKE2B 30bdb9299483718e9fe2872496dd3a8b6e62f22cd452c229fe358da8d3920bd9634fd74ddf53abde208f5ee9b1fd399c28640e1a4b8f1b76a88c072a6240e83a SHA512 cc6b010ee705b3e09b90e0bbabffa4ed94b3d2da4012d8f87381cf44b645a542809035549f87b0b2afc7a5b35a698bfbcac9e9392006d625d02003c1b1319702
+EBUILD grass-7.4.0.ebuild 7316 BLAKE2B 0ccddb16ffb1d3e6e8cb566fd2f3cb435419bd70a69cb62550f65c9647f32251fbbaae281e3cb1eb2ed5807eafa067345deace268acd49f90a412e6522d0aaca SHA512 22cfbca1d55a73c1429bdc14d880f92c08b06f8875751497262b197d1f8f3f250777edeabeb23962312d8beffd856d7a45f83cc975c46807c5057adff4d1fa1e
 MISC metadata.xml 814 BLAKE2B 0b1eacbba651c73fa3586014f44722e8eaedcdebf199651dbfce15a3f76538a4a6b498876e46cbd184aa777d4a6762cc0561614d5fc77d764002cdfa8a670ae9 SHA512 1dbb667232d8ebfbff53e2a66a5bdf8ef1d8e894d94c4e03348b658d99d8e8cf0ec159fe9421380c8bd4491ea71499fc10d6f20b3ca35208224eab82cce27635
diff --git a/sci-geosciences/grass/grass-7.2.0-r1.ebuild b/sci-geosciences/grass/grass-7.2.0-r1.ebuild
index 233823e1fa49..4c924ed16592 100644
--- a/sci-geosciences/grass/grass-7.2.0-r1.ebuild
+++ b/sci-geosciences/grass/grass-7.2.0-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="sqlite"  # bug 572440
 WANT_AUTOCONF="2.1"
 WX_GTK_VER=3.0
 
-inherit eutils gnome2 fdo-mime multilib python-single-r1 versionator wxwidgets autotools
+inherit autotools gnome2 python-single-r1 versionator wxwidgets xdg-utils
 
 MY_PM=${PN}$(get_version_component_range 1-2 ${PV})
 MY_PM=${MY_PM/.}
@@ -32,8 +32,8 @@ RDEPEND="${PYTHON_DEPS}
 	sci-libs/gdal
 	sys-libs/gdbm
 	sys-libs/ncurses:0=
-	sys-libs/zlib
-	fftw? ( sci-libs/fftw:3.0 )
+	sys-libs/zlib:=
+	fftw? ( sci-libs/fftw:3.0= )
 	geos? ( sci-libs/geos )
 	blas? ( virtual/blas
 		sci-libs/cblas-reference )
@@ -121,9 +121,7 @@ src_prepare() {
 	sed -e 's:\(#include <ogr_api.h>\):#ifdef HAVE_OGR\n\1\n#endif:' \
 		-i "${S}/vector/v.external/main.c" || die "failed to sed main.c"
 
-	epatch "${PATCHES[@]}"
-
-	eapply_user
+	default
 	eautoconf
 
 	ebegin "Fixing python shebangs"
@@ -254,14 +252,14 @@ src_install() {
 
 pkg_postinst() {
 	if use X; then
-		fdo-mime_desktop_database_update
+		xdg_desktop_database_update
 		gnome2_icon_cache_update
 	fi
 }
 
 pkg_postrm() {
 	if use X; then
-		fdo-mime_desktop_database_update
+		xdg_desktop_database_update
 		gnome2_icon_cache_update
 	fi
 }
diff --git a/sci-geosciences/grass/grass-7.4.0.ebuild b/sci-geosciences/grass/grass-7.4.0.ebuild
new file mode 100644
index 000000000000..a5e3ddaf60ef
--- /dev/null
+++ b/sci-geosciences/grass/grass-7.4.0.ebuild
@@ -0,0 +1,281 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"  # bug 572440
+WANT_AUTOCONF="2.1"
+WX_GTK_VER=3.0
+
+inherit autotools gnome2 python-single-r1 versionator wxwidgets xdg-utils
+
+MY_PM=${PN}$(get_version_component_range 1-2 ${PV})
+MY_PM=${MY_PM/.}
+MY_P=${P/_rc/RC}
+
+DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization"
+HOMEPAGE="http://grass.osgeo.org/"
+SRC_URI="http://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/7.4.0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="X blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype"
+
+RDEPEND="${PYTHON_DEPS}
+	>=app-admin/eselect-1.2
+	dev-python/numpy[${PYTHON_USEDEP}]
+	media-libs/libprojectm
+	sci-libs/proj
+	sci-libs/xdrfile
+	sci-libs/gdal
+	sys-libs/gdbm
+	sys-libs/ncurses:0=
+	sys-libs/zlib:=
+	fftw? ( sci-libs/fftw:3.0= )
+	geos? ( sci-libs/geos )
+	blas? ( virtual/blas
+		sci-libs/cblas-reference )
+	lapack? ( virtual/lapack )
+	liblas? ( sci-geosciences/liblas )
+	mysql? ( virtual/mysql )
+	netcdf? ( sci-libs/netcdf )
+	odbc? ( dev-db/unixODBC )
+	opencl? ( virtual/opencl )
+	opengl? ( virtual/opengl )
+	png? ( media-libs/libpng:0= )
+	postgres? ( >=dev-db/postgresql-8.4:= )
+	readline? ( sys-libs/readline:0= )
+	sqlite? ( dev-db/sqlite:3 )
+	tiff? ( media-libs/tiff:0= )
+	truetype? ( media-libs/freetype:2 )
+	X? (
+		dev-python/wxpython:3.0[cairo,opengl?]
+		x11-libs/cairo[X,opengl?]
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXt
+	)"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/flex
+	sys-devel/gettext
+	sys-devel/bison
+	X? (
+		dev-lang/swig
+		x11-base/xorg-proto
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	opengl? ( X )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}"-7.0.1-declare-inespg.patch
+)
+
+#pre_pkg_setup() {
+#	export LIBS="$(pkg-config --libs libtirpc) ${LIBS}"
+#	export CPPFLAGS="$(pkg-config --cflags libtirpc) ${CPPFLAGS}"
+#	einfo "LIBS='${LIBS}' CPPFLAGS='${CPPFLAGS}' # bug #588980"
+#}
+
+pkg_setup() {
+	if use lapack; then
+		local mylapack
+		mylapack=$(eselect lapack show) || die
+		if [[ -z "${mylapack/.*reference.*/}" ]] && \
+			[[ -z "${mylapack/.*atlas.*/}" ]]; then
+			ewarn "You need to set lapack to atlas or reference. Do:"
+			ewarn "   eselect lapack set <impl>"
+			ewarn "where <impl> is atlas, threaded-atlas or reference"
+			die "setup failed"
+		fi
+	fi
+
+	if use blas; then
+		local myblas
+		myblas=$(eselect blas show) || die
+		if [[ -z "${myblas/.*reference.*/}" ]] && \
+			[[ -z "${myblas/.*atlas.*/}" ]]; then
+			ewarn "You need to set blas to atlas or reference. Do:"
+			ewarn "   eselect blas set <impl>"
+			ewarn "where <impl> is atlas, threaded-atlas or reference"
+			die "setup failed"
+		fi
+	fi
+
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Fix unversioned python calls
+	local pyver=${EPYTHON/python/}
+	sed -e "s:GRASS_PYTHON=.*:&${pyver}:" -i "${S}/lib/init/grass.sh" || die
+	sed -e "s:= python:&${pyver}:" -i "${S}/include/Make/Platform.make.in" || die
+
+	# fix header being unconditionally included
+	# see upstream https://trac.osgeo.org/grass/ticket/2779
+	sed -e 's:\(#include <ogr_api.h>\):#ifdef HAVE_OGR\n\1\n#endif:' \
+		-i "${S}/vector/v.external/main.c" || die "failed to sed main.c"
+
+	default
+	eautoconf
+
+	ebegin "Fixing python shebangs"
+	python_fix_shebang -q "${S}"
+	eend $?
+
+	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+	shopt -s nullglob
+	mesa_cards=$(echo -n /dev/dri/card* /dev/dri/render* | sed 's/ /:/g')
+	if test -n "${mesa_cards}"; then
+		addpredict "${mesa_cards}"
+	fi
+	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+	if test -n "${ati_cards}"; then
+		addpredict "${ati_cards}"
+	fi
+	shopt -u nullglob
+	addpredict /dev/nvidiactl
+
+}
+
+src_configure() {
+	if use X; then
+		WX_BUILD=yes
+		setup-wxwidgets
+	fi
+
+	addwrite "${EPREFIX}/dev/dri/renderD128"
+
+	econf \
+		--enable-shared \
+		--disable-w11 \
+		$(use_with cxx) \
+		$(use_with tiff) \
+		$(use_with png) \
+		$(use_with postgres) \
+		$(use_with mysql) \
+		$(use_with mysql mysql-includes "${EPREFIX}/usr/include/mysql") \
+		$(use_with mysql mysql-libs "${EPREFIX}/usr/$(get_libdir)/mysql") \
+		$(use_with sqlite) \
+		$(use_with opengl) \
+		$(use_with odbc) \
+		$(use_with fftw) \
+		$(use_with blas) \
+		$(use_with lapack) \
+		$(use_with X cairo) \
+		$(use_with truetype freetype) \
+		$(use_with truetype freetype-includes "${EPREFIX}/usr/include/freetype2") \
+		$(use_with nls) \
+		$(use_with readline) \
+		--without-opendwg \
+		--with-regex \
+		$(use_with threads pthread) \
+		$(use_with openmp) \
+		$(use_with opencl) \
+		--with-gdal="${EPREFIX}/usr/bin/gdal-config" \
+		$(use_with liblas liblas "${EPREFIX}/usr/bin/liblas-config") \
+		$(use_with X wxwidgets "${WX_CONFIG}") \
+		$(use_with netcdf netcdf "${EPREFIX}/usr/bin/nc-config") \
+		$(use_with geos geos "${EPREFIX}/usr/bin/geos-config") \
+		--with-proj-includes="${EPREFIX}/usr/include/libprojectM" \
+		--with-proj-libs="${EPREFIX}/usr/$(get_libdir)" \
+		--with-proj-share="${EPREFIX}/usr/share/proj/" \
+		$(use_with X x)
+}
+
+src_compile() {
+	# we don't want to link against embedded mysql lib
+	emake CC="$(tc-getCC)" MYSQLDLIB=""
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		INST_DIR="${D}usr/${MY_PM}" \
+		prefix="${D}usr" BINDIR="${D}usr/bin" \
+		PREFIX="${D}usr/" \
+		install
+
+	pushd "${D}usr/${MY_PM}" &> /dev/null || die
+
+	# fix docs
+	dodoc AUTHORS CHANGES
+	docinto html
+	dodoc -r docs/html/*
+	rm -rf docs/ || die
+	rm -rf {AUTHORS,CHANGES,COPYING,GPL.TXT,REQUIREMENTS.html} || die
+
+	# manuals
+	dodir /usr/share/man/man1
+	rm -rf man/ || die
+
+	# translations
+	if use nls; then
+		dodir /usr/share/locale/
+		mv locale/* "${D}usr/share/locale/" || die
+		rm -rf locale/ || die
+	fi
+
+	popd &> /dev/null || die
+
+	# place libraries where they belong
+	mv "${D}usr/${MY_PM}/lib/" "${D}usr/$(get_libdir)/" || die
+
+	# place header files where they belong
+	mv "${D}usr/${MY_PM}/include/" "${D}usr/include/" || die
+	# make rules are not required on installed system
+	rm -rf "${D}usr/include/Make" || die
+
+	# mv remaining gisbase stuff to libdir
+	mv "${D}usr/${MY_PM}" "${D}usr/$(get_libdir)" || die
+
+	# get proper folder for grass path in script
+	local gisbase
+	gisbase="${ROOT}usr/$(get_libdir)/${MY_PM}"
+	sed -e "s:gisbase = \".*:gisbase = \"${gisbase}\":" \
+		-i "${D}usr/bin/${MY_PM}" || die
+
+	# get proper fonts path for fontcap
+	sed -i \
+		-e "s|${D}usr/${MY_PM}|${EPREFIX}usr/$(get_libdir)/${MY_PM}|" \
+		"${D}usr/$(get_libdir)/${MY_PM}/etc/fontcap" || die
+
+	# set proper python interpreter
+	sed -e "s:= \"python\":= \"${EPYTHON}\":" -i "${D}usr/bin/${MY_PM}" || die
+
+	if use X; then
+		local GUI="-gui"
+		[[ ${WX_BUILD} == yes ]] && GUI="-wxpython"
+		make_desktop_entry "/usr/bin/${MY_PM} ${GUI}" "${PN}" "${PN}-48x48" "Science;Education"
+		doicon -s 48 gui/icons/${PN}-48x48.png
+	fi
+
+	# install .pc file so other apps know where to look for grass
+	insinto /usr/$(get_libdir)/pkgconfig/
+	doins grass.pc
+
+	# fix weird +x on tcl scripts
+	find "${D}" -name "*.tcl" -exec chmod +r-x '{}' \;
+}
+
+pkg_postinst() {
+	if use X; then
+		xdg_desktop_database_update
+		gnome2_icon_cache_update
+	fi
+}
+
+pkg_postrm() {
+	if use X; then
+		xdg_desktop_database_update
+		gnome2_icon_cache_update
+	fi
+}
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 4d561244819a..db3f962c1136 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -4,8 +4,10 @@ AUX qgis-3.0.1-check-constraints.patch 9535 BLAKE2B d2296d9f99578c53cdca2a028716
 AUX qgis-3.0.1-qt-5.11.patch 7015 BLAKE2B 77b59b3e8381ae84b138fae9bf39029207985c212489c2a3f4a522c1bdb84f82d0ef2a283869819e63a39d89584d7f1f4967d0d4947e96dd1ad1c4af6654aba7 SHA512 4d935e6686dad9e8bf17de944706f6815da25387278a2ebf822d31c580972809226d77ee0e5e9e9137d028e8e980742bfb73926f97738242dd56220fd53d6e9d
 DIST qgis-3.0.1.tar.bz2 94217493 BLAKE2B 9f3b9e9d76dfac574cbe7c9b95f0dc59fb9ad74ddd5c5a420931107200b1ba6641e2b74cff681ecec8cdab777cda69c0e698fa952bc28cd79c761f4636f62f00 SHA512 c07fc9b033fa043e38098d226dac69ea35890109c45ccc4c47017e0af2d3fbed4b1a71b3fd7dc76fea3eb43fbcdbfb660df50d779da8c43f68a4402b239f8f75
 DIST qgis-3.0.2.tar.bz2 94483208 BLAKE2B 198587a8440bf6d1dff6d08e706f1c0972088f8f90df4def27a0066f659e4273be35687ad0f35b4f3dcd7fb60e30ead74093541c69ddbd456bcbbcbae4c99c76 SHA512 4eec027f81ee693293e87d3c16b7b210ebd66f35a2884dc4662b5a3359b18cfd8a11919132ab88489456121eab36f8e5a9c20afcb34fa9dbe54673d838fc2be1
+DIST qgis-3.0.3.tar.bz2 94462631 BLAKE2B 047f4d8852b7572dc94b9c04ec9c81e53bab2ed63a7a490682b7c557ae1b21fcc3257e751cc794d368dc4124c20c008ffdc7f1f4b79af2faea78774dc6ef430c SHA512 67f46f1acacd6688984b0c13aa5880e2f31d85b5a28ebf12830d33f198c2e5983887a8c85036b8be59edf3836ba7d38985f58433f53d3164c2ffb4a6db94d046
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d
 EBUILD qgis-3.0.1.ebuild 6259 BLAKE2B 452fb81c2eaa394b5d8b74ec954bb4845530b45a6e2dd54dbda9af6c220afd66f4d09dbfb2313644ebdd1357b5eb03518afc3a75b2484ad1988feeb92f780ba8 SHA512 de833d3679e3aa943e1b5361d069e08c5bb75475fa31fbcce2106ac0abaa9c8260a180c03ce6aa0ba3cdfa5f8f2a09df6e3ebd27b416038462603319a31af6f7
-EBUILD qgis-3.0.2.ebuild 6192 BLAKE2B 304565331b8ebaed4afa777ddd454da15acd8094c63459dfb197eff024a63f5ac7cd0c1cc6bab57bb36b357107cef8a3fc1a1d7a42eceb4e5351b2eb5348ca14 SHA512 74450d5caa73086807da8651f5da1cfc86af522561356710421b06e0dae7f4cfefb13fb5456f6ac5e98703483635244d8f5584f02e71a59022601e37c6e39877
+EBUILD qgis-3.0.2.ebuild 6191 BLAKE2B 50725cbe2f757b94effceeb04647d6a3483a94e5dcdc8be00dbb68800dbfa88937764999f45f89c1e5ffb9cade6e46e571b44437a418ca9e13c0469de75c663d SHA512 eb193d84faaa558485a977f40eb21c6c0bdac2f6fab8497e2d4aba3f17e38a352e88338e8556a280a8b4b37ff06c9494285f802e6ea3abf584569063d751ebd6
+EBUILD qgis-3.0.3.ebuild 6192 BLAKE2B 304565331b8ebaed4afa777ddd454da15acd8094c63459dfb197eff024a63f5ac7cd0c1cc6bab57bb36b357107cef8a3fc1a1d7a42eceb4e5351b2eb5348ca14 SHA512 74450d5caa73086807da8651f5da1cfc86af522561356710421b06e0dae7f4cfefb13fb5456f6ac5e98703483635244d8f5584f02e71a59022601e37c6e39877
 EBUILD qgis-9999.ebuild 6192 BLAKE2B 304565331b8ebaed4afa777ddd454da15acd8094c63459dfb197eff024a63f5ac7cd0c1cc6bab57bb36b357107cef8a3fc1a1d7a42eceb4e5351b2eb5348ca14 SHA512 74450d5caa73086807da8651f5da1cfc86af522561356710421b06e0dae7f4cfefb13fb5456f6ac5e98703483635244d8f5584f02e71a59022601e37c6e39877
 MISC metadata.xml 1114 BLAKE2B eb9f40495ad88a2e5b6d07b4eb2bfd6eb4be9f992bb631cc0bb0826959a54db372253dbdc4ed79f16755b43041f81fa66a584af798dbb5b974fdcaf08046fcea SHA512 89554d9c97f843c63f5cf96f9cbb67aa8f14f26ff3956e25d7c6951a8dbbb859383df2ceee555d5e542624042377d2fee0c9f77683f184e98911df8bc0bd6700
diff --git a/sci-geosciences/qgis/qgis-3.0.2.ebuild b/sci-geosciences/qgis/qgis-3.0.2.ebuild
index 0b888637f800..ee1a3c82ea4a 100644
--- a/sci-geosciences/qgis/qgis-3.0.2.ebuild
+++ b/sci-geosciences/qgis/qgis-3.0.2.ebuild
@@ -10,7 +10,7 @@ QT_MIN_VER="5.9.4"
 if [[ ${PV} != *9999 ]]; then
 	SRC_URI="https://qgis.org/downloads/${P}.tar.bz2
 		examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 else
 	GIT_ECLASS="git-r3"
 	EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
diff --git a/sci-geosciences/qgis/qgis-3.0.3.ebuild b/sci-geosciences/qgis/qgis-3.0.3.ebuild
new file mode 100644
index 000000000000..0b888637f800
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-3.0.3.ebuild
@@ -0,0 +1,221 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_5 )
+PYTHON_REQ_USE="sqlite"
+QT_MIN_VER="5.9.4"
+
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="https://qgis.org/downloads/${P}.tar.bz2
+		examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )"
+	KEYWORDS="~amd64 ~x86"
+else
+	GIT_ECLASS="git-r3"
+	EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
+fi
+inherit cmake-utils eutils ${GIT_ECLASS} gnome2-utils python-single-r1 qmake-utils xdg-utils
+unset GIT_ECLASS
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="https://www.qgis.org/"
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="3d examples georeferencer grass mapserver oracle polar postgres python webkit"
+
+REQUIRED_USE="
+	grass? ( python )
+	mapserver? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+COMMON_DEPEND="
+	app-crypt/qca:2[qt5(+),ssl]
+	>=dev-db/spatialite-4.2.0
+	dev-db/sqlite:3
+	dev-libs/expat
+	dev-libs/libzip:=
+	dev-libs/qtkeychain[qt5(+)]
+	>=dev-qt/designer-${QT_MIN_VER}:5
+	>=dev-qt/qtconcurrent-${QT_MIN_VER}:5
+	>=dev-qt/qtcore-${QT_MIN_VER}:5
+	>=dev-qt/qtgui-${QT_MIN_VER}:5
+	>=dev-qt/qtnetwork-${QT_MIN_VER}:5[ssl]
+	>=dev-qt/qtpositioning-${QT_MIN_VER}:5
+	>=dev-qt/qtprintsupport-${QT_MIN_VER}:5
+	>=dev-qt/qtsvg-${QT_MIN_VER}:5
+	>=dev-qt/qtsql-${QT_MIN_VER}:5
+	>=dev-qt/qtwidgets-${QT_MIN_VER}:5
+	>=dev-qt/qtxml-${QT_MIN_VER}:5
+	>=sci-libs/gdal-2.2.3:=[geos,python?,${PYTHON_USEDEP}]
+	sci-libs/geos
+	sci-libs/libspatialindex:=
+	sci-libs/proj
+	>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
+	>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
+	3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 )
+	georeferencer? ( sci-libs/gsl:= )
+	grass? ( =sci-geosciences/grass-7*:= )
+	mapserver? ( dev-libs/fcgi )
+	oracle? (
+		dev-db/oracle-instantclient:=
+		sci-libs/gdal:=[oracle]
+	)
+	polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
+	postgres? ( dev-db/postgresql:= )
+	python? ( ${PYTHON_DEPS}
+		dev-python/future[${PYTHON_USEDEP}]
+		dev-python/httplib2[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/markupsafe[${PYTHON_USEDEP}]
+		dev-python/owslib[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/sip:=[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+	)
+	webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-qt/linguist-tools-${QT_MIN_VER}:5
+	>=dev-qt/qttest-${QT_MIN_VER}:5
+	>=dev-qt/qtxmlpatterns-${QT_MIN_VER}:5
+	sys-devel/bison
+	sys-devel/flex
+"
+RDEPEND="${COMMON_DEPEND}
+	sci-geosciences/gpsbabel
+"
+
+# Disabling test suite because upstream disallow running from install path
+RESTRICT="test"
+
+PATCHES=(
+	# git master
+	"${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch"
+	# TODO upstream
+	"${FILESDIR}/${PN}-3.0.0-featuresummary.patch"
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	sed -e "s:\${QT_BINARY_DIR}:$(qt5_get_bindir):" \
+		-i CMakeLists.txt || die "Failed to fix lrelease path"
+
+	sed -e "/QT_LRELEASE_EXECUTABLE/d" \
+		-e "/QT_LUPDATE_EXECUTABLE/s/set/find_program/" \
+		-e "s:lupdate-qt5:NAMES lupdate PATHS $(qt5_get_bindir) NO_DEFAULT_PATH:" \
+		-i cmake/modules/ECMQt4To5Porting.cmake || die "Failed to fix ECMQt4To5Porting.cmake"
+
+	cd src/plugins || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DQGIS_MANUAL_SUBDIR=/share/man/
+		-DBUILD_SHARED_LIBS=ON
+		-DQGIS_LIB_SUBDIR=$(get_libdir)
+		-DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis
+		-DQWT_INCLUDE_DIR=/usr/include/qwt6
+		-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt5.so
+		-DPEDANTIC=OFF
+		-DWITH_APIDOC=OFF
+		-DWITH_QSPATIALITE=ON
+		-DENABLE_TESTS=OFF
+		-DWITH_3D=$(usex 3d)
+		-DWITH_GEOREFERENCER=$(usex georeferencer)
+		-DWITH_GRASS7=$(usex grass)
+		-DWITH_SERVER=$(usex mapserver)
+		-DWITH_ORACLE=$(usex oracle)
+		-DWITH_QWTPOLAR=$(usex polar)
+		-DWITH_POSTGRESQL=$(usex postgres)
+		-DWITH_BINDINGS=$(usex python)
+		-DWITH_CUSTOM_WIDGETS=$(usex python)
+		-DWITH_QTWEBKIT=$(usex webkit)
+	)
+
+	if use grass; then
+		mycmakeargs+=(
+			-DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
+		)
+	fi
+
+	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
+
+	# bugs 612956, 648726
+	addpredict /dev/dri/renderD128
+	addpredict /dev/dri/renderD129
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	domenu debian/qgis.desktop
+
+	local size type
+	for size in 16 22 24 32 48 64 96 128 256; do
+		newicon -s ${size} debian/icons/${PN}-icon${size}x${size}.png ${PN}.png
+		newicon -c mimetypes -s ${size} debian/icons/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png
+		for type in qgs qml qlr qpt; do
+			newicon -c mimetypes -s ${size} debian/icons/${PN}-${type}${size}x${size}.png ${PN}-${type}.png
+		done
+	done
+	newicon -s scalable images/icons/qgis_icon.svg qgis.svg
+
+	insinto /usr/share/mime/packages
+	doins debian/qgis.xml
+
+	if use examples; then
+		docinto examples
+		dodoc -r "${WORKDIR}"/qgis_sample_data/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	if use python; then
+		python_optimize "${ED%/}"/usr/share/qgis/python
+
+		if use grass; then
+			python_fix_shebang "${ED%/}"/usr/share/qgis/grass/scripts
+		fi
+	fi
+}
+
+pkg_postinst() {
+	if use postgres; then
+		elog "If you don't intend to use an external PostGIS server"
+		elog "you should install:"
+		elog "   dev-db/postgis"
+	elif use python; then
+		elog "Support of PostgreSQL is disabled."
+		elog "But some installed python-plugins import the psycopg2 module."
+		elog "If you do not need these plugins just disable them"
+		elog "in the Plugins menu, else you need to set USE=\"postgres\""
+	fi
+	if has_version "<sci-geosciences/qgis-3"; then
+		elog "QGIS is now based on PyQt5. Old scripts may not work anymore."
+	fi
+
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index 6080c41c19e4..6acb74bdf3ef 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest
index 12330ae28164..ca610b3c8f59 100644
--- a/sci-visualization/paraview/Manifest
+++ b/sci-visualization/paraview/Manifest
@@ -1,8 +1,11 @@
 AUX paraview-4.0.1-xdmf-cstring.patch 360 BLAKE2B 919de8333b22125dd1122987f780ad65594982f4fd403c45a80ae1294d1acb11cda61adc8c62f97243651679b044130e94850ecd9e06f26da1c538268fd02ba8 SHA512 5577b7bae26959546795721d712c4e4f6a5403b35c0871040f6c74c07cd3aecd5b03e9f7a07ef49714b8adb4c7cc880385215b8742895006d2ad3dfeccc50472
 AUX paraview-5.3.0-fix_buildsystem.patch 797 BLAKE2B f77c72f34c13eae42a4da281f954808f7db47c7765b9084a99d2e0ea6297d30092d1b3dae7ab26df7ac1e4de6559805748c0994853e2ad34c0f8f639ce732b12 SHA512 18526dc29219fd8dbc3679920ce271977cfb153a51cf217d49ba544510da23ee02f57b3ee9450ad9ee421d272a18fecdf3bd5043225cc16d04a2b115f62ce1f0
 AUX paraview-5.4.1-jsoncpp_1.8.4.patch 787 BLAKE2B 1978d56feb0d25fb4730dac0138803327984c4a7defee2921a9d42ba69a75788d3b5abde03c99c33024e3c89de71b93f24d3ba2a60011a24445919f16824fbf4 SHA512 9ffd209bfc5de42e6100669614771a20c904b809cea7beda90709b5b2e2c36a533ab3474495d6f6e6e7141d033e2cc53ff1dfc241287eadfb13996b7a123eadf
+AUX paraview-5.5.0-allow_custom_build_type.patch 1036 BLAKE2B ff00093034196935e9075c5751f8a64027da009679de5c3f5b941681e65df9b91b0a05a3f0201a873313d859f029596739b1c5d705a1c35ae3cc83251312774e SHA512 0c79315d28b98d4cf45bfd48198dbb3315ebf6ffbd05e9720b35e7bdea05bd98c086dbb02cd7ac6d9580f504c7d29f498244d2b30d9e2932e881261a78b020c7
 DIST ParaView-v5.3.0.tar.gz 45173528 BLAKE2B 878e8dae0b5de4bee5d72a4a272a5048fa587fac8e949d39c8e040b9fe3553b787e53f183ae98d20f24755db7e355280b85a9f572037764c53740de2eb4a9e30 SHA512 3dc3c2a1c27a0f0dc82fc04ce84477a26aacb329d6ea42c276c4204e39d11bc78adbc1807e1e7168aade31aa48b6d628775841b8b94b5122084eac46e358a23f
 DIST ParaView-v5.4.1.tar.gz 43783720 BLAKE2B 2197d7f390b7192eb58ad67b88c84119da35fc4229547a42ef12a600874304addb410d0a53684a785855f617011762bf6a819231821f0bff8ee226111df8e577 SHA512 6a720f9ed9e03b7b97f0e84bb6d67b2a28c4ffc5079427d544e9522ce313264eed273c9b7ae13b11e34ab4de903132a22bacc337452d1e9da9876416449520f5
+DIST ParaView-v5.5.0.tar.gz 51414419 BLAKE2B 832a01701d21f463c07186912501796756c2477063803fa3b2b67dbb9ac2c9db28a45a8b3d22077085255adf16eb429c3289093848b3712ebab46c0ae4c17956 SHA512 0915eac75a710736334fa9d436369a14546e2f90a1b55f9a0f7a96fedb94ced043d27576d2a179f275478be17e326cd3bee76f06266a776d586f6510722f3172
 EBUILD paraview-5.3.0.ebuild 9230 BLAKE2B c65d17b150e9a9aacaa9a98331556d06422140cde16a066df2ae2107fe35fd445d6f6b427b6cee9a7cbcbb21c7ea451a6973079490bc473e1cd981c4ea81cace SHA512 7d8ea25c399d2951b3892d50c429cf136a5c9d7be199a0b55978d1ee3dc0228298ba79e69f57358e3cce9517804e509d6680ba700552e1f86e277693164c6cec
 EBUILD paraview-5.4.1.ebuild 8162 BLAKE2B e5ac791d2e598f6f18b238bcc2ddc73677ef7a73e0094880b7df3b80084a92025e463eee46ae3d9f7438117c351f46804f845bd163c4172d3e09a424064f2aa2 SHA512 f2e4c0939dfe6b3413d4d6683c21793ad3449061c0b7f867f5e9999e319fa1f97b1e9b86c112789adbcd997fa7df28c01da0c7f2f8d1b46656a5cd27687ec703
+EBUILD paraview-5.5.0.ebuild 8194 BLAKE2B e3f53fb059f93f9c6a8f772be48b5714d51a97c6b7ef01e0973025e37740ba8c02d595d6da6f87464e2af0f9ce157e0d794380c312a149b522a779a6f7c25720 SHA512 b3101948d94bb693b78ba84ba75992022dc0e967c065e4b4011a55be3ec0f90720310d6e899c847856b225ea1e9c9e554ea396045dad51cc3451bc41f8a49ba6
 MISC metadata.xml 748 BLAKE2B 25046c08c0a8df768efba10cae82ef24d583776d21ddda5fd65f895e11214ca9745205458f27e96f45d83fd0d6e77d5f2c12653206eaef09f398fa7a9275418e SHA512 5354c12b5448883903bca724a5d3adfc1cccf352d378317f7ab43f3e4125e2329d9477081eff7e37c8602aaba2aa6df0c73a240d409541017555920f57847d65
diff --git a/sci-visualization/paraview/files/paraview-5.5.0-allow_custom_build_type.patch b/sci-visualization/paraview/files/paraview-5.5.0-allow_custom_build_type.patch
new file mode 100644
index 000000000000..1549e58af865
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-5.5.0-allow_custom_build_type.patch
@@ -0,0 +1,18 @@
+diff -urNd ParaView-v5.5.0/VTK/ThirdParty/eigen/vtkeigen/CMakeLists.txt ParaView-v5.5.0-fix/VTK/ThirdParty/eigen/vtkeigen/CMakeLists.txt
+--- ParaView-v5.5.0/VTK/ThirdParty/eigen/vtkeigen/CMakeLists.txt	2018-04-07 06:03:33.000000000 +1000
++++ ParaView-v5.5.0-fix/VTK/ThirdParty/eigen/vtkeigen/CMakeLists.txt	2018-04-10 16:19:08.841144557 +1000
+@@ -21,14 +21,6 @@
+   set(CMAKE_BUILD_TYPE "Release")
+ endif()
+ 
+-string(TOLOWER "${CMAKE_BUILD_TYPE}" cmake_build_type_tolower)
+-if(    NOT cmake_build_type_tolower STREQUAL "debug"
+-   AND NOT cmake_build_type_tolower STREQUAL "release"
+-   AND NOT cmake_build_type_tolower STREQUAL "relwithdebinfo")
+-  message(FATAL_ERROR "Unknown build type \"${CMAKE_BUILD_TYPE}\". Allowed values are Debug, Release, RelWithDebInfo (case-insensitive).")
+-endif()
+-
+-
+ #############################################################################
+ # retrieve version infomation                                               #
+ #############################################################################
diff --git a/sci-visualization/paraview/paraview-5.5.0.ebuild b/sci-visualization/paraview/paraview-5.5.0.ebuild
new file mode 100644
index 000000000000..580afbbb19fb
--- /dev/null
+++ b/sci-visualization/paraview/paraview-5.5.0.ebuild
@@ -0,0 +1,281 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit eutils cmake-utils multilib python-single-r1 toolchain-funcs versionator
+
+MAIN_PV=$(get_major_version)
+MAJOR_PV=$(get_version_component_range 1-2)
+MY_P="ParaView-v${PV}"
+
+DESCRIPTION="ParaView is a powerful scientific data visualization application"
+HOMEPAGE="http://www.paraview.org"
+SRC_URI="http://www.paraview.org/files/v${MAJOR_PV}/${MY_P}.tar.gz"
+RESTRICT="mirror"
+
+LICENSE="paraview GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="boost cg coprocessing development doc examples ffmpeg mpi mysql nvcontrol openmp plugins python +qt5 sqlite tcl test tk"
+RESTRICT="test"
+
+REQUIRED_USE="python? ( mpi ${PYTHON_REQUIRED_USE} )
+	mysql? ( sqlite )" # "vtksqlite, needed by vtkIOSQL" and "vtkIOSQL, needed by vtkIOMySQL"
+
+RDEPEND="
+	app-arch/lz4
+	dev-libs/expat
+	dev-libs/jsoncpp
+	dev-libs/libxml2:2
+	dev-libs/protobuf
+	dev-libs/pugixml
+	media-libs/freetype
+	media-libs/glew:0
+	media-libs/libpng:0
+	media-libs/libtheora
+	media-libs/tiff:0=
+	sci-libs/cgnslib
+	sci-libs/hdf5[mpi=]
+	>=sci-libs/netcdf-4.2[hdf5]
+	>=sci-libs/netcdf-cxx-4.2:3
+	sci-libs/xdmf2
+	sys-libs/zlib
+	virtual/glu
+	virtual/jpeg:0
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXt
+	coprocessing? (
+		plugins? (
+			dev-python/PyQt5
+			dev-qt/qtgui:5[-gles2]
+		)
+	)
+	ffmpeg? ( virtual/ffmpeg )
+	mpi? ( virtual/mpi[cxx,romio] )
+	mysql? ( virtual/mysql )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/constantly[${PYTHON_USEDEP}]
+		dev-python/incremental[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/sip[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/twisted-core[${PYTHON_USEDEP}]
+		dev-python/zope-interface[${PYTHON_USEDEP}]
+		mpi? ( dev-python/mpi4py )
+		qt5? ( dev-python/PyQt5[opengl,webkit,${PYTHON_USEDEP}] )
+	)
+	qt5? (
+		dev-qt/designer:5
+		dev-qt/qtgui:5[-gles2]
+		dev-qt/qthelp:5
+		dev-qt/qtopengl:5[-gles2]
+		dev-qt/qtsql:5
+		dev-qt/qttest:5
+		dev-qt/qtwebkit:5
+		dev-qt/qtx11extras:5
+	)
+	sqlite? ( dev-db/sqlite:3 )
+	tcl? ( dev-lang/tcl:0= )
+	tk? ( dev-lang/tk:0= )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	>=dev-util/cmake-3.4
+	boost? ( >=dev-libs/boost-1.40.0[mpi?,${PYTHON_USEDEP}] )
+	doc? ( app-doc/doxygen )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0.1-xdmf-cstring.patch
+	"${FILESDIR}"/${PN}-5.3.0-fix_buildsystem.patch
+	"${FILESDIR}"/${PN}-5.5.0-allow_custom_build_type.patch
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && use openmp && [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp; then
+		eerror "For USE=openmp a gcc with openmp support is required"
+		eerror
+		return 1
+	fi
+}
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	PVLIBDIR=$(get_libdir)/${PN}-${MAJOR_PV}
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# lib64 fixes
+	sed -i \
+		-e "s:/lib/python:/$(get_libdir)/python:g" \
+		VTK/ThirdParty/xdmf3/vtkxdmf3/CMakeLists.txt || die
+	sed -i \
+		-e "s:lib/paraview-:$(get_libdir)/paraview-:g" \
+		ParaViewCore/ServerManager/SMApplication/vtkInitializationHelper.cxx || die
+}
+
+src_configure() {
+	if use qt5; then
+		export QT_SELECT=qt5
+	fi
+
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_LIBDIR="${PVLIBDIR}"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
+		-DEXPAT_INCLUDE_DIR="${EPREFIX}"/usr/include
+		-DEXPAT_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libexpat.so
+		-DOPENGL_gl_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGL.so
+		-DOPENGL_glu_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGLU.so
+		-DBUILD_SHARED_LIBS=ON
+		-DCMAKE_COLOR_MAKEFILE=TRUE
+		-DCMAKE_VERBOSE_MAKEFILE=ON
+		-DVTK_Group_StandAlone=ON
+		-DVTK_RENDERING_BACKEND=OpenGL2
+		-DVTK_USE_FFMPEG_ENCODER=OFF
+		-DVTK_USE_OFFSCREEN=TRUE
+		# -DVTK_USE_SYSTEM_AUTOBAHN once we transitioned to Python 3...
+		-DVTK_USE_SYSTEM_CGNS=ON
+		-DVTK_USE_SYSTEM_PUGIXML=ON
+		-DVTK_USE_SYSTEM_EXPAT=ON
+		-DVTK_USE_SYSTEM_FREETYPE=ON
+		-DVTK_USE_SYSTEM_GL2PS=OFF # doesn't compile, requires modified sources
+		-DVTK_USE_SYSTEM_GLEW=ON
+		-DVTK_USE_SYSTEM_HDF5=ON
+		-DVTK_USE_SYSTEM_INCREMENTAL=ON
+		-DVTK_USE_SYSTEM_JPEG=ON
+		-DVTK_USE_SYSTEM_JSONCPP=ON
+		-DVTK_USE_SYSTEM_LIBHARU=OFF # doesn't compile, requires modified sources
+		-DVTK_USE_SYSTEM_LIBXML2=ON
+		-DVTK_USE_SYSTEM_LZ4=ON
+		-DVTK_USE_SYSTEM_NETCDF=ON
+		-DVTK_USE_SYSTEM_OGGTHEORA=ON
+		-DVTK_USE_SYSTEM_PNG=ON
+		-DVTK_USE_SYSTEM_PROTOBUF=ON
+		-DVTK_USE_SYSTEM_TIFF=ON
+		-DVTK_USE_SYSTEM_XDMF2=ON
+		-DVTK_USE_SYSTEM_XDMF2=OFF
+		-DVTK_USE_SYSTEM_ZLIB=ON
+		# force this module due to incorrect build system deps
+		# wrt bug 460528
+		-DModule_vtkUtilitiesProcessXML=ON
+		)
+
+	mycmakeargs+=(
+		-DPARAVIEW_INSTALL_DEVELOPMENT_FILES="$(usex development)"
+
+		-DModule_vtkGUISupportQtOpenGL="$(usex qt5)"
+		-DModule_vtkGUISupportQtSQL="$(usex qt5)"
+		-DModule_vtkGUISupportQtWebkit="$(usex qt5)"
+		-DModule_vtkRenderingQt="$(usex qt5)"
+		-DModule_vtkViewsQt="$(usex qt5)"
+		-DPARAVIEW_BUILD_QT_GUI="$(usex qt5)"
+		-DVTK_Group_ParaViewQt="$(usex qt5)"
+		-DVTK_Group_Qt="$(usex qt5)"
+		-DModule_pqPython="$(usex qt5 "$(usex python)" "off")"
+		$(usex qt5 "-DPARAVIEW_QT_VERSION=5" "")
+		-DVTK_USE_NVCONTROL="$(usex nvcontrol)"
+
+		-DModule_vtkInfovisBoost="$(usex boost)"
+
+		-DPARAVIEW_USE_ICE_T="$(usex mpi)"
+		-DPARAVIEW_USE_MPI_SSEND="$(usex mpi)"
+		-DPARAVIEW_USE_MPI="$(usex mpi)"
+		-DVTK_Group_MPI="$(usex mpi)"
+		-DVTK_XDMF_USE_MPI="$(usex mpi)"
+		-DXDMF_BUILD_MPI="$(usex mpi)"
+
+		-DModule_AutobahnPython="$(usex python)"
+		-DModule_pqPython="$(usex python)"
+		-DModule_Twisted="$(usex python)"
+		-DModule_vtkmpi4py="$(usex python)"
+		-DModule_vtkPython="$(usex python)"
+		-DModule_vtkWrappingPythonCore="$(usex python)"
+		-DModule_ZopeInterface="$(usex python)"
+		-DPARAVIEW_ENABLE_PYTHON="$(usex python)"
+		-DXDMF_WRAP_PYTHON="$(usex python)"
+
+		-DBUILD_DOCUMENTATION="$(usex doc)"
+
+		-DBUILD_EXAMPLES="$(usex examples)"
+
+		-DModule_vtkIOMySQL="$(usex mysql)"
+
+		-DModule_vtksqlite="$(usex sqlite)"
+
+		-DPARAVIEW_ENABLE_CATALYST="$(usex coprocessing)"
+
+		-DPARAVIEW_ENABLE_FFMPEG="$(usex ffmpeg)"
+		-DVTK_USE_FFMPEG_ENCODER="$(usex ffmpeg)"
+		-DModule_vtkIOFFMPEG="$(usex ffmpeg)"
+
+		-DVTK_Group_Tk="$(usex tk)"
+		-DVTK_USE_TK="$(usex tk)"
+		-DModule_vtkRenderingTk="$(usex tk)"
+		-DModule_vtkTclTk="$(usex tcl)"
+		-DModule_vtkWrappingTcl="$(usex tcl)"
+		-DBUILD_TESTING="$(usex test)"
+		)
+
+	if use openmp; then
+		mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP )
+	fi
+
+	# TODO: MantaView VaporPlugin VRPlugin
+	mycmakeargs+=(
+		-DPARAVIEW_BUILD_PLUGIN_AdiosReader="$(usex plugins)"
+		-DPARAVIEW_BUILD_PLUGIN_AnalyzeNIfTIIO="$(usex plugins)"
+		-DPARAVIEW_BUILD_PLUGIN_ArrowGlyph="$(usex plugins)"
+		-DPARAVIEW_BUILD_PLUGIN_EyeDomeLighting="$(usex plugins)"
+		-DPARAVIEW_BUILD_PLUGIN_GMVReader="$(usex plugins)"
+		-DPARAVIEW_BUILD_PLUGIN_Moments="$(usex plugins)"
+		-DPARAVIEW_BUILD_PLUGIN_NonOrthogonalSource="$(usex plugins)"
+		-DPARAVIEW_BUILD_PLUGIN_PacMan="$(usex plugins)"
+		-DPARAVIEW_BUILD_PLUGIN_SierraPlotTools="$(usex plugins)"
+		-DPARAVIEW_BUILD_PLUGIN_SLACTools="$(usex plugins)"
+		-DPARAVIEW_BUILD_PLUGIN_StreamingParticles="$(usex plugins)"
+		-DPARAVIEW_BUILD_PLUGIN_SurfaceLIC="$(usex plugins)"
+		# these are always needed for plugins
+		-DModule_vtkFiltersFlowPaths="$(usex plugins)"
+		-DModule_vtkPVServerManagerApplication="$(usex plugins)"
+		)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# remove wrapper binaries and put the actual executable in place
+	for i in "${ED}"/usr/bin/*; do
+		mv "${ED}"/usr/lib/"$(basename $i)" "$i" || die
+	done
+
+	# install libraries into correct directory respecting get_libdir:
+	mv "${ED}"/usr/lib "${ED}"/usr/lib_tmp || die
+	mkdir -p "${ED}"/usr/"${PVLIBDIR}" || die
+	mv "${ED}"/usr/lib_tmp/* "${ED}"/usr/"${PVLIBDIR}" || die
+	rmdir "${ED}"/usr/lib_tmp || die
+
+	# set up the environment
+	echo "LDPATH=${EPREFIX}/usr/${PVLIBDIR}" > "${T}"/40${PN} || die
+	doenvd "${T}"/40${PN}
+
+	newicon "${S}"/Applications/ParaView/pvIcon-32x32.png paraview.png
+	make_desktop_entry paraview "Paraview" paraview
+
+	use python && python_optimize "${D}"/usr/$(get_libdir)/${PN}-${MAJOR_PV}
+}
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 3bf4a1e520fa..215fa71966f6 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index 0cd7ced4b3b4..84a2780ae2f5 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -1,4 +1,6 @@
 DIST baselayout-2.4.1.tar.bz2 31307 BLAKE2B da26f7fbeefa5efecb6e5d9ded6c2bf3148cd1fcfc6ebb86535f5a9c086c4bb55f6a8420a3c0d0f7008251637f3e4653db875ec427745d039f753008d2f21be2 SHA512 e505ad81834aafb574ffee9bc1fce216c1c8c7fa11b0095580f87a37e4b9efb057ee78db7cd5affc64f05d5dd0592c671304414c119b37d86dfaa1e7b84ce7c1
+DIST baselayout-2.5.tar.bz2 31368 BLAKE2B 73a939bf9a180da151804045ff0e57e4def11e9bca8f55b2b891437712877b718faaf7d6ef006161d92e853c747246b20adc7d26105832c5c3120510325cbc67 SHA512 5705740c0be47a7c76d480c1173fd69a5cfc278351f34ab0c4f54220da81617fc4755c8f61888985611f77881cc89b273775fec593915f344076fc3264ea6934
 EBUILD baselayout-2.4.1-r2.ebuild 8573 BLAKE2B 1ae0257d233a4ee8a6351cd501bd3516b0c3c3a6e306d3b01fd45db29b4a932214dfe4989d23f397733eefd02c72f58bb726bdcfce975a58a0541f7fe71b4671 SHA512 cdd4f344d072851848c6e512bc3c47f1225d49b2077dbd3af45caf1f4e8d6d9d112a315b034a2237f8cf7bcadd5585cd3fc55489a085bb744130c0d37d2d7662
-EBUILD baselayout-9999.ebuild 8737 BLAKE2B e20a3bcf2bfa5b88a2b2fc857c3d532c9f17905264cdf56d1cb711ead535798b7994c40be17044e87464fe6d95d312c31d7c1cfc0d5967792e666818e866adf3 SHA512 fd0a56d5bf3c1c56f211ecd7d303c6d71da1b164d30926848445d73590a5ff25faf23e71543b167c730cc1b4156be65f43679208dab2bc6680a5102799ea5a6a
-MISC metadata.xml 447 BLAKE2B 8d2a924108bc62d05d6324741f3f5b008ce6a5197b5615c2a798dfda5bfccffc1b489139d41f59668298bb5947c25be4c08d818499008d188544706f53c8af0b SHA512 df8ef8945e71112074f70af3fb2ffc0d83ffd0b25827f802b96924436b6a7f184ffcfef495d543bddc3007e7a1ea5429ca696e2ad6dfb09a0541e504f7d135d1
+EBUILD baselayout-2.5-r1.ebuild 8890 BLAKE2B b4f5d135b81f21f5f2e53482fbb45fcf3e297de59d2ae2a547135de22250bd19e09b4cd0b04330864426803f54c176fe181752f90afe27366251439592e58638 SHA512 6b884773a0e854724b1e32f79c4c8c90fe0a7cf1b017efe7b0dbe60e81f2c8445c124eb3125cb41996ad4bd343d71f27e0f210b072f0fb89725a6375b5a3474d
+EBUILD baselayout-9999.ebuild 8890 BLAKE2B b4f5d135b81f21f5f2e53482fbb45fcf3e297de59d2ae2a547135de22250bd19e09b4cd0b04330864426803f54c176fe181752f90afe27366251439592e58638 SHA512 6b884773a0e854724b1e32f79c4c8c90fe0a7cf1b017efe7b0dbe60e81f2c8445c124eb3125cb41996ad4bd343d71f27e0f210b072f0fb89725a6375b5a3474d
+MISC metadata.xml 460 BLAKE2B 5c30cc883f9ea3feeae2148cb58741c98e182ca0fff7c28458b3cc20023321395cbeda951426d12ff469105b43689ecaaa5f9c984396b72065c70b8c99843c38 SHA512 60728fd1a2702e79a717ea3e74247ac1e5c80a586a920597d985c87f0d84b30462ef04a36713a0945147d7f2b6c01052c08722c660b02fe82c4bba0407c582b1
diff --git a/sys-apps/baselayout/baselayout-2.5-r1.ebuild b/sys-apps/baselayout/baselayout-2.5-r1.ebuild
new file mode 100644
index 000000000000..866701708dc6
--- /dev/null
+++ b/sys-apps/baselayout/baselayout-2.5-r1.ebuild
@@ -0,0 +1,272 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib versionator prefix
+
+DESCRIPTION="Filesystem baselayout and init scripts"
+HOMEPAGE="https://www.gentoo.org/"
+if [[ ${PV} = 9999 ]]; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="build kernel_FreeBSD kernel_linux +split-usr"
+
+pkg_setup() {
+	multilib_layout
+}
+
+# Create our multilib dirs - the Makefile has no knowledge of this
+multilib_layout() {
+	local def_libdir libdir libdirs
+	def_libdir=$(get_abi_LIBDIR $DEFAULT_ABI)
+	libdirs=$(get_all_libdirs)
+	: ${libdirs:=lib}	# it isn't that we don't trust multilib.eclass...
+
+	[ -z "${def_libdir}" ] && die "your DEFAULT_ABI=$DEFAULT_ABI appears to be invalid"
+
+	# figure out which paths should be symlinks and which should be directories
+	local dirs syms exp d
+	for libdir in ${libdirs} ; do
+		if use split-usr ; then
+			exp=( {,usr/,usr/local/}${libdir} )
+		else
+			exp=( {usr/,usr/local/}${libdir} )
+		fi
+		for d in "${exp[@]}" ; do
+			# most things should be dirs
+			if [ "${SYMLINK_LIB}" = "yes" ] && [ "${libdir}" = "lib" ] ; then
+				[ ! -h "${d}" ] && [ -e "${d}" ] && dirs+=" ${d}"
+			else
+				[ -h "${d}" ] && syms+=" ${d}"
+			fi
+		done
+	done
+	if [ -n "${syms}${dirs}" ] ; then
+		ewarn "Your system profile has SYMLINK_LIB=${SYMLINK_LIB:-no}, so that means you need to"
+		ewarn "have these paths configured as follows:"
+		[ -n "${dirs}" ] && ewarn "symlinks to '${def_libdir}':${dirs}"
+		[ -n "${syms}" ] && ewarn "directories:${syms}"
+		ewarn "The ebuild will attempt to fix these, but only for trivial conversions."
+		ewarn "If things fail, you will need to manually create/move the directories."
+		echo
+	fi
+
+	# setup symlinks and dirs where we expect them to be; do not migrate
+	# data ... just fall over in that case.
+	local prefix prefix_lst
+	if use split-usr ; then
+		prefix_lst=( "${EROOT}"{,usr/,usr/local/} )
+	else
+		prefix_lst=( "${EROOT}"{usr/,usr/local/} )
+	fi
+	for prefix in "${prefix_lst[@]}"; do
+		if [ "${SYMLINK_LIB}" = yes ] ; then
+			# we need to make sure "lib" points to the native libdir
+			if [ -h "${prefix}lib" ] ; then
+				# it's already a symlink!  assume it's pointing to right place ...
+				continue
+			elif [ -d "${prefix}lib" ] ; then
+				# "lib" is a dir, so need to convert to a symlink
+				ewarn "Converting ${prefix}lib from a dir to a symlink"
+				rm -f "${prefix}lib"/.keep
+				if rmdir "${prefix}lib" 2>/dev/null ; then
+					ln -s ${def_libdir} "${prefix}lib" || die
+				else
+					die "non-empty dir found where we needed a symlink: ${prefix}lib"
+				fi
+			else
+				# nothing exists, so just set it up sanely
+				ewarn "Initializing ${prefix}lib as a symlink"
+				mkdir -p "${prefix}" || die
+				rm -f "${prefix}lib" || die
+				ln -s ${def_libdir} "${prefix}lib" || die
+				mkdir -p "${prefix}${def_libdir}" #423571
+			fi
+		else
+			# we need to make sure "lib" is a dir
+			if [ -h "${prefix}lib" ] ; then
+				# "lib" is a symlink, so need to convert to a dir
+				ewarn "Converting ${prefix}lib from a symlink to a dir"
+				rm -f "${prefix}lib" || die
+				if [ -d "${prefix}lib32" ] ; then
+					ewarn "Migrating ${prefix}lib32 to ${prefix}lib"
+					mv "${prefix}lib32" "${prefix}lib" || die
+				else
+					mkdir -p "${prefix}lib" || die
+				fi
+			elif [ -d "${prefix}lib" ] && ! has lib32 ${libdirs} ; then
+				# make sure the old "lib" ABI location does not exist; we
+				# only symlinked the lib dir on systems where we moved it
+				# to "lib32" ...
+				case ${CHOST} in
+				*-gentoo-freebsd*) ;; # We want it the other way on fbsd.
+				i?86*|x86_64*|powerpc*|sparc*|s390*)
+					if [[ -d ${prefix}lib32 && ! -h ${prefix}lib32 ]] ; then
+						rm -f "${prefix}lib32"/.keep
+						if ! rmdir "${prefix}lib32" 2>/dev/null ; then
+							ewarn "You need to merge ${prefix}lib32 into ${prefix}lib"
+							die "non-empty dir found where there should be none: ${prefix}lib32"
+						fi
+					fi
+					;;
+				esac
+			else
+				# nothing exists, so just set it up sanely
+				ewarn "Initializing ${prefix}lib as a dir"
+				mkdir -p "${prefix}lib" || die
+			fi
+		fi
+	done
+	if ! use split-usr ; then
+		for libdir in ${libdirs}; do
+			if [[ ! -e "${EROOT}${libdir}" ]]; then
+				ln -s usr/"${libdir}" "${EROOT}${libdir}"
+			fi
+		done
+	fi
+}
+
+pkg_preinst() {
+	# This is written in src_install (so it's in CONTENTS), but punt all
+	# pending updates to avoid user having to do etc-update (and make the
+	# pkg_postinst logic simpler).
+	rm -f "${EROOT}"/etc/._cfg????_gentoo-release
+
+	# We need to install directories and maybe some dev nodes when building
+	# stages, but they cannot be in CONTENTS.
+	# Also, we cannot reference $S as binpkg will break so we do this.
+	multilib_layout
+	if use build ; then
+		if use split-usr ; then
+			emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout
+		else
+			emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout-usrmerge
+		fi
+	fi
+	rm -f "${ED}"/usr/share/${PN}/Makefile
+}
+
+src_prepare() {
+	default
+	if use prefix; then
+		hprefixify -e "/EUID/s,0,${EUID}," -q '"' etc/profile
+		hprefixify etc/{env.d/50baselayout,shells} share.Linux/passwd
+		echo PATH=/usr/bin:/bin >> etc/env.d/99host
+		echo ROOTPATH=/usr/sbin:/sbin:/usr/bin:/bin >> etc/env.d/99host
+	fi
+
+	# handle multilib paths.  do it here because we want this behavior
+	# regardless of the C library that you're using.  we do explicitly
+	# list paths which the native ldconfig searches, but this isn't
+	# problematic as it doesn't change the resulting ld.so.cache or
+	# take longer to generate.  similarly, listing both the native
+	# path and the symlinked path doesn't change the resulting cache.
+	local libdir ldpaths
+	for libdir in $(get_all_libdirs) ; do
+		ldpaths+=":${EPREFIX}/${libdir}:${EPREFIX}/usr/${libdir}"
+		ldpaths+=":${EPREFIX}/usr/local/${libdir}"
+	done
+	echo "LDPATH='${ldpaths#:}'" >> etc/env.d/50baselayout
+
+	# rc-scripts version for testing of features that *should* be present
+	echo "Gentoo Base System release ${PV}" > etc/gentoo-release
+}
+
+src_install() {
+	emake \
+		OS=$(usex kernel_FreeBSD BSD Linux) \
+		DESTDIR="${ED}" \
+		install
+	dodoc ChangeLog
+
+	# need the makefile in pkg_preinst
+	insinto /usr/share/${PN}
+	doins Makefile
+}
+
+pkg_postinst() {
+	local x
+
+	# We installed some files to /usr/share/baselayout instead of /etc to stop
+	# (1) overwriting the user's settings
+	# (2) screwing things up when attempting to merge files
+	# (3) accidentally packaging up personal files with quickpkg
+	# If they don't exist then we install them
+	for x in master.passwd passwd shadow group fstab ; do
+		[ -e "${EROOT}etc/${x}" ] && continue
+		[ -e "${EROOT}usr/share/baselayout/${x}" ] || continue
+		cp -p "${EROOT}usr/share/baselayout/${x}" "${EROOT}"etc
+	done
+
+	# Force shadow permissions to not be world-readable #260993
+	for x in shadow ; do
+		[ -e "${EROOT}etc/${x}" ] && chmod o-rwx "${EROOT}etc/${x}"
+	done
+
+	# Take care of the etc-update for the user
+	if [ -e "${EROOT}"etc/._cfg0000_gentoo-release ] ; then
+		mv "${EROOT}"etc/._cfg0000_gentoo-release "${EROOT}"etc/gentoo-release
+	fi
+
+	# whine about users that lack passwords #193541
+	if [[ -e "${EROOT}"etc/shadow ]] ; then
+		local bad_users=$(sed -n '/^[^:]*::/s|^\([^:]*\)::.*|\1|p' "${EROOT}"/etc/shadow)
+		if [[ -n ${bad_users} ]] ; then
+			echo
+			ewarn "The following users lack passwords!"
+			ewarn ${bad_users}
+		fi
+	fi
+
+	# whine about users with invalid shells #215698
+	if [[ -e "${EROOT}"etc/passwd ]] ; then
+		local bad_shells=$(awk -F: 'system("test -e " $7) { print $1 " - " $7}' "${EROOT}"etc/passwd | sort)
+		if [[ -n ${bad_shells} ]] ; then
+			echo
+			ewarn "The following users have non-existent shells!"
+			ewarn "${bad_shells}"
+		fi
+	fi
+
+	# https://bugs.gentoo.org/361349
+	if use kernel_linux; then
+		mkdir -p "${EROOT}"run
+
+		local found fstype mountpoint
+		while read -r _ mountpoint fstype _; do
+		[[ ${mountpoint} = /run ]] && [[ ${fstype} = tmpfs ]] && found=1
+		done < "${ROOT}"proc/mounts
+		[[ -z ${found} ]] &&
+			ewarn "You should reboot now to get /run mounted with tmpfs!"
+	fi
+
+	for x in ${REPLACING_VERSIONS}; do
+		if ! version_is_at_least 2.4 ${x}; then
+			ewarn "After updating ${EROOT}etc/profile, please run"
+			ewarn "env-update && . /etc/profile"
+		fi
+
+		if ! version_is_at_least 2.5 ${x}; then
+			ewarn "Please run env-update then log out and back in to"
+			ewarn "update your path."
+		fi
+		# clean up after 2.5 typos
+		# https://bugs.gentoo.org/show_bug.cgi?id=656380
+		if [[ ${x} == 2.5 ]]; then
+			rm -fr "${EROOT}{,usr"
+		fi
+	done
+
+	if [[ -e "${EROOT}"etc/env.d/00basic ]]; then
+		ewarn "${EROOT}etc/env.d/00basic is now ${EROOT}etc/env.d/50baselayout"
+		ewarn "Please migrate your changes."
+	fi
+}
diff --git a/sys-apps/baselayout/baselayout-9999.ebuild b/sys-apps/baselayout/baselayout-9999.ebuild
index cef8791471ae..866701708dc6 100644
--- a/sys-apps/baselayout/baselayout-9999.ebuild
+++ b/sys-apps/baselayout/baselayout-9999.ebuild
@@ -17,7 +17,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="build kernel_FreeBSD kernel_linux usrmerge"
+IUSE="build kernel_FreeBSD kernel_linux +split-usr"
 
 pkg_setup() {
 	multilib_layout
@@ -35,7 +35,7 @@ multilib_layout() {
 	# figure out which paths should be symlinks and which should be directories
 	local dirs syms exp d
 	for libdir in ${libdirs} ; do
-		if ! use usrmerge ; then
+		if use split-usr ; then
 			exp=( {,usr/,usr/local/}${libdir} )
 		else
 			exp=( {usr/,usr/local/}${libdir} )
@@ -62,12 +62,12 @@ multilib_layout() {
 	# setup symlinks and dirs where we expect them to be; do not migrate
 	# data ... just fall over in that case.
 	local prefix prefix_lst
-	if ! use usrmerge ; then
-		prefix_lst="${EROOT}"{,usr/,usr/local/}
+	if use split-usr ; then
+		prefix_lst=( "${EROOT}"{,usr/,usr/local/} )
 	else
-		prefix_lst="${EROOT}"{usr/,usr/local/}
+		prefix_lst=( "${EROOT}"{usr/,usr/local/} )
 	fi
-	for prefix in "${prefix_lst}"; do
+	for prefix in "${prefix_lst[@]}"; do
 		if [ "${SYMLINK_LIB}" = yes ] ; then
 			# we need to make sure "lib" points to the native libdir
 			if [ -h "${prefix}lib" ] ; then
@@ -125,7 +125,7 @@ multilib_layout() {
 			fi
 		fi
 	done
-	if use usrmerge ; then
+	if ! use split-usr ; then
 		for libdir in ${libdirs}; do
 			if [[ ! -e "${EROOT}${libdir}" ]]; then
 				ln -s usr/"${libdir}" "${EROOT}${libdir}"
@@ -145,7 +145,7 @@ pkg_preinst() {
 	# Also, we cannot reference $S as binpkg will break so we do this.
 	multilib_layout
 	if use build ; then
-		if ! use usrmerge ; then
+		if use split-usr ; then
 			emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout
 		else
 			emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout-usrmerge
@@ -258,6 +258,11 @@ pkg_postinst() {
 			ewarn "Please run env-update then log out and back in to"
 			ewarn "update your path."
 		fi
+		# clean up after 2.5 typos
+		# https://bugs.gentoo.org/show_bug.cgi?id=656380
+		if [[ ${x} == 2.5 ]]; then
+			rm -fr "${EROOT}{,usr"
+		fi
 	done
 
 	if [[ -e "${EROOT}"etc/env.d/00basic ]]; then
diff --git a/sys-apps/baselayout/metadata.xml b/sys-apps/baselayout/metadata.xml
index 452b01304667..8a7288dd9a89 100644
--- a/sys-apps/baselayout/metadata.xml
+++ b/sys-apps/baselayout/metadata.xml
@@ -10,6 +10,6 @@
 	<name>Gentoo Base System</name>
 </maintainer>
 <use>
-	<flag name="usrmerge">Activate the /usr merge when stages are built</flag>
+	<flag name="split-usr">Enable this if /bin and /usr/bin are separate directories</flag>
 </use>
 </pkgmetadata>
diff --git a/sys-apps/checkpolicy/Manifest b/sys-apps/checkpolicy/Manifest
index a918aad621bf..dd715ffffc31 100644
--- a/sys-apps/checkpolicy/Manifest
+++ b/sys-apps/checkpolicy/Manifest
@@ -1,12 +1,6 @@
-DIST checkpolicy-2.6.tar.gz 69748 BLAKE2B d3cb4580a553b211c483eefb9437d81398a30cbe870712b86b659402e36079d45bd746e22498dfe965635f5678016012db51dc417aec6fa5b34fe8268616704b SHA512 1d8361a5735410909be7fe5a54740e0e1b6339d0fbad9965f3ae2902e7eaaec7531fec1dd73bb57b28ad933773778ab50b97db3d92aacf5fac3b63d1ed364b46
 DIST checkpolicy-2.7.tar.gz 65967 BLAKE2B 6918187363cd74a1a23df41f0af23a2231c7087c696d3935db65db4c6750cf7dfa7613b1d569dc76b80f9781fed9f58ef8d41e6ed4325086a10fb322f7f8f754 SHA512 fba8a4132f90c98f8222de563dc15aac1b739d3a6207779b6a4715d2813e7553081351c54f42371a1b704a1f5038d40821b61213c4ad53eb705823975858cf7f
-DIST checkpolicy-2.8-rc1.tar.gz 66260 BLAKE2B 8b9d02c07ad51afd1db81bb0679c9a9729c0f1457c36c3f53d58b8927a6ee488fc0884c853f252fc871e54b5b3300798a8adf5c6770ceef63fa69cbfa4668d80 SHA512 a13d8abba9a10257d7b9b917754fecf21518d2cdf094508dca1028d24f19763f6ba71cf7dd8a654633152316a6ec618a488598d8ba6cda2960039f101745b57c
-DIST checkpolicy-2.8-rc2.tar.gz 66262 BLAKE2B 88be634685ddd3d299184c95337f78995420b1440e55dfd529936dd8eae84a7e3b48374f67ffe13895e6e17af435b790ad441f5b02bd8e26a11c4e520956ef57 SHA512 5a5f1023f5f8f35d4a1e4921826c2e3cc4a3259340e62a3f554a8ea073d9c6807e8bffc4d4278fdfd5f21a69b7e23ad4aa7ef058298e69edb1d33e5930d75adf
-DIST checkpolicy-2.8-rc3.tar.gz 66261 BLAKE2B ade05091ccd641e3c92e5f1fd8dfe54f7c419aa64c78deb729c7dbd6a70876d71611ff7d8143eb4ab6b6e46a40ad88654d041e1fc61c3e25073df8d265f98bfa SHA512 6e59c08704bd658e507ff1738caa0c810cb2b21677d6aa8d43d84b9411647e0f9a1f876ebe4ccbeef9d97a343e1b2bdd0e8a42b83d9c70fcd49dcdb8381a5696
-EBUILD checkpolicy-2.6.ebuild 1170 BLAKE2B 0bead9d12eddedfc9972ff41ceae1027e4d6d8451630146a9ff93dbaeb2217fbe1121b41bd1e46bf47d30f39a481d2b133f1529b50969dffece1e88e3451fd31 SHA512 756f3191add673f5ae35e27997f88584d026a663ef12c943f3bdc57a1c0679c18cf0f26300d0e568b8c2f707fd7e3001f5c79cbe6fcfda0f509cee200660cf84
+DIST checkpolicy-2.8.tar.gz 66243 BLAKE2B cd4b5ead13606df9888260a15d982eb43d59c659a6f021a18c598657b2a07de5e70a9eacee6528855f26256d26b27bd8bec27b95a7366cf2e44ba5d426369582 SHA512 d1a52dffefcc8f9f879214290f01beb5f4978f1764ab6378ee03a62ef924206b9a6f6a512001ae556034ababcd3a0043d455f5aef66b5629a4f152cd2c9f0b7a
 EBUILD checkpolicy-2.7.ebuild 1232 BLAKE2B a2375ca69a96de38a648904261277d54222ef50fcef3722deaa9430995c62a8adcd24cc06a9b86b868f932d95b5acb27e076115ad73b0e76f6e9630f37e3e38f SHA512 b671810da7baedcd74e6456f53cdd63afdf73cbedab7d5f942023534d863aef4d536ff8e6acf370964352707a86c0b72bd3530601025aa27f96395b29ff3c1f8
-EBUILD checkpolicy-2.8_rc1.ebuild 1189 BLAKE2B 58de5b771ec9c5098a343bf861ffa159faef221c8a1305f7cabe3d1463cf80b2a00f6f74d60ad46a14deb00251142eeaa787f5034663f37fa42bc15caa42698a SHA512 d5585a561cc0075db28577190f6478b1f99f9722212d5909b506643527eac1aea1a890b0be8ae567f2768542b90cc038409312b9aff275d7e14eb9dcdf52b6e1
-EBUILD checkpolicy-2.8_rc2.ebuild 1189 BLAKE2B 4e914607831d4438ddbbc074aff38dd6c72d98b7eee130ed78d8595e7407abb86657fa3ce1d974efcab32f987284bfb060393600aff9baecd48e257477dd2d77 SHA512 463b138c13b6ca03056aa3c98289356df96ed6a6f5ecceaf1c227b4d8d84b83058db4cfec0ea25562440629da5ae97b64536c1ced7082b61fa54bb7281bc1090
-EBUILD checkpolicy-2.8_rc3.ebuild 1189 BLAKE2B bc063ece296eb8bf7e179d779d22ac5cb15a095f819e520cadeee8ee384e4ccb553871ffec176aee56914c0473d426afaa5246d64f98db2e2c5c773d0ec272aa SHA512 60b96b571d46fe7a32077f5b82963ac5a4138e98d4ecb7ad4f29de2861a8872267f2a3fad443de5df0468d1573ba6f3c484d5e553e80725e99ec6f68d1245f34
-EBUILD checkpolicy-9999.ebuild 1189 BLAKE2B bc063ece296eb8bf7e179d779d22ac5cb15a095f819e520cadeee8ee384e4ccb553871ffec176aee56914c0473d426afaa5246d64f98db2e2c5c773d0ec272aa SHA512 60b96b571d46fe7a32077f5b82963ac5a4138e98d4ecb7ad4f29de2861a8872267f2a3fad443de5df0468d1573ba6f3c484d5e553e80725e99ec6f68d1245f34
+EBUILD checkpolicy-2.8.ebuild 1189 BLAKE2B 868ae87c0d8b18c1a05eda749727c4c5c8a2814f8b8d50087d0ea45330829c33ab9f7aac2d9f551bbe0f9b57922357db1623d60bbf79bf7462005cd9a9f3b2a2 SHA512 4810db1d1a63e4836ef1f239b47ee7f4359e3d3eeb6d0d698cf529c8ef11af4475b56d10decc3c61b5fceba572d12e7ec8b5135653ce84dec21a04ec4c40e3e1
+EBUILD checkpolicy-9999.ebuild 1189 BLAKE2B 868ae87c0d8b18c1a05eda749727c4c5c8a2814f8b8d50087d0ea45330829c33ab9f7aac2d9f551bbe0f9b57922357db1623d60bbf79bf7462005cd9a9f3b2a2 SHA512 4810db1d1a63e4836ef1f239b47ee7f4359e3d3eeb6d0d698cf529c8ef11af4475b56d10decc3c61b5fceba572d12e7ec8b5135653ce84dec21a04ec4c40e3e1
 MISC metadata.xml 308 BLAKE2B 9147e4199ebd94dc7cb5d04986bae70ecc5bedf765fa6295546b894df249fa074c66e96a7d788295d912f49e9b0c5c305eb404c98d9b04646ab12a7597d4877f SHA512 e07f79eaa348cc35ebb4eac966f6b59ff87cde6c2b9694ac996da971c45aed834f34b8a9325b205fdfe590d7add0d46013cc551af166a9ca2ca59e0feffbc9bb
diff --git a/sys-apps/checkpolicy/checkpolicy-2.6.ebuild b/sys-apps/checkpolicy/checkpolicy-2.6.ebuild
deleted file mode 100644
index 9f6ccc4d75b2..000000000000
--- a/sys-apps/checkpolicy/checkpolicy-2.6.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs
-
-MY_P="${P//_/-}"
-MY_RELEASEDATE="20161014"
-
-SEPOL_VER="${PV}"
-SEMNG_VER="${PV}"
-
-DESCRIPTION="SELinux policy compiler"
-HOMEPAGE="http://userspace.selinuxproject.org"
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
-	S="${WORKDIR}/${MY_P}/${PN}"
-else
-	SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug"
-
-DEPEND=">=sys-libs/libsepol-${SEPOL_VER}
-	>=sys-libs/libsemanage-${SEMNG_VER}
-	sys-devel/flex
-	sys-devel/bison"
-
-RDEPEND=">=sys-libs/libsemanage-${SEMNG_VER}"
-
-src_compile() {
-	emake CC="$(tc-getCC)" YACC="bison -y" LIBDIR="\$(PREFIX)/$(get_libdir)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	if use debug; then
-		dobin "${S}/test/dismod"
-		dobin "${S}/test/dispol"
-	fi
-}
-
-pkg_postinst() {
-	einfo "This checkpolicy can compile version `checkpolicy -V |cut -f 1 -d ' '` policy."
-}
diff --git a/sys-apps/checkpolicy/checkpolicy-2.8_rc3.ebuild b/sys-apps/checkpolicy/checkpolicy-2.8.ebuild
index 2a50f93eeeb3..bd892103a73b 100644
--- a/sys-apps/checkpolicy/checkpolicy-2.8_rc3.ebuild
+++ b/sys-apps/checkpolicy/checkpolicy-2.8.ebuild
@@ -6,7 +6,7 @@ EAPI="6"
 inherit toolchain-funcs
 
 MY_P="${P//_/-}"
-MY_RELEASEDATE="20180510"
+MY_RELEASEDATE="20180524"
 
 SEPOL_VER="${PV}"
 SEMNG_VER="${PV}"
diff --git a/sys-apps/checkpolicy/checkpolicy-2.8_rc1.ebuild b/sys-apps/checkpolicy/checkpolicy-2.8_rc1.ebuild
deleted file mode 100644
index 66c08af1f9e2..000000000000
--- a/sys-apps/checkpolicy/checkpolicy-2.8_rc1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs
-
-MY_P="${P//_/-}"
-MY_RELEASEDATE="20180419"
-
-SEPOL_VER="${PV}"
-SEMNG_VER="${PV}"
-
-DESCRIPTION="SELinux policy compiler"
-HOMEPAGE="http://userspace.selinuxproject.org"
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
-	S="${WORKDIR}/${MY_P}/${PN}"
-else
-	SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug"
-
-DEPEND=">=sys-libs/libsepol-${SEPOL_VER}
-	>=sys-libs/libsemanage-${SEMNG_VER}
-	sys-devel/flex
-	sys-devel/bison"
-
-RDEPEND=">=sys-libs/libsemanage-${SEMNG_VER}"
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		YACC="bison -y" \
-		LIBDIR="\$(PREFIX)/$(get_libdir)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		install
-
-	if use debug; then
-		dobin "${S}/test/dismod"
-		dobin "${S}/test/dispol"
-	fi
-}
-
-pkg_postinst() {
-	einfo "This checkpolicy can compile version `checkpolicy -V | cut -f 1 -d ' '` policy."
-}
diff --git a/sys-apps/checkpolicy/checkpolicy-2.8_rc2.ebuild b/sys-apps/checkpolicy/checkpolicy-2.8_rc2.ebuild
deleted file mode 100644
index 6dc34b79d2e9..000000000000
--- a/sys-apps/checkpolicy/checkpolicy-2.8_rc2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs
-
-MY_P="${P//_/-}"
-MY_RELEASEDATE="20180426"
-
-SEPOL_VER="${PV}"
-SEMNG_VER="${PV}"
-
-DESCRIPTION="SELinux policy compiler"
-HOMEPAGE="http://userspace.selinuxproject.org"
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
-	S="${WORKDIR}/${MY_P}/${PN}"
-else
-	SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug"
-
-DEPEND=">=sys-libs/libsepol-${SEPOL_VER}
-	>=sys-libs/libsemanage-${SEMNG_VER}
-	sys-devel/flex
-	sys-devel/bison"
-
-RDEPEND=">=sys-libs/libsemanage-${SEMNG_VER}"
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		YACC="bison -y" \
-		LIBDIR="\$(PREFIX)/$(get_libdir)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		install
-
-	if use debug; then
-		dobin "${S}/test/dismod"
-		dobin "${S}/test/dispol"
-	fi
-}
-
-pkg_postinst() {
-	einfo "This checkpolicy can compile version `checkpolicy -V | cut -f 1 -d ' '` policy."
-}
diff --git a/sys-apps/checkpolicy/checkpolicy-9999.ebuild b/sys-apps/checkpolicy/checkpolicy-9999.ebuild
index 2a50f93eeeb3..bd892103a73b 100644
--- a/sys-apps/checkpolicy/checkpolicy-9999.ebuild
+++ b/sys-apps/checkpolicy/checkpolicy-9999.ebuild
@@ -6,7 +6,7 @@ EAPI="6"
 inherit toolchain-funcs
 
 MY_P="${P//_/-}"
-MY_RELEASEDATE="20180510"
+MY_RELEASEDATE="20180524"
 
 SEPOL_VER="${PV}"
 SEMNG_VER="${PV}"
diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index f07b0a940879..cc4aa1f14ad9 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -1,14 +1,8 @@
-DIST coreutils-8.26-man.tar.xz 43608 BLAKE2B 3d87ae424117a2bbe11e912837af3000b0049e9b9f3478a292e758169d8d987a295a4bd1c19d9492dc528dbb7c4f8de6926f96b8e269f7d21b6a4fd528fed72f SHA512 33fe9f370b0d2a59217b5a40a47f5f673669b9975baf2793f45a05117fe4c04ab9f05be68cf419a761b20e21c13d9a15b35322cecc81b7b9a1c8c534960432cf
-DIST coreutils-8.26-patches-1.1.tar.xz 7184 BLAKE2B 4c42feebbe1c1d816e29db3196010c8b078c417a113887f549b17c0ea5cf3230d93a251f90fb914498d6448b5e4b4bbf6fb1a1e758abae68607be43571a8a48d SHA512 ed8b9af1f76484549b63eb3ad4818a6649117ff1efbda2231f8741d149f0ee67438d09b6b2ea7b461aef36c346f17e3ee9a7328766a4c01d1b2b7d3e157f4455
-DIST coreutils-8.26.tar.xz 5810244 BLAKE2B fec86f4c531370518d032345d1c6b9a73e01b3153960af6543d8967af0cb71e2165c36e8909a0f786de05ec1f599aa80bd47ee56933d29ed51e6d3ac76861b9c SHA512 1ca7b32a1564855e672f64cb815f858619dd4308af1c9763959d06fab1ecd51385c4c61d987ceec7ff6baaaac699f2db10be4be7e40b2c6a6d4ffc3911180b03
 DIST coreutils-8.28-man.tar.xz 43832 BLAKE2B 18ea22a89daac64444da8b91c82c62e4c6dfe27e0e9c2d2ec1de4dc9c3ee44fb91f197e3122803a8a18c2619c6daf683e0b3b07c36e0e9b8dd73c2cdf44ba6b7 SHA512 363cf595e0f6fc69eb6a9d1ca258a5f012404cee99887494ab6e40fe2c6de5e49e7cad953aecb394c5612043efe6b407e657811d8251b10e159c97b849dd8b3e
-DIST coreutils-8.28-patches-1.0.tar.xz 7264 BLAKE2B c86ec707aaaef7f65867af96d69251542f007fe0f644908b4567890f8ee2ca31222be7c208b76cfcd3e4c1364d27ef09427674f3f6eff3335d5fe822fdf5fd99 SHA512 b358b827eaff789ea8a3838f53f81efb08a6caa5318ac93dab112ec90052174c05d219e1c0170106bb1ed65bd4e37ffc36b742bf3661cc64ee4b166db741bbbc
 DIST coreutils-8.28-patches-1.1.tar.xz 7336 BLAKE2B 9cd5db3e1d5545da5cb38f919ae5528d8642efb7f7e11994c6603f49b097f0f804cf1553dfce65682f9d725964cd6a3d142916cbc018f707cc617ad8c9b9f471 SHA512 af47aaa614550e5cd82b2386fafd9f90beb0564b8bbedfe92238906e7c6f040fb7468c1929f0951d4f98038b6e1df7da2408204be78219e6a041658507385957
 DIST coreutils-8.28.tar.xz 5252336 BLAKE2B 30e3c05311834b19a941ddaa6a405cb0033b0e3518211dd0d33e9a1aa91c60f4d597fca9419b467ade2b54e3bf81ba5149cebfc93a02fa1e546c1b0f71ee91c9 SHA512 1e592d0dd03b9227bf92af9a82bed6dc3bcbee46e984c7fb09833dea0962e86b309aa34d5e43823b73d4522c066bfa5cdc8ec694aa190910fb246ff32ceb63a1
 DIST coreutils-8.29-patches-1.0.tar.xz 5772 BLAKE2B 8f05185404d527ad524684231f0b8bef3b65e7752527b6bf55371f474035b8a92cdcaa8349a321784d14c6700a0d49e9d10ee2e3a96b78e8f6423ee8c5b9ec02 SHA512 0f7db6744a6a6bad8d582bb2d32e1a0ad0ab5f48a53b54c371d27494967832ddec2570e45dbf7e66c7091496bcecd66aab21644f603d2c8878a87f51a1a9b1a2
 DIST coreutils-8.29.tar.xz 5286588 BLAKE2B cbb66d9054bdd2db5b9a6010876484b16d178f8f4d935836b1e42830178647fac4e0a75052a6e7e2fbc50e74e4e7ff6f8da43f1137b96d0c2d027c4ebac28a98 SHA512 546bbcd5741beae7a68e7c4ca14d6d634f7c8be87feecdeddd00e226f4865bb89d503437c3a95622ba7bb0cb70addbb5bdf3767fa18d0b7410ab90ee53b29dfd
-EBUILD coreutils-8.26.ebuild 5858 BLAKE2B 9247499208fc8e9155b0b107dea5cd99b7e1da3ebc55c2cac9c25c4939d7a522afb8de33398169635c678fae8a0f58ee981d9542074e47aa0a6fe56041ae478e SHA512 fc8a6d01fb2e3885b876756dbc0c4a78e0300d470ca2e845de5045f6dc79f8d004b7069ca5df40bfee05662bbc01d05107ad793c868e2b6451b757fb2e149e14
 EBUILD coreutils-8.28-r1.ebuild 6516 BLAKE2B cce086ffecc713b04301bbd498bca6cce4bb501d2d80ab93fa9dfd86b3e88c62ea79f652385a789b09f4e02f66a6a500637ff9d393f4c3294c1005f018de04be SHA512 8df28ce72003cd7f890f252b1f62addd0c80b2ed3b6599cde3cde7d25478923fb9848783c8ff5e88c91f75ba3c879e89d0e955acaa8467583cddc00630b57ad9
-EBUILD coreutils-8.28.ebuild 5871 BLAKE2B de4df961f1615d7acec165054e2118b81eb091d09ba7bdb773bb6592234643312713d78d09ad9def4cea37e0f41618426b089e4b5f4e9f14f95d751f1f90cc4b SHA512 e3f725bf850b21e6881465b29dca4984dc61a6cf0efc24f7c5ae970142cee83cdfd3fd1a8a8ab8801a66d99e40acffe655c6739c4c026c5c2deebdc19abd58bf
 EBUILD coreutils-8.29.ebuild 6063 BLAKE2B 3582ae6e941fa7d6dc47729939ebec016d6d682d616069cac70c58dc34ecf13820820191be18c353f0fc4d86bb6af7becd888024fa5cf21c718c005c26bebd90 SHA512 095b2958618e972ae9f6d04f7868acc97996a3fbd8bede850d6f215d392736cfe046ee5afb99919e10f34b1dfbcbdd501ef37880f9d6ab0a697d68e342231196
 MISC metadata.xml 869 BLAKE2B 397aa866d67eb1d6ff5f604194cf071be0f75606092d78e1cf7f0ced85cf4474d67677307e7e8566ba402c1f94ae2f3e3906ef5006a50e73d6673edb25d517fa SHA512 19e07c93cbe1cfe087eb7fdc8647aa4c264f1e6a193a0ed4e1ceb302bda92565aa76966b6ef2efa15d7535082ef0e6a1454fee20eca4797466f5de5e37ac4957
diff --git a/sys-apps/coreutils/coreutils-8.26.ebuild b/sys-apps/coreutils/coreutils-8.26.ebuild
deleted file mode 100644
index 6b9584bd0abd..000000000000
--- a/sys-apps/coreutils/coreutils-8.26.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# To generate the man pages, unpack the upstream tarball and run:
-# ./configure --enable-install-program=arch,coreutils,hostname,kill
-# make
-# cd ..
-# tar cf - coreutils-*/man/*.[0-9] | xz > coreutils-<ver>-man.tar.xz
-
-EAPI=5
-
-inherit eutils flag-o-matic toolchain-funcs
-
-PATCH_VER="1.1"
-DESCRIPTION="Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)"
-HOMEPAGE="https://www.gnu.org/software/coreutils/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
-	mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz
-	https://dev.gentoo.org/~polynomial-c/dist/${P}-patches-${PATCH_VER}.tar.xz
-	mirror://gentoo/${P}-man.tar.xz
-	https://dev.gentoo.org/~polynomial-c/dist/${P}-man.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
-IUSE="acl caps gmp hostname kill multicall nls selinux static userland_BSD vanilla xattr"
-
-LIB_DEPEND="acl? ( sys-apps/acl[static-libs] )
-	caps? ( sys-libs/libcap )
-	gmp? ( dev-libs/gmp:=[static-libs] )
-	xattr? ( !userland_BSD? ( sys-apps/attr[static-libs] ) )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs]} )
-	selinux? ( sys-libs/libselinux )
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-	app-arch/xz-utils"
-RDEPEND+="
-	hostname? ( !sys-apps/net-tools[hostname] )
-	kill? (
-		!sys-apps/util-linux[kill]
-		!sys-process/procps[kill]
-	)
-	!app-misc/realpath
-	!<sys-apps/util-linux-2.13
-	!sys-apps/stat
-	!net-mail/base64
-	!sys-apps/mktemp
-	!<app-forensics/tct-1.18-r1
-	!<net-fs/netatalk-2.0.3-r4"
-
-src_prepare() {
-	if ! use vanilla ; then
-		use_if_iuse unicode || rm -f "${WORKDIR}"/patch/000_all_coreutils-i18n.patch
-		EPATCH_SUFFIX="patch" \
-		PATCHDIR="${WORKDIR}/patch" \
-		EPATCH_EXCLUDE="001_all_coreutils-gen-progress-bar.patch" \
-		epatch
-	fi
-
-	# Since we've patched many .c files, the make process will try to
-	# re-build the manpages by running `./bin --help`.  When doing a
-	# cross-compile, we can't do that since 'bin' isn't a native bin.
-	# Also, it's not like we changed the usage on any of these things,
-	# so let's just update the timestamps and skip the help2man step.
-	set -- man/*.x
-	touch ${@/%x/1}
-
-	# Avoid perl dep for compiled in dircolors default #348642
-	if ! has_version dev-lang/perl ; then
-		touch src/dircolors.h
-		touch ${@/%x/1}
-	fi
-}
-
-src_configure() {
-	local myconf=''
-	if tc-is-cross-compiler && [[ ${CHOST} == *linux* ]] ; then
-		export fu_cv_sys_stat_statfs2_bsize=yes #311569
-		export gl_cv_func_realpath_works=yes #416629
-	fi
-
-	export gl_cv_func_mknod_works=yes #409919
-	use static && append-ldflags -static && sed -i '/elf_sys=yes/s:yes:no:' configure #321821
-	use selinux || export ac_cv_{header_selinux_{context,flash,selinux}_h,search_setfilecon}=no #301782
-	use userland_BSD && myconf="${myconf} -program-prefix=g --program-transform-name=s/stat/nustat/"
-	# kill/uptime - procps
-	# groups/su   - shadow
-	# hostname    - net-tools
-	econf \
-		--with-packager="Gentoo" \
-		--with-packager-version="${PVR} (p${PATCH_VER:-0})" \
-		--with-packager-bug-reports="https://bugs.gentoo.org/" \
-		--enable-install-program="arch,$(usev hostname),$(usev kill)" \
-		--enable-no-install-program="groups,$(usev !hostname),$(usev !kill),su,uptime" \
-		--enable-largefile \
-		$(use caps || echo --disable-libcap) \
-		$(use_enable nls) \
-		$(use_enable acl) \
-		$(use_enable multicall single-binary) \
-		$(use_enable xattr) \
-		$(use_with gmp) \
-		${myconf}
-}
-
-src_test() {
-	# Non-root tests will fail if the full path isn't
-	# accessible to non-root users
-	chmod -R go-w "${WORKDIR}"
-	chmod a+rx "${WORKDIR}"
-
-	# coreutils tests like to do `mount` and such with temp dirs
-	# so make sure /etc/mtab is writable #265725
-	# make sure /dev/loop* can be mounted #269758
-	mkdir -p "${T}"/mount-wrappers
-	mkwrap() {
-		local w ww
-		for w in "$@" ; do
-			ww="${T}/mount-wrappers/${w}"
-			cat <<-EOF > "${ww}"
-				#!${EPREFIX}/bin/sh
-				exec env SANDBOX_WRITE="\${SANDBOX_WRITE}:/etc/mtab:/dev/loop" $(type -P $w) "\$@"
-			EOF
-			chmod a+rx "${ww}"
-		done
-	}
-	mkwrap mount umount
-
-	addwrite /dev/full
-	#export RUN_EXPENSIVE_TESTS="yes"
-	#export FETISH_GROUPS="portage wheel"
-	env PATH="${T}/mount-wrappers:${PATH}" \
-	emake -j1 -k check
-}
-
-src_install() {
-	default
-
-	insinto /etc
-	newins src/dircolors.hin DIR_COLORS
-
-	if [[ ${USERLAND} == "GNU" ]] ; then
-		cd "${ED}"/usr/bin || die
-		dodir /bin
-		# move critical binaries into /bin (required by FHS)
-		local fhs="cat chgrp chmod chown cp date dd df echo false ln ls
-		           mkdir mknod mv pwd rm rmdir stty sync true uname"
-		mv ${fhs} ../../bin/ || die "could not move fhs bins"
-		if use kill; then
-			mv kill ../../bin/ || die
-		fi
-		# move critical binaries into /bin (common scripts)
-		local com="basename chroot cut dir dirname du env expr head mkfifo
-		           mktemp readlink seq sleep sort tail touch tr tty vdir wc yes"
-		mv ${com} ../../bin/ || die "could not move common bins"
-		# create a symlink for uname in /usr/bin/ since autotools require it
-		local x
-		for x in ${com} uname ; do
-			dosym ../../bin/${x} /usr/bin/${x}
-		done
-	else
-		# For now, drop the man pages, collides with the ones of the system.
-		rm -rf "${ED}"/usr/share/man
-	fi
-
-}
-
-pkg_postinst() {
-	ewarn "Make sure you run 'hash -r' in your active shells."
-	ewarn "You should also re-source your shell settings for LS_COLORS"
-	ewarn "  changes, such as: source /etc/profile"
-
-	# Help out users using experimental filesystems
-	if grep -qs btrfs "${EROOT}"/etc/fstab /proc/mounts ; then
-		case $(uname -r) in
-		2.6.[12][0-9]|2.6.3[0-7]*)
-			ewarn "You are running a system with a buggy btrfs driver."
-			ewarn "Please upgrade your kernel to avoid silent corruption."
-			ewarn "See: https://bugs.gentoo.org/353907"
-			;;
-		esac
-	fi
-}
diff --git a/sys-apps/coreutils/coreutils-8.28.ebuild b/sys-apps/coreutils/coreutils-8.28.ebuild
deleted file mode 100644
index a93f4f9f3acb..000000000000
--- a/sys-apps/coreutils/coreutils-8.28.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# To generate the man pages, unpack the upstream tarball and run:
-# ./configure --enable-install-program=arch,coreutils,hostname,kill
-# make
-# cd ..
-# tar cf - coreutils-*/man/*.[0-9] | xz > coreutils-<ver>-man.tar.xz
-
-EAPI=6
-
-inherit eutils flag-o-matic toolchain-funcs
-
-PATCH_VER="1.0"
-DESCRIPTION="Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)"
-HOMEPAGE="https://www.gnu.org/software/coreutils/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
-	mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz
-	https://dev.gentoo.org/~polynomial-c/dist/${P}-patches-${PATCH_VER}.tar.xz
-	mirror://gentoo/${P}-man.tar.xz
-	https://dev.gentoo.org/~polynomial-c/dist/${P}-man.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
-IUSE="acl caps gmp hostname kill multicall nls selinux static userland_BSD vanilla xattr"
-
-LIB_DEPEND="acl? ( sys-apps/acl[static-libs] )
-	caps? ( sys-libs/libcap )
-	gmp? ( dev-libs/gmp:=[static-libs] )
-	xattr? ( !userland_BSD? ( sys-apps/attr[static-libs] ) )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs]} )
-	selinux? ( sys-libs/libselinux )
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-	app-arch/xz-utils"
-RDEPEND+="
-	hostname? ( !sys-apps/net-tools[hostname] )
-	kill? (
-		!sys-apps/util-linux[kill]
-		!sys-process/procps[kill]
-	)
-	!app-misc/realpath
-	!<sys-apps/util-linux-2.13
-	!<sys-apps/sandbox-2.10-r4
-	!sys-apps/stat
-	!net-mail/base64
-	!sys-apps/mktemp
-	!<app-forensics/tct-1.18-r1
-	!<net-fs/netatalk-2.0.3-r4"
-
-src_prepare() {
-	if ! use vanilla ; then
-		use_if_iuse unicode || rm -f "${WORKDIR}"/patch/000_all_coreutils-i18n.patch
-		#rm "${WORKDIR}"/patch/001_all_coreutils-gen-progress-bar.patch || die
-		eapply "${WORKDIR}"/patch/*.patch
-	fi
-
-	eapply_user
-
-	# Since we've patched many .c files, the make process will try to
-	# re-build the manpages by running `./bin --help`.  When doing a
-	# cross-compile, we can't do that since 'bin' isn't a native bin.
-	# Also, it's not like we changed the usage on any of these things,
-	# so let's just update the timestamps and skip the help2man step.
-	set -- man/*.x
-	touch ${@/%x/1}
-
-	# Avoid perl dep for compiled in dircolors default #348642
-	if ! has_version dev-lang/perl ; then
-		touch src/dircolors.h
-		touch ${@/%x/1}
-	fi
-}
-
-src_configure() {
-	local myconf=(
-		--with-packager="Gentoo"
-		--with-packager-version="${PVR} (p${PATCH_VER:-0})"
-		--with-packager-bug-reports="https://bugs.gentoo.org/"
-		--enable-install-program="arch,$(usev hostname),$(usev kill)"
-		--enable-no-install-program="groups,$(usev !hostname),$(usev !kill),su,uptime"
-		--enable-largefile
-		$(use caps || echo --disable-libcap)
-		$(use_enable nls)
-		$(use_enable acl)
-		$(use_enable multicall single-binary)
-		$(use_enable xattr)
-		$(use_with gmp)
-	)
-	if tc-is-cross-compiler && [[ ${CHOST} == *linux* ]] ; then
-		export fu_cv_sys_stat_statfs2_bsize=yes #311569
-		export gl_cv_func_realpath_works=yes #416629
-	fi
-
-	export gl_cv_func_mknod_works=yes #409919
-	use static && append-ldflags -static && sed -i '/elf_sys=yes/s:yes:no:' configure #321821
-	use selinux || export ac_cv_{header_selinux_{context,flash,selinux}_h,search_setfilecon}=no #301782
-	use userland_BSD && myconf+=( -program-prefix=g --program-transform-name=s/stat/nustat/ )
-	# kill/uptime - procps
-	# groups/su   - shadow
-	# hostname    - net-tools
-	econf "${myconf[@]}"
-}
-
-src_test() {
-	# Non-root tests will fail if the full path isn't
-	# accessible to non-root users
-	chmod -R go-w "${WORKDIR}"
-	chmod a+rx "${WORKDIR}"
-
-	# coreutils tests like to do `mount` and such with temp dirs
-	# so make sure /etc/mtab is writable #265725
-	# make sure /dev/loop* can be mounted #269758
-	mkdir -p "${T}"/mount-wrappers
-	mkwrap() {
-		local w ww
-		for w in "$@" ; do
-			ww="${T}/mount-wrappers/${w}"
-			cat <<-EOF > "${ww}"
-				#!${EPREFIX}/bin/sh
-				exec env SANDBOX_WRITE="\${SANDBOX_WRITE}:/etc/mtab:/dev/loop" $(type -P $w) "\$@"
-			EOF
-			chmod a+rx "${ww}"
-		done
-	}
-	mkwrap mount umount
-
-	addwrite /dev/full
-	#export RUN_EXPENSIVE_TESTS="yes"
-	#export FETISH_GROUPS="portage wheel"
-	env PATH="${T}/mount-wrappers:${PATH}" \
-	emake -j1 -k check
-}
-
-src_install() {
-	default
-
-	insinto /etc
-	newins src/dircolors.hin DIR_COLORS
-
-	if [[ ${USERLAND} == "GNU" ]] ; then
-		cd "${ED%/}"/usr/bin || die
-		dodir /bin
-		# move critical binaries into /bin (required by FHS)
-		local fhs="cat chgrp chmod chown cp date dd df echo false ln ls
-		           mkdir mknod mv pwd rm rmdir stty sync true uname"
-		mv ${fhs} ../../bin/ || die "could not move fhs bins"
-		if use kill; then
-			mv kill ../../bin/ || die
-		fi
-		# move critical binaries into /bin (common scripts)
-		local com="basename chroot cut dir dirname du env expr head mkfifo
-		           mktemp readlink seq sleep sort tail touch tr tty vdir wc yes"
-		mv ${com} ../../bin/ || die "could not move common bins"
-		# create a symlink for uname in /usr/bin/ since autotools require it
-		local x
-		for x in ${com} uname ; do
-			dosym ../../bin/${x} /usr/bin/${x}
-		done
-	else
-		# For now, drop the man pages, collides with the ones of the system.
-		rm -rf "${ED%/}"/usr/share/man
-	fi
-
-}
-
-pkg_postinst() {
-	ewarn "Make sure you run 'hash -r' in your active shells."
-	ewarn "You should also re-source your shell settings for LS_COLORS"
-	ewarn "  changes, such as: source /etc/profile"
-
-	# Help out users using experimental filesystems
-	if grep -qs btrfs "${EROOT%/}"/etc/fstab /proc/mounts ; then
-		case $(uname -r) in
-		2.6.[12][0-9]|2.6.3[0-7]*)
-			ewarn "You are running a system with a buggy btrfs driver."
-			ewarn "Please upgrade your kernel to avoid silent corruption."
-			ewarn "See: https://bugs.gentoo.org/353907"
-			;;
-		esac
-	fi
-}
diff --git a/sys-apps/ethtool/Manifest b/sys-apps/ethtool/Manifest
index 4e97864226dd..6fc04b24537f 100644
--- a/sys-apps/ethtool/Manifest
+++ b/sys-apps/ethtool/Manifest
@@ -2,7 +2,7 @@ DIST ethtool-4.13.tar.xz 217472 BLAKE2B be60c4763a06dba4b246c17b76dd10bf956e69d1
 DIST ethtool-4.15.tar.xz 219408 BLAKE2B 7667f3e24f62c6dbaeb2590e79b59198d15ee44a46440c9af917154a5e5b6fde5f29b88ada03fdc195a642c2585c16ae503cf04b1be941d98413a596e4396ee4 SHA512 7ffd76b17b56de4182a14c2a77bf3026715f4af4c60809aed192f5631cb72173ed3c5d451e54711a73b65fee8339d58c857e83ddf60b85057bfed20863476527
 DIST ethtool-4.16.tar.xz 220676 BLAKE2B 12eb2e69493bb83b3789747a8019e3f8b7d6d39dbff7b1fc5fa6352943334881dd47c35d355d53a07ba517e91663aa623afb5ecdc1a1f57137dd44f20f492954 SHA512 c0cd28ca34e7fdc9af3335fd0b666b4b879ecbaf0c0bccf032aa36fdd66cbb01b6ddf16c6b60823d46a81f9b5f377047422ac88cc7cd0a869e239a3171966c66
 DIST ethtool-4.8.tar.xz 214932 BLAKE2B bbfbc7eb23a7fe057e28f22fad962bc8b46c581e4c6fc35612c345863b300478232b95569a2e35fd26f76eb48f824bdf7dcd0cdb8bdcc136e7494c5d39361f2b SHA512 ab1f13db57129fdef6018d8d8ee4ad9733041813aa0b7a29d46407e93d3c264a42aa24e2f1892084d523ed9946c62c6b9d2ae886629aeb013a58a0946fd6be96
-EBUILD ethtool-4.13.ebuild 454 BLAKE2B d4f846c939b66d76fd5e5aed7db87002f9b179c8b518cd7054870b90707d6cadaf2c111b65c9117faecfcdf8bbe90d2487e694b31362ca963befa4c204db5fbd SHA512 e81e7813955e1cc795288209b27562177b4b4a04c381628bb1bb9295bdddf4af852d69dc911723d33a72588353df2d75a685197fb45f04413022d387e48d06f8
+EBUILD ethtool-4.13.ebuild 453 BLAKE2B 039558a1279ee3cbfb7c11005761705fd30f8248d97cd79d089be6d7e9b27aec8f9cba28ed58bc6f80e2a33877dee10e67ddf09211d27b30371e2e2fffdfb81c SHA512 46b487cd70ed8f5bfb656a9371ef185f46761c4dcc1ad2f9cbbc20abbc5c9e2d32f6f3a52f0ae709b2444ab8514d4ada9cf66b5fdec88c342bf6ca367cd525a4
 EBUILD ethtool-4.15.ebuild 461 BLAKE2B 723e352428fe60e0a62a1f00a839061fe3c146b889336e16a9e8b4a58f64f06c9d16faba896dce89b363985f9aa3c2723e8d033123624f0060eb7c6cf4e01b18 SHA512 3d045feec342b69797788268656a4acf63f0ec35e8e8facfae70e6e930ad69352b3810c317b22bcd27151cf06692bed324ac5a08236431f1f899f512288640fc
 EBUILD ethtool-4.16.ebuild 461 BLAKE2B 723e352428fe60e0a62a1f00a839061fe3c146b889336e16a9e8b4a58f64f06c9d16faba896dce89b363985f9aa3c2723e8d033123624f0060eb7c6cf4e01b18 SHA512 3d045feec342b69797788268656a4acf63f0ec35e8e8facfae70e6e930ad69352b3810c317b22bcd27151cf06692bed324ac5a08236431f1f899f512288640fc
 EBUILD ethtool-4.8.ebuild 453 BLAKE2B 46fd2c76b13b3ac09bf91980870c7eb70a2600ea46d3146b006b54d1b21dd72bd50cd01f29504ae9329db8be393fce2cf1bd540a006278e0d2530278b3a84ca7 SHA512 f5ebf39536df9e46be717e5e42334472c7f30d02a3dd9f8b1fbab8e2242cb0c67e573fb829fbf74f115d431b777a83ebc17005150751d83f8e681e5966e8fce2
diff --git a/sys-apps/ethtool/ethtool-4.13.ebuild b/sys-apps/ethtool/ethtool-4.13.ebuild
index 9ba26876c250..4ef19eb26fcf 100644
--- a/sys-apps/ethtool/ethtool-4.13.ebuild
+++ b/sys-apps/ethtool/ethtool-4.13.ebuild
@@ -9,6 +9,6 @@ SRC_URI="mirror://kernel/software/network/ethtool/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ~ppc ppc64 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
 
 DEPEND="app-arch/xz-utils"
diff --git a/sys-apps/fakeroot/Manifest b/sys-apps/fakeroot/Manifest
index eb60acda18f3..7193d91aacc3 100644
--- a/sys-apps/fakeroot/Manifest
+++ b/sys-apps/fakeroot/Manifest
@@ -1,4 +1,3 @@
-AUX fakeroot-1.18.4-no-acl_h.patch 763 BLAKE2B c41f0fb90f549d27681b8680cad71bc76182bee731fbd143b8866fb1673a980c2557b4e38b8ad54b820ce126fd2f34839ed510cdfdbef85892fd7c55f482a6ff SHA512 a534bbd2918328bc4717256010a14218a5341cece7c4f043e8e5df0d7f671effce2bcc7fe868d333fd37472382c14d389bf302fc2d5c2651a4c45361845a6e27
 AUX fakeroot-1.19-no-acl_h.patch 915 BLAKE2B 2392343f314e5cc3fa49def14a245cf2898902d99ff2fbe4bc0a883e70ae1382ed5c4c506533545b9c428958f8e4be54e795601063d48dd8ffe9e80d56ec267a SHA512 d077e8ba2bc4407ba1a57fb5920f2a866bdcb13fa359c2245e479019bbc19a3aab398cc25220079edf7c42c4d09429e57326b606ff5795f83de24c7a31835717
 AUX fakeroot-1.20.2-glibc-2.24.patch 1021 BLAKE2B 1f907d709be9819d4d7a9113fe17d72497145bcb8e5e1b2acf43608dd03f1a2b9ee688fda8859491d79c898e6f412eded6a5c8a24734640e2479eda95319a265 SHA512 824e71169877702c5d98970d62866d5074d1a728d5bc52460483117610f50f6869f65714608313f20e40b7432ea4c50cf9f47158d8f2f9ef4a3c00220ccbd52c
 DIST fakeroot_1.20.2.orig.tar.bz2 326910 BLAKE2B 813fce6416a375de7dce0581a2a7398f023e5e5d6b981d6dd973e9e29380b5908e0bb9e1e84db3b20638933817ed85a8f7d341b369631881905aab9ca4cf2119 SHA512 1ac231f995774aa40f43c4325cd9e6de45365963277c32a85776690c3e7fd281ac410f3d91395dc1e5e5ca3b143e89914e048632011a3985ead216e870852231
diff --git a/sys-apps/fakeroot/files/fakeroot-1.18.4-no-acl_h.patch b/sys-apps/fakeroot/files/fakeroot-1.18.4-no-acl_h.patch
deleted file mode 100644
index dbd9dd7758e9..000000000000
--- a/sys-apps/fakeroot/files/fakeroot-1.18.4-no-acl_h.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-http://bugs.gentoo.org/424419
-
---- libfakeroot.c
-+++ libfakeroot.c
-@@ -1551,6 +1551,7 @@
-   return fakeroot_disabled;
- }
- 
-+#ifdef HAVE_SYS_ACL_H
- #ifdef HAVE_ACL_T
- int acl_set_fd(int fd, acl_t acl) {
-   errno = ENOTSUP;
-@@ -1561,6 +1562,7 @@
-   errno = ENOTSUP;
-   return -1;
- }
-+#endif /* HAVE_ACL_T */
- #endif /* HAVE_SYS_ACL_H */
- 
- #ifdef HAVE_FTS_READ
---- wrapfunc.inp
-+++ wrapfunc.inp
-@@ -167,10 +167,12 @@
- #endif /* HAVE_UNLINKAT */
- #endif /* HAVE_FSTATAT */
- 
-+#ifdef HAVE_SYS_ACL_H
- #ifdef HAVE_ACL_T
- acl_set_fd;int;(int fd, acl_t acl);(fd, acl)
- acl_set_file;int;(const char *path_p, acl_type_t type, acl_t acl);(path_p, type, acl)
- #endif /* HAVE_ACL_T */
-+#endif /* HAVE_SYS_ACL_H */
- 
- #ifdef HAVE_FTS_READ
- fts_read;FTSENT *;(FTS *ftsp);(ftsp)
diff --git a/sys-apps/guix/Manifest b/sys-apps/guix/Manifest
index 0424a1101175..d318696b9d83 100644
--- a/sys-apps/guix/Manifest
+++ b/sys-apps/guix/Manifest
@@ -8,5 +8,5 @@ DIST guix-bootstrap-i686-linux-20131110-guile-2.0.9.tar.xz.bootstrap 2656076 BLA
 DIST guix-bootstrap-mips64el-linux-20131110-guile-2.0.9.tar.xz.bootstrap 2734180 BLAKE2B 8ac6d9cfb59b1e2214c112fa7bfe865966cd06cb0214f360dc337a54e16cb59e4e3aa6da0662a52e6bceedfbb2a9ebb0eb62fe08491e5761912e2ee17b7ecd48 SHA512 8c4be098a31f63d56e7d35c174ce4095ba8317662c365d44c005980b38ba499461926754a4659e699ab271bb841c9da514f1a36b812d881c212a5f12177d73c0
 DIST guix-bootstrap-x86_64-linux-20131110-guile-2.0.9.tar.xz.bootstrap 2885996 BLAKE2B c16595fcb821468d5d293201046642dd4f0b149bb5e64f7b784f29f513ce26243b9747a8eefee3128e813a9b4b27a6a60a1693706b3fcb8cbb238fb4ad6e56c1 SHA512 96efc583f42f6c7647bc026e2d2a96d603e7bea12ca02f6bcc65e819b9966082ac4c9f7e42f64536ff42a988e4766e695d87a82c73dd97d80745975a05badb23
 EBUILD guix-0.13.0-r1.ebuild 3585 BLAKE2B d78dc51abf4be7d3b0558fa9b96fd6696c4f35a83b3b2b28638d8a4de2dfedb8536477e077e5e8f3ecb1e27b95dc2e3e60fe61faad4deb88c922513b1ee3ca5a SHA512 500a6e19aabde2fe9259171a46b4214ab278548e8415e96dd4fcedcc332e30c6aaef58a4b3c2d02c2c40fc1f282fcf1c32e0113de1cbc2a3dc95bbb87a8e640c
-EBUILD guix-0.14.0.ebuild 4042 BLAKE2B 292e76d39cb9d2c127c767e06a84a3b12415a72a78d1710c406fad458b227f6a198f1778abe4f23c82df9027e4d81ebf4e4e1965fb3670cfe13219df413c9bab SHA512 ee8a4b8c71f80b939d19d5e53d3f4020e0e797b9851dd3c59c31c725347e6c5775c8ea51d78efab86faee4a083d182d47ccebaedbcb43f930bad6d54e7cc9fe1
+EBUILD guix-0.14.0.ebuild 4044 BLAKE2B aa4f6f587fcb3903b39e1cfe2936104c30b409b07b0d5e57842e9aa01818c501a8c17798aa985f0cd5ae786f1504a3b6f0c1430a2a2eb09c79707796bbdd83da SHA512 eaaec42be5fe5c4573aa971c68c7c4b3511c34b10736ce912a3ae810ad9ea45fdf8a7a2ef344e234a12a9003e832e54c59a2dcc9067a44a3b72da1581803e7a9
 MISC metadata.xml 251 BLAKE2B 9785c4729d0751280d104965bab25a268219a7fee217dcd8c01a5642a13f8abc471a3dff54ae0d34d3cf3dc8267fb483d93bd3b16aa3617e8fa8e9abd1703dfe SHA512 cc2bd3977894946ee4ea5b739cc3998bcd6017b9e7a52aa501409d0988954339a9a22fe751d0a5e967ddac9225d9b23f20b4fb1e2c62ee91d1d23c383d9776dd
diff --git a/sys-apps/guix/guix-0.14.0.ebuild b/sys-apps/guix/guix-0.14.0.ebuild
index fee128e9630b..31fd035cf39e 100644
--- a/sys-apps/guix/guix-0.14.0.ebuild
+++ b/sys-apps/guix/guix-0.14.0.ebuild
@@ -103,7 +103,7 @@ src_prepare() {
 
 	default
 	# build system is very eager to run automake itself: bug #625166
-	eautomake
+	eautoreconf
 
 	# guile is trying to avoid recompilation by checking if file
 	#     /usr/lib64/guile/2.2/site-ccache/guix/modules.go
diff --git a/sys-apps/mcstrans/Manifest b/sys-apps/mcstrans/Manifest
index f75908b5d4ab..cfd20e1336ae 100644
--- a/sys-apps/mcstrans/Manifest
+++ b/sys-apps/mcstrans/Manifest
@@ -1,11 +1,7 @@
 AUX mcstransd.init 659 BLAKE2B ef74c438407efa47a066a18a1ba8d7cad2b13240fbf39d83887dda37a9c2c53c49a27f4ebe00451baf01be59fcd9ed4e47d095e925387fd2032e4e822672d466 SHA512 de97bb70286bd2b772ac6e98346ffcb96dcad95925ebb3bb44e6ffd4cf22b88d27aea103c89973f0fcc6334c98a9399d077e9cd52eaf7da70c5fce3da96ef3a3
 DIST mcstrans-2.7.tar.gz 41137 BLAKE2B 83f195dee4bf61c36f65b009cf40dd58459e01d75222fbd7fe15c61ae7942315373a4a0e9a1cd0a654efcf471c3c7166f76c87837085ef6a4136567d4b52fc73 SHA512 2e59f26fad3423a0c8e2ea49d619f99022c72e1aebb00e842defb4fad56f187f9ed0f069ef78d3b209ba76f5ebdcba1668f51ff881b753dada5716ee942519b3
-DIST mcstrans-2.8-rc1.tar.gz 41385 BLAKE2B 7aa05d9ec7230e5a2c0b5555368c46af31a5f92318300a07db3242ae18c7855225dd399f2874c2ba09ecbbebcdec686c20f604c2a86e104900b1eaaf50460a44 SHA512 6927d3b06012fb351d04558f26e602c084058911ca095891d49286976cc9f96446476057c09c044564eba25aca920bc99f2218182551a957d0dac6ce1a9bc2db
-DIST mcstrans-2.8-rc2.tar.gz 41387 BLAKE2B ddded091b0167ae6c465d7459a70da3e5567e1a548992c206785dc99f8c23568dfd00575ecdc5518d2825a88a8199fca42798a912a0f506a51c6919b2dca865d SHA512 3b4cb62eece6db434272a3d0c30b2b8b982793008aad6f02b73dd88822ae50e91aa422d972c92f58d3e132a1bc6f871924ba144078d26c72a2f95098cf3a20f9
-DIST mcstrans-2.8-rc3.tar.gz 41392 BLAKE2B 31c08eea9f9866da2fc16d734f8ced6a1acc6c0b0d5294cc3cfb07085535d7ed6202662f45b43b42aaa28642194c19b1d26fb5b98dda42e259562b6729e2956d SHA512 d25ab36b9b764abf8805764a457f870659e92ef440990d8b442caf64eaff082d7717b9b5c0b731fc1fd2ab4def9ea9ac82090b5cc5c0a63631418c6831ea2c72
+DIST mcstrans-2.8.tar.gz 41385 BLAKE2B 08cdb2588ab2cb48824816fd3eb578a77bfb6696f00fac7b808250ae88a5c85ae02824f047ac6cd6f3653d4b8550352f3570b63969ebfef5b396478ef191b97c SHA512 b20b369fea926ed55db4e454e82ef842fd39a8194190c9feb063b36126f6334f9d3401ef1c3636c03230a813c69648b5efbcc35b163387495175cde80dd6bd39
 EBUILD mcstrans-2.7.ebuild 1217 BLAKE2B 3b6414b7e668a2d7ec5c7ee5bb0c5d0b859f2360ab88fc88db0c1c4a7f06f539e5b881b02035aea89cd4e75e98e7bd6a42d035d1bd3dfb0f810b1191477b454b SHA512 d26037fd0d2f2ef722a21da5ba974410a5441608e32fb35d8674ebae48dd2eb485b30af50d7f54a3d3181b8c7af838e03d744336181f8bd3b8d8b8a47a906250
-EBUILD mcstrans-2.8_rc1.ebuild 1134 BLAKE2B b3b2532f024a638a7438db44a94a4da3627b769a748f5e288422a75abf88757b4812da9d4baf3a5ae84c7d68cc53cf7e9670e2942bc34359fe5bdaf85601b294 SHA512 9e94454233c349e043e4a3260b01e08de119e4b9f8d45a5bc3e8d4fe26778e75d38d41ee493e9bd44aeae65fcd0f8bb57b18245e45ae9412d58b2d85308fff4a
-EBUILD mcstrans-2.8_rc2.ebuild 1134 BLAKE2B cdafa28f1c27df99217f2a019b56a29b7f7539a6da269573026d28a3fa422b8b256831423e3f5c9010a102c52b5694cec998905ab9e88fc777b7d1993a26edb8 SHA512 3f3d0f2a3ca3d07fc54529860e2c3dee67d32f289d8d561d12e4d2257921163b1f002634458d8f73d577e7f0d417af69c5a20c0e8c3a2c97626ea3f4785d038b
-EBUILD mcstrans-2.8_rc3.ebuild 1134 BLAKE2B 1b604db83926701f5a9cecbba920a6483bf27ebfb6965816799c524bf0e37bd04d8ddcf9aefd13f0ca28cad3b48932423c0a93dd19ee156fc8daa283c9091862 SHA512 7bb101517f94e66259d64af47a1f636ebd11365130d736f3e36a9308c164357c5e433bc3286ed03069f32fabea8aa522072be603395f833e08111009fe39f2b0
-EBUILD mcstrans-9999.ebuild 1134 BLAKE2B 1b604db83926701f5a9cecbba920a6483bf27ebfb6965816799c524bf0e37bd04d8ddcf9aefd13f0ca28cad3b48932423c0a93dd19ee156fc8daa283c9091862 SHA512 7bb101517f94e66259d64af47a1f636ebd11365130d736f3e36a9308c164357c5e433bc3286ed03069f32fabea8aa522072be603395f833e08111009fe39f2b0
+EBUILD mcstrans-2.8.ebuild 1134 BLAKE2B dbf77ca7936dfe814452ac81efe094c5fcde8ee0f7c7f431cf8e2b4c746ac1daef9a621c75685b06002f7f4fbe9b0415fb1a2e2689eff5b622e47df67cf8f98c SHA512 b8933e5d30dca6f97e1c1dfc7a9987095023116ba62e392c7e8f4d958ebc8333a72571b773617950e19e2ec25dfc3b700a0f1240c19df06258826ebcad156be4
+EBUILD mcstrans-9999.ebuild 1134 BLAKE2B dbf77ca7936dfe814452ac81efe094c5fcde8ee0f7c7f431cf8e2b4c746ac1daef9a621c75685b06002f7f4fbe9b0415fb1a2e2689eff5b622e47df67cf8f98c SHA512 b8933e5d30dca6f97e1c1dfc7a9987095023116ba62e392c7e8f4d958ebc8333a72571b773617950e19e2ec25dfc3b700a0f1240c19df06258826ebcad156be4
 MISC metadata.xml 451 BLAKE2B bf8e87dcdd8c3dfbb33728600b986bf96e2243a9e9916db87ae4b4d69508f6397915929b24c4b7381d711a7754987402f0abd8ee8217621479d6970c91922189 SHA512 9d1f5669661c1fe232b18517a954640350c8f0c606d3ca91e429f53790532bfc9b73d7c18e575c4055d3ea7ba4a5ade632d1814700ed1d3d000fe5ebfa065744
diff --git a/sys-apps/mcstrans/mcstrans-2.8_rc2.ebuild b/sys-apps/mcstrans/mcstrans-2.8.ebuild
index 79dc30ee803c..7de09ec4120d 100644
--- a/sys-apps/mcstrans/mcstrans-2.8_rc2.ebuild
+++ b/sys-apps/mcstrans/mcstrans-2.8.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
 
 inherit toolchain-funcs
 
-MY_RELEASEDATE="20180426"
+MY_RELEASEDATE="20180524"
 
 MY_P="${P//_/-}"
 IUSE=""
diff --git a/sys-apps/mcstrans/mcstrans-2.8_rc1.ebuild b/sys-apps/mcstrans/mcstrans-2.8_rc1.ebuild
deleted file mode 100644
index 06e7b08fbd9c..000000000000
--- a/sys-apps/mcstrans/mcstrans-2.8_rc1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs
-
-MY_RELEASEDATE="20180419"
-
-MY_P="${P//_/-}"
-IUSE=""
-
-if [[ ${PV} == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
-	S="${WORKDIR}/${MY_P}/${PN}"
-else
-	SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="SELinux context translation to human readable names"
-HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND=">=sys-libs/libsepol-${PV}:=
-	>=sys-libs/libselinux-${PV}:=
-	dev-libs/libpcre:=
-	>=sys-libs/libcap-1.10-r10:="
-
-RDEPEND="${DEPEND}
-	!<sys-apps/policycoreutils-2.7_pre"
-
-src_prepare() {
-	default
-
-	sed -i 's/-Werror//g' "${S}"/*/Makefile || die "Failed to remove Werror"
-}
-
-src_compile() {
-	tc-export CC
-	default
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	rm -rf "${D}/etc/rc.d" || die
-
-	newinitd "${FILESDIR}/mcstransd.init" mcstransd
-}
diff --git a/sys-apps/mcstrans/mcstrans-2.8_rc3.ebuild b/sys-apps/mcstrans/mcstrans-2.8_rc3.ebuild
deleted file mode 100644
index 16d98aa73012..000000000000
--- a/sys-apps/mcstrans/mcstrans-2.8_rc3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs
-
-MY_RELEASEDATE="20180510"
-
-MY_P="${P//_/-}"
-IUSE=""
-
-if [[ ${PV} == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
-	S="${WORKDIR}/${MY_P}/${PN}"
-else
-	SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="SELinux context translation to human readable names"
-HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND=">=sys-libs/libsepol-${PV}:=
-	>=sys-libs/libselinux-${PV}:=
-	dev-libs/libpcre:=
-	>=sys-libs/libcap-1.10-r10:="
-
-RDEPEND="${DEPEND}
-	!<sys-apps/policycoreutils-2.7_pre"
-
-src_prepare() {
-	default
-
-	sed -i 's/-Werror//g' "${S}"/*/Makefile || die "Failed to remove Werror"
-}
-
-src_compile() {
-	tc-export CC
-	default
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	rm -rf "${D}/etc/rc.d" || die
-
-	newinitd "${FILESDIR}/mcstransd.init" mcstransd
-}
diff --git a/sys-apps/mcstrans/mcstrans-9999.ebuild b/sys-apps/mcstrans/mcstrans-9999.ebuild
index 16d98aa73012..7de09ec4120d 100644
--- a/sys-apps/mcstrans/mcstrans-9999.ebuild
+++ b/sys-apps/mcstrans/mcstrans-9999.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
 
 inherit toolchain-funcs
 
-MY_RELEASEDATE="20180510"
+MY_RELEASEDATE="20180524"
 
 MY_P="${P//_/-}"
 IUSE=""
diff --git a/sys-apps/osinfo-db/Manifest b/sys-apps/osinfo-db/Manifest
index fd54423f4f1b..7931fdc9bbba 100644
--- a/sys-apps/osinfo-db/Manifest
+++ b/sys-apps/osinfo-db/Manifest
@@ -1,5 +1,7 @@
 DIST osinfo-db-20170813.tar.xz 64424 BLAKE2B b4d46f82197bb5f1b956fe72e87ef365b139c6a1ab90906ac30dd3191fb6c3f5ef3978ceaf56d029a3766e8354558aa00554a767c637eef49b861b6a775fc614 SHA512 0ae4906b5c3eb400ca397f0c3baf5146b8197ee2dc712b1b89dd2f443f9505aee208327f008118628407b54ce52390a8b6138425f3f6f974b94f4a8d79955653
 DIST osinfo-db-20180416.tar.xz 70324 BLAKE2B 44bcc2be467f7e1ce50d1a0fd2bd2f3695f6aa68ab038fd0d548a8c46606032a9fb805152f0de08a0f56d6e096397cc17582a7451e0695dbb58760fa94363630 SHA512 e8d25dc501909803a949987239ea5a2e7a01ac4bb536f1040edff93d8ce3871499fceda882da799ada295dd5d4cc284e99c6b5f493c464dda776f6144803a1f1
+DIST osinfo-db-20180514.tar.xz 70780 BLAKE2B ccde92692b6b6a77007bd4f78f8f3f0e9db4c4d8ed3a270df2f8ba6a8073c3467a9f51e53cc7ab9138b66af7424bdb84cad0fc76edf9c5a19b8ce798bffec155 SHA512 518791269148c0e3cc6b65b4481f37284780497a5643a1c9523458aa56ecd47cb7bfe9d95c086b2155b282369214c4cd3e2926c304ab84f78ddc0568d3b30216
 EBUILD osinfo-db-20170813.ebuild 671 BLAKE2B 21131786f459a25aab816a1ea30067b7f3ed84d00063d7e2ed330c060f7e8616171e298379ac0bfad2ac54c2e847072b8a481ef85be280f19b9ded9f8f2494a7 SHA512 feecb9a6298484e19e9d78aefa7e75c376b66c0bd676aff22e5ad3fe7a745ea74fc64ddbfb6dde002f6b58a72720e5ddb571ef616c9e1af04411a910aa1b2694
 EBUILD osinfo-db-20180416.ebuild 673 BLAKE2B bc1f0a9c4f01f70e62d28c388aba1b3892cd8445c18a0020f0cb5cd5e998221f5009b828790229c73a8f62ee13dee14c9c35ae1464bef1fec04ecd1b8baf3dd4 SHA512 e873662320619e38cb827b3987208a3c74a472cc969c1774e33c0a2a91041bb17c20574513667170091c204805b042a74f7ce94da011fb8ff9dcf17ff59ab377
+EBUILD osinfo-db-20180514.ebuild 673 BLAKE2B bc1f0a9c4f01f70e62d28c388aba1b3892cd8445c18a0020f0cb5cd5e998221f5009b828790229c73a8f62ee13dee14c9c35ae1464bef1fec04ecd1b8baf3dd4 SHA512 e873662320619e38cb827b3987208a3c74a472cc969c1774e33c0a2a91041bb17c20574513667170091c204805b042a74f7ce94da011fb8ff9dcf17ff59ab377
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sys-apps/osinfo-db/osinfo-db-20180514.ebuild b/sys-apps/osinfo-db/osinfo-db-20180514.ebuild
new file mode 100644
index 000000000000..9e69a433ac60
--- /dev/null
+++ b/sys-apps/osinfo-db/osinfo-db-20180514.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="osinfo database files"
+HOMEPAGE="http://libosinfo.org/"
+SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.xz"
+S="${WORKDIR}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	sys-apps/osinfo-db-tools
+"
+# we don't depend on intltool here, contrary to README, as the tarball already
+# contains the processed results with translations in XML files
+
+src_unpack() { :; }
+
+src_install() {
+	osinfo-db-import --root "${D}" --dir "/usr/share/osinfo" "${DISTDIR}/${A}"
+}
diff --git a/sys-apps/policycoreutils/Manifest b/sys-apps/policycoreutils/Manifest
index 7776cdc79d73..58c67e065ac4 100644
--- a/sys-apps/policycoreutils/Manifest
+++ b/sys-apps/policycoreutils/Manifest
@@ -1,12 +1,8 @@
 AUX policycoreutils-2.7-0001-newrole-not-suid.patch 351 BLAKE2B 84a67799662e6df3aeefafeda3a70e011856313beb4ac28e37312e7a53219b0a2d224a4be650200b537a39a58858c443e2b3253c1ebab617aaa6acf95b7e68fc SHA512 41c37a0711011ebdaafee01b357438ac3219b34b6c9e6ebe182c863d61c899e4819ae71bd9adf4b52bee37750c99b5b1cd40c6a92f119899bd227251d37ccd99
 DIST policycoreutils-2.7.tar.gz 2796707 BLAKE2B 4b1c03f2d12252b453950c3d6bcde75780926a1b91263d3881f741399c5630c707f0429b9b144c657b017b7b0c1500b63b6463610dea3caaef8c2f7c3f69fd8f SHA512 ce97d659f72058fd23d8dab8db98fc7c0003806a636c521fa15da465d7358d40ccc8e3eaa9675f00a9b0b8aaa1465d3fb650bc0ebbbf00164e121230673256fb
-DIST policycoreutils-2.8-rc1.tar.gz 2797172 BLAKE2B f75549e05af02038481807e78267b0af2df4d2c8ab5568e9f4be853c742e358ce3c6fd4a4f2f56e022aa76235b41a80676eee342cd79f43be2270b5753151a71 SHA512 252b1a2784221cd1b960d584e17c3c116b46a36ef4900510f8caf34908784dd1d19d2a5d2c394aaa4d920485183365af2ab23056eb5867ccbaf284e2ca8612cd
-DIST policycoreutils-2.8-rc2.tar.gz 2796955 BLAKE2B 9a62c08b6fe4e53b1338d671d3fd51600e9fac18ca036a48bab7445b86883a7fb093cde0a99023e8fb9c8579f69075e0b3032217b4cdfa254ca3bab143150deb SHA512 ce807e6175c92649cb4218444ff49d4f70ba1feb99ca01412f05a3d713a0a5f3c5dae0cd284b077a8c8e03a68d4dd023302863f3922f7748798205c5d5d73021
-DIST policycoreutils-2.8-rc3.tar.gz 2797294 BLAKE2B 74be15f5a189c310570d64215e900885924a82cc2ae47e585ed093e36300614fc36b43bd391a72a45eeb4e814b29a6f11bc86cdd16ed2b2d3cbb0647d9f07686 SHA512 6100fdde5eb492a21028c470712dccffd25caf1cf2cabe5653df02126c19c7173cfd293b1e1ce3215bf7c59c32fed36e053348b1d5fb5916a24547d8e9c8794c
+DIST policycoreutils-2.8.tar.gz 2796775 BLAKE2B 36115cc2faf72a4b647312f8faaf4762d7f2fb56bf0531ccadeb46b100c9e577f3148fe6890925d3fed94ac22803dc61729781e54bd0ddeb1539ccce2ec2a29b SHA512 2b4a70836fd8727a16b8f8d4afcc39c9461ab6f5bc1ba5ce5833d41150da921ebb3c9bdbd1cfa7dd31fd382ba18b5433ca9b63bce58bd290db81fa9bedfe29f3
 DIST policycoreutils-extra-1.36.tar.bz2 8830 BLAKE2B 6d98e41ea379d3e95221a6e53d8a8b144e4e15ca5581381e76a529dbbaca304d5587b30419797c8c70cbd7c2b2588e5ecd62adcf97294e429950899c1c318346 SHA512 c6a18e6fb2d65f51dc55b88907f23241f2fbfc033d3d2888b109596d9ed31d509b2c93456727ea4d1f98544831afb15c449ff72d6aedf93b9e474b27817f7fb3
 EBUILD policycoreutils-2.7.ebuild 4966 BLAKE2B 1e252c86aa33e9ac68c14d859ced7e277fc0cf5f5ad6aa335ae7b334b5ff56417ed8ff973a57e2858bae832dde946a7080d1d9eb72e7b2ed0e583b1badf8ccc9 SHA512 f068c7fb1d918bcf305b8f8a72433774e5dcc23e8b5a22fee2e64fbb54cd4e14d897da33c893b948247600350bf4f54ab64f6d81be405d2c6930ea40176dc729
-EBUILD policycoreutils-2.8_rc1.ebuild 4897 BLAKE2B 4c0c156f179ff00bb15b50512ba2085c69385bc4cdd3c33779ea66405198d315662f7dfdc359bdb68e12faced56743ea60bc2c6e1f3c0299d0591ce4f8b46c30 SHA512 a700c9ab01edd4219ca70ed571dcfdc63be9c7f4248be53a58f3680baba690a3a71d017e11861c87e32b055656e8d65d3206fc692cbe2ad4c51b7039342688f6
-EBUILD policycoreutils-2.8_rc2.ebuild 4897 BLAKE2B ebb8a9a8cb960ee4b7ef5a96ebbbfeeb804870e853bc448ce59724c029280ff67ce48f17c55605a8e529a7003afa88fc0c01890e03e7ccfe5c1ef97a5d26ddc7 SHA512 6b65d82b5e59e19137450b589f02351206104266f5a79ae28a7b3da1810e8b6048fafeec27aeb84784f74e6dc5890b9fcd3912fa200f58a75fd8dadf526e72c7
-EBUILD policycoreutils-2.8_rc3.ebuild 4897 BLAKE2B 3dccfa5e1f27a1642a8705a62415309a48e4e119b0aa39722250ce8c069dc00214934ab5a03ffefe19b8e724dd46b3f4d3706c983f428beb65fd5aec1d5604dd SHA512 4a0337b168a541bf400473ecc400a83f24883c16b4a007eae53094859b9c00272cce5d5d79bc9d5a86547f8bafe5659be8beea27799e7f0b9c877580afee4b0b
-EBUILD policycoreutils-9999.ebuild 4875 BLAKE2B 0630a4672625933b6abda266748ab0db457e3e6f15d9eb0c6a31e410f73dfb79e8c0430e2181461af2edd10708bfa55117c688c66c9296c18dbd20709b51c520 SHA512 1f5c419f949b4c634a4645006d2003fce342c4dccbb01f2c7d077d05b68d5361a3877cbb748fd318550ea687501cb33be274c472318d8d5c6bd2a07bc65f0e12
+EBUILD policycoreutils-2.8.ebuild 4875 BLAKE2B 691beea03598aab075177fc4c77233e483e14b62f65990c56fd127eab6983d207e197caa8948d6a2a2a8cbbafb02f23b6521145c15e4a2542d985a71dafc53fe SHA512 b65baf0542890f20e28f72a8971fd940eb704796a289bb6889fe68d843d9aff02836596caf7c8d5b2d7b66c14886126d29f0a673d02b52578b255c3619bab520
+EBUILD policycoreutils-9999.ebuild 4875 BLAKE2B 691beea03598aab075177fc4c77233e483e14b62f65990c56fd127eab6983d207e197caa8948d6a2a2a8cbbafb02f23b6521145c15e4a2542d985a71dafc53fe SHA512 b65baf0542890f20e28f72a8971fd940eb704796a289bb6889fe68d843d9aff02836596caf7c8d5b2d7b66c14886126d29f0a673d02b52578b255c3619bab520
 MISC metadata.xml 1117 BLAKE2B 0ec558cea900ec5f25cef43a76a5c0436562ca9d43cfa23d9251ac4e8eb22f0154ca577f061f50762559be9b567faf5dd7ed994c59308ba140f2fe2b8a5d1ad0 SHA512 1f8703b31ced13b4e15311ecc9d4e03c085eb580e61394e8781744a9c33794e0f10144617415e69b703f5716ca5fd15ad6db14fe93a95c9b5d46c429542beac5
diff --git a/sys-apps/policycoreutils/policycoreutils-2.8_rc2.ebuild b/sys-apps/policycoreutils/policycoreutils-2.8.ebuild
index bdd5ccc8ac34..307c82a9c3eb 100644
--- a/sys-apps/policycoreutils/policycoreutils-2.8_rc2.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-2.8.ebuild
@@ -9,7 +9,7 @@ inherit multilib python-r1 toolchain-funcs bash-completion-r1
 
 MY_P="${P//_/-}"
 
-MY_RELEASEDATE="20180426"
+MY_RELEASEDATE="20180524"
 EXTRAS_VER="1.36"
 SEMNG_VER="${PV}"
 SELNX_VER="${PV}"
@@ -41,7 +41,6 @@ LICENSE="GPL-2"
 SLOT="0"
 
 DEPEND=">=sys-libs/libselinux-${SELNX_VER}:=[python,${PYTHON_USEDEP}]
-	>=sys-libs/glibc-2.4
 	>=sys-libs/libcap-1.10-r10:=
 	>=sys-libs/libsemanage-${SEMNG_VER}:=[python,${PYTHON_USEDEP}]
 	sys-libs/libcap-ng:=
diff --git a/sys-apps/policycoreutils/policycoreutils-2.8_rc1.ebuild b/sys-apps/policycoreutils/policycoreutils-2.8_rc1.ebuild
deleted file mode 100644
index aebedfb6cd4c..000000000000
--- a/sys-apps/policycoreutils/policycoreutils-2.8_rc1.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-PYTHON_REQ_USE="xml"
-
-inherit multilib python-r1 toolchain-funcs bash-completion-r1
-
-MY_P="${P//_/-}"
-
-MY_RELEASEDATE="20180419"
-EXTRAS_VER="1.36"
-SEMNG_VER="${PV}"
-SELNX_VER="${PV}"
-SEPOL_VER="${PV}"
-
-IUSE="audit pam dbus"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DESCRIPTION="SELinux core utilities"
-HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
-	SRC_URI="https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
-	S1="${WORKDIR}/${MY_P}/${PN}"
-	S2="${WORKDIR}/policycoreutils-extra"
-	S="${S1}"
-else
-	SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz
-		https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
-	KEYWORDS="~amd64 ~arm64 ~mips ~x86"
-	S1="${WORKDIR}/${MY_P}"
-	S2="${WORKDIR}/policycoreutils-extra"
-	S="${S1}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND=">=sys-libs/libselinux-${SELNX_VER}:=[python,${PYTHON_USEDEP}]
-	>=sys-libs/glibc-2.4
-	>=sys-libs/libcap-1.10-r10:=
-	>=sys-libs/libsemanage-${SEMNG_VER}:=[python,${PYTHON_USEDEP}]
-	sys-libs/libcap-ng:=
-	>=sys-libs/libsepol-${SEPOL_VER}:=
-	>=app-admin/setools-4.1.1[${PYTHON_USEDEP}]
-	sys-devel/gettext
-	dev-python/ipy[${PYTHON_USEDEP}]
-	dbus? (
-		sys-apps/dbus
-		dev-libs/dbus-glib:=
-	)
-	audit? ( >=sys-process/audit-1.5.1[python,${PYTHON_USEDEP}] )
-	pam? ( sys-libs/pam:= )
-	${PYTHON_DEPS}
-	!<sec-policy/selinux-base-policy-2.20151208-r6"
-# 2.20151208-r6 and higher has support for new setfiles
-
-### libcgroup -> seunshare
-### dbus -> restorecond
-
-# pax-utils for scanelf used by rlpkg
-RDEPEND="${DEPEND}
-	app-misc/pax-utils
-	!<sys-apps/openrc-0.14"
-
-PDEPEND="sys-apps/semodule-utils
-	sys-apps/selinux-python"
-
-src_unpack() {
-	# Override default one because we need the SRC_URI ones even in case of 9999 ebuilds
-	default
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-	fi
-}
-
-src_prepare() {
-	S="${S1}"
-	cd "${S}" || die "Failed to switch to ${S}"
-	if [[ ${PV} != 9999 ]] ; then
-		# If needed for live ebuilds please use /etc/portage/patches
-		eapply "${FILESDIR}/policycoreutils-2.7-0001-newrole-not-suid.patch"
-	fi
-
-	# rlpkg is more useful than fixfiles
-	sed -i -e '/^all/s/fixfiles//' "${S}/scripts/Makefile" \
-		|| die "fixfiles sed 1 failed"
-	sed -i -e '/fixfiles/d' "${S}/scripts/Makefile" \
-		|| die "fixfiles sed 2 failed"
-
-	eapply_user
-
-	sed -i 's/-Werror//g' "${S1}"/*/Makefile || die "Failed to remove Werror"
-
-	python_copy_sources
-	# Our extra code is outside the regular directory, so set it to the extra
-	# directory. We really should optimize this as it is ugly, but the extra
-	# code is needed for Gentoo at the same time that policycoreutils is present
-	# (so we cannot use an additional package for now).
-	S="${S2}"
-	python_copy_sources
-}
-
-src_compile() {
-	building() {
-		emake -C "${BUILD_DIR}" \
-			AUDIT_LOG_PRIVS="y" \
-			AUDITH="$(usex audit y n)" \
-			PAMH="$(usex pam y n)" \
-			INOTIFYH="$(usex dbus y n)" \
-			SESANDBOX="n" \
-			CC="$(tc-getCC)" \
-			LIBDIR="\$(PREFIX)/$(get_libdir)"
-	}
-	S="${S1}" # Regular policycoreutils
-	python_foreach_impl building
-	S="${S2}" # Extra set
-	python_foreach_impl building
-}
-
-src_install() {
-	# Python scripts are present in many places. There are no extension modules.
-	installation-policycoreutils() {
-		einfo "Installing policycoreutils"
-		emake -C "${BUILD_DIR}" DESTDIR="${D}" \
-			AUDIT_LOG_PRIVS="y" \
-			AUDITH="$(usex audit y n)" \
-			PAMH="$(usex pam y n)" \
-			INOTIFYH="$(usex dbus y n)" \
-			SESANDBOX="n" \
-			CC="$(tc-getCC)" \
-			LIBDIR="\$(PREFIX)/$(get_libdir)" \
-			install
-		python_optimize
-	}
-
-	installation-extras() {
-		einfo "Installing policycoreutils-extra"
-		emake -C "${BUILD_DIR}" \
-			DESTDIR="${D}" \
-			install
-		python_optimize
-	}
-
-	S="${S1}" # policycoreutils
-	python_foreach_impl installation-policycoreutils
-	S="${S2}" # extras
-	python_foreach_impl installation-extras
-	S="${S1}" # back for later
-
-	# remove redhat-style init script
-	rm -fR "${D}/etc/rc.d" || die
-
-	# compatibility symlinks
-	dosym /sbin/setfiles /usr/sbin/setfiles
-	bashcomp_alias setsebool getsebool
-
-	# location for policy definitions
-	dodir /var/lib/selinux
-	keepdir /var/lib/selinux
-
-	# Set version-specific scripts
-	for pyscript in rlpkg; do
-	  python_replicate_script "${ED}/usr/sbin/${pyscript}"
-	done
-}
-
-pkg_postinst() {
-	for POLICY_TYPE in ${POLICY_TYPES} ; do
-		# There have been some changes to the policy store, rebuilding now.
-		# https://marc.info/?l=selinux&m=143757277819717&w=2
-		einfo "Rebuilding store ${POLICY_TYPE} (without re-loading)."
-		semodule -s "${POLICY_TYPE}" -n -B || die "Failed to rebuild policy store ${POLICY_TYPE}"
-	done
-}
diff --git a/sys-apps/policycoreutils/policycoreutils-2.8_rc3.ebuild b/sys-apps/policycoreutils/policycoreutils-2.8_rc3.ebuild
deleted file mode 100644
index 869c231e4972..000000000000
--- a/sys-apps/policycoreutils/policycoreutils-2.8_rc3.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-PYTHON_REQ_USE="xml"
-
-inherit multilib python-r1 toolchain-funcs bash-completion-r1
-
-MY_P="${P//_/-}"
-
-MY_RELEASEDATE="20180510"
-EXTRAS_VER="1.36"
-SEMNG_VER="${PV}"
-SELNX_VER="${PV}"
-SEPOL_VER="${PV}"
-
-IUSE="audit pam dbus"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DESCRIPTION="SELinux core utilities"
-HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
-	SRC_URI="https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
-	S1="${WORKDIR}/${MY_P}/${PN}"
-	S2="${WORKDIR}/policycoreutils-extra"
-	S="${S1}"
-else
-	SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz
-		https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
-	KEYWORDS="~amd64 ~arm64 ~mips ~x86"
-	S1="${WORKDIR}/${MY_P}"
-	S2="${WORKDIR}/policycoreutils-extra"
-	S="${S1}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND=">=sys-libs/libselinux-${SELNX_VER}:=[python,${PYTHON_USEDEP}]
-	>=sys-libs/glibc-2.4
-	>=sys-libs/libcap-1.10-r10:=
-	>=sys-libs/libsemanage-${SEMNG_VER}:=[python,${PYTHON_USEDEP}]
-	sys-libs/libcap-ng:=
-	>=sys-libs/libsepol-${SEPOL_VER}:=
-	>=app-admin/setools-4.1.1[${PYTHON_USEDEP}]
-	sys-devel/gettext
-	dev-python/ipy[${PYTHON_USEDEP}]
-	dbus? (
-		sys-apps/dbus
-		dev-libs/dbus-glib:=
-	)
-	audit? ( >=sys-process/audit-1.5.1[python,${PYTHON_USEDEP}] )
-	pam? ( sys-libs/pam:= )
-	${PYTHON_DEPS}
-	!<sec-policy/selinux-base-policy-2.20151208-r6"
-# 2.20151208-r6 and higher has support for new setfiles
-
-### libcgroup -> seunshare
-### dbus -> restorecond
-
-# pax-utils for scanelf used by rlpkg
-RDEPEND="${DEPEND}
-	app-misc/pax-utils
-	!<sys-apps/openrc-0.14"
-
-PDEPEND="sys-apps/semodule-utils
-	sys-apps/selinux-python"
-
-src_unpack() {
-	# Override default one because we need the SRC_URI ones even in case of 9999 ebuilds
-	default
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-	fi
-}
-
-src_prepare() {
-	S="${S1}"
-	cd "${S}" || die "Failed to switch to ${S}"
-	if [[ ${PV} != 9999 ]] ; then
-		# If needed for live ebuilds please use /etc/portage/patches
-		eapply "${FILESDIR}/policycoreutils-2.7-0001-newrole-not-suid.patch"
-	fi
-
-	# rlpkg is more useful than fixfiles
-	sed -i -e '/^all/s/fixfiles//' "${S}/scripts/Makefile" \
-		|| die "fixfiles sed 1 failed"
-	sed -i -e '/fixfiles/d' "${S}/scripts/Makefile" \
-		|| die "fixfiles sed 2 failed"
-
-	eapply_user
-
-	sed -i 's/-Werror//g' "${S1}"/*/Makefile || die "Failed to remove Werror"
-
-	python_copy_sources
-	# Our extra code is outside the regular directory, so set it to the extra
-	# directory. We really should optimize this as it is ugly, but the extra
-	# code is needed for Gentoo at the same time that policycoreutils is present
-	# (so we cannot use an additional package for now).
-	S="${S2}"
-	python_copy_sources
-}
-
-src_compile() {
-	building() {
-		emake -C "${BUILD_DIR}" \
-			AUDIT_LOG_PRIVS="y" \
-			AUDITH="$(usex audit y n)" \
-			PAMH="$(usex pam y n)" \
-			INOTIFYH="$(usex dbus y n)" \
-			SESANDBOX="n" \
-			CC="$(tc-getCC)" \
-			LIBDIR="\$(PREFIX)/$(get_libdir)"
-	}
-	S="${S1}" # Regular policycoreutils
-	python_foreach_impl building
-	S="${S2}" # Extra set
-	python_foreach_impl building
-}
-
-src_install() {
-	# Python scripts are present in many places. There are no extension modules.
-	installation-policycoreutils() {
-		einfo "Installing policycoreutils"
-		emake -C "${BUILD_DIR}" DESTDIR="${D}" \
-			AUDIT_LOG_PRIVS="y" \
-			AUDITH="$(usex audit y n)" \
-			PAMH="$(usex pam y n)" \
-			INOTIFYH="$(usex dbus y n)" \
-			SESANDBOX="n" \
-			CC="$(tc-getCC)" \
-			LIBDIR="\$(PREFIX)/$(get_libdir)" \
-			install
-		python_optimize
-	}
-
-	installation-extras() {
-		einfo "Installing policycoreutils-extra"
-		emake -C "${BUILD_DIR}" \
-			DESTDIR="${D}" \
-			install
-		python_optimize
-	}
-
-	S="${S1}" # policycoreutils
-	python_foreach_impl installation-policycoreutils
-	S="${S2}" # extras
-	python_foreach_impl installation-extras
-	S="${S1}" # back for later
-
-	# remove redhat-style init script
-	rm -fR "${D}/etc/rc.d" || die
-
-	# compatibility symlinks
-	dosym /sbin/setfiles /usr/sbin/setfiles
-	bashcomp_alias setsebool getsebool
-
-	# location for policy definitions
-	dodir /var/lib/selinux
-	keepdir /var/lib/selinux
-
-	# Set version-specific scripts
-	for pyscript in rlpkg; do
-	  python_replicate_script "${ED}/usr/sbin/${pyscript}"
-	done
-}
-
-pkg_postinst() {
-	for POLICY_TYPE in ${POLICY_TYPES} ; do
-		# There have been some changes to the policy store, rebuilding now.
-		# https://marc.info/?l=selinux&m=143757277819717&w=2
-		einfo "Rebuilding store ${POLICY_TYPE} (without re-loading)."
-		semodule -s "${POLICY_TYPE}" -n -B || die "Failed to rebuild policy store ${POLICY_TYPE}"
-	done
-}
diff --git a/sys-apps/policycoreutils/policycoreutils-9999.ebuild b/sys-apps/policycoreutils/policycoreutils-9999.ebuild
index 61c30a89194c..307c82a9c3eb 100644
--- a/sys-apps/policycoreutils/policycoreutils-9999.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-9999.ebuild
@@ -9,7 +9,7 @@ inherit multilib python-r1 toolchain-funcs bash-completion-r1
 
 MY_P="${P//_/-}"
 
-MY_RELEASEDATE="20180510"
+MY_RELEASEDATE="20180524"
 EXTRAS_VER="1.36"
 SEMNG_VER="${PV}"
 SELNX_VER="${PV}"
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 7bcb9ed59439..b18785c9a4ce 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -6,6 +6,7 @@ DIST portage-2.3.24.tar.bz2 959266 BLAKE2B bc15f10599c694ad29f5a55264e929d0a04a9
 DIST portage-2.3.31.tar.bz2 986684 BLAKE2B dc2a6e7da211da98320b872b26af46138791e2600d261fbff21823576804ea04dc77bc69c5f64d94a9bc3d0ec9cba0630b9093c12c426ae0561471092c837080 SHA512 7cca6aa6e8e6ce7ee3902686b437ea09c398630f46926d568a35f94b95be3c6ecc53a4ab6ee99d52c04755d5144900cc3aa84be24a49533518f8c50a9301ffb8
 DIST portage-2.3.36.tar.bz2 992242 BLAKE2B 44b414495ab156214bfd27d10894a6b1ae020f503639f41d408670b440b5e389bd56c801138907992982db8964aaa2664e9f7f0aa99647d4eab1aa81167157ba SHA512 765bb60fce2b6b84c5fde7b19c5abeeed0ba8036ea311c7f57dfcb2ed11395cafe7bdd07a2b46adce95792f4bf9f5401643e88780c90e792a8a4e4d1f2886167
 DIST portage-2.3.38.tar.bz2 993841 BLAKE2B a473d905a3caae4fc9e45486c4cbf75b10de396b40b4f84aef9012da12dab78ad14f8645bbb71adf058159dca6dacba7314d44664826c8402904d0e0e4c55e52 SHA512 e9fbfdcb5c3f4f8c001d0cd16e62c0cc7c23b92f9abca1b26f4c9e95b547e78cf126a9a7807b70beb9014514c1d32bd277bea9d0b91a7c912785b4178f77dede
+DIST portage-2.3.39.tar.bz2 995385 BLAKE2B 91cfc2b48b82b971c7fa3112110a47f151459cf7a714abd81c812ac198433d5946047adb7c582887eb0026d5cbf594d15b20f261f0f01f3d8078309f07b58aa5 SHA512 71e6cb4401e2b8e778a458efa8aea21ba6b48781abaf14b37ec7e76fdcb08540a12e922d7175bcb8492c2b2e80d543f8f39ecfb2f4b48235c8ac86a8c51aa76d
 DIST portage-2.3.8.tar.bz2 938062 BLAKE2B 3f7bedf6268131a3b3539d53c8a7bb069b533b3a78e5eec521b6201439c8ee5e66996e798fe295561d0a94bfcd32adf414d4f8b5e7a93035cea09749406e64a3 SHA512 4b4b2de20323799b9b0f7a8812f939aa9a96d2744a0f65ad5287ba49744c491b55169cdb21f2885317a6a7c960d2070775ffd798f247b44eebc677c33c271eb8
 EBUILD portage-2.3.13-r1.ebuild 8511 BLAKE2B 1b64d5a8f21d7631bb785e26929dcf2ede2896e0262f09c0d3243e8ef538582353e0386819b5c35ca192c2a3e28040296451157a5bb757c78bdb28885f101b22 SHA512 99cfbd35d7666eef17ea804a14788f4d1612d70743d8d37e4cd94e9eacace3486f7e78e4032215e52abf43fd416bdfbe5dd59178d494fa39b85d25ce569777db
 EBUILD portage-2.3.19-r1.ebuild 8415 BLAKE2B 2f317c8d4c636a870ed27cbb4dbdc3a0cba6decbef29944f5eec3d8091e6b4fd098033da44bffe55a312c23de2e9dbd16b73a9d69ba2d3c2d2ce05ba0d6cf033 SHA512 b4d363547eab3e074da48d9050b1dd091372114ded9ff146df3f0168264f7cc7781d4b5968df42f3a5dea8fcdfa1c483a5e3ecdefc59222503f7daf441c9da20
@@ -13,6 +14,7 @@ EBUILD portage-2.3.24-r1.ebuild 9269 BLAKE2B ba60aee1fba595b80a91ee183275cd0b29d
 EBUILD portage-2.3.31.ebuild 9282 BLAKE2B 4496d4c5b4ac38ddb8084c0f8d9d6c833066dedb7817d212d739b379b0f40d0d41cd3755617ccf9b72423ba68bce1e39bc31b0c8c84829875863723bd0ba7f3a SHA512 316b5a517cfd3856910598f01dae9d7f17a7b68723996c02eb05ea6f3b36ecab9ac05f1602c9f9c72775151d483f677f58a4223c6ede4f2d0eaa8587f3cc178d
 EBUILD portage-2.3.36.ebuild 9282 BLAKE2B 4496d4c5b4ac38ddb8084c0f8d9d6c833066dedb7817d212d739b379b0f40d0d41cd3755617ccf9b72423ba68bce1e39bc31b0c8c84829875863723bd0ba7f3a SHA512 316b5a517cfd3856910598f01dae9d7f17a7b68723996c02eb05ea6f3b36ecab9ac05f1602c9f9c72775151d483f677f58a4223c6ede4f2d0eaa8587f3cc178d
 EBUILD portage-2.3.38.ebuild 9298 BLAKE2B 4b2307614bc193b7b7100fb7895ec75cf18e3aeef18772f9083b48e870ccdcf6d8104039d7371856d26e1ebe7be856a23ae5e644533b3b560911d5aa5c2f2a50 SHA512 e7d2afb7b89a4f49c014c806e4a8f3bee4f67025eef23e64689f54f2779ff9af64fffa0501adde36890b0c1887157cc161010cda36655aeddfd583075e4f5cc7
+EBUILD portage-2.3.39.ebuild 9298 BLAKE2B 4b2307614bc193b7b7100fb7895ec75cf18e3aeef18772f9083b48e870ccdcf6d8104039d7371856d26e1ebe7be856a23ae5e644533b3b560911d5aa5c2f2a50 SHA512 e7d2afb7b89a4f49c014c806e4a8f3bee4f67025eef23e64689f54f2779ff9af64fffa0501adde36890b0c1887157cc161010cda36655aeddfd583075e4f5cc7
 EBUILD portage-2.3.8.ebuild 8184 BLAKE2B 82741887eae10f0618155d62129b43e52d4295847411ee3128a594e7679e0270eb924e34e9a5da5814092d2a02cb901592981a7c2bbf8e45498f2e28ff68bf28 SHA512 089f05718ee3fe0c8738af8653f76b2c9f7b65782fb29ae2a3d055af3dc3fff1f27c9a38620606f45416c6cd6d4b84a86db68ed43ddc41da5312487168383dfb
 EBUILD portage-9999.ebuild 8811 BLAKE2B 2b31ee7001e79f48f4d0e0d8ef131bec99cd2625fd95818e02606b849d4ccdc56a67377a6f4965983ce8933fdf6096a239fd1d86644c9b852e74bc934db130d1 SHA512 9b5fdc9ea17f6f7ccb3358b27a3c16736ed989601c74e69e9168ab44c215dc3ad69710e2e408b4f1d4676f1c5a19abdb93b80fd674051150882f2e5da42106ee
 MISC metadata.xml 1415 BLAKE2B 0bad16a272e536342079102034e68130eb96a93e46fb811d1c89d00a4b4bf911f8cf42a93bb4d8fae8086c9e47601a709bd4fa5fb41c3e754c1f08c2f7acbe33 SHA512 a4556fbc0ae69691bff793e73b504e9898a5ec187df28d23a37a3290a94c78d4eaa3a3ac70a997c6456be9b72281916965fdea6a057df58aa15090f630d2ce59
diff --git a/sys-apps/portage/portage-2.3.39.ebuild b/sys-apps/portage/portage-2.3.39.ebuild
new file mode 100644
index 000000000000..677674ee4de0
--- /dev/null
+++ b/sys-apps/portage/portage-2.3.39.ebuild
@@ -0,0 +1,284 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=(
+	pypy
+	python3_4 python3_5 python3_6
+	python2_7
+)
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+
+inherit distutils-r1 systemd
+
+DESCRIPTION="Portage is the package management and distribution system for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+SLOT="0"
+IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
+
+DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	>=sys-apps/sed-4.0.5 sys-devel/patch
+	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
+	epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
+# Require sandbox-2.2 for bug #288863.
+# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
+# quite slow, so it's not considered in the dependencies as an alternative to
+# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
+# for now, don't pull in xattr deps for other kernels.
+# For whirlpool hash, require python[ssl] (bug #425046).
+# For compgen, require bash[readline] (bug #445576).
+# app-portage/gemato goes without PYTHON_USEDEP since we're calling
+# the executable.
+RDEPEND="
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	!build? (
+		>=sys-apps/sed-4.0.5
+		app-shells/bash:0[readline]
+		>=app-admin/eselect-1.2
+		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
+			python{2_7,3_4,3_5} pypy)
+		rsync-verify? (
+			>=app-portage/gemato-12.1
+			app-crypt/openpgp-keys-gentoo-release
+			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
+		)
+	)
+	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
+	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+	elibc_musl? ( >=sys-apps/sandbox-2.2 )
+	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
+	>=app-misc/pax-utils-0.1.17
+	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
+	xattr? ( kernel_linux? (
+		>=sys-apps/install-xattr-0.3
+		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
+			python2_7 pypy)
+	) )
+	!<app-admin/logrotate-3.8.0"
+PDEPEND="
+	!build? (
+		>=net-misc/rsync-2.6.4
+		userland_GNU? ( >=sys-apps/coreutils-6.4 )
+	)"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# NOTE: FEATURES=installsources requires debugedit and rsync
+
+REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
+
+SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives"
+
+prefix_src_archives() {
+	local x y
+	for x in ${@}; do
+		for y in ${SRC_ARCHIVES}; do
+			echo ${y}/${x}
+		done
+	done
+}
+
+TARBALL_PV=${PV}
+SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
+	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
+
+pkg_setup() {
+	use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
+}
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	if use gentoo-dev; then
+		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
+		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
+			-i pym/_emerge/create_depgraph_params.py || \
+			die "failed to patch create_depgraph_params.py"
+
+		einfo "Enabling additional FEATURES for gentoo-dev..."
+		echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox strict-keepdir"' \
+			>> cnf/make.globals || die
+	fi
+
+	if use native-extensions; then
+		printf "[build_ext]\nportage-ext-modules=true\n" >> \
+			setup.cfg || die
+	fi
+
+	if ! use ipc ; then
+		einfo "Disabling ipc..."
+		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
+			-i pym/_emerge/AbstractEbuildProcess.py || \
+			die "failed to patch AbstractEbuildProcess.py"
+	fi
+
+	if use xattr && use kernel_linux ; then
+		einfo "Adding FEATURES=xattr to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	if use build || ! use rsync-verify; then
+		sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
+			-i cnf/repos.conf || die "sed failed"
+	fi
+
+	if [[ -n ${EPREFIX} ]] ; then
+		einfo "Setting portage.const.EPREFIX ..."
+		sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
+			-i pym/portage/const.py || \
+			die "Failed to patch portage.const.EPREFIX"
+
+		einfo "Prefixing shebangs ..."
+		while read -r -d $'\0' ; do
+			local shebang=$(head -n1 "$REPLY")
+			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
+					die "sed failed"
+			fi
+		done < <(find . -type f -print0)
+
+		einfo "Adjusting make.globals ..."
+		sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
+			-e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
+			-i cnf/make.globals || die "sed failed"
+
+		einfo "Adjusting repos.conf ..."
+		sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(sync-openpgp-key-path = \)\(.*\)|\\1${EPREFIX}\\2|" \
+			-i cnf/repos.conf || die "sed failed"
+		if use prefix-guest ; then
+			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
+				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
+				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
+				-i cnf/repos.conf || die "sed failed"
+		fi
+
+		einfo "Adding FEATURES=force-prefix to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	cd "${S}/cnf" || die
+	if [ -f "make.conf.example.${ARCH}".diff ]; then
+		patch make.conf.example "make.conf.example.${ARCH}".diff || \
+			die "Failed to patch make.conf.example"
+	else
+		eerror ""
+		eerror "Portage does not have an arch-specific configuration for this arch."
+		eerror "Please notify the arch maintainer about this issue. Using generic."
+		eerror ""
+	fi
+}
+
+python_compile_all() {
+	local targets=()
+	use doc && targets+=( docbook )
+	use epydoc && targets+=( epydoc )
+
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install() {
+	# Install sbin scripts to bindir for python-exec linking
+	# they will be relocated in pkg_preinst()
+	distutils-r1_python_install \
+		--system-prefix="${EPREFIX}/usr" \
+		--bindir="$(python_get_scriptdir)" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
+		--sbindir="$(python_get_scriptdir)" \
+		--sysconfdir="${EPREFIX}/etc" \
+		"${@}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	local targets=()
+	use doc && targets+=(
+		install_docbook
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
+	use epydoc && targets+=(
+		install_epydoc
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
+
+	# install docs
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+
+	systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf
+
+	# Due to distutils/python-exec limitations
+	# these must be installed to /usr/bin.
+	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
+	einfo "Moving admin scripts to the correct directory"
+	dodir /usr/sbin
+	for target in ${sbin_relocations}; do
+		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
+		mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
+	done
+}
+
+pkg_preinst() {
+	# comment out sanity test until it is fixed to work
+	# with the new PORTAGE_PYM_PATH
+	#if [[ $ROOT == / ]] ; then
+		## Run some minimal tests as a sanity check.
+		#local test_runner=$(find "${ED}" -name runTests)
+		#if [[ -n $test_runner && -x $test_runner ]] ; then
+			#einfo "Running preinst sanity tests..."
+			#"$test_runner" || die "preinst sanity tests failed"
+		#fi
+	#fi
+
+	# elog dir must exist to avoid logrotate error for bug #415911.
+	# This code runs in preinst in order to bypass the mapping of
+	# portage:portage to root:root which happens after src_install.
+	keepdir /var/log/portage/elog
+	# This is allowed to fail if the user/group are invalid for prefix users.
+	if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
+		chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
+	fi
+
+	if has_version ">=${CATEGORY}/${PN}-2.3.1" && \
+		has_version "<${CATEGORY}/${PN}-2.3.3"; then
+		SYNC_DEPTH_UPGRADE=true
+	else
+		SYNC_DEPTH_UPGRADE=false
+	fi
+}
+
+pkg_postinst() {
+	if ${SYNC_DEPTH_UPGRADE}; then
+		ewarn "Please note that this release no longer respects sync-depth for"
+		ewarn "git repositories.  There have been too many problems and"
+		ewarn "performance issues.  See bugs 552814, 559008"
+	fi
+	einfo ""
+	einfo "This release of portage NO LONGER contains the repoman code base."
+	einfo "Repoman has its own ebuild and release package."
+	einfo "For repoman functionality please emerge app-portage/repoman"
+	einfo "Please report any bugs you may encounter."
+	einfo ""
+}
diff --git a/sys-apps/restorecond/Manifest b/sys-apps/restorecond/Manifest
index 77cdf682e882..b2092e4b938b 100644
--- a/sys-apps/restorecond/Manifest
+++ b/sys-apps/restorecond/Manifest
@@ -1,11 +1,7 @@
 AUX restorecond.init 650 BLAKE2B 507c65c11f756d5cf11045ba75d40a39a9fb6a527c9e0406247e8d2d06a41ec977110bdb9c77f4a75d97fc179bf507b0fd58b962c1976eff57a743cf019c684a SHA512 ee0ff9bfe542124eff0217dbf9cc2e00586b4577e0eee2bfa67946f78a97fe009c6e5c337e8ad68e1cd9af2f69ec3ce3acba9157b4d53c2fdeeb01f9e0aa9d0a
 DIST restorecond-2.7.tar.gz 17753 BLAKE2B 793a41dbfd0a33d79e15c62e79f4fbbacc4208a8f2057813d7c3e2d16a3435c12e0c29ca60a3b45cef33ec13b5aacd28c8ad95ddcbf47a812654d3a59fcb6c89 SHA512 c81950e4f748a729c8951b13a4075ab1003530f8ada7a9d3fbe6428f76070df4819a37daaab557b63fc234aa8c8320ec41757fbdb24b76fa2c11747bde0038ad
-DIST restorecond-2.8-rc1.tar.gz 17778 BLAKE2B 7f0c3da54555f1bd015e191ab762d5564e8e40d1aceafa94fc774c0864f9ff720c468679a60869dc94280e89a160369afcdf2172a6aaee1b0ce555dc204cd957 SHA512 9b90485998bbabeb26d1ca197b78dadc2ad4aa15fc3eb30f16809e631009ce07f2a624d8e0c139cb6ea831ff46068de2744168c6ee0414693716b4963c8e3be9
-DIST restorecond-2.8-rc2.tar.gz 17778 BLAKE2B 47bf2f3481dd94b1b63a8d5994f94cbecb99d84835e4c61d133f89e5be42650f69794dae9c80115a73614ec0548e2773c7a03bac33e666ac989badb20d0438cd SHA512 5d35576264b59face6130e97223d815df0f114b3e51d9e5008dddbb31a802763b346bf2f69a8ae8271c5dcacf04235e2ed3de305b036b8108b76f4951ff2d126
-DIST restorecond-2.8-rc3.tar.gz 17773 BLAKE2B 23492c3f2a8aa8b85236e4c4ac4e8f1dad090d7b1585e5ffe26face4f3b689a6a083944f107ca1fc2241a35f5373699ae216828ec8e44f37bd7dd28ad60546a5 SHA512 1e52a2767e497d43125202ba66799c556b6a2d521ec6d747f96208e3b1d2c4bc8f7f28b3ca86fe47c0e0a2daac1de811a0630f02196a4c9502868a8c5e571dfc
+DIST restorecond-2.8.tar.gz 17740 BLAKE2B ad873acbbb7c56c29a8523a42dc053ea79036a15bed71b47a690d01d4012394b5ecf74ae75b27affb4007d754935ec90246f22ef3e0b9611556ec7baf59670db SHA512 5d72336782c3ad095746f8e6fa67e36448e5e76ca29586d8fe4962c64e505fa95c1458e8fc8f7d5bd589fff71b4be3758fb0cee3dacd2ccd0bc8476423e2540e
 EBUILD restorecond-2.7.ebuild 1250 BLAKE2B 7ae1b18d0eb9906ace64c5e2191c894fe424e69fe4f38f14238b3706c426a8272ea7f35ba5237a3375f7329d2140b78c02161cc855460e70f09d7c3f4850a51a SHA512 c5bbc404f56d756897433561485a6c90d5bdfb70958181cf5b670bb4a3dc9b428f91b8960e0960251d7acdd35f0e9b6141c5f4056f90d934a913b5b5ebfc6af8
-EBUILD restorecond-2.8_rc1.ebuild 1167 BLAKE2B 448e2bef9436bf28d3f77496845a7a7dd4a814528f6c06fb69710c5005483da5c6d509904b2ca1dd74c60b8926db9a1b5ece0e10e28fd32bb394b91d616f6ae0 SHA512 1024de33914bebbffe48aa5870d076ea76e6afa4abfabd2d3afd813977f3add30cf0efd29b2e360ca7a4bc26b9d13c445c81c23a5fc3ba9963ff195ef2174be5
-EBUILD restorecond-2.8_rc2.ebuild 1167 BLAKE2B bfcf47b777ded91dff77cb9beed7e627f87162a896ccc498d5ced9bae693bb3c8c6c748d8808f89bfbda11224f7fe5f046f50d0f75ff0a86c9097d148429bba1 SHA512 81b6880c7d16cc31b066930cb0c23f27454d10c558169fe1963339629f26a0718f1534f0780200053932e8df4b45c2e6460664e124a054a25c8570e7376f605e
-EBUILD restorecond-2.8_rc3.ebuild 1167 BLAKE2B 806ca12e275725aece6b45965c46b9c8307b7b1515e7f08d69759c433917b2c3062b0dd5aa04c4004abb62876fa80ac7e90b3759566d7d8ea24660517eb1f65e SHA512 1569e398dc18c06e86630fb5a1959214898b08368868cd08f79c7afb3c7ba8a749cf3ae179018b6d7a01deb1aad5c160df3db2446758556eea31b5e136811469
-EBUILD restorecond-9999.ebuild 1167 BLAKE2B 806ca12e275725aece6b45965c46b9c8307b7b1515e7f08d69759c433917b2c3062b0dd5aa04c4004abb62876fa80ac7e90b3759566d7d8ea24660517eb1f65e SHA512 1569e398dc18c06e86630fb5a1959214898b08368868cd08f79c7afb3c7ba8a749cf3ae179018b6d7a01deb1aad5c160df3db2446758556eea31b5e136811469
+EBUILD restorecond-2.8.ebuild 1167 BLAKE2B 8abd796a13078dbc295d7609a0687d5b9d0ada389a1fde40d77dbc93e738e63cf1845fc6648dfd65b18422218912030ec3613befaf36f62cd5951d9b458cba60 SHA512 60366fd70b14a718858e4a18bbcd4e6b3d2d74c61b0339d0f78df4c5cdfb13817301e7559019cd4fe16c5130f8217c9b68ddb07f49bd19df80677a42752309ca
+EBUILD restorecond-9999.ebuild 1167 BLAKE2B 8abd796a13078dbc295d7609a0687d5b9d0ada389a1fde40d77dbc93e738e63cf1845fc6648dfd65b18422218912030ec3613befaf36f62cd5951d9b458cba60 SHA512 60366fd70b14a718858e4a18bbcd4e6b3d2d74c61b0339d0f78df4c5cdfb13817301e7559019cd4fe16c5130f8217c9b68ddb07f49bd19df80677a42752309ca
 MISC metadata.xml 460 BLAKE2B d0de63ca5ac8e0c1c061f418ea9dba5472644626bbc5799499ce70ff0c2d1c7e49b023e3855cc7c767e78f5fb6f62429f5aab59dd272d9a906dbe026895e2e46 SHA512 0e4910de5e3932eb2914ddf4ef3250ae919885428337b1939f6827037a4dc5a75b13c97531c7b81748b1c90e3eb2b10a4671c76ede69749dbd1955bc67b5ca0a
diff --git a/sys-apps/restorecond/restorecond-2.8_rc2.ebuild b/sys-apps/restorecond/restorecond-2.8.ebuild
index 1f417fd9bef1..fe377bb27bd6 100644
--- a/sys-apps/restorecond/restorecond-2.8_rc2.ebuild
+++ b/sys-apps/restorecond/restorecond-2.8.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
 
 inherit toolchain-funcs
 
-MY_RELEASEDATE="20180426"
+MY_RELEASEDATE="20180524"
 
 MY_P="${P//_/-}"
 IUSE=""
diff --git a/sys-apps/restorecond/restorecond-2.8_rc1.ebuild b/sys-apps/restorecond/restorecond-2.8_rc1.ebuild
deleted file mode 100644
index 78002784e9c6..000000000000
--- a/sys-apps/restorecond/restorecond-2.8_rc1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs
-
-MY_RELEASEDATE="20180419"
-
-MY_P="${P//_/-}"
-IUSE=""
-
-if [[ ${PV} == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
-	S="${WORKDIR}/${MY_P}/${PN}"
-else
-	SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="Daemon to watch for creation and set default SELinux fcontexts"
-HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND=">=sys-libs/libsepol-${PV}:=
-	>=sys-libs/libselinux-${PV}:=
-	dev-libs/dbus-glib
-	dev-libs/libpcre:=
-	>=sys-libs/libcap-1.10-r10:="
-
-RDEPEND="${DEPEND}
-	!<sys-apps/policycoreutils-2.7_pre"
-
-src_prepare() {
-	default
-
-	sed -i 's/-Werror//g' "${S}"/Makefile || die "Failed to remove Werror"
-}
-
-src_compile() {
-	tc-export CC
-	default
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	rm -rf "${D}/etc/rc.d" || die
-
-	newinitd "${FILESDIR}/restorecond.init" restorecond
-}
diff --git a/sys-apps/restorecond/restorecond-2.8_rc3.ebuild b/sys-apps/restorecond/restorecond-2.8_rc3.ebuild
deleted file mode 100644
index 968d6b3de58b..000000000000
--- a/sys-apps/restorecond/restorecond-2.8_rc3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs
-
-MY_RELEASEDATE="20180510"
-
-MY_P="${P//_/-}"
-IUSE=""
-
-if [[ ${PV} == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
-	S="${WORKDIR}/${MY_P}/${PN}"
-else
-	SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="Daemon to watch for creation and set default SELinux fcontexts"
-HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND=">=sys-libs/libsepol-${PV}:=
-	>=sys-libs/libselinux-${PV}:=
-	dev-libs/dbus-glib
-	dev-libs/libpcre:=
-	>=sys-libs/libcap-1.10-r10:="
-
-RDEPEND="${DEPEND}
-	!<sys-apps/policycoreutils-2.7_pre"
-
-src_prepare() {
-	default
-
-	sed -i 's/-Werror//g' "${S}"/Makefile || die "Failed to remove Werror"
-}
-
-src_compile() {
-	tc-export CC
-	default
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	rm -rf "${D}/etc/rc.d" || die
-
-	newinitd "${FILESDIR}/restorecond.init" restorecond
-}
diff --git a/sys-apps/restorecond/restorecond-9999.ebuild b/sys-apps/restorecond/restorecond-9999.ebuild
index 968d6b3de58b..fe377bb27bd6 100644
--- a/sys-apps/restorecond/restorecond-9999.ebuild
+++ b/sys-apps/restorecond/restorecond-9999.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
 
 inherit toolchain-funcs
 
-MY_RELEASEDATE="20180510"
+MY_RELEASEDATE="20180524"
 
 MY_P="${P//_/-}"
 IUSE=""
diff --git a/sys-apps/secilc/Manifest b/sys-apps/secilc/Manifest
index 9445eed2fa81..2df02177f12e 100644
--- a/sys-apps/secilc/Manifest
+++ b/sys-apps/secilc/Manifest
@@ -1,12 +1,6 @@
-DIST secilc-2.6.tar.gz 174543 BLAKE2B a540fc1b0e1821bb5177be57904602280ec8808c1cd4248385850db288493390e1340e637b98cfa75d27bc4e02555bcb4174b9946c30be160ba6220034befe6e SHA512 5d59320d599d15754d76d36d981a1927d9633db9813f0248c29c9ff38bc59bf394910f4d56444a97df910b48e59f128d9997a85b6bd2ee8e0dd3ae31a9a2b7d0
 DIST secilc-2.7.tar.gz 175733 BLAKE2B dfad83618f3dd14f4a710d27b6ff3dbe188c9e1eecabe29dd16d9b0ba35a2aa2c5777d999fb378159624f7b7af9af152592e69f9212d2ae6dc6e52dbefcba056 SHA512 cd828ad34e80151951f94414d27246b480cd4831d1d57cb35d5958ce23c30fe74f26ec1c4b29b51fe382bf03ec3144311b35ca645ffc6b914b7abfe677684c06
-DIST secilc-2.8-rc1.tar.gz 175892 BLAKE2B e919e7a519c02e4ff467aa086e1112d26fe2e32d30406ca34859703158d51b473353cd8b6c9825dc824f6fc09774993ab6386390ae2f9262f5afc80a19ca08fa SHA512 c4ed860b4a35bbd4d2e9f20810deea8f8158825e24d55d97c122a8ffda0a7c8c16d84f966e923b371359c807620308e2c7fc10bccb384a94216a7b92d756ac13
-DIST secilc-2.8-rc2.tar.gz 175891 BLAKE2B 15874f9de10c9cfcd063e9b3aa1c75427e3953fbb1b21127a5af3f1e49b34de59b01e5a813c6b82eaf38a4443b5aeb7d9669018c09c7a2d7a3552ee7a3a6be80 SHA512 b08990900817ac0c334ab59c70d88acd491e8203cbdb8a0fedd2c044be61fbafd8ae86fda1d32a87e605676c6f8cd123b2716de2920b8ed0efb8b05b4fdd0eff
-DIST secilc-2.8-rc3.tar.gz 175888 BLAKE2B 4121c26b1d3f9479aa1fa2a5fbdc54944ff2040864bd65160b78c4e0b0e3f9e1a48c2903a5273e767ac7389152b46c5c65d94ccac5fb2b4f0f17ed63f74c2939 SHA512 ff457379e21362e102596a1619f77b42570634871427134e380d004b6711b327693339dfa52dda777b984f8019f56b4c056bf0f84f76173119b2ecedb03f73fb
-EBUILD secilc-2.6.ebuild 856 BLAKE2B 4366abf0099faf79a5daaa7966c59c6d42b4bfb4728bcffa6ae584bb9b3e22dfc5cde71e47080c3e9ff4ff534612264edb690877892bfce83feecc370b5fa417 SHA512 062650227a2625af512e415b5f9f85f74f3045962637ae543bfa0657312ae655532deb86932952d025517cdee7b350d294896addcdea55c55f559c23391afbf7
+DIST secilc-2.8.tar.gz 175893 BLAKE2B d1e588c82d8be68efb66abbcedf28b3f99ac58edf58df238d970243b7a9c94109fcfc6958907fd4f614381e9ee4e248796b556a37a283d6f0e602a98349c1dd9 SHA512 70b92802af8bdfbeb458ccaaed74e00e8a1edfcdbb48a0b422cf1e98ce467db1a586c800574ae61b0fbf006330c603b44d022091d7bcb6b0963ef1b1c6e547c1
 EBUILD secilc-2.7.ebuild 922 BLAKE2B 0316d98a09d332cc1781f25776e6408fcac8cc4b3d3fa76ed0f1e897a7aa1bd7dcde16ac55f200a04e941d5dec63e6cc8f6c319ae0f2f96d6b828e5ea63b898b SHA512 dc913463e0a5d9c3367712c4e4d7a096b0ae84d0e188086f3328a66d081a92e45f2f12df86e8d5e7e175e9196ac6c3a3acbcf29870ca04f5e23aa8aa46715b28
-EBUILD secilc-2.8_rc1.ebuild 924 BLAKE2B 302d7ca0c5797aca16b8007e4002c75cf0802970c46d801a4b9302ffec74c886883ddf92f40971c5817fd6d6b5e679ac82a743220554df78c4536160c1893362 SHA512 06b5ccac475056c11f8281a48f1ae280bb61798c68d3a6242406da12b810a9cca912af0e76dba17236f7b68f1581650b325f34352db6d07a3ce335f45d5c1a66
-EBUILD secilc-2.8_rc2.ebuild 924 BLAKE2B 9be7580bdd9e1e6068d59411005b774b41e83c52225c3b7be206b0e0b8f548f69347886f11bb7b746a1a4db92f9dcd41aa293daf17a201f6f9852414b37dc125 SHA512 ad506e4a58ebee554ce62ec740c2f6b99b7bb105596895edcff702773ff1ee7fdb3ea999863e308c354c360cf20942c4ceb6a235811adf1d3dfaeba2f22fd7d1
-EBUILD secilc-2.8_rc3.ebuild 924 BLAKE2B e6180aea71db97e89bb322be9e6e7ae4574554d61188e085fd686a8272ca41a0816bfc243952395d75d791df54df1cd06ff1bdf6c19c04551d9689ddf7be7b0e SHA512 bff408e870e17227dc055c865131dccc46628e0d1115135ae1ca3f5ae16c5073a2e6322b5ac4321aa7e2525319a6ba5a1cedf8fe746985b9ae0b1b70a7258dc1
-EBUILD secilc-9999.ebuild 924 BLAKE2B e6180aea71db97e89bb322be9e6e7ae4574554d61188e085fd686a8272ca41a0816bfc243952395d75d791df54df1cd06ff1bdf6c19c04551d9689ddf7be7b0e SHA512 bff408e870e17227dc055c865131dccc46628e0d1115135ae1ca3f5ae16c5073a2e6322b5ac4321aa7e2525319a6ba5a1cedf8fe746985b9ae0b1b70a7258dc1
+EBUILD secilc-2.8.ebuild 924 BLAKE2B 6e71813361b90f35e5cbad6bfc91d44c1e1c9946c12db18f87a6e10685b4eb97c7463ee278a20da7b482069410c96ba2fbcc20934fb82575a3dad229d6f87525 SHA512 0e252228f316d76c3cc544edd8dcb13e46b27556b23c22e8220e33ac8027fc1c31bb06e4ceaaf588ca8ee2f67811fd1cbd168704d3bb255fbb6fd700caf1266f
+EBUILD secilc-9999.ebuild 924 BLAKE2B 6e71813361b90f35e5cbad6bfc91d44c1e1c9946c12db18f87a6e10685b4eb97c7463ee278a20da7b482069410c96ba2fbcc20934fb82575a3dad229d6f87525 SHA512 0e252228f316d76c3cc544edd8dcb13e46b27556b23c22e8220e33ac8027fc1c31bb06e4ceaaf588ca8ee2f67811fd1cbd168704d3bb255fbb6fd700caf1266f
 MISC metadata.xml 517 BLAKE2B 69224c0360ff5acd98dcd493463266090ad17693588e91a434e412460352594673563388b52eba5313c7a9aa3b745d916f089805fe88ba8270cef1528f1fe13c SHA512 457ff97de6f9c6992a025588a5af5692abfc38a7df8537de2006ac841989a9b7e566b796b16d304252ad03cf66f205dd3a4fb0218281fd551c430c58b9039310
diff --git a/sys-apps/secilc/secilc-2.6.ebuild b/sys-apps/secilc/secilc-2.6.ebuild
deleted file mode 100644
index 4dbf6ea81427..000000000000
--- a/sys-apps/secilc/secilc-2.6.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-MY_P="${P//_/-}"
-MY_RELEASEDATE="20161014"
-
-SEPOL_VER="${PV}"
-
-DESCRIPTION="SELinux Common Intermediate Language (CIL) Compiler"
-HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
-	S="${WORKDIR}/${MY_P}/${PN}"
-else
-	SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="amd64 x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	app-text/xmlto
-	>=sys-libs/libsepol-${SEPOL_VER}
-	"
-RDEPEND="
-	>=sys-libs/libsepol-${SEPOL_VER}
-	"
-
-# tests are not meant to be run outside of the
-# full SELinux userland repo
-RESTRICT="test"
diff --git a/sys-apps/secilc/secilc-2.8_rc1.ebuild b/sys-apps/secilc/secilc-2.8.ebuild
index 4e6f3c66ad82..8ff2138afafc 100644
--- a/sys-apps/secilc/secilc-2.8_rc1.ebuild
+++ b/sys-apps/secilc/secilc-2.8.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
 inherit toolchain-funcs
 
 MY_P="${P//_/-}"
-MY_RELEASEDATE="20180419"
+MY_RELEASEDATE="20180524"
 
 SEPOL_VER="${PV}"
 
diff --git a/sys-apps/secilc/secilc-2.8_rc2.ebuild b/sys-apps/secilc/secilc-2.8_rc2.ebuild
deleted file mode 100644
index cbce8f70e767..000000000000
--- a/sys-apps/secilc/secilc-2.8_rc2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit toolchain-funcs
-
-MY_P="${P//_/-}"
-MY_RELEASEDATE="20180426"
-
-SEPOL_VER="${PV}"
-
-DESCRIPTION="SELinux Common Intermediate Language (CIL) Compiler"
-HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
-	S="${WORKDIR}/${MY_P}/${PN}"
-else
-	SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	app-text/xmlto
-	>=sys-libs/libsepol-${SEPOL_VER}
-	"
-RDEPEND="
-	>=sys-libs/libsepol-${SEPOL_VER}
-	"
-
-# tests are not meant to be run outside of the
-# full SELinux userland repo
-RESTRICT="test"
-
-src_compile() {
-	tc-export CC
-	default
-}
diff --git a/sys-apps/secilc/secilc-2.8_rc3.ebuild b/sys-apps/secilc/secilc-2.8_rc3.ebuild
deleted file mode 100644
index 6587d7e6b168..000000000000
--- a/sys-apps/secilc/secilc-2.8_rc3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit toolchain-funcs
-
-MY_P="${P//_/-}"
-MY_RELEASEDATE="20180510"
-
-SEPOL_VER="${PV}"
-
-DESCRIPTION="SELinux Common Intermediate Language (CIL) Compiler"
-HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
-	S="${WORKDIR}/${MY_P}/${PN}"
-else
-	SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	app-text/xmlto
-	>=sys-libs/libsepol-${SEPOL_VER}
-	"
-RDEPEND="
-	>=sys-libs/libsepol-${SEPOL_VER}
-	"
-
-# tests are not meant to be run outside of the
-# full SELinux userland repo
-RESTRICT="test"
-
-src_compile() {
-	tc-export CC
-	default
-}
diff --git a/sys-apps/secilc/secilc-9999.ebuild b/sys-apps/secilc/secilc-9999.ebuild
index 6587d7e6b168..8ff2138afafc 100644
--- a/sys-apps/secilc/secilc-9999.ebuild
+++ b/sys-apps/secilc/secilc-9999.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
 inherit toolchain-funcs
 
 MY_P="${P//_/-}"
-MY_RELEASEDATE="20180510"
+MY_RELEASEDATE="20180524"
 
 SEPOL_VER="${PV}"
 
diff --git a/sys-apps/selinux-python/Manifest b/sys-apps/selinux-python/Manifest
index 9d6d2a6574e8..31c30bbeeb86 100644
--- a/sys-apps/selinux-python/Manifest
+++ b/sys-apps/selinux-python/Manifest
@@ -1,10 +1,6 @@
 DIST selinux-python-2.7.tar.gz 2068004 BLAKE2B 57c7f324a8faddf57a576f9ec5c46c8dbbd085a3aff4355df645b0f391a0c2db718e8adb2719515cc4a9c386e11c3df053b5303d3f91ff4958fb91e80d440b51 SHA512 df8645e7ac9ca568f0c9d81c42b93d0abadc43c22f14d38451ab262b52132cfb7abd7742e3a00ab9c153f95dd5b23b3a496d84875debcd9787f75d940eb45c28
-DIST selinux-python-2.8-rc1.tar.gz 2068420 BLAKE2B 7c00bd05cb692ae31e11c5d415641f5ceafd032882a329984a495b353e8e7272a87045c732e10a563cd0d33faca81fb373cee3d0671bc6699b6f007148f13d7d SHA512 bce5823ac4c24f1bceae9219a07fc9e6192d703e044711f9dfc170946dde411b833cb7a6d0c175e569efcd878a75a8df33dda0498e3da888f60b7adf9d5448a1
-DIST selinux-python-2.8-rc2.tar.gz 2068421 BLAKE2B 1c1564f9eb281f896a794a5086ef09e91486f8ba7d404de14b0de78f3ec4aa9c3a8293b24988b80289e4e9e186b06184e8016a1ec936d6d76f17db0c3ef22a40 SHA512 5a3fb2131a12850bfe5beb794083c97507fd3f43d87674cb7050fd33ea181607077a9e004cf983918bb5b349ed22b02f3c681f2a1f72a64ee93bd49fbf40bd32
-DIST selinux-python-2.8-rc3.tar.gz 2068452 BLAKE2B 37e25ac52ea157f5bb360d1391ad17c59c9dd74eb3cab4053bef0aef98b38d2e0eb2c79bb468591b91462494788e11b0b445ca123a291e4875bbf4af9ef326a0 SHA512 0481891563df1872688d881d11bb498cbd402f7b31eb674fb83526e9fa391907b424be3df5da0cef17e053e3aca3200333bf90acfe42f7f58929f322ad447ab3
+DIST selinux-python-2.8.tar.gz 2068101 BLAKE2B c28f12e4bd453955148a6ba82fd28621d1a4600f872ac63d97372f2e0153091adf1cf871f89765dd300bc6b7b2d610b96f87e3fc5accbfad713ed8a0d8f76f5a SHA512 e695c11122f7f8105b75d1ef98355fd2b82b40d93c2fd9e733dcd95d4d7c392f60b646df81203c43ad2a0e8447f9901083007e1572b78e17368ad2764ffa1aad
 EBUILD selinux-python-2.7.ebuild 2673 BLAKE2B 14692ea38d55be1eb9b17dde7b4f1c7195139543347314896527c442931812bdac4524cd75c66b654d9b778ed4d6d213d21f2b8b1f3dc424b4bf8101da08bb07 SHA512 ad6d6047b551c82464d58de569cbe7c4137d0e5c87125164690bab4aac5bb48fa01059e31e1cb6de99a0abfd942c7294fefecced7e4b19d8dc4715b398c788c6
-EBUILD selinux-python-2.8_rc1.ebuild 2585 BLAKE2B 5493f174730a4905b9110f7eafc0c1e3bcaac09ca592725fccd4624aa47649ec013043828707a290f7cd39ce261fb91200b0a1fa21cdd014213f111bfdfa5d62 SHA512 ed7617917eb838f0a40cff44b996e3f2de5760ad8aa199cb710eb7d5e145de4b27cf056911da424dd9944c64b44c24beb599b6d1c07793d0df888b61afa5dfad
-EBUILD selinux-python-2.8_rc2.ebuild 2585 BLAKE2B b2707890a99d88550aef69c068f1fe50f645770d856540470bce968cad32ad777e118486cc16a8c6e7bd00b6dc5b0c02ea4f751ad599c76cfe8061d5eb138368 SHA512 27c8b1171fd5d40e5cbd8ba417e6927cffdba8228cb362f7df9c95c22e6f55a0e8d2e8a3b743c05bd3eb66eecea68a056a5c8f055d4f6bf52968e23138af00e7
-EBUILD selinux-python-2.8_rc3.ebuild 2585 BLAKE2B a431576fa2251512fa4722238d40a7226ba7e448bc558cd1eb4b59415815796d6c9a10cf95b3ecf88831b25c2585b3dedf4cf7da76b1bea6fd43b2c7e151834c SHA512 cc6c35e9a3118f49545d19a319c38ac9469c0a7516dada311c6fc4ef4ced05199540528e0b3a84997c4c09a4a87ff34c98e30355bbd80f6ef5bb5f485c7f57aa
-EBUILD selinux-python-9999.ebuild 2585 BLAKE2B a431576fa2251512fa4722238d40a7226ba7e448bc558cd1eb4b59415815796d6c9a10cf95b3ecf88831b25c2585b3dedf4cf7da76b1bea6fd43b2c7e151834c SHA512 cc6c35e9a3118f49545d19a319c38ac9469c0a7516dada311c6fc4ef4ced05199540528e0b3a84997c4c09a4a87ff34c98e30355bbd80f6ef5bb5f485c7f57aa
+EBUILD selinux-python-2.8.ebuild 2585 BLAKE2B 8e01d08781d9c53b2832b939073f0e720abfadddfa5de47a64e69fe4e99c813e1e94db5e593031981aba443b374f130fa0ae6d95ae6cf9178e64bf21b5183941 SHA512 cf4ac70801dcd0bb15c292c7b85e3818e34146d09176446a9068ab5826fe82d7167e8761f5548825f3a36b2545447c85f067d48468f70d52a094757a39811f4e
+EBUILD selinux-python-9999.ebuild 2585 BLAKE2B 8e01d08781d9c53b2832b939073f0e720abfadddfa5de47a64e69fe4e99c813e1e94db5e593031981aba443b374f130fa0ae6d95ae6cf9178e64bf21b5183941 SHA512 cf4ac70801dcd0bb15c292c7b85e3818e34146d09176446a9068ab5826fe82d7167e8761f5548825f3a36b2545447c85f067d48468f70d52a094757a39811f4e
 MISC metadata.xml 718 BLAKE2B ca11527a8722aa1c1f74f1731409e950f866094492f15e9345c117622da63f06bb5681e806545083200a494d3b65f0c4f31e1454aea5fed923f438ef01aa91af SHA512 a45a1c3e516dd956e60be67ddce632d055a98ff0fb45b920adfb5d1253da77822286f9742865027a47e94386dad2a1478a5b51f2bf9a97e2c2571470fdb34e04
diff --git a/sys-apps/selinux-python/selinux-python-2.8_rc2.ebuild b/sys-apps/selinux-python/selinux-python-2.8.ebuild
index 73a4652fbf63..96a4fbaa8e14 100644
--- a/sys-apps/selinux-python/selinux-python-2.8_rc2.ebuild
+++ b/sys-apps/selinux-python/selinux-python-2.8.ebuild
@@ -9,7 +9,7 @@ inherit python-r1 toolchain-funcs
 
 MY_P="${P//_/-}"
 
-MY_RELEASEDATE="20180426"
+MY_RELEASEDATE="20180524"
 SEPOL_VER="${PV}"
 SELNX_VER="${PV}"
 SEMNG_VER="${PV}"
diff --git a/sys-apps/selinux-python/selinux-python-2.8_rc1.ebuild b/sys-apps/selinux-python/selinux-python-2.8_rc1.ebuild
deleted file mode 100644
index abb33eda4e3f..000000000000
--- a/sys-apps/selinux-python/selinux-python-2.8_rc1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-PYTHON_REQ_USE="xml"
-
-inherit python-r1 toolchain-funcs
-
-MY_P="${P//_/-}"
-
-MY_RELEASEDATE="20180419"
-SEPOL_VER="${PV}"
-SELNX_VER="${PV}"
-SEMNG_VER="${PV}"
-
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DESCRIPTION="SELinux core utilities"
-HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
-	S="${WORKDIR}/${MY_P}/${PN#selinux-}"
-else
-	SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~mips ~x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND=">=sys-libs/libselinux-${SELNX_VER}:=[python]
-	>=sys-libs/libsemanage-${SEMNG_VER}:=[python]
-	>=sys-libs/libsepol-${SEPOL_VER}:=
-	>=app-admin/setools-4.1.1[${PYTHON_USEDEP}]
-	dev-python/ipy[${PYTHON_USEDEP}]
-	!dev-python/sepolgen
-	${PYTHON_DEPS}"
-
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	sed -i 's/-Werror//g' "${S}"/*/Makefile || die "Failed to remove Werror"
-
-	python_copy_sources
-}
-
-src_compile() {
-	building() {
-		emake -C "${BUILD_DIR}" \
-			CC="$(tc-getCC)" \
-			LIBDIR="\$(PREFIX)/$(get_libdir)"
-	}
-	python_foreach_impl building
-}
-
-src_install() {
-	installation() {
-		emake -C "${BUILD_DIR}" \
-			DESTDIR="${D}" \
-			LIBDIR="\$(PREFIX)/$(get_libdir)" \
-			install
-		python_optimize
-	}
-	python_foreach_impl installation
-
-	# Set version-specific scripts
-	for pyscript in audit2allow sepolgen-ifgen sepolicy chcat; do
-		python_replicate_script "${ED}/usr/bin/${pyscript}"
-	done
-	for pyscript in semanage; do
-		python_replicate_script "${ED}/usr/sbin/${pyscript}"
-	done
-
-	# Create sepolgen.conf with different devel location definition
-	if [[ -f /etc/selinux/config ]];
-	then
-		local selinuxtype=$(awk -F'=' '/^SELINUXTYPE/ {print $2}' /etc/selinux/config);
-		mkdir -p "${D}"/etc/selinux || die "Failed to create selinux directory";
-		echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include:/usr/share/selinux/${selinuxtype}" > "${D}"/etc/selinux/sepolgen.conf;
-	else
-		local selinuxtype="${POLICY_TYPES%% *}";
-		if [[ -n "${selinuxtype}" ]];
-		then
-			echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include:/usr/share/selinux/${selinuxtype}" > "${D}"/etc/selinux/sepolgen.conf;
-		else
-			echo "SELINUX_DEVEL_PATH=/usr/share/selinux/strict/include:/usr/share/selinux/strict" > "${D}"/etc/selinux/sepolgen.conf;
-		fi
-	fi
-}
diff --git a/sys-apps/selinux-python/selinux-python-2.8_rc3.ebuild b/sys-apps/selinux-python/selinux-python-2.8_rc3.ebuild
deleted file mode 100644
index 6fc19d34339a..000000000000
--- a/sys-apps/selinux-python/selinux-python-2.8_rc3.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-PYTHON_REQ_USE="xml"
-
-inherit python-r1 toolchain-funcs
-
-MY_P="${P//_/-}"
-
-MY_RELEASEDATE="20180510"
-SEPOL_VER="${PV}"
-SELNX_VER="${PV}"
-SEMNG_VER="${PV}"
-
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DESCRIPTION="SELinux core utilities"
-HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
-	S="${WORKDIR}/${MY_P}/${PN#selinux-}"
-else
-	SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~mips ~x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND=">=sys-libs/libselinux-${SELNX_VER}:=[python]
-	>=sys-libs/libsemanage-${SEMNG_VER}:=[python]
-	>=sys-libs/libsepol-${SEPOL_VER}:=
-	>=app-admin/setools-4.1.1[${PYTHON_USEDEP}]
-	dev-python/ipy[${PYTHON_USEDEP}]
-	!dev-python/sepolgen
-	${PYTHON_DEPS}"
-
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	sed -i 's/-Werror//g' "${S}"/*/Makefile || die "Failed to remove Werror"
-
-	python_copy_sources
-}
-
-src_compile() {
-	building() {
-		emake -C "${BUILD_DIR}" \
-			CC="$(tc-getCC)" \
-			LIBDIR="\$(PREFIX)/$(get_libdir)"
-	}
-	python_foreach_impl building
-}
-
-src_install() {
-	installation() {
-		emake -C "${BUILD_DIR}" \
-			DESTDIR="${D}" \
-			LIBDIR="\$(PREFIX)/$(get_libdir)" \
-			install
-		python_optimize
-	}
-	python_foreach_impl installation
-
-	# Set version-specific scripts
-	for pyscript in audit2allow sepolgen-ifgen sepolicy chcat; do
-		python_replicate_script "${ED}/usr/bin/${pyscript}"
-	done
-	for pyscript in semanage; do
-		python_replicate_script "${ED}/usr/sbin/${pyscript}"
-	done
-
-	# Create sepolgen.conf with different devel location definition
-	if [[ -f /etc/selinux/config ]];
-	then
-		local selinuxtype=$(awk -F'=' '/^SELINUXTYPE/ {print $2}' /etc/selinux/config);
-		mkdir -p "${D}"/etc/selinux || die "Failed to create selinux directory";
-		echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include:/usr/share/selinux/${selinuxtype}" > "${D}"/etc/selinux/sepolgen.conf;
-	else
-		local selinuxtype="${POLICY_TYPES%% *}";
-		if [[ -n "${selinuxtype}" ]];
-		then
-			echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include:/usr/share/selinux/${selinuxtype}" > "${D}"/etc/selinux/sepolgen.conf;
-		else
-			echo "SELINUX_DEVEL_PATH=/usr/share/selinux/strict/include:/usr/share/selinux/strict" > "${D}"/etc/selinux/sepolgen.conf;
-		fi
-	fi
-}
diff --git a/sys-apps/selinux-python/selinux-python-9999.ebuild b/sys-apps/selinux-python/selinux-python-9999.ebuild
index 6fc19d34339a..96a4fbaa8e14 100644
--- a/sys-apps/selinux-python/selinux-python-9999.ebuild
+++ b/sys-apps/selinux-python/selinux-python-9999.ebuild
@@ -9,7 +9,7 @@ inherit python-r1 toolchain-funcs
 
 MY_P="${P//_/-}"
 
-MY_RELEASEDATE="20180510"
+MY_RELEASEDATE="20180524"
 SEPOL_VER="${PV}"
 SELNX_VER="${PV}"
 SEMNG_VER="${PV}"
diff --git a/sys-apps/semodule-utils/Manifest b/sys-apps/semodule-utils/Manifest
index c05570b8607e..9895ee97d48b 100644
--- a/sys-apps/semodule-utils/Manifest
+++ b/sys-apps/semodule-utils/Manifest
@@ -1,10 +1,6 @@
 DIST semodule-utils-2.7.tar.gz 15447 BLAKE2B 44c28ad634ef2ab9e478edb58020547c217a01be0aa75cf3a2432be419efb626f0a5742ba1bcec50ba11c132c207a42c05836eb2749e1f80d4a8142fb9e34a9e SHA512 5c7c2a2224949f50c1119edba90d937363e22af52a38f06525e957b29f5310a3e3444d03980b2f808ce995de0f9fc0a9dca8b6167bbfde29c1a33b9bc786d3c8
-DIST semodule-utils-2.8-rc1.tar.gz 12543 BLAKE2B 99dc8fed5df4a285435aa9c27a38fe2de15d02ea037f0c53b1402940ef7c84c0b6d28237f87adc4482125fc8e7a454042fac62a3a4811de38b55665ec90d9a3d SHA512 489ee453a5c0f6bac754f8056f738c32a815fc055daa2c1fc93c63a5e8a4c5cf017e3d687a4ba432bef0a789ed972c1a90bc56487b4014b486c0bf7ca079c565
-DIST semodule-utils-2.8-rc2.tar.gz 12547 BLAKE2B 68ca9dd5afc640070f6a5b6e7a30049e7802aeb7bf5239e59ff8a9aaa9825dc04ccf131022d604f858cd8f7adefa63715dbd95ceda95ca40765556b916b282db SHA512 31844fcf4389cd20b9164c6a11fdf914e51dc27170e5e083929376840e1135c3193e00a4abdcc24f99b98b815371f63167ade9d6de483f3ae3fdf7b04f76cb2b
-DIST semodule-utils-2.8-rc3.tar.gz 12546 BLAKE2B 67b28736793ee52bbb6fd3a7ed416d80878d9e276c2467699822ada5039a443a3f54d84aea7a663bbfa1e9632fd46e47b4558d710bc8b9ff8e8633273dba1ddb SHA512 8fd81a3785c6e47c6a4639850954603edd6f4a364928eb706f37a9f1164f8b2f7e8af5b640647bdb0c1e961a973b9dc5c3020edb870a6b4b5f9d079d718bcd52
+DIST semodule-utils-2.8.tar.gz 12536 BLAKE2B 93a2f8fee887eba72b009071549a687fe86045344979e31493b3f17041ddf3f31c29ea3c754a31f6029847798dfe26d63b02fadc1042bc68aa414050b283d208 SHA512 13d79a22115f5448dafc5202dc3dec66b9ad826051d61d7c126defe823407959511db35713d97c7dfe9e79de96193fec91a10b98c13743e06a1213f5734f4ae7
 EBUILD semodule-utils-2.7.ebuild 1123 BLAKE2B b94f20dedd85eabdb4cc9ea37ed8060ce68f044e3a463f1d255cdbcda0e0187686d8d3c2b6be0f0339eb034a04e2c42050eb1633ac0e9546f4436e4585a34e4d SHA512 66d018f1a8a2c16f6083972fb80d14806cd2671ab8150fd676fd164d21bfef12d43eb70b1f1e99a972f15cc19ed0c78d518788a79ca8805f9ce31dae9d10a38d
-EBUILD semodule-utils-2.8_rc1.ebuild 999 BLAKE2B aa472a9c8c3c0d38578e26dfeaabb08147a2dedd2de3be97689c97a287d0146de69affaeb84c5b01489c9825e3b66712d741db2f949f8807141ad3128bb703bf SHA512 099d9b7c0b2b5c98b0ddfbb6b9e4191b3cb84664291e3c639b231de3b2d17718b82e8e0cd7ed7016b7255a8df60976213124cf868665c10369945b76b4dcd150
-EBUILD semodule-utils-2.8_rc2.ebuild 999 BLAKE2B 20b0b55cb4b059c56a3ecf1c3e48af61f1b0cb069fd26432d09f6e32c529eb25b5b9bdd80101ce151cd7763f27b788df112255b48f4471aa184d6b88e486367c SHA512 9420041471418f1ee38ec8c2e854010b6856d0bdb9eee79e43406a9bd882bd89062e6eb8d3e44d588d48b2ac6f71d8a50831c803726e7c5715ca1d7608b1bf19
-EBUILD semodule-utils-2.8_rc3.ebuild 999 BLAKE2B 83ddb3c2961e56067dfbf6c51ac00d2ff08904f1f86aae0cdd455dc548fa2d252ce8637b777fb7120a4313731bf7e48b5980864a6972678c083447d0cc6bf08a SHA512 79b73c77385ef2c3a726b58f141ddd7f72c3d6d244379690f5d60afa767b83ba91ae906545206d3c786a58a2d6533b6c3681b2c231683a28fb65e1f8cf5842fe
-EBUILD semodule-utils-9999.ebuild 999 BLAKE2B 83ddb3c2961e56067dfbf6c51ac00d2ff08904f1f86aae0cdd455dc548fa2d252ce8637b777fb7120a4313731bf7e48b5980864a6972678c083447d0cc6bf08a SHA512 79b73c77385ef2c3a726b58f141ddd7f72c3d6d244379690f5d60afa767b83ba91ae906545206d3c786a58a2d6533b6c3681b2c231683a28fb65e1f8cf5842fe
+EBUILD semodule-utils-2.8.ebuild 999 BLAKE2B b5cd5f3d695c333c82dc7ece4b0ffd85ed19d903cf8fcf2ee1d09b1f6a79a66de16f172cf547cb3f5df72bce4e27346eb7dc78a1ac28115225628d5f2b8984f1 SHA512 e9bd04833eee2e666ddfc67fc2b70a0391467b6947fb952143e536863c4405f7abd0d6ba06b38b8dfe533f33c88b5d74d8821b391b7bc0305f6d7b050f9a3ed4
+EBUILD semodule-utils-9999.ebuild 999 BLAKE2B b5cd5f3d695c333c82dc7ece4b0ffd85ed19d903cf8fcf2ee1d09b1f6a79a66de16f172cf547cb3f5df72bce4e27346eb7dc78a1ac28115225628d5f2b8984f1 SHA512 e9bd04833eee2e666ddfc67fc2b70a0391467b6947fb952143e536863c4405f7abd0d6ba06b38b8dfe533f33c88b5d74d8821b391b7bc0305f6d7b050f9a3ed4
 MISC metadata.xml 521 BLAKE2B 5785152e6b947a78aa09c12816bdee5f0c93e718d0a3cb9244b1b769dab19bb057db91c49179990d06e8cfc6bac692b5223ddf2137ea043a13ee58c41b2ade1d SHA512 e15b382ddf7059ff9c82887d636522dcc993e580e715d4a822106ed27c7fdb75b32e96c8c32a34cbdbbef4ad0f9c49bfb7c7420ea97852fa82e7740c4044a689
diff --git a/sys-apps/semodule-utils/semodule-utils-2.8_rc2.ebuild b/sys-apps/semodule-utils/semodule-utils-2.8.ebuild
index d814b41b424d..9c11d6fc2ec9 100644
--- a/sys-apps/semodule-utils/semodule-utils-2.8_rc2.ebuild
+++ b/sys-apps/semodule-utils/semodule-utils-2.8.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
 
 inherit toolchain-funcs
 
-MY_RELEASEDATE="20180426"
+MY_RELEASEDATE="20180524"
 SEPOL_VER="${PV}"
 SELNX_VER="${PV}"
 
diff --git a/sys-apps/semodule-utils/semodule-utils-2.8_rc1.ebuild b/sys-apps/semodule-utils/semodule-utils-2.8_rc1.ebuild
deleted file mode 100644
index 821f4f48c483..000000000000
--- a/sys-apps/semodule-utils/semodule-utils-2.8_rc1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs
-
-MY_RELEASEDATE="20180419"
-SEPOL_VER="${PV}"
-SELNX_VER="${PV}"
-
-MY_P="${P//_/-}"
-IUSE=""
-
-if [[ ${PV} == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
-	S="${WORKDIR}/${MY_P}/${PN}"
-else
-	SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="SELinux policy module utilities"
-HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND=">=sys-libs/libsepol-${SEPOL_VER}:="
-
-RDEPEND="${DEPEND}
-	!<sys-apps/policycoreutils-2.7_pre"
-
-src_prepare() {
-	default
-
-	sed -i 's/-Werror//g' "${S}"/*/Makefile || die "Failed to remove Werror"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		install
-}
diff --git a/sys-apps/semodule-utils/semodule-utils-2.8_rc3.ebuild b/sys-apps/semodule-utils/semodule-utils-2.8_rc3.ebuild
deleted file mode 100644
index d209000bef66..000000000000
--- a/sys-apps/semodule-utils/semodule-utils-2.8_rc3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs
-
-MY_RELEASEDATE="20180510"
-SEPOL_VER="${PV}"
-SELNX_VER="${PV}"
-
-MY_P="${P//_/-}"
-IUSE=""
-
-if [[ ${PV} == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
-	S="${WORKDIR}/${MY_P}/${PN}"
-else
-	SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="SELinux policy module utilities"
-HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND=">=sys-libs/libsepol-${SEPOL_VER}:="
-
-RDEPEND="${DEPEND}
-	!<sys-apps/policycoreutils-2.7_pre"
-
-src_prepare() {
-	default
-
-	sed -i 's/-Werror//g' "${S}"/*/Makefile || die "Failed to remove Werror"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		install
-}
diff --git a/sys-apps/semodule-utils/semodule-utils-9999.ebuild b/sys-apps/semodule-utils/semodule-utils-9999.ebuild
index d209000bef66..9c11d6fc2ec9 100644
--- a/sys-apps/semodule-utils/semodule-utils-9999.ebuild
+++ b/sys-apps/semodule-utils/semodule-utils-9999.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
 
 inherit toolchain-funcs
 
-MY_RELEASEDATE="20180510"
+MY_RELEASEDATE="20180524"
 SEPOL_VER="${PV}"
 SELNX_VER="${PV}"
 
diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index 41b272e8a1ca..6628ec50e66d 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -2,10 +2,6 @@ AUX default/useradd 96 BLAKE2B 64b694bdff7f901e19ac21695e3b2eebeb5a03683be5a01e3
 AUX pam.d-include/passwd 144 BLAKE2B 95e159c70416218950ad5cdc41c83b52f8d2ec042d35c9908ca400bd57dcb234fb7691aa2a5a7646a379553aa6dee0dd96ee569aa492d7f20774e991a90f8602 SHA512 31611a08d97cd2c129f18d451a555ff6c781f91603c77fc0c66ff406b5fa4a97db19ae4ce104816a6324529d10e131de0d5329646bdab2abc8dc3ee5b82b057f
 AUX pam.d-include/shadow 152 BLAKE2B 82d1f678abc60586ea873da7e2f4907349d77a64085cc475fa09c47cb008b41a7a00a7de2816b2c5cb2f48452d1b07523be35f8dd29026736ba8fbd3ae3d7c56 SHA512 d07611c350d0d6f3386db5080c80a84e4135cf33e44fd3a390cb1092e034f9bd2a69495fadd4bda6ede9962e9658e77f2c8e12d3189cdcda6c7b3c607336f0c3
 AUX shadow-4.1.3-dots-in-usernames.patch 302 BLAKE2B a83f463be9267c3a704997b98d67cd0daddf8ee05debf447d091530517a855078bd53ce28c87045643b2b8c467dd09caad06a4eb0a6568c271e6a42b49a54dcc SHA512 ad20fb3f4f0292f39b5da796e41df71e9e8b1b81dd11a99b2d988440c1b435b0061333a0a5a37a909598d5a840a75946e8c59c74426bae7452de88cf673a5f7d
-AUX shadow-4.5-CVE-2018-7169.patch 5778 BLAKE2B 59e06cda2d3b48d77548c22073f9c4ce018c16bdd128089ce6ae6d8eebe1ad9b73438530fb32b628bc5e72201852b7c452264a13707bcbfa826777b778a7b90b SHA512 fef082516e47ee4e3d9627916c47ffb8e1987580586639374d461b7b9d041370abe5b80dbbfacd4fd256a1bc2f9d23e0e71497298dd60ccd96d795811a13cd58
-DIST shadow-4.5.tar.gz 3804933 BLAKE2B c4714b7fe9a1af5a5751d4274e70e7fb31994cc40058b44c401bbbdf83c238fcf48e6e6e663d8a61f614b6291ea524862d9d2425d7d839340a10f8fb7c8eaa85 SHA512 02d6482a1159689e404dd49a68b4e2db85e9ffdcdfbacc8efcbd9043f14a1ec3fc4d749700df915d375df67d589219b6b0f57a6cfd9fb5b197012888a608913b
 DIST shadow-4.6.tar.gz 3804282 BLAKE2B 268c90e7daba138827aec6039f428f52cdcf7929743fa1f49f801cc669de7456ec5a69531194cdb29f051ce7d0b2f1e966fdf2513a9fc8f7fbdeb29d786a509f SHA512 36358333e7f03ef558772f3361bc5851a7d7fd3d85c993a6b732e37304b8068b2893d55607b9bfe8b8eed616a687264f947ff66cefc74ea1a48ba9396d464714
-EBUILD shadow-4.5-r1.ebuild 5405 BLAKE2B 7518b3700adf543a619413066415f64959a50efbbe669b28622e8d2d4cd749705b256c62e3ba73a88e6f3c0d6c195c87c377e7541e165ccbf4328ec5f4b1b0df SHA512 a50352c9b189d5265e921e977acff5c96dedef2634b046f66b376e6d6e2fdab40b629e453695a3153dd1edb13740e94d6d205daed544b3bba885fd35dbb7251e
-EBUILD shadow-4.5.ebuild 5321 BLAKE2B fa760284cc0e44d1adb2735b90bdf8e191af67bfb51501551b0626a9646bbf3f3df2f34555c848d6ca6fb377d363621b8b8a2e52370313e0026fc94674257ca6 SHA512 33f57cbb2f8aef136deea2f4ded91a68a1358edec538ca2e4ddcb4d9ef55d477ca1c8e6424054e5e7cca21502dc4888a73af9661916a9eb3f2d328ff2ce49c60
-EBUILD shadow-4.6.ebuild 5351 BLAKE2B 231e53bb1d28b4b6afb1e440f0b481353669a2b5b34e9f659df985d671edcc8e9f5423b8613302fc4925807c72b14630ecee28d238ba84214860f5a735b0666d SHA512 489c9c84d1c75d07be162698387195be245ac1b4d37343b0a61efe173113eb190fd89757ee5f3cab42f5179388b4fee67932797450b1dafc0c45c32d1620eaf9
+EBUILD shadow-4.6.ebuild 5349 BLAKE2B 06f7ef54c7e2f34a679364b51c0447ad9b4c221225e3d47489132da7ddf3b0c2d9483f0ae2a338f83242fc9969d57b5ce56a5ddc562b5ef481b7ae64c4b9d582 SHA512 2d6b2f974c4540ddc0ef987416636e3ce8e52feac028eaa29a6d86570c1b16d2b50c8613a7dff27a4132a0a3f2b554ae7cb000aed333e99b7883a3a10d26d479
 MISC metadata.xml 565 BLAKE2B bdd91116c16f590eabb6f18f05a4f72b55651383431c78fb07c27b23e7152b25816895e2ae3e2afd1ecd6e2b9fa9dd0005d198f2ab7ee2061583b586e4c44b01 SHA512 be29faf2eb981bdb0d643ca691d48b10ee702c3a32ca7fca1d00365aa1c4beb5b1b4bec8104be4352fed32f3fabc3108061b8eb8f0054e612c268b5c6f4b1469
diff --git a/sys-apps/shadow/files/shadow-4.5-CVE-2018-7169.patch b/sys-apps/shadow/files/shadow-4.5-CVE-2018-7169.patch
deleted file mode 100644
index 30ad9e614067..000000000000
--- a/sys-apps/shadow/files/shadow-4.5-CVE-2018-7169.patch
+++ /dev/null
@@ -1,180 +0,0 @@
-From fb28c99b8a66ff2605c5cb96abc0a4d975f92de0 Mon Sep 17 00:00:00 2001
-From: Aleksa Sarai <asarai@suse.de>
-Date: Thu, 15 Feb 2018 23:49:40 +1100
-Subject: [PATCH] newgidmap: enforce setgroups=deny if self-mapping a group
-
-This is necessary to match the kernel-side policy of "self-mapping in a
-user namespace is fine, but you cannot drop groups" -- a policy that was
-created in order to stop user namespaces from allowing trivial privilege
-escalation by dropping supplementary groups that were "blacklisted" from
-certain paths.
-
-This is the simplest fix for the underlying issue, and effectively makes
-it so that unless a user has a valid mapping set in /etc/subgid (which
-only administrators can modify) -- and they are currently trying to use
-that mapping -- then /proc/$pid/setgroups will be set to deny. This
-workaround is only partial, because ideally it should be possible to set
-an "allow_setgroups" or "deny_setgroups" flag in /etc/subgid to allow
-administrators to further restrict newgidmap(1).
-
-We also don't write anything in the "allow" case because "allow" is the
-default, and users may have already written "deny" even if they
-technically are allowed to use setgroups. And we don't write anything if
-the setgroups policy is already "deny".
-
-Ref: https://bugs.launchpad.net/ubuntu/+source/shadow/+bug/1729357
-Fixes: CVE-2018-7169
-Reported-by: Craig Furman <craig.furman89@gmail.com>
-Signed-off-by: Aleksa Sarai <asarai@suse.de>
----
- src/newgidmap.c | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++------
- 1 file changed, 80 insertions(+), 9 deletions(-)
-
-diff --git a/src/newgidmap.c b/src/newgidmap.c
-index b1e33513..59a2e75c 100644
---- a/src/newgidmap.c
-+++ b/src/newgidmap.c
-@@ -46,32 +46,37 @@
-  */
- const char *Prog;
- 
--static bool verify_range(struct passwd *pw, struct map_range *range)
-+
-+static bool verify_range(struct passwd *pw, struct map_range *range, bool *allow_setgroups)
- {
- 	/* An empty range is invalid */
- 	if (range->count == 0)
- 		return false;
- 
--	/* Test /etc/subgid */
--	if (have_sub_gids(pw->pw_name, range->lower, range->count))
-+	/* Test /etc/subgid. If the mapping is valid then we allow setgroups. */
-+	if (have_sub_gids(pw->pw_name, range->lower, range->count)) {
-+		*allow_setgroups = true;
- 		return true;
-+	}
- 
--	/* Allow a process to map its own gid */
--	if ((range->count == 1) && (pw->pw_gid == range->lower))
-+	/* Allow a process to map its own gid. */
-+	if ((range->count == 1) && (pw->pw_gid == range->lower)) {
-+		/* noop -- if setgroups is enabled already we won't disable it. */
- 		return true;
-+	}
- 
- 	return false;
- }
- 
- static void verify_ranges(struct passwd *pw, int ranges,
--	struct map_range *mappings)
-+	struct map_range *mappings, bool *allow_setgroups)
- {
- 	struct map_range *mapping;
- 	int idx;
- 
- 	mapping = mappings;
- 	for (idx = 0; idx < ranges; idx++, mapping++) {
--		if (!verify_range(pw, mapping)) {
-+		if (!verify_range(pw, mapping, allow_setgroups)) {
- 			fprintf(stderr, _( "%s: gid range [%lu-%lu) -> [%lu-%lu) not allowed\n"),
- 				Prog,
- 				mapping->upper,
-@@ -89,6 +94,70 @@ static void usage(void)
- 	exit(EXIT_FAILURE);
- }
- 
-+void write_setgroups(int proc_dir_fd, bool allow_setgroups)
-+{
-+	int setgroups_fd;
-+	char *policy, policy_buffer[4096];
-+
-+	/*
-+	 * Default is "deny", and any "allow" will out-rank a "deny". We don't
-+	 * forcefully write an "allow" here because the process we are writing
-+	 * mappings for may have already set themselves to "deny" (and "allow"
-+	 * is the default anyway). So allow_setgroups == true is a noop.
-+	 */
-+	policy = "deny\n";
-+	if (allow_setgroups)
-+		return;
-+
-+	setgroups_fd = openat(proc_dir_fd, "setgroups", O_RDWR|O_CLOEXEC);
-+	if (setgroups_fd < 0) {
-+		/*
-+		 * If it's an ENOENT then we are on too old a kernel for the setgroups
-+		 * code to exist. Emit a warning and bail on this.
-+		 */
-+		if (ENOENT == errno) {
-+			fprintf(stderr, _("%s: kernel doesn't support setgroups restrictions\n"), Prog);
-+			goto out;
-+		}
-+		fprintf(stderr, _("%s: couldn't open process setgroups: %s\n"),
-+			Prog,
-+			strerror(errno));
-+		exit(EXIT_FAILURE);
-+	}
-+
-+	/*
-+	 * Check whether the policy is already what we want. /proc/self/setgroups
-+	 * is write-once, so attempting to write after it's already written to will
-+	 * fail.
-+	 */
-+	if (read(setgroups_fd, policy_buffer, sizeof(policy_buffer)) < 0) {
-+		fprintf(stderr, _("%s: failed to read setgroups: %s\n"),
-+			Prog,
-+			strerror(errno));
-+		exit(EXIT_FAILURE);
-+	}
-+	if (!strncmp(policy_buffer, policy, strlen(policy)))
-+		goto out;
-+
-+	/* Write the policy. */
-+	if (lseek(setgroups_fd, 0, SEEK_SET) < 0) {
-+		fprintf(stderr, _("%s: failed to seek setgroups: %s\n"),
-+			Prog,
-+			strerror(errno));
-+		exit(EXIT_FAILURE);
-+	}
-+	if (dprintf(setgroups_fd, "%s", policy) < 0) {
-+		fprintf(stderr, _("%s: failed to setgroups %s policy: %s\n"),
-+			Prog,
-+			policy,
-+			strerror(errno));
-+		exit(EXIT_FAILURE);
-+	}
-+
-+out:
-+	close(setgroups_fd);
-+}
-+
- /*
-  * newgidmap - Set the gid_map for the specified process
-  */
-@@ -103,6 +172,7 @@ int main(int argc, char **argv)
- 	struct stat st;
- 	struct passwd *pw;
- 	int written;
-+	bool allow_setgroups = false;
- 
- 	Prog = Basename (argv[0]);
- 
-@@ -145,7 +215,7 @@ int main(int argc, char **argv)
- 				(unsigned long) getuid ()));
- 		return EXIT_FAILURE;
- 	}
--	
-+
- 	/* Get the effective uid and effective gid of the target process */
- 	if (fstat(proc_dir_fd, &st) < 0) {
- 		fprintf(stderr, _("%s: Could not stat directory for target %u\n"),
-@@ -177,8 +247,9 @@ int main(int argc, char **argv)
- 	if (!mappings)
- 		usage();
- 
--	verify_ranges(pw, ranges, mappings);
-+	verify_ranges(pw, ranges, mappings, &allow_setgroups);
- 
-+	write_setgroups(proc_dir_fd, allow_setgroups);
- 	write_mapping(proc_dir_fd, ranges, mappings, "gid_map");
- 	sub_gid_close();
- 
diff --git a/sys-apps/shadow/shadow-4.5-r1.ebuild b/sys-apps/shadow/shadow-4.5-r1.ebuild
deleted file mode 100644
index 1e3d98f2593e..000000000000
--- a/sys-apps/shadow/shadow-4.5-r1.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit libtool pam multilib
-
-DESCRIPTION="Utilities to deal with user accounts"
-HOMEPAGE="https://github.com/shadow-maint/shadow http://pkg-shadow.alioth.debian.org/"
-SRC_URI="https://github.com/shadow-maint/shadow/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="acl audit +cracklib nls pam selinux skey xattr"
-# Taken from the man/Makefile.am file.
-LANGS=( cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW )
-
-RDEPEND="acl? ( sys-apps/acl:0= )
-	audit? ( >=sys-process/audit-2.6:0= )
-	cracklib? ( >=sys-libs/cracklib-2.7-r3:0= )
-	pam? ( virtual/pam:0= )
-	skey? ( sys-auth/skey:0= )
-	selinux? (
-		>=sys-libs/libselinux-1.28:0=
-		sys-libs/libsemanage:0=
-	)
-	nls? ( virtual/libintl )
-	xattr? ( sys-apps/attr:0= )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	nls? ( sys-devel/gettext )"
-RDEPEND="${RDEPEND}
-	pam? ( >=sys-auth/pambase-20150213 )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.1.3-dots-in-usernames.patch"
-	"${FILESDIR}/${P}-CVE-2018-7169.patch" #647790
-)
-
-src_prepare() {
-	default
-	#eautoreconf
-	elibtoolize
-}
-
-src_configure() {
-	local myeconfargs=(
-		--without-group-name-max-length
-		--without-tcb
-		--enable-shared=no
-		--enable-static=yes
-		$(use_with acl)
-		$(use_with audit)
-		$(use_with cracklib libcrack)
-		$(use_with pam libpam)
-		$(use_with skey)
-		$(use_with selinux)
-		$(use_enable nls)
-		$(use_with elibc_glibc nscd)
-		$(use_with xattr attr)
-	)
-	econf "${myeconfargs[@]}"
-
-	has_version 'sys-libs/uclibc[-rpc]' && sed -i '/RLOGIN/d' config.h #425052
-
-	if use nls ; then
-		local l langs="po" # These are the pot files.
-		for l in ${LANGS[*]} ; do
-			has ${l} ${LINGUAS-${l}} && langs+=" ${l}"
-		done
-		sed -i "/^SUBDIRS = /s:=.*:= ${langs}:" man/Makefile || die
-	fi
-}
-
-set_login_opt() {
-	local comment="" opt=$1 val=$2
-	if [[ -z ${val} ]]; then
-		comment="#"
-		sed -i \
-			-e "/^${opt}\>/s:^:#:" \
-			"${ED%/}"/etc/login.defs || die
-	else
-		sed -i -r \
-			-e "/^#?${opt}\>/s:.*:${opt} ${val}:" \
-			"${ED%/}"/etc/login.defs
-	fi
-	local res=$(grep "^${comment}${opt}\>" "${ED%/}"/etc/login.defs)
-	einfo "${res:-Unable to find ${opt} in /etc/login.defs}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" suidperms=4711 install
-
-	# Remove libshadow and libmisc; see bug 37725 and the following
-	# comment from shadow's README.linux:
-	#   Currently, libshadow.a is for internal use only, so if you see
-	#   -lshadow in a Makefile of some other package, it is safe to
-	#   remove it.
-	rm -f "${ED%/}"/{,usr/}$(get_libdir)/lib{misc,shadow}.{a,la}
-
-	insinto /etc
-	if ! use pam ; then
-		insopts -m0600
-		doins etc/login.access etc/limits
-	fi
-
-	# needed for 'useradd -D'
-	insinto /etc/default
-	insopts -m0600
-	doins "${FILESDIR}"/default/useradd
-
-	# move passwd to / to help recover broke systems #64441
-	mv "${ED%/}"/usr/bin/passwd "${ED%/}"/bin/ || die
-	dosym /bin/passwd /usr/bin/passwd
-
-	cd "${S}" || die
-	insinto /etc
-	insopts -m0644
-	newins etc/login.defs login.defs
-
-	set_login_opt CREATE_HOME yes
-	if ! use pam ; then
-		set_login_opt MAIL_CHECK_ENAB no
-		set_login_opt SU_WHEEL_ONLY yes
-		set_login_opt CRACKLIB_DICTPATH /usr/$(get_libdir)/cracklib_dict
-		set_login_opt LOGIN_RETRIES 3
-		set_login_opt ENCRYPT_METHOD SHA512
-		set_login_opt CONSOLE
-	else
-		dopamd "${FILESDIR}"/pam.d-include/shadow
-
-		for x in chpasswd chgpasswd newusers; do
-			newpamd "${FILESDIR}"/pam.d-include/passwd ${x}
-		done
-
-		for x in chage chsh chfn \
-				 user{add,del,mod} group{add,del,mod} ; do
-			newpamd "${FILESDIR}"/pam.d-include/shadow ${x}
-		done
-
-		# comment out login.defs options that pam hates
-		local opt sed_args=()
-		for opt in \
-			CHFN_AUTH \
-			CONSOLE \
-			CRACKLIB_DICTPATH \
-			ENV_HZ \
-			ENVIRON_FILE \
-			FAILLOG_ENAB \
-			FTMP_FILE \
-			LASTLOG_ENAB \
-			MAIL_CHECK_ENAB \
-			MOTD_FILE \
-			NOLOGINS_FILE \
-			OBSCURE_CHECKS_ENAB \
-			PASS_ALWAYS_WARN \
-			PASS_CHANGE_TRIES \
-			PASS_MIN_LEN \
-			PORTTIME_CHECKS_ENAB \
-			QUOTAS_ENAB \
-			SU_WHEEL_ONLY
-		do
-			set_login_opt ${opt}
-			sed_args+=( -e "/^#${opt}\>/b pamnote" )
-		done
-		sed -i "${sed_args[@]}" \
-			-e 'b exit' \
-			-e ': pamnote; i# NOTE: This setting should be configured via /etc/pam.d/ and not in this file.' \
-			-e ': exit' \
-			"${ED%/}"/etc/login.defs || die
-
-		# remove manpages that pam will install for us
-		# and/or don't apply when using pam
-		find "${ED%/}"/usr/share/man \
-			'(' -name 'limits.5*' -o -name 'suauth.5*' ')' \
-			-delete
-
-		# Remove pam.d files provided by pambase.
-		rm "${ED%/}"/etc/pam.d/{login,passwd,su} || die
-	fi
-
-	# Remove manpages that are handled by other packages
-	find "${ED%/}"/usr/share/man \
-		'(' -name id.1 -o -name passwd.5 -o -name getspnam.3 ')' \
-		-delete
-
-	cd "${S}" || die
-	dodoc ChangeLog NEWS TODO
-	newdoc README README.download
-	cd doc || die
-	dodoc HOWTO README* WISHLIST *.txt
-}
-
-pkg_preinst() {
-	rm -f "${EROOT}"/etc/pam.d/system-auth.new \
-		"${EROOT}/etc/login.defs.new"
-}
-
-pkg_postinst() {
-	# Enable shadow groups.
-	if [ ! -f "${EROOT}"/etc/gshadow ] ; then
-		if grpck -r -R "${EROOT}" 2>/dev/null ; then
-			grpconv -R "${EROOT}"
-		else
-			ewarn "Running 'grpck' returned errors.  Please run it by hand, and then"
-			ewarn "run 'grpconv' afterwards!"
-		fi
-	fi
-
-	einfo "The 'adduser' symlink to 'useradd' has been dropped."
-}
diff --git a/sys-apps/shadow/shadow-4.5.ebuild b/sys-apps/shadow/shadow-4.5.ebuild
deleted file mode 100644
index 0b67db2fe8aa..000000000000
--- a/sys-apps/shadow/shadow-4.5.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils libtool pam multilib
-
-DESCRIPTION="Utilities to deal with user accounts"
-HOMEPAGE="https://github.com/shadow-maint/shadow http://pkg-shadow.alioth.debian.org/"
-SRC_URI="https://github.com/shadow-maint/shadow/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="acl audit +cracklib nls pam selinux skey xattr"
-# Taken from the man/Makefile.am file.
-LANGS=( cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW )
-
-RDEPEND="acl? ( sys-apps/acl:0= )
-	audit? ( >=sys-process/audit-2.6:0= )
-	cracklib? ( >=sys-libs/cracklib-2.7-r3:0= )
-	pam? ( virtual/pam:0= )
-	skey? ( sys-auth/skey:0= )
-	selinux? (
-		>=sys-libs/libselinux-1.28:0=
-		sys-libs/libsemanage:0=
-	)
-	nls? ( virtual/libintl )
-	xattr? ( sys-apps/attr:0= )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	nls? ( sys-devel/gettext )"
-RDEPEND="${RDEPEND}
-	pam? ( >=sys-auth/pambase-20150213 )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.1.3-dots-in-usernames.patch
-)
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-	epatch_user
-	#eautoreconf
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		--without-group-name-max-length \
-		--without-tcb \
-		--enable-shared=no \
-		--enable-static=yes \
-		$(use_with acl) \
-		$(use_with audit) \
-		$(use_with cracklib libcrack) \
-		$(use_with pam libpam) \
-		$(use_with skey) \
-		$(use_with selinux) \
-		$(use_enable nls) \
-		$(use_with elibc_glibc nscd) \
-		$(use_with xattr attr)
-	has_version 'sys-libs/uclibc[-rpc]' && sed -i '/RLOGIN/d' config.h #425052
-
-	if use nls ; then
-		local l langs="po" # These are the pot files.
-		for l in ${LANGS[*]} ; do
-			has ${l} ${LINGUAS-${l}} && langs+=" ${l}"
-		done
-		sed -i "/^SUBDIRS = /s:=.*:= ${langs}:" man/Makefile || die
-	fi
-}
-
-set_login_opt() {
-	local comment="" opt=$1 val=$2
-	if [[ -z ${val} ]]; then
-		comment="#"
-		sed -i \
-			-e "/^${opt}\>/s:^:#:" \
-			"${ED}"/etc/login.defs || die
-	else
-		sed -i -r \
-			-e "/^#?${opt}\>/s:.*:${opt} ${val}:" \
-			"${ED}"/etc/login.defs
-	fi
-	local res=$(grep "^${comment}${opt}\>" "${ED}"/etc/login.defs)
-	einfo "${res:-Unable to find ${opt} in /etc/login.defs}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" suidperms=4711 install
-
-	# Remove libshadow and libmisc; see bug 37725 and the following
-	# comment from shadow's README.linux:
-	#   Currently, libshadow.a is for internal use only, so if you see
-	#   -lshadow in a Makefile of some other package, it is safe to
-	#   remove it.
-	rm -f "${ED}"/{,usr/}$(get_libdir)/lib{misc,shadow}.{a,la}
-
-	insinto /etc
-	if ! use pam ; then
-		insopts -m0600
-		doins etc/login.access etc/limits
-	fi
-
-	# needed for 'useradd -D'
-	insinto /etc/default
-	insopts -m0600
-	doins "${FILESDIR}"/default/useradd
-
-	# move passwd to / to help recover broke systems #64441
-	mv "${ED}"/usr/bin/passwd "${ED}"/bin/ || die
-	dosym /bin/passwd /usr/bin/passwd
-
-	cd "${S}"
-	insinto /etc
-	insopts -m0644
-	newins etc/login.defs login.defs
-
-	set_login_opt CREATE_HOME yes
-	if ! use pam ; then
-		set_login_opt MAIL_CHECK_ENAB no
-		set_login_opt SU_WHEEL_ONLY yes
-		set_login_opt CRACKLIB_DICTPATH /usr/$(get_libdir)/cracklib_dict
-		set_login_opt LOGIN_RETRIES 3
-		set_login_opt ENCRYPT_METHOD SHA512
-		set_login_opt CONSOLE
-	else
-		dopamd "${FILESDIR}"/pam.d-include/shadow
-
-		for x in chpasswd chgpasswd newusers; do
-			newpamd "${FILESDIR}"/pam.d-include/passwd ${x}
-		done
-
-		for x in chage chsh chfn \
-				 user{add,del,mod} group{add,del,mod} ; do
-			newpamd "${FILESDIR}"/pam.d-include/shadow ${x}
-		done
-
-		# comment out login.defs options that pam hates
-		local opt sed_args=()
-		for opt in \
-			CHFN_AUTH \
-			CONSOLE \
-			CRACKLIB_DICTPATH \
-			ENV_HZ \
-			ENVIRON_FILE \
-			FAILLOG_ENAB \
-			FTMP_FILE \
-			LASTLOG_ENAB \
-			MAIL_CHECK_ENAB \
-			MOTD_FILE \
-			NOLOGINS_FILE \
-			OBSCURE_CHECKS_ENAB \
-			PASS_ALWAYS_WARN \
-			PASS_CHANGE_TRIES \
-			PASS_MIN_LEN \
-			PORTTIME_CHECKS_ENAB \
-			QUOTAS_ENAB \
-			SU_WHEEL_ONLY
-		do
-			set_login_opt ${opt}
-			sed_args+=( -e "/^#${opt}\>/b pamnote" )
-		done
-		sed -i "${sed_args[@]}" \
-			-e 'b exit' \
-			-e ': pamnote; i# NOTE: This setting should be configured via /etc/pam.d/ and not in this file.' \
-			-e ': exit' \
-			"${ED}"/etc/login.defs || die
-
-		# remove manpages that pam will install for us
-		# and/or don't apply when using pam
-		find "${ED}"/usr/share/man \
-			'(' -name 'limits.5*' -o -name 'suauth.5*' ')' \
-			-delete
-
-		# Remove pam.d files provided by pambase.
-		rm "${ED}"/etc/pam.d/{login,passwd,su} || die
-	fi
-
-	# Remove manpages that are handled by other packages
-	find "${ED}"/usr/share/man \
-		'(' -name id.1 -o -name passwd.5 -o -name getspnam.3 ')' \
-		-delete
-
-	cd "${S}"
-	dodoc ChangeLog NEWS TODO
-	newdoc README README.download
-	cd doc
-	dodoc HOWTO README* WISHLIST *.txt
-}
-
-pkg_preinst() {
-	rm -f "${EROOT}"/etc/pam.d/system-auth.new \
-		"${EROOT}/etc/login.defs.new"
-}
-
-pkg_postinst() {
-	# Enable shadow groups.
-	if [ ! -f "${EROOT}"/etc/gshadow ] ; then
-		if grpck -r -R "${EROOT}" 2>/dev/null ; then
-			grpconv -R "${EROOT}"
-		else
-			ewarn "Running 'grpck' returned errors.  Please run it by hand, and then"
-			ewarn "run 'grpconv' afterwards!"
-		fi
-	fi
-
-	einfo "The 'adduser' symlink to 'useradd' has been dropped."
-}
diff --git a/sys-apps/shadow/shadow-4.6.ebuild b/sys-apps/shadow/shadow-4.6.ebuild
index fd1e15e8a1ff..2c4f91f2ecd8 100644
--- a/sys-apps/shadow/shadow-4.6.ebuild
+++ b/sys-apps/shadow/shadow-4.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/shadow-maint/shadow/releases/download/${PV}/${P}.tar
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ~ppc64 s390 sh sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="acl audit +cracklib nls pam selinux skey xattr"
 # Taken from the man/Makefile.am file.
 LANGS=( cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW )
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index e26c79986d33..19746f21ca25 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -4,6 +4,7 @@ AUX 238-0003-udev-net-id-Fix-check-for-address-to-keep-interface-8458.patch 1688
 AUX 238-initctl.patch 1497 BLAKE2B 7f916414a8bb92e5d8a2b47fc9adf90da73c9fb27bd32eb2a89c5d0b56215bac1ac8c7e9e011268b2f3126fa272c0a118f5e2916f6eca48f60e359a056cf6d92 SHA512 1963c653321fd69a66f75dc441e36d47d7eb15c193066845e43a6f62d436d9a7fefd98c6418cdb08fca823720fa62887c93e67de427e599ee19b1f72301cfe62
 AUX 238-libmount-include.patch 2164 BLAKE2B d9d86e8affb6a6d5cc8cb42b4f1744936b0773318d466a7f76b43a382ffc6aca7d863cbfef7ea8a114615db35d1a6f57b22a2fd451a82b71cfac3383bb019870 SHA512 4f1d82195623a213b6439aec6a2ff17b027f4ed079e6917957635503125a0917d4069c8055b5b9d1be235c47d62235f4c7baa0cfb9184d48f06bac356b69706a
 AUX 238-nspawn-wait.patch 3415 BLAKE2B db43b0128709bba3bd50199645e2e819d0b86eb6839f3bff34b21ce989f5e9301d541265fdb0dbaa76cae00df492581a624e9ca694d4d6d1f2d1cabf5a02612c SHA512 8f1c940da604d72948aa14e735f31ce6b349d274f18836233f15bdec7605e7a52a9ac1016cbd98fdd57d547e31ff882f3244029fba58ac4a408aad41f378a0a0
+AUX 238-sparc-raw-clone.patch 1802 BLAKE2B 79998e7582b0a724ccd715f5d4f9ca1e08078a46e29b7cc08fd917ac9046d8aa997a0d2986cc48f7ebc10ff4c4ce6adafe46c3b603e9104df9b767ac13b35f96 SHA512 9a3f31f37211b186f5a17a084795498599f71fe3d8da2fa37d2a3cb2445d31e8929b5253533e66fac868cc4b9c8f3cb4405765cea0d55db67347dffdb8f8bc61
 AUX 238-timesync-connection.patch 2105 BLAKE2B 388ac432261486ecc01f937be7e1cf9f3f7238d509363f389e960c13ceb4146468cf972312b2b240c60191d609526f65c2d30d979d6640e02e0ef0326d3f1ec0 SHA512 7420933ebd65ba6191a2738ad5d1a16e17a9d631afaf6839e31388ff8758e16db5e60c5bea02cff3ab6850b0ee019e4626ef4905d63899c9e39b25db9f7d3074
 AUX gentoo-Dont-enable-audit-by-default.patch 1027 BLAKE2B 9193a409db4e5c1dec6f6b66ee6e0a4cc1ada49d41ab758c788cf12534fffb67bd7370b8558a6af56572d7f2b73cf47db255fef105e56362c15f0a426f80b256 SHA512 44e512d8bbadbc5714192896a3ba262e460af034846e4e9b9832b4143fff772e2734e655316fd88d1ef386509bd234c195dce2087348f220836b3bf4f26790e0
 AUX gentoo-generator-path.patch 1046 BLAKE2B 648d1fff6874135267647ff6ffb52ddd9e991af64fb2b41909246c173e55709c49edd6e47245d566457ba9f55bf6d758ed837ff740f58004f2790b5565f8e462 SHA512 e9999afbf4d2d8a9e828d81dd0b54e2c2ba556e9778a4954dac3da885a15bc6dcc718f7e119c352eb2efd090e410735395ec20ce2eb3c84a481570bc8b5f66b3
@@ -12,12 +13,9 @@ AUX gentoo-uucp-group-r1.patch 562 BLAKE2B 98b629d9b20e4fedfb017864dca1346aa1766
 AUX nsswitch.conf 698 BLAKE2B ad209377afa4bea6383dba80b045c3905e6e0c0cd091c6710f753fa7b0bc911ee2c48d6975a0646d688fc534add23d0be3fac7c1da6f3654a5a27a609c2ec434 SHA512 486581b096db702941589bbd3211df58df4979d17856dc935f6e22f7a268c5b6b1c4dfa643d38e21bc01eb258b0b97318d4e97ebab0e87abd718af1e391fde1a
 DIST systemd-236-patches-2.tar.gz 54737 BLAKE2B bce5f9e234c975a2b6e474ca2a0c2c82e704f02cf19885134dddc5edbd0b7bfb3773d737f88f78ba2ab81093dfceeb44d76ecda99cf2b916072dcdfa84720c19 SHA512 b74ab6944135c938b2d0d2a1dd40ac4cc4ff26d072603d6bfbe4529d808b2e481eb910155895bce14607842ad6d30751aded51654a53f76278becbb5e317b875
 DIST systemd-236.tar.gz 6759035 BLAKE2B 0fc26bd67fb6cc3b0565c763fc26e38186c4b05c3d38652b73a2189dfbfb46382dba239f7f6f889eec57ad1d8f69d4098745c8f4ca16a707aa23b7771f2328f3 SHA512 1a9672960e03e05c09e41fb8cfe9b0f25e867fd43f37f8371515ddddfdbd4270afd746a6da733f6d1d3b2cc43db1ecc7a9f2245f2dac2ec233db74e9e70e4f6d
-DIST systemd-238-patches-0.tar.gz 30019 BLAKE2B 0f393865cd6bcd815c1a6e932c0e5a25e125768d2bdef072d5fa7830b9ea012d0986380a1cdea8e369e1fffe89ea7657e4d55de2bae0d785ae374796a4e7c64b SHA512 f7e6fb7bf3b5cde2717a9e5dcd779a4595d6185d1ecdad8405a075edbb55b32c2573558f6af119ff50ea0df8eacef12ae7ee710fadd269f83db0985d76eb22dc
 DIST systemd-238-patches-1.tar.gz 47512 BLAKE2B 9edf8835ec7bba43bd00b1481b23bc5a4148030724633a8bfe1e82ec48b79699d4822b0bc5ea3a979b404e706efa9c0eae8e0460d76658ba2e901c4853da0c04 SHA512 809d8a3a9a023217b509b738e0d341d060f1343df6159e5acfcededfb452986de140ddf4b879a5157fba1a5646d00db8b6537aba8358c48f75fd6527f881a14c
 DIST systemd-238.tar.gz 6954022 BLAKE2B 9b5cc36a7234c0d037a2656ee1e5ed54186a394b8be41771ebc29c903d3efcecf7f13f004a6d1695c022923bd0d540a243e897852f07e810f73fd3163f688dde SHA512 c0f272b022308d3bd94679184e102a8dc85de55310bda205a458ea33c77c7733e5c8c8e5b15f786ba3e0ce59e7c6a9bf0d5a0950517c6b91e0f345950129b9c8
-EBUILD systemd-236-r5.ebuild 12921 BLAKE2B 4b8df5c5939fe8fe9dd814228eebb7d9419564ed91643353955edfb95290d2423c7291564c690a75fc48035de1c45fb5441a0455beecc3964f3fa187d4b8a4eb SHA512 d0cd0b8c31b40322227db7f4a5621d0e1ae73e1bea30e5ee0b88de14c0b1bad2d05c53a3c86c77bfbe16325556e5108198514974a428dd5c0cd56f4583663c18
-EBUILD systemd-238-r2.ebuild 13145 BLAKE2B 026520104d0f8fc395bf19b1f04d0a5f46a22dcbbc02dab148469f8c88ec7ab9c80a2d8416d594cc3161c71f794c755db37ee71bbe0d51061a7f1b9df3dcc22f SHA512 8183c0bc11f9385721f02fbc6da07eefdacb84f18eae71fd01bbddd8f6c4aab8f7c9f015fc3bd8a54acc6394c2c9c77656360e2986712c2c899bc54cb977cdc4
-EBUILD systemd-238-r4.ebuild 13047 BLAKE2B fe8bf96af2b3e665151c4118721ffd60e2b84991883d06fd75134e49ab92b455c7c190a9424228769000addb8d2998530037e15938e5f8669a90844150b59b5d SHA512 e384cee4eeb6ae614725131c2a61f75950060ebfc04f970c19583b093d1ad93fe95d7084cc9014e68a557fe5869ed7706f2addc7a5badab7af8927fa0174d4b6
-EBUILD systemd-238-r6.ebuild 13048 BLAKE2B 036f9063aae1a4603dd1d0f0c9912f6825f9e91fe0b66eb3e59dd8a32f36c34354b85c589d0ecdb48b951ad6d1c500f006ee74cfee0d92e9bf035883e036da15 SHA512 6b399cd79e6ba975fb62645a559c07e3bfe85c4cfd46f69a7dee421ea6ba1f0a5c9f87c0495761bce41a0eadba8d1d9a32baba47eb5757e3128b6be1d2c837ce
-EBUILD systemd-9999.ebuild 13063 BLAKE2B 326c2e60a6edbf8b30759c3fedeb339e35acd6a091611a7725f31fe4f0efa011ee142bf6cfb16a8f11bb2de90628d505ddc1ceebc433d6ddff0cdd70f89b7913 SHA512 9878d1d0291cc31115f41ba134b839bf9e1e2334f11a73f9286b44114f0cb9e9c1f3f1d291856068c6cf610ef384b5de82e8c1825111e1f7e564110bc095d84b
-MISC metadata.xml 2036 BLAKE2B c2f3d74c0cdcf1a5d850c31d43085ab441523e025369c9ad07d9e518d01c7c585c2019c4365892dd6b395c1b4eebc3c7f31c8948c13cab78acf6a2f9528f614c SHA512 72d9f1db3a9cf681a7971d9ded4d73b8b56bf7c467e453f7599293bf3761c66daa7e80716b5c70adcd18a181521f6710267b92df78e8e9a3430a340f8d33fd47
+EBUILD systemd-236-r5.ebuild 12925 BLAKE2B 7af4a9109f2273d2ddb7aa777e7e2e6d055e7b3bf7c6c56b6b02faf3c010af467d09477d7c03efbf58a9511ba4cd2cff3a1e92d0a7f793419d41fe87fb0b5d97 SHA512 ab0bb749a02f9e296d6a4dffc481616bc286127b970122d9d1337cadf3cfe40be44e9f76cf95d0f89d758ef329f4c06bb734643e40f16afca00329b71780449c
+EBUILD systemd-238-r7.ebuild 13143 BLAKE2B a53d102b7007faf0c8b4d200f27dd713fd101e90061ed4e2375d61deac49899c6ed9893eb2c946b96eadb69d2c91dbf302f0b8b98b0c211275fa6323a5f7e268 SHA512 3b6df28916d99e57dcdc35438a9661362d92388a12883ba41ac1ff85d66aec06d9a71d657640ceda6899c69b0387a5a2c1fe6ed7da573125e9463116917b0718
+EBUILD systemd-9999.ebuild 13116 BLAKE2B 7a90220be1694281dbd8ed450125b1fc34dac92b464e8f41aee69a55811cd8a67e721663a11ce7cd51d182652327c56b505056e1b6eec354bf80ed5e1dab2184 SHA512 b03004fbdf6ba83eebac851793419065c389ed3a830c869edd77c7a772629aa5b076b3d1233ae46dc5ab1b407229dcb10442de46d91edc4c8a896e22812559a0
+MISC metadata.xml 2062 BLAKE2B bcca3d75829a25da2a4b3b987c7b14a5295785987d5e4573c19cd39aa165080d71f9a581190365a595567d5f20b58f054de5631480a8dec34c3a10d04f1498b5 SHA512 287b000a32b1b8ddd8041c8303857249317e74492c22e3ac59d237c9c9b511a612a90ab0fdaa209fc8ee092b00a0db0edc364053c1efc42a28f538dd4c3ee7d1
diff --git a/sys-apps/systemd/files/238-sparc-raw-clone.patch b/sys-apps/systemd/files/238-sparc-raw-clone.patch
new file mode 100644
index 000000000000..736a498e918c
--- /dev/null
+++ b/sys-apps/systemd/files/238-sparc-raw-clone.patch
@@ -0,0 +1,42 @@
+From e4aa2c34d526c108dd8fa37448b19bdb38de52c9 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Thu, 24 May 2018 10:48:55 -0400
+Subject: [PATCH] basic: fix raw_clone() on 32-bit sparc
+
+The clone syscall uses the same semantics as on 64-bit. The trap number
+for syscall entry is different.
+
+Bug: https://bugs.gentoo.org/656368
+---
+ src/basic/raw-clone.h | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/src/basic/raw-clone.h b/src/basic/raw-clone.h
+index d8a68663180..d35540903ab 100644
+--- a/src/basic/raw-clone.h
++++ b/src/basic/raw-clone.h
+@@ -39,10 +39,10 @@ static inline pid_t raw_clone(unsigned long flags) {
+         /* On s390/s390x and cris the order of the first and second arguments
+          * of the raw clone() system call is reversed. */
+         ret = (pid_t) syscall(__NR_clone, NULL, flags);
+-#elif defined(__sparc__) && defined(__arch64__)
++#elif defined(__sparc__)
+         {
+                 /**
+-                 * sparc64 always returns the other process id in %o0, and
++                 * sparc always returns the other process id in %o0, and
+                  * a boolean flag whether this is the child or the parent in
+                  * %o1. Inline assembly is needed to get the flag returned
+                  * in %o1.
+@@ -52,7 +52,11 @@ static inline pid_t raw_clone(unsigned long flags) {
+                 asm volatile("mov %2, %%g1\n\t"
+                              "mov %3, %%o0\n\t"
+                              "mov 0 , %%o1\n\t"
++#if defined(__arch64__)
+                              "t 0x6d\n\t"
++#else
++                             "t 0x10\n\t"
++#endif
+                              "mov %%o1, %0\n\t"
+                              "mov %%o0, %1" :
+                              "=r"(in_child), "=r"(child_pid) :
diff --git a/sys-apps/systemd/metadata.xml b/sys-apps/systemd/metadata.xml
index cdc951205cdc..ad89da665866 100644
--- a/sys-apps/systemd/metadata.xml
+++ b/sys-apps/systemd/metadata.xml
@@ -25,7 +25,7 @@
 		<flag name="qrcode">Enable qrcode output support in journal</flag>
 		<flag name="resolvconf">Install resolvconf symlink for systemd-resolve</flag>
 		<flag name="sysv-utils">Install sysvinit compatibility symlinks and manpages for init, telinit, halt, poweroff, reboot, runlevel, and shutdown</flag>
-		<flag name="usrmerge">Enable /usr merge (experimental)</flag>
+		<flag name="split-usr">Enable this if /bin and /usr/bin are separate directories</flag>
 		<flag name="vanilla">Disable Gentoo-specific behavior and compatibility quirks</flag>
 		<flag name="xkb">Depend on <pkg>x11-libs/libxkbcommon</pkg> to allow logind to control the X11 keymap</flag>
 	</use>
diff --git a/sys-apps/systemd/systemd-236-r5.ebuild b/sys-apps/systemd/systemd-236-r5.ebuild
index a39294c568af..9c9f8dd71f87 100644
--- a/sys-apps/systemd/systemd-236-r5.ebuild
+++ b/sys-apps/systemd/systemd-236-r5.ebuild
@@ -21,7 +21,7 @@ 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 elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam policykit qrcode +seccomp selinux ssl +sysv-utils test usrmerge vanilla xkb"
+IUSE="acl apparmor audit build cryptsetup curl elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam policykit qrcode +seccomp selinux +split-usr ssl +sysv-utils test vanilla xkb"
 
 REQUIRED_USE="importd? ( curl gcrypt lzma )"
 RESTRICT="!test? ( test )"
@@ -199,8 +199,8 @@ multilib_src_configure() {
 		# avoid bash-completion dep
 		-Dbashcompletiondir="$(get_bashcompdir)"
 		# make sure we get /bin:/sbin in PATH
-		-Dsplit-usr=$(usex usrmerge false true)
-		-Drootprefix="$(usex usrmerge "${EPREFIX}/usr" "${EPREFIX:-/}")"
+		-Dsplit-usr=$(usex split-usr true false)
+		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
 		-Dsysvinit-path=
 		-Dsysvrcnd-path=
 		# Avoid infinite exec recursion, bug 642724
@@ -331,11 +331,11 @@ multilib_src_install_all() {
 	rm -fr "${ED%/}"/etc/systemd/system/sysinit.target.wants || die
 
 	local udevdir=/lib/udev
-	use usrmerge && udevdir=/usr/lib/udev
+	use split-usr || udevdir=/usr/lib/udev
 
 	rm -r "${ED%/}${udevdir}/hwdb.d" || die
 
-	if ! use usrmerge; then
+	if use split-usr; then
 		# Avoid breaking boot/reboot
 		dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
 		dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
diff --git a/sys-apps/systemd/systemd-238-r2.ebuild b/sys-apps/systemd/systemd-238-r2.ebuild
deleted file mode 100644
index 41ec7ba2128a..000000000000
--- a/sys-apps/systemd/systemd-238-r2.ebuild
+++ /dev/null
@@ -1,436 +0,0 @@
-# Copyright 1999-2018 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}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
-
-inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils 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 elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +seccomp selinux ssl +sysv-utils test usrmerge vanilla xkb"
-
-REQUIRED_USE="importd? ( curl gcrypt lzma )"
-RESTRICT="!test? ( test )"
-
-MINKV="3.11"
-
-COMMON_DEPEND=">=sys-apps/util-linux-2.30: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? (
-		libidn2? ( net-dns/libidn2 )
-		!libidn2? ( net-dns/libidn )
-	)
-	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}] )
-	pcre? ( dev-libs/libpcre2 )
-	qrcode? ( media-gfx/qrencode:0= )
-	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
-	selinux? ( sys-libs/libselinux:0= )
-	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )"
-
-# baselayout-2.2 has /run
-RDEPEND="${COMMON_DEPEND}
-	>=sys-apps/baselayout-2.2
-	selinux? ( sec-policy/selinux-base-policy[systemd] )
-	sysv-utils? ( !sys-apps/sysvinit )
-	!sysv-utils? ( sys-apps/sysvinit )
-	!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
-	$(python_gen_any_dep '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_FALLBACK ~!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"
-		kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF"
-
-		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() {
-	local PATCHES=(
-		"${FILESDIR}/238-0001-sd-bus-do-not-try-to-close-already-closed-fd-8392.patch"
-		"${FILESDIR}/238-0002-core-do-not-free-heap-allocated-strings-8391.patch"
-		"${FILESDIR}/238-libmount-include.patch"
-		"${FILESDIR}/238-0003-udev-net-id-Fix-check-for-address-to-keep-interface-8458.patch"
-	)
-
-	[[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
-
-	if ! use vanilla; then
-		PATCHES+=(
-			"${FILESDIR}/gentoo-Dont-enable-audit-by-default.patch"
-			"${FILESDIR}/gentoo-systemd-user-pam.patch"
-			"${FILESDIR}/gentoo-uucp-group-r1.patch"
-			"${FILESDIR}/gentoo-generator-path.patch"
-		)
-	fi
-
-	default
-}
-
-src_configure() {
-	# Prevent conflicts with i686 cross toolchain, bug 559726
-	tc-export AR CC NM OBJCOPY RANLIB
-
-	python_setup
-
-	multilib-minimal_src_configure
-}
-
-meson_use() {
-	usex "$1" true false
-}
-
-meson_multilib() {
-	if multilib_is_native_abi; then
-		echo true
-	else
-		echo false
-	fi
-}
-
-meson_multilib_native_use() {
-	if multilib_is_native_abi && use "$1"; then
-		echo true
-	else
-		echo false
-	fi
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--localstatedir="${EPREFIX}/var"
-		-Dpamlibdir="$(getpam_mod_dir)"
-		# avoid bash-completion dep
-		-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=
-		# Avoid infinite exec recursion, bug 642724
-		-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
-		# no deps
-		-Defi=$(meson_multilib)
-		-Dima=true
-		# Optional components/dependencies
-		-Dacl=$(meson_multilib_native_use acl)
-		-Dapparmor=$(meson_multilib_native_use apparmor)
-		-Daudit=$(meson_multilib_native_use audit)
-		-Dlibcryptsetup=$(meson_multilib_native_use cryptsetup)
-		-Dlibcurl=$(meson_multilib_native_use curl)
-		-Delfutils=$(meson_multilib_native_use elfutils)
-		-Dgcrypt=$(meson_use gcrypt)
-		-Dgnu-efi=$(meson_multilib_native_use gnuefi)
-		-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)
-		-Dbzip2=$(meson_multilib_native_use importd)
-		-Dzlib=$(meson_multilib_native_use importd)
-		-Dkmod=$(meson_multilib_native_use kmod)
-		-Dlz4=$(meson_use lz4)
-		-Dxz=$(meson_use lzma)
-		-Dlibiptc=$(meson_multilib_native_use nat)
-		-Dpam=$(meson_use pam)
-		-Dpcre2=$(meson_multilib_native_use pcre)
-		-Dpolkit=$(meson_multilib_native_use policykit)
-		-Dqrencode=$(meson_multilib_native_use qrcode)
-		-Dseccomp=$(meson_multilib_native_use seccomp)
-		-Dselinux=$(meson_multilib_native_use selinux)
-		#-Dtests=$(meson_multilib_native_use test)
-		-Ddbus=$(meson_multilib_native_use test)
-		-Dxkbcommon=$(meson_multilib_native_use xkb)
-		# hardcode a few paths to spare some deps
-		-Dkill-path=/bin/kill
-		-Dntp-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.
-		-Ddefault-kill-user-processes=false
-
-		# multilib options
-		-Dbacklight=$(meson_multilib)
-		-Dbinfmt=$(meson_multilib)
-		-Dcoredump=$(meson_multilib)
-		-Denvironment-d=$(meson_multilib)
-		-Dfirstboot=$(meson_multilib)
-		-Dhibernate=$(meson_multilib)
-		-Dhostnamed=$(meson_multilib)
-		-Dhwdb=$(meson_multilib)
-		-Dldconfig=$(meson_multilib)
-		-Dlocaled=$(meson_multilib)
-		-Dman=$(meson_multilib)
-		-Dnetworkd=$(meson_multilib)
-		-Dquotacheck=$(meson_multilib)
-		-Drandomseed=$(meson_multilib)
-		-Drfkill=$(meson_multilib)
-		-Dsysusers=$(meson_multilib)
-		-Dtimedated=$(meson_multilib)
-		-Dtimesyncd=$(meson_multilib)
-		-Dtmpfiles=$(meson_multilib)
-		-Dvconsole=$(meson_multilib)
-	)
-
-	if multilib_is_native_abi && use idn; then
-		myconf+=(
-			-Dlibidn2=$(usex libidn2 true false)
-			-Dlibidn=$(usex libidn2 false true)
-		)
-	else
-		myconf+=(
-			-Dlibidn2=false
-			-Dlibidn=false
-		)
-	fi
-
-	meson_src_configure "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	eninja
-}
-
-multilib_src_test() {
-	eninja test
-}
-
-multilib_src_install() {
-	DESTDIR="${D}" eninja install
-}
-
-multilib_src_install_all() {
-	# meson doesn't know about docdir
-	mv "${ED%/}"/usr/share/doc/{systemd,${PF}} || die
-
-	einstalldocs
-	dodoc "${FILESDIR}"/nsswitch.conf
-
-	if ! use sysv-utils; then
-		local rootprefix=$(usex usrmerge /usr '')
-		rm "${ED%/}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die
-		rmdir "${ED%/}${rootprefix}"/sbin || die
-		rm "${ED%/}"/usr/share/man/man1/init.1 || die
-		rm "${ED%/}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die
-	fi
-
-	# Preserve empty dirs in /etc & /var, bug #437008
-	keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
-	keepdir /etc/systemd/{ntp-units.d,user} /var/lib/systemd
-	keepdir /etc/udev/{hwdb.d,rules.d}
-	keepdir /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 -f "${ED%/}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service || die
-	rm -f "${ED%/}"/etc/systemd/system/dbus-org.freedesktop.network1.service || die
-	rm -f "${ED%/}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service || die
-	rm -f "${ED%/}"/etc/systemd/system/dbus-org.freedesktop.resolve1.service || die
-	rm -fr "${ED%/}"/etc/systemd/system/network-online.target.wants || die
-	rm -fr "${ED%/}"/etc/systemd/system/sockets.target.wants || die
-	rm -fr "${ED%/}"/etc/systemd/system/sysinit.target.wants || die
-
-	local udevdir=/lib/udev
-	use usrmerge && udevdir=/usr/lib/udev
-
-	rm -r "${ED%/}${udevdir}/hwdb.d" || die
-
-	if ! use usrmerge; then
-		# Avoid breaking boot/reboot
-		dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
-		dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
-	fi
-}
-
-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 kvm 78
-	enewgroup render
-	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="${EROOT%/}"
-	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-238-r4.ebuild b/sys-apps/systemd/systemd-238-r4.ebuild
deleted file mode 100644
index afc515ee2618..000000000000
--- a/sys-apps/systemd/systemd-238-r4.ebuild
+++ /dev/null
@@ -1,438 +0,0 @@
-# Copyright 1999-2018 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}/${P}.tar.gz
-		https://dev.gentoo.org/~floppym/dist/${P}-patches-0.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
-
-inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils 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 elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +seccomp selinux ssl +sysv-utils test usrmerge vanilla xkb"
-
-REQUIRED_USE="importd? ( curl gcrypt lzma )"
-RESTRICT="!test? ( test )"
-
-MINKV="3.11"
-
-COMMON_DEPEND=">=sys-apps/util-linux-2.30: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? (
-		libidn2? ( net-dns/libidn2 )
-		!libidn2? ( net-dns/libidn )
-	)
-	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}] )
-	pcre? ( dev-libs/libpcre2 )
-	qrcode? ( media-gfx/qrencode:0= )
-	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
-	selinux? ( sys-libs/libselinux:0= )
-	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )"
-
-# baselayout-2.2 has /run
-RDEPEND="${COMMON_DEPEND}
-	>=sys-apps/baselayout-2.2
-	selinux? ( sec-policy/selinux-base-policy[systemd] )
-	sysv-utils? ( !sys-apps/sysvinit )
-	!sysv-utils? ( sys-apps/sysvinit )
-	!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
-	$(python_gen_any_dep '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_FALLBACK ~!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"
-		kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF"
-
-		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() {
-	local PATCHES=()
-
-	[[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
-
-	PATCHES+=(
-		"${FILESDIR}/238-libmount-include.patch"
-		"${FILESDIR}/238-initctl.patch"
-		"${FILESDIR}/238-nspawn-wait.patch"
-	)
-
-	if ! use vanilla; then
-		PATCHES+=(
-			"${FILESDIR}/gentoo-Dont-enable-audit-by-default.patch"
-			"${FILESDIR}/gentoo-systemd-user-pam.patch"
-			"${FILESDIR}/gentoo-uucp-group-r1.patch"
-			"${FILESDIR}/gentoo-generator-path.patch"
-		)
-	fi
-
-	default
-}
-
-src_configure() {
-	# Prevent conflicts with i686 cross toolchain, bug 559726
-	tc-export AR CC NM OBJCOPY RANLIB
-
-	python_setup
-
-	multilib-minimal_src_configure
-}
-
-meson_use() {
-	usex "$1" true false
-}
-
-meson_multilib() {
-	if multilib_is_native_abi; then
-		echo true
-	else
-		echo false
-	fi
-}
-
-meson_multilib_native_use() {
-	if multilib_is_native_abi && use "$1"; then
-		echo true
-	else
-		echo false
-	fi
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--localstatedir="${EPREFIX}/var"
-		-Dpamlibdir="$(getpam_mod_dir)"
-		# avoid bash-completion dep
-		-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=
-		# Avoid infinite exec recursion, bug 642724
-		-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
-		# no deps
-		-Defi=$(meson_multilib)
-		-Dima=true
-		# Optional components/dependencies
-		-Dacl=$(meson_multilib_native_use acl)
-		-Dapparmor=$(meson_multilib_native_use apparmor)
-		-Daudit=$(meson_multilib_native_use audit)
-		-Dlibcryptsetup=$(meson_multilib_native_use cryptsetup)
-		-Dlibcurl=$(meson_multilib_native_use curl)
-		-Delfutils=$(meson_multilib_native_use elfutils)
-		-Dgcrypt=$(meson_use gcrypt)
-		-Dgnu-efi=$(meson_multilib_native_use gnuefi)
-		-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)
-		-Dbzip2=$(meson_multilib_native_use importd)
-		-Dzlib=$(meson_multilib_native_use importd)
-		-Dkmod=$(meson_multilib_native_use kmod)
-		-Dlz4=$(meson_use lz4)
-		-Dxz=$(meson_use lzma)
-		-Dlibiptc=$(meson_multilib_native_use nat)
-		-Dpam=$(meson_use pam)
-		-Dpcre2=$(meson_multilib_native_use pcre)
-		-Dpolkit=$(meson_multilib_native_use policykit)
-		-Dqrencode=$(meson_multilib_native_use qrcode)
-		-Dseccomp=$(meson_multilib_native_use seccomp)
-		-Dselinux=$(meson_multilib_native_use selinux)
-		#-Dtests=$(meson_multilib_native_use test)
-		-Ddbus=$(meson_multilib_native_use test)
-		-Dxkbcommon=$(meson_multilib_native_use xkb)
-		# hardcode a few paths to spare some deps
-		-Dkill-path=/bin/kill
-		-Dntp-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.
-		-Ddefault-kill-user-processes=false
-
-		# multilib options
-		-Dbacklight=$(meson_multilib)
-		-Dbinfmt=$(meson_multilib)
-		-Dcoredump=$(meson_multilib)
-		-Denvironment-d=$(meson_multilib)
-		-Dfirstboot=$(meson_multilib)
-		-Dhibernate=$(meson_multilib)
-		-Dhostnamed=$(meson_multilib)
-		-Dhwdb=$(meson_multilib)
-		-Dldconfig=$(meson_multilib)
-		-Dlocaled=$(meson_multilib)
-		-Dman=$(meson_multilib)
-		-Dnetworkd=$(meson_multilib)
-		-Dquotacheck=$(meson_multilib)
-		-Drandomseed=$(meson_multilib)
-		-Drfkill=$(meson_multilib)
-		-Dsysusers=$(meson_multilib)
-		-Dtimedated=$(meson_multilib)
-		-Dtimesyncd=$(meson_multilib)
-		-Dtmpfiles=$(meson_multilib)
-		-Dvconsole=$(meson_multilib)
-	)
-
-	if multilib_is_native_abi && use idn; then
-		myconf+=(
-			-Dlibidn2=$(usex libidn2 true false)
-			-Dlibidn=$(usex libidn2 false true)
-		)
-	else
-		myconf+=(
-			-Dlibidn2=false
-			-Dlibidn=false
-		)
-	fi
-
-	meson_src_configure "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	eninja
-}
-
-multilib_src_test() {
-	eninja test
-}
-
-multilib_src_install() {
-	DESTDIR="${D}" eninja install
-}
-
-multilib_src_install_all() {
-	# meson doesn't know about docdir
-	mv "${ED%/}"/usr/share/doc/{systemd,${PF}} || die
-
-	einstalldocs
-	dodoc "${FILESDIR}"/nsswitch.conf
-
-	if ! use sysv-utils; then
-		local rootprefix=$(usex usrmerge /usr '')
-		rm "${ED%/}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die
-		rmdir "${ED%/}${rootprefix}"/sbin || die
-		rm "${ED%/}"/usr/share/man/man1/init.1 || die
-		rm "${ED%/}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die
-	fi
-
-	# Preserve empty dirs in /etc & /var, bug #437008
-	keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
-	keepdir /etc/systemd/{ntp-units.d,user} /var/lib/systemd
-	keepdir /etc/udev/{hwdb.d,rules.d}
-	keepdir /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 -f "${ED%/}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service || die
-	rm -f "${ED%/}"/etc/systemd/system/dbus-org.freedesktop.network1.service || die
-	rm -f "${ED%/}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service || die
-	rm -f "${ED%/}"/etc/systemd/system/dbus-org.freedesktop.resolve1.service || die
-	rm -fr "${ED%/}"/etc/systemd/system/network-online.target.wants || die
-	rm -fr "${ED%/}"/etc/systemd/system/sockets.target.wants || die
-	rm -fr "${ED%/}"/etc/systemd/system/sysinit.target.wants || die
-
-	local udevdir=/lib/udev
-	use usrmerge && udevdir=/usr/lib/udev
-
-	rm -r "${ED%/}${udevdir}/hwdb.d" || die
-
-	if ! use usrmerge; then
-		# Avoid breaking boot/reboot
-		dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
-		dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
-	fi
-}
-
-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 kvm 78
-	enewgroup render
-	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="${EROOT%/}"
-	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-238-r6.ebuild b/sys-apps/systemd/systemd-238-r7.ebuild
index 9766434cbd96..e65ddd901dd0 100644
--- a/sys-apps/systemd/systemd-238-r6.ebuild
+++ b/sys-apps/systemd/systemd-238-r7.ebuild
@@ -21,7 +21,7 @@ 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 elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +seccomp selinux ssl +sysv-utils test usrmerge vanilla xkb"
+IUSE="acl apparmor audit build cryptsetup curl elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +seccomp selinux +split-usr ssl +sysv-utils test vanilla xkb"
 
 REQUIRED_USE="importd? ( curl gcrypt lzma )"
 RESTRICT="!test? ( test )"
@@ -154,6 +154,7 @@ src_prepare() {
 		"${FILESDIR}/238-initctl.patch"
 		"${FILESDIR}/238-nspawn-wait.patch"
 		"${FILESDIR}/238-timesync-connection.patch"
+		"${FILESDIR}/238-sparc-raw-clone.patch"
 	)
 
 	if ! use vanilla; then
@@ -204,8 +205,8 @@ multilib_src_configure() {
 		# avoid bash-completion dep
 		-Dbashcompletiondir="$(get_bashcompdir)"
 		# make sure we get /bin:/sbin in PATH
-		-Dsplit-usr=$(usex usrmerge false true)
-		-Drootprefix="$(usex usrmerge "${EPREFIX}/usr" "${EPREFIX:-/}")"
+		-Dsplit-usr=$(usex split-usr true false)
+		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
 		-Dsysvinit-path=
 		-Dsysvrcnd-path=
 		# Avoid infinite exec recursion, bug 642724
@@ -290,6 +291,7 @@ multilib_src_compile() {
 }
 
 multilib_src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
 	eninja test
 }
 
@@ -305,7 +307,7 @@ multilib_src_install_all() {
 	dodoc "${FILESDIR}"/nsswitch.conf
 
 	if ! use sysv-utils; then
-		local rootprefix=$(usex usrmerge /usr '')
+		local rootprefix=$(usex split-usr '' /usr)
 		rm "${ED%/}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die
 		rmdir "${ED%/}${rootprefix}"/sbin || die
 		rm "${ED%/}"/usr/share/man/man1/init.1 || die
@@ -332,11 +334,11 @@ multilib_src_install_all() {
 	rm -fr "${ED%/}"/etc/systemd/system/sysinit.target.wants || die
 
 	local udevdir=/lib/udev
-	use usrmerge && udevdir=/usr/lib/udev
+	use split-usr || udevdir=/usr/lib/udev
 
 	rm -r "${ED%/}${udevdir}/hwdb.d" || die
 
-	if ! use usrmerge; then
+	if use split-usr; then
 		# Avoid breaking boot/reboot
 		dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
 		dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 999d766f966c..8112fd15fef7 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -20,7 +20,7 @@ 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 elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux ssl +sysv-utils test usrmerge vanilla xkb"
+IUSE="acl apparmor audit build cryptsetup curl elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux +split-usr ssl +sysv-utils test vanilla xkb"
 
 REQUIRED_USE="importd? ( curl gcrypt lzma )"
 RESTRICT="!test? ( test )"
@@ -203,8 +203,8 @@ multilib_src_configure() {
 		# avoid bash-completion dep
 		-Dbashcompletiondir="$(get_bashcompdir)"
 		# make sure we get /bin:/sbin in PATH
-		-Dsplit-usr=$(usex usrmerge false true)
-		-Drootprefix="$(usex usrmerge "${EPREFIX}/usr" "${EPREFIX:-/}")"
+		-Dsplit-usr=$(usex split-usr true false)
+		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
 		-Dsysvinit-path=
 		-Dsysvrcnd-path=
 		# Avoid infinite exec recursion, bug 642724
@@ -289,6 +289,7 @@ multilib_src_compile() {
 }
 
 multilib_src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
 	eninja test
 }
 
@@ -297,7 +298,7 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	local rootprefix=$(usex usrmerge /usr '')
+	local rootprefix=$(usex split-usr '' /usr)
 
 	# meson doesn't know about docdir
 	mv "${ED%/}"/usr/share/doc/{systemd,${PF}} || die
@@ -336,11 +337,11 @@ multilib_src_install_all() {
 	rm -fr "${ED%/}"/etc/systemd/system/sysinit.target.wants || die
 
 	local udevdir=/lib/udev
-	use usrmerge && udevdir=/usr/lib/udev
+	use split-usr || udevdir=/usr/lib/udev
 
 	rm -r "${ED%/}${udevdir}/hwdb.d" || die
 
-	if ! use usrmerge; then
+	if use split-usr; then
 		# Avoid breaking boot/reboot
 		dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
 		dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index e5f60bce4d12..f08fa798d35c 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/rtkit/Manifest b/sys-auth/rtkit/Manifest
index 4d141a0a0e64..2064af46f7c3 100644
--- a/sys-auth/rtkit/Manifest
+++ b/sys-auth/rtkit/Manifest
@@ -2,6 +2,5 @@ AUX rtkit-0.11-controlgroup.patch 528 BLAKE2B 2b8d61a1f6705c76015332ecf87a8d940c
 AUX rtkit-0.11-gettime.patch 744 BLAKE2B a32bf8db977a473a005d0890b7b6064c0ef8769cdaf42a46bab5d43d5f62adec1f3896a5a6a110eaf3d146e2075304fbba692630c4ee3e1b58a07b1168776743 SHA512 b9207e1be512689e3896587105d135ab686d4eb1dd8c2e0feb62ca73eed2a8e1e473826e82b06bf240f26c64975b9793cd407cf6493a8f7eb6946da17198059c
 AUX rtkit-0.11-polkit.patch 2074 BLAKE2B 4530c423c62b1fae601a16271e8de829d9ee5e1b4f147867694de707ae24965ef4aa6864f3981ee0c4084e6652dcd418d651920887509eee2d3c8a4ae3d68d59 SHA512 cc4cb9879235398f828c16951e380e0456c9e5bbd5acc2a0968153c5ce361fd1aceeeeac8ab873c21c0556c5d4677cdad8ed9e23dd3b9b5a8a73cf9264ee5a4b
 DIST rtkit-0.11.tar.xz 126748 BLAKE2B e989f1fb9e33c2e06d7eedbe0aab45982d458b6a80aa8ba9b05ae94ed048ef1351d30f8800859a08d8bb0a53891e7b63f6bda6308b4521da10a61182ca3921f9 SHA512 4641af965dc64c0f498ae469fbee1ceb337204fa7d778fbbb41f2b5c5e88947e633c7e9ad037274fdd778c3c097a4a1dbb0b2add287d74eccbcd2d357cb2da22
-EBUILD rtkit-0.11-r1.ebuild 950 BLAKE2B 095fca5ccf3d98f55a13e17f0cbe9b9d323f76560005fb0c4977e687b638087dbec3c285b6c7c587bcce32504927b621ebb8576c38c7b9e5d1c6874320489c12 SHA512 a5c3f0e14787711bfdd826345cfec2ceb60dd708f95a6fdd81ed77f9ffb51bb10ba53819272ec7406fd2c28fd73ce1659e508c3669b1cb6267896dbdb3f17fb6
 EBUILD rtkit-0.11-r2.ebuild 1342 BLAKE2B 4ac3a9cd082ab0dfdc3196e12182cdb528f11f0ad169add7e94f3944e4646faba00d4e2d6afd61e753808b037ca99aece8e41761ce63319ec887b90089b3832f SHA512 4cd30f5dd4f5736d9a66a634aa4aeb2109b202bfe592a6d1bece3fce98a690fe9ef6836c1ca37f0d0689fb20fd14b16cb8e8accb9a2e5a0b69965fa8a1dec558
 MISC metadata.xml 455 BLAKE2B cc63fbcf541ef442091a8bd3f8b2da07f629b71778b0ece05a18617088de554f6f8ffdc1d4aeed4a73bb957c88b470fcec52781704800575b364a3d2164b3914 SHA512 90bde656e242fe6cd7b408671f419ee54f73a781b67ee9047c8cd06d7fb29fee2882aed7ab95b42f22fdb65570f389e04931f8fa24506307b1bc8387c213850e
diff --git a/sys-auth/rtkit/rtkit-0.11-r1.ebuild b/sys-auth/rtkit/rtkit-0.11-r1.ebuild
deleted file mode 100644
index 4b8743fc02f7..000000000000
--- a/sys-auth/rtkit/rtkit-0.11-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils systemd user autotools
-
-DESCRIPTION="Realtime Policy and Watchdog Daemon"
-HOMEPAGE="http://0pointer.de/blog/projects/rtkit"
-SRC_URI="http://0pointer.de/public/${P}.tar.xz"
-
-LICENSE="GPL-3 BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86"
-IUSE=""
-
-RDEPEND="
-	sys-apps/dbus
-	sys-auth/polkit
-	sys-libs/libcap
-"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	enewgroup rtkit
-	enewuser rtkit -1 -1 -1 "rtkit"
-}
-
-src_prepare() {
-	# Fedora patches
-	epatch "${FILESDIR}"/${P}-polkit.patch
-	epatch "${FILESDIR}"/${P}-gettime.patch
-	epatch "${FILESDIR}"/${P}-controlgroup.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf $(systemd_with_unitdir)
-}
-
-src_install() {
-	default
-
-	./rtkit-daemon --introspect > org.freedesktop.RealtimeKit1.xml
-	insinto /usr/share/dbus-1/interfaces
-	doins org.freedesktop.RealtimeKit1.xml
-}
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 35bd348e522b..9adbed3521b5 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/cinder/Manifest b/sys-cluster/cinder/Manifest
index ae324e94d66f..6a3853736431 100644
--- a/sys-cluster/cinder/Manifest
+++ b/sys-cluster/cinder/Manifest
@@ -1,13 +1,11 @@
 AUX cinder.initd 494 BLAKE2B f919de45b8e39b65d355f627fcd71a4c23a7bb550157d25811c1d1f3a84b9f1c1e7c596361ec5d2aab650f1ebf3f0f053e313f2e15be64995d1309a6eafc8a69 SHA512 be3c2e6798b08527487cfd2b1cd66a03d891526a45f52c97a536b15a08d46a4162e3b036dcae86911c7dba25c5d7f02e73a089d4dd720526bf38ecd0f44c59b0
 AUX cinder.sudoersd 86 BLAKE2B 1ea49d3cf3bc134ea0a2d5512c6e258f117187267bfa408fea0d2449a091068e5404812a0e693f226d895ec23766ed73aca36128d6f7b968ae44dc38b8ad948a SHA512 c158be54e721abc6916db2e710092ca75aac65ac88b19849ccd0f3ebbb7c8879aab6b73aba36537e806abd5b8b5e8fbc24fca79d00015d3308198d5270e51fe1
 DIST cinder-11.1.0.tar.gz 5813863 BLAKE2B 467ebe47d92b8a9c612b6d2c30ca9a3b737b33cf999c3612079cb6d6886ee986e60f9eb15bc6cd3e2adc7ab9c4e956ca41c9324c23f8892cdea9aedd1e1e035c SHA512 193914d69144afba54bda7b3d05a8140501368c2fd44dd203dff5006228dad47602c4da244dc844781cff36581987ee236fc5238c7d78062e7cb78b8795b1f28
-DIST cinder-12.0.0.tar.gz 5359294 BLAKE2B 85a7422ba3a562546cb192cabd6d9614adf8e4daa5cd86d98b6c3a49bd3ecea71027ce9e075f297f998d6539803f02505153fb09586928a159fce7683db6f680 SHA512 dbc65a0231ae584734a9cb9b29429a5ebecb15caf340237e8c3064b7e4c02793e6ec988554588aff46b825a44eac75fb748b25001ac28667752acc8fe199022d
 DIST cinder-12.0.1.tar.gz 5333749 BLAKE2B 9a78b3a4a6212018e9bfa2ec29ee3c26dbb11a77214eeea2a421fcb898f75a15da78a6e7b6d42793b5ac833003b20bc39a56851a177fca6ec1ca96684d7e3bba SHA512 4b07a3cd579ee235446eb6eaf50698b629a6d24d5e7ada2d99635702aa3d53bab2038edf79f7b741d1039a88a752a1a093c454648c88abae8dc7070c59d16c07
 DIST pike-cinder.conf.sample 185310 BLAKE2B 6f6a626537098107d63cd33ef6f8cc63dd5064711fcab3b6a7ebd0bb4170d3cc18e1cc414491859c63ca02d39602f496068823975f1cd5de731402696ade0868 SHA512 12c44b7a31888fbf4c70e037a2f5d0b778018e10bd0fc1cb97391bbe2fc6f97bbe4bec0d1504513ee0235ce50decda6883fe64a7d8fd5e329d8ad73e6bb74654
 DIST queens-cinder.conf.sample 179467 BLAKE2B 00c229a6d9882740460c633db69bf3f5ff3d77a2a8e78f38528f1b5e6e03c2371141ba219c24b8dc82e51c20a5e784af142c1a0192791ff356e5841a9991d713 SHA512 346f9ad4ddcfed26dd3b9b34e65c2edaf08a7d649d4af5bd3a5ebf1047c78d6cdc4e4712666e022f56acd3b2a0b323850b40cc4d0008f2c140507342a00b2908
 EBUILD cinder-11.1.0.ebuild 7748 BLAKE2B fee1f56d529fd4aa3969d4af66d793c419f1c2215d4e8715d8a4faa0c4cc82c5af2e125ea8de35e3496354c323bf0fbd55159fde814ff070415b025c0a435a34 SHA512 ff37f6b3906eba212691312b9c689d62a848e2db4c05e20acf233edf502423b4ac466639f9c073d9c70e08e570e8a411513b224c881b227fae52f0cedb72fd7d
-EBUILD cinder-12.0.0.ebuild 8060 BLAKE2B 3682c951bf990f8cae4d173e42696843390d8d31b61da81447457379edcd249e9eba247ea0d3f63af9273fd91a07656a2c44b25647821d061f94b66112038e69 SHA512 0c02a0da61808f23305762971a61842f5bc9bfd5eb8b90915f3a755602b5563dea91e93db46e7a26c1b35a008f2fb2c9f39847e2fad5626d42945d07d8a14452
-EBUILD cinder-12.0.1.ebuild 8062 BLAKE2B d7b7ee7a2d552288c8cd69598dad60d9e3b0432f59fbe330b187de7e2c46f9ac581aa3ee6a205b10d94d50454afa64291a1695cde00e8929d730578cfeb04298 SHA512 3f9a25e897baba087f8206a4348ba41fa36d60bb4bbd32e5e5292f0415a9585396a74ed095c42ed24d4086e9c0039d21a13af99f782afb71cf42c14852b7c791
+EBUILD cinder-12.0.1.ebuild 8060 BLAKE2B 3682c951bf990f8cae4d173e42696843390d8d31b61da81447457379edcd249e9eba247ea0d3f63af9273fd91a07656a2c44b25647821d061f94b66112038e69 SHA512 0c02a0da61808f23305762971a61842f5bc9bfd5eb8b90915f3a755602b5563dea91e93db46e7a26c1b35a008f2fb2c9f39847e2fad5626d42945d07d8a14452
 EBUILD cinder-2017.2.9999.ebuild 7772 BLAKE2B 354ea7431e2e7d3bf9f5322f5b4f313de076977b0b33ef812cdeb9133983d7cbd50b569cf7c1451fc49857023e29741708fbd6a43c5e941c6a107771563ed9dd SHA512 c8a6db8c3d8c3c4ebca2d121250a6dde400a9cfd1092b17e2510e12656c4b945f4ffa8292f9893d06a29f4b1c5eac36202eb08d2b5d28997343070678d973c91
 EBUILD cinder-2018.1.9999.ebuild 8064 BLAKE2B 7fa795367871db689ddabf456eeab9d59b67d6b76195efc7e66fe9370017f043412c1945129b74afa43d8f12e1e96b1f16dbad5f9440498539053998d8f47bc2 SHA512 62c9b7d4dc3b72edb659db5130ecde8502346b1a253e7ae3a62bc1447559fafb0f5ee74672f52307a2257c49fdef37dc1f803cf5742f353525678f906b622888
 MISC metadata.xml 1244 BLAKE2B bac3f4931079ae89c48d66ed2fe689978fcf609638ade7b26d8f07ffbd6562d7c4a16b42dec4390654747c6d2dfcb92b73d27c90356f1928199469d42432ef69 SHA512 fda201e6974bb0af9c24c1384a3bb2dd0a0c630439d7f1955de336f53804070a68426919fd4dc6f864d502c7e9e99a80d1920c740b6dc179f7b46c7f7fb7aef9
diff --git a/sys-cluster/cinder/cinder-12.0.0.ebuild b/sys-cluster/cinder/cinder-12.0.0.ebuild
deleted file mode 100644
index 1ced12d0b38b..000000000000
--- a/sys-cluster/cinder/cinder-12.0.0.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit distutils-r1 eutils git-r3 linux-info user
-
-DESCRIPTION="Cinder is the OpenStack Block storage service, a spin out of nova-volumes"
-HOMEPAGE="https://launchpad.net/cinder"
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/queens/cinder.conf.sample -> queens-cinder.conf.sample"
-	EGIT_REPO_URI="https://github.com/openstack/cinder.git"
-	EGIT_BRANCH="stable/queens"
-else
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/queens/cinder.conf.sample -> queens-cinder.conf.sample
-	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS=""
-IUSE="+api +scheduler +volume infiniband iscsi lvm mysql +memcached postgres rdma sqlite +tcp test +tgt"
-REQUIRED_USE="|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma )"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	app-admin/sudo"
-
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/defusedxml-0.5.0[${PYTHON_USEDEP}]
-	dev-python/enum34[$(python_gen_usedep 'python2_7')]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
-	<dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.4.1[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
-	virtual/python-ipaddress[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.3.0[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.4.1[${PYTHON_USEDEP}]
-	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/oauth2client-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.25.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-privsep-1.23.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-2.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.31.2[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-barbicanclient-4.0.0[${PYTHON_USEDEP}]
-	!~dev-python/python-barbicanclient-4.5.0[${PYTHON_USEDEP}]
-	!~dev-python/python-barbicanclient-4.5.1[${PYTHON_USEDEP}]
-	>=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-novaclient-9.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
-	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/taskflow-2.16.0[${PYTHON_USEDEP}]
-	>=dev-python/rtslib-fb-2.1.43[${PYTHON_USEDEP}]
-	!~dev-python/rtslib-fb-2.1.60[${PYTHON_USEDEP}]
-	!~dev-python/rtslib-fb-2.1.61[${PYTHON_USEDEP}]
-	!~dev-python/rtslib-fb-2.1.64[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	sqlite? (
-		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
-	)
-	mysql? (
-		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
-		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
-	)
-	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	~dev-python/suds-0.6[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-vmware-2.17.0[${PYTHON_USEDEP}]
-	>=dev-python/os-brick-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/tooz-1.58.0[${PYTHON_USEDEP}]
-	>=dev-python/google-api-python-client-1.4.2[${PYTHON_USEDEP}]
-	>=dev-python/castellan-0.16.0[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.9[${PYTHON_USEDEP}]
-	!~dev-python/cryptography-2.0[${PYTHON_USEDEP}]
-	iscsi? (
-		tgt? ( sys-block/tgt )
-		sys-block/open-iscsi
-	)
-	lvm? ( sys-fs/lvm2 )
-	memcached? ( net-misc/memcached )
-	app-emulation/qemu
-	sys-fs/sysfsutils"
-# qemu is needed for image conversion
-
-#PATCHES=(
-#)
-
-pkg_pretend() {
-	linux-info_pkg_setup
-	CONFIG_CHECK_MODULES=""
-	if use tcp; then
-		CONFIG_CHECK_MODULES+="SCSI_ISCSI_ATTRS ISCSI_TCP "
-	fi
-	if use rdma; then
-		CONFIG_CHECK_MODULES+="INFINIBAND_ISER "
-	fi
-	if use infiniband; then
-		CONFIG_CHECK_MODULES+="INFINIBAND_IPOIB INFINIBAND_USER_MAD INFINIBAND_USER_ACCESS"
-	fi
-	if linux_config_exists; then
-		for module in ${CONFIG_CHECK_MODULES}; do
-			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled"
-		done
-	fi
-}
-
-pkg_setup() {
-	enewgroup cinder
-	enewuser cinder -1 -1 /var/lib/cinder cinder
-}
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# Let's track progress of this # https://bugs.launchpad.net/swift/+bug/1249727
-	nosetests -I test_wsgi.py cinder/tests/ || die "tests failed under python2.7"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	keepdir /etc/cinder
-	dodir /etc/cinder/rootwrap.d
-
-	for svc in api scheduler volume; do
-		newinitd "${FILESDIR}/cinder.initd" cinder-${svc}
-	done
-
-	insinto /etc/cinder
-	insopts -m0640 -o cinder -g cinder
-	doins "etc/cinder/api-httpd.conf"
-	doins "etc/cinder/logging_sample.conf"
-	doins "etc/cinder/rootwrap.conf"
-	doins "etc/cinder/api-paste.ini"
-	doins "etc/cinder/resource_filters.json"
-	newins "${DISTDIR}/pike-cinder.conf.sample" "cinder.conf.sample"
-	insinto /etc/cinder/rootwrap.d
-	doins "etc/cinder/rootwrap.d/volume.filters"
-
-	dodir /var/log/cinder
-	fowners cinder:cinder /var/log/cinder
-
-	#add sudoers definitions for user nova
-	insinto /etc/sudoers.d/
-	insopts -m 0440 -o root -g root
-	newins "${FILESDIR}/cinder.sudoersd" cinder
-}
-
-pkg_postinst() {
-	if use iscsi ; then
-		elog "Cinder needs tgtd to be installed and running to work with iscsi"
-		elog "it also needs 'include /var/lib/cinder/volumes/*' in /etc/tgt/targets.conf"
-	fi
-}
diff --git a/sys-cluster/cinder/cinder-12.0.1.ebuild b/sys-cluster/cinder/cinder-12.0.1.ebuild
index 7c4c55c46c39..1ced12d0b38b 100644
--- a/sys-cluster/cinder/cinder-12.0.1.ebuild
+++ b/sys-cluster/cinder/cinder-12.0.1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]];then
 else
 	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/queens/cinder.conf.sample -> queens-cinder.conf.sample
 	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/sys-cluster/kube-apiserver/Manifest b/sys-cluster/kube-apiserver/Manifest
index a0da26bbc57e..b4b209ec6386 100644
--- a/sys-cluster/kube-apiserver/Manifest
+++ b/sys-cluster/kube-apiserver/Manifest
@@ -2,9 +2,13 @@ AUX kube-apiserver.confd 116 BLAKE2B 2cf2dff516674ba4dc0763985a070b75e23f9af51e7
 AUX kube-apiserver.initd 541 BLAKE2B ddddc86735a9f90a0c232f2631ac21c028045783c737d041a808fb5012522844614a40059524c472b9b50fd077253b75e2bcf33d69518d71428fcb7e27143fba SHA512 2863ad6d1d238b5e9557874cd3f5413108ed9424604cf026e2fd8c2fd66ba867ca9a3d98f67fdac54f335bacddf0479547b28f71aaa1db6580beff49290de110
 AUX kube-apiserver.logrotated 88 BLAKE2B e58f3f108f5f7dbbadacfcc1b401567ce79d511a4623f85f01830c5e40d4ad4e44fe0b3f90d4143042d82bd83b0a2b11517e89037755ef2ad7afeeb23401bb60 SHA512 1a4bcd54dafaedc614e34bbadc2a1163f003b5925d47552fb2c47049c033c147e612171e263d9659d189fc2d95688a0b7153322d8dba97c083c079fdef6c400e
 DIST kubernetes-1.10.2.tar.gz 24746905 BLAKE2B d09b8a71562696282cccbe7c0653518694825f25e1bd51ac62a41f4f7853e142b7b2f380026a610efb726f0206cb13ca55a3c3d39e13894345a9debbea06e0f8 SHA512 be907fed5d5ebc42097101160b9cac1924f738ba6856b821ea4e8582cb877f6ef919e98758f7d7924662633323215c9693173617df90d5940c987160e7397fc8
+DIST kubernetes-1.10.3.tar.gz 24761331 BLAKE2B d9c2935140813a020c73e13397c7dd20d9728cbfcfde0ed5e23aa135fe8c01df92dc644255ddb62466b141d0eacb92efca1d5df71c5f0079fd2e05d12f96f5a6 SHA512 bf8a89d7f9ef3306b9f0d45258a3eb425dd61f3f79a15f401cff93b7856e990444aa169150a883a6989467d8672cab9e9018477759a6fa8fcdf1cf499b721dd5
 DIST kubernetes-1.9.6.tar.gz 23538810 BLAKE2B ff832b3c8b0c06d47d62c6bbb981a60c94d31822921eb4a2e1fcb9b04c44cb9ffbb2f3bca050ba7188a49ec5292e5bad9a0560c6c39bce8ff706d1034df90e45 SHA512 1182f189fe5090297c373359f8c3782acc05213cc05c35b7cd48aaed845a2c8cbe32e155699e549690d8438cea220a129bde8256e834ae8939badf2ad953fa1e
 DIST kubernetes-1.9.7.tar.gz 23550884 BLAKE2B f0762b24d74aa0bab6176ef96fdd30de288ab97ae8cdc73f3d8735b2be677f22a2aa5218745da767999024399b6feca1953308069cda732d002726ac0b87435f SHA512 d5e0e16cfa75053f5019f28a709cc44f27fb46cdbd50f6637c8b8bd6012cd3a0e6afb625ad21b1f84bc4ea83f4cb3a7064f42226a1b2ba84113e185e628fbf3d
+DIST kubernetes-1.9.8.tar.gz 23559610 BLAKE2B ef384dd9a06cb00c5a095b05a4b304b08a97c3eac9c40b1b06664bfffb5e5b7c71505d50c4f7c3b594975df1013030788c8cee40acbce5c9ccd34ee5b44dc4fe SHA512 45e65d7a1f0950f2fb8fc923bdcaf1d607960be096a98fbfe187ef117da02ce7bf430cdc4c6d7e707557ef54f3239025e442be08729e86dabba624f3aa7503d1
 EBUILD kube-apiserver-1.10.2.ebuild 1208 BLAKE2B 836e21b3513e7cc03dcddac3792fbf1d1247faca83da3d71deabbfb6cebc8cc85189e459558b3b7baa73e8bf876ae30105ae9ec3871b806e08b256e808d4b0e9 SHA512 104b15950bd93e8e791f21b7b7402df60c3c751a6b834e2d5071790cb3d38030512e5c7c01b1883ad3599f30304e76eb27212033aa18c3ce623eb592572e6550
+EBUILD kube-apiserver-1.10.3.ebuild 1208 BLAKE2B 836e21b3513e7cc03dcddac3792fbf1d1247faca83da3d71deabbfb6cebc8cc85189e459558b3b7baa73e8bf876ae30105ae9ec3871b806e08b256e808d4b0e9 SHA512 104b15950bd93e8e791f21b7b7402df60c3c751a6b834e2d5071790cb3d38030512e5c7c01b1883ad3599f30304e76eb27212033aa18c3ce623eb592572e6550
 EBUILD kube-apiserver-1.9.6.ebuild 1208 BLAKE2B 836e21b3513e7cc03dcddac3792fbf1d1247faca83da3d71deabbfb6cebc8cc85189e459558b3b7baa73e8bf876ae30105ae9ec3871b806e08b256e808d4b0e9 SHA512 104b15950bd93e8e791f21b7b7402df60c3c751a6b834e2d5071790cb3d38030512e5c7c01b1883ad3599f30304e76eb27212033aa18c3ce623eb592572e6550
 EBUILD kube-apiserver-1.9.7.ebuild 1208 BLAKE2B 836e21b3513e7cc03dcddac3792fbf1d1247faca83da3d71deabbfb6cebc8cc85189e459558b3b7baa73e8bf876ae30105ae9ec3871b806e08b256e808d4b0e9 SHA512 104b15950bd93e8e791f21b7b7402df60c3c751a6b834e2d5071790cb3d38030512e5c7c01b1883ad3599f30304e76eb27212033aa18c3ce623eb592572e6550
+EBUILD kube-apiserver-1.9.8.ebuild 1208 BLAKE2B 836e21b3513e7cc03dcddac3792fbf1d1247faca83da3d71deabbfb6cebc8cc85189e459558b3b7baa73e8bf876ae30105ae9ec3871b806e08b256e808d4b0e9 SHA512 104b15950bd93e8e791f21b7b7402df60c3c751a6b834e2d5071790cb3d38030512e5c7c01b1883ad3599f30304e76eb27212033aa18c3ce623eb592572e6550
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.10.3.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.10.3.ebuild
new file mode 100644
index 000000000000..2cef73774731
--- /dev/null
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.10.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit user golang-build golang-vcs-snapshot
+
+EGO_PN="k8s.io/kubernetes"
+ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Kubernetes API server"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+DEPEND="dev-go/go-bindata"
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+	default
+	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
+	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
+}
+
+src_compile() {
+	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin _output/bin/${PN}
+	popd || die
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+}
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.9.8.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.9.8.ebuild
new file mode 100644
index 000000000000..2cef73774731
--- /dev/null
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.9.8.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit user golang-build golang-vcs-snapshot
+
+EGO_PN="k8s.io/kubernetes"
+ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Kubernetes API server"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+DEPEND="dev-go/go-bindata"
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+	default
+	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
+	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
+}
+
+src_compile() {
+	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin _output/bin/${PN}
+	popd || die
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+}
diff --git a/sys-cluster/kube-controller-manager/Manifest b/sys-cluster/kube-controller-manager/Manifest
index b98aa7936c5a..86b6651a7117 100644
--- a/sys-cluster/kube-controller-manager/Manifest
+++ b/sys-cluster/kube-controller-manager/Manifest
@@ -2,9 +2,13 @@ AUX kube-controller-manager.confd 142 BLAKE2B d8d35c62bf5c04cc3f440e8b5fb8acab2c
 AUX kube-controller-manager.initd 566 BLAKE2B c632b9bc357aead53a2c181af50201b544f214921672e60fffa2d6f77dbeb1912b3d1d138f867d8118cef5ae0843b75d3859ebfc71a4defc2b4cf66426a58101 SHA512 7e3baab9b034e7048ed3cda8d09444c76369874cecc0a747fb5484c482fef464adb5ccc25fcb4481fb4aff68415a60462f6cbee2138810316f0cf822637676c1
 AUX kube-controller-manager.logrotated 97 BLAKE2B 00827bf3c3c68c978dc30839318dcdd9ca73e64a38d377168cca75de4764dbd303cdae35fe2c5f6ddded23c7c72976d274e1def66f48a81548e0561411879984 SHA512 e00cd9297d8ac75fcd504a2bfb80d5c5e145e7d475dd15edf9361dc28721afdc069c5b6e79438b75a774e972028841a17e8f7842dcfb3d7835c436a3e503704c
 DIST kubernetes-1.10.2.tar.gz 24746905 BLAKE2B d09b8a71562696282cccbe7c0653518694825f25e1bd51ac62a41f4f7853e142b7b2f380026a610efb726f0206cb13ca55a3c3d39e13894345a9debbea06e0f8 SHA512 be907fed5d5ebc42097101160b9cac1924f738ba6856b821ea4e8582cb877f6ef919e98758f7d7924662633323215c9693173617df90d5940c987160e7397fc8
+DIST kubernetes-1.10.3.tar.gz 24761331 BLAKE2B d9c2935140813a020c73e13397c7dd20d9728cbfcfde0ed5e23aa135fe8c01df92dc644255ddb62466b141d0eacb92efca1d5df71c5f0079fd2e05d12f96f5a6 SHA512 bf8a89d7f9ef3306b9f0d45258a3eb425dd61f3f79a15f401cff93b7856e990444aa169150a883a6989467d8672cab9e9018477759a6fa8fcdf1cf499b721dd5
 DIST kubernetes-1.9.6.tar.gz 23538810 BLAKE2B ff832b3c8b0c06d47d62c6bbb981a60c94d31822921eb4a2e1fcb9b04c44cb9ffbb2f3bca050ba7188a49ec5292e5bad9a0560c6c39bce8ff706d1034df90e45 SHA512 1182f189fe5090297c373359f8c3782acc05213cc05c35b7cd48aaed845a2c8cbe32e155699e549690d8438cea220a129bde8256e834ae8939badf2ad953fa1e
 DIST kubernetes-1.9.7.tar.gz 23550884 BLAKE2B f0762b24d74aa0bab6176ef96fdd30de288ab97ae8cdc73f3d8735b2be677f22a2aa5218745da767999024399b6feca1953308069cda732d002726ac0b87435f SHA512 d5e0e16cfa75053f5019f28a709cc44f27fb46cdbd50f6637c8b8bd6012cd3a0e6afb625ad21b1f84bc4ea83f4cb3a7064f42226a1b2ba84113e185e628fbf3d
+DIST kubernetes-1.9.8.tar.gz 23559610 BLAKE2B ef384dd9a06cb00c5a095b05a4b304b08a97c3eac9c40b1b06664bfffb5e5b7c71505d50c4f7c3b594975df1013030788c8cee40acbce5c9ccd34ee5b44dc4fe SHA512 45e65d7a1f0950f2fb8fc923bdcaf1d607960be096a98fbfe187ef117da02ce7bf430cdc4c6d7e707557ef54f3239025e442be08729e86dabba624f3aa7503d1
 EBUILD kube-controller-manager-1.10.2.ebuild 1216 BLAKE2B e16cd08be6fd07106a8c68ba8aa79260eb13aa702853916b22cd9b72408d5f24de211bb29f1eabe5ae71fb430941106b12b7e97abfabf503a9e4d41550e8dd38 SHA512 28557478e958a07a30035edf942282c4582ddb329ef9777d1de929a95be5909af8d8e1345364fc996c5fbb5a689d40ec0de573b89a85756fc5a63690606e0c17
+EBUILD kube-controller-manager-1.10.3.ebuild 1216 BLAKE2B e16cd08be6fd07106a8c68ba8aa79260eb13aa702853916b22cd9b72408d5f24de211bb29f1eabe5ae71fb430941106b12b7e97abfabf503a9e4d41550e8dd38 SHA512 28557478e958a07a30035edf942282c4582ddb329ef9777d1de929a95be5909af8d8e1345364fc996c5fbb5a689d40ec0de573b89a85756fc5a63690606e0c17
 EBUILD kube-controller-manager-1.9.6.ebuild 1216 BLAKE2B e16cd08be6fd07106a8c68ba8aa79260eb13aa702853916b22cd9b72408d5f24de211bb29f1eabe5ae71fb430941106b12b7e97abfabf503a9e4d41550e8dd38 SHA512 28557478e958a07a30035edf942282c4582ddb329ef9777d1de929a95be5909af8d8e1345364fc996c5fbb5a689d40ec0de573b89a85756fc5a63690606e0c17
 EBUILD kube-controller-manager-1.9.7.ebuild 1216 BLAKE2B e16cd08be6fd07106a8c68ba8aa79260eb13aa702853916b22cd9b72408d5f24de211bb29f1eabe5ae71fb430941106b12b7e97abfabf503a9e4d41550e8dd38 SHA512 28557478e958a07a30035edf942282c4582ddb329ef9777d1de929a95be5909af8d8e1345364fc996c5fbb5a689d40ec0de573b89a85756fc5a63690606e0c17
+EBUILD kube-controller-manager-1.9.8.ebuild 1216 BLAKE2B e16cd08be6fd07106a8c68ba8aa79260eb13aa702853916b22cd9b72408d5f24de211bb29f1eabe5ae71fb430941106b12b7e97abfabf503a9e4d41550e8dd38 SHA512 28557478e958a07a30035edf942282c4582ddb329ef9777d1de929a95be5909af8d8e1345364fc996c5fbb5a689d40ec0de573b89a85756fc5a63690606e0c17
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.10.3.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.10.3.ebuild
new file mode 100644
index 000000000000..3a0b835d0991
--- /dev/null
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.10.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit user golang-build golang-vcs-snapshot
+
+EGO_PN="k8s.io/kubernetes"
+ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Kubernetes Controller Manager"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+DEPEND="dev-go/go-bindata"
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+	default
+	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
+	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
+}
+
+src_compile() {
+	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin _output/bin/${PN}
+	popd || die
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+}
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.9.8.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.9.8.ebuild
new file mode 100644
index 000000000000..3a0b835d0991
--- /dev/null
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.9.8.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit user golang-build golang-vcs-snapshot
+
+EGO_PN="k8s.io/kubernetes"
+ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Kubernetes Controller Manager"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+DEPEND="dev-go/go-bindata"
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+	default
+	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
+	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
+}
+
+src_compile() {
+	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin _output/bin/${PN}
+	popd || die
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+}
diff --git a/sys-cluster/kube-proxy/Manifest b/sys-cluster/kube-proxy/Manifest
index 1c8980b7c5dc..37db6bb9d08d 100644
--- a/sys-cluster/kube-proxy/Manifest
+++ b/sys-cluster/kube-proxy/Manifest
@@ -2,9 +2,13 @@ AUX kube-proxy.confd 53 BLAKE2B 0cd5fc844dc21f63786ef21d972210ac02ea55165b05cef8
 AUX kube-proxy.initd 507 BLAKE2B 96697ce13e03c0a541bd8e7a3dc28a1c5647067d3bffe464d672d00ecf5b5fffd349a6affcd8ae3ea0ba06160be72f31cfa2d918c01050e83640fb9956917dc0 SHA512 088d91cd77e614f7857d65496f5b6d486741a8e3358b3e13bcd4203d35a76fa3aa390f658065e2826145525b6e83fcd33f8365a873e99b522f3ab7e8615ed364
 AUX kube-proxy.logrotated 84 BLAKE2B d1a37cac3891f131b605edfe569ed545445d6993528059b11b4a8d20d0c958abbab8d7c6acfc7a9e0f17c64ac7f19ef2b4954ff475bededf406e718d04261d59 SHA512 7842a4585aaf9b7be0fac89dca58874354453fc6f17f00223c04aad2211217531ae6a942424a8a112808dcf9e52a499c4879730e435d2ad08931516c66d5441d
 DIST kubernetes-1.10.2.tar.gz 24746905 BLAKE2B d09b8a71562696282cccbe7c0653518694825f25e1bd51ac62a41f4f7853e142b7b2f380026a610efb726f0206cb13ca55a3c3d39e13894345a9debbea06e0f8 SHA512 be907fed5d5ebc42097101160b9cac1924f738ba6856b821ea4e8582cb877f6ef919e98758f7d7924662633323215c9693173617df90d5940c987160e7397fc8
+DIST kubernetes-1.10.3.tar.gz 24761331 BLAKE2B d9c2935140813a020c73e13397c7dd20d9728cbfcfde0ed5e23aa135fe8c01df92dc644255ddb62466b141d0eacb92efca1d5df71c5f0079fd2e05d12f96f5a6 SHA512 bf8a89d7f9ef3306b9f0d45258a3eb425dd61f3f79a15f401cff93b7856e990444aa169150a883a6989467d8672cab9e9018477759a6fa8fcdf1cf499b721dd5
 DIST kubernetes-1.9.6.tar.gz 23538810 BLAKE2B ff832b3c8b0c06d47d62c6bbb981a60c94d31822921eb4a2e1fcb9b04c44cb9ffbb2f3bca050ba7188a49ec5292e5bad9a0560c6c39bce8ff706d1034df90e45 SHA512 1182f189fe5090297c373359f8c3782acc05213cc05c35b7cd48aaed845a2c8cbe32e155699e549690d8438cea220a129bde8256e834ae8939badf2ad953fa1e
 DIST kubernetes-1.9.7.tar.gz 23550884 BLAKE2B f0762b24d74aa0bab6176ef96fdd30de288ab97ae8cdc73f3d8735b2be677f22a2aa5218745da767999024399b6feca1953308069cda732d002726ac0b87435f SHA512 d5e0e16cfa75053f5019f28a709cc44f27fb46cdbd50f6637c8b8bd6012cd3a0e6afb625ad21b1f84bc4ea83f4cb3a7064f42226a1b2ba84113e185e628fbf3d
+DIST kubernetes-1.9.8.tar.gz 23559610 BLAKE2B ef384dd9a06cb00c5a095b05a4b304b08a97c3eac9c40b1b06664bfffb5e5b7c71505d50c4f7c3b594975df1013030788c8cee40acbce5c9ccd34ee5b44dc4fe SHA512 45e65d7a1f0950f2fb8fc923bdcaf1d607960be096a98fbfe187ef117da02ce7bf430cdc4c6d7e707557ef54f3239025e442be08729e86dabba624f3aa7503d1
 EBUILD kube-proxy-1.10.2.ebuild 1120 BLAKE2B 76ba7a2f75f735b1263c32096ab4a08989326fd43b54ceeaf06ea1e67d9a1571c31e41b2a902eeead7004f98f5398d28441f3c67f97df80a41006c5c73fdef00 SHA512 ac30ccd4f440c6edb48b3510935590189c7a3322f0160b0ec48454cf98b553c3040dbbd2d851bc7198415446cf9a540d2ccbfd6b80a4f7bea72a341f554c904d
+EBUILD kube-proxy-1.10.3.ebuild 1120 BLAKE2B 76ba7a2f75f735b1263c32096ab4a08989326fd43b54ceeaf06ea1e67d9a1571c31e41b2a902eeead7004f98f5398d28441f3c67f97df80a41006c5c73fdef00 SHA512 ac30ccd4f440c6edb48b3510935590189c7a3322f0160b0ec48454cf98b553c3040dbbd2d851bc7198415446cf9a540d2ccbfd6b80a4f7bea72a341f554c904d
 EBUILD kube-proxy-1.9.6.ebuild 1120 BLAKE2B 76ba7a2f75f735b1263c32096ab4a08989326fd43b54ceeaf06ea1e67d9a1571c31e41b2a902eeead7004f98f5398d28441f3c67f97df80a41006c5c73fdef00 SHA512 ac30ccd4f440c6edb48b3510935590189c7a3322f0160b0ec48454cf98b553c3040dbbd2d851bc7198415446cf9a540d2ccbfd6b80a4f7bea72a341f554c904d
 EBUILD kube-proxy-1.9.7.ebuild 1120 BLAKE2B 76ba7a2f75f735b1263c32096ab4a08989326fd43b54ceeaf06ea1e67d9a1571c31e41b2a902eeead7004f98f5398d28441f3c67f97df80a41006c5c73fdef00 SHA512 ac30ccd4f440c6edb48b3510935590189c7a3322f0160b0ec48454cf98b553c3040dbbd2d851bc7198415446cf9a540d2ccbfd6b80a4f7bea72a341f554c904d
+EBUILD kube-proxy-1.9.8.ebuild 1120 BLAKE2B 76ba7a2f75f735b1263c32096ab4a08989326fd43b54ceeaf06ea1e67d9a1571c31e41b2a902eeead7004f98f5398d28441f3c67f97df80a41006c5c73fdef00 SHA512 ac30ccd4f440c6edb48b3510935590189c7a3322f0160b0ec48454cf98b553c3040dbbd2d851bc7198415446cf9a540d2ccbfd6b80a4f7bea72a341f554c904d
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.10.3.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.10.3.ebuild
new file mode 100644
index 000000000000..882a7f40ebcc
--- /dev/null
+++ b/sys-cluster/kube-proxy/kube-proxy-1.10.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit golang-build golang-vcs-snapshot
+
+EGO_PN="k8s.io/kubernetes"
+ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Kubernetes Proxy service"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+DEPEND="dev-go/go-bindata"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
+	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
+}
+
+src_compile() {
+	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin _output/bin/${PN}
+	popd || die
+	keepdir /var/log/${PN} /var/lib/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+}
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.9.8.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.9.8.ebuild
new file mode 100644
index 000000000000..882a7f40ebcc
--- /dev/null
+++ b/sys-cluster/kube-proxy/kube-proxy-1.9.8.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit golang-build golang-vcs-snapshot
+
+EGO_PN="k8s.io/kubernetes"
+ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Kubernetes Proxy service"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+DEPEND="dev-go/go-bindata"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
+	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
+}
+
+src_compile() {
+	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin _output/bin/${PN}
+	popd || die
+	keepdir /var/log/${PN} /var/lib/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+}
diff --git a/sys-cluster/kube-scheduler/Manifest b/sys-cluster/kube-scheduler/Manifest
index bba63b4382a8..0d3774b6de12 100644
--- a/sys-cluster/kube-scheduler/Manifest
+++ b/sys-cluster/kube-scheduler/Manifest
@@ -2,9 +2,13 @@ AUX kube-scheduler.confd 133 BLAKE2B 6b88dfc011173f183a88a16d078cbb5d96d46c26912
 AUX kube-scheduler.initd 548 BLAKE2B dd9373f659b87fcf12dca20527aebdb304a60ec559fd9fb9efcd0db8b3c155fdba2ce8a59461cd15ed3b4294cc5b335093e12d2b8411e400927e1307b37bc6d8 SHA512 151ea6f5cc36de9b83f0e5365579e33eea8002f9a03f5f61d195a349236e6baf192f701d3fb591b769aa90e8e1e620d525b20c95a1e8cda58d062971d8f587a3
 AUX kube-scheduler.logrotated 88 BLAKE2B af29a5ba84cb29787b17368105c793868a2e61a28e9a5b02361cf4833982d4489364bd1291faa136df275988f02ce78c7b785c9209a54aec5eea6180b9041da0 SHA512 3692da349dd6ed0f5acc09d7b95ac562ffecb103e2270bebdfe4a7808d48dada9d2debff262d85b11c47f9ca3f0c20000712d03629ed813ff08a3e02d69267e6
 DIST kubernetes-1.10.2.tar.gz 24746905 BLAKE2B d09b8a71562696282cccbe7c0653518694825f25e1bd51ac62a41f4f7853e142b7b2f380026a610efb726f0206cb13ca55a3c3d39e13894345a9debbea06e0f8 SHA512 be907fed5d5ebc42097101160b9cac1924f738ba6856b821ea4e8582cb877f6ef919e98758f7d7924662633323215c9693173617df90d5940c987160e7397fc8
+DIST kubernetes-1.10.3.tar.gz 24761331 BLAKE2B d9c2935140813a020c73e13397c7dd20d9728cbfcfde0ed5e23aa135fe8c01df92dc644255ddb62466b141d0eacb92efca1d5df71c5f0079fd2e05d12f96f5a6 SHA512 bf8a89d7f9ef3306b9f0d45258a3eb425dd61f3f79a15f401cff93b7856e990444aa169150a883a6989467d8672cab9e9018477759a6fa8fcdf1cf499b721dd5
 DIST kubernetes-1.9.6.tar.gz 23538810 BLAKE2B ff832b3c8b0c06d47d62c6bbb981a60c94d31822921eb4a2e1fcb9b04c44cb9ffbb2f3bca050ba7188a49ec5292e5bad9a0560c6c39bce8ff706d1034df90e45 SHA512 1182f189fe5090297c373359f8c3782acc05213cc05c35b7cd48aaed845a2c8cbe32e155699e549690d8438cea220a129bde8256e834ae8939badf2ad953fa1e
 DIST kubernetes-1.9.7.tar.gz 23550884 BLAKE2B f0762b24d74aa0bab6176ef96fdd30de288ab97ae8cdc73f3d8735b2be677f22a2aa5218745da767999024399b6feca1953308069cda732d002726ac0b87435f SHA512 d5e0e16cfa75053f5019f28a709cc44f27fb46cdbd50f6637c8b8bd6012cd3a0e6afb625ad21b1f84bc4ea83f4cb3a7064f42226a1b2ba84113e185e628fbf3d
+DIST kubernetes-1.9.8.tar.gz 23559610 BLAKE2B ef384dd9a06cb00c5a095b05a4b304b08a97c3eac9c40b1b06664bfffb5e5b7c71505d50c4f7c3b594975df1013030788c8cee40acbce5c9ccd34ee5b44dc4fe SHA512 45e65d7a1f0950f2fb8fc923bdcaf1d607960be096a98fbfe187ef117da02ce7bf430cdc4c6d7e707557ef54f3239025e442be08729e86dabba624f3aa7503d1
 EBUILD kube-scheduler-1.10.2.ebuild 1207 BLAKE2B aab74e6835d98b2510041d325e953371279abaa1fc56c8c998fdc8487a8076e03771e8247784ab90b0e0179b0b2a9fa52d263b534ea6e1b5da8d3f6f74e0e811 SHA512 fb8ec4141744c524d1f4bbc267db9f956f4ae27e31828db4e4e73639e9b445587ad87533a0a20141505650493ab93dabbcdec6ec8f022abf9b029f496f9ea1a8
+EBUILD kube-scheduler-1.10.3.ebuild 1207 BLAKE2B aab74e6835d98b2510041d325e953371279abaa1fc56c8c998fdc8487a8076e03771e8247784ab90b0e0179b0b2a9fa52d263b534ea6e1b5da8d3f6f74e0e811 SHA512 fb8ec4141744c524d1f4bbc267db9f956f4ae27e31828db4e4e73639e9b445587ad87533a0a20141505650493ab93dabbcdec6ec8f022abf9b029f496f9ea1a8
 EBUILD kube-scheduler-1.9.6.ebuild 1223 BLAKE2B 4b4d084ab1c0bde0ba6c2f969d2851bedbb32c489c13ebe9e6087c7ea2bb9290819f24043f5a09d1a8f15a19b5959e33c239e9521728fdd9d298b29775eb293d SHA512 0e6fe77b9e9f411b398e61dc8a6213a254cffd154c8e19fe986f76f22a06c3b60aa672f26b13ce86016ca63af4e8be7669d1f0e519acc9cdbecc1e24d504faa4
 EBUILD kube-scheduler-1.9.7.ebuild 1223 BLAKE2B 4b4d084ab1c0bde0ba6c2f969d2851bedbb32c489c13ebe9e6087c7ea2bb9290819f24043f5a09d1a8f15a19b5959e33c239e9521728fdd9d298b29775eb293d SHA512 0e6fe77b9e9f411b398e61dc8a6213a254cffd154c8e19fe986f76f22a06c3b60aa672f26b13ce86016ca63af4e8be7669d1f0e519acc9cdbecc1e24d504faa4
+EBUILD kube-scheduler-1.9.8.ebuild 1223 BLAKE2B 4b4d084ab1c0bde0ba6c2f969d2851bedbb32c489c13ebe9e6087c7ea2bb9290819f24043f5a09d1a8f15a19b5959e33c239e9521728fdd9d298b29775eb293d SHA512 0e6fe77b9e9f411b398e61dc8a6213a254cffd154c8e19fe986f76f22a06c3b60aa672f26b13ce86016ca63af4e8be7669d1f0e519acc9cdbecc1e24d504faa4
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.10.3.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.10.3.ebuild
new file mode 100644
index 000000000000..576989d30fd3
--- /dev/null
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.10.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit user golang-build golang-vcs-snapshot
+
+EGO_PN="k8s.io/kubernetes"
+ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Kubernetes Scheduler"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+DEPEND="dev-go/go-bindata"
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+	default
+	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
+	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
+}
+
+src_compile() {
+	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin _output/bin/${PN}
+	popd || die
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+}
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.9.8.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.9.8.ebuild
new file mode 100644
index 000000000000..170c510184ff
--- /dev/null
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.9.8.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit user golang-build golang-vcs-snapshot
+
+EGO_PN="k8s.io/kubernetes"
+ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Kubernetes Controller Manager"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+DEPEND="dev-go/go-bindata"
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+	default
+	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
+	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
+}
+
+src_compile() {
+	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=plugin/cmd/${PN} GOFLAGS=-v
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin _output/bin/${PN}
+	popd || die
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+}
diff --git a/sys-cluster/kubectl/Manifest b/sys-cluster/kubectl/Manifest
index e4429b0ff51b..bfe1953b25f4 100644
--- a/sys-cluster/kubectl/Manifest
+++ b/sys-cluster/kubectl/Manifest
@@ -1,7 +1,11 @@
 DIST kubernetes-1.10.2.tar.gz 24746905 BLAKE2B d09b8a71562696282cccbe7c0653518694825f25e1bd51ac62a41f4f7853e142b7b2f380026a610efb726f0206cb13ca55a3c3d39e13894345a9debbea06e0f8 SHA512 be907fed5d5ebc42097101160b9cac1924f738ba6856b821ea4e8582cb877f6ef919e98758f7d7924662633323215c9693173617df90d5940c987160e7397fc8
+DIST kubernetes-1.10.3.tar.gz 24761331 BLAKE2B d9c2935140813a020c73e13397c7dd20d9728cbfcfde0ed5e23aa135fe8c01df92dc644255ddb62466b141d0eacb92efca1d5df71c5f0079fd2e05d12f96f5a6 SHA512 bf8a89d7f9ef3306b9f0d45258a3eb425dd61f3f79a15f401cff93b7856e990444aa169150a883a6989467d8672cab9e9018477759a6fa8fcdf1cf499b721dd5
 DIST kubernetes-1.9.6.tar.gz 23538810 BLAKE2B ff832b3c8b0c06d47d62c6bbb981a60c94d31822921eb4a2e1fcb9b04c44cb9ffbb2f3bca050ba7188a49ec5292e5bad9a0560c6c39bce8ff706d1034df90e45 SHA512 1182f189fe5090297c373359f8c3782acc05213cc05c35b7cd48aaed845a2c8cbe32e155699e549690d8438cea220a129bde8256e834ae8939badf2ad953fa1e
 DIST kubernetes-1.9.7.tar.gz 23550884 BLAKE2B f0762b24d74aa0bab6176ef96fdd30de288ab97ae8cdc73f3d8735b2be677f22a2aa5218745da767999024399b6feca1953308069cda732d002726ac0b87435f SHA512 d5e0e16cfa75053f5019f28a709cc44f27fb46cdbd50f6637c8b8bd6012cd3a0e6afb625ad21b1f84bc4ea83f4cb3a7064f42226a1b2ba84113e185e628fbf3d
+DIST kubernetes-1.9.8.tar.gz 23559610 BLAKE2B ef384dd9a06cb00c5a095b05a4b304b08a97c3eac9c40b1b06664bfffb5e5b7c71505d50c4f7c3b594975df1013030788c8cee40acbce5c9ccd34ee5b44dc4fe SHA512 45e65d7a1f0950f2fb8fc923bdcaf1d607960be096a98fbfe187ef117da02ce7bf430cdc4c6d7e707557ef54f3239025e442be08729e86dabba624f3aa7503d1
 EBUILD kubectl-1.10.2.ebuild 1221 BLAKE2B 657220b247d9262b3a92bf0085bb4380ce02d4a332e7f2cd467dd075566e3a2a5c93bf42997ca8f78dfa18a9fc1312a62252419191c22d6f478ab55b57530507 SHA512 4b32ef0f3b584faa986b6c32eb00b2f1e7aa06aeba50979a472f74b709065903ecf3ec4ab6e1a05ba3247a9589062b82e21007cb9f9eac76b4defacaaff79770
+EBUILD kubectl-1.10.3.ebuild 1221 BLAKE2B 657220b247d9262b3a92bf0085bb4380ce02d4a332e7f2cd467dd075566e3a2a5c93bf42997ca8f78dfa18a9fc1312a62252419191c22d6f478ab55b57530507 SHA512 4b32ef0f3b584faa986b6c32eb00b2f1e7aa06aeba50979a472f74b709065903ecf3ec4ab6e1a05ba3247a9589062b82e21007cb9f9eac76b4defacaaff79770
 EBUILD kubectl-1.9.6.ebuild 1221 BLAKE2B 657220b247d9262b3a92bf0085bb4380ce02d4a332e7f2cd467dd075566e3a2a5c93bf42997ca8f78dfa18a9fc1312a62252419191c22d6f478ab55b57530507 SHA512 4b32ef0f3b584faa986b6c32eb00b2f1e7aa06aeba50979a472f74b709065903ecf3ec4ab6e1a05ba3247a9589062b82e21007cb9f9eac76b4defacaaff79770
 EBUILD kubectl-1.9.7.ebuild 1221 BLAKE2B 657220b247d9262b3a92bf0085bb4380ce02d4a332e7f2cd467dd075566e3a2a5c93bf42997ca8f78dfa18a9fc1312a62252419191c22d6f478ab55b57530507 SHA512 4b32ef0f3b584faa986b6c32eb00b2f1e7aa06aeba50979a472f74b709065903ecf3ec4ab6e1a05ba3247a9589062b82e21007cb9f9eac76b4defacaaff79770
+EBUILD kubectl-1.9.8.ebuild 1221 BLAKE2B 657220b247d9262b3a92bf0085bb4380ce02d4a332e7f2cd467dd075566e3a2a5c93bf42997ca8f78dfa18a9fc1312a62252419191c22d6f478ab55b57530507 SHA512 4b32ef0f3b584faa986b6c32eb00b2f1e7aa06aeba50979a472f74b709065903ecf3ec4ab6e1a05ba3247a9589062b82e21007cb9f9eac76b4defacaaff79770
 MISC metadata.xml 331 BLAKE2B 5af758a2aff067b1d7e94cb6d87a27fb96825c56490b5a4c7d9554cbb5057cf10b0dfb7d069f3edf8f7bcdce88b0f6b4286c4622c3cdcf5e5b283c75760f6a1d SHA512 d44cef89f9f902c706b0f9c0c4106bfd6ca094d64c273d0a13da53aec7ba2b238cd6ff489f13765e895ee4a6f2bb4638436839c7c60cce2ece3013fdc27232a4
diff --git a/sys-cluster/kubectl/kubectl-1.10.3.ebuild b/sys-cluster/kubectl/kubectl-1.10.3.ebuild
new file mode 100644
index 000000000000..14674478c43c
--- /dev/null
+++ b/sys-cluster/kubectl/kubectl-1.10.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit golang-build golang-vcs-snapshot bash-completion-r1
+
+EGO_PN="k8s.io/kubernetes"
+ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="CLI to run commands against Kubernetes clusters"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-go/go-bindata"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
+	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
+}
+
+src_compile() {
+	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
+	pushd src/${EGO_PN} || die
+	_output/bin/${PN} completion bash > ${PN}.bash || die
+	_output/bin/${PN} completion zsh > ${PN}.zsh || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin _output/bin/${PN}
+
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+
+	popd || die
+}
diff --git a/sys-cluster/kubectl/kubectl-1.9.8.ebuild b/sys-cluster/kubectl/kubectl-1.9.8.ebuild
new file mode 100644
index 000000000000..14674478c43c
--- /dev/null
+++ b/sys-cluster/kubectl/kubectl-1.9.8.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit golang-build golang-vcs-snapshot bash-completion-r1
+
+EGO_PN="k8s.io/kubernetes"
+ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="CLI to run commands against Kubernetes clusters"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-go/go-bindata"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
+	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
+}
+
+src_compile() {
+	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
+	pushd src/${EGO_PN} || die
+	_output/bin/${PN} completion bash > ${PN}.bash || die
+	_output/bin/${PN} completion zsh > ${PN}.zsh || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin _output/bin/${PN}
+
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+
+	popd || die
+}
diff --git a/sys-cluster/kubelet/Manifest b/sys-cluster/kubelet/Manifest
index 5888134aee85..e4d607012a79 100644
--- a/sys-cluster/kubelet/Manifest
+++ b/sys-cluster/kubelet/Manifest
@@ -2,9 +2,13 @@ AUX kubelet.confd 58 BLAKE2B 5c01a2146beacf3a024f312d1bd3422055887ba48d5d869a32a
 AUX kubelet.initd 520 BLAKE2B 50edf888fed020a02f099189f8a5bdde54a4bfa2a00585489864c262d90ad8347763753f99eccec6fe6670c6fa016674dee4dea0fa838991abb503db97bd983a SHA512 c6b9bcdb6d063728ef2e9d67673ea29c0972e70e446be9c020cfd277a7bbcfc955a5ad7a72ab0ca1579a4d04b0fc4ac71ee20e6dba9d9a9a9099efcad3c139d0
 AUX kubelet.logrotated 84 BLAKE2B 269b78dfd4ef7d4dea37da9be9e4009cbf231dfaba83207ae89aae4f2e151a8b32e21b8d5e92229cccd7b7aa2676328d3d1a5fa80cadde65fe80a8cde10535d4 SHA512 05ce9ea16d2ddf8e255adb406556c37bc04dcfc457a132a78d31deaed78963f4e1f31555f781b706909c02815a04370d5c0e02614eb79d602b1cb827cf2471d5
 DIST kubernetes-1.10.2.tar.gz 24746905 BLAKE2B d09b8a71562696282cccbe7c0653518694825f25e1bd51ac62a41f4f7853e142b7b2f380026a610efb726f0206cb13ca55a3c3d39e13894345a9debbea06e0f8 SHA512 be907fed5d5ebc42097101160b9cac1924f738ba6856b821ea4e8582cb877f6ef919e98758f7d7924662633323215c9693173617df90d5940c987160e7397fc8
+DIST kubernetes-1.10.3.tar.gz 24761331 BLAKE2B d9c2935140813a020c73e13397c7dd20d9728cbfcfde0ed5e23aa135fe8c01df92dc644255ddb62466b141d0eacb92efca1d5df71c5f0079fd2e05d12f96f5a6 SHA512 bf8a89d7f9ef3306b9f0d45258a3eb425dd61f3f79a15f401cff93b7856e990444aa169150a883a6989467d8672cab9e9018477759a6fa8fcdf1cf499b721dd5
 DIST kubernetes-1.9.6.tar.gz 23538810 BLAKE2B ff832b3c8b0c06d47d62c6bbb981a60c94d31822921eb4a2e1fcb9b04c44cb9ffbb2f3bca050ba7188a49ec5292e5bad9a0560c6c39bce8ff706d1034df90e45 SHA512 1182f189fe5090297c373359f8c3782acc05213cc05c35b7cd48aaed845a2c8cbe32e155699e549690d8438cea220a129bde8256e834ae8939badf2ad953fa1e
 DIST kubernetes-1.9.7.tar.gz 23550884 BLAKE2B f0762b24d74aa0bab6176ef96fdd30de288ab97ae8cdc73f3d8735b2be677f22a2aa5218745da767999024399b6feca1953308069cda732d002726ac0b87435f SHA512 d5e0e16cfa75053f5019f28a709cc44f27fb46cdbd50f6637c8b8bd6012cd3a0e6afb625ad21b1f84bc4ea83f4cb3a7064f42226a1b2ba84113e185e628fbf3d
+DIST kubernetes-1.9.8.tar.gz 23559610 BLAKE2B ef384dd9a06cb00c5a095b05a4b304b08a97c3eac9c40b1b06664bfffb5e5b7c71505d50c4f7c3b594975df1013030788c8cee40acbce5c9ccd34ee5b44dc4fe SHA512 45e65d7a1f0950f2fb8fc923bdcaf1d607960be096a98fbfe187ef117da02ce7bf430cdc4c6d7e707557ef54f3239025e442be08729e86dabba624f3aa7503d1
 EBUILD kubelet-1.10.2.ebuild 1217 BLAKE2B b79361e11d72cd8d24a573a5e3b071c6533224c9ebeab0f1b95db623b55bfe5df5ee5dca1f61001c6f406ce27c32763906de7649e5cf3cb54f6d100f90b530e6 SHA512 83392d785d0484c9ae3a84e556f38cbfafd5ac6b5131fe5bd4764948e57e70c17f668004927d33d79ea5d1cc4b341cd3b542943d21960dd648d7bd312393e454
+EBUILD kubelet-1.10.3.ebuild 1217 BLAKE2B b79361e11d72cd8d24a573a5e3b071c6533224c9ebeab0f1b95db623b55bfe5df5ee5dca1f61001c6f406ce27c32763906de7649e5cf3cb54f6d100f90b530e6 SHA512 83392d785d0484c9ae3a84e556f38cbfafd5ac6b5131fe5bd4764948e57e70c17f668004927d33d79ea5d1cc4b341cd3b542943d21960dd648d7bd312393e454
 EBUILD kubelet-1.9.6.ebuild 1217 BLAKE2B b79361e11d72cd8d24a573a5e3b071c6533224c9ebeab0f1b95db623b55bfe5df5ee5dca1f61001c6f406ce27c32763906de7649e5cf3cb54f6d100f90b530e6 SHA512 83392d785d0484c9ae3a84e556f38cbfafd5ac6b5131fe5bd4764948e57e70c17f668004927d33d79ea5d1cc4b341cd3b542943d21960dd648d7bd312393e454
 EBUILD kubelet-1.9.7.ebuild 1217 BLAKE2B b79361e11d72cd8d24a573a5e3b071c6533224c9ebeab0f1b95db623b55bfe5df5ee5dca1f61001c6f406ce27c32763906de7649e5cf3cb54f6d100f90b530e6 SHA512 83392d785d0484c9ae3a84e556f38cbfafd5ac6b5131fe5bd4764948e57e70c17f668004927d33d79ea5d1cc4b341cd3b542943d21960dd648d7bd312393e454
+EBUILD kubelet-1.9.8.ebuild 1217 BLAKE2B b79361e11d72cd8d24a573a5e3b071c6533224c9ebeab0f1b95db623b55bfe5df5ee5dca1f61001c6f406ce27c32763906de7649e5cf3cb54f6d100f90b530e6 SHA512 83392d785d0484c9ae3a84e556f38cbfafd5ac6b5131fe5bd4764948e57e70c17f668004927d33d79ea5d1cc4b341cd3b542943d21960dd648d7bd312393e454
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kubelet/kubelet-1.10.3.ebuild b/sys-cluster/kubelet/kubelet-1.10.3.ebuild
new file mode 100644
index 000000000000..e1a41e8ec6bc
--- /dev/null
+++ b/sys-cluster/kubelet/kubelet-1.10.3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit golang-build golang-vcs-snapshot
+
+EGO_PN="k8s.io/kubernetes"
+ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Kubernetes Node Agent"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="hardened"
+
+DEPEND="dev-go/go-bindata"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
+	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
+}
+
+src_compile() {
+	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"
+	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin _output/bin/${PN}
+	popd || die
+	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+}
diff --git a/sys-cluster/kubelet/kubelet-1.9.8.ebuild b/sys-cluster/kubelet/kubelet-1.9.8.ebuild
new file mode 100644
index 000000000000..e1a41e8ec6bc
--- /dev/null
+++ b/sys-cluster/kubelet/kubelet-1.9.8.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit golang-build golang-vcs-snapshot
+
+EGO_PN="k8s.io/kubernetes"
+ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Kubernetes Node Agent"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="hardened"
+
+DEPEND="dev-go/go-bindata"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
+	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
+}
+
+src_compile() {
+	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"
+	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin _output/bin/${PN}
+	popd || die
+	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+}
diff --git a/sys-cluster/minikube/Manifest b/sys-cluster/minikube/Manifest
index 673e5974b903..33f6992020ae 100644
--- a/sys-cluster/minikube/Manifest
+++ b/sys-cluster/minikube/Manifest
@@ -1,9 +1,5 @@
-DIST minikube-0.25.2.tar.gz 19765563 BLAKE2B 6830cb402ed29e7a976b2bbe418fe41051b295414d38b88a4d35e7352923b96aacd5f4d80458e53c3ae752d3e53b86e0b8a823c317271e4efd201db27eafb029 SHA512 505dea2ddee96ddd476429f05bcf889c99f60a38fee21b4724f528253037ae268ebac2830c38d331f14f47a689afc2dec2d6815983dd0aee4c5bb7ff58f67f9d
-DIST minikube-0.26.0.tar.gz 20345503 BLAKE2B ecec80c44c9192a498f80d70a4f955f8409e9fefcc169ac29f212c78cc21a17da0d467c1a44f634b4573b6b968f122face1a651dc4306d787e6919cfa323182c SHA512 f608aa120503afd7060bebe0572f29b03e49404c7b46ff57fd9352163e686182696f78681d309da24d45648edcfba6b6c5c6cc14d5237af2c9206a40d538ed76
 DIST minikube-0.26.1.tar.gz 20349450 BLAKE2B 18c2cab52b2cb6f4361a9f8fbb1416370eb9f4f3b1bc8e65f76e08cfe685fa55c3c41b421080a94250c81b315aa72be4c8340f6d2623b0335b67ec66a3931cd8 SHA512 9e68609c8fc5ff98be06952529f8c1a34180b71017c8f8680233e34985a3a22e1083cbd6576d8d2152488509a45c97e17fff7c0689c01467e92ef6f26c679a14
 DIST minikube-0.27.0.tar.gz 20349013 BLAKE2B 2467917776b14644d47c75a72719291ba573ff797fb305169d14e5a1d9c3a1df176cc672d22698db9f14a748fdba5224e74701de8e9f91a7ca45dfc45a9e2977 SHA512 77553c9259648d59b0bcaaab44f0cbfc0d4c2ebbcd2dcdd50a4a1e1102743ffea8288a93d9165ae9e38724339124b08e0e9ae04e7ddc415f0548ec81cfced418
-EBUILD minikube-0.25.2.ebuild 1236 BLAKE2B 61fd277e913631f9f13742b5fd8e8a0e9b1715fced9616007d7a77ca79aa29e8b4922a6f3a1ace80b37c440dd606b699ca3b523d4bfc0e48c7d7d1d113822739 SHA512 95445d01f25e2d97874fd72dbe62dbd702c09ce7a0306a9107392c514415e46a3e2eaba9992afaf70f4d0f81d69ba1ca14b1e1b9a4e0ca44f65117e2203cf107
-EBUILD minikube-0.26.0.ebuild 1252 BLAKE2B 8922f54ea5917f3da21a2f8d6a368ccdc89808ce91502ccc441a4cf13dfa8ed537b37a4b182fc6f0ec9d415c4874f05275dfcf6b9ff71f27a3bbdc32b8d91e03 SHA512 af6941b5477b43618e849ee0a62f9f7ebdaa36509b870f7ef2ec4f034412f57b7f5038f7dbd4d6d5041e103aba17144e70dcde6b371d8c7d3f03b779e1e176b0
 EBUILD minikube-0.26.1.ebuild 1252 BLAKE2B 8922f54ea5917f3da21a2f8d6a368ccdc89808ce91502ccc441a4cf13dfa8ed537b37a4b182fc6f0ec9d415c4874f05275dfcf6b9ff71f27a3bbdc32b8d91e03 SHA512 af6941b5477b43618e849ee0a62f9f7ebdaa36509b870f7ef2ec4f034412f57b7f5038f7dbd4d6d5041e103aba17144e70dcde6b371d8c7d3f03b779e1e176b0
 EBUILD minikube-0.27.0.ebuild 1252 BLAKE2B 8922f54ea5917f3da21a2f8d6a368ccdc89808ce91502ccc441a4cf13dfa8ed537b37a4b182fc6f0ec9d415c4874f05275dfcf6b9ff71f27a3bbdc32b8d91e03 SHA512 af6941b5477b43618e849ee0a62f9f7ebdaa36509b870f7ef2ec4f034412f57b7f5038f7dbd4d6d5041e103aba17144e70dcde6b371d8c7d3f03b779e1e176b0
 MISC metadata.xml 329 BLAKE2B bee02eda560e62d3acfec815f602b025d2954be0e51e9d03866de095999db40208a582d8e135bb7403d6dc474f07a08c2a742d083606d6e11ff405af5b627030 SHA512 4b280d1e0c76f5f571d1b31cda9cad9c564e03d99891ff7ae83f6e61e078636608aed240d088bc2d4b309f9315645abdba751cdba11bfd8268b89adc8c339857
diff --git a/sys-cluster/minikube/minikube-0.25.2.ebuild b/sys-cluster/minikube/minikube-0.25.2.ebuild
deleted file mode 100644
index 8f9d3252d27a..000000000000
--- a/sys-cluster/minikube/minikube-0.25.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit python-any-r1 golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/minikube"
-ARCHIVE_URI="https://github.com/kubernetes/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Single Node Kubernetes Cluster"
-HOMEPAGE="https://github.com/kubernetes/minikube https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="hardened"
-
-DEPEND="dev-go/go-bindata
-	${PYTHON_DEPS}"
-RDEPEND=">=sys-cluster/kubectl-1.9.4"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e 's/ -s -w/ -w/' -e 's#$(GOPATH)/bin/go-bindata#go-bindata#' -e 's#GOBIN=$(GOPATH)/bin go get github.com/jteeuwen/go-bindata/...##' src/${EGO_PN}/Makefile || die
-	sed -i -e "s/get_rev(), get_version(), get_tree_state()/get_rev(), get_version(), 'gitTreeState=clean'/"  src/${EGO_PN}/hack/get_k8s_version.py || die
-}
-
-src_compile() {
-	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -C src/${EGO_PN}
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin out/minikube
-	dodoc -r docs CHANGELOG.md README.md
-	popd || die
-}
diff --git a/sys-cluster/minikube/minikube-0.26.0.ebuild b/sys-cluster/minikube/minikube-0.26.0.ebuild
deleted file mode 100644
index 3f64627d6490..000000000000
--- a/sys-cluster/minikube/minikube-0.26.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit python-any-r1 golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/minikube"
-ARCHIVE_URI="https://github.com/kubernetes/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Single Node Kubernetes Cluster"
-HOMEPAGE="https://github.com/kubernetes/minikube https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="hardened"
-
-DEPEND="dev-go/go-bindata
-	${PYTHON_DEPS}"
-RDEPEND=">=sys-cluster/kubectl-1.9.4"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e 's/ -s -w/ -w/' -e 's#GOBIN=$(GOPATH)/bin go get github.com/jteeuwen/go-bindata/...##' -e 's#$(GOPATH)/bin/go-bindata#/usr/bin/go-bindata#g' src/${EGO_PN}/Makefile || die
-	sed -i -e "s/get_commit(), get_tree_state(), get_version()/get_commit(), 'gitTreeState=clean', get_version()/"  src/${EGO_PN}/hack/get_k8s_version.py || die
-}
-
-src_compile() {
-	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -C src/${EGO_PN}
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin out/minikube
-	dodoc -r docs CHANGELOG.md README.md
-	popd || die
-}
diff --git a/sys-cluster/nova/Manifest b/sys-cluster/nova/Manifest
index 3a5d43f96736..2f783e2b69da 100644
--- a/sys-cluster/nova/Manifest
+++ b/sys-cluster/nova/Manifest
@@ -3,26 +3,14 @@ AUX nova-sudoers 78 BLAKE2B d2df2db0a2905e3a6aec56dc70afab046933d675715c9c16f0e9
 AUX nova.initd 745 BLAKE2B 3242a38313147eaffc096752b35cbed34e16f1133cb482515086afcd9159264d7c357731aa565f857257ae5591599704f7524a8005e531dcd6d848cd197ef79d SHA512 42b029745341b7516f3f158d214053123d894c1e3f7d354d7a83009630ce371a297b10b59bb4a655cd43e226ed8c045b4fbf4d9b20b73dd490e2181dabc70077
 AUX openstack-scsi-disk.rules 134 BLAKE2B c1e3e150d93ab51b4da48caf2a0f83513fe63b5dde1e449a9c4c4dbfad65589b6326c799958736da86390142a914acbf9acf5b78bb1042e2c156eaf01cec8250 SHA512 6c3734d0b9ce9de887e15b1ddd5f5486dd1d0a55f463f9824ef067d3fe64a93d08ad2ef2b9d288f0dd42d570a5061e7a06976f7223df44b98bd321b73f9d036b
 AUX scsi-openscsi-link.sh 2777 BLAKE2B 84c14df2b1c49fe6210a4abf4387229aaa4fcd0c956b374b719285a20d8309f1bb58d51061084f34d284624d279bc64d53a629ec57702314c23e9b129c4a16b4 SHA512 3e7f6fc872f27b6a4d6c991346bd8eafcbc8f2b74439f1c77e93362e57fa1010ff002813cf21bf12d0550bfc165f79c70430862cd4ed5aaa15056777baf34409
-DIST nova-16.1.0.tar.gz 10952926 BLAKE2B b0b1f8eba404aca567e846210debd45aca7460a39a34a051b00cac2c057f2aec746b405ccb0ab4775573a69ac66a9e464d75ec15353598b4f41c8424f3d9d992 SHA512 eb6eafacc5194c9bdbb81134d77a884d6959c29921b9aa62d829b5e2dafbd905625a5181bc0e65c4f111d629e54544820e7c889f9eb451c3aa2341e4e9938f41
-DIST nova-16.1.2.tar.gz 10978566 BLAKE2B 5ab24b56b0b8f3dcc4eae8555a4e8968c7396a525e376c01cf7bc373548af64bf520079f36e921bc8b6a8ed38a2edcdccb7f0a6909dc0829a369bb4b8be40dfa SHA512 4cba847ed6ce37efa4805411b5c87c7b26538e0dd2bb6284691a15cd9beaf3379a9a74866bd2515537d55e5597c8bd11ed9395da5bca683c6920c732e26ac622
 DIST nova-16.1.3.tar.gz 10978745 BLAKE2B 6eb95dd2b499dac6355f345ea6b2becb5741d78dafe402bb479a891f9a97405a3ab7fbf30df8d67e906408a34cbbbc6d08fa3861235f274927df4c146c0d24a9 SHA512 37efe67b3ab10b14dbbf3fed98859652ff15fb215616905ced58840f9ce3c8a9a78af93347164e321de7ed5e043efc5e033edbc1434f417d93b59b7de4c25c3d
-DIST nova-17.0.1.tar.gz 11038397 BLAKE2B 2006412601cd5ca7349b0df248bcacf7c9316b4865b8ff9fc7e0eb81174f3c4eade994624f5a5031de9c079e85c09aa28adc16c550eb596271ebfc6a29a107a2 SHA512 6308bdb35f2d8fa8e1d28ffab8f3421d8d4357834272e27aca61a4aed83ebcf5cffafe330c286dc6e4c746145d12b018f876a57db2f0e44cae3ae8728a634e85
-DIST nova-17.0.3.tar.gz 11055655 BLAKE2B 6e2f9b07c8c32e711f570ff704754e2e02722fec87e32b6d315611982e6289465c6d65bec85c45ae30d3bf7a713eee09aa5e883bb8dc1893a21977e42df12f23 SHA512 9c20ac51cbac91563f3f84c94142cccafa72c5db51dac9a846eaa6985e5c119468f938bffeb7a19a3e63810705969e23305c3a9720304b7d72bec3c47516a80c
 DIST nova-17.0.4.tar.gz 11052405 BLAKE2B fc5a02bf1dadbc2f2541e2dfcba08506b95289ac8ca3ac6504ec81b31cbf6f2f971adc301c9b90764bb324d4584a6852a777d344dd0d90941edc24cf2ecefe73 SHA512 183f86a716f029dee56e93599721fa7ada43426b01ff6f126afeb638228d3e30fdb85d6edda2f28f738894a65ef9b444dff4b2fda857e8dd61a705b04d15bcd3
-DIST nova.conf.sample-16.1.0 360926 BLAKE2B 0cdfcff1d5faf5803de72b8113085591df4d1c7feb0591df786a5bf0e13ff133c1fcc4a2c3ebfdadf2a60943a7810e18813a00f5f78987daf3c271e3ba627911 SHA512 68f548e998396c7b18692fb3b1e9bf267f9bc06d73f602bb8f20bba426b6ede01e270447906f1685133cdbfd43b76ed5a9913b0167ce70f1ff3debd1ca11d378
-DIST nova.conf.sample-16.1.2 360926 BLAKE2B 0cdfcff1d5faf5803de72b8113085591df4d1c7feb0591df786a5bf0e13ff133c1fcc4a2c3ebfdadf2a60943a7810e18813a00f5f78987daf3c271e3ba627911 SHA512 68f548e998396c7b18692fb3b1e9bf267f9bc06d73f602bb8f20bba426b6ede01e270447906f1685133cdbfd43b76ed5a9913b0167ce70f1ff3debd1ca11d378
 DIST nova.conf.sample-16.1.3 360926 BLAKE2B 0cdfcff1d5faf5803de72b8113085591df4d1c7feb0591df786a5bf0e13ff133c1fcc4a2c3ebfdadf2a60943a7810e18813a00f5f78987daf3c271e3ba627911 SHA512 68f548e998396c7b18692fb3b1e9bf267f9bc06d73f602bb8f20bba426b6ede01e270447906f1685133cdbfd43b76ed5a9913b0167ce70f1ff3debd1ca11d378
-DIST nova.conf.sample-17.0.1 361499 BLAKE2B 3d5543fbec2b2688d8cc1a2dbc5d954302c4168999ddd9349f3602035259439e7b1daac05bd7d60d61e9296a37ae62aaedd63cc4d77f2e03cec4614a4b3d470e SHA512 c1d14671ecb2c1941a98b80a267ed47969c1ed5c27d88a2f9fa9857b318c6ff6aae9a0fe22e6c28c964221b3c38df26c632a7bbd24ca4110bd03aafa4db0f459
-DIST nova.conf.sample-17.0.3 361499 BLAKE2B 3d5543fbec2b2688d8cc1a2dbc5d954302c4168999ddd9349f3602035259439e7b1daac05bd7d60d61e9296a37ae62aaedd63cc4d77f2e03cec4614a4b3d470e SHA512 c1d14671ecb2c1941a98b80a267ed47969c1ed5c27d88a2f9fa9857b318c6ff6aae9a0fe22e6c28c964221b3c38df26c632a7bbd24ca4110bd03aafa4db0f459
 DIST nova.conf.sample-17.0.4 361499 BLAKE2B 3d5543fbec2b2688d8cc1a2dbc5d954302c4168999ddd9349f3602035259439e7b1daac05bd7d60d61e9296a37ae62aaedd63cc4d77f2e03cec4614a4b3d470e SHA512 c1d14671ecb2c1941a98b80a267ed47969c1ed5c27d88a2f9fa9857b318c6ff6aae9a0fe22e6c28c964221b3c38df26c632a7bbd24ca4110bd03aafa4db0f459
 DIST nova.conf.sample-2017.2.9999 360926 BLAKE2B 0cdfcff1d5faf5803de72b8113085591df4d1c7feb0591df786a5bf0e13ff133c1fcc4a2c3ebfdadf2a60943a7810e18813a00f5f78987daf3c271e3ba627911 SHA512 68f548e998396c7b18692fb3b1e9bf267f9bc06d73f602bb8f20bba426b6ede01e270447906f1685133cdbfd43b76ed5a9913b0167ce70f1ff3debd1ca11d378
 DIST nova.conf.sample-2018.1.9999 361499 BLAKE2B 3d5543fbec2b2688d8cc1a2dbc5d954302c4168999ddd9349f3602035259439e7b1daac05bd7d60d61e9296a37ae62aaedd63cc4d77f2e03cec4614a4b3d470e SHA512 c1d14671ecb2c1941a98b80a267ed47969c1ed5c27d88a2f9fa9857b318c6ff6aae9a0fe22e6c28c964221b3c38df26c632a7bbd24ca4110bd03aafa4db0f459
-EBUILD nova-16.1.0.ebuild 9545 BLAKE2B dea213885cc593f5744c12c7156b2db5a30e93bf068c783a93d8eb53c35d4ef0eaaeaee9f4271b0f1fd9b96ba0e2f33e4f7976459cc9d73dcf1fbed0fa30c206 SHA512 b7e8a4991a46b86a25d62a77609ef300f0b2107f43867c1876f50c446e4f5ff420c8bcef9958dbb20dd9f398a269277f602b37c69af555c48af2fc7cba1c2e2e
-EBUILD nova-16.1.2.ebuild 9547 BLAKE2B 740d55d2ebb11af6c8d92fc9abcf703f741ebe12d5c7e67d620edb3fd2f37ac52421994c441480277310d77510516a6bcd1c1792dc8edd806dbd08c39b0d56fb SHA512 f51d5c194236bbec87e11547d9f6cc8d6beca7388672faf46636a0aefd9364da457f4d7a28acd601ec6c2524fbd81291b3453a5ae33db8c32480e76a08c62102
-EBUILD nova-16.1.3.ebuild 9547 BLAKE2B 740d55d2ebb11af6c8d92fc9abcf703f741ebe12d5c7e67d620edb3fd2f37ac52421994c441480277310d77510516a6bcd1c1792dc8edd806dbd08c39b0d56fb SHA512 f51d5c194236bbec87e11547d9f6cc8d6beca7388672faf46636a0aefd9364da457f4d7a28acd601ec6c2524fbd81291b3453a5ae33db8c32480e76a08c62102
-EBUILD nova-17.0.1.ebuild 9717 BLAKE2B 9b2995e91ebc2cb17b907087f1855121ef670915e0342b52d390452b6d95f8192a4a541e30f646bdf8f9f103d6d7319d18ef91750c7130f550a772e9742e2546 SHA512 9407eba358fb3b9c8268570f1d7b1ce77f1fa0678f82d485dcab258755ef0534b0ebf71058fd5c73623fd6072e0a20fd85b5ad2d8dd292b8929338a3fd4afa07
-EBUILD nova-17.0.3.ebuild 9719 BLAKE2B 8f09686f5baad6c41de69ee50d5eb5e72ffbfd274394e9ffc220bfb632a78ea614faca2f2ea208e5bfcfd70fe37f8612518d46923c1bdaa8650d87ebfc74bafb SHA512 8c0b2fa83b0bb737299f4bd85da8114ecf9c111f6c1bcfaca43f407c7513bc0f6c80080e46102ab760d4b5443d5c15c9ebb68b045afdb1e63e20a4db18778a11
-EBUILD nova-17.0.4.ebuild 9719 BLAKE2B 8f09686f5baad6c41de69ee50d5eb5e72ffbfd274394e9ffc220bfb632a78ea614faca2f2ea208e5bfcfd70fe37f8612518d46923c1bdaa8650d87ebfc74bafb SHA512 8c0b2fa83b0bb737299f4bd85da8114ecf9c111f6c1bcfaca43f407c7513bc0f6c80080e46102ab760d4b5443d5c15c9ebb68b045afdb1e63e20a4db18778a11
+EBUILD nova-16.1.3.ebuild 9545 BLAKE2B dea213885cc593f5744c12c7156b2db5a30e93bf068c783a93d8eb53c35d4ef0eaaeaee9f4271b0f1fd9b96ba0e2f33e4f7976459cc9d73dcf1fbed0fa30c206 SHA512 b7e8a4991a46b86a25d62a77609ef300f0b2107f43867c1876f50c446e4f5ff420c8bcef9958dbb20dd9f398a269277f602b37c69af555c48af2fc7cba1c2e2e
+EBUILD nova-17.0.4.ebuild 9717 BLAKE2B 9b2995e91ebc2cb17b907087f1855121ef670915e0342b52d390452b6d95f8192a4a541e30f646bdf8f9f103d6d7319d18ef91750c7130f550a772e9742e2546 SHA512 9407eba358fb3b9c8268570f1d7b1ce77f1fa0678f82d485dcab258755ef0534b0ebf71058fd5c73623fd6072e0a20fd85b5ad2d8dd292b8929338a3fd4afa07
 EBUILD nova-2017.2.9999.ebuild 9566 BLAKE2B 8874d34fced2011d197ce189095f43e1bc6080068d88087cb2d0b285c0ed48d0af56a2c80a906f4ce9323104943740276bd03b70f930b663c62246c38cb79d50 SHA512 5139a6196b404b02d0ccbcfb2f0a46e83985f4e6aebf3be57db830a797d79774a98984d739bce99e8fd3f08a95982b65d3ac0a800e8bee785c310c570e6fa29c
 EBUILD nova-2018.1.9999.ebuild 9719 BLAKE2B 8f09686f5baad6c41de69ee50d5eb5e72ffbfd274394e9ffc220bfb632a78ea614faca2f2ea208e5bfcfd70fe37f8612518d46923c1bdaa8650d87ebfc74bafb SHA512 8c0b2fa83b0bb737299f4bd85da8114ecf9c111f6c1bcfaca43f407c7513bc0f6c80080e46102ab760d4b5443d5c15c9ebb68b045afdb1e63e20a4db18778a11
 MISC metadata.xml 1172 BLAKE2B aa85fe6bed1e40717884d721c2633c5f6d380914c69cb8a4a4c31b3e4c779db52b90fdaa5ee63b66ad9bc6694f666dd37dceeffb8de4676014ef3bb688476ef7 SHA512 bb506fa680b064c3d6a48710cac11efedc9e8a340603e234bf5c4c48aaab773e4527d7a8fc66ae36ec894230a1d02a5be995e521d222914f652e03b6f72642e4
diff --git a/sys-cluster/nova/nova-16.1.0.ebuild b/sys-cluster/nova/nova-16.1.0.ebuild
deleted file mode 100644
index 8856721e03fb..000000000000
--- a/sys-cluster/nova/nova-16.1.0.ebuild
+++ /dev/null
@@ -1,251 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit distutils-r1 eutils linux-info multilib user
-
-DESCRIPTION="Cloud computing fabric controller (main part of an IaaS system) in Python"
-HOMEPAGE="https://launchpad.net/nova"
-SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/pike/nova.conf.sample -> nova.conf.sample-${PV}
-	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="+compute compute-only iscsi +memcached mysql +novncproxy openvswitch postgres +rabbitmq sqlite"
-REQUIRED_USE="
-	!compute-only? ( || ( mysql postgres sqlite ) )
-	compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite )"
-
-CDEPEND="
-	>=dev-python/setuptools-16.0[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-24.0.0[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.0.0[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.0.1[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.0.2[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.0.3[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.1.0[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.1.1[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.2.0[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.3.0[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.3.1[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.3.2[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-36.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="
-	${CDEPEND}
-	app-admin/sudo"
-
-RDEPEND="
-	${CDEPEND}
-	compute-only? (
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
-	)
-	sqlite? (
-		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
-	)
-	mysql? (
-		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
-		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
-	)
-	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
-	<dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.0[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.1[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.2[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.3[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.4[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.6.0[${PYTHON_USEDEP}]
-	!~dev-python/cryptography-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
-	dev-python/paste[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}]
-	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-2.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-cinderclient-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-neutronclient-6.3.0[${PYTHON_USEDEP}]
-	>=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/websockify-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-cache-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-reports-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.24.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-rootwrap-5.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.24.2[${PYTHON_USEDEP}]
-	!~dev-python/oslo-messaging-5.25.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.23.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-privsep-1.9.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-privsep-1.17.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/rfc3986-0.3.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.27.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.17.0[${PYTHON_USEDEP}]
-	>=dev-python/os-brick-1.15.2[${PYTHON_USEDEP}]
-	>=dev-python/os-traits-0.3.1[${PYTHON_USEDEP}]
-	>=dev-python/os-vif-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/os-win-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/castellan-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/microversion-parse-0.1.2[${PYTHON_USEDEP}]
-	>=dev-python/os-xenapi-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/tooz-1.47.0[${PYTHON_USEDEP}]
-	>=dev-python/cursive-0.1.2[${PYTHON_USEDEP}]
-	>=dev-python/pypowervm-1.1.6[${PYTHON_USEDEP}]
-	dev-python/libvirt-python[${PYTHON_USEDEP}]
-	app-emulation/libvirt[iscsi?]
-	novncproxy? ( www-apps/novnc )
-	sys-apps/iproute2
-	openvswitch? ( net-misc/openvswitch )
-	rabbitmq? ( net-misc/rabbitmq-server )
-	memcached? (
-		net-misc/memcached
-		>=dev-python/python-memcached-1.58
-	)
-	sys-fs/sysfsutils
-	sys-fs/multipath-tools
-	net-misc/bridge-utils
-	compute? (
-		app-cdr/cdrtools
-		sys-fs/dosfstools
-		app-emulation/qemu
-	)
-	iscsi? (
-		sys-fs/lsscsi
-		>=sys-block/open-iscsi-2.0.873-r1
-	)"
-
-#PATCHES=(
-#)
-
-pkg_setup() {
-	linux-info_pkg_setup
-	CONFIG_CHECK_MODULES="BLK_DEV_NBD VHOST_NET IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
-	IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 IP_NF_FILTER IP_NF_IPTABLES \
-	NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 NF_NAT_IPV4 NF_NAT NF_CONNTRACK NETFILTER_XTABLES \
-	ISCSI_TCP SCSI_DH DM_MULTIPATH DM_SNAPSHOT"
-	if linux_config_exists; then
-		for module in ${CONFIG_CHECK_MODULES}; do
-			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel"
-		done
-	fi
-	enewgroup nova
-	enewuser nova -1 -1 /var/lib/nova nova
-}
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use !compute-only; then
-		for svc in api conductor consoleauth network scheduler spicehtml5proxy xvpvncproxy; do
-			newinitd "${FILESDIR}/nova.initd" "nova-${svc}"
-		done
-	fi
-	use compute && newinitd "${FILESDIR}/nova.initd" "nova-compute"
-	use novncproxy && newinitd "${FILESDIR}/nova.initd" "nova-novncproxy"
-
-	diropts -m 0750 -o nova -g qemu
-	dodir /var/log/nova /var/lib/nova/instances
-	diropts -m 0750 -o nova -g nova
-
-	insinto /etc/nova
-	insopts -m 0640 -o nova -g nova
-	newins "${DISTDIR}/nova.conf.sample-${PV}" "nova.conf.sample"
-	doins "${FILESDIR}/nova-compute.conf"
-	doins "${S}/etc/nova/"*
-	# rootwrap filters
-	insopts -m 0644
-	insinto /etc/nova/rootwrap.d
-	doins "etc/nova/rootwrap.d/api-metadata.filters"
-	doins "etc/nova/rootwrap.d/compute.filters"
-	doins "etc/nova/rootwrap.d/network.filters"
-
-	# add sudoers definitions for user nova
-	insinto /etc/sudoers.d/
-	insopts -m 0600 -o root -g root
-	doins "${FILESDIR}/nova-sudoers"
-
-	if use iscsi ; then
-		# Install udev rules for handle iscsi disk with right links under /dev
-		udev_newrules "${FILESDIR}/openstack-scsi-disk.rules" 60-openstack-scsi-disk.rules
-
-		insinto /etc/nova/
-		doins "${FILESDIR}/scsi-openscsi-link.sh"
-	fi
-}
-
-python_install() {
-	distutils-r1_python_install
-	# copy migration conf file (not coppied on install via setup.py script)
-	insinto "$(python_get_sitedir)/db/sqlalchemy/migrate_repo/"
-	doins "nova/db/sqlalchemy/migrate_repo/migrate.cfg"
-	# copy the CA cert dir (not coppied on install via setup.py script)
-	cp -R "${S}/nova/CA" "${D}/$(python_get_sitedir)/nova/" || die "installing CA files failed"
-}
-
-pkg_postinst() {
-	if use iscsi ; then
-		elog "iscsid needs to be running if you want cinder to connect"
-	fi
-}
diff --git a/sys-cluster/nova/nova-16.1.2.ebuild b/sys-cluster/nova/nova-16.1.2.ebuild
deleted file mode 100644
index 3db5286945f2..000000000000
--- a/sys-cluster/nova/nova-16.1.2.ebuild
+++ /dev/null
@@ -1,251 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit distutils-r1 eutils linux-info multilib user
-
-DESCRIPTION="Cloud computing fabric controller (main part of an IaaS system) in Python"
-HOMEPAGE="https://launchpad.net/nova"
-SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/pike/nova.conf.sample -> nova.conf.sample-${PV}
-	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+compute compute-only iscsi +memcached mysql +novncproxy openvswitch postgres +rabbitmq sqlite"
-REQUIRED_USE="
-	!compute-only? ( || ( mysql postgres sqlite ) )
-	compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite )"
-
-CDEPEND="
-	>=dev-python/setuptools-16.0[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-24.0.0[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.0.0[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.0.1[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.0.2[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.0.3[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.1.0[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.1.1[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.2.0[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.3.0[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.3.1[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.3.2[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-36.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="
-	${CDEPEND}
-	app-admin/sudo"
-
-RDEPEND="
-	${CDEPEND}
-	compute-only? (
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
-	)
-	sqlite? (
-		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
-	)
-	mysql? (
-		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
-		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
-	)
-	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
-	<dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.0[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.1[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.2[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.3[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.4[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.6.0[${PYTHON_USEDEP}]
-	!~dev-python/cryptography-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
-	dev-python/paste[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}]
-	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-2.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-cinderclient-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-neutronclient-6.3.0[${PYTHON_USEDEP}]
-	>=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/websockify-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-cache-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-reports-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.24.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-rootwrap-5.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.24.2[${PYTHON_USEDEP}]
-	!~dev-python/oslo-messaging-5.25.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.23.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-privsep-1.9.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-privsep-1.17.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/rfc3986-0.3.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.27.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.17.0[${PYTHON_USEDEP}]
-	>=dev-python/os-brick-1.15.2[${PYTHON_USEDEP}]
-	>=dev-python/os-traits-0.3.1[${PYTHON_USEDEP}]
-	>=dev-python/os-vif-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/os-win-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/castellan-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/microversion-parse-0.1.2[${PYTHON_USEDEP}]
-	>=dev-python/os-xenapi-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/tooz-1.47.0[${PYTHON_USEDEP}]
-	>=dev-python/cursive-0.1.2[${PYTHON_USEDEP}]
-	>=dev-python/pypowervm-1.1.6[${PYTHON_USEDEP}]
-	dev-python/libvirt-python[${PYTHON_USEDEP}]
-	app-emulation/libvirt[iscsi?]
-	novncproxy? ( www-apps/novnc )
-	sys-apps/iproute2
-	openvswitch? ( net-misc/openvswitch )
-	rabbitmq? ( net-misc/rabbitmq-server )
-	memcached? (
-		net-misc/memcached
-		>=dev-python/python-memcached-1.58
-	)
-	sys-fs/sysfsutils
-	sys-fs/multipath-tools
-	net-misc/bridge-utils
-	compute? (
-		app-cdr/cdrtools
-		sys-fs/dosfstools
-		app-emulation/qemu
-	)
-	iscsi? (
-		sys-fs/lsscsi
-		>=sys-block/open-iscsi-2.0.873-r1
-	)"
-
-#PATCHES=(
-#)
-
-pkg_setup() {
-	linux-info_pkg_setup
-	CONFIG_CHECK_MODULES="BLK_DEV_NBD VHOST_NET IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
-	IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 IP_NF_FILTER IP_NF_IPTABLES \
-	NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 NF_NAT_IPV4 NF_NAT NF_CONNTRACK NETFILTER_XTABLES \
-	ISCSI_TCP SCSI_DH DM_MULTIPATH DM_SNAPSHOT"
-	if linux_config_exists; then
-		for module in ${CONFIG_CHECK_MODULES}; do
-			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel"
-		done
-	fi
-	enewgroup nova
-	enewuser nova -1 -1 /var/lib/nova nova
-}
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use !compute-only; then
-		for svc in api conductor consoleauth network scheduler spicehtml5proxy xvpvncproxy; do
-			newinitd "${FILESDIR}/nova.initd" "nova-${svc}"
-		done
-	fi
-	use compute && newinitd "${FILESDIR}/nova.initd" "nova-compute"
-	use novncproxy && newinitd "${FILESDIR}/nova.initd" "nova-novncproxy"
-
-	diropts -m 0750 -o nova -g qemu
-	dodir /var/log/nova /var/lib/nova/instances
-	diropts -m 0750 -o nova -g nova
-
-	insinto /etc/nova
-	insopts -m 0640 -o nova -g nova
-	newins "${DISTDIR}/nova.conf.sample-${PV}" "nova.conf.sample"
-	doins "${FILESDIR}/nova-compute.conf"
-	doins "${S}/etc/nova/"*
-	# rootwrap filters
-	insopts -m 0644
-	insinto /etc/nova/rootwrap.d
-	doins "etc/nova/rootwrap.d/api-metadata.filters"
-	doins "etc/nova/rootwrap.d/compute.filters"
-	doins "etc/nova/rootwrap.d/network.filters"
-
-	# add sudoers definitions for user nova
-	insinto /etc/sudoers.d/
-	insopts -m 0600 -o root -g root
-	doins "${FILESDIR}/nova-sudoers"
-
-	if use iscsi ; then
-		# Install udev rules for handle iscsi disk with right links under /dev
-		udev_newrules "${FILESDIR}/openstack-scsi-disk.rules" 60-openstack-scsi-disk.rules
-
-		insinto /etc/nova/
-		doins "${FILESDIR}/scsi-openscsi-link.sh"
-	fi
-}
-
-python_install() {
-	distutils-r1_python_install
-	# copy migration conf file (not coppied on install via setup.py script)
-	insinto "$(python_get_sitedir)/db/sqlalchemy/migrate_repo/"
-	doins "nova/db/sqlalchemy/migrate_repo/migrate.cfg"
-	# copy the CA cert dir (not coppied on install via setup.py script)
-	cp -R "${S}/nova/CA" "${D}/$(python_get_sitedir)/nova/" || die "installing CA files failed"
-}
-
-pkg_postinst() {
-	if use iscsi ; then
-		elog "iscsid needs to be running if you want cinder to connect"
-	fi
-}
diff --git a/sys-cluster/nova/nova-16.1.3.ebuild b/sys-cluster/nova/nova-16.1.3.ebuild
index 3db5286945f2..8856721e03fb 100644
--- a/sys-cluster/nova/nova-16.1.3.ebuild
+++ b/sys-cluster/nova/nova-16.1.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/pike/nova.co
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="+compute compute-only iscsi +memcached mysql +novncproxy openvswitch postgres +rabbitmq sqlite"
 REQUIRED_USE="
 	!compute-only? ( || ( mysql postgres sqlite ) )
diff --git a/sys-cluster/nova/nova-17.0.1.ebuild b/sys-cluster/nova/nova-17.0.1.ebuild
deleted file mode 100644
index 86f72145cf9b..000000000000
--- a/sys-cluster/nova/nova-17.0.1.ebuild
+++ /dev/null
@@ -1,257 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit distutils-r1 eutils linux-info multilib user
-
-DESCRIPTION="Cloud computing fabric controller (main part of an IaaS system) in Python"
-HOMEPAGE="https://launchpad.net/nova"
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/queens/nova.conf.sample -> nova.conf.sample-${PV}"
-	EGIT_REPO_URI="https://github.com/openstack/nova.git"
-	EGIT_BRANCH="stable/queens"
-else
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/queens/nova.conf.sample -> nova.conf.sample-${PV}
-	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+compute compute-only iscsi +memcached mysql +novncproxy openvswitch postgres +rabbitmq sqlite"
-REQUIRED_USE="
-	!compute-only? ( || ( mysql postgres sqlite ) )
-	compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite )"
-
-CDEPEND="
-	>=dev-python/setuptools-16.0[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-24.0.0[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.0.0[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.0.1[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.0.2[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.0.3[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.1.0[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.1.1[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.2.0[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.3.0[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.3.1[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.3.2[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-36.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="
-	${CDEPEND}
-	app-admin/sudo"
-
-RDEPEND="
-	${CDEPEND}
-	compute-only? (
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
-	)
-	sqlite? (
-		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
-	)
-	mysql? (
-		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
-		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
-	)
-	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
-	<dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.0[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.1[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.2[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.3[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.4[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-2.4.1[${PYTHON_USEDEP}]
-	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.9.0[${PYTHON_USEDEP}]
-	!~dev-python/cryptography-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.4.10[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.3.0[${PYTHON_USEDEP}]
-	>=dev-python/python-neutronclient-6.3.0[${PYTHON_USEDEP}]
-	>=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/websockify-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.25.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-privsep-1.23.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
-	>=dev-python/rfc3986-0.3.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.31.2[${PYTHON_USEDEP}]
-	>=dev-python/os-brick-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/os-traits-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/os-vif-1.7.0[${PYTHON_USEDEP}]
-	!~dev-python/os-vif-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/castellan-0.16.0[${PYTHON_USEDEP}]
-	>=dev-python/microversion-parse-0.1.2[${PYTHON_USEDEP}]
-	>=dev-python/os-xenapi-0.3.1[${PYTHON_USEDEP}]
-	>=dev-python/tooz-1.58.0[${PYTHON_USEDEP}]
-	>=dev-python/cursive-0.2.1[${PYTHON_USEDEP}]
-	>=dev-python/pypowervm-1.1.10[${PYTHON_USEDEP}]
-	>=dev-python/os-service-types-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/taskflow-2.16.0[${PYTHON_USEDEP}]
-	dev-python/libvirt-python[${PYTHON_USEDEP}]
-	app-emulation/libvirt[iscsi?]
-	novncproxy? ( www-apps/novnc )
-	sys-apps/iproute2
-	openvswitch? ( net-misc/openvswitch )
-	rabbitmq? ( net-misc/rabbitmq-server )
-	memcached? (
-		net-misc/memcached
-		>=dev-python/python-memcached-1.58
-	)
-	sys-fs/sysfsutils
-	sys-fs/multipath-tools
-	net-misc/bridge-utils
-	compute? (
-		app-cdr/cdrtools
-		sys-fs/dosfstools
-		app-emulation/qemu
-	)
-	iscsi? (
-		sys-fs/lsscsi
-		>=sys-block/open-iscsi-2.0.873-r1
-	)"
-
-#PATCHES=(
-#)
-
-pkg_setup() {
-	linux-info_pkg_setup
-	CONFIG_CHECK_MODULES="BLK_DEV_NBD VHOST_NET IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
-	IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 IP_NF_FILTER IP_NF_IPTABLES \
-	NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 NF_NAT_IPV4 NF_NAT NF_CONNTRACK NETFILTER_XTABLES \
-	ISCSI_TCP SCSI_DH DM_MULTIPATH DM_SNAPSHOT"
-	if linux_config_exists; then
-		for module in ${CONFIG_CHECK_MODULES}; do
-			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel"
-		done
-	fi
-	enewgroup nova
-	enewuser nova -1 -1 /var/lib/nova nova
-}
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use !compute-only; then
-		for svc in api conductor consoleauth network scheduler spicehtml5proxy xvpvncproxy; do
-			newinitd "${FILESDIR}/nova.initd" "nova-${svc}"
-		done
-	fi
-	use compute && newinitd "${FILESDIR}/nova.initd" "nova-compute"
-	use novncproxy && newinitd "${FILESDIR}/nova.initd" "nova-novncproxy"
-
-	diropts -m 0750 -o nova -g qemu
-	dodir /var/log/nova /var/lib/nova/instances
-	diropts -m 0750 -o nova -g nova
-
-	insinto /etc/nova
-	insopts -m 0640 -o nova -g nova
-	newins "${DISTDIR}/nova.conf.sample-${PV}" "nova.conf.sample"
-	doins "${FILESDIR}/nova-compute.conf"
-	doins "${S}/etc/nova/"*
-	# rootwrap filters
-	insopts -m 0644
-	insinto /etc/nova/rootwrap.d
-	doins "etc/nova/rootwrap.d/api-metadata.filters"
-	doins "etc/nova/rootwrap.d/compute.filters"
-	doins "etc/nova/rootwrap.d/network.filters"
-
-	# add sudoers definitions for user nova
-	insinto /etc/sudoers.d/
-	insopts -m 0600 -o root -g root
-	doins "${FILESDIR}/nova-sudoers"
-
-	if use iscsi ; then
-		# Install udev rules for handle iscsi disk with right links under /dev
-		udev_newrules "${FILESDIR}/openstack-scsi-disk.rules" 60-openstack-scsi-disk.rules
-
-		insinto /etc/nova/
-		doins "${FILESDIR}/scsi-openscsi-link.sh"
-	fi
-}
-
-python_install() {
-	distutils-r1_python_install
-	# copy migration conf file (not coppied on install via setup.py script)
-	insinto "$(python_get_sitedir)/db/sqlalchemy/migrate_repo/"
-	doins "nova/db/sqlalchemy/migrate_repo/migrate.cfg"
-	# copy the CA cert dir (not coppied on install via setup.py script)
-	cp -R "${S}/nova/CA" "${D}/$(python_get_sitedir)/nova/" || die "installing CA files failed"
-}
-
-pkg_postinst() {
-	if use iscsi ; then
-		elog "iscsid needs to be running if you want cinder to connect"
-	fi
-}
diff --git a/sys-cluster/nova/nova-17.0.3.ebuild b/sys-cluster/nova/nova-17.0.3.ebuild
deleted file mode 100644
index 4f9c25caad5a..000000000000
--- a/sys-cluster/nova/nova-17.0.3.ebuild
+++ /dev/null
@@ -1,257 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit distutils-r1 eutils linux-info multilib user
-
-DESCRIPTION="Cloud computing fabric controller (main part of an IaaS system) in Python"
-HOMEPAGE="https://launchpad.net/nova"
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/queens/nova.conf.sample -> nova.conf.sample-${PV}"
-	EGIT_REPO_URI="https://github.com/openstack/nova.git"
-	EGIT_BRANCH="stable/queens"
-else
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/queens/nova.conf.sample -> nova.conf.sample-${PV}
-	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+compute compute-only iscsi +memcached mysql +novncproxy openvswitch postgres +rabbitmq sqlite"
-REQUIRED_USE="
-	!compute-only? ( || ( mysql postgres sqlite ) )
-	compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite )"
-
-CDEPEND="
-	>=dev-python/setuptools-16.0[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-24.0.0[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.0.0[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.0.1[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.0.2[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.0.3[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.1.0[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.1.1[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.2.0[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.3.0[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.3.1[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-34.3.2[${PYTHON_USEDEP}]
-	!~dev-python/setuptools-36.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="
-	${CDEPEND}
-	app-admin/sudo"
-
-RDEPEND="
-	${CDEPEND}
-	compute-only? (
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
-	)
-	sqlite? (
-		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
-	)
-	mysql? (
-		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
-		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
-	)
-	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
-	<dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.0[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.1[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.2[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.3[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.4[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-2.4.1[${PYTHON_USEDEP}]
-	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.9.0[${PYTHON_USEDEP}]
-	!~dev-python/cryptography-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.4.10[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.3.0[${PYTHON_USEDEP}]
-	>=dev-python/python-neutronclient-6.3.0[${PYTHON_USEDEP}]
-	>=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/websockify-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.25.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-privsep-1.23.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
-	>=dev-python/rfc3986-0.3.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.31.2[${PYTHON_USEDEP}]
-	>=dev-python/os-brick-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/os-traits-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/os-vif-1.7.0[${PYTHON_USEDEP}]
-	!~dev-python/os-vif-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/castellan-0.16.0[${PYTHON_USEDEP}]
-	>=dev-python/microversion-parse-0.1.2[${PYTHON_USEDEP}]
-	>=dev-python/os-xenapi-0.3.1[${PYTHON_USEDEP}]
-	>=dev-python/tooz-1.58.0[${PYTHON_USEDEP}]
-	>=dev-python/cursive-0.2.1[${PYTHON_USEDEP}]
-	>=dev-python/pypowervm-1.1.10[${PYTHON_USEDEP}]
-	>=dev-python/os-service-types-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/taskflow-2.16.0[${PYTHON_USEDEP}]
-	dev-python/libvirt-python[${PYTHON_USEDEP}]
-	app-emulation/libvirt[iscsi?]
-	novncproxy? ( www-apps/novnc )
-	sys-apps/iproute2
-	openvswitch? ( net-misc/openvswitch )
-	rabbitmq? ( net-misc/rabbitmq-server )
-	memcached? (
-		net-misc/memcached
-		>=dev-python/python-memcached-1.58
-	)
-	sys-fs/sysfsutils
-	sys-fs/multipath-tools
-	net-misc/bridge-utils
-	compute? (
-		app-cdr/cdrtools
-		sys-fs/dosfstools
-		app-emulation/qemu
-	)
-	iscsi? (
-		sys-fs/lsscsi
-		>=sys-block/open-iscsi-2.0.873-r1
-	)"
-
-#PATCHES=(
-#)
-
-pkg_setup() {
-	linux-info_pkg_setup
-	CONFIG_CHECK_MODULES="BLK_DEV_NBD VHOST_NET IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
-	IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 IP_NF_FILTER IP_NF_IPTABLES \
-	NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 NF_NAT_IPV4 NF_NAT NF_CONNTRACK NETFILTER_XTABLES \
-	ISCSI_TCP SCSI_DH DM_MULTIPATH DM_SNAPSHOT"
-	if linux_config_exists; then
-		for module in ${CONFIG_CHECK_MODULES}; do
-			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel"
-		done
-	fi
-	enewgroup nova
-	enewuser nova -1 -1 /var/lib/nova nova
-}
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use !compute-only; then
-		for svc in api conductor consoleauth network scheduler spicehtml5proxy xvpvncproxy; do
-			newinitd "${FILESDIR}/nova.initd" "nova-${svc}"
-		done
-	fi
-	use compute && newinitd "${FILESDIR}/nova.initd" "nova-compute"
-	use novncproxy && newinitd "${FILESDIR}/nova.initd" "nova-novncproxy"
-
-	diropts -m 0750 -o nova -g qemu
-	dodir /var/log/nova /var/lib/nova/instances
-	diropts -m 0750 -o nova -g nova
-
-	insinto /etc/nova
-	insopts -m 0640 -o nova -g nova
-	newins "${DISTDIR}/nova.conf.sample-${PV}" "nova.conf.sample"
-	doins "${FILESDIR}/nova-compute.conf"
-	doins "${S}/etc/nova/"*
-	# rootwrap filters
-	insopts -m 0644
-	insinto /etc/nova/rootwrap.d
-	doins "etc/nova/rootwrap.d/api-metadata.filters"
-	doins "etc/nova/rootwrap.d/compute.filters"
-	doins "etc/nova/rootwrap.d/network.filters"
-
-	# add sudoers definitions for user nova
-	insinto /etc/sudoers.d/
-	insopts -m 0600 -o root -g root
-	doins "${FILESDIR}/nova-sudoers"
-
-	if use iscsi ; then
-		# Install udev rules for handle iscsi disk with right links under /dev
-		udev_newrules "${FILESDIR}/openstack-scsi-disk.rules" 60-openstack-scsi-disk.rules
-
-		insinto /etc/nova/
-		doins "${FILESDIR}/scsi-openscsi-link.sh"
-	fi
-}
-
-python_install() {
-	distutils-r1_python_install
-	# copy migration conf file (not coppied on install via setup.py script)
-	insinto "$(python_get_sitedir)/db/sqlalchemy/migrate_repo/"
-	doins "nova/db/sqlalchemy/migrate_repo/migrate.cfg"
-	# copy the CA cert dir (not coppied on install via setup.py script)
-	cp -R "${S}/nova/CA" "${D}/$(python_get_sitedir)/nova/" || die "installing CA files failed"
-}
-
-pkg_postinst() {
-	if use iscsi ; then
-		elog "iscsid needs to be running if you want cinder to connect"
-	fi
-}
diff --git a/sys-cluster/nova/nova-17.0.4.ebuild b/sys-cluster/nova/nova-17.0.4.ebuild
index 4f9c25caad5a..86f72145cf9b 100644
--- a/sys-cluster/nova/nova-17.0.4.ebuild
+++ b/sys-cluster/nova/nova-17.0.4.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]];then
 else
 	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/queens/nova.conf.sample -> nova.conf.sample-${PV}
 	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/sys-cluster/openmpi/Manifest b/sys-cluster/openmpi/Manifest
index e102a215f5fe..e4c193cbb21f 100644
--- a/sys-cluster/openmpi/Manifest
+++ b/sys-cluster/openmpi/Manifest
@@ -11,19 +11,19 @@ DIST openmpi-1.8.8.tar.bz2 13231433 BLAKE2B d196fd0bb08cfb0c86a29ae39015eb15e146
 DIST openmpi-2.0.2.tar.bz2 8311215 BLAKE2B 8dd0d7b95c396e9a0f05760136bbf62defd3527b2ac4f9ec738239b91d8cf5ed0c3dc4ad5330f0ea2fafa3464164e3d514bc058dc9d019daa83382ae990f442c SHA512 87dc3c23db4b9cb92dbacc9b384b21ce8c4288fe4edc204fbf4a3bef70d8ac4329269e777ed190fa87933d78b73b9e5550ea3b925b2039599cfef3953567232a
 DIST openmpi-2.0.4.tar.bz2 8272983 BLAKE2B 7d0a392fbc8c896cdccefb9bf0ff83fbd8db8a42d17f06cb23ac88ba896e2c75e1b1b7a79559d0ce3c2b881f197f54ce1bd8967c889bafe2b97f95fb6b957501 SHA512 2cccb83847d44f6282ec24f7bc12ab51b84dc5ac1a2a919ef0761847ff7cdcb31cfb1f38dca33df7063a98c27a64575a108002716d207cbba3a54773b999e6c5
 DIST openmpi-2.1.3.tar.bz2 8311304 BLAKE2B a6a2d0d759a7207e4e9e9bb1526825ce5b0c9acd22c113f71712381fd7cab55228e78294533a5af6ef2b243803d789c5c71c6d59dd7a8ebbf10b2aa5d99296fd SHA512 61ecf53d840feb4cad1e792225c7fb07a8c4cb849f21693051359cde2cf1b5060de3a9d00ba3b55ded20b5b93bc5ac439951b4fe5cb1a74d4e800f26c979feba
-DIST openmpi-3.0.0.tar.bz2 9267606 BLAKE2B 9ee569a9c5f5918bb3d389a2945a2e7a5d98464afbd111eb2426a4e8296a23cf6d5b558554ce8126b13f910bd59acbb77e93ac297f3cf222c4bc764836b39ee6 SHA512 7e37eacf959a803d6d89dff4291b64a1f3d83bc7941b778a2fb13d12be0f205cb904e4a807d79676ad1e31fd99ffb15f255c8a227e830673455abb144f14616a
 DIST openmpi-3.0.1.tar.bz2 9176460 BLAKE2B 65fdaeb492da3cf86a68c2d47d19568c8d65e92d0202041853ae3cbe0f057d8bdc79953538921b5b8c9eb9c9cedab8502816985e12524704992069a51e08d857 SHA512 15fad504ba743d564e7196b62a112027798d4b26e9c8d11d9c1c00ac2968f1858ebc168df30473104c5a31f71e38ab558204b598260b535a12b6094aa77182b8
-EBUILD openmpi-1.10.7.ebuild 6371 BLAKE2B 4c0972ec160ca97f6bb3bb26230acad63db196e143a3d53d159ca033885658417970cf02ecff2e7941e346c79a56a8c4a219c552c3b6a3c813f3438d6c8d3388 SHA512 fe8b2309eec88e65a0286d625213fb2b25fa73db7ff4feac115c3f1f40a0155172f9d4f730d25e587416120e5be4d3bea5d9ac6d124a60ed3763599709c59544
-EBUILD openmpi-1.4.3.ebuild 2599 BLAKE2B 7d4cfad71f26c7cb3ba7d1e96fdc837d35d577b5d0e4d82a324f36d350548afb17a343cf0ffe6cb5c906c5165b20bcf8c70971a5d9e1b194dcfea62a234b9c9b SHA512 300e6e21c6a51ce3d097de46813bc496c5efe6508434f5d1a7bfc6b393452192b546802905f8562867b3386a86ad06bb7c42db8d06fd9d50afdf3a3105d0997b
-EBUILD openmpi-1.4.5.ebuild 2608 BLAKE2B 0f59bb9c25fd6dbc86b5942cfc1f18df3f16fdf16ae97459aca33e6e020b3df0280f9dce7794cc33d4835231453f21d03311ae808f3beb3cdf36a533da1a2ff5 SHA512 adf34b9ac8817e2b37e9ae7ee539bc280c9b1c7b798fa682409ef000961e1e9f5bca7be1511a0ced27e4c3db6850a6d6214bbf90e67a85fcd46e9bb15a2ea918
-EBUILD openmpi-1.6.5-r1.ebuild 5310 BLAKE2B 097d32b48d6107271e5abf16ec83f82634dd0d8ec80537ecd4fb69b52c4f1b1ce521fa98fa2a9fdbaa4044fccf1a349062b3f151a12ada8ca3572208228a1e58 SHA512 3b6e7d50021f9dae65f9a0eade04b40e7cda87f992d9adf34989aca3b53ea06704958e4ef4314beb9be8e0243a933de82a51d27f518c6b7f3627ed8baec84968
-EBUILD openmpi-1.7.5-r1.ebuild 5005 BLAKE2B 684414b5fbd7cba01ede9c9c6e31c752d0c3169ff9e46fff1c567be970b9a88dc473f599981e573535c1e0cf92f888d5dd3dfed81a504ee3353fbf5234045daa SHA512 0a478b87a43f7111f2a9130d242e44e2a83de6b8cc357f930bf28ade0ec3c7b86d277c9479b2c6e6073f28bc64d8b905d954b2289274df7a5861e690c32b2d02
-EBUILD openmpi-1.8.4-r4.ebuild 5048 BLAKE2B d26fa1fdf6fc73a956fd5cfbd10bd9724bb0c9719560e539967ba0dd034e11673c59c20659c680e41a208614a83f308db8cd70186dd900fcfa1972917e159ddd SHA512 eb2918d4aefc61c52e6cbff893edd3c83501751e3bc62a0a28625bdc31633bc5d1ee7b16102ca6f972a14886d1e5c158dc798738ccdafbdd073467f754d3b653
-EBUILD openmpi-1.8.7-r1.ebuild 5560 BLAKE2B 2612d375a86e1d98cd5886c7ced4664b5fce54c68dcf296514a11f196af3476a974575f1549e45e4c32220bf466855b07ff2ca011e67a8134db30ba03ccb39b0 SHA512 7de2ec62a421648d21c58be27a72d707093fc041f594b655fdcb09bdeeb7e771bfc3daf3d5ad9821d1f282575bf524e8ffe54b7129bf9f60c0ff0bfc9a232ae9
-EBUILD openmpi-1.8.8.ebuild 5566 BLAKE2B 56828b2534ab5fa76cac1dfbb67249cb64de5017c9e7187038da3e3aa90bd31a143b0c93c497ff5b505f5921eb49c37d6bfa202d4f16928bc6d3a618dabb454b SHA512 c0781188fecce6c9bb8981c7e1008230da9f54defd47098664b963989c202ee0910cd675f6a1660f4bb6b8a0cab2c199fb7cb93e002e1e7ba009d512ac6e6f58
-EBUILD openmpi-2.0.2.ebuild 5978 BLAKE2B a9cb499057d16cb9db04a63f9fe33fa118d1899f0cec2e51b00045db2f0c14f5a3a9f054542660d569a0210002777905974ee38bed9a329d3d2cf412efbbc09c SHA512 9152c1ad9a979ffa9ad63d2a5575667dfd52d10a9c94ea3f66126f2770a278c021203385e0bb5e63e9a946c14f831b6b3e2acffa7a8d0a30fbf8f5ef9d0faf7a
-EBUILD openmpi-2.0.4.ebuild 5976 BLAKE2B d0dc2da7c801f5866b89e9113029e9d498ae1574b8ec01fe031fcc015ad3cc8380b1bbfe98a4136193483260c69c6ae549f93ebe0f128261014aa29229b5c301 SHA512 c348dcce467c19c6f8474d78f76366c4c2e56a25d2c7b43add9750b4473c00b7e486778d4f9b2fd12b2c83b3051c9f3dc081b0a0e56af7ab147fc0ae77f62364
-EBUILD openmpi-2.1.3.ebuild 5596 BLAKE2B beb41a1306eb635f09bb4a862eed9217a57cd8bff89ce65dd5b19a1ab12856ca50a676c91f025dca53bd68cfa289aca0c676a8dbc8c3f22c74ce18336bfc5806 SHA512 3f76918594348cc5a475a8828ffdcb9ed6bde1ba0dd1a9207d048162041b4b3060dabdd8bdfd91f3a12f44e7c25a5b85aaa98480e07e76edf8aff48bd1baccb4
-EBUILD openmpi-3.0.0-r1.ebuild 5482 BLAKE2B 9176ba52c12f53e9e600dc0b77ea7b7377953e70f8c0c81f20de9f5ab1d8311529560d534b5bf2f08e5e5b0407f4d19b69fe443027fd725223f77361fa498757 SHA512 566314c8969df8e5573bcd4064b0f0ace73897d1e4cb271d38ad311301b4ba3bfeec05ace93e11e415b85977603946d581d7b6fad13117682378c015accd7324
-EBUILD openmpi-3.0.1.ebuild 5482 BLAKE2B 9176ba52c12f53e9e600dc0b77ea7b7377953e70f8c0c81f20de9f5ab1d8311529560d534b5bf2f08e5e5b0407f4d19b69fe443027fd725223f77361fa498757 SHA512 566314c8969df8e5573bcd4064b0f0ace73897d1e4cb271d38ad311301b4ba3bfeec05ace93e11e415b85977603946d581d7b6fad13117682378c015accd7324
+DIST openmpi-3.1.0.tar.bz2 9443759 BLAKE2B 7670b2cec327bad1bf348e08def3d39ea0b971c9534ec3e462a56719c4a1ebc8ceaf4a76556d0213cc2b7610c26f849d881f84ceaaaf54645ffbcefbd0273663 SHA512 23a43a16683c4b56f96c711fe009d992f3bd4e10cf9ef55091865a5b1aed195cc1de6a87720564f70d3b60a2441966bab39cda8969293aeb118cda10aead3dee
+EBUILD openmpi-1.10.7.ebuild 6390 BLAKE2B 55977738b22a8c2cab3adbd3026269e95671c71536068e1f89088b850263e1f61a580477ac0e71e47bb2e2dd740be888b8022603e7cb0b6766b6d1e1986969c1 SHA512 952e8364c98e19dda8ec34eb789165532986d2fe10f1a9b1c5631ad0418583a5470ede9174f7e65d7b769b1a1a4cb6081ef459a0da75e424a34556b501155ea8
+EBUILD openmpi-1.4.3.ebuild 2618 BLAKE2B a030b33a0fae59cf7e75cc8252af897ba703f95e259f938872182dfa97c86f587eb2259594f75114f939c7b0961490452ff3c11c2ed3a6b60ae3f2974d926446 SHA512 5c47bdf1192a6d2b95fa35c217a27ff6f69c0ca1bf5c5be3ff43f7785b354c214a371697006275efc08fc9ec3bf27d284db45a7f5d6cb1af9937c42340f79f83
+EBUILD openmpi-1.4.5.ebuild 2627 BLAKE2B 3aef1a37d78c175dcf3e3a47321a52f03d2fd61b1dde797ac811b2444d100b29e3eb4686d9961848573055af62ce41f114055eb729e2cec469e5edbc630ec4aa SHA512 4c31cc8ae2986222645c873f30ba0aa53f612524e4019428c3d803a83d0d947b08770317b440749a93ef7485e71c174a39436589b4a73786253a5289a8d7e2bb
+EBUILD openmpi-1.6.5-r1.ebuild 5329 BLAKE2B e155006ffebc9dd049b8aca2e362fc6d799f16d4b1425bde054299f90109f176992a817db9f2af30ef0735a5634ac550d3f309c5d2de6947842702c097b1ff36 SHA512 9b5b0ba8f4d376748d16d954547311ec6124b2e9d1809595d280bb96e68b5eb7389a769414286d3590cb4af4501d9255e914647810045e9b5fea848c640ae852
+EBUILD openmpi-1.7.5-r1.ebuild 5024 BLAKE2B 12b59637302e86a4337d35603094345184e0871e0884db3b3dc8b367eedb5713cbf9e5e65b60c2ec30850000c7385d2c189d8da2d13f94c19ca45a4addb8bd98 SHA512 060e89281a6d3b088b13d178022c5b16582e681c0c63bcb37d546a74395e93884cf457a116d15598b45b8a9b941df6501538e46f50c61e6021ee1856c2dfd03f
+EBUILD openmpi-1.8.4-r4.ebuild 5067 BLAKE2B bfcd66d54add32b45aa30ba92a32f2513dc43f58e771c000cb933c8ebcbf14684ed02c455ef293de8edff685164fa11d21e4d3a33d6b6eefd9bcfcab1e8ec645 SHA512 828fa3a47a63eb06b650dcc19d67cda546134ea0520838b7521d7d0d07af8101dc27a8cd01a8a272f9ed542b33f47a104711e2a31342c66d6b928c8cf48a06d5
+EBUILD openmpi-1.8.7-r1.ebuild 5579 BLAKE2B 13959d6ec10acd1682ee5ee6352b9d6cbc8b420f4dfe14549ce076249a255158fe8a590a5ab6036f937801187788bb9aff6130791ca2b967db19b4ed46a7aaab SHA512 be0ffdbbb72a78408de28ffad4380279d18a90d5caf8a210f4da960059cc664fb47759abc98355d88845ac6fb9fa9e882de643505179b0f60315baa6a83bc8c7
+EBUILD openmpi-1.8.8.ebuild 5585 BLAKE2B c02fe06f936dee22e589d29d2cc8e04bcf3a69e682957e7b8878969287859d95c0820154a6cb1f2c2a93d4ce6860dec77d5039d5cf16d6ea4bdb2d9eb90f3604 SHA512 0daf5af8160fda8492a1e50a18846afdcfe359ad043c8ed98408081c92dc43f63d6ea1d804cba9f7dc2a3529e4e2f17641a66101de4de476f0f39f53779e1481
+EBUILD openmpi-2.0.2.ebuild 5997 BLAKE2B a1c50d7944b1b7b0401f059a5c9e5293719afdc6a978404370d7fa510c426b47e04a33216430266b559e43af5fc99d984f0e9c841c423e86a7f3bc648333f402 SHA512 9519f42ef32704e0241fc5f51fb57cc2ec4e05188235f74e214444b4b43bbe4819a628c3a3b92026867121ceb5262607d5c51d79fc18e34df188100a64ad65f4
+EBUILD openmpi-2.0.4.ebuild 5995 BLAKE2B f0e8b0971b2e9cdae4a46b771bee622a4c3558455df9d59ac09624a784865df79268201535bd8aff0cd782425dc95fdec4235f2fe1dbf1d2be1d55c5fc8bc20f SHA512 dd4e1c687c56ae395ff209e4f1c6e22b74b78a83373850ada084c7d6391f6442d6607125c3f3027e3b40837ffce6b7bfa3ef7ec810e614e6337bc5c383ec1a35
+EBUILD openmpi-2.1.3.ebuild 5615 BLAKE2B 9195ee57f8626e23012c89d601034b68c5fd4f333729d82d64ad48b8607ebb6b7e778fdda414d10c432428610e9de1bcbe9ead021068fa8b9b7d2c0087ffc701 SHA512 0b5ca00feb899a0ca13ea6c4a2f80c824303ea52cac4a616ddb1f807e40030b1bca509be5f5d23d96a717e346e043b3b897914a3f8a329f1d05d07c00a4bec15
+EBUILD openmpi-3.0.1.ebuild 5501 BLAKE2B 47580c29cbd6edd9f18488ca3fe91ae8e45115b1d5665161e4195c22f016ee6550339b910618322343599bc444e7d4638828a81ca9ae8d33023baac1f4129d32 SHA512 9cec89649171b6eaa491c074660ee88a74daaf95938686a508df717ae761b95412cb41606b47e95abf6c8de55906f6d4d052afc228f164d6645878883d31e945
+EBUILD openmpi-3.1.0.ebuild 5501 BLAKE2B 47580c29cbd6edd9f18488ca3fe91ae8e45115b1d5665161e4195c22f016ee6550339b910618322343599bc444e7d4638828a81ca9ae8d33023baac1f4129d32 SHA512 9cec89649171b6eaa491c074660ee88a74daaf95938686a508df717ae761b95412cb41606b47e95abf6c8de55906f6d4d052afc228f164d6645878883d31e945
 MISC metadata.xml 901 BLAKE2B 8cdef4e4438351cb99b59bafb932e4b2b960f08b4eaa9917ac2a5d97fd2423781b1ec27a16005ae6470b8f50509ae3c08c2d06f95e452bd2cf00505b7a79ac35 SHA512 6f30f50d2f2173a01e7ef0d4b808352be98b64945b6af1f05cfaa28024f6efccad28984fe0ad31094f8822c5e251c1270765d5905c7737e1b84302143fe4ac09
diff --git a/sys-cluster/openmpi/openmpi-1.10.7.ebuild b/sys-cluster/openmpi/openmpi-1.10.7.ebuild
index 24c15a5e73b2..d9445be72cf3 100644
--- a/sys-cluster/openmpi/openmpi-1.10.7.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.10.7.ebuild
@@ -58,6 +58,7 @@ CDEPEND="
 	!sys-cluster/mpich2
 	!sys-cluster/nullmpi
 	!sys-cluster/mpiexec
+	!sys-cluster/pmix
 	>=dev-libs/libevent-2.0.21[${MULTILIB_USEDEP}]
 	dev-libs/libltdl:0[${MULTILIB_USEDEP}]
 	>=sys-apps/hwloc-1.10.0-r2[${MULTILIB_USEDEP},numa?]
diff --git a/sys-cluster/openmpi/openmpi-1.4.3.ebuild b/sys-cluster/openmpi/openmpi-1.4.3.ebuild
index 13aa396266d9..1c7c5aaf0513 100644
--- a/sys-cluster/openmpi/openmpi-1.4.3.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.4.3.ebuild
@@ -26,7 +26,8 @@ RDEPEND="
 	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
 	!sys-cluster/mpich
 	!sys-cluster/mpich2
-	!sys-cluster/mpiexec"
+	!sys-cluster/mpiexec
+	!sys-cluster/pmix"
 DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${MY_P}
diff --git a/sys-cluster/openmpi/openmpi-1.4.5.ebuild b/sys-cluster/openmpi/openmpi-1.4.5.ebuild
index 76e9393e8ff1..a533b92ca6ba 100644
--- a/sys-cluster/openmpi/openmpi-1.4.5.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.4.5.ebuild
@@ -28,7 +28,8 @@ RDEPEND="
 	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
 	!sys-cluster/mpich
 	!sys-cluster/mpich2
-	!sys-cluster/mpiexec"
+	!sys-cluster/mpiexec
+	!sys-cluster/pmix"
 DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${MY_P}
diff --git a/sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild b/sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild
index 726682652f3a..a5befadf3e4b 100644
--- a/sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild
@@ -52,6 +52,7 @@ RDEPEND="
 	!sys-cluster/mpich
 	!sys-cluster/mpich2
 	!sys-cluster/mpiexec
+	!sys-cluster/pmix
 	>=sys-apps/hwloc-1.3
 	dev-libs/libltdl:0
 	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
diff --git a/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild b/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild
index fafe8de40b9b..c3cccad1880c 100644
--- a/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild
@@ -55,6 +55,7 @@ RDEPEND="
 	!sys-cluster/mpich
 	!sys-cluster/mpich2
 	!sys-cluster/mpiexec
+	!sys-cluster/pmix
 	dev-libs/libevent
 	dev-libs/libltdl:0
 	>=sys-apps/hwloc-1.7.2
diff --git a/sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild b/sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild
index e18b5d76f1eb..1c5265167384 100644
--- a/sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild
@@ -57,6 +57,7 @@ RDEPEND="
 	!sys-cluster/mpich
 	!sys-cluster/mpich2
 	!sys-cluster/mpiexec
+	!sys-cluster/pmix
 	dev-libs/libevent
 	dev-libs/libltdl:0
 	>=sys-apps/hwloc-1.9.1[numa?]
diff --git a/sys-cluster/openmpi/openmpi-1.8.7-r1.ebuild b/sys-cluster/openmpi/openmpi-1.8.7-r1.ebuild
index 9cfc540f108d..e744ac73c6ca 100644
--- a/sys-cluster/openmpi/openmpi-1.8.7-r1.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.8.7-r1.ebuild
@@ -57,6 +57,7 @@ CDEPEND="
 	!sys-cluster/mpich
 	!sys-cluster/mpich2
 	!sys-cluster/mpiexec
+	!sys-cluster/pmix
 	dev-libs/libevent
 	dev-libs/libltdl:0
 	>=sys-apps/hwloc-1.9.1[numa?]
diff --git a/sys-cluster/openmpi/openmpi-1.8.8.ebuild b/sys-cluster/openmpi/openmpi-1.8.8.ebuild
index fed24bd2c4fe..98a3502fcb43 100644
--- a/sys-cluster/openmpi/openmpi-1.8.8.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.8.8.ebuild
@@ -57,6 +57,7 @@ CDEPEND="
 	!sys-cluster/mpich
 	!sys-cluster/mpich2
 	!sys-cluster/mpiexec
+	!sys-cluster/pmix
 	dev-libs/libevent
 	dev-libs/libltdl:0
 	>=sys-apps/hwloc-1.9.1[numa?]
diff --git a/sys-cluster/openmpi/openmpi-2.0.2.ebuild b/sys-cluster/openmpi/openmpi-2.0.2.ebuild
index bdac184888c0..89dd842faa59 100644
--- a/sys-cluster/openmpi/openmpi-2.0.2.ebuild
+++ b/sys-cluster/openmpi/openmpi-2.0.2.ebuild
@@ -52,6 +52,7 @@ CDEPEND="
 	!sys-cluster/mpich2
 	!sys-cluster/nullmpi
 	!sys-cluster/mpiexec
+	!sys-cluster/pmix
 	>=dev-libs/libevent-2.0.22[${MULTILIB_USEDEP},threads]
 	dev-libs/libltdl:0[${MULTILIB_USEDEP}]
 	>=sys-apps/hwloc-1.11.2[${MULTILIB_USEDEP},numa?]
diff --git a/sys-cluster/openmpi/openmpi-2.0.4.ebuild b/sys-cluster/openmpi/openmpi-2.0.4.ebuild
index 68208b7b6553..37249c6d1c32 100644
--- a/sys-cluster/openmpi/openmpi-2.0.4.ebuild
+++ b/sys-cluster/openmpi/openmpi-2.0.4.ebuild
@@ -52,6 +52,7 @@ CDEPEND="
 	!sys-cluster/mpich2
 	!sys-cluster/nullmpi
 	!sys-cluster/mpiexec
+	!sys-cluster/pmix
 	>=dev-libs/libevent-2.0.22[${MULTILIB_USEDEP},threads]
 	dev-libs/libltdl:0[${MULTILIB_USEDEP}]
 	<sys-apps/hwloc-2[${MULTILIB_USEDEP},numa?]
diff --git a/sys-cluster/openmpi/openmpi-2.1.3.ebuild b/sys-cluster/openmpi/openmpi-2.1.3.ebuild
index 823dd2c95def..a100f6b01cec 100644
--- a/sys-cluster/openmpi/openmpi-2.1.3.ebuild
+++ b/sys-cluster/openmpi/openmpi-2.1.3.ebuild
@@ -48,6 +48,7 @@ CDEPEND="
 	!sys-cluster/mpich2
 	!sys-cluster/nullmpi
 	!sys-cluster/mpiexec
+	!sys-cluster/pmix
 	>=dev-libs/libevent-2.0.22[${MULTILIB_USEDEP},threads]
 	dev-libs/libltdl:0[${MULTILIB_USEDEP}]
 	>=sys-apps/hwloc-1.11.2[${MULTILIB_USEDEP},numa?]
diff --git a/sys-cluster/openmpi/openmpi-3.0.1.ebuild b/sys-cluster/openmpi/openmpi-3.0.1.ebuild
index 6393b65d02e2..c9ae7f37806b 100644
--- a/sys-cluster/openmpi/openmpi-3.0.1.ebuild
+++ b/sys-cluster/openmpi/openmpi-3.0.1.ebuild
@@ -48,6 +48,7 @@ CDEPEND="
 	!sys-cluster/mpich2
 	!sys-cluster/nullmpi
 	!sys-cluster/mpiexec
+	!sys-cluster/pmix
 	>=dev-libs/libevent-2.0.22[${MULTILIB_USEDEP},threads]
 	dev-libs/libltdl:0[${MULTILIB_USEDEP}]
 	>=sys-apps/hwloc-1.11.2[${MULTILIB_USEDEP},numa?]
diff --git a/sys-cluster/openmpi/openmpi-3.0.0-r1.ebuild b/sys-cluster/openmpi/openmpi-3.1.0.ebuild
index 6393b65d02e2..c9ae7f37806b 100644
--- a/sys-cluster/openmpi/openmpi-3.0.0-r1.ebuild
+++ b/sys-cluster/openmpi/openmpi-3.1.0.ebuild
@@ -48,6 +48,7 @@ CDEPEND="
 	!sys-cluster/mpich2
 	!sys-cluster/nullmpi
 	!sys-cluster/mpiexec
+	!sys-cluster/pmix
 	>=dev-libs/libevent-2.0.22[${MULTILIB_USEDEP},threads]
 	dev-libs/libltdl:0[${MULTILIB_USEDEP}]
 	>=sys-apps/hwloc-1.11.2[${MULTILIB_USEDEP},numa?]
diff --git a/sys-firmware/Manifest.gz b/sys-firmware/Manifest.gz
index 3f7923595734..71a2008d3c5a 100644
--- a/sys-firmware/Manifest.gz
+++ b/sys-firmware/Manifest.gz
diff --git a/sys-firmware/intel-microcode/Manifest b/sys-firmware/intel-microcode/Manifest
index 6755a668feb3..67d6fc334ddb 100644
--- a/sys-firmware/intel-microcode/Manifest
+++ b/sys-firmware/intel-microcode/Manifest
@@ -1,5 +1,6 @@
 AUX intel-microcode2ucode.c 3484 BLAKE2B ff203133c00813884e61a7e1c3cfd5ca34cc8b6bbbac2940e0f9161594355d6d2ed9aa96e83c7d5dd64559ad7945e7daf0bb84d64831128a86970e4e1d3a73e1 SHA512 0e29f995dee47707026cfb6224580c2166d000e91af7b1afe12f00158be8606093d07cdbc0d583a0af79370cf1d9c16b5f35a306bae7f545a5c774ea253509b7
 AUX intel-microcode2ucode.c-r1 3533 BLAKE2B 5d6863c069526ae472bc4510b0900017ddd9d7723e86241536eff7b97a225c15bab8d53f14872a7bab7d5599ad0f0492b8df50baa5d3edc01c4d32808b1781ad SHA512 2b234a0080461f27440047d870b3a2769425499c35807f6ccc89a31e4ee87a14bc74ed2ca95a8b9744f07b93f8042a3d6486cda07011585e3e634663834ca49e
+DIST intel-microcode-collection-20180426.tar.xz 4155132 BLAKE2B 222c48ba0123887b4ae299e0acc4696512dc1c7528f1b735dd79b2d2f0bf6d988d061e773fb3949b2ab9ddcb69e4224ddb431ccda1c4b329ca37e9409ca60380 SHA512 038d43cd698183baa14b14f1b05e76c93386568494b2621e49338cf3c02fd0e663284ca864a50b3df4188bde5669bf4794cdcf7f4a287dcd42efbb8717809990
 DIST microcode-20140430.tgz 785594 BLAKE2B e51a187ca99ad496804f117871b50693b03b50759c9dd23002149ff7fa4b74888c83e8e1fcf078a973dea82e6a9439de8415c56c902ed0163e55ceaaff0eaf23 SHA512 12954522629ce15c4b95c158b6288b3877a3d1f87bea838f8138e53987ef1b6c0edc7a8cbb802a981ccca178b70b4323907aafa7479c0c2fed4497f6fb7bbc1c
 DIST microcode-20140624.tgz 787237 BLAKE2B 1c2d8f39bf142570283e80f370f41c502ef04d24b4348ca4b44c881e3b1e54df72a88e09350d45a33d47d9955d84a80ae8a11e44561b1a8944a59f9326d4d81a SHA512 c774006aae639e7fae90bc1f5d8308b407e7cd3b7d0da6e35577560bf6201c2b15f7d7b6b0cd727c50be1e9d508b484b067856631fa2598498982109bff0e44c
 DIST microcode-20140913.tgz 830537 BLAKE2B 665c72fc3a3e1e13d9e58eba0ed202b30856532eee590006c02112df926b879985a97ba9a96b58a6aad0285bff95a3fbb27b22d533f958fe170887f0ab37eef1 SHA512 e179fe0001b1157cc95aee39185f51fd182d53c1bdb30bfc95bc3a70795c32012050f3a4adf06735a77d8ef9c703a330c6a2610b73b70f09f5760e31d39cb89c
@@ -15,6 +16,7 @@ DIST microcode-20171117_p20171215-r1.tgz 1477015 BLAKE2B 3911aed3bbbd350be69a99b
 DIST microcode-20171117_p20171215.tgz 1468587 BLAKE2B 58777a39f843ae880f7dd8971a9570dbfc176d69541bb9d3cdc948d7be71a7df2559265fb1c8a199bc7567bb5a60176ade1d2c36624d0193dbac98d82401d0dd SHA512 25db94dbf18b1fea9497ec1e61bb5349d7bc78b0578d8869546bc3ec579b96bee7cd62657e66ebd3d4616805e85d790ac7ee7c0fed70b5db30236ffd12b33293
 DIST microcode-20180108.tgz 3676678 BLAKE2B 197e0188e516a3071be9e2e7a6261d78208613db8b746c7df533ce37884197dbd06a4e6ab027cbddba38903f590130f2d974e46da8fbab0613561523653460ab SHA512 f4010d83353948df27beeb804ef11e4f019f63397a4936f9d139e2842f7944d1ae864b9376987eaffc7db5b97201d5de2f4c1d7cc6b0f545ae15ec53a61fce2b
 DIST microcode-20180312.tgz 3789662 BLAKE2B e948d74833fe75b9bbdff1e4676f5d49a13bdd06aa6525c39be3448b822203947a5f55515484401ee0c96e8ade19ea580718949bed65883d983509661a16e637 SHA512 cc2cabf6d12c83b65eeb30fca7eb0b503e037dbee3d7ce9cb307b02ed8ac9426b2bafc2c1f1281dddff0945f8308f0d3cd320edea4596551354188d64760b854
+DIST microcode-20180425.tgz 1565473 BLAKE2B 70e0a56f0f5f720e00ab18d6553bc221147589e83df34fdc0c130c6f74a239e48355bfe1845b1de919ed1bce9ade7b7db298883eb3de1d53732a694b15d76f62 SHA512 6cea53cc0f486891fb9ddffc1e03e8e0a6d1d91df6bfda81250b2c60714e7b4111caa9df5afa7f13d8144e591550ef7eb4fd1e153fc67fc904afb83ccc2e3bb0
 EBUILD intel-microcode-20140430.ebuild 1169 BLAKE2B eab5c169361c8954bc6adf7035e2cdcb6602cd777cc0d02fc9308f0be06863c1e760e23e01c47458d329a11dfc5a6dd4bc5acc2eab88d4c6e4b7e9ff23515e71 SHA512 c0b31a6fcac608c7ba811b4ffc068172fdaed22c58dc29a5526275b0935d7c9210381978f224f419ca4071dd79d04ba3b8e2e788e5d2343bc46bcb3b4a3c570a
 EBUILD intel-microcode-20140624.ebuild 1171 BLAKE2B 9376abe8e21dbafb22978fc8607638380a6d69727df313300b4527a6afbaf56d74a72432b57d2b67cfad829aa2b93da8a2bd4e93d86ed6e44c704fbab0a512c5 SHA512 c8ea78ebe459ff578f11c06c29fa58f87793f1b5ea6f7b93586af36ecc586cc5f03576b71f15b729c0c9bb97886244de4febb2dcd73fa6206ffb312622ff83c9
 EBUILD intel-microcode-20140913.ebuild 1171 BLAKE2B ecb957649f70ff9e0cd52b7332870f5cb3917afde0e19e7bfc250e777468e39d2cece9dc5265962b0b779abca5e36c4f43793b5d2d30f9e24c66d5467a0d554a SHA512 a52bd7f6e9b2e35d207d6a3f819576e8654435220034631ac26a352159fc34edd6cc49d3545f50dcbb44ea824be59dd775938c86f432226e8334c5bcc12c4f8e
@@ -33,4 +35,5 @@ EBUILD intel-microcode-20171117_p20171215.ebuild 1149 BLAKE2B 54add03072f87c0e10
 EBUILD intel-microcode-20180108-r1.ebuild 2589 BLAKE2B aa50ed2760d43058427b2f01a4d7464f4ed2539d5c9adcf45034cf6a52d36d00557c12e244eaae4dfc2ac0f0381a58f4e44f971edc2bf279e39ecf1f8b7396ba SHA512 24e62065e2a261591d765b1fd2b7097ff99ac44f973bf5e22f07ba4615293c90b79bab135de09312e78cc2c2a07ac1b857309923b4b560adf1fdfff88dcc3980
 EBUILD intel-microcode-20180108.ebuild 1328 BLAKE2B 27e9dfb4283a5ed844514b1fc0df0afe793776454fd9748fd00b68947834465a667b86e9b262a4161d142b42fef80651391fcf872857abaeef66de5492528f3c SHA512 d6a0b50abe64c41bac70172e0672442e46458789ee9fac3df39f91c66f16011f4bd639dcb3cbe236429223d4d51c581ed345e2048bfce205c98a3b05a580839b
 EBUILD intel-microcode-20180312.ebuild 2590 BLAKE2B cf489e4899380a5672e78fd5d8f81f5896dda301d1f82478301c1367839285631d0e1d90e67a676b59ff68b65823f7ff5354a7ac227866304457efab1ff98ccd SHA512 325b6917aa5415145ba1193d59b8a57b5667e0fea8fb3dd3d97bc0ad2e1172a5f161f94e660aebfee4057cb5f11dfcb3e3935bc4664b339b8250bc45510d47a3
-MISC metadata.xml 570 BLAKE2B d49b45c4dff6e9116a388c1ab183461f609d31ed2f07c9145847b1cbb30ebf54922fb2474be2947d8668f7dfa5e06f4ac2beb7ab2b39a90976901a16862a3ef9 SHA512 f0c8094b68e2cb452975b01fbdb8c32f031fe1ef26971d518245dd886d2da8ab6c058d61cb4b4b9b1cb56a754cd08c3ef3fa30e280042675fa2d8705874a763e
+EBUILD intel-microcode-20180426-r1.ebuild 4719 BLAKE2B 39885862ddf77f6d7029dc34827ecc24dad5a38ed8a715858a751b928670720105a839b60e3bed804077bf4727088e2c9a743c9132be11eda77b2f34ba1e4d4a SHA512 5e1ce72701fc5934104725b7d33b90bb76f1ee3341e4ac7ba88e798d5fc35458d77bb258733a7448ec2d12a4c81ec7159bfe8f505892262efad442b9baaa36e5
+MISC metadata.xml 670 BLAKE2B cf668e9fce0c28a0522522b983874abccf81ace0910587f759225a703c9ac3760a233d217bf6589a4b76bd42d07e40854a21b171c36bc95cfd45011babf27b2b SHA512 2d6bb1ea8f2a89193edfdf33a688128b98a5b011856374c2f8e13becce25b609f797a2037c973bd12be26314738d4369574c431485659f3fada6feec3e4181a9
diff --git a/sys-firmware/intel-microcode/intel-microcode-20180426-r1.ebuild b/sys-firmware/intel-microcode/intel-microcode-20180426-r1.ebuild
new file mode 100644
index 000000000000..29a6958681db
--- /dev/null
+++ b/sys-firmware/intel-microcode/intel-microcode-20180426-r1.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit linux-info toolchain-funcs mount-boot
+
+# Find updates by searching and clicking the first link (hopefully it's the one):
+# http://www.intel.com/content/www/us/en/search.html?keyword=Processor+Microcode+Data+File
+
+COLLECTION_SNAPSHOT="20180426"
+INTEL_SNAPSHOT="20180425"
+NUM="27776"
+DESCRIPTION="Intel IA32/IA64 microcode update data"
+HOMEPAGE="http://inertiawar.com/microcode/ https://downloadcenter.intel.com/Detail_Desc.aspx?DwnldID=${NUM}"
+SRC_URI="https://downloadmirror.intel.com/${NUM}/eng/microcode-${INTEL_SNAPSHOT}.tgz
+	https://dev.gentoo.org/~whissi/dist/intel-microcode/intel-microcode-collection-${COLLECTION_SNAPSHOT}.tar.xz"
+
+LICENSE="intel-ucode"
+SLOT="0"
+KEYWORDS=""
+IUSE="initramfs +split-ucode vanilla"
+REQUIRED_USE="|| ( initramfs split-ucode )"
+
+DEPEND="sys-apps/iucode_tool"
+RDEPEND="!<sys-apps/microcode-ctl-1.17-r2" #268586
+
+S=${WORKDIR}
+
+# Blacklist bad microcode here.
+# 0x000406f1 aka 06-4f-01 aka CPUID 406F1 require newer microcode loader
+MICROCODE_BLACKLIST_DEFAULT="-s !0x000406f1"
+MICROCODE_BLACKLIST="${MICROCODE_BLACKLIST:=${MICROCODE_BLACKLIST_DEFAULT}}"
+
+# In case we want to set some defaults ...
+MICROCODE_SIGNATURES_DEFAULT=""
+
+# Advanced users only:
+# merge with:
+# only current CPU: MICROCODE_SIGNATURES="-S"
+# only specific CPU: MICROCODE_SIGNATURES="-s 0x00000f4a -s 0x00010676"
+# exclude specific CPU: MICROCODE_SIGNATURES="-s !0x00000686"
+MICROCODE_SIGNATURES="${MICROCODE_SIGNATURES:=${MICROCODE_SIGNATURES_DEFAULT}}"
+
+pkg_pretend() {
+	if [[ "${MICROCODE_BLACKLIST}" != "${MICROCODE_BLACKLIST_DEFAULT}" ]]; then
+		ewarn "MICROCODE_BLACKLIST is set to \"${MICROCODE_BLACKLIST}\" instead of default \"${MICROCODE_BLACKLIST_DEFAULT}\". You are on your own!"
+	fi
+
+	if [[ "${MICROCODE_SIGNATURES}" != "${MICROCODE_SIGNATURES_DEFAULT}" ]]; then
+		ewarn "The user has opted in for advanced use:"
+		ewarn "MICROCODE_SIGNATURES is set to \"${MICROCODE_SIGNATURES}\" instead of default \"${MICROCODE_SIGNATURES_DEFAULT}\"!"
+	fi
+
+	use initramfs && mount-boot_pkg_pretend
+}
+
+src_prepare() {
+	default
+
+	# Prevent "invalid file format" errors from iucode_tool
+	rm -f "${S}"/intel-ucod*/list || die
+}
+
+src_install() {
+	# This will take ALL of the upstream microcode sources:
+	# - microcode.dat
+	# - intel-ucode/
+	# In some cases, they have not contained the same content (eg the directory has newer stuff).
+	MICROCODE_SRC=(
+		"${S}"/intel-ucode/
+		"${S}"/intel-ucode-with-caveats/
+	)
+
+	# Allow users who are scared about microcode updates not included in Intel's official
+	# microcode tarball to opt-out and comply with Intel marketing
+	if ! use vanilla; then
+		MICROCODE_SRC+=( "${S}"/intel-microcode-collection-${COLLECTION_SNAPSHOT} )
+	fi
+
+	opts=(
+		${MICROCODE_BLACKLIST}
+		${MICROCODE_SIGNATURES}
+		# be strict about what we are doing
+		--overwrite
+		--strict-checks
+		--no-ignore-broken
+		# we want to install latest version
+		--no-downgrade
+		# show everything we find
+		--list-all
+		# show what we selected
+		--list
+	)
+
+	# The earlyfw cpio needs to be in /boot because it must be loaded before
+	# rootfs is mounted.
+	use initramfs && dodir /boot && opts+=( --write-earlyfw="${ED%/}"/boot/intel-uc.img )
+	# split location:
+	use split-ucode && dodir /lib/firmware/intel-ucode && opts+=( --write-firmware="${ED%/}"/lib/firmware/intel-ucode )
+
+	iucode_tool \
+		"${opts[@]}" \
+		"${MICROCODE_SRC[@]}" \
+		|| die "iucode_tool ${opts[@]} ${MICROCODE_SRC[@]}"
+
+	dodoc releasenote
+}
+
+pkg_preinst() {
+	use initramfs && mount-boot_pkg_preinst
+}
+
+pkg_prerm() {
+	use initramfs && mount-boot_pkg_prerm
+}
+
+pkg_postrm() {
+	use initramfs && mount-boot_pkg_postrm
+}
+
+pkg_postinst() {
+	use initramfs && mount-boot_pkg_postinst
+
+	# We cannot give detailed information if user is affected or not:
+	# If MICROCODE_BLACKLIST wasn't modified, user can still use MICROCODE_SIGNATURES
+	# to to force a specific, otherwise blacklisted, microcode. So we
+	# only show a generic warning based on running kernel version:
+	if kernel_is -lt 4 14 34; then
+		ewarn "${P} contains microcode updates which require"
+		ewarn "additional kernel patches which aren't yet included in kernel <4.14.34."
+		ewarn "Loading such a microcode through kernel interface from an unpatched kernel"
+		ewarn "can crash your system!"
+		ewarn ""
+		ewarn "Those microcodes are blacklisted per default. However, if you have altered"
+		ewarn "MICROCODE_BLACKLIST or MICROCODE_SIGNATURES, you maybe have unintentionally"
+		ewarn "re-enabled those microcodes...!"
+		ewarn ""
+		ewarn "Check ${EROOT%/}/usr/share/doc/${P}/releasenot* if your microcode update"
+		ewarn "requires additional kernel patches or not."
+	fi
+}
diff --git a/sys-firmware/intel-microcode/metadata.xml b/sys-firmware/intel-microcode/metadata.xml
index f8bcf6658dd3..2d96b231657b 100644
--- a/sys-firmware/intel-microcode/metadata.xml
+++ b/sys-firmware/intel-microcode/metadata.xml
@@ -9,5 +9,6 @@
 	<flag name="initramfs">install a small initramfs for use with CONFIG_MICROCODE_EARLY</flag>
 	<flag name="monolithic">install the large text microcode.dat (used by older kernels via microcode_ctl)</flag>
 	<flag name="split-ucode">install the split binary ucode files (used by the kernel directly)</flag>
+	<flag name="vanilla">install only microcode updates from Intel's official microcode tarball</flag>
 </use>
 </pkgmetadata>
diff --git a/sys-freebsd/Manifest.gz b/sys-freebsd/Manifest.gz
index 7b772230f1ea..e5699a1fcdee 100644
--- a/sys-freebsd/Manifest.gz
+++ b/sys-freebsd/Manifest.gz
diff --git a/sys-freebsd/freebsd-mk-defs/Manifest b/sys-freebsd/freebsd-mk-defs/Manifest
index 03ef4c08acc0..7b3bf271db14 100644
--- a/sys-freebsd/freebsd-mk-defs/Manifest
+++ b/sys-freebsd/freebsd-mk-defs/Manifest
@@ -3,9 +3,6 @@ AUX freebsd-mk-defs-11.0-gnu.patch 1946 BLAKE2B 5d9cdff486102e88aa7e7a12ed2d6af4
 AUX freebsd-mk-defs-11.0-libproc-libcxx.patch 369 BLAKE2B fdaefd66f08bad103db14ca3b32e5898ff09587094c6460743b3034e1549777c40abf99a2537c84535df1bee5b22f8fe96d65d6afd9c951d2121ed73cf94f473 SHA512 87de2c90588bccdc2e74ee206f2ca4135fbf5a4674d8400479d5eb08575a30a5b421bb81008ae1cf577e7acbebdc951fd1bd204b7b99f2818343c3f74ed59545
 AUX freebsd-mk-defs-11.0-rename-libs.patch 478 BLAKE2B 83171c7cffbfc5a64ca0b73b3c0da30b76056df877fa8b6501992e36ec3131ae67d52e3dbfb650a081f8b7bbfa2a3d74fa5ad1c4fb7bd6f0d1b267caa203b9dc SHA512 e07091f6b91d4d02cc6db5f76e0fbddc682f594dc5b9176cf282758253eddfb03093f4ef0b0bb5c514724d6065a6a4784e518526b32a86c7b344f43cb1e56ec2
 AUX freebsd-mk-defs-11.1-gentoo.patch 12921 BLAKE2B 1a0e8c098e6ccd6294bd02c3b8cf50faa69b3ae47f00b2fb20b3078439b2f5170d2f9e488fddbeaaf2c06a32355dd4ed563ecfc0854cc32736edf367be932355 SHA512 5253780ce30522f90d7c6ba7292333e3e8edf7a295042f954dd70d3b0806a0cea16f8f6eb0fc9bd9e60d6d191569b4e4248d96b114c5133832c5a1c5e3a50339
-AUX freebsd-mk-defs-9.1-gentoo.patch 11769 BLAKE2B 5a6f3ce6c84049cb876db85e69e7428a66473de2244ee299a0e6abf921fd7c4d0c4e412fd73e44581fa168ed635f49bac36bd4f73f94113b22c9bb02259a8705 SHA512 2ac2f700b168905df79b8a4c43fb7893ba752fa95b9d55bf0924602903ea5fdd6e4510b89a212dac70dd208ce24928eb202891f932a69507695d49ba59c4c6fe
-AUX freebsd-mk-defs-9.1-gnu.patch 2273 BLAKE2B c74563cbf039bbb3377bbea7e47affe540d756a0ef15ddfca60cf7f889b51b943cbad01bc0fc9ce1fb7783777a8bba1b5b1d82cfe6079bfb30dde6e9dc1e5491 SHA512 b1537d3c9dcac78de5ddc026b1281887f755990a4a164e9f05cee53acfc1d7f2674ab1dfb4345b3862bdf971d9403e677e0900fb64a4e7b200c38b8d06c64fbd
-AUX freebsd-mk-defs-add-nossp-cflags.patch 1017 BLAKE2B 2093435dece5cfc8dbbcd1035ee4930c7b30d35b5450f7548c3fa9e34e6ac451731cd4f93c8acd3ba045150ba5674ea557ed7c1e8c79fa2fef1d3627c44afac5 SHA512 012897f4f4b4c3f71d1288ab57adeed56d7f399e508cfa4f593a1f787443e3e4752f7002c86f5da65952ac57eb908d0cce751d7b029048b1c70a9b3c79bea913
 DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca
 EBUILD freebsd-mk-defs-11.1.ebuild 1136 BLAKE2B ffd94b408344303a33c949098cb8bf7084255cfe8adaf4f3bfb5d31a0907c37fb05596f955dd21ac0012c84a836c16267608b5083b343f187f16f1b622e4f4bb SHA512 645fff46a41d3c00ffb966139d58f2e46a6bedabbd163692300fa46bd7cf956d75dd5a7a41b733f7a6eb7743a2049de038a2c9484671a1a0d861dd2bab34b544
 MISC metadata.xml 238 BLAKE2B 5d18b211ca67cdae4e0f4d6e1598b20b39a471aa07326791c53bb4e1013607b85bac28a64c1939e53b01228d0c9b7814314b95c0f76928de265d95ef7ee6cd45 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.1-gentoo.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.1-gentoo.patch
deleted file mode 100644
index 598d0b9145b4..000000000000
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.1-gentoo.patch
+++ /dev/null
@@ -1,326 +0,0 @@
-diff -Nur share.orig/mk/bsd.doc.mk share/mk/bsd.doc.mk
---- share.orig/mk/bsd.doc.mk	2012-07-12 13:25:44.000000000 +0900
-+++ share/mk/bsd.doc.mk	2012-07-16 00:01:55.000000000 +0900
-@@ -135,10 +135,12 @@
- realinstall:
- .for _dev in ${PRINTERDEVICE:Mhtml}
- 	cd ${SRCDIR}; \
-+	    ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}; \
- 	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
- 	    ${DOC}*.html ${DESTDIR}${BINDIR}/${VOLUME}
- .endfor
- .for _dev in ${PRINTERDEVICE:Nhtml}
-+	${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}; \
- 	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
- 	    ${DFILE.${_dev}} ${DESTDIR}${BINDIR}/${VOLUME}
- .endfor
-diff -Nur share.orig/mk/bsd.files.mk share/mk/bsd.files.mk
---- share.orig/mk/bsd.files.mk	2012-07-12 13:25:44.000000000 +0900
-+++ share/mk/bsd.files.mk	2012-07-16 00:01:55.000000000 +0900
-@@ -39,6 +39,7 @@
- .endif
- installfiles: _${group}INS_${file:T}
- _${group}INS_${file:T}: ${file}
-+	${INSTALL} -d ${DESTDIR}${${group}DIR_${.ALLSRC:T}}
- 	${INSTALL} -o ${${group}OWN_${.ALLSRC:T}} \
- 	    -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
- 	    ${.ALLSRC} \
-@@ -51,10 +52,12 @@
- installfiles: _${group}INS
- _${group}INS: ${_${group}FILES}
- .if defined(${group}NAME)
-+	${INSTALL} -d ${DESTDIR}${${group}DIR}/${${group}NAME}
- 	${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \
- 	    -m ${${group}MODE} ${.ALLSRC} \
- 	    ${DESTDIR}${${group}DIR}/${${group}NAME}
- .else
-+	${INSTALL} -d ${DESTDIR}${${group}DIR}
- 	${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \
- 	    -m ${${group}MODE} ${.ALLSRC} ${DESTDIR}${${group}DIR}
- .endif
-diff -Nur share.orig/mk/bsd.incs.mk share/mk/bsd.incs.mk
---- share.orig/mk/bsd.incs.mk	2012-07-12 13:25:44.000000000 +0900
-+++ share/mk/bsd.incs.mk	2012-07-16 00:01:55.000000000 +0900
-@@ -41,6 +41,9 @@
- .endif
- installincludes: _${group}INS_${header:T}
- _${group}INS_${header:T}: ${header}
-+	${INSTALL} -d -o ${${group}OWN_${.ALLSRC:T}} \
-+		 -g ${${group}GRP_${.ALLSRC:T}} \
-+		 ${DESTDIR}${${group}DIR_${.ALLSRC:T}}
- 	${INSTALL} -C -o ${${group}OWN_${.ALLSRC:T}} \
- 	    -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
- 	    ${.ALLSRC} \
-@@ -53,9 +56,13 @@
- installincludes: _${group}INS
- _${group}INS: ${_${group}INCS}
- .if defined(${group}NAME)
-+	${INSTALL} -d -o ${${group}OWN} -g ${${group}GRP} \
-+		${DESTDIR}${${group}DIR}
- 	${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
- 	    ${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME}
- .else
-+	${INSTALL} -d -o ${${group}OWN} -g ${${group}GRP} \
-+		${DESTDIR}${${group}DIR}
- 	${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
- 	    ${.ALLSRC} ${DESTDIR}${${group}DIR}
- .endif
-diff -Nur share.orig/mk/bsd.info.mk share/mk/bsd.info.mk
---- share.orig/mk/bsd.info.mk	2012-07-12 13:25:44.000000000 +0900
-+++ share/mk/bsd.info.mk	2012-07-16 00:01:55.000000000 +0900
-@@ -83,6 +83,7 @@
- TEX?=		tex
- DVIPS?=		dvips
- DVIPS2ASCII?=	dvips2ascii
-+INSTALL?=	install
- 
- .SUFFIXES: ${ICOMPRESS_EXT} .info .texi .texinfo .dvi .ps .latin1 .html
- 
-@@ -144,15 +145,17 @@
- INSTALLINFODIRS+= ${x:S/$/-install/}
- ${x:S/$/-install/}:
- .if !empty(.MAKEFLAGS:M-j)
-+	${INSTALL} -d ${DESTDIR}${INFODIR}
- 	lockf -k ${DESTDIR}${INFODIR}/${INFODIRFILE} \
- 	${INSTALLINFO} ${INSTALLINFOFLAGS} \
--	    --defsection=${INFOSECTION} \
--	    --defentry=${INFOENTRY_${x}} \
-+	    --section=${INFOSECTION} \
-+	    --entry=${INFOENTRY_${x}} \
- 	    ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE}
- .else
-+	${INSTALL} -d ${DESTDIR}${INFODIR}
- 	${INSTALLINFO} ${INSTALLINFOFLAGS} \
--	    --defsection=${INFOSECTION} \
--	    --defentry=${INFOENTRY_${x}} \
-+	    --section=${INFOSECTION} \
-+	    --entry=${INFOENTRY_${x}} \
- 	    ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE}
- .endif
- .endfor
-diff -Nur share.orig/mk/bsd.lib.mk share/mk/bsd.lib.mk
---- share.orig/mk/bsd.lib.mk	2012-07-12 13:25:44.000000000 +0900
-+++ share/mk/bsd.lib.mk	2012-07-16 00:01:55.000000000 +0900
-@@ -46,10 +46,6 @@
- .endif
- .endif
- 
--.if !defined(DEBUG_FLAGS)
--STRIP?=	-s
--.endif
--
- .include <bsd.libnames.mk>
- 
- # prefer .s to a .c, add .po, remove stuff not used in the BSD libraries
-@@ -284,14 +280,17 @@
- .ORDER: beforeinstall _libinstall
- _libinstall:
- .if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no"
-+	${INSTALL} -d ${DESTDIR}${LIBDIR}
- 	${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- 	    ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${LIBDIR}
- .endif
- .if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB)
-+	${INSTALL} -d ${DESTDIR}${LIBDIR}
- 	${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- 	    ${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${LIBDIR}
- .endif
- .if defined(SHLIB_NAME)
-+	${INSTALL} -d ${DESTDIR}${SHLIBDIR}
- 	${INSTALL} ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- 	    ${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \
- 	    ${SHLIB_NAME} ${DESTDIR}${SHLIBDIR}
-@@ -329,10 +328,12 @@
- .endif # SHLIB_LINK
- .endif # SHIB_NAME
- .if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) && ${MK_TOOLCHAIN} != "no"
-+	${INSTALL} -d ${DESTDIR}${LIBDIR}
- 	${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- 	    ${_INSTALLFLAGS} lib${LIB}_pic.a ${DESTDIR}${LIBDIR}
- .endif
- .if defined(WANT_LINT) && !defined(NO_LINT) && defined(LIB) && !empty(LIB)
-+	${INSTALL} -d ${DESTDIR}${LINTLIBDIR}
- 	${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- 	    ${_INSTALLFLAGS} ${LINTLIB} ${DESTDIR}${LINTLIBDIR}
- .endif
-diff -Nur share.orig/mk/bsd.libnames.mk share/mk/bsd.libnames.mk
---- share.orig/mk/bsd.libnames.mk	2012-07-12 13:25:44.000000000 +0900
-+++ share/mk/bsd.libnames.mk	2012-07-16 00:01:55.000000000 +0900
-@@ -48,7 +48,7 @@
- LIBEDIT?=	${DESTDIR}${LIBDIR}/libedit.a
- LIBELF?=	${DESTDIR}${LIBDIR}/libelf.a
- LIBFETCH?=	${DESTDIR}${LIBDIR}/libfetch.a
--LIBFL?=		"don't use LIBFL, use LIBL"
-+LIBFL?=		${DESTDIR}${LIBDIR}/libfl.a
- LIBFORM?=	${DESTDIR}${LIBDIR}/libform.a
- LIBFTPIO?=	${DESTDIR}${LIBDIR}/libftpio.a
- LIBG2C?=	${DESTDIR}${LIBDIR}/libg2c.a
-@@ -79,7 +79,7 @@
- LIBKICONV?=	${DESTDIR}${LIBDIR}/libkiconv.a
- LIBKRB5?=	${DESTDIR}${LIBDIR}/libkrb5.a
- LIBKVM?=	${DESTDIR}${LIBDIR}/libkvm.a
--LIBL?=		${DESTDIR}${LIBDIR}/libl.a
-+LIBL?=		${DESTDIR}${LIBDIR}/libfl.a
- LIBLN?=		"don't use LIBLN, use LIBL"
- .if ${MK_BIND} != "no"
- LIBLWRES?=	${DESTDIR}${LIBDIR}/liblwres.a
-diff -Nur share.orig/mk/bsd.links.mk share/mk/bsd.links.mk
---- share.orig/mk/bsd.links.mk	2012-07-12 13:25:44.000000000 +0900
-+++ share/mk/bsd.links.mk	2012-07-16 00:01:55.000000000 +0900
-@@ -15,6 +15,8 @@
- 		t=${DESTDIR}$$1; \
- 		shift; \
- 		${ECHO} $$t -\> $$l; \
-+		d=`dirname $$t`; \
-+		test -d $$d || mkdir $$d; \
- 		ln -f $$l $$t; \
- 	done; true
- .endif
-@@ -26,6 +28,8 @@
- 		t=${DESTDIR}$$1; \
- 		shift; \
- 		${ECHO} $$t -\> $$l; \
-+		d=`dirname $$t`; \
-+		test -d $$d || mkdir $$d; \
- 		ln -fs $$l $$t; \
- 	done; true
- .endif
-diff -Nur share.orig/mk/bsd.man.mk share/mk/bsd.man.mk
---- share.orig/mk/bsd.man.mk	2012-07-12 13:25:44.000000000 +0900
-+++ share/mk/bsd.man.mk	2012-07-16 00:01:55.000000000 +0900
-@@ -165,9 +165,11 @@
- .if defined(NO_MANCOMPRESS)
- .if defined(MANFILTER)
- .for __page in ${MAN}
-+	${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}/${page}
- 	${MINSTALL} ${__page:T:S/$/${FILTEXTENSION}/g} \
- 		${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR}/${__page}
- .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
-+	${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page}
- 	${MINSTALL} ${__page:T:S/$/${CATEXT}${FILTEXTENSION}/g} \
- 		${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page}
- .endif
-@@ -181,11 +183,14 @@
- 		esac; \
- 		page=$$1; shift; sect=$$1; shift; \
- 		d=${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}; \
-+		${ECHO} ${INSTALL} -d $${d}; \
-+		${INSTALL} -d $${d}; \
- 		${ECHO} ${MINSTALL} $${page} $${d}; \
- 		${MINSTALL} $${page} $${d}; \
- 	done
- .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
- .for __page in ${MAN}
-+	${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T}
- 	${MINSTALL} ${__page:T:S/$/${CATEXT}/} \
- 		${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T}
- .endfor
-@@ -193,9 +198,11 @@
- .endif
- .else
- .for __page in ${MAN}
-+	${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}
- 	${MINSTALL} ${__page:T:S/$/${MCOMPRESS_EXT}/g} \
- 		${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR}
- .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
-+	${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T:S/$/${MCOMPRESS_EXT}
- 	${MINSTALL} ${__page:T:S/$/${CATEXT}${MCOMPRESS_EXT}/g} \
- 		${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T:S/$/${MCOMPRESS_EXT}/}
- .endif
-diff -Nur share.orig/mk/bsd.nls.mk share/mk/bsd.nls.mk
---- share.orig/mk/bsd.nls.mk	2012-07-12 13:25:44.000000000 +0900
-+++ share/mk/bsd.nls.mk	2012-07-16 00:01:55.000000000 +0900
-@@ -62,7 +62,8 @@
- # installation rules
- #
- .for file in ${NLS}
--NLSNAME_${file:T}= ${file:T:R}/${NLSNAME}.cat
-+NLSDIR_${file:T}= ${SHAREDIR}/nls/${file:T:R}/
-+NLSNAME_${file:T}= ${NLSNAME}.cat
- .if defined(NLSLINKS_${file:R}) && !empty(NLSLINKS_${file:R})
- NLSLINKS+=	${file:R}
- .endif
-diff -Nur share.orig/mk/bsd.own.mk share/mk/bsd.own.mk
---- share.orig/mk/bsd.own.mk	2012-07-12 13:25:44.000000000 +0900
-+++ share/mk/bsd.own.mk	2012-07-16 00:01:55.000000000 +0900
-@@ -182,9 +182,6 @@
- INCLUDEDIR?=	/usr/include
- 
- # Common variables
--.if !defined(DEBUG_FLAGS)
--STRIP?=		-s
--.endif
- 
- COMPRESS_CMD?=	gzip -cn
- COMPRESS_EXT?=	.gz
-diff -Nur share.orig/mk/bsd.prog.mk share/mk/bsd.prog.mk
---- share.orig/mk/bsd.prog.mk	2012-07-12 13:25:44.000000000 +0900
-+++ share/mk/bsd.prog.mk	2012-07-16 00:01:55.000000000 +0900
-@@ -33,10 +33,6 @@
- CFLAGS+=${CRUNCH_CFLAGS}
- .endif
- 
--.if !defined(DEBUG_FLAGS)
--STRIP?=	-s
--.endif
--
- .if defined(NO_SHARED) && (${NO_SHARED} != "no" && ${NO_SHARED} != "NO")
- LDFLAGS+= -static
- .endif
-@@ -155,6 +151,7 @@
- .ORDER: beforeinstall _proginstall
- _proginstall:
- .if defined(PROG)
-+	${INSTALL} -d ${DESTDIR}${BINDIR}
- .if defined(PROGNAME)
- 	${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
- 	    ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME}
-@@ -186,6 +183,7 @@
- SCRIPTSMODE_${script:T}?=	${SCRIPTSMODE}
- _scriptsinstall: _SCRIPTSINS_${script:T}
- _SCRIPTSINS_${script:T}: ${script}
-+	${INSTALL} -d ${DESTDIR}${SCRIPTSDIR_${.ALLSRC:T}}
- 	${INSTALL} -o ${SCRIPTSOWN_${.ALLSRC:T}} \
- 	    -g ${SCRIPTSGRP_${.ALLSRC:T}} -m ${SCRIPTSMODE_${.ALLSRC:T}} \
- 	    ${.ALLSRC} \
-diff -Nur share.orig/mk/bsd.sys.mk share/mk/bsd.sys.mk
---- share.orig/mk/bsd.sys.mk	2012-07-12 13:25:44.000000000 +0900
-+++ share/mk/bsd.sys.mk	2012-07-16 00:04:14.000000000 +0900
-@@ -28,10 +28,6 @@
- .if defined(WARNS)
- .if ${WARNS} >= 1
- CWARNFLAGS+=	-Wsystem-headers
--.if !defined(NO_WERROR) && ((${MK_CLANG_IS_CC} == "no" && \
--    ${CC:T:Mclang} != "clang") || !defined(NO_WERROR.clang))
--CWARNFLAGS+=	-Werror
--.endif # !NO_WERROR && (!CLANG || !NO_WERROR.clang)
- .endif # WARNS >= 1
- .if ${WARNS} >= 2
- CWARNFLAGS+=	-Wall -Wno-format-y2k
-@@ -95,10 +91,6 @@
- CWARNFLAGS+=	-Wno-format-nonliteral
- .endif # WARNS <= 3
- .endif # CLANG
--.if !defined(NO_WERROR) && ((${MK_CLANG_IS_CC} == "no" && \
--    ${CC:T:Mclang} != "clang") || !defined(NO_WERROR.clang))
--CWARNFLAGS+=	-Werror
--.endif # !NO_WERROR && (!CLANG || !NO_WERROR.clang)
- .endif # WFORMAT > 0
- .endif # WFORMAT
- .if defined(NO_WFORMAT) || ((${MK_CLANG_IS_CC} != "no" || \
-diff -Nur share.orig/mk/sys.mk share/mk/sys.mk
---- share.orig/mk/sys.mk	2012-07-12 13:25:44.000000000 +0900
-+++ share/mk/sys.mk	2012-07-16 00:01:55.000000000 +0900
-@@ -349,12 +349,6 @@
- 		(${ECHO} ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} && \
- 		${CTFCONVERT} ${CTFFLAGS} ${.TARGET})
- 
--# FreeBSD build pollution.  Hide it in the non-POSIX part of the ifdef.
--__MAKE_CONF?=/etc/make.conf
--.if exists(${__MAKE_CONF})
--.include "${__MAKE_CONF}"
--.endif
--
- .if defined(__MAKE_SHELL) && !empty(__MAKE_SHELL)
- SHELL=	${__MAKE_SHELL}
- .SHELL: path=${__MAKE_SHELL}
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.1-gnu.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.1-gnu.patch
deleted file mode 100644
index f986ed9c3e11..000000000000
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.1-gnu.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff -Nur share.orig/mk/bsd.lib.mk share/mk/bsd.lib.mk
---- share.orig/mk/bsd.lib.mk	2012-07-16 02:40:07.000000000 +0900
-+++ share/mk/bsd.lib.mk	2012-07-16 02:41:40.000000000 +0900
-@@ -155,11 +155,7 @@
- lib${LIB}.a: ${OBJS} ${STATICOBJS}
- 	@${ECHO} building static ${LIB} library
- 	@rm -f ${.TARGET}
--.if !defined(NM)
--	@${AR} cq ${.TARGET} `lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD}
--.else
--	@${AR} cq ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD}
--.endif
-+	@${AR} cq ${.TARGET} ${OBJS} ${STATICOBJS} ${ARADD}
- 	${RANLIB} ${.TARGET}
- .endif
- 
-@@ -172,11 +168,7 @@
- lib${LIB}_p.a: ${POBJS}
- 	@${ECHO} building profiled ${LIB} library
- 	@rm -f ${.TARGET}
--.if !defined(NM)
--	@${AR} cq ${.TARGET} `lorder ${POBJS} | tsort -q` ${ARADD}
--.else
--	@${AR} cq ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort -q` ${ARADD}
--.endif
-+	@${AR} cq ${.TARGET} ${POBJS} ${ARADD}
- 	${RANLIB} ${.TARGET}
- .endif
- 
-@@ -203,15 +195,9 @@
- .if defined(SHLIB_LINK)
- 	@ln -fs ${.TARGET} ${SHLIB_LINK}
- .endif
--.if !defined(NM)
- 	@${CC} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \
- 	    -o ${.TARGET} -Wl,-soname,${SONAME} \
--	    `lorder ${SOBJS} | tsort -q` ${LDADD}
--.else
--	@${CC} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \
--	    -o ${.TARGET} -Wl,-soname,${SONAME} \
--	    `NM='${NM}' lorder ${SOBJS} | tsort -q` ${LDADD}
--.endif
-+	    `echo ${SOBJS} | xargs -n 1 echo | sort -u` ${LDADD}
- 	@[ -z "${CTFMERGE}" -o -n "${NO_CTF}" ] || \
- 		(${ECHO} ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS} && \
- 		${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS})
-@@ -259,13 +245,6 @@
- 
- .if !target(install)
- 
--.if defined(PRECIOUSLIB)
--.if !defined(NO_FSCHG)
--SHLINSTALLFLAGS+= -fschg
--.endif
--SHLINSTALLFLAGS+= -S
--.endif
--
- _INSTALLFLAGS:=	${INSTALLFLAGS}
- .for ie in ${INSTALLFLAGS_EDIT}
- _INSTALLFLAGS:=	${_INSTALLFLAGS${ie}}
-diff -Nur share.orig/mk/bsd.prog.mk share/mk/bsd.prog.mk
---- share.orig/mk/bsd.prog.mk	2012-07-16 02:40:07.000000000 +0900
-+++ share/mk/bsd.prog.mk	2012-07-16 02:40:24.000000000 +0900
-@@ -134,13 +134,6 @@
- 
- .if !target(install)
- 
--.if defined(PRECIOUSPROG)
--.if !defined(NO_FSCHG)
--INSTALLFLAGS+= -fschg
--.endif
--INSTALLFLAGS+= -S
--.endif
--
- _INSTALLFLAGS:=	${INSTALLFLAGS}
- .for ie in ${INSTALLFLAGS_EDIT}
- _INSTALLFLAGS:=	${_INSTALLFLAGS${ie}}
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-add-nossp-cflags.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-add-nossp-cflags.patch
deleted file mode 100644
index 8eb80c38cc7a..000000000000
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-add-nossp-cflags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=511698
-
-diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk
-index e438633..de4a05b 100644
---- a/share/mk/bsd.sys.mk
-+++ b/share/mk/bsd.sys.mk
-@@ -111,12 +111,18 @@ CLANG_OPT_SMALL= -mstack-alignment=8 -mllvm -inline-threshold=3\
- CFLAGS+=	 -Qunused-arguments
- .endif # CLANG
- 
--.if ${MK_SSP} != "no" && ${MACHINE_CPUARCH} != "ia64" && \
--    ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips"
-+.if ${MACHINE_CPUARCH} != "ia64" && ${MACHINE_CPUARCH} != "arm" \
-+    && ${MACHINE_CPUARCH} != "mips"
-+.if ${MK_SSP} != "no"
- # Don't use -Wstack-protector as it breaks world with -Werror.
- SSP_CFLAGS?=	-fstack-protector
-+.else
-+# gcc-4.9, -fstack-protector-strong is enabled by default.
-+# Add -fno-stack-protector to disable it. Gentoo Bug #511698.
-+SSP_CFLAGS=	-fno-stack-protector
-+.endif #SSP
- CFLAGS+=	${SSP_CFLAGS}
--.endif # SSP && !IA64 && !ARM && !MIPS
-+.endif # !IA64 && !ARM && !MIPS
- 
- # Allow user-specified additional warning flags
- CFLAGS+=	${CWARNFLAGS}
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 3208a08a514f..b9df6f0e9c51 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index 4568d135393e..dd70b53a2581 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -10,7 +10,7 @@ DIST e2fsprogs-1.43.9.tar.gz 7470878 BLAKE2B dcc1a6fda87884a0b3b1d49f4116be060bf
 DIST e2fsprogs-1.44.1.tar.gz 7534979 BLAKE2B 1d1dcdfebca41d62bb15e0b0464bcfc848b8c1379f89987f91a59093d497536ccd5e80be67419cad05daf694be1629774f881d026ef834e3a61b00dc64f3543b SHA512 acd612a5146e4a07aa7ab3ef1b38c3ef3f27120f65c519dd02d44e48e5814c86d013315eb30c4f08edecaef6f08f0ec0b91fa133ea9dbd769ee29be3f2ae17c9
 DIST e2fsprogs-1.44.2.tar.gz 7562398 BLAKE2B a828cb9f5f3ee1579a2c5b29ef0eaf0e5696e2bf27a639cf1bf27b8d334bbbd1d142588e53e359934338f2ec95d06343a42b7c2fbd44dd6e01b348958aae3189 SHA512 d416e14a69f3e2e4ea2f4563764c422cc63400bcd514ddb12ebda6456ef04cff523da215664ede1329183acc22246111016e1abd92ff604a23e015e066dd379a
 EBUILD e2fsprogs-1.43.6.ebuild 3795 BLAKE2B e806ec2e72188d2e4c36b214ccac4ec18ae4e3f605e34de4a12e91935fce411d32e4caafbb0495e8d437b7700792a39447402b3e987b018354c0706b01db4573 SHA512 d2c1db96d10631d7bfa30daff720f712c423dc8bea2f2d869feb4c85b23fa368afbce0617632fabadc2085aeb33ea93f8973ec016826e29638c69e41f1bbecb3
-EBUILD e2fsprogs-1.43.9.ebuild 3822 BLAKE2B abcf38d42e097a8d6c6eaa7f15ea5a57409f7cca1c89377b75199f6bb509bd79233219e9c4a0a807a6b1f84caad46edc084795ee8f78981fb2aed14fe3c2b31e SHA512 e9e64c79dcf144a203b779dd316d41cd6b7ef5448464046c832673676ebdb667d8ba70816285b3a0033fd25e6fa12bc0a6f3eac4f173b0f32657fe950ce69c5c
+EBUILD e2fsprogs-1.43.9.ebuild 3820 BLAKE2B 8af84ab9babf5ad3f8de298b543e25cb24cfae45bf6fa5f8965c2618a5660be94dfdfe34b31ff20eb266a5107419c633a1e4c03236e71f81d58bcd9d0e913052 SHA512 4cc629109812f4d7716f256e1edd176f567e26e85bb356dfe35fa7190df1672cf3d9162603630df67f217a329d2863a61518702c22eccded68c9412b1e46e92f
 EBUILD e2fsprogs-1.44.1.ebuild 3827 BLAKE2B 71bb5aef6c6f5ab2b1fc288821cdeab9f4ba067e481a80115042fd9c2624082a6b9a1dc8fa399071cf85937a451d47ffe007e46d51ab03742bb5fda266ee23e6 SHA512 89086e25c804f89bdd84a870c28e90dd7bb32de1cc4a891fb58f08c3566a53dafada3d65814612e7c0b1d1a34d8ee41de883037da00127a1bc7d769ae47bd9ab
 EBUILD e2fsprogs-1.44.2.ebuild 3827 BLAKE2B 71bb5aef6c6f5ab2b1fc288821cdeab9f4ba067e481a80115042fd9c2624082a6b9a1dc8fa399071cf85937a451d47ffe007e46d51ab03742bb5fda266ee23e6 SHA512 89086e25c804f89bdd84a870c28e90dd7bb32de1cc4a891fb58f08c3566a53dafada3d65814612e7c0b1d1a34d8ee41de883037da00127a1bc7d769ae47bd9ab
 MISC metadata.xml 520 BLAKE2B 3e908938de1132b5cde97c6b51b40f72c03e91301b54c14339379d2e2380414dd33096a87d64ff2fc7d886cd65fb16b9c16a376b7338c826f44917860f380be2 SHA512 a5ff91610ed175147f1a9c2c725a30380908c02fc04c6b7df2792cb4fd805f9137374d2a910e456128a7bf2fec9e83af3063bcb5f2ad51394bed8bed648e3905
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.43.9.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.43.9.ebuild
index f73efe2b94da..45aa9b9ace6d 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.43.9.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.43.9.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint"
 IUSE="fuse nls static-libs elibc_FreeBSD"
 
 RDEPEND="~sys-libs/${PN}-libs-${PV}
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 123bbb443333..548782d4f9e2 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -11,6 +11,6 @@ EBUILD udev-216.ebuild 15081 BLAKE2B adc66d5478de63a817c208832802557672c072368d9
 EBUILD udev-225-r1.ebuild 13436 BLAKE2B 551c495815193eeaf89dd70e1b0d969bb717200f18eedd241b6a308cbfe62388c5fb9bcd801597482f5c4f8451475c61b628b4f38de1df01d62a7cce11361cfb SHA512 b3310daf82972b710c37a6ee25776369bc09beac4926ea056d73421bd01627f93c2aaacdb2bd2b0819989629d82eea619d475ae4c6cd4179be2201cf7ec632a7
 EBUILD udev-233.ebuild 12904 BLAKE2B 53e3f5f68bf504acf0085f5e957894c1a3462bdcf8282e2399787a6d2ccf0a3b409116cbac5a3df22432d7576604807c8400755102731031416e9cec3a899fca SHA512 d7bc4f8d9c68ce67b25de78669301b39816c1ab2221e498dcf27c80c62466db99db32581648e5aab79fd960989c498cd035794c3f80666c388d363e6a9628c9c
 EBUILD udev-236-r1.ebuild 10048 BLAKE2B cd7b1f1b4edaf2dec245c9b00e1f19af56e3f4b21f6de1535f062d9deaa16107efc9f873dc50928604562da3c8877cdfff70c5489bec15cbcfa952b9bf4ff8ca SHA512 e6dca2f55c992a025cefc67b06df09d402fdd8438cfd819419a70de6ea2b26e58e380781aa66f0d63bf682b4500ab94f6b552117969851ddd892bb8a6415f4ee
-EBUILD udev-238.ebuild 9601 BLAKE2B cb7da683b5b6ee3d0c3b12dc5a9cadf421ea8116d091f17944889415ce78a6a5680c3600f6f74a04d627dcc02631199228533e9d5162d2ebb85c0c5f968f6e3d SHA512 9c135e89847c33e8ec82b080d92799c8f20af01fcbb66b6a453e361cb2bdb42423412848499cce82a2d957b3e42e7740d12b3abe16de86e95235ced89c27866b
+EBUILD udev-238.ebuild 9596 BLAKE2B 84589152b087db240b47d2e632a996fc7231b9f578a885c19f86fdf7b4dbf3446cbf2e21e65d876435a60cfb6d9da7f5b64f22c1dde545f5b2647f6246704b47 SHA512 75bbba68a7f89f75d3cc3e03b33a6c6dd37cfb8aee297b2f0bb70b32ccca77de704ac140adc33e94ad20d94ebc66deef15e707951e050f2070c2a628ae62fe2e
 EBUILD udev-9999.ebuild 9607 BLAKE2B c175d2eed5f59f08225701dab78983864208fb1fd2a4a2d2dd6ba90d35cbc7ecb3b39929ceae89e845433d8261845fbd773f01321c0f32434594bc7f65453920 SHA512 3593e0e706fb81c82a3f031580e338d85cdbc0bf48b4c86c4466041a9ab6c4a2e4b91e35ded2ea7e104f65a3dd28728f5169fccbc9d570eb4f5284de2fe978f5
 MISC metadata.xml 680 BLAKE2B 3f6b21eff391977d69921da6eeb7f48ae6c706dd856e12c4b0126f0db4ced358925374bed23d950d957a58b5447e087ad98301aa1f75dd140a1cd816ef1d2426 SHA512 2e90cdfb013904211fba8404c6b96ad940dfaea05eebe7592e3fa185dec9b16b738cc7661fd466990788accf8c261a596bcb08477e879e0e18fcc91cdce65c5e
diff --git a/sys-fs/udev/udev-238.ebuild b/sys-fs/udev/udev-238.ebuild
index fdab7e738b48..757ea0518094 100644
--- a/sys-fs/udev/udev-238.ebuild
+++ b/sys-fs/udev/udev-238.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${PV}.tar.gz"
-	KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86"
+	KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 fi
 
 DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 1828ba6c5ffd..2c838640e7b7 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/ck-sources/Manifest b/sys-kernel/ck-sources/Manifest
index 0b29faf4f8a1..8e23375843fe 100644
--- a/sys-kernel/ck-sources/Manifest
+++ b/sys-kernel/ck-sources/Manifest
@@ -23,6 +23,9 @@ DIST genpatches-4.14-46.extras.tar.xz 17496 BLAKE2B c7fca4b94f96e36704f4f7aea0da
 DIST genpatches-4.14-47.base.tar.xz 1200752 BLAKE2B 4e52afb8c85a9d2f162dec0d0e6ef557a66a6b899d47fd7578a350d65ad30bab32daa514d1305cf3a7faf66ce43f74c6a4525c8b987846bc92c2ec14405ec9cf SHA512 c2a46c73d999a199b406a712e79b74d1c33c1a3d0963d43a69f8fd32b9e52beb715867cd064639c842f2395993e789de42b18973932a042061be03957ee81b1a
 DIST genpatches-4.14-47.experimental.tar.xz 5184 BLAKE2B 12a3437d97cd8f7779e158f6e376ba41cada33db4fdbad8c803baaba01e5e459738b155fec1352e3354020f5b43846bb479fe2682dee5fa296d498e41b67af58 SHA512 885fc8f8b127f792426b575dc87d4c8d5655ef514eee7d8a77e065415db674fd995f6eb91c0f23ad0f03a26b01dfa67f2d474bd5a8e7753922cb9387be2d184c
 DIST genpatches-4.14-47.extras.tar.xz 17504 BLAKE2B 5f364e68c663c7ef6d5bf5cded7fc304d806adde306d25294996063efc6c9d3134e4d8da1839cc4fccb2da4d0781b2a9ab926351ce6bf4b4c0bae9cd955233b4 SHA512 6d17fdfa3228377120147e43f7a53700c8d3f25c6f2a09c82818558bce493e09db4a7405c42f1b4697a4424ababc607128d98d88301f825a266c802fd18cd78c
+DIST genpatches-4.14-48.base.tar.xz 1222408 BLAKE2B 8870bd2081a385e3243c18e96a9a89c768c196bcc54e188f1793bfd48f29e8994beb0b787f38b14db2ed459aa53845074fb5ddaf3bed4d6e39f32b479b0651ba SHA512 e4c4a84feecf0fbd8392fa3981d7276aee2f40aad3a2568598146e935973432670a7f3c32fda09f4bfc17ee5273fd0a7e0b6fd2f4531a10336169586da085640
+DIST genpatches-4.14-48.experimental.tar.xz 5184 BLAKE2B e0fe9fcdb7c1f5e648791a3e686871f2c2951786092a8ebf97b84bb79e80521e3baabbe4a0537b72c2bf5641b2cc292da0853b46124c46bc69b106e61bed1e3b SHA512 d845805a394c93ae5d0ecf22a4c9902fd2d3b1382fd791b0431b5ebead9d3e580759c76a1c95b63f444b8246437dec300a79341049d2573ecd4af060e7fc1f4d
+DIST genpatches-4.14-48.extras.tar.xz 17496 BLAKE2B c7fca4b94f96e36704f4f7aea0daac855515544d54a286dc90791e8318ef172771665ce132872351da9e26a0231f0b3e356cf9380c59ea52358ece117a23157e SHA512 eba699a9b0615b096358e967c1ee68989f1374ba9a4f281f232aca8ea459b30446551346a081b4a61067a4e94fedfbe2e470708801a4e9bc3049b69f6558fa14
 DIST genpatches-4.15-20.base.tar.xz 464468 BLAKE2B b3c30e02819663b31b4ed83794d57c4521fe13015a4419088664f017f4753117bbc88a5600e310092d8eaf8b132b0757d59fb7b503abef046db0249ed7ae96e6 SHA512 cf79c85b65f3a68d3d721d2425fb6e498df808097bd8b1c610023d0c36c0378ec0f92d33ee0dc39592730d87f4a1df52931ea9608be2d56d5543a201f9d1d658
 DIST genpatches-4.15-20.experimental.tar.xz 5184 BLAKE2B 96ab38624869b7ca2caddceea1be6701c6a9df489dda0be4736765a6546909d522f5b32a44506875270485606797357bf44e044ed61ee40f6171670a5956bdbb SHA512 673083672ca1758f0b3dcc4507bd18c3ea1c024c86f1f8e0bcafe6117f33e226ad981fa123f1b3317858b93f5a17b5f56924e5e5eefb6c0980fc8572626010da
 DIST genpatches-4.15-20.extras.tar.xz 17492 BLAKE2B a610729f55d64e3ef6dee6129879f5ae27f31bb2738b0d8d3270f3502eaa19024323a741f0ac3325ba72342ae9e3c7fc9b4dbd56f8763a4be29e825d98a17b18 SHA512 304fa9e1f83f5b8e2fe10905799badc8bd8e9ac981fd59b3568f9d9d208dc671ec4dc1b88163351322d047596db4d2c8f9a261dbefa3351cf25f321b84beca9e
@@ -35,6 +38,9 @@ DIST genpatches-4.16-10.extras.tar.xz 17488 BLAKE2B 75169c7816271f85df521749f6da
 DIST genpatches-4.16-11.base.tar.xz 229832 BLAKE2B ad7e4b657825802cd3049893140621a26a20f78f5327c43d36cdbbc3ba87938a80276757f1952fb532933d691428ce0bb8dc23d8c8c1c6533d939adaf7a65b5b SHA512 589eb66c4908d6c4964b50e62b22ccbcf6e9b5959cc0ce0bac6d07dbf483c0a0ded6c640649819efcee07f71ed0f930a0f6059be77d8df65e11a3f5031f8555d
 DIST genpatches-4.16-11.experimental.tar.xz 5168 BLAKE2B 9d8fb3e66bce93a3e8e2925d3b0b3627d37af82fc3b31faa4a676e2b8c355f36ffc998e1cb0b7a7ae75153712ffb3cbe289a351a1a5511b65251734b9b977e57 SHA512 eff2802e2d950357dcd368a9b358bbb2a5892b886be8991da0b808ecf61f199fd079a1d4e3a60bfe0c70bb4c97b582142a1f3341731d50aafc6fad06e462c634
 DIST genpatches-4.16-11.extras.tar.xz 17496 BLAKE2B c7fca4b94f96e36704f4f7aea0daac855515544d54a286dc90791e8318ef172771665ce132872351da9e26a0231f0b3e356cf9380c59ea52358ece117a23157e SHA512 eba699a9b0615b096358e967c1ee68989f1374ba9a4f281f232aca8ea459b30446551346a081b4a61067a4e94fedfbe2e470708801a4e9bc3049b69f6558fa14
+DIST genpatches-4.16-12.base.tar.xz 262212 BLAKE2B 95d70087d1e17fa59498be09fb5f73b26843627e0f858979914123d5ed38c48c3d0b6cc8fdcddb0d0a145342f5664032784793a9076692fe0c260b40299c0fc6 SHA512 3d029c80a1b00dc90f4781c778815bbacae1713f0b5e2af3c9351ee6d56996efc1e048ef2509c8e002fc8c633158886c5abc24a8663eb7daa97bbe2cf0f9363c
+DIST genpatches-4.16-12.experimental.tar.xz 5168 BLAKE2B a65e3d51f96010dc20c5937bdc2d1984c519af9633a2e460a161b2640293ddbec38f2581e0ba6278397d06d9cd9154c8880eb6f31a02ce2f25123ad6b1ff12bd SHA512 1691f82a02d153d5d6f98c53e03db5692693f6e01487b17d025193f973904f488bbe48a73a8e7c9e35ef5f9dfe37e4f3c1087713b891791fad714f18a6a82c49
+DIST genpatches-4.16-12.extras.tar.xz 17496 BLAKE2B c7fca4b94f96e36704f4f7aea0daac855515544d54a286dc90791e8318ef172771665ce132872351da9e26a0231f0b3e356cf9380c59ea52358ece117a23157e SHA512 eba699a9b0615b096358e967c1ee68989f1374ba9a4f281f232aca8ea459b30446551346a081b4a61067a4e94fedfbe2e470708801a4e9bc3049b69f6558fa14
 DIST genpatches-4.16-9.base.tar.xz 196768 BLAKE2B 25c4b6a22a9a07af643ddc73fea2cf6e997f5cca89f86cf8386286d1b63e0c0dd393f138f66f87773d9eba382bcaec3a2562d2a4c22140a61358cd2612e11d4f SHA512 aab3c760270e8d72c892d58a88fac3db792150a8f7157a2fb656d52ecfb29c9f6a049783ec9583b98b9cfd09ae6f77f672ef375d6a260cb2cb4df8157e5398a7
 DIST genpatches-4.16-9.experimental.tar.xz 5164 BLAKE2B 0e8c1ce1a65404faafe4c0c7163cf87ce4ba4195edec6caab0dcbffff5351c6b211b233b6b659a7521e48e11e0fcf726e23341728591e9dbf305a4cac4500175 SHA512 9b4003d7902152183e4a76c54e0d4d09da33c9956aadafef4b11cdde81f7539a0d7931f4ae7d4d7e02928bbd7c128eba5fda00319723c1f7c2a7abb34ecddc9c
 DIST genpatches-4.16-9.extras.tar.xz 17492 BLAKE2B 2e9bb4e33e33f0b5ba923bc0036a3697abefcf7c439dfba68beb0c4d0a558dffde1c9224f56da6bbea560bec3664cb1025c0ce1c961037598523d1af0d0513fb SHA512 e1ed8a1532488aa849969a90bf299eaf39233695eb9bda7b070a87906b8891e2332a06234d4b2c98338b04380020387b8fb212dc95072ae79cc58274e8118656
@@ -47,6 +53,9 @@ DIST genpatches-4.9-103.extras.tar.xz 17356 BLAKE2B e84df76263c11d9ae1fe5bbbad0d
 DIST genpatches-4.9-104.base.tar.xz 1988596 BLAKE2B 00e31664c8da68ded4e831c872296319b341690c2640c47e0940b1dad6ac1cf9c78a1a773ea5120605af3f09ccf4a62f544b6e6a5d42562d3a803ccae6617dfd SHA512 13fab296b38eae012ec9e58bb3e29fb5bf3b4afced6156d87e275836d04c9afc1a5c748b45e495d770c665e3e61020893f3ae912d7c014b2891fc56b87f640ab
 DIST genpatches-4.9-104.experimental.tar.xz 106388 BLAKE2B c8a171fda6fd70e17662b779805cc7353303159443fc4031f153bb8acda5c3632aaf331d1720c389b030fbc837d25522c4abbf6cb1858e7023ba292c5373b633 SHA512 db1c60f4c5356cc67e26244af373678fa7b51155c620cb8d62ae966e63e5b2c8320167bae699137135fd2e522337e197d6e2d8c1bf9f736ba5fc0657243218a3
 DIST genpatches-4.9-104.extras.tar.xz 17356 BLAKE2B e84df76263c11d9ae1fe5bbbad0d24dfd2e866f625deab07f7b72404c351237ac28f8907cb4ef30e5bb88947ef303e1c8c4123acf4c6f899aa66f2ccfab5de41 SHA512 49025fe6fd388ddf72cdb3cbb68f24ae8225d4356459bbb2f8677b90488eb49f27e62591f98f87038f2d17d0355c55bf0c38b8fb94e3929a0619ebf2bccd06e6
+DIST genpatches-4.9-105.base.tar.xz 2008496 BLAKE2B 228c1495c583ca33adee5c13476363b516b6705d1818458ee03d600b00e3e4e57952f8f55a7ffc5c6ced2b2bd9951a3ba2bc34be12981e147e64f8354b5fe3e9 SHA512 86b70fa9f98e6e4e855a5949ebe11d9a9ab15a7f84529173487538e59227f3a75b834aa419397a835b510e99d7b6f91b4c462ec3dfd0cac8e50b1f161a422728
+DIST genpatches-4.9-105.experimental.tar.xz 106388 BLAKE2B 8458f5d7cea973d2085a67d6b715ba20d745ec9bcb7b66c27a8f955a4df1d2badac5fba93b35f0d79eaa0042950e77972ecd9a8396460f0c8dabdb5967f3da0a SHA512 56d1cd213f4084d3976ceb150f2f38baf14794fb4ba3bf2faa730db5a15278e7f2274ebaa0cf6f5d770448bbd683e82981bc9924990e18ad6bb1068b5d523363
+DIST genpatches-4.9-105.extras.tar.xz 17356 BLAKE2B ee7a0b4ac672a9cadaf17899a102859f1df6e91a5974dd993cf157cc4929a5bee4424b0d264b8a0ca760cab30f43c072117a3d043c9bbb0770b762c4c87b4bb8 SHA512 96f5fa4fa4617f291ef59160f575a54ecd9f1134c8f6b5162ee1fb8335ba4cc2b60467e6cd389f8b0df43cef0e10b7b12db1418b315301f8f044a1459017c895
 DIST genpatches-4.9-96.base.tar.xz 1813704 BLAKE2B 43236fbdf22137a2f98c617919e3a21208cf7269a5d5e51d705734610e348f443b57677e3c00aa1d75a73c68314de537252eb24bd23cf83e8d7de05c2f111526 SHA512 c8275aad26fce06c6f8286d4341964031aaa5308ee4e0396fde48f3abbc97fc47db6bcc67764ba424dbed6d93fcc935f07831c20c5dada21acdd9e2d9575a5d8
 DIST genpatches-4.9-96.experimental.tar.xz 106408 BLAKE2B a959d2df5d348d1dac693e9e99169f7f87a0234cd45e4a7b8f77e5d446cb844ed210ae64e7d5f50239e5d4e1d55da67ab740cf803d428a683d23ac481731ce80 SHA512 aa23d0364460a82382f6554416019ae1bec6fb61e3dc18ed2c9366b25f47fac447c30ba5316b5b627e041710cfd33d8411c998bba1e5e9ace722aca304ce9816
 DIST genpatches-4.9-96.extras.tar.xz 17352 BLAKE2B ab1643d3b767b33a4f0cf1d5de5fd373d7de89f2eec1d0c626cab8155b057d18667f614bc1cf29926e5c55538ed4570ef9c25aef171f13d8c86fb3aa130174d7 SHA512 7a56e5b5108ed398696e220c25859ac1a5a9e02afac6659977f1c38b8d0731ee9b8455654d3e5d03e50f188ea0eaf2e8714435eb241a4bb7fdc6f2b273859661
@@ -66,13 +75,16 @@ EBUILD ck-sources-4.14.35.ebuild 1890 BLAKE2B 31e796623109a95e9479c14c1fe4215d48
 EBUILD ck-sources-4.14.40.ebuild 1890 BLAKE2B 1189c57b729c29b7fe37d421e69a5bef9f1ee9d6ba9398a116bb40b839927a85925678a65666c24ec26cc445e332d7d56af77a91d19b31b574e3b3068279fe8e SHA512 6eb6b7001d973e354163c8ced89ae13999a0b8d9aeb4f469c0d46648960c05433b42186376ee815944460e0358761c3ece9fb97a89a15b104354fff690004e62
 EBUILD ck-sources-4.14.41.ebuild 1890 BLAKE2B a951cff7570362e32c29c2702612b9b877342a16504165b4dda2c93725506e69b6cc2f3d2aa1c0785a9387982b9126cf9fd82164469fdf503c5a76c2f678b9fb SHA512 643c67eadb27afbdde7aaad402e6326bed9b842b44984eaf8accd4c0a5e6ddd86270d0fb570def87fecd449ec647ed71bf639f9ed8b8089bff5e4d988342f1ac
 EBUILD ck-sources-4.14.42.ebuild 1890 BLAKE2B c5c2ee07b80189e0c0a144660ed141c5d92a2ac5af5e0130c4e970c93a1f3f2d52fd3a5d3736784ccda6168d815ac5c2ed920a20d5f41cd79a9a520cfd90b076 SHA512 6928cf9380784473ca96ef15c821332aee5b6b0b3068e430c5277ce084273286d63a1e4f495234740e1a78d7985326f269a527ce2bc76b8ac459ccc749029854
+EBUILD ck-sources-4.14.43.ebuild 1890 BLAKE2B 8c2b2fca9a7b1b8c3a3ff4696e2f8dd06e4bd3d08ad34e1452c2b8ea573404c7501526da4d6d02fafe295623da3f1c84d3723e338f6128d442e368934a5c241e SHA512 a6593eb68f18bedcdf51a8c27d7c84fd61a61bb5a62dfeaf68103e8d4be6afb9de7156578a0d33730df39a4d4b1ecea4673fdff6cbace5abfac0c36921c7e1ad
 EBUILD ck-sources-4.15.17.ebuild 1613 BLAKE2B c686bdc39cf2bcdfb39fc6bb1d022abe7c89c6bf56d6768dca114ef37a75028958760b0248cd998fca8e38b0eee1a91fe60f377855bbced0962ebdb2e6fc1d3b SHA512 c89b106684d799d5cc02f57b2c963ceacd67ec9319aa2ed4d56a377699972d817463fd5dc1449bbde5b000f67944430bc6de04275ed8aa8fc261ca63636caec3
 EBUILD ck-sources-4.15.18.ebuild 1613 BLAKE2B d44234f86f13cdddd3e9e4aef9ba9416fa99f43dfd9de249fc38e7c51f733bd1ca21ae07fc2f862e304139ec5bff459022054978931996d8c6c033f89331760f SHA512 ed30d4061718fd052ec346697a2d5f6d737d4bfbcb16ea9164d0d45f6cb9312845d1301ebb1f51e759a1748bf44f2a6080132cce3ed8e34bcc1e2c9caa8c9109
 EBUILD ck-sources-4.16.10.ebuild 1613 BLAKE2B 68dfdcfe26016215211970aea4ea14e95042e9db0dab3ebc090017ac964bce69f3b721edf7ebfe1dff80876b496689601e982dd2524ed82c3722a51be8b6d96b SHA512 c0b101634574032eb2cdfb489dbd1615a8cda82602db99dfb04f3b4f8bb696c2faacdb0a1dd19c53d2481056cb544a2ec651e42a229e3bb0ae35f92c460c862c
+EBUILD ck-sources-4.16.11.ebuild 1613 BLAKE2B 4b214a840fbc800fe35a2250ffd45620b592aa1697a5f939b09ccfa15e10b7a270bc0f4ac39a3457f7f63da1a628305c724d2c71c82bdffa4ffbbffc06faff32 SHA512 2d38fbe9f0768c0d640868a06fcc2bfbc330316a774b664ddab249433a207ecdf11f8a784157fcce7df7cda57065b821d43d3ce923398ec5a67dc88468c03987
 EBUILD ck-sources-4.16.8.ebuild 1612 BLAKE2B b4065b5b7b954efe9f1dd0c947ba8254c5720e29be9b310bf5a4309016a4413233da74737d65e9c6f1a36fa923323eeb2920093e34f6df538c8e07fc3a4147a8 SHA512 c2739523c055f939b14ac149fd76788100d0fcd5d750056cbecd1935b80effabc11de5caf9ab96df946d45f4c354b780e456990a0a4037d49e49c4b5045a59dc
 EBUILD ck-sources-4.16.9.ebuild 1613 BLAKE2B d48cd4eef9a3de8313a0d400ddd0ed46d5bb5f71ad5d07373673234308394af43d0f5058766b5b09b3b7355674f4acab59755057e7e6ef677d1fecebeb6b7c0f SHA512 3426bb5264b67d482fbfd20cc4ffb664c2f60ed31fd169c078ccf06370c5beddff376ecefa6fb37d587be1c2673312cfde2e3f79f4c139f393e248c900c833ba
 EBUILD ck-sources-4.9.100.ebuild 1892 BLAKE2B fc000087dca221160f4e403aa79158fa72552ae807233543a619b7afca0931f3d7b22386b9b170e0a384514dcbb5bb46133814c5d7b35a1c6b9747f99880e2df SHA512 5fbbb633cd61982643079f1562070fa6426c7541ed3b31d4134b120ba5151042a12175b8ae2e63232335217bea6fdb0120113bea920715cb932abba50f506e9e
 EBUILD ck-sources-4.9.101.ebuild 1892 BLAKE2B ff6f002af8e3ff6dec87ca42cd5128d4429697addf8d3748712ef5ba8818e40c14fd8ec5c8d2c0fd817560abc58926f3f1160fa16ff5c66e6767ac5a58b63d56 SHA512 c2a276c330872f031f3c729887489a874f8ec6df8603187a9c6eda59127a3af969d590eda09606f0330f40d7389cf4ef72a375c15fb2eb60c9dfad5e6dffcad5
+EBUILD ck-sources-4.9.102.ebuild 1892 BLAKE2B e934ed5df1eb6d1fbaf5a620a7bff1482ac8dd7355558fa1437edadf645940ea15c6c901c33d31bf1b5b594797de2262c0d93be15f0f4f91a27d81ee92434f19 SHA512 4d4c68926789799e37a9726e4886dcc0506e07bd50eb4742cccb90eb4fda458e635f43930511f9a20d22d740367317c585d7d8d2a890e76c780336e10d57d10f
 EBUILD ck-sources-4.9.93.ebuild 1891 BLAKE2B 6b6fbd4a9ada3a7f348012e1d5dd541a8d8c930c9bb51737f2e12faadb57fe9c2fdd54cf88361557b3cd69c8891815b3f0ee38875d631745bb4f4ac3915ab6bd SHA512 bc67bb18bf2d98ee26f575feae16696e695c93f3591d2cfefef7c6439fdc8b7d5f69ec06953d20c56dad0c251acb1148ab8dedabd28d84c79c0a02c4b40f69b1
 EBUILD ck-sources-4.9.95.ebuild 1891 BLAKE2B 69e55844a6b354cc046acc196ce3c966c05e8c1fb27e06f7bf7cca68b8ef0fd98ad1057195a11de52810d0b6d64e97c76421d67f76107a87389daa9218be9d8d SHA512 e60b5414bd80181ba16a00841a2ab51923996bae6401121ddead1ed199bda77525651e3e754f980186ab64e20fee18dc45c46547ae3d35d4ced73caebf8a7237
 EBUILD ck-sources-4.9.99.ebuild 1892 BLAKE2B 0112b97794c6f18328ba0e2063bbd238cb515091c8c530fcf6170d62ead611ffb26fc9ca1b9ee314a8db009e2475f609ae81d7bc055c9be97f40f53c4616b03a SHA512 7c4feace1bfe13cf8d4e576fd72e3e066c0eac1d0a2fae5e238c334fd719f3fcf631f907f7a47dac495f97cec6eafd44d64f80c7b76b04ba49ce580313f8b55b
diff --git a/sys-kernel/ck-sources/ck-sources-4.14.43.ebuild b/sys-kernel/ck-sources/ck-sources-4.14.43.ebuild
new file mode 100644
index 000000000000..3b81296199af
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-4.14.43.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+KEYWORDS="~amd64 ~x86"
+
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
+	http://kernel.kolivas.org/"
+
+IUSE="experimental"
+
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="48"
+K_SECURITY_UNSUPPORTED="1"
+K_DEBLOB_AVAILABLE="1"
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-any-r1 kernel-2
+detect_version
+detect_arch
+
+DEPEND="deblob? ( ${PYTHON_DEPS} )"
+
+K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
+
+DESCRIPTION="Con Kolivas' high performance patchset and Gentoo's genpatches for Linux ${K_BRANCH_ID}"
+
+CK_VERSION="1"
+
+CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}.xz"
+
+CK_BASE_URL="http://ck.kolivas.org/patches/4.0"
+CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}"
+CK_URI="${CK_LVER_URL}/${CK_FILE}"
+CK_URI="${CK_LVER_URL}/${CK_FILE}"
+
+# Fix for: https://github.com/gentoo/gentoo/pull/6942
+BLKIO_HASH="25849740d77dfc089fdbfb53623e50d38a972aff"
+BLKIO_FILE="${PN}-4.14-blkio-fix.patch"
+BLKIO_URI="https://github.com/ckolivas/linux/commit/${BLKIO_HASH}.patch -> ${BLKIO_FILE}"
+
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_URI} ${BLKIO_URI}"
+
+UNIPATCH_LIST="${DISTDIR}/${CK_FILE} ${DISTDIR}/${BLKIO_FILE}"
+UNIPATCH_STRICTORDER="yes"
+
+pkg_setup() {
+	use deblob && python-any-r1_pkg_setup
+	kernel-2_pkg_setup
+}
+
+src_prepare() {
+
+#-- Comment out CK's EXTRAVERSION in Makefile ---------------------------------
+
+	# linux-info eclass cannot handle recursively expanded variables in Makefile #490328
+	sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile" || die
+
+	kernel-2_src_prepare
+}
+
+pkg_postinst() {
+	elog "ck-sources previously enabled CPU optimizations by default."
+	elog "USE=\"experimental\" is now required to enable this patch."
+	elog "this can be set in /etc/portage/package.use (or make.conf)"
+}
diff --git a/sys-kernel/ck-sources/ck-sources-4.16.11.ebuild b/sys-kernel/ck-sources/ck-sources-4.16.11.ebuild
new file mode 100644
index 000000000000..05d896dd38ed
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-4.16.11.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+KEYWORDS="~amd64 ~x86"
+
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
+	http://kernel.kolivas.org/"
+
+IUSE="experimental"
+
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="12"
+K_SECURITY_UNSUPPORTED="1"
+K_DEBLOB_AVAILABLE="1"
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-any-r1 kernel-2
+detect_version
+detect_arch
+
+DEPEND="deblob? ( ${PYTHON_DEPS} )"
+
+K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
+
+DESCRIPTION="Con Kolivas' high performance patchset and Gentoo's genpatches for Linux ${K_BRANCH_ID}"
+
+CK_VERSION="1"
+
+CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}.xz"
+
+CK_BASE_URL="http://ck.kolivas.org/patches/4.0"
+CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}"
+CK_URI="${CK_LVER_URL}/${CK_FILE}"
+CK_URI="${CK_LVER_URL}/${CK_FILE}"
+
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_URI}"
+
+UNIPATCH_LIST="${DISTDIR}/${CK_FILE}"
+UNIPATCH_STRICTORDER="yes"
+
+pkg_setup() {
+	use deblob && python-any-r1_pkg_setup
+	kernel-2_pkg_setup
+}
+
+src_prepare() {
+
+#-- Comment out CK's EXTRAVERSION in Makefile ---------------------------------
+
+	# linux-info eclass cannot handle recursively expanded variables in Makefile #490328
+	sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile" || die
+
+	kernel-2_src_prepare
+}
+
+pkg_postinst() {
+	elog "ck-sources previously enabled CPU optimizations by default."
+	elog "USE=\"experimental\" is now required to enable this patch."
+	elog "this can be set in /etc/portage/package.use (or make.conf)"
+}
diff --git a/sys-kernel/ck-sources/ck-sources-4.9.102.ebuild b/sys-kernel/ck-sources/ck-sources-4.9.102.ebuild
new file mode 100644
index 000000000000..ce11a7b0e72f
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-4.9.102.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+KEYWORDS="~amd64 ~x86"
+
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
+	http://kernel.kolivas.org/"
+
+K_WANT_GENPATCHES="base extras experimental"
+K_EXP_GENPATCHES_PULL="1"
+K_EXP_GENPATCHES_NOUSE="1"
+K_GENPATCHES_VER="105"
+K_SECURITY_UNSUPPORTED="1"
+K_DEBLOB_AVAILABLE="1"
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-any-r1 kernel-2
+detect_version
+detect_arch
+
+DEPEND="deblob? ( ${PYTHON_DEPS} )"
+
+K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
+
+DESCRIPTION="Con Kolivas' high performance patchset and Gentoo's genpatches for Linux ${K_BRANCH_ID}"
+
+CK_VERSION="1"
+
+CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}.xz"
+
+CK_BASE_URL="http://ck.kolivas.org/patches/4.0"
+CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}"
+CK_URI="${CK_LVER_URL}/${CK_FILE}"
+
+# solves bug #606866 (Fix build for CONFIG_FREEZER disabled.x)
+FRZR_HASH="7de569950716147ed436b27936628ee3ab5b45cc"
+FRZR_FILE="${PN}-4.9-freezer-fix.patch"
+FRZR_URI="https://github.com/ckolivas/linux/commit/${FRZR_HASH}.patch -> ${FRZR_FILE}"
+
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_URI} ${FRZR_URI}"
+
+UNIPATCH_LIST="${DISTDIR}/${CK_FILE} ${DISTDIR}/${FRZR_FILE}"
+UNIPATCH_STRICTORDER="yes"
+
+# ck-patches already includes BFQ (similar version as genpatches "experimental" USE flag)
+# what's not included is: "additional cpu optimizations" (5010) from genpatches experimental
+
+K_EXP_GENPATCHES_LIST="5010_*.patch*"
+
+pkg_setup() {
+	use deblob && python-any-r1_pkg_setup
+	kernel-2_pkg_setup
+}
+
+src_prepare() {
+
+#-- Comment out CK's EXTRAVERSION in Makefile ---------------------------------
+
+	# linux-info eclass cannot handle recursively expanded variables in Makefile #490328
+	sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile" || die
+
+	kernel-2_src_prepare
+}
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 3829855f584a..962c6685e8a3 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -31,6 +31,9 @@ DIST genpatches-4.14-46.extras.tar.xz 17496 BLAKE2B c7fca4b94f96e36704f4f7aea0da
 DIST genpatches-4.14-47.base.tar.xz 1200752 BLAKE2B 4e52afb8c85a9d2f162dec0d0e6ef557a66a6b899d47fd7578a350d65ad30bab32daa514d1305cf3a7faf66ce43f74c6a4525c8b987846bc92c2ec14405ec9cf SHA512 c2a46c73d999a199b406a712e79b74d1c33c1a3d0963d43a69f8fd32b9e52beb715867cd064639c842f2395993e789de42b18973932a042061be03957ee81b1a
 DIST genpatches-4.14-47.experimental.tar.xz 5184 BLAKE2B 12a3437d97cd8f7779e158f6e376ba41cada33db4fdbad8c803baaba01e5e459738b155fec1352e3354020f5b43846bb479fe2682dee5fa296d498e41b67af58 SHA512 885fc8f8b127f792426b575dc87d4c8d5655ef514eee7d8a77e065415db674fd995f6eb91c0f23ad0f03a26b01dfa67f2d474bd5a8e7753922cb9387be2d184c
 DIST genpatches-4.14-47.extras.tar.xz 17504 BLAKE2B 5f364e68c663c7ef6d5bf5cded7fc304d806adde306d25294996063efc6c9d3134e4d8da1839cc4fccb2da4d0781b2a9ab926351ce6bf4b4c0bae9cd955233b4 SHA512 6d17fdfa3228377120147e43f7a53700c8d3f25c6f2a09c82818558bce493e09db4a7405c42f1b4697a4424ababc607128d98d88301f825a266c802fd18cd78c
+DIST genpatches-4.14-48.base.tar.xz 1222408 BLAKE2B 8870bd2081a385e3243c18e96a9a89c768c196bcc54e188f1793bfd48f29e8994beb0b787f38b14db2ed459aa53845074fb5ddaf3bed4d6e39f32b479b0651ba SHA512 e4c4a84feecf0fbd8392fa3981d7276aee2f40aad3a2568598146e935973432670a7f3c32fda09f4bfc17ee5273fd0a7e0b6fd2f4531a10336169586da085640
+DIST genpatches-4.14-48.experimental.tar.xz 5184 BLAKE2B e0fe9fcdb7c1f5e648791a3e686871f2c2951786092a8ebf97b84bb79e80521e3baabbe4a0537b72c2bf5641b2cc292da0853b46124c46bc69b106e61bed1e3b SHA512 d845805a394c93ae5d0ecf22a4c9902fd2d3b1382fd791b0431b5ebead9d3e580759c76a1c95b63f444b8246437dec300a79341049d2573ecd4af060e7fc1f4d
+DIST genpatches-4.14-48.extras.tar.xz 17496 BLAKE2B c7fca4b94f96e36704f4f7aea0daac855515544d54a286dc90791e8318ef172771665ce132872351da9e26a0231f0b3e356cf9380c59ea52358ece117a23157e SHA512 eba699a9b0615b096358e967c1ee68989f1374ba9a4f281f232aca8ea459b30446551346a081b4a61067a4e94fedfbe2e470708801a4e9bc3049b69f6558fa14
 DIST genpatches-4.15-19.base.tar.xz 418976 BLAKE2B a3308a311f69861513ea5d0f92c65f180e640353e015e0e0869cb5aa1fa5f1d00bc9b3339f1115b1c0b193f6917237e029177d011a56660d43ae30299566d547 SHA512 16955bee641b1467f7ffed95100ff2e840093638ca5ded0937e2eac8854c6c213f0f466c51df2262d8f0feb41d265410bbc04f6ef0dd62ea0ab48777aeaef5c5
 DIST genpatches-4.15-19.experimental.tar.xz 5188 BLAKE2B 7057889db0d41a03e8a2ad1c3bb81f529088938ab8dfae6c6a0850de99af8cf73d9f4ebf9e7d10adcf4a34abdc516853570ad1f8d1d019bc256d2823efe47743 SHA512 74d6c91eaf4e6eea292aa1a268fec104f4d0b1baf6cf412fed32a6eebfb8c778d1f27d5d140f5addf4fc25fccb5b21b374760e3c648bb38517e316adcae2602b
 DIST genpatches-4.15-19.extras.tar.xz 17484 BLAKE2B 4f0dd93555cbdf9d64b94714e34430a0f55f1a36e509aaf0f6a367fb9a2875680f5a97205f08b8307f7e66d7e6479bb3e40823c763512387d0c6af3618a75158 SHA512 9779f34f4077b1dd662dccfec156682f1015163b75b084c2888b58372fc42e50f2de8f8f9011e5deea8850fe5e819ef3a6756255ef6171b6f42ee23d3eff4209
@@ -46,6 +49,9 @@ DIST genpatches-4.16-10.extras.tar.xz 17488 BLAKE2B 75169c7816271f85df521749f6da
 DIST genpatches-4.16-11.base.tar.xz 229832 BLAKE2B ad7e4b657825802cd3049893140621a26a20f78f5327c43d36cdbbc3ba87938a80276757f1952fb532933d691428ce0bb8dc23d8c8c1c6533d939adaf7a65b5b SHA512 589eb66c4908d6c4964b50e62b22ccbcf6e9b5959cc0ce0bac6d07dbf483c0a0ded6c640649819efcee07f71ed0f930a0f6059be77d8df65e11a3f5031f8555d
 DIST genpatches-4.16-11.experimental.tar.xz 5168 BLAKE2B 9d8fb3e66bce93a3e8e2925d3b0b3627d37af82fc3b31faa4a676e2b8c355f36ffc998e1cb0b7a7ae75153712ffb3cbe289a351a1a5511b65251734b9b977e57 SHA512 eff2802e2d950357dcd368a9b358bbb2a5892b886be8991da0b808ecf61f199fd079a1d4e3a60bfe0c70bb4c97b582142a1f3341731d50aafc6fad06e462c634
 DIST genpatches-4.16-11.extras.tar.xz 17496 BLAKE2B c7fca4b94f96e36704f4f7aea0daac855515544d54a286dc90791e8318ef172771665ce132872351da9e26a0231f0b3e356cf9380c59ea52358ece117a23157e SHA512 eba699a9b0615b096358e967c1ee68989f1374ba9a4f281f232aca8ea459b30446551346a081b4a61067a4e94fedfbe2e470708801a4e9bc3049b69f6558fa14
+DIST genpatches-4.16-12.base.tar.xz 262212 BLAKE2B 95d70087d1e17fa59498be09fb5f73b26843627e0f858979914123d5ed38c48c3d0b6cc8fdcddb0d0a145342f5664032784793a9076692fe0c260b40299c0fc6 SHA512 3d029c80a1b00dc90f4781c778815bbacae1713f0b5e2af3c9351ee6d56996efc1e048ef2509c8e002fc8c633158886c5abc24a8663eb7daa97bbe2cf0f9363c
+DIST genpatches-4.16-12.experimental.tar.xz 5168 BLAKE2B a65e3d51f96010dc20c5937bdc2d1984c519af9633a2e460a161b2640293ddbec38f2581e0ba6278397d06d9cd9154c8880eb6f31a02ce2f25123ad6b1ff12bd SHA512 1691f82a02d153d5d6f98c53e03db5692693f6e01487b17d025193f973904f488bbe48a73a8e7c9e35ef5f9dfe37e4f3c1087713b891791fad714f18a6a82c49
+DIST genpatches-4.16-12.extras.tar.xz 17496 BLAKE2B c7fca4b94f96e36704f4f7aea0daac855515544d54a286dc90791e8318ef172771665ce132872351da9e26a0231f0b3e356cf9380c59ea52358ece117a23157e SHA512 eba699a9b0615b096358e967c1ee68989f1374ba9a4f281f232aca8ea459b30446551346a081b4a61067a4e94fedfbe2e470708801a4e9bc3049b69f6558fa14
 DIST genpatches-4.16-4.base.tar.xz 46368 BLAKE2B 30a98545ab83f25ca726d3b2fddd4abf2a5b325be187ff16836aecfa699526efde2d8c56dbfc7af068b2e281527525edc0d18a14244513636e42f31fd726dca7 SHA512 dd723b619926eaf4fe13db53197e2142d8ff6b2e18eacf829635ce84d442a795e3ec392ac70ddcf0ce55af48470a3ba594beaf27783b473cb169e3aa4f608223
 DIST genpatches-4.16-4.experimental.tar.xz 5164 BLAKE2B d64e5d3c47c7b98fe56b7d1fcfa331c8fb114e56829b602321ef52181934a5548f6a6a5bca578faf64637b277430e8378ed85285d2e422e0589d3292d96c2479 SHA512 b08c4fc95160ec60dce4e4dc15d885e3d7559a2b133dce76e134982139e1b9a6ae2034a60812e2b2c263e10be0e6422ee2e0ceea2b9bc00c2152bc19239856b4
 DIST genpatches-4.16-4.extras.tar.xz 17496 BLAKE2B 04b98295a1a852516aefd1f99e806b1d471b98164948368e64179eb6c0131079b7743639eacb2b5852417e9dba0b34d7b2c92031c3f36bfc8845f230c6dc9f5d SHA512 5941bf6ffbe7e79233b4d722404c76790ab0c7c2a5090e1fa52a41a9dd8b5597013676f9e877f7440f6ffbef3d3ef91da6da9241f5bc94e7337bc0f8a2001508
@@ -100,6 +106,9 @@ DIST genpatches-4.9-103.extras.tar.xz 17356 BLAKE2B e84df76263c11d9ae1fe5bbbad0d
 DIST genpatches-4.9-104.base.tar.xz 1988596 BLAKE2B 00e31664c8da68ded4e831c872296319b341690c2640c47e0940b1dad6ac1cf9c78a1a773ea5120605af3f09ccf4a62f544b6e6a5d42562d3a803ccae6617dfd SHA512 13fab296b38eae012ec9e58bb3e29fb5bf3b4afced6156d87e275836d04c9afc1a5c748b45e495d770c665e3e61020893f3ae912d7c014b2891fc56b87f640ab
 DIST genpatches-4.9-104.experimental.tar.xz 106388 BLAKE2B c8a171fda6fd70e17662b779805cc7353303159443fc4031f153bb8acda5c3632aaf331d1720c389b030fbc837d25522c4abbf6cb1858e7023ba292c5373b633 SHA512 db1c60f4c5356cc67e26244af373678fa7b51155c620cb8d62ae966e63e5b2c8320167bae699137135fd2e522337e197d6e2d8c1bf9f736ba5fc0657243218a3
 DIST genpatches-4.9-104.extras.tar.xz 17356 BLAKE2B e84df76263c11d9ae1fe5bbbad0d24dfd2e866f625deab07f7b72404c351237ac28f8907cb4ef30e5bb88947ef303e1c8c4123acf4c6f899aa66f2ccfab5de41 SHA512 49025fe6fd388ddf72cdb3cbb68f24ae8225d4356459bbb2f8677b90488eb49f27e62591f98f87038f2d17d0355c55bf0c38b8fb94e3929a0619ebf2bccd06e6
+DIST genpatches-4.9-105.base.tar.xz 2008496 BLAKE2B 228c1495c583ca33adee5c13476363b516b6705d1818458ee03d600b00e3e4e57952f8f55a7ffc5c6ced2b2bd9951a3ba2bc34be12981e147e64f8354b5fe3e9 SHA512 86b70fa9f98e6e4e855a5949ebe11d9a9ab15a7f84529173487538e59227f3a75b834aa419397a835b510e99d7b6f91b4c462ec3dfd0cac8e50b1f161a422728
+DIST genpatches-4.9-105.experimental.tar.xz 106388 BLAKE2B 8458f5d7cea973d2085a67d6b715ba20d745ec9bcb7b66c27a8f955a4df1d2badac5fba93b35f0d79eaa0042950e77972ecd9a8396460f0c8dabdb5967f3da0a SHA512 56d1cd213f4084d3976ceb150f2f38baf14794fb4ba3bf2faa730db5a15278e7f2274ebaa0cf6f5d770448bbd683e82981bc9924990e18ad6bb1068b5d523363
+DIST genpatches-4.9-105.extras.tar.xz 17356 BLAKE2B ee7a0b4ac672a9cadaf17899a102859f1df6e91a5974dd993cf157cc4929a5bee4424b0d264b8a0ca760cab30f43c072117a3d043c9bbb0770b762c4c87b4bb8 SHA512 96f5fa4fa4617f291ef59160f575a54ecd9f1134c8f6b5162ee1fb8335ba4cc2b60467e6cd389f8b0df43cef0e10b7b12db1418b315301f8f044a1459017c895
 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
@@ -135,10 +144,12 @@ EBUILD gentoo-sources-4.14.39.ebuild 742 BLAKE2B 269255718016d4c18fe36618ec32da0
 EBUILD gentoo-sources-4.14.40.ebuild 742 BLAKE2B b33b45fdfce80d37224a1e9921bef528a2d53e32734d36065b415d31d524e4a90dc58beeb0ff56b494bdf22386589a913ed2dc8291f3a2cf27080a129373b541 SHA512 5cb52d93d3de1fc28d7e0db8738aecd28569f4332a743cd03670413cdd3ccc395412466cd62855fbdfa2b9ada2ecd049644d292711faa61846fe057b3e1665d5
 EBUILD gentoo-sources-4.14.41.ebuild 742 BLAKE2B 93a3bad7a055db53273778c1afead34634ff7dd3b4105695d600e5167c89bd0bbc8354d841a6997d98d554970cf3f936c8bb3696dcc802b420a1ed6cf8d71c9f SHA512 4ab9503c525fdf8224816464ff4bd80d9cfb0491e7c15ef0412a6b70aee390d258cc9fd7aba87007cd3d0669874d4fa269bb1197ca3dd1c855d24f16cd22114d
 EBUILD gentoo-sources-4.14.42.ebuild 742 BLAKE2B 0784e34075ae9b9eaa71b78ced91108776191ab424b2e9026d8ec72079a7e8a1c889443171b7ba745d018ab8e8099586a53e3d118350447183df33c4e6a87f59 SHA512 9d333379549b157028563f02f9a21b75fb3260a99fe98fe8c9448204a2812c74379a618de7ee6426d0efdbdf2d6f80f039c3e27a95cbf7b0dcc838e8c78770f0
+EBUILD gentoo-sources-4.14.43.ebuild 742 BLAKE2B 8fbb78228753c2c50e8db94dcf8c622bf6497382aef8ef38bf765eac3f101ef499ecfffd495817f67d9ffa5bbdab9d0ad1b2491615018ae62bba88c5dee7bf9a SHA512 bbcd31b38e6df6d41b6082c3b24a3db5b821f0cff3631b8e66d47486509ad4f6ba59f7b702b2e8ebffa3f56cbfd02baece363d81acd03ce298921afba96e9b2f
 EBUILD gentoo-sources-4.15.16.ebuild 742 BLAKE2B 8cf138fd93fa76e2280baf29a973fd8d26a495d41cda3cbf0b9ac1b81718209a14ba87ac2623ce768bb9bf2f23813dc3a9e35ec942c3b031c1e9cb264cb93d7b SHA512 042e8df152e227429809a4e994d86668641b5632ae50f21780636aa22138b2e7fb48b25db6533875617c9e578c3c3f0f852188dad4137bf6c25c55ae75b86eed
 EBUILD gentoo-sources-4.15.17.ebuild 742 BLAKE2B d3121b065e2470df22b82884c4786e16b886b2d665555596f08f2193d8b37cfa624e84a241382651e38811e9bb24f41a608795620ae3df5166d2b5830bdf8014 SHA512 adc5a779711a415a5e614c26e60fac4b301e0b7f101fbb8c0e06308005f355b7e0f61ca613d5135c70b6b266b33b408a6962ab20b816b68826ac1e81451af5e9
 EBUILD gentoo-sources-4.15.18.ebuild 742 BLAKE2B 863f9406c40f4646d01f4b023b393cce2df9d8570840c9d3b59b8269deaf646f4f94cff234c7284df02599dba189edbb741edbd6d68c9514299aba6093964d46 SHA512 c8114271cbf01aaae62118c40c15e178ff87854d1a3d27df49fae729bbf472626e4e30458e687db36174a6735a9ac3fdc3b5d04421cb71493e5ab3b412a910d1
 EBUILD gentoo-sources-4.16.10.ebuild 742 BLAKE2B 236aa15d94c986e007093b39cb21e36851191a907a7003f4cbffcbfa8075a69119926cdde47e8da9e88b31dac43a5e92ecaac1d20bd8534588f662b9b08feecf SHA512 fab04b4e34ccd0cf93560d2a27eefdb8029f6cd6f8c93590b1bd091b085a96faab788b25b764bba9917cc33385b4900fada87594aac17e79ad1d76e6f7ef0ce8
+EBUILD gentoo-sources-4.16.11.ebuild 742 BLAKE2B 9b4b7701175fa852367e1dd0087d34a2b8439cdc800501cc95d5139664172ba3a42c84d7c8ababce19a50c7e025b7107e4d286a1cb17e8402ff61d85910dd605 SHA512 fe6760cad937d2e862172c7e4e0a6a2a03efeea2dea4a141261f357f8759afc80387ed1d13378c40de09e612ae3f88c9fd11c4c900e949dea373ae5da8024770
 EBUILD gentoo-sources-4.16.3.ebuild 741 BLAKE2B 64ad4fafa2243d25c4798c2020c8a16ce32c4212812023073b55a977021e150b52bb2fcd13133831233be438760178c71c03423643b3729e11814ad55aa71c95 SHA512 2a26da6cc8938e404fde1ae53aba5531521d87cdfb1ccda14cb64584df2595e9293d303ebcb09c384c2134b4a5e0e6176c0d5d77de6a55f463113e4b94a06d70
 EBUILD gentoo-sources-4.16.4.ebuild 741 BLAKE2B f1e5fa6acf69df9a5e78740ee57f94033bc417bc64b6af21df7016d4f20b10b5498c49eedfe042bb2a5c020d30baeab532d3296c5284cd8de1e95bd342b80c60 SHA512 2491e573773f078689ec07fd1c836b55032fca2773f5ec8195a4c3fd2e23c8356bfbf0a51976621c074491881352c3fc4ce35723f2ae2c1c55773b5dd799b463
 EBUILD gentoo-sources-4.16.5.ebuild 741 BLAKE2B e0a48fdf626979d01025952d1004c9c8b59cb5891d7bc966ad1f4dc38f636da59b4237f9d1ca078bb4e787d06e61a83886425a558495f0aa1b43285a7cbccb95 SHA512 19bb33b52273b61e22a9cbe31cf5cfc09a671fae876131fd37bd0c28d2bf75403aa80f81b6b52cfdbe37de383dc4d10d76029a17f37c10255006001305d7b767
@@ -155,6 +166,7 @@ EBUILD gentoo-sources-4.4.132.ebuild 743 BLAKE2B 96d6a21bc5179eaa4c8cd07615d4db6
 EBUILD gentoo-sources-4.4.87-r1.ebuild 734 BLAKE2B 1f1cb7f7355792bcb664b74c7476e9f8d0e90ca648b819ad44e0a4339210867658584a206beb21842633b7537b2b7f58d43b391d4c4f98fd700280a72662423b SHA512 3a59950c522313a2f9722ae6d4801cd03ddb9430b58f17ab9e8a500fb9a083dc59369de7ad59de1064412f82bdc21396c7280a6af6fcb0a4524ac93f758d85ff
 EBUILD gentoo-sources-4.9.100.ebuild 743 BLAKE2B 1e901227a2e45994ad3658fff49d125e23183ad9ebb1e1729cf9832329a1ac8e2d9e01b5a638097aa9775a3706bc2ef29f1bfd8a7c22a59de370a199818f7bdb SHA512 d95fa4ba848c9e3748b911bbd07619ff0a53de10732dab6678bea00e5847756f254a1b9e88822d4356f304de3924ed23169fc5a5601301b042263937886ac9ec
 EBUILD gentoo-sources-4.9.101.ebuild 743 BLAKE2B ffc4c00e086076225db245e5778bbf4be967fe5fd706959bb5c76d8b83b910fed6972b7807279cbeb94246533d0112cf51b1263193f332e80d041e5c8e6166c9 SHA512 e8006ef4f7db559cb2d571744762cfa2c05367e434ed89556a96ba8c6bc32395ac4c1551caa9a5294742d23e8303f35308a52a88b590d1ff8f2baf1a9cff4d59
+EBUILD gentoo-sources-4.9.102.ebuild 743 BLAKE2B a61846027590fd34539fcdbdfa16bea6d1f33aff774fa6df67f2de7436854adb3c16daad0e76479e074df6600d4defc4cf0ec6c7490cece9cd6ccd134a90c4f3 SHA512 245e1a63fde4c275dc1fa67a12727e29a5aa89d60384eed9d8ed789fa726808daba7751240cd448fd716588fe4f38091697c3a18062d61cc654705baa6c19c83
 EBUILD gentoo-sources-4.9.49-r1.ebuild 734 BLAKE2B 169d43bf5276e6d398a72a22b968f571d6122d6b88f61e757f27ccc3d732b171bcdffc27d502c440818e93da732495c258844f047f2f64672fca5b595d15b906 SHA512 8a42455eb119e89f3df16a675486efc5ba208a94ac255b0f4033cb699dea75b9ad7fe28acb1df044b73f16f1bb50c08bbc09bb59e541286893048190c5a74a8e
 EBUILD gentoo-sources-4.9.72.ebuild 738 BLAKE2B 1c88296bca01b95ece33afc5dbc5fe7ebc29ec545fdbff53dae3113b028392c41fc5557e949c4c07503fdc88b5c5f925b79316e48bc8ba8978a316554a2aa191 SHA512 d1c3b5fbcb59ac3ab703b8dd62a8f4f213dbc14526be00a34c3bb480dc4eb068297d02ab0fff33bd0d6fcf8973e862df74ca31e774cbdb0a437edcf892c233e9
 EBUILD gentoo-sources-4.9.76-r1.ebuild 737 BLAKE2B fac5a16968488d560fa550e85e6f73c7f356d23f287abfcf1a2fe1aad048832f46bb152db6afcf2cab4daea535f7c51dff3672062d8379620cf2451d5d3e65a1 SHA512 6e3af1a01abcadaef0846cb4fb861d583561fb54937d60d22803eac7a7d62f1d4d1e3e05202fad77c9699a8d4a34d09ff915cf2af948a4e64224c4d1a1818d2b
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.43.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.43.ebuild
new file mode 100644
index 000000000000..93f70e9b8b53
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.43.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="48"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.16.11.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.16.11.ebuild
new file mode 100644
index 000000000000..5c9caf450f21
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.16.11.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="12"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.9.102.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.102.ebuild
new file mode 100644
index 000000000000..9c760e3ed461
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.102.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="105"
+
+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/kpatch/Manifest b/sys-kernel/kpatch/Manifest
index 876ab05afa5a..2db44a63ed4d 100644
--- a/sys-kernel/kpatch/Manifest
+++ b/sys-kernel/kpatch/Manifest
@@ -1,4 +1,6 @@
 DIST kpatch-0.4.0.tar.gz 124433 BLAKE2B 6ea18c4d590426f9db95e16d555307e264d1b7db362d421f72eaaf897703f7883c44cc49bd98b48d8789453962259d0b0e301aca325c94be6c21061d0621a9cf SHA512 0bbb49a06d02e9eb026be458eb904cf50f50461a67f16835a306bb3a4a57ef88b86ecf6bca6dfc91b921ba87b4c8b9d532e2a77e987e7c71583b8cb53520a1d7
+DIST kpatch-0.6.0.tar.gz 153337 BLAKE2B 5c132b885f9f8bc3c7b514997a0b8b77280d0387431dd3eb73f45da4678b281961a03452b0ec590b37fc9568192135528a9a42bd5005530bd8b9175fe652f7b1 SHA512 7ac27639773a851ad6689743100ff973b4e3a30efc386bdf413c8f6167068d93c2d18820d87e1f1e96405fa3545dcb80a72db0011f07218a692f91f1f3c3655a
 EBUILD kpatch-0.4.0-r1.ebuild 1921 BLAKE2B 3b35c292949f73c13efe8b429e96034d9982d923b937962a184dd4d742d31e86a05433db9a4e44aa3ab043aea3e7d2c9b5d619ed53c2833f16640ca6244f163f SHA512 ab0db6ce451aebd04142d1439f8e2e66d36a6e7abd548f3fbada115650d512c62c1a01918d4529ead08b06e66b5ad6521122efe788a35ca09c65ce9b47e94300
+EBUILD kpatch-0.6.0.ebuild 1921 BLAKE2B 9a4ea4154f650aee4364f5e727d60659f5fbf35a6b1a681410a92454854d7f45078f4cc240aa0b60cef079873fa202c719ea3e67c5bf2888a041ca6fcbcbbb6a SHA512 fbda6b2f18f0d3256d6fec90549027417867456b6d86fd6fd3983a2d08752f672bfa5f56d2de316c47ff5ebfe1bf86d985680aa75441d488359c2ac0a64381e0
 EBUILD kpatch-9999.ebuild 1952 BLAKE2B 40d2f4405a96d90e1162aa05110ffded881e3a2a75edab8716f877495502dc4fa3945ebbef9f6086b30ff97194eeb99a686dd811d5c5e5a0806c2545edbd7189 SHA512 f60f2e00b2194083b84bb92d31c0b8c48bb108cf5ba1ff0837585f91950c9c9101bcd8bfeab59e31dd63320cd4f37212a9f08fe8c68101a0891f675457f30adc
 MISC metadata.xml 308 BLAKE2B 326cea5516e2914ea6b9077f6aea441891ec7d7bfad7f3d98cab3179aeacb559d2535395f69732b397afa6651938ad186ca6b2b7fb249f1c8c612c4349347201 SHA512 1094168fbbb63ed9328edc7ab2904b648f30f893d3fde7c2de2716a2b4bbcd32a72bc271974e2b006510e8abcebcc6f684670b550ff44e6267954c519eb06469
diff --git a/sys-kernel/kpatch/kpatch-0.6.0.ebuild b/sys-kernel/kpatch/kpatch-0.6.0.ebuild
new file mode 100644
index 000000000000..e9cdeb7b5ac3
--- /dev/null
+++ b/sys-kernel/kpatch/kpatch-0.6.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit linux-info linux-mod flag-o-matic
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/dynup/${PN}.git"
+else
+	SRC_URI="https://github.com/dynup/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Dynamic kernel patching for Linux"
+HOMEPAGE="https://github.com/dynup/kpatch"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="examples +modules test"
+
+RDEPEND="
+	app-crypt/pesign
+	dev-libs/openssl:0=
+	sys-libs/zlib
+	sys-apps/pciutils
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-libs/elfutils
+	sys-devel/bison
+"
+
+pkg_pretend() {
+	if kernel_is gt 3 9 0; then
+		if ! linux_config_exists; then
+			eerror "Unable to check the currently running kernel for kpatch support"
+			eerror "Please be sure a .config file is available in the kernel src dir"
+			eerror "and ensure the kernel has been built."
+		else
+			# Fail to build if these kernel options are not enabled (see kpatch/kmod/core/Makefile)
+			CONFIG_CHECK="FUNCTION_TRACER HAVE_FENTRY MODULES SYSFS KALLSYMS_ALL"
+			ERROR_FUNCTION_TRACER="CONFIG_FUNCTION_TRACER must be enabled in the kernel's config file"
+			ERROR_HAVE_FENTRY="CONFIG_HAVE_FENTRY must be enabled in the kernel's config file"
+			ERROR_MODULES="CONFIG_MODULES must be enabled in the kernel's config file"
+			ERROR_SYSFS="CONFIG_SYSFS must be enabled in the kernel's config file"
+			ERROR_KALLSYMS_ALL="CONFIG_KALLSYMS_ALL must be enabled in the kernel's config file"
+		fi
+	else
+		eerror
+		eerror "kpatch is not available for Linux kernels below 4.0.0"
+		eerror
+		die "Upgrade the kernel sources before installing kpatch."
+	fi
+
+	check_extra_config
+}
+
+src_prepare() {
+	replace-flags '-O?' '-O1'
+	default
+}
+
+src_compile() {
+	set_arch_to_kernel
+	emake all
+}
+
+src_install() {
+	set_arch_to_kernel
+	emake DESTDIR="${D}" PREFIX="/usr" install
+
+	einstalldocs
+}
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index f6ae97a93744..3a993ccd8fe2 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -9,17 +9,17 @@ DIST linux-4.9.tar.xz 93192404 BLAKE2B 83ae310b17d47f1f18d6d28537c31e10f3e60458c
 DIST patch-3.16.56.xz 1956224 BLAKE2B 27db858a51be5d57ff1f3d5409d511df5002f542584d80b64d2303f1569c0502d0d15783a3e36facc2ee9481ada4b8f08359a79972b4a3ca07ac180c2e607c01 SHA512 e1c1c004c2ac52fb6944718c82b6c70a9ee4175943fc8477b298dbbde42d16f1e1c9387f9d5ca05958b3efa0e851eb0105daf4a0d59ad836b31ec3919ee857b6
 DIST patch-3.2.101.xz 1942280 BLAKE2B 9000a0e0d23a6e9e8651c6f2f936e0aa14e6660ad27fa8d29c35fc71e4cb0590337460a80aecd5725804546a20a610f367ee9da5864d53ffd1fea45c0e43b2a1 SHA512 00a8d179a60bf628ea12595d866c25ce5848e9c68ae44d7a10388e5ab2e99fb7f3ae77d57689a9ae161c9084d5de84c595f0f96e4d8eaf60230bd28f3435acf2
 DIST patch-4.1.51.xz 1456804 BLAKE2B 8c95a6a85258c1ac13cd475b73ecf70bdd82018b74be68f34345ccdea88a2acc464117dbdeb764d11251a8a023eac2558753431025c9849ad62c60cecafff562 SHA512 37a5d84e15d1ca9096aff7e762007e6abec370d865a91e6f254412a322b3f371d95cb3dc5143118583a2a553ebad93f425439fdd0985a6ec2a4ecf65dcb3e1ac
-DIST patch-4.14.42.xz 1126044 BLAKE2B 7b180d715bbe338b8ef34572c3d2b3ef02aaa51ec552cec7ca4cd979c688cf20c068332c92d0f0535e988311a52fae5f08343fbb15fee8fe59dde79addb96bc1 SHA512 5480a05cca0c0d30dad2a8f5d1165d9e07d3d4252f4131c3f0be89261afed36859c42ba1e7eee8cc7ae0964a226d7435ccdba652a8390bef9153e1882ec190c8
+DIST patch-4.14.43.xz 1144288 BLAKE2B ae4e70f674fa6e8d738a6d2fa643490a9e82ced855dcdf1fc9bbfb0ec12b4dfaadc4eee2f95c68a7faa6fd1c34d8717c9ae01169a19da2b30f7921170d79aae2 SHA512 51e7359df7018b5f9d8d1c9fac55f3519df1700ac0dca2b625a08853f45c108511c13d256ea8b2f8af5159748059075cf63e451ff39e9b2c10c5e2df25dfa2ed
 DIST patch-4.15.18.xz 456456 BLAKE2B 94b41c7ada6547c6e2823602e11504f8ba57c9b1ac9bfcfb156a35ec42415df55fb1faeb6f548f6d52cf435bd5109ec03d35c599ca742160672ae814281f91db SHA512 c40dfeedce4876fa4df51ae93978b2a8d9844ca04cf890a6d708fd85786dcda99a6611066977d5a4d841a03af8838d6aa6e1bc69084720fbf7147058b8394fb8
-DIST patch-4.16.10.xz 221656 BLAKE2B 7232657cc83f1000e745e4e2b2b1b2c8dde3d0f53115534bd2559ec9a4e1eb49fb29613a9a97a421f56aeb8fc720e08540c2ad0a55a1216f2075f893af1fe32f SHA512 53d700ca245341cd6493ecd01af069b2015564c9d7514751348e57047838bb1a6379f065dcf21312cf8f861f5569d28e7445846b40d14c225c644a69c09da5d1
+DIST patch-4.16.11.xz 253100 BLAKE2B 3edc6d9b2291e27f5d88e92cedfa9d6edf5509f2c82d586389dd08d18f70db47865e4d51d7c5844a12254d4cbc9fe87b3874cf4364ae7748766c793aa5f74c61 SHA512 03c2dbd6f5bac48875a08f6ef3603379fd5736d7b4d1abe1d4271d484ac5b08790c8d28177cec4e45421a303eb539fc79e15a9b67383b249b7d999e47652135c
 DIST patch-4.4.132.xz 1883948 BLAKE2B 77e06affb5b3ec82cbb1dd95e87e896813c1891fbf0d6267508e5966182161ea1017e0d70667e6280fc531724e69f366e79987ba65ec953f789e7dc7696e5443 SHA512 eb4c2c9e4e91ec5a89039de1bcaef7e5003a5e353b000483a6e942bafa3499f718f91f396a8d76eb35e097f3d03bc0226dbf498be0f9a75e7d19da0341e41eda
-DIST patch-4.9.101.xz 1835168 BLAKE2B 8adb0f070808cb42cc39f2ca1c0e64e211c8a902b821a6eb8efd04817979341ae73f4050354da54e182510ace372b869e036e798ad33038b44f93ae6417ede77 SHA512 4f63b7768f6dd36e2b24f62f36fd72d1407c32c66902788f671db246589751ec930275db52dea4fb8068e3204bc3a12f5cbaa5b79c9c69daccb5adf76f2f77fb
+DIST patch-4.9.102.xz 1851224 BLAKE2B 5fde2b526076b7e5a0963de6a1257ff4b1b7bb2155749284b392c17503cf34e28dc475d7aef41a814242764d31704783302697488f07040dec0045fadd894cc4 SHA512 653ee9eb12dd5a0b7489feee8b3370ead3061e1e45e10d1636d39a0dd18812c361320bba6fafc03e80540b70423ef5f8468c41b8ebf52b0aac05b1b3ebde8445
 EBUILD vanilla-sources-3.16.56.ebuild 426 BLAKE2B b25609c42424a49dc380bcf42e9bc0d45c147ef710d7895d1c79476c3e24909fb789fa02b7947664ce6c7c27de95066f472244e3ac421a8f6fbf5db9508e7349 SHA512 5d983013c6ab32e02c62b1f9d83f7d0246eb5f89910915f5807252b4817128fb9861be9b1b761f0e63a3c5d0f72e5259dcdcdab7150c666946bfd8a84f1df842
 EBUILD vanilla-sources-3.2.101.ebuild 426 BLAKE2B b25609c42424a49dc380bcf42e9bc0d45c147ef710d7895d1c79476c3e24909fb789fa02b7947664ce6c7c27de95066f472244e3ac421a8f6fbf5db9508e7349 SHA512 5d983013c6ab32e02c62b1f9d83f7d0246eb5f89910915f5807252b4817128fb9861be9b1b761f0e63a3c5d0f72e5259dcdcdab7150c666946bfd8a84f1df842
 EBUILD vanilla-sources-4.1.51.ebuild 426 BLAKE2B b25609c42424a49dc380bcf42e9bc0d45c147ef710d7895d1c79476c3e24909fb789fa02b7947664ce6c7c27de95066f472244e3ac421a8f6fbf5db9508e7349 SHA512 5d983013c6ab32e02c62b1f9d83f7d0246eb5f89910915f5807252b4817128fb9861be9b1b761f0e63a3c5d0f72e5259dcdcdab7150c666946bfd8a84f1df842
-EBUILD vanilla-sources-4.14.42.ebuild 426 BLAKE2B 847290c74c7ae6c74a2163a83d073eeceba141b71012eabd6d5df71f40202653f41a54b166bde5b4d2bc47264ab26664c895ac37e310eb8a01b8775dbbde9d9e SHA512 79d3e16bbc665ad13361e7fd9b385441183a3d420710f39098e48f0e8eb737d7aecaf29b79a2fcef30dd4e3b341874b3d0dfcbe02e4b0bec30fd201cd4504551
+EBUILD vanilla-sources-4.14.43.ebuild 426 BLAKE2B 847290c74c7ae6c74a2163a83d073eeceba141b71012eabd6d5df71f40202653f41a54b166bde5b4d2bc47264ab26664c895ac37e310eb8a01b8775dbbde9d9e SHA512 79d3e16bbc665ad13361e7fd9b385441183a3d420710f39098e48f0e8eb737d7aecaf29b79a2fcef30dd4e3b341874b3d0dfcbe02e4b0bec30fd201cd4504551
 EBUILD vanilla-sources-4.15.18.ebuild 426 BLAKE2B 847290c74c7ae6c74a2163a83d073eeceba141b71012eabd6d5df71f40202653f41a54b166bde5b4d2bc47264ab26664c895ac37e310eb8a01b8775dbbde9d9e SHA512 79d3e16bbc665ad13361e7fd9b385441183a3d420710f39098e48f0e8eb737d7aecaf29b79a2fcef30dd4e3b341874b3d0dfcbe02e4b0bec30fd201cd4504551
-EBUILD vanilla-sources-4.16.10.ebuild 426 BLAKE2B 847290c74c7ae6c74a2163a83d073eeceba141b71012eabd6d5df71f40202653f41a54b166bde5b4d2bc47264ab26664c895ac37e310eb8a01b8775dbbde9d9e SHA512 79d3e16bbc665ad13361e7fd9b385441183a3d420710f39098e48f0e8eb737d7aecaf29b79a2fcef30dd4e3b341874b3d0dfcbe02e4b0bec30fd201cd4504551
+EBUILD vanilla-sources-4.16.11.ebuild 426 BLAKE2B 847290c74c7ae6c74a2163a83d073eeceba141b71012eabd6d5df71f40202653f41a54b166bde5b4d2bc47264ab26664c895ac37e310eb8a01b8775dbbde9d9e SHA512 79d3e16bbc665ad13361e7fd9b385441183a3d420710f39098e48f0e8eb737d7aecaf29b79a2fcef30dd4e3b341874b3d0dfcbe02e4b0bec30fd201cd4504551
 EBUILD vanilla-sources-4.4.132.ebuild 426 BLAKE2B 847290c74c7ae6c74a2163a83d073eeceba141b71012eabd6d5df71f40202653f41a54b166bde5b4d2bc47264ab26664c895ac37e310eb8a01b8775dbbde9d9e SHA512 79d3e16bbc665ad13361e7fd9b385441183a3d420710f39098e48f0e8eb737d7aecaf29b79a2fcef30dd4e3b341874b3d0dfcbe02e4b0bec30fd201cd4504551
-EBUILD vanilla-sources-4.9.101.ebuild 426 BLAKE2B 847290c74c7ae6c74a2163a83d073eeceba141b71012eabd6d5df71f40202653f41a54b166bde5b4d2bc47264ab26664c895ac37e310eb8a01b8775dbbde9d9e SHA512 79d3e16bbc665ad13361e7fd9b385441183a3d420710f39098e48f0e8eb737d7aecaf29b79a2fcef30dd4e3b341874b3d0dfcbe02e4b0bec30fd201cd4504551
+EBUILD vanilla-sources-4.9.102.ebuild 426 BLAKE2B 847290c74c7ae6c74a2163a83d073eeceba141b71012eabd6d5df71f40202653f41a54b166bde5b4d2bc47264ab26664c895ac37e310eb8a01b8775dbbde9d9e SHA512 79d3e16bbc665ad13361e7fd9b385441183a3d420710f39098e48f0e8eb737d7aecaf29b79a2fcef30dd4e3b341874b3d0dfcbe02e4b0bec30fd201cd4504551
 MISC metadata.xml 642 BLAKE2B 6aa41c5f612d15c0b53c6aed058b2dd01bf9d7dd1ef8abb188f85cad84b43be94b3279d7c7ba50b3ac1b112c385ce01a8a8bf77d3a85dfd8e18838d7def5031d SHA512 b7e1d4e4e6a4a75046ace025fa1b42a38068dcbdafddf2b468287e9280832173617202c036b1ad1fb42c2f2e16920c44f0580039e3844cbb73402143361f764e
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.14.42.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.14.43.ebuild
index 2e4a132369ff..2e4a132369ff 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.14.42.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.14.43.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.16.10.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.16.11.ebuild
index 2e4a132369ff..2e4a132369ff 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.16.10.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.16.11.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.9.101.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.9.102.ebuild
index 2e4a132369ff..2e4a132369ff 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.9.101.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.9.102.ebuild
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 7a981219d9c9..8ce73a7427d7 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/e2fsprogs-libs/Manifest b/sys-libs/e2fsprogs-libs/Manifest
index 21a2fab2f1b7..7eb994455f36 100644
--- a/sys-libs/e2fsprogs-libs/Manifest
+++ b/sys-libs/e2fsprogs-libs/Manifest
@@ -4,7 +4,7 @@ DIST e2fsprogs-libs-1.43.9.tar.gz 595452 BLAKE2B 2f4c8b07abe343f304f3217984ec03a
 DIST e2fsprogs-libs-1.44.1.tar.gz 714486 BLAKE2B d2794e5b3a28b2b3ef811396ffb3ac139c294f8a4407cd74ae0f8c6b39d5ebcdc464cfd2e99e1f8fd3e2be7bcb2016c019f586810ccbfef15696fd2a21cb49cd SHA512 2b81454230def3f499a634e38342f323d3708be460ec0d69a7de7d9c9fea657a84759f7dd09b81e7dc6fbe07510c06c5e55317374a25f4ed3b6dfc58881132a3
 DIST e2fsprogs-libs-1.44.2.tar.gz 715214 BLAKE2B 696702563e30f877f1ced23c116240b6f5314987858492908396a5190019df095165e3e2995bc00330a1a3c19052773c483928db93bb2f9f01dc73de69858edd SHA512 c133c779b7ad4f51977d5c5627810f3808b0e40559726e99eadaa7beaecf08d09c6da6041c376148e71f94c60c2be185c9ed0b1c3fbdeda5e113a32f10b1b6c3
 EBUILD e2fsprogs-libs-1.43.6.ebuild 1854 BLAKE2B 6751907b5bd67f9b1aae0133eae4c9df1a29fa06ac359c3af904ac490b32837cdae4f2c196ba1a7cc3e689cb0d34b35fff09adb493ea4c091dd3e53de6074c96 SHA512 565b03d3728d9044166e7e61a0ade32cb31b47697e21a0230f2fe5ad6f2ba096b9c0e58db9993ab359ed348623e05b8a29a25010212396f1191eeb7f4ab083e7
-EBUILD e2fsprogs-libs-1.43.9.ebuild 1873 BLAKE2B c4f90d2e5c1d30e9881b9f44c4d31093d0effeff57687ccf1f44b27e1dfaa2726f945f2199181c62a9422ae787085e181792742137df4db4f5555a1fe6d24bf1 SHA512 36875094f497486c1975e70b560369649f7afcf35b74301336f5da8f9de055aaa94abca59855225d7eae3c205a5e5994e5e3869407a5a07fc2314b5c43fa0e32
+EBUILD e2fsprogs-libs-1.43.9.ebuild 1871 BLAKE2B 6eb2d568ac35372e10e5deca3d663c2729d6b85e153d3123972141a97bb25bfd5b048cef0c6254456a7ab33fdf035b30858d81ee9195a52733163cb768274b22 SHA512 d5a411373dc9aa77d2b6fd6a2789eec2e0c18b31a6cb5634e9cfa091d94a0ff64fa9880f4ef4bfac5b3ac4b6581973e20e8609c85abada5cae0a6b01c43962df
 EBUILD e2fsprogs-libs-1.44.1.ebuild 1878 BLAKE2B 8abd48e95d66949bf5451ae3820f2da81eee7a0fb662c7da1a46a013a87da3858ba245c8ae84ca9e1d443ec79dcfdc97bb61b55c943b816c7f9f927174a868b7 SHA512 96e1d98877c800cafc48065584c92711b64af5531cfb70a97fedfabc3cd5c5126ac8923582456eda24ca655dd119206929e6171c453e146ed8cf1c332ba252fa
 EBUILD e2fsprogs-libs-1.44.2.ebuild 1878 BLAKE2B 8abd48e95d66949bf5451ae3820f2da81eee7a0fb662c7da1a46a013a87da3858ba245c8ae84ca9e1d443ec79dcfdc97bb61b55c943b816c7f9f927174a868b7 SHA512 96e1d98877c800cafc48065584c92711b64af5531cfb70a97fedfabc3cd5c5126ac8923582456eda24ca655dd119206929e6171c453e146ed8cf1c332ba252fa
 MISC metadata.xml 329 BLAKE2B 03dc6edded63d4d10b064515402e963a4770ffc36e17de351d5617849ea138796e4bf20c7feb383cc8ca3a88fba1caaf68b5411241a2558db832f9b659193644 SHA512 39e1ddf508b648594e45cd4e72a41997ab4ae7b5cfdefa136a18a1e68ac5a2bfb1f6a12328f1faee5501fbeff0c61cd91417de717c4869f530a18a05ea5d4c71
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.43.9.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.43.9.ebuild
index f389b0e609ef..985969c9aa31 100644
--- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.43.9.ebuild
+++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.43.9.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint ~x86-solaris"
 IUSE="nls static-libs"
 
 RDEPEND="!sys-libs/com_err
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index c30e8ec05bdc..f9c34985051b 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -44,9 +44,9 @@ EBUILD glibc-2.19-r2.ebuild 40613 BLAKE2B 3cb96b82da71e6019d1e2721de6287366ae19d
 EBUILD glibc-2.20-r2.ebuild 4947 BLAKE2B 24062f002678df912ced724a3d919bc2f07476c98000092cb3fa3f2be1836db57348c88b6fc1da7a9364103136eecbe687fe365d131f10c82de3cb0edd3eb8c5 SHA512 ff76e9173ab6bfccb1c659f79cefb93f6fa6266adab40a3816f56acddb7866cee67ba6bfa8d1b9988eff755e9d1a879e62973fc332566c185f019af5e17a9f1d
 EBUILD glibc-2.21-r2.ebuild 4922 BLAKE2B 99bd1be39a3643f845c0daff4f7b19a0abb37de95a8494b4dc9d29aaee74281d4a252792010ff4935e5d661a7240cf4d5944907267e9059ce208b59891528085 SHA512 ff896f5bb20502db03f00d1438a06a026e0940106e368b4bb27abb72bb927fb235371a5a6b01130e35906f17c478e79e44bec6dda02bd5fedb30552bf4a6cc86
 EBUILD glibc-2.22-r4.ebuild 4973 BLAKE2B 6f4f632413cacf34a2a011d8cc83d0a92deaa0980aa9b6fe0d11cf45850a7bec482b77c8a0aa00b66a2103d4ff03ca16b0b7d38cd089b8f010039faaaf26d76b SHA512 1a056e465dc38dc4956b4707ff9fc9da8df4046d95edeb3dd6ae36fc229545acefdd317c50961a153ec83f21cba3d645d1e45b526157f8209a932242c2b08c33
-EBUILD glibc-2.23-r4.ebuild 4975 BLAKE2B 9a0d3a3689896fab9f71fa20a83be5f2563f023040563f85385f8d28d32d6eee7f144acbdf4a35d6c1a65d56289ae72813b1d7f561f514e391e95dd4e43a4902 SHA512 9662308abee890c1eeaa45a49c4238448c62400d8b8661fc7588cd78aa58cbe044a0c15f46a6e8d161a203f3645600385fc2200d4d6434c24e496781aa06b04a
+EBUILD glibc-2.23-r4.ebuild 4972 BLAKE2B 4822ca6b994dbfcf13b361628f43f70139b758b9eb97c096db4c4613080360f1062d5101b724278d51c6a6f2709fa2f61397a90014aa356d075506582cf6dbcd SHA512 040ff4940943c75f0735fd4220e6d1abfbd03b75d81acdb35b86a61905a4c9f5711e08907fb262544729a884b8447db4cf5f4405597a31114a05217506e0d1ee
 EBUILD glibc-2.24-r4.ebuild 5011 BLAKE2B 71050f0449074652d4fabc709326025b4de2e6642fdde87898acfde6f99cce95f4d7b9e1e7f9eedcdf6d2fd70ebf3c2860599ec36ccf68e0e633ec794f8ce0e8 SHA512 1cb3bcbd7d9d7f7c095bdff7c81d0acc3b4700c0b8a9d4fd0499cbf53abb55c67ca3bc3cce125916d238eb8cf6f6d69989af27defd6f194aaa5ac27cdda94eb9
-EBUILD glibc-2.25-r11.ebuild 5001 BLAKE2B 30988b55a9f655033db8cb2ac3c6ae0183c8a240134bcf26b9b98503a2351bf30fb3742cf84c23b4c81d56797b0c83d138341d6335659046784208a6404776f8 SHA512 43118e02defd07a02b3a9bd8220ed0dcfb7fb0b2c4bcf3b6d510a78a978295814e44ae329fa4a41ef99a73c10d8fbf9a31f84a53a9196bc848af28f3a33720d3
+EBUILD glibc-2.25-r11.ebuild 4998 BLAKE2B 87086150ecd3d0f729e10fbcb302da77c30ee4138abd87df29bccb6b4dc2dec3a647bcc8f00481668cba666c24f2eb7c69985f7ee0457aa04860ef7573fbb727 SHA512 3ca07ffd57bb30e0f9b8d8ad075aea275e89364f8fc59dd55d9c58b4f3881cb895555814c04ec259c7dc1162c549c66d8cad0ba2afcacfcef8517711a3376831
 EBUILD glibc-2.26-r7.ebuild 25629 BLAKE2B 1ad33ffd21b8ddf1dc8a8a6b3a308a108ed27edbe3d7acb89bee70cd29d88628cb6cdb98e09029c705d4476f7fdb488e4ea7e266719844be5b28b2c5a809c30d SHA512 02e8091061e205f9a5339afd3c3b4d0246058a2f9605f01491c05e0b528ea6741d832b0fa3d76433136bb17fe664ca7f11c4a2f152bcca1dc0f9564a2155b907
 EBUILD glibc-2.27-r2.ebuild 41869 BLAKE2B ce05b276283a1b5128b440f830ebbd9d7508e5f06b9bfbf97d5a1fcdd08fa85761c8183459cd7cc4c400e4b047a953d6a0ade75ef7aa57515f400b4dc5b4dfc7 SHA512 ace14c3697f3dfd4101e01ff1d4f71354e96096530a9996811b7cecc97d03e2047620d8fe30596b083e47327100b58ab39fe3f28284710efa66de2f34e95b007
 EBUILD glibc-2.27-r3.ebuild 41101 BLAKE2B 93981d157cad9b235812a6de7b121bcbb66e62756477a68259c24fcc154241a0e89a62a591f1d0d561f0334cb0e5703d6154823cecc7d966ef4a5ee4c1d2a759 SHA512 09a4a31beb76527e4cbe6dc5f5d401bb7d9241d724a502caa1dd2dafafe41c1389e5e0046b602e399554563155fab54518e7bf563d60e4346661ed494bec989a
diff --git a/sys-libs/glibc/glibc-2.23-r4.ebuild b/sys-libs/glibc/glibc-2.23-r4.ebuild
index 18fe392f108e..83000a9d6622 100644
--- a/sys-libs/glibc/glibc-2.23-r4.ebuild
+++ b/sys-libs/glibc/glibc-2.23-r4.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="GNU libc6 (also called glibc2) C library"
 HOMEPAGE="https://www.gnu.org/software/libc/libc.html"
 
 LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 RESTRICT="strip" # strip ourself #46186
 EMULTILIB_PKG="true"
 
diff --git a/sys-libs/glibc/glibc-2.25-r11.ebuild b/sys-libs/glibc/glibc-2.25-r11.ebuild
index 6e74ceffe238..db95b9d9ab61 100644
--- a/sys-libs/glibc/glibc-2.25-r11.ebuild
+++ b/sys-libs/glibc/glibc-2.25-r11.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="GNU libc6 (also called glibc2) C library"
 HOMEPAGE="https://www.gnu.org/software/libc/libc.html"
 
 LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 RESTRICT="strip" # strip ourself #46186
 EMULTILIB_PKG="true"
 
diff --git a/sys-libs/libselinux/Manifest b/sys-libs/libselinux/Manifest
index 0268ff6ae85d..fd7bee452d6f 100644
--- a/sys-libs/libselinux/Manifest
+++ b/sys-libs/libselinux/Manifest
@@ -1,13 +1,7 @@
 AUX libselinux-2.6-0007-build-related-fixes-bug-500674.patch 3565 BLAKE2B 6e06cce02897a17e549a6fdfea1ecd0c5826c8810893d8ff0167dd72ce3c442ca2c433e4cccf9ed857b0b05bea1bee8dd37d8c212a7a2b10327efbfb4e18dcd5 SHA512 d377c6be001edb874e443d1a3992633bffef8b243ba73757e83b348d9db988be1af1239820471f4d319ea76a308148b5b06c23178910bfd032892ea861a47cd4
-DIST libselinux-2.6.tar.gz 203119 BLAKE2B ee18d11258e8ea1611d46b5c748bd972084809c8c02832a5dc7d58577760330f58ce4a01e26e9e849eb26da7a663bbdaae74112ecbc16820de1b150829bfbc8d SHA512 906e1bf98c669862ab4f4e883d511db8d739a5763dc857c9405ad3cc6c70766a482853d07134698a1a98257a8632cc756d0549a7640c2915d051714f502ff14b
 DIST libselinux-2.7.tar.gz 187574 BLAKE2B cc6ee51d5015943dd73fe16efb2ce2478616f43eaf7da55655de50502010e69973c2de13c8a562c8814a31211a8dbd7200fa2f22761f3d0f81fa3a1d3cd1e998 SHA512 415d10306692d4323455b61fb61d7e56e53b9144276ff206d72760e1df9b04ab07c62a4d6f04bf4e5fa708f9f14b21a9801069b16ece0a0aade886950941ab8d
-DIST libselinux-2.8-rc1.tar.gz 187670 BLAKE2B b3ea4c32571a78fd535c4144487a5ceb83ab74642fec89effaec992f467b7ed3efd899487173a9b0ebb898b369cc2dadab8add38e27093beab85d21ca0b47e75 SHA512 11f51348d1b743e82b5c01abed4664b3513295436bec109e414df1ed86334422e294109c9563e6552ecab0d16e23c2fb3ea5f420f6ba3f11d35be1d9c8d20477
-DIST libselinux-2.8-rc2.tar.gz 187700 BLAKE2B 51ce916fc40fc8d551f3578d6eff87a53442e75644cb9877aa68e85d7db63057d3c33bb7a860fcb13d0fd094c23c024f9d6668ce6ff9d4294d380b0e5f71519d SHA512 052b86ba717820b482df056de69ce225090f39974b6fcc06d50d669601339deaeb2b507f7c1a18a614edee036e75a0ee59108742bd97fe78d19dda9afcdadf52
-DIST libselinux-2.8-rc3.tar.gz 187741 BLAKE2B 55b3df4386fa096fd7437c999a8eeb9623b8101dfced78033fbcb494017d02944864fd0d6fed0746e143c2507ce0c309bf6942ca13b70848d9bc969cbe2a17df SHA512 2b0bf8790fe8d8c87613542fe7618352dd195e2fe75a9d50c15851e48442a18adb59d65b8e9316ad6d044f57f1359d23215696ee5972019a9e4e812bf42fecbe
-EBUILD libselinux-2.6.ebuild 4151 BLAKE2B b87adca06f48c588d7516ddf0f88dc60cbc3d5a5ce49b35b21116a6c550fefc345c4ff47483a3bd78be2db91aa846e3edb6b1c09b5d3b4c4e2dbe1760ce9853d SHA512 dd49f8961e502b1ad81d0481a70a3b411e9c2d89e54628a099d0dd248f8ec7ec1ade6e19f5b69128f79a89a8c502b33ff368d4af17b9994fc0b1f6f506dcc690
+DIST libselinux-2.8.tar.gz 187759 BLAKE2B 1e0e1a5aa2230fd6080e921efe871e97fa9412176b72a0c9721f60c6190459e508644fa3370f3b5f513f088428844c7c615cda4567990ddee91c13e1ee88f9ed SHA512 2f15d08888fbef9b0cf7bf01893b513edc6738974e2d0eab7e3f79cef9be79cf966742b0d2693b5d2ec7defddb5f4d6c6f6280be9d4158ed41f7a18d50b9f019
 EBUILD libselinux-2.7.ebuild 4019 BLAKE2B f5dfa22a258e893e7b084196a45e45ee3a9b8ceb2da5ebef5b7d329c4e37149197d0cbdf31e569dfaaf4881120a2ec80d25911bf47c1ec4f8ee9ffa55edf48ea SHA512 62ef94ea79e87533e38a9b98128f65dc8cc7179ba4993f2d346d543db0aa3658fc1741028f7e75a645d6e514fd41ea724ed55cf5a094c71c290f6117235dc677
-EBUILD libselinux-2.8_rc1.ebuild 3939 BLAKE2B 2a485146bf59c420d7af5ea6851c8c7ec39b0475c23a3b5f777631b6c3018b85d0cc74d9266030a1bb967e2c8a12d8ce4e017c59c8ec454788d757ced7b0de53 SHA512 481654bc9d1794d2dc413dd394105ed311e3d6cfbe0bed1b35fecf4b12865e2b048e8065c36d2eb5495a19a2cd4b8fba5af94c0320c598d15fc3ab468f8c20f6
-EBUILD libselinux-2.8_rc2.ebuild 3939 BLAKE2B 7f0e198c1e7d9ea1f2726bf173ef0f1074a9de0a9fcaa93daf89f1740b9160e645b542eb29b0ba64692561a36f04ff4322d62580e9d9888f6bac63793cbed96a SHA512 34249c2d504ffeaab63e09cf210c42dadb23a4c69bb757351a27d26970e75d2185adc41ededccaaf81e4a4b5b17afa14abccf482af49b0a5deb0cdc5cddc26a6
-EBUILD libselinux-2.8_rc3.ebuild 3932 BLAKE2B 9571d0d3d99b98f73f0e4cf220ed244e282f92197c8c1b8979ebfd35353c0aea9435b10fbdd4f66657a4de0a2f7299a7ac2bd8dcc694758ec04e5bfb71382362 SHA512 d8d49b3b6326edf96b2604e512317ee6134951e5089f444f4ed6a83bda50e3d4647adb67cc2eba357776f59fcaf54cc96ca6ee2cf1d8ba14a934481e25c82c79
-EBUILD libselinux-9999.ebuild 4118 BLAKE2B f4586913bb98bd1aca0206d7a9e6ab2fa0520f5b90abe10da34358088705f509968517c7531fd6c65993ff8a530d094e35975d737c1d7a6e8937d65bf61a4ef1 SHA512 51abd162ff8ccc17589daa0dcdf2d13ff3cb1c762fad42f907e028c7631ec57cb4572532568d80bbcb082afc7c440010c57f398ab84a30ca2c2ec26e3d6de601
+EBUILD libselinux-2.8.ebuild 4118 BLAKE2B 5321583db275a10ec2f958070066114004c0f1a73f4ba6a65c5b30a35cae151f5df5c047c7fd922b65ba247c5511836ad8af2005701aaab2bf8de3413a7bc3da SHA512 2b561f15c74dac927e93f9a6d5c04375804d452de22e634d85232ec85a061450c083ebcfb9ab57ff2caef6bac0987a14d00b114fe36d3014f4eb044366638f1d
+EBUILD libselinux-9999.ebuild 4118 BLAKE2B 5321583db275a10ec2f958070066114004c0f1a73f4ba6a65c5b30a35cae151f5df5c047c7fd922b65ba247c5511836ad8af2005701aaab2bf8de3413a7bc3da SHA512 2b561f15c74dac927e93f9a6d5c04375804d452de22e634d85232ec85a061450c083ebcfb9ab57ff2caef6bac0987a14d00b114fe36d3014f4eb044366638f1d
 MISC metadata.xml 676 BLAKE2B 530269a4d717ef305f4b15fe02c54e26f6acb9d73d6c7ac6ecd1f947712912f98120820a362e7cdc8e17019e88bc9c30162d54002bdea6facb2c41931e9c54f2 SHA512 7b33e0d113637a129a7894d8720feb9024d67466b86d475fbc3398f514b2ecc28c70dc759952376208d2022a00658eb120fc3561edbb9c7ecdc4404bed5f57a7
diff --git a/sys-libs/libselinux/libselinux-2.6.ebuild b/sys-libs/libselinux/libselinux-2.6.ebuild
deleted file mode 100644
index e87f36e1844c..000000000000
--- a/sys-libs/libselinux/libselinux-2.6.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
-USE_RUBY="ruby23"
-
-# No, I am not calling ruby-ng
-inherit multilib python-r1 toolchain-funcs multilib-minimal
-
-MY_P="${P//_/-}"
-SEPOL_VER="${PV}"
-MY_RELEASEDATE="20161014"
-
-DESCRIPTION="SELinux userland library"
-HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
-	S="${WORKDIR}/${MY_P}/${PN}"
-else
-	SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="public-domain"
-SLOT="0"
-IUSE="pcre2 python ruby static-libs ruby_targets_ruby23"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}:=[${MULTILIB_USEDEP}]
-	!pcre2? ( >=dev-libs/libpcre-8.33-r1:=[static-libs?,${MULTILIB_USEDEP}] )
-	pcre2? ( dev-libs/libpcre2:=[static-libs?,${MULTILIB_USEDEP}] )
-	python? ( ${PYTHON_DEPS} )
-	ruby? (
-		ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	python? ( >=dev-lang/swig-2.0.9 )"
-
-src_prepare() {
-	if [[ ${PV} != 9999 ]] ; then
-		# If needed for live builds, place them in /etc/portage/patches
-		eapply "${FILESDIR}/libselinux-2.6-0007-build-related-fixes-bug-500674.patch"
-	fi
-
-	eapply_user
-
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	tc-export AR CC PKG_CONFIG RANLIB
-
-	emake \
-		LIBDIR="\$(PREFIX)/$(get_libdir)" \
-		SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \
-		LDFLAGS="-fPIC ${LDFLAGS} -pthread" \
-		USE_PCRE2="$(usex pcre2 y n)" \
-		all
-
-	if multilib_is_native_abi && use python; then
-		building() {
-			python_export PYTHON_INCLUDEDIR PYTHON_LIBPATH
-			emake \
-				PYINC="-I${PYTHON_INCLUDEDIR}" \
-				LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \
-				LIBDIR="\$(PREFIX)/$(get_libdir)" \
-				SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \
-				USE_PCRE2="$(usex pcre2 y n)" \
-				pywrap
-		}
-		python_foreach_impl building
-	fi
-
-	if multilib_is_native_abi && use ruby; then
-		building() {
-			einfo "Calling rubywrap for ${1}"
-			# Clean up .lo file to force rebuild
-			rm -f src/selinuxswig_ruby_wrap.lo || die
-			emake \
-				RUBY=${1} \
-				LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \
-				LIBDIR="\$(PREFIX)/$(get_libdir)" \
-				SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \
-				USE_PCRE2="$(usex pcre2 y n)" \
-				rubywrap
-		}
-		for RUBYTARGET in ${USE_RUBY}; do
-			use ruby_targets_${RUBYTARGET} || continue
-
-			building ${RUBYTARGET}
-		done
-	fi
-}
-
-multilib_src_install() {
-		emake DESTDIR="${D}" \
-			LIBDIR="\$(PREFIX)/$(get_libdir)" \
-			SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \
-			USE_PCRE2="$(usex pcre2 y n)" \
-			install
-
-	if multilib_is_native_abi && use python; then
-		installation() {
-			emake DESTDIR="${D}" \
-				LIBDIR="\$(PREFIX)/$(get_libdir)" \
-				USE_PCRE2="$(usex pcre2 y n)" \
-				install-pywrap
-			python_optimize # bug 531638
-		}
-		python_foreach_impl installation
-	fi
-
-	if multilib_is_native_abi && use ruby; then
-		installation() {
-			einfo "Calling install-rubywrap for ${1}"
-			# Forcing (re)build here as otherwise the resulting SO file is used for all ruby versions
-			rm src/selinuxswig_ruby_wrap.lo
-			emake DESTDIR="${D}" \
-				LIBDIR="\$(PREFIX)/$(get_libdir)" \
-				RUBY=${1} \
-				USE_PCRE2="$(usex pcre2 y n)" \
-				install-rubywrap
-		}
-		for RUBYTARGET in ${USE_RUBY}; do
-			use ruby_targets_${RUBYTARGET} || continue
-
-			installation ${RUBYTARGET}
-		done
-	fi
-
-	use static-libs || rm "${D}"/usr/lib*/*.a || die
-}
-
-pkg_postinst() {
-	# Fix bug 473502
-	for POLTYPE in ${POLICY_TYPES};
-	do
-		mkdir -p /etc/selinux/${POLTYPE}/contexts/files || die
-		touch /etc/selinux/${POLTYPE}/contexts/files/file_contexts.local || die
-		# Fix bug 516608
-		for EXPRFILE in file_contexts file_contexts.homedirs file_contexts.local ; do
-			if [[ -f "/etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE}" ]]; then
-				sefcontext_compile /etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE} \
-				|| die "Failed to recompile contexts"
-			fi
-		done
-	done
-}
diff --git a/sys-libs/libselinux/libselinux-2.8_rc3.ebuild b/sys-libs/libselinux/libselinux-2.8.ebuild
index edb830d3fa65..be003372f55f 100644
--- a/sys-libs/libselinux/libselinux-2.8_rc3.ebuild
+++ b/sys-libs/libselinux/libselinux-2.8.ebuild
@@ -10,7 +10,7 @@ inherit multilib python-r1 toolchain-funcs multilib-minimal
 
 MY_P="${P//_/-}"
 SEPOL_VER="${PV}"
-MY_RELEASEDATE="20180510"
+MY_RELEASEDATE="20180524"
 
 DESCRIPTION="SELinux userland library"
 HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
@@ -36,7 +36,8 @@ RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}:=[${MULTILIB_USEDEP}]
 	python? ( ${PYTHON_DEPS} )
 	ruby? (
 		ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
-	)"
+	)
+	elibc_musl? ( sys-libs/fts-standalone )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	python? ( >=dev-lang/swig-2.0.9 )
@@ -56,6 +57,7 @@ multilib_src_compile() {
 		SHLIBDIR="/$(get_libdir)" \
 		LDFLAGS="-fPIC ${LDFLAGS} -pthread" \
 		USE_PCRE2="$(usex pcre2 y n)" \
+		FTS_LDLIBS="$(usex elibc_musl '-lfts' '')" \
 		all
 
 	if multilib_is_native_abi && use python; then
@@ -65,6 +67,7 @@ multilib_src_compile() {
 				LIBDIR="\$(PREFIX)/$(get_libdir)" \
 				SHLIBDIR="/$(get_libdir)" \
 				USE_PCRE2="$(usex pcre2 y n)" \
+				FTS_LDLIBS="$(usex elibc_musl '-lfts' '')" \
 				pywrap
 		}
 		python_foreach_impl building
@@ -81,6 +84,7 @@ multilib_src_compile() {
 				LIBDIR="\$(PREFIX)/$(get_libdir)" \
 				SHLIBDIR="/$(get_libdir)" \
 				USE_PCRE2="$(usex pcre2 y n)" \
+				FTS_LDLIBS="$(usex elibc_musl '-lfts' '')" \
 				rubywrap
 		}
 		for RUBYTARGET in ${USE_RUBY}; do
diff --git a/sys-libs/libselinux/libselinux-2.8_rc1.ebuild b/sys-libs/libselinux/libselinux-2.8_rc1.ebuild
deleted file mode 100644
index b4d9bf189124..000000000000
--- a/sys-libs/libselinux/libselinux-2.8_rc1.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
-USE_RUBY="ruby23"
-
-# No, I am not calling ruby-ng
-inherit multilib python-r1 toolchain-funcs multilib-minimal
-
-MY_P="${P//_/-}"
-SEPOL_VER="${PV}"
-MY_RELEASEDATE="20180419"
-
-DESCRIPTION="SELinux userland library"
-HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
-	S="${WORKDIR}/${MY_P}/${PN}"
-else
-	SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="public-domain"
-SLOT="0"
-IUSE="pcre2 python ruby static-libs ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}:=[${MULTILIB_USEDEP}]
-	!pcre2? ( >=dev-libs/libpcre-8.33-r1:=[static-libs?,${MULTILIB_USEDEP}] )
-	pcre2? ( dev-libs/libpcre2:=[static-libs?,${MULTILIB_USEDEP}] )
-	python? ( ${PYTHON_DEPS} )
-	ruby? (
-		ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	python? ( >=dev-lang/swig-2.0.9 )"
-
-src_prepare() {
-	eapply_user
-
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	tc-export AR CC PKG_CONFIG RANLIB
-
-	emake \
-		LIBDIR="\$(PREFIX)/$(get_libdir)" \
-		SHLIBDIR="/$(get_libdir)" \
-		LDFLAGS="-fPIC ${LDFLAGS} -pthread" \
-		USE_PCRE2="$(usex pcre2 y n)" \
-		all
-
-	if multilib_is_native_abi && use python; then
-		building() {
-			emake \
-				LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \
-				LIBDIR="\$(PREFIX)/$(get_libdir)" \
-				SHLIBDIR="/$(get_libdir)" \
-				USE_PCRE2="$(usex pcre2 y n)" \
-				pywrap
-		}
-		python_foreach_impl building
-	fi
-
-	if multilib_is_native_abi && use ruby; then
-		building() {
-			einfo "Calling rubywrap for ${1}"
-			# Clean up .lo file to force rebuild
-			rm -f src/selinuxswig_ruby_wrap.lo || die
-			emake \
-				RUBY=${1} \
-				LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \
-				LIBDIR="\$(PREFIX)/$(get_libdir)" \
-				SHLIBDIR="/$(get_libdir)" \
-				USE_PCRE2="$(usex pcre2 y n)" \
-				rubywrap
-		}
-		for RUBYTARGET in ${USE_RUBY}; do
-			use ruby_targets_${RUBYTARGET} || continue
-
-			building ${RUBYTARGET}
-		done
-	fi
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" \
-		LIBDIR="\$(PREFIX)/$(get_libdir)" \
-		SHLIBDIR="/$(get_libdir)" \
-		USE_PCRE2="$(usex pcre2 y n)" \
-		install
-
-	if multilib_is_native_abi && use python; then
-		installation() {
-			emake DESTDIR="${D}" \
-				LIBDIR="\$(PREFIX)/$(get_libdir)" \
-				SHLIBDIR="/$(get_libdir)" \
-				USE_PCRE2="$(usex pcre2 y n)" \
-				install-pywrap
-			python_optimize # bug 531638
-		}
-		python_foreach_impl installation
-	fi
-
-	if multilib_is_native_abi && use ruby; then
-		installation() {
-			einfo "Calling install-rubywrap for ${1}"
-			# Forcing (re)build here as otherwise the resulting SO file is used for all ruby versions
-			rm src/selinuxswig_ruby_wrap.lo
-			emake DESTDIR="${D}" \
-				LIBDIR="\$(PREFIX)/$(get_libdir)" \
-				SHLIBDIR="/$(get_libdir)" \
-				RUBY=${1} \
-				USE_PCRE2="$(usex pcre2 y n)" \
-				install-rubywrap
-		}
-		for RUBYTARGET in ${USE_RUBY}; do
-			use ruby_targets_${RUBYTARGET} || continue
-
-			installation ${RUBYTARGET}
-		done
-	fi
-
-	use static-libs || rm "${D}"/usr/lib*/*.a || die
-}
-
-pkg_postinst() {
-	# Fix bug 473502
-	for POLTYPE in ${POLICY_TYPES};
-	do
-		mkdir -p /etc/selinux/${POLTYPE}/contexts/files || die
-		touch /etc/selinux/${POLTYPE}/contexts/files/file_contexts.local || die
-		# Fix bug 516608
-		for EXPRFILE in file_contexts file_contexts.homedirs file_contexts.local ; do
-			if [[ -f "/etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE}" ]]; then
-				sefcontext_compile /etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE} \
-				|| die "Failed to recompile contexts"
-			fi
-		done
-	done
-}
diff --git a/sys-libs/libselinux/libselinux-2.8_rc2.ebuild b/sys-libs/libselinux/libselinux-2.8_rc2.ebuild
deleted file mode 100644
index 7388fc1ec31f..000000000000
--- a/sys-libs/libselinux/libselinux-2.8_rc2.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
-USE_RUBY="ruby23"
-
-# No, I am not calling ruby-ng
-inherit multilib python-r1 toolchain-funcs multilib-minimal
-
-MY_P="${P//_/-}"
-SEPOL_VER="${PV}"
-MY_RELEASEDATE="20180426"
-
-DESCRIPTION="SELinux userland library"
-HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
-	S="${WORKDIR}/${MY_P}/${PN}"
-else
-	SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="public-domain"
-SLOT="0"
-IUSE="pcre2 python ruby static-libs ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}:=[${MULTILIB_USEDEP}]
-	!pcre2? ( >=dev-libs/libpcre-8.33-r1:=[static-libs?,${MULTILIB_USEDEP}] )
-	pcre2? ( dev-libs/libpcre2:=[static-libs?,${MULTILIB_USEDEP}] )
-	python? ( ${PYTHON_DEPS} )
-	ruby? (
-		ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	python? ( >=dev-lang/swig-2.0.9 )"
-
-src_prepare() {
-	eapply_user
-
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	tc-export AR CC PKG_CONFIG RANLIB
-
-	emake \
-		LIBDIR="\$(PREFIX)/$(get_libdir)" \
-		SHLIBDIR="/$(get_libdir)" \
-		LDFLAGS="-fPIC ${LDFLAGS} -pthread" \
-		USE_PCRE2="$(usex pcre2 y n)" \
-		all
-
-	if multilib_is_native_abi && use python; then
-		building() {
-			emake \
-				LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \
-				LIBDIR="\$(PREFIX)/$(get_libdir)" \
-				SHLIBDIR="/$(get_libdir)" \
-				USE_PCRE2="$(usex pcre2 y n)" \
-				pywrap
-		}
-		python_foreach_impl building
-	fi
-
-	if multilib_is_native_abi && use ruby; then
-		building() {
-			einfo "Calling rubywrap for ${1}"
-			# Clean up .lo file to force rebuild
-			rm -f src/selinuxswig_ruby_wrap.lo || die
-			emake \
-				RUBY=${1} \
-				LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \
-				LIBDIR="\$(PREFIX)/$(get_libdir)" \
-				SHLIBDIR="/$(get_libdir)" \
-				USE_PCRE2="$(usex pcre2 y n)" \
-				rubywrap
-		}
-		for RUBYTARGET in ${USE_RUBY}; do
-			use ruby_targets_${RUBYTARGET} || continue
-
-			building ${RUBYTARGET}
-		done
-	fi
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" \
-		LIBDIR="\$(PREFIX)/$(get_libdir)" \
-		SHLIBDIR="/$(get_libdir)" \
-		USE_PCRE2="$(usex pcre2 y n)" \
-		install
-
-	if multilib_is_native_abi && use python; then
-		installation() {
-			emake DESTDIR="${D}" \
-				LIBDIR="\$(PREFIX)/$(get_libdir)" \
-				SHLIBDIR="/$(get_libdir)" \
-				USE_PCRE2="$(usex pcre2 y n)" \
-				install-pywrap
-			python_optimize # bug 531638
-		}
-		python_foreach_impl installation
-	fi
-
-	if multilib_is_native_abi && use ruby; then
-		installation() {
-			einfo "Calling install-rubywrap for ${1}"
-			# Forcing (re)build here as otherwise the resulting SO file is used for all ruby versions
-			rm src/selinuxswig_ruby_wrap.lo
-			emake DESTDIR="${D}" \
-				LIBDIR="\$(PREFIX)/$(get_libdir)" \
-				SHLIBDIR="/$(get_libdir)" \
-				RUBY=${1} \
-				USE_PCRE2="$(usex pcre2 y n)" \
-				install-rubywrap
-		}
-		for RUBYTARGET in ${USE_RUBY}; do
-			use ruby_targets_${RUBYTARGET} || continue
-
-			installation ${RUBYTARGET}
-		done
-	fi
-
-	use static-libs || rm "${D}"/usr/lib*/*.a || die
-}
-
-pkg_postinst() {
-	# Fix bug 473502
-	for POLTYPE in ${POLICY_TYPES};
-	do
-		mkdir -p /etc/selinux/${POLTYPE}/contexts/files || die
-		touch /etc/selinux/${POLTYPE}/contexts/files/file_contexts.local || die
-		# Fix bug 516608
-		for EXPRFILE in file_contexts file_contexts.homedirs file_contexts.local ; do
-			if [[ -f "/etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE}" ]]; then
-				sefcontext_compile /etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE} \
-				|| die "Failed to recompile contexts"
-			fi
-		done
-	done
-}
diff --git a/sys-libs/libselinux/libselinux-9999.ebuild b/sys-libs/libselinux/libselinux-9999.ebuild
index 7b90d5d867ba..be003372f55f 100644
--- a/sys-libs/libselinux/libselinux-9999.ebuild
+++ b/sys-libs/libselinux/libselinux-9999.ebuild
@@ -10,7 +10,7 @@ inherit multilib python-r1 toolchain-funcs multilib-minimal
 
 MY_P="${P//_/-}"
 SEPOL_VER="${PV}"
-MY_RELEASEDATE="20180510"
+MY_RELEASEDATE="20180524"
 
 DESCRIPTION="SELinux userland library"
 HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
diff --git a/sys-libs/libsemanage/Manifest b/sys-libs/libsemanage/Manifest
index 754cddbf8037..fa5386b3585b 100644
--- a/sys-libs/libsemanage/Manifest
+++ b/sys-libs/libsemanage/Manifest
@@ -1,14 +1,8 @@
 AUX libsemanage-2.6-0001-libsemanage-genhomedircon-only-set-MLS-level-if-MLS-.patch 1370 BLAKE2B fc666edd6f8f2e9ad1e92d8d4a459f721e44a0f934b1e15af9b05a14599b46c300c9a6af9f2fabc819da954c1d93418ae8cd86890e9c0afab90af78c65d4aadc SHA512 08663502d489730b2bcc2ea2e1a15fc3cb0874dff4d2b9e650fc6b71f74d8e395a6787186ba1d138bfa99897ba44a9acbbe7b695e88e98591a8ea9f4bc3857c3
 AUX libsemanage-2.6-build-paths.patch 1325 BLAKE2B 89806798190f645d1064830775e55f5ddbbc5bfe8615c96e5f603b6d4a3d655987993443d53e44761330480c0713f0dc26a7680a45558fe094b0ca0b3c5c0331 SHA512 06fb96608f27169efde64bf679b8cc3e337857e4b6cf0743953f96be7df382e11ea0a20837d854c73dc5c216cee8f9723e23b17fa1a7844d3a4b7ef4ebe937d2
-DIST libsemanage-2.6.tar.gz 155897 BLAKE2B 503a8c2d6204ad696045c6dc1ed2686eb2b1d9f1fd27c08b95fbd7f022da0df4d4363067e65d6664bf1250f1e6ef8924dae56a3f3b552fc4ed666de97301ecc4 SHA512 38741d6e6f7a2669bfeee362e42d6bfd720cceeaf61331e329b2210fdc070444e529656ce86dd82e94aa248eafcfaea4c5d013d9cce76c1039be6fc6a6b2c790
 DIST libsemanage-2.7.tar.gz 153465 BLAKE2B fb585b8caba394757dbabb7c0825086059578b7449cddd5ff19ffe13d4b2ed3938a03f307cee01d852ce3680485ee58cf0dba59cfbacbb660c988d9542ffdf55 SHA512 6b30ea87f1ab3944935188539bbf869c8e287e05c174ea61cd19722a89cf8156518f336476e23b4117a5a05aec9a99a4db679b58a6952bf0c31ad809e9ab91d9
-DIST libsemanage-2.8-rc1.tar.gz 154131 BLAKE2B c0110cd67f04bf599b491335078af69852f23130ed321f0608fdefc1ba0cd425080fff07a1a267382c2610716d8bc766dd6ed34f5aae78818432542132b0b906 SHA512 befeaf587e36d1bcde068f9c46143b76c075122ed06c9290f9bdb16f5fa5d12dabbd9f190fc2584c87234c44f0778b434bf6cc5ca350a5de390cfec2f9fa1307
-DIST libsemanage-2.8-rc2.tar.gz 154148 BLAKE2B c376ae7b728b50010c9a9dfcb69787667ba2096fb9c4663012a4e33d100bd093f2a9136a0ae08cd2d2dc28ec97c7c25106b9f19bbceb9477fd7d58bce556141d SHA512 0ee4bafa1d407796b0a79794fef92625c54ea72cd861f8426b142f0e80954772f28bf787013514bc1f6f55f31625cf71ef246a81564d1ce97a61bba9fbd81fce
-DIST libsemanage-2.8-rc3.tar.gz 154158 BLAKE2B d03bf87f5c49928c31b61be87c9bcd5d295694e9a59884291bf2157e56d0b4a1aba39b350c2e6388418f8f3f4ffd0b7afc3219a596368103be2c5308f00fa36b SHA512 b3a6cb11684890ef7c707a36fb559abdc836cc819a4eb481818393816470a9231260763087fa0d6d23a224dcee65d199e1704fc01433336b1838f2ff047d8a6a
-EBUILD libsemanage-2.6.ebuild 4894 BLAKE2B f2e8f5e3ebe05ebb45ca449330c639e2e72d7d5145f103c38033910b1fbad5f7526a60060675eb7524006e600a0ae424948c365a797ef61e28923fb2c18c5af8 SHA512 8a6483d6fe09dae2bcc901e92476ae4a4cae7c8d585c068ed7b2c9c2bb646bdfc4856e4be81d6f12aabb9d76b38d76076ebce927a0160e7c166e5efcc71486f4
+DIST libsemanage-2.8.tar.gz 154200 BLAKE2B db987e42aed7177cd9b3d1e495c97878a816fe78d7c73631f475649d0ab4182e5966a9ee691f2d59863eab2b7a62f608bc00f0789f22401a54f18b41f6ebfb68 SHA512 53f09c79da168a79b853f55e0f1c20a96229df9d82929c514bcaf72697446ae836f7f0457fc0056d2418cc6d0712157faf0152881518fe84a1b1b9b9af17e7ef
 EBUILD libsemanage-2.7.ebuild 4758 BLAKE2B 3d5c1366e85a5be7ce44394eafc7a698d1721b4a242a03450c16f8cfaae2587c604741b1326123821330b63addcae5343be44dae489663251f0f855567fe7d40 SHA512 38217988193c9c0afe87497548e2d4239337f763a937025b7648435a8bfb1451ba2a2596349afd5acb768bf605f52967694af1f56b964e5ca0f3234cd3f0c1ac
-EBUILD libsemanage-2.8_rc1.ebuild 4674 BLAKE2B 7933f68079efe65986aa1017bccaf585109bb68363fcf83a4e7f851397927042fd102849a517926519769f11027221a1e069e998138025001a296ed4d8099161 SHA512 325bac7ec716e2ed2e1f088339d1073f50e2e4a55ffdead28d77bf23e27d909ac634e59d1c3b81b28929fabb6e037c7d1a0d5eedb8cdaaccaef18ffd807e7ac4
-EBUILD libsemanage-2.8_rc2.ebuild 4674 BLAKE2B cf4d27716eb18d87111da254da6ae77dbf4d536a6809a8745b24abb5d6c111992332d7ecbc97cd431c9c66fcf3820af87dc8aeca7bfb23b0f030d327f7ecc298 SHA512 b48a61fd901d950a43e11e66de21031618290ba359fe827f2d05a71f660c8941d83e7af9cb2fdadc323a30d785a1ce1a16e0a75e28da266ebfc9c71f5d2bdd33
-EBUILD libsemanage-2.8_rc3.ebuild 4674 BLAKE2B c7ac52f41953158f225b09b14c9455f5d619cfb144a6bd8bdfb4e77a23cc772aacb3bdf066d5cc9214973e14da0e9939770020bbd48fb76eed1320ade453c50e SHA512 a4f70577671ae2206eed048632e28b8049a531bff3f38c07552b70bf18cfde47c477bf0bff29909a98def8660a1c8233f6e4d1b5d78ff4c38737c10091fdafb3
-EBUILD libsemanage-9999.ebuild 4674 BLAKE2B c7ac52f41953158f225b09b14c9455f5d619cfb144a6bd8bdfb4e77a23cc772aacb3bdf066d5cc9214973e14da0e9939770020bbd48fb76eed1320ade453c50e SHA512 a4f70577671ae2206eed048632e28b8049a531bff3f38c07552b70bf18cfde47c477bf0bff29909a98def8660a1c8233f6e4d1b5d78ff4c38737c10091fdafb3
+EBUILD libsemanage-2.8.ebuild 4674 BLAKE2B c8117194c6e60645140f138526efeaafbe257ef4ef060b39dcee3d170c69dfcd215486bf84d38eb870d9a45c0e5df9c319bb3abe4ad78552cd0bd9e9b5296fd2 SHA512 6d5bbb372911cf7a80d57ba432eec048ee710ecfcd0fede674db4d0db152dd4c5eed854dbc9538b59807191a65bb175f8dd8b43cf6d1ccd202e85541ffad6f62
+EBUILD libsemanage-9999.ebuild 4674 BLAKE2B c8117194c6e60645140f138526efeaafbe257ef4ef060b39dcee3d170c69dfcd215486bf84d38eb870d9a45c0e5df9c319bb3abe4ad78552cd0bd9e9b5296fd2 SHA512 6d5bbb372911cf7a80d57ba432eec048ee710ecfcd0fede674db4d0db152dd4c5eed854dbc9538b59807191a65bb175f8dd8b43cf6d1ccd202e85541ffad6f62
 MISC metadata.xml 406 BLAKE2B c9f83aef9f66b26a895bad604ab829ba1d6b6865cb519ac23be395cfb9b81f06d35a3ac4602d5a0b53f0ca58e50a8ca71efba8dc8d70740294cee2a49ed0e777 SHA512 742aba47cdd9ad8f97fcb03a01cc2552c6e1d715f6b717c9dff2ae86ab34b850745888e4f2e3963ec2c258cf16a33cb161205f4ea72563446eada82f6c298479
diff --git a/sys-libs/libsemanage/libsemanage-2.6.ebuild b/sys-libs/libsemanage/libsemanage-2.6.ebuild
deleted file mode 100644
index 8fe7677a97c6..000000000000
--- a/sys-libs/libsemanage/libsemanage-2.6.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit multilib python-r1 toolchain-funcs multilib-minimal
-
-MY_P="${P//_/-}"
-MY_RELEASEDATE="20161014"
-
-SEPOL_VER="${PV}"
-SELNX_VER="${PV}"
-
-DESCRIPTION="SELinux kernel and policy management library"
-HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
-	S="${WORKDIR}/${MY_P}/${PN}"
-else
-	SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}[${MULTILIB_USEDEP}]
-	>=sys-libs/libselinux-${SELNX_VER}[${MULTILIB_USEDEP}]
-	>=sys-process/audit-2.2.2[${MULTILIB_USEDEP}]
-	>=dev-libs/ustr-1.0.4-r2[${MULTILIB_USEDEP}]
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-	python? (
-		>=dev-lang/swig-2.0.4-r1
-		virtual/pkgconfig
-	)"
-
-# tests are not meant to be run outside of the
-# full SELinux userland repo
-RESTRICT="test"
-
-src_prepare() {
-	echo "# Set this to true to save the linked policy." >> "${S}/src/semanage.conf"
-	echo "# This is normally only useful for analysis" >> "${S}/src/semanage.conf"
-	echo "# or debugging of policy." >> "${S}/src/semanage.conf"
-	echo "save-linked=false" >> "${S}/src/semanage.conf"
-	echo >> "${S}/src/semanage.conf"
-	echo "# Set this to 0 to disable assertion checking." >> "${S}/src/semanage.conf"
-	echo "# This should speed up building the kernel policy" >> "${S}/src/semanage.conf"
-	echo "# from policy modules, but may leave you open to" >> "${S}/src/semanage.conf"
-	echo "# dangerous rules which assertion checking" >> "${S}/src/semanage.conf"
-	echo "# would catch." >> "${S}/src/semanage.conf"
-	echo "expand-check=1" >> "${S}/src/semanage.conf"
-	echo >> "${S}/src/semanage.conf"
-	echo "# Modules in the module store can be compressed" >> "${S}/src/semanage.conf"
-	echo "# with bzip2.  Set this to the bzip2 blocksize" >> "${S}/src/semanage.conf"
-	echo "# 1-9 when compressing.  The higher the number," >> "${S}/src/semanage.conf"
-	echo "# the more memory is traded off for disk space." >> "${S}/src/semanage.conf"
-	echo "# Set to 0 to disable bzip2 compression." >> "${S}/src/semanage.conf"
-	echo "bzip-blocksize=0" >> "${S}/src/semanage.conf"
-	echo >> "${S}/src/semanage.conf"
-	echo "# Reduce memory usage for bzip2 compression and" >> "${S}/src/semanage.conf"
-	echo "# decompression of modules in the module store." >> "${S}/src/semanage.conf"
-	echo "bzip-small=true" >> "${S}/src/semanage.conf"
-
-	eapply "${FILESDIR}"/${PN}-2.6-build-paths.patch
-	eapply "${FILESDIR}"/${PN}-2.6-0001-libsemanage-genhomedircon-only-set-MLS-level-if-MLS-.patch
-
-	eapply_user
-
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	emake \
-		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		all
-
-	if multilib_is_native_abi && use python; then
-		building_py() {
-			python_export PYTHON_INCLUDEDIR PYTHON_LIBPATH
-			emake CC="$(tc-getCC)" PYINC="-I${PYTHON_INCLUDEDIR}" PYTHONLBIDIR="${PYTHON_LIBPATH}" PYPREFIX="${EPYTHON##*/}" "$@"
-		}
-		python_foreach_impl building_py swigify
-		python_foreach_impl building_py pywrap
-	fi
-}
-
-multilib_src_install() {
-	emake \
-		LIBDIR="${ED}/usr/$(get_libdir)" \
-		SHLIBDIR="${ED}/usr/$(get_libdir)" \
-		DESTDIR="${ED}" install
-
-	if multilib_is_native_abi && use python; then
-		installation_py() {
-			emake DESTDIR="${ED}" LIBDIR="${ED}/usr/$(get_libdir)" \
-				SHLIBDIR="${ED}/usr/$(get_libdir)" install-pywrap
-			python_optimize # bug 531638
-		}
-		python_foreach_impl installation_py
-	fi
-}
-
-pkg_postinst() {
-	# Migrate the SELinux semanage configuration store if not done already
-	local selinuxtype=$(awk -F'=' '/SELINUXTYPE=/ {print $2}' "${EROOT}"/etc/selinux/config 2>/dev/null)
-	if [ -n "${selinuxtype}" ] && [ ! -d "${EROOT}"/var/lib/selinux/${mcs}/active ] ; then
-		ewarn "Since the 2.4 SELinux userspace, the policy module store is moved"
-		ewarn "from /etc/selinux to /var/lib/selinux. The migration will be run now."
-		ewarn "If there are any issues, it can be done manually by running:"
-		ewarn "/usr/libexec/selinux/semanage_migrate_store"
-		ewarn "For more information, please see"
-		ewarn "- https://github.com/SELinuxProject/selinux/wiki/Policy-Store-Migration"
-	fi
-
-	# Run the store migration without rebuilds
-	for POLICY_TYPE in ${POLICY_TYPES} ; do
-		if [ ! -d "${EROOT}/var/lib/selinux/${POLICY_TYPE}/active" ] ; then
-			einfo "Migrating store ${POLICY_TYPE} (without policy rebuild)."
-			/usr/libexec/selinux/semanage_migrate_store -n -s "${POLICY_TYPE}" || die "Failed to migrate store ${POLICY_TYPE}"
-		fi
-	done
-}
diff --git a/sys-libs/libsemanage/libsemanage-2.8_rc1.ebuild b/sys-libs/libsemanage/libsemanage-2.8.ebuild
index c2a6ce67e3ee..0cc1dbbf8b49 100644
--- a/sys-libs/libsemanage/libsemanage-2.8_rc1.ebuild
+++ b/sys-libs/libsemanage/libsemanage-2.8.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit multilib python-r1 toolchain-funcs multilib-minimal
 
 MY_P="${P//_/-}"
-MY_RELEASEDATE="20180419"
+MY_RELEASEDATE="20180524"
 
 SEPOL_VER="${PV}"
 SELNX_VER="${PV}"
diff --git a/sys-libs/libsemanage/libsemanage-2.8_rc2.ebuild b/sys-libs/libsemanage/libsemanage-2.8_rc2.ebuild
deleted file mode 100644
index e61629720acd..000000000000
--- a/sys-libs/libsemanage/libsemanage-2.8_rc2.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit multilib python-r1 toolchain-funcs multilib-minimal
-
-MY_P="${P//_/-}"
-MY_RELEASEDATE="20180426"
-
-SEPOL_VER="${PV}"
-SELNX_VER="${PV}"
-
-DESCRIPTION="SELinux kernel and policy management library"
-HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
-	S="${WORKDIR}/${MY_P}/${PN}"
-else
-	SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}[${MULTILIB_USEDEP}]
-	>=sys-libs/libselinux-${SELNX_VER}[${MULTILIB_USEDEP}]
-	>=sys-process/audit-2.2.2[${MULTILIB_USEDEP}]
-	>=dev-libs/ustr-1.0.4-r2[${MULTILIB_USEDEP}]
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-	python? (
-		>=dev-lang/swig-2.0.4-r1
-		virtual/pkgconfig
-	)"
-
-# tests are not meant to be run outside of the
-# full SELinux userland repo
-RESTRICT="test"
-
-src_prepare() {
-	eapply_user
-
-	echo >> "${S}/src/semanage.conf"
-	echo "# Set this to true to save the linked policy." >> "${S}/src/semanage.conf"
-	echo "# This is normally only useful for analysis" >> "${S}/src/semanage.conf"
-	echo "# or debugging of policy." >> "${S}/src/semanage.conf"
-	echo "save-linked=false" >> "${S}/src/semanage.conf"
-	echo >> "${S}/src/semanage.conf"
-	echo "# Set this to 0 to disable assertion checking." >> "${S}/src/semanage.conf"
-	echo "# This should speed up building the kernel policy" >> "${S}/src/semanage.conf"
-	echo "# from policy modules, but may leave you open to" >> "${S}/src/semanage.conf"
-	echo "# dangerous rules which assertion checking" >> "${S}/src/semanage.conf"
-	echo "# would catch." >> "${S}/src/semanage.conf"
-	echo "expand-check=1" >> "${S}/src/semanage.conf"
-	echo >> "${S}/src/semanage.conf"
-	echo "# Modules in the module store can be compressed" >> "${S}/src/semanage.conf"
-	echo "# with bzip2.  Set this to the bzip2 blocksize" >> "${S}/src/semanage.conf"
-	echo "# 1-9 when compressing.  The higher the number," >> "${S}/src/semanage.conf"
-	echo "# the more memory is traded off for disk space." >> "${S}/src/semanage.conf"
-	echo "# Set to 0 to disable bzip2 compression." >> "${S}/src/semanage.conf"
-	echo "bzip-blocksize=0" >> "${S}/src/semanage.conf"
-	echo >> "${S}/src/semanage.conf"
-	echo "# Reduce memory usage for bzip2 compression and" >> "${S}/src/semanage.conf"
-	echo "# decompression of modules in the module store." >> "${S}/src/semanage.conf"
-	echo "bzip-small=true" >> "${S}/src/semanage.conf"
-
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	emake \
-		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		all
-
-	if multilib_is_native_abi && use python; then
-		building_py() {
-			emake \
-				AR="$(tc-getAR)" \
-				CC="$(tc-getCC)" \
-				LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-				"$@"
-		}
-		python_foreach_impl building_py swigify
-		python_foreach_impl building_py pywrap
-	fi
-}
-
-multilib_src_install() {
-	emake \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		DESTDIR="${ED}" install
-
-	if multilib_is_native_abi && use python; then
-		installation_py() {
-			emake DESTDIR="${ED}" \
-				LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-				install-pywrap
-			python_optimize # bug 531638
-		}
-		python_foreach_impl installation_py
-	fi
-}
-
-pkg_postinst() {
-	# Migrate the SELinux semanage configuration store if not done already
-	local selinuxtype=$(awk -F'=' '/SELINUXTYPE=/ {print $2}' "${EROOT}"/etc/selinux/config 2>/dev/null)
-	if [ -n "${selinuxtype}" ] && [ ! -d "${EROOT}"/var/lib/selinux/${mcs}/active ] ; then
-		ewarn "Since the 2.4 SELinux userspace, the policy module store is moved"
-		ewarn "from /etc/selinux to /var/lib/selinux. The migration will be run now."
-		ewarn "If there are any issues, it can be done manually by running:"
-		ewarn "/usr/libexec/selinux/semanage_migrate_store"
-		ewarn "For more information, please see"
-		ewarn "- https://github.com/SELinuxProject/selinux/wiki/Policy-Store-Migration"
-	fi
-
-	# Run the store migration without rebuilds
-	for POLICY_TYPE in ${POLICY_TYPES} ; do
-		if [ ! -d "${EROOT}/var/lib/selinux/${POLICY_TYPE}/active" ] ; then
-			einfo "Migrating store ${POLICY_TYPE} (without policy rebuild)."
-			"${EROOT}/usr/libexec/selinux/semanage_migrate_store" -n -s "${POLICY_TYPE}" || die "Failed to migrate store ${POLICY_TYPE}"
-		fi
-	done
-}
diff --git a/sys-libs/libsemanage/libsemanage-2.8_rc3.ebuild b/sys-libs/libsemanage/libsemanage-2.8_rc3.ebuild
deleted file mode 100644
index 1c36853d92f2..000000000000
--- a/sys-libs/libsemanage/libsemanage-2.8_rc3.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit multilib python-r1 toolchain-funcs multilib-minimal
-
-MY_P="${P//_/-}"
-MY_RELEASEDATE="20180510"
-
-SEPOL_VER="${PV}"
-SELNX_VER="${PV}"
-
-DESCRIPTION="SELinux kernel and policy management library"
-HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
-	S="${WORKDIR}/${MY_P}/${PN}"
-else
-	SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}[${MULTILIB_USEDEP}]
-	>=sys-libs/libselinux-${SELNX_VER}[${MULTILIB_USEDEP}]
-	>=sys-process/audit-2.2.2[${MULTILIB_USEDEP}]
-	>=dev-libs/ustr-1.0.4-r2[${MULTILIB_USEDEP}]
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-	python? (
-		>=dev-lang/swig-2.0.4-r1
-		virtual/pkgconfig
-	)"
-
-# tests are not meant to be run outside of the
-# full SELinux userland repo
-RESTRICT="test"
-
-src_prepare() {
-	eapply_user
-
-	echo >> "${S}/src/semanage.conf"
-	echo "# Set this to true to save the linked policy." >> "${S}/src/semanage.conf"
-	echo "# This is normally only useful for analysis" >> "${S}/src/semanage.conf"
-	echo "# or debugging of policy." >> "${S}/src/semanage.conf"
-	echo "save-linked=false" >> "${S}/src/semanage.conf"
-	echo >> "${S}/src/semanage.conf"
-	echo "# Set this to 0 to disable assertion checking." >> "${S}/src/semanage.conf"
-	echo "# This should speed up building the kernel policy" >> "${S}/src/semanage.conf"
-	echo "# from policy modules, but may leave you open to" >> "${S}/src/semanage.conf"
-	echo "# dangerous rules which assertion checking" >> "${S}/src/semanage.conf"
-	echo "# would catch." >> "${S}/src/semanage.conf"
-	echo "expand-check=1" >> "${S}/src/semanage.conf"
-	echo >> "${S}/src/semanage.conf"
-	echo "# Modules in the module store can be compressed" >> "${S}/src/semanage.conf"
-	echo "# with bzip2.  Set this to the bzip2 blocksize" >> "${S}/src/semanage.conf"
-	echo "# 1-9 when compressing.  The higher the number," >> "${S}/src/semanage.conf"
-	echo "# the more memory is traded off for disk space." >> "${S}/src/semanage.conf"
-	echo "# Set to 0 to disable bzip2 compression." >> "${S}/src/semanage.conf"
-	echo "bzip-blocksize=0" >> "${S}/src/semanage.conf"
-	echo >> "${S}/src/semanage.conf"
-	echo "# Reduce memory usage for bzip2 compression and" >> "${S}/src/semanage.conf"
-	echo "# decompression of modules in the module store." >> "${S}/src/semanage.conf"
-	echo "bzip-small=true" >> "${S}/src/semanage.conf"
-
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	emake \
-		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		all
-
-	if multilib_is_native_abi && use python; then
-		building_py() {
-			emake \
-				AR="$(tc-getAR)" \
-				CC="$(tc-getCC)" \
-				LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-				"$@"
-		}
-		python_foreach_impl building_py swigify
-		python_foreach_impl building_py pywrap
-	fi
-}
-
-multilib_src_install() {
-	emake \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		DESTDIR="${ED}" install
-
-	if multilib_is_native_abi && use python; then
-		installation_py() {
-			emake DESTDIR="${ED}" \
-				LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-				install-pywrap
-			python_optimize # bug 531638
-		}
-		python_foreach_impl installation_py
-	fi
-}
-
-pkg_postinst() {
-	# Migrate the SELinux semanage configuration store if not done already
-	local selinuxtype=$(awk -F'=' '/SELINUXTYPE=/ {print $2}' "${EROOT}"/etc/selinux/config 2>/dev/null)
-	if [ -n "${selinuxtype}" ] && [ ! -d "${EROOT}"/var/lib/selinux/${mcs}/active ] ; then
-		ewarn "Since the 2.4 SELinux userspace, the policy module store is moved"
-		ewarn "from /etc/selinux to /var/lib/selinux. The migration will be run now."
-		ewarn "If there are any issues, it can be done manually by running:"
-		ewarn "/usr/libexec/selinux/semanage_migrate_store"
-		ewarn "For more information, please see"
-		ewarn "- https://github.com/SELinuxProject/selinux/wiki/Policy-Store-Migration"
-	fi
-
-	# Run the store migration without rebuilds
-	for POLICY_TYPE in ${POLICY_TYPES} ; do
-		if [ ! -d "${EROOT}/var/lib/selinux/${POLICY_TYPE}/active" ] ; then
-			einfo "Migrating store ${POLICY_TYPE} (without policy rebuild)."
-			"${EROOT}/usr/libexec/selinux/semanage_migrate_store" -n -s "${POLICY_TYPE}" || die "Failed to migrate store ${POLICY_TYPE}"
-		fi
-	done
-}
diff --git a/sys-libs/libsemanage/libsemanage-9999.ebuild b/sys-libs/libsemanage/libsemanage-9999.ebuild
index 1c36853d92f2..0cc1dbbf8b49 100644
--- a/sys-libs/libsemanage/libsemanage-9999.ebuild
+++ b/sys-libs/libsemanage/libsemanage-9999.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit multilib python-r1 toolchain-funcs multilib-minimal
 
 MY_P="${P//_/-}"
-MY_RELEASEDATE="20180510"
+MY_RELEASEDATE="20180524"
 
 SEPOL_VER="${PV}"
 SELNX_VER="${PV}"
diff --git a/sys-libs/libsepol/Manifest b/sys-libs/libsepol/Manifest
index 25eb46964c4f..ab8e7892d8db 100644
--- a/sys-libs/libsepol/Manifest
+++ b/sys-libs/libsepol/Manifest
@@ -1,12 +1,6 @@
-DIST libsepol-2.6.tar.gz 442549 BLAKE2B d56eea07310e0e8338f4ef2de7470db0cda57efcad92bbb2fd7b5df184cd210a316f2f517c227f5d711a5b7ec967908e22e5c687859060e020ae8710e2240724 SHA512 17d007857634e3d581fcc9bafcbb75674a06e382bb258c2c6b3656c141d71493699c42b78c8e1917c628476aeb8ead73bb86e8ccf43d7ce59aa0b7884bea132a
 DIST libsepol-2.7.tar.gz 471147 BLAKE2B 5eea0be27cd14e105c261ce67d46806c60f8454ebcc82c27d060529deb1d36b1d7a3aac7a2c6706e969b0cea9225351e0cbce3149a73c0bbb18242b70d258344 SHA512 1d308c17bfea2659f9dc4877ab685449a5a33dff7260e62b603cde9551bed2010360b71a896c6dfcdb8b9fe86ecebc9f6b3225e6c3573a80fca8578a9d561b47
-DIST libsepol-2.8-rc1.tar.gz 473554 BLAKE2B 274894dfeb1d0dd7ba7b661266e7acdd0dc1c4ae4a51b689f2beb3a838ffebe5f1a9b7ce3f28c421215a68ba9eea57b9a3a5a4cf2a3effefa905bfdb1d71e72a SHA512 79307249604207b52af154ee17c96b90ea31c44d208935a06b276975c7521b84f8c96f9f2dd578478d2baa974fe5777c5f1417073eba828202fa227cf2ea383d
-DIST libsepol-2.8-rc2.tar.gz 473561 BLAKE2B a27526915a02c1a77c49bcb107d164759799835c32ed07a9ca7924d195c4127257fa97325434e6e4edd932564f9c80c5ed122dbd7b597a4749a5cad8fbb76507 SHA512 2e738986e6ddcc86904c5ef605fe03f4a3cbd239b34c76b1a3d06da1c21c327aa835949dbd5b2328d11c6c032d1a8677da21e5c06e2107f1f60a182286a9f2ea
-DIST libsepol-2.8-rc3.tar.gz 473488 BLAKE2B 1befe617e73b3a845322efe107cd22649dc17a6df0ff90c6c25486d937bffa84d9f6e83979e294df693772f1afb8943dd2db6a95f76ae71d83f15fd90819d888 SHA512 afefd13732aadd2b7e476cb439fa3d09dc870ac50f262b3c803459a5ce431c26d896e327a4207fea88eac7121e0901db77674bae632bb3940a80e183c156d7fc
-EBUILD libsepol-2.6.ebuild 1160 BLAKE2B c6df9f8f485a73ea811afd95ae409e1323b5d2293ee8533c5f7bcd912f213964ab23f2bf86c60d9a471530a50c8ad6848e668a0edd5c7ead963796e25c73ac58 SHA512 cdcdd05098775b6ad5ecd293261f6a3e8af7f7178f1a6fa4650844cd3d136c73a0332e73deff98b5f4e1605a3cdc94aab3b283ea867996b38de5178cb5b037dd
+DIST libsepol-2.8.tar.gz 473384 BLAKE2B 7280221d0824b316a3e66a0126654c71f52464d8a17460a2d38f592cb54449e2c57383f22ab7a3da2af809adeba93ef46b9c03cc69ddd112ab7592a14393cef3 SHA512 dd065886819a265cd4f2751ac231a7baa5d7c7735844f3557d5c7e1feb06d4b4d03433d26ff6419b426caf90b69771ee743850fe45d36bc0201cadb86c62189c
 EBUILD libsepol-2.7.ebuild 1160 BLAKE2B bc347feab8e6b530c378ba71c5ac1023cfd781a6339561adf769b29b2c5d5e4537001a402965c285c744ea8964089467734eedf1fbdfd7a7338fc58a5866d0a6 SHA512 5783c3475e553ca8da4885c5122ecc10ed8f7a87857e37840a8e2a9198504ad3d2ffb968ce1df8745db229f001ab4b6adef3bba1d88020b325eedf9f06cf1b36
-EBUILD libsepol-2.8_rc1.ebuild 1123 BLAKE2B 5e27ec591965bc0abbb91d64c0d4a7e7cb26159a32c29759130c8097b2fdb3e786e2e0745c9d495d2ad7a83de01188f157a645e1a68899721ad5f759c5b020d1 SHA512 da09b05eedf8c7287be69577ab4f5d280a9a44ef531eef2dd3df9d6f94e259d53e198d7d20736f490a53a0e987ef0f30b45a39ffe0a0ed1969572bd0ff885dec
-EBUILD libsepol-2.8_rc2.ebuild 1123 BLAKE2B cb07aced7e0a466ddd75dbe94968e8efe0843fc1947eb9f4532d462d9a28cdfd3e2c71989fb4f95a881c6a059366991bc24218deec6a22f080ecc29ecf5c8176 SHA512 96b4eba02a90198691135395758bd15264dce0c0af4c79f69de7d1ba4790beef3e21fc5ceb1d68949515aa6075f3035b7f0db166ac77eff2659978e0a590ad47
-EBUILD libsepol-2.8_rc3.ebuild 1123 BLAKE2B a665349acc441153534e92705a523b6764a8d25f1373d0800810af59ed01393362dd1857c0d6b0e22f514c7a557a01a368f69a33a23144585d29d59760b1b3c6 SHA512 86b1f567fcb21eeecb0bb1e7916eda3ca9927b58d6766e040d8a92584ffd9a9ecd9dde8d8bdf3e40e7870f97f38cbf6a34429bf5070c03f56131c6dfbf6c6183
-EBUILD libsepol-9999.ebuild 1123 BLAKE2B a665349acc441153534e92705a523b6764a8d25f1373d0800810af59ed01393362dd1857c0d6b0e22f514c7a557a01a368f69a33a23144585d29d59760b1b3c6 SHA512 86b1f567fcb21eeecb0bb1e7916eda3ca9927b58d6766e040d8a92584ffd9a9ecd9dde8d8bdf3e40e7870f97f38cbf6a34429bf5070c03f56131c6dfbf6c6183
+EBUILD libsepol-2.8.ebuild 1123 BLAKE2B 16ff21d2eabbc895b39cc2273316a2ed77fd4fbe42d45c945ec838fce169d829fd805a1f3301b7e8fe63c5ffb25d981275df38a2fda74baadc44796bcfbfcdda SHA512 f6dcb3beede0e3fb0cc923f99c61ad0ec226cecc3f1eb7290c80e5d1395b02f0fe8d75c57df2f7142a6dea1d35855a9fa0fe23fecc1f3216c32ac5f268bb9a93
+EBUILD libsepol-9999.ebuild 1123 BLAKE2B 16ff21d2eabbc895b39cc2273316a2ed77fd4fbe42d45c945ec838fce169d829fd805a1f3301b7e8fe63c5ffb25d981275df38a2fda74baadc44796bcfbfcdda SHA512 f6dcb3beede0e3fb0cc923f99c61ad0ec226cecc3f1eb7290c80e5d1395b02f0fe8d75c57df2f7142a6dea1d35855a9fa0fe23fecc1f3216c32ac5f268bb9a93
 MISC metadata.xml 428 BLAKE2B 5e3dba085b9d5cf181fd548681975f00f888a6bb02b688eaa088a3668acdfb5def36af8c0e1085ca8785b7c503c3b797474724097fb24ebb1acc9c1a4c4e9a0f SHA512 14093ec1e86ac7b7521ab02ace725347013e11628e22cf3ed5362cfe7f30a180374ab00747b58ae251afbb3fabbeb4e328bda798e512bfac9bad643206835192
diff --git a/sys-libs/libsepol/libsepol-2.6.ebuild b/sys-libs/libsepol/libsepol-2.6.ebuild
deleted file mode 100644
index d53577659dc1..000000000000
--- a/sys-libs/libsepol/libsepol-2.6.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit multilib toolchain-funcs multilib-minimal
-
-MY_P="${P//_/-}"
-MY_RELEASEDATE="20161014"
-
-DESCRIPTION="SELinux binary policy representation library"
-HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
-	S="${WORKDIR}/${MY_P}/${PN}"
-else
-	SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-# tests are not meant to be run outside of the full SELinux userland repo
-RESTRICT="test"
-
-src_prepare() {
-	eapply_user
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	tc-export RANLIB;
-	LIBDIR="\$(PREFIX)/$(get_libdir)" SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \
-		emake AR="$(tc-getAR)" CC="$(tc-getCC)"
-}
-
-multilib_src_install() {
-	LIBDIR="\$(PREFIX)/$(get_libdir)" SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \
-		emake DESTDIR="${D}" install
-}
diff --git a/sys-libs/libsepol/libsepol-2.8_rc1.ebuild b/sys-libs/libsepol/libsepol-2.8.ebuild
index 0b34ccbc1760..8672b08d98b3 100644
--- a/sys-libs/libsepol/libsepol-2.8_rc1.ebuild
+++ b/sys-libs/libsepol/libsepol-2.8.ebuild
@@ -6,7 +6,7 @@ EAPI="6"
 inherit multilib toolchain-funcs multilib-minimal
 
 MY_P="${P//_/-}"
-MY_RELEASEDATE="20180419"
+MY_RELEASEDATE="20180524"
 
 DESCRIPTION="SELinux binary policy representation library"
 HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
diff --git a/sys-libs/libsepol/libsepol-2.8_rc2.ebuild b/sys-libs/libsepol/libsepol-2.8_rc2.ebuild
deleted file mode 100644
index abd1362b6316..000000000000
--- a/sys-libs/libsepol/libsepol-2.8_rc2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit multilib toolchain-funcs multilib-minimal
-
-MY_P="${P//_/-}"
-MY_RELEASEDATE="20180426"
-
-DESCRIPTION="SELinux binary policy representation library"
-HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
-	S="${WORKDIR}/${MY_P}/${PN}"
-else
-	SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-# tests are not meant to be run outside of the full SELinux userland repo
-RESTRICT="test"
-
-src_prepare() {
-	eapply_user
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	tc-export CC AR RANLIB
-	emake \
-		LIBDIR="\$(PREFIX)/$(get_libdir)" \
-		SHLIBDIR="/$(get_libdir)"
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" \
-		LIBDIR="\$(PREFIX)/$(get_libdir)" \
-		SHLIBDIR="/$(get_libdir)" \
-		install
-}
diff --git a/sys-libs/libsepol/libsepol-2.8_rc3.ebuild b/sys-libs/libsepol/libsepol-2.8_rc3.ebuild
deleted file mode 100644
index 1e5f9c74df6b..000000000000
--- a/sys-libs/libsepol/libsepol-2.8_rc3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit multilib toolchain-funcs multilib-minimal
-
-MY_P="${P//_/-}"
-MY_RELEASEDATE="20180510"
-
-DESCRIPTION="SELinux binary policy representation library"
-HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
-	S="${WORKDIR}/${MY_P}/${PN}"
-else
-	SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-# tests are not meant to be run outside of the full SELinux userland repo
-RESTRICT="test"
-
-src_prepare() {
-	eapply_user
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	tc-export CC AR RANLIB
-	emake \
-		LIBDIR="\$(PREFIX)/$(get_libdir)" \
-		SHLIBDIR="/$(get_libdir)"
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" \
-		LIBDIR="\$(PREFIX)/$(get_libdir)" \
-		SHLIBDIR="/$(get_libdir)" \
-		install
-}
diff --git a/sys-libs/libsepol/libsepol-9999.ebuild b/sys-libs/libsepol/libsepol-9999.ebuild
index 1e5f9c74df6b..8672b08d98b3 100644
--- a/sys-libs/libsepol/libsepol-9999.ebuild
+++ b/sys-libs/libsepol/libsepol-9999.ebuild
@@ -6,7 +6,7 @@ EAPI="6"
 inherit multilib toolchain-funcs multilib-minimal
 
 MY_P="${P//_/-}"
-MY_RELEASEDATE="20180510"
+MY_RELEASEDATE="20180524"
 
 DESCRIPTION="SELinux binary policy representation library"
 HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 739651835636..b89ede4017f6 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/procps/Manifest b/sys-process/procps/Manifest
index 7d83d7f38258..a4814fd81529 100644
--- a/sys-process/procps/Manifest
+++ b/sys-process/procps/Manifest
@@ -9,5 +9,5 @@ DIST procps-ng-3.3.15.tar.xz 904416 BLAKE2B 9fc1384df1d51a13bdf3aaad173160a11c5a
 EBUILD procps-3.3.12-r1.ebuild 2328 BLAKE2B 389b25d2ed9e1855392b6fea552d4fc7c9a5d8ebfb81502a9f7125b9687d8195905ee9550a75a8e44e59d1cae4dea0abada40cdcf895b032f4deb1d518bd4e96 SHA512 6ec0d09ae0afa59d2880d88873db63c8091e3d95ebfa1cc76e729bf6c139a7afe11f4ee1649f830839fbce61e756c792b528c15655544587a8ed0ffe52a8246b
 EBUILD procps-3.3.12.ebuild 1984 BLAKE2B 64041bcd297cca29ee4702ad4ee2555da2abb24c749e7070402981efb359d0017235f30e94fa6aa94e01f54b03fbc4d6e602c6b90810645935e0a3a0e84fbc16 SHA512 ebdf9a402bf2682892fc8b2628da524fd85d7fc1c0593b6c4e4e742743bcedfc643d2076863e863a35cbb894bd8d37a0771c58f1eaeb6447a367ad5f445cf5db
 EBUILD procps-3.3.14.ebuild 2066 BLAKE2B 476532905b101230dc1818448f870abf2934939104859943c6389965bbc846aaf724bace914ee319d179af032d957ce18c3b9b3638a33290b2c8e196c6edd60e SHA512 a3308497a5ff3f280d27db1e988574177141424648e43c7062e8e53159e21ffb91e08aae33ffbb1b7d581387f16ca27b220b555d011903446a8225c70d85e696
-EBUILD procps-3.3.15-r1.ebuild 1992 BLAKE2B 812b3ca9424a118288ff3006e297c826c88c1ee5224fb44e350d1ffbbff660d5f10b8915cb290580695a8e9039da4e6468eee1c797afdef5dfa46df0613d41f3 SHA512 ee8f6c6d807abde6c009c15693232e28d66a913f4be18599cbdeb9ef85e4d26fa365c4da45938c7ab6b203b6f9238caa763ff2dbbb2aae9d98900bfa5d7bc8c0
+EBUILD procps-3.3.15-r1.ebuild 1988 BLAKE2B 3f511c9783e78700fb7d60cf8da3161b1fe27b1623de368f0679242b6ca69cee70afa3c6f7d5cc15c0f0b89795ebe2069c776a9f3133319d7ccf79def8c854f8 SHA512 538c38a343d1f30db4ffebf250bfdf1d48c884bcc5ec5535c3cbcadb0245544038ba296ef59709d5fc033716fb0a6a82e700c95857463aaa1b4ba20cdb56bd60
 MISC metadata.xml 653 BLAKE2B de137950217a24b13838a10e3dddacd94898c4d4be18c9080e31d666fe74d6f8e5fe3edfb4f3caf369fde1c82858e4c8828883c21f3ed32867a5f35d0771dc89 SHA512 d98bc7ed5e5437134c30db0a2ecbe4f430143aad2b91775e128fe735ddc39801e8d8fe62905cabbd8a41c4d07698110605b74056296282a74ac7622a09272703
diff --git a/sys-process/procps/procps-3.3.15-r1.ebuild b/sys-process/procps/procps-3.3.15-r1.ebuild
index 9fe2c96448bd..294aca285e13 100644
--- a/sys-process/procps/procps-3.3.15-r1.ebuild
+++ b/sys-process/procps/procps-3.3.15-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}-ng/${PN}-ng-${PV}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/6" # libprocps.so
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="elogind +kill modern-top +ncurses nls selinux static-libs systemd test unicode"
 
 COMMON_DEPEND="
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index 70b467e503f7..5f95bf783c27 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/notification-daemon/Manifest b/virtual/notification-daemon/Manifest
index 37ccb383b33b..1791cafca916 100644
--- a/virtual/notification-daemon/Manifest
+++ b/virtual/notification-daemon/Manifest
@@ -1,2 +1,2 @@
-EBUILD notification-daemon-0.ebuild 909 BLAKE2B 0742c27bf6df03e9af809cc9dbdc8589ca06152438bb60fa246b6e0c7799645a06531bae33d8ac431938a58b4a4ba034a7d3003e2ceac4b343e817ec23e94d63 SHA512 c15906437c2e7ee0f81d4240137ea6a1fe56d83cda1445bf05707b0a430a835cc510e1e8b631cc53b8338284f9d0c226a6e4ad50357e883741956cc7df780e7c
+EBUILD notification-daemon-0.ebuild 864 BLAKE2B 3b69f1c061b611f16d8db10574d929b615dd8182c357d43deaae0beac06eb3458581c76466e728790c8416815ff5e23239fdf5c4523d698d44f02e155fd5c87b SHA512 7f7e8137c5301c64a31f12484d0776b2c4cbbb9acd5d53c74ca99767e8df9f8a9f3851353c995c93dedba1a60507aff6b9b7cd6e17febe1eef68440b71f498d9
 MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4
diff --git a/virtual/notification-daemon/notification-daemon-0.ebuild b/virtual/notification-daemon/notification-daemon-0.ebuild
index c6255f2fc1c4..190fd4347a28 100644
--- a/virtual/notification-daemon/notification-daemon-0.ebuild
+++ b/virtual/notification-daemon/notification-daemon-0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 DESCRIPTION="Virtual for notification daemon dbus service"
 SLOT="0"
@@ -16,7 +16,6 @@ RDEPEND="
 		x11-misc/notification-daemon
 		gnome-extra/cinnamon
 		xfce-extra/xfce4-notifyd
-		x11-misc/qtnotifydaemon
 		x11-misc/notify-osd
 		x11-misc/dunst
 		>=x11-wm/awesome-3.4.4
@@ -24,5 +23,4 @@ RDEPEND="
 		x11-wm/enlightenment[e_modules_notification]
 		x11-misc/mate-notification-daemon
 		lxqt-base/lxqt-notificationd
-		net-misc/eventd[notification]
-		kde-misc/colibri ) ) )"
+		net-misc/eventd[notification] ) ) )"
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 3b268dab74c4..faee9dbcba39 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest
index 184f29878adf..c9af77813c4a 100644
--- a/www-apps/grafana-bin/Manifest
+++ b/www-apps/grafana-bin/Manifest
@@ -2,7 +2,7 @@ AUX grafana.confd 162 BLAKE2B f5567427be3510fd7c79eefe06fe4050c7e350eaa9e82c3e87
 AUX grafana.initd.3 972 BLAKE2B 077e7cf023b83b152c762f63c937435823053909e26d6743e94fc59f76ef77220610d2fd02950ad0157b9ebbfd8380a489cd0da33b5b25102fbaa936c1212e2f SHA512 fbad0e00b1b47d9eba808d2ed84e3208d2279f1deeaad71710c6756ad120b1f9f1bb2ba1c5f9677ed3a5efe28df8437c48f5c68b5e8eabb1e91b14e762c1e442
 AUX grafana.service 651 BLAKE2B dcf0ddfcd2cbbc457f0dc7142a64c403c7657c30a7f85ab103828758c16fce8c6fc2e80a4f2f943393f3c226f873a2bce4b6df999fa4b178b3e95bf213688d86 SHA512 7bda41f0c6ee9ec0947ef6b8d4591453f797ac0256f9b67800249a6edf699e55855a9bd6f46501a86ffec5b5d2e1d8ac735657a0c63600683f61044e0bbc35d4
 DIST grafana-bin-5.0.4.tar.gz 51600575 BLAKE2B 13fc3943fc55424674ae173c9c16ae3f1de0d1c331dbee807e69cef9d9743c83d348185edc33af541ae77766849e74a5cb0c742a316677ac9582db40ae051d08 SHA512 c0a05e6661af615676f3bee99c7865bda599a47de464d4bb322232224305191879cdb6ac4149a8963b2a7102d6a34349059cdb3b0e069cf830d341889df1c745
-DIST grafana-bin-5.1.2.tar.gz 52436054 BLAKE2B 653361e5dba07b9f0e6105af7fce7ec0785c31968b34b20850fec35441bb6af171571528ee243fd8a0bc95b7b799ae659ae19ed80e318b2241f984a376f09189 SHA512 e44cd9ba5dc5de93b8d7d3ffcef8d127b62676672e14ebef6df1f4345268ac2acdc1c74c4cfcd6e09511076d43e0a226bc7d48c56b49e6f1cf73d6541982f092
-EBUILD grafana-bin-5.0.4.ebuild 1744 BLAKE2B 44baac3eb8ab856235c2eadc43c415e0973722024c3dca157b0aa7c11d9967c30b6f5d55f8d2a534b99c2cc9ddc3e1c1c381aa2c50543042ffa8b134264f6e90 SHA512 6eed7ec805a005b2f7cf7fb959b77c2d8169f1812cc0cee829112cf4e97c2d8f38af07a5c32712f878926fec735034378b18f4ed650ce21fbf0ef81e088824c4
-EBUILD grafana-bin-5.1.2.ebuild 1744 BLAKE2B 44baac3eb8ab856235c2eadc43c415e0973722024c3dca157b0aa7c11d9967c30b6f5d55f8d2a534b99c2cc9ddc3e1c1c381aa2c50543042ffa8b134264f6e90 SHA512 6eed7ec805a005b2f7cf7fb959b77c2d8169f1812cc0cee829112cf4e97c2d8f38af07a5c32712f878926fec735034378b18f4ed650ce21fbf0ef81e088824c4
+DIST grafana-bin-5.1.3.tar.gz 52436314 BLAKE2B e5ff613a6d65018b6c205a88a520b5f07ea32955cb8f4b75d1eef05946d93c50272edecf80c8a4a6b8b4a70fbae7c90c71f1b833a31ff56ed71c59dda3007b4c SHA512 3d0fcc2015d95a5334d571f4ea61fa1bb7ead1b4131342e3bf167c832c0f951ae6669049da73a8d954117d54b5422be9203505db19b370ec337c481900d7fea5
+EBUILD grafana-bin-5.0.4.ebuild 1744 BLAKE2B bc770fec942dd9cb491ebe4a6fea5dd1b344a24ba70c36c8180c419720b0c749c4cefd43d408d7b0d0cfc64fe835af5e7a443ce3f20dcb185cc937fec063d6d7 SHA512 2b2958db3539457935e235f4271aff86100868203cf840512d2d9916067fbb899f95765bbda14f9fca60063d618e09de4c1c96de3045e864090a676715a5231a
+EBUILD grafana-bin-5.1.3.ebuild 1744 BLAKE2B bc770fec942dd9cb491ebe4a6fea5dd1b344a24ba70c36c8180c419720b0c749c4cefd43d408d7b0d0cfc64fe835af5e7a443ce3f20dcb185cc937fec063d6d7 SHA512 2b2958db3539457935e235f4271aff86100868203cf840512d2d9916067fbb899f95765bbda14f9fca60063d618e09de4c1c96de3045e864090a676715a5231a
 MISC metadata.xml 416 BLAKE2B ff5bdf7e202aa96bbf615df2f86c6542bb7d291e6d564dfac683a2e54002380dd80ef3f1ca0b6c1f398de0115e26398903256b9d64e353127f25c3e97e5b21c8 SHA512 db2cbd25cf9b21664db93dc8f9719bf7f9a2fd632c5231d0f296bb32f3f6af3e08307c8a662081cc68f33638d70f6512094fad76073a5de4ceba02eeb3d1188b
diff --git a/www-apps/grafana-bin/grafana-bin-5.0.4.ebuild b/www-apps/grafana-bin/grafana-bin-5.0.4.ebuild
index a2e20a0a3685..579ce394738a 100644
--- a/www-apps/grafana-bin/grafana-bin-5.0.4.ebuild
+++ b/www-apps/grafana-bin/grafana-bin-5.0.4.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit user systemd
 
diff --git a/www-apps/grafana-bin/grafana-bin-5.1.2.ebuild b/www-apps/grafana-bin/grafana-bin-5.1.3.ebuild
index a2e20a0a3685..579ce394738a 100644
--- a/www-apps/grafana-bin/grafana-bin-5.1.2.ebuild
+++ b/www-apps/grafana-bin/grafana-bin-5.1.3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit user systemd
 
diff --git a/www-apps/icingaweb2-module-graphite/Manifest b/www-apps/icingaweb2-module-graphite/Manifest
index 14696dc2426c..000a71db6cb8 100644
--- a/www-apps/icingaweb2-module-graphite/Manifest
+++ b/www-apps/icingaweb2-module-graphite/Manifest
@@ -1,3 +1,5 @@
 AUX patch-unquote-service.patch 2566 BLAKE2B 1eb3f46859c5109c9e35e562a5d0af0a3a0be5f374e2140e8911aef968ae5acb68ac248445246248739add0f3e80416dddebe7eaaef8b7bbda150961d533fff4 SHA512 6365cc7886f3b5d1ceed9b7f46a90ecc80205a0f42aa31e75b53e9384a094503a82a6a86748170af07be021eb08c0bc2ce800b8fffc961401ee3a5290c2b4297
+DIST icingaweb2-module-graphite-1.0.1.tar.gz 5988 BLAKE2B 43f98d853643377cc8088e60845c603563ec5f3bee8d1e9f48e884677c7bfbc82da5603e1aae05634616a52bd387c1685bf2605d1abcae0a96cc88dad303dd1c SHA512 594a8d2a141bdf682fa37dc7b677a78f255dfa3d05071878a416b7426ed6355abc2a2864394e333a00c08aba8fd4f898e42c5a49ffeaf689a16de175f6ddb333
+EBUILD icingaweb2-module-graphite-1.0.1.ebuild 713 BLAKE2B 0d795bbb7ac66003659e857017c68745a534671250252ca35a20b15105ab243752b09bedbbff14c87f5b21c76658102973f39028cc4147ab2d003d9970a3d31d SHA512 392c3e58f37ce7a3963742eba7063e2ccabc185684ce95e22e11aeb98c21d3e0f9e6e57bd0ba394a89cb284dd5cd3d171a7119f65d750ec842a97b94eae95fbe
 EBUILD icingaweb2-module-graphite-9999.ebuild 756 BLAKE2B 04fde5e34c4a0a3455a0680fec5b7cfa76f8e0bbfe0425e1054317c66a6172de975c0c5bec020f88225ee6f900e1687f7a3d38d43b0e300da44384fb3c9636c7 SHA512 717da1e4407afcde50eafb1ce60fc1a04bbc9da3f4406d679959b34f00e46637518342bd822420a447a4a5511a682dbd5ed895819589fd2ea0e4152dfa308ecc
 MISC metadata.xml 254 BLAKE2B 731c7015b1415180253ab851fc24ad031153050aa0feff41781a5c16ced70787ca132b4fe53adaa8a189de944dda987c65081162895f1f03d68dc77405308fa7 SHA512 49faa8aa0aef31db638fe291aa55ff114f96fd9f9b2c733f88b326b44f3e9dbf627e825de7c41d45f208b2b7e5e6cd5c03e6fee3fa6013625ce7ce158bbc9a31
diff --git a/www-apps/icingaweb2-module-graphite/icingaweb2-module-graphite-1.0.1.ebuild b/www-apps/icingaweb2-module-graphite/icingaweb2-module-graphite-1.0.1.ebuild
new file mode 100644
index 000000000000..1722cdeaadb2
--- /dev/null
+++ b/www-apps/icingaweb2-module-graphite/icingaweb2-module-graphite-1.0.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Icinga Web 2 plugin for pnp4nagios"
+HOMEPAGE="http://www.icinga.org/"
+if [[ "${PV}" == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Icinga/icingaweb2-module-graphite.git"
+else
+	KEYWORDS="~amd64 ~x86"
+	MY_PN="icingaweb2-module-pnp"
+	SRC_URI="https://codeload.github.com/Icinga/${MY_PN}/tar.gz/v${PV} -> ${P}.tar.gz"
+	S="${WORKDIR}/${MY_PN}-${PV}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND=">=net-analyzer/icinga2-2.4.0
+	>=www-apps/icingaweb2-2.5.0"
+RDEPEND="${DEPEND}"
+
+PATCHES=()
+
+src_install() {
+	insinto "/usr/share/icingaweb2/modules/graphite/"
+	doins -r "${S}"/*
+}
diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index 9babd7e4c6f0..531d6ccbaeef 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1,8 +1,4 @@
-DIST icingaweb2-2.5.1.tar.gz 8133540 BLAKE2B f5f9d2131f87160f7df5b34cae7e9b1036e14994f3b739607b26ba676e6cd56ad95ed5688c873df3232fc9782566b0bb5c2054aa04dd272b389a1eae8501af88 SHA512 8e76347f76a2b2889fb9a61c000ef7865f40b2ea261f59bfbf24bb8d0e4e7e2977ff283d31989f6892e371f4a9a4d4682a2cac3269070b2036cc37ea74af1b11
-DIST icingaweb2-2.5.2.tar.gz 8125051 BLAKE2B 36ed108d890736c909a9aa5908405e864129538801a5648194e976179660841244c53f852badaafcda50b2677abc74afb3b48d2073ef8f80e23a795a65b2a641 SHA512 174bc4b2433f49cc9e58dc2501b9328520914d7eebb81193950e5fe337620f3fbf345a0537176fbfc1dbc062f9cb7e1e4e3058480bad5b73f465fb8e1839e90d
 DIST icingaweb2-2.5.3.tar.gz 8124667 BLAKE2B 43f9e47d670aaeffb15a8dbca6794d72436b195d4a19491d31f548a57ef9d2d0c411f16276be5355700e8dc863b8ef84821c68759d65ef2e97688a88d92605ca SHA512 d11d4f90f0cb54ab6fc5412151d412fc7827c895e81f6c91806090c364b3df4f2999bbc5f65cd4007406a3e7a7c9e0d48fb8f8362f3d7780681ac8702cfcb572
-EBUILD icingaweb2-2.5.1.ebuild 2549 BLAKE2B 3578e930824e6dee430d33190fb62f7074c6e8ed8d839f88abe840502d767441f8d156e869ff0a1c14ae3bd4af7fad423f43150ae18e439886df46e1e75510b4 SHA512 46ffbd0eccd4e880bc74398dc63c9f5d5c4a7423602cc81be889beac106e5090166aa838a3d0ea62a883cac4bdfef89bbfd888eb64a0f62b6dc84c317d204948
-EBUILD icingaweb2-2.5.2.ebuild 2551 BLAKE2B 26e99debb6314b95d285171683ef789e0b0d3d7a6368c0c29c6e182d4179f2fbeaf080f4807710c7b160a47088fe969bb9d374ea81ce31d497514f25b32d36e2 SHA512 fa11545bb44db98cb2ca1ff33ad1185990c8d5ee0a15a26db86a47cf77564099576ddcd79eb21467846d46554c8b29024d41bba06325adba7d9bc5854a6654c2
-EBUILD icingaweb2-2.5.3.ebuild 2551 BLAKE2B 26e99debb6314b95d285171683ef789e0b0d3d7a6368c0c29c6e182d4179f2fbeaf080f4807710c7b160a47088fe969bb9d374ea81ce31d497514f25b32d36e2 SHA512 fa11545bb44db98cb2ca1ff33ad1185990c8d5ee0a15a26db86a47cf77564099576ddcd79eb21467846d46554c8b29024d41bba06325adba7d9bc5854a6654c2
+EBUILD icingaweb2-2.5.3.ebuild 2549 BLAKE2B 3578e930824e6dee430d33190fb62f7074c6e8ed8d839f88abe840502d767441f8d156e869ff0a1c14ae3bd4af7fad423f43150ae18e439886df46e1e75510b4 SHA512 46ffbd0eccd4e880bc74398dc63c9f5d5c4a7423602cc81be889beac106e5090166aa838a3d0ea62a883cac4bdfef89bbfd888eb64a0f62b6dc84c317d204948
 EBUILD icingaweb2-9999.ebuild 2546 BLAKE2B a5a883a093e6a88e99d357b65a5d7367719d40fa98d7d8ab530147631448f033ec0858481575bb5a981f0126bf650d7862ea5c283ff9add93325ec640b28034c SHA512 fa08a2c6d47a9b1df8027dba57b7b8be8bad1980af3c45af52203435dc98ce28b47ec211691e241bda8913dcd77370004ef1b24622fabae8cc3d510f3f9decbc
 MISC metadata.xml 407 BLAKE2B 42e1ae67b6d8307c3af6ee7257eb811d893705aedd5852c4b33b103d77bbb4858d01bf8369511d7ce1cc187158482755894583d3b77be0ca7580043279f96461 SHA512 40eb3b6ff856fb8a4bcced4b177c73e4a7987b468dbcfe645d4a9f816f100ce899c8f8f803ad343c2b33b60cbcfbd4cef37257548311d22b4272a15602b1c961
diff --git a/www-apps/icingaweb2/icingaweb2-2.5.1.ebuild b/www-apps/icingaweb2/icingaweb2-2.5.1.ebuild
deleted file mode 100644
index f0f9dd8f5d6a..000000000000
--- a/www-apps/icingaweb2/icingaweb2-2.5.1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit depend.apache eutils multilib user
-
-DESCRIPTION="Icinga Web 2 - Frontend for icinga2"
-HOMEPAGE="http://www.icinga.org/"
-SRC_URI="https://codeload.github.com/Icinga/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="apache2 ldap mysql nginx pdf postgres"
-REQUIRED_USE="^^ ( apache2 nginx )"
-KEYWORDS="amd64 x86"
-
-DEPEND=">=net-analyzer/icinga2-2.1.1
-		dev-php/pecl-imagick
-		pdf? ( media-gfx/imagemagick[png] )
-		apache2? (
-			>=www-servers/apache-2.4.0
-			|| (
-				dev-lang/php:5.6[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-				dev-lang/php:7.0[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-				dev-lang/php:7.1[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-			)
-		)
-		nginx? (
-			>=www-servers/nginx-1.7.0:*
-			|| (
-				dev-lang/php:5.6[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-				dev-lang/php:7.0[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-				dev-lang/php:7.1[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-			)
-		)"
-RDEPEND="${DEPEND}"
-
-want_apache2
-
-pkg_setup() {
-	depend.apache_pkg_setup
-
-	enewgroup icingaweb2
-	enewgroup icingacmd
-	use nginx && usermod -a -G icingacmd,icingaweb2 nginx
-	use apache2 && usermod -a -G icingacmd,icingaweb2 apache
-}
-
-pkg_config() {
-	if [[ -d /etc/icingaweb2 ]] ; then
-		einfo "Updating existing installation ..."
-	else
-		einfo "Running first time setup ..."
-		einfo "Creating configuration directory ..."
-		/usr/share/${PN}/bin/icingacli setup config directory
-		einfo "Creating authentication token for web setup ..."
-		/usr/share/${PN}/bin/icingacli setup token create
-		if use apache2 ; then
-			einfo "The following might be useful for your Apache2 configuration:"
-			/usr/share/${PN}/bin/icingacli setup config webserver apache --document-root /usr/share/${PN}/public
-		fi
-		if use nginx ; then
-			einfo "The following might be useful for your NGinx configuration:"
-			/usr/share/${PN}/bin/icingacli setup config webserver nginx --document-root /usr/share/${PN}/public
-		fi
-	fi
-	einfo "All done."
-}
-
-src_install() {
-	insinto "/usr/share/${PN}"
-	doins -r "${S}"/*
-	fperms -R a+rX "/usr/share/${PN}/public/"
-	fperms u+x,g+x "/usr/share/${PN}/bin/icingacli"
-}
-
-pkg_postinst() {
-	einfo "Run 'emerge --config =${CATEGORY}/${PF}' to finish setup."
-}
diff --git a/www-apps/icingaweb2/icingaweb2-2.5.2.ebuild b/www-apps/icingaweb2/icingaweb2-2.5.2.ebuild
deleted file mode 100644
index f3513d784a28..000000000000
--- a/www-apps/icingaweb2/icingaweb2-2.5.2.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit depend.apache eutils multilib user
-
-DESCRIPTION="Icinga Web 2 - Frontend for icinga2"
-HOMEPAGE="http://www.icinga.org/"
-SRC_URI="https://codeload.github.com/Icinga/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="apache2 ldap mysql nginx pdf postgres"
-REQUIRED_USE="^^ ( apache2 nginx )"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=">=net-analyzer/icinga2-2.1.1
-		dev-php/pecl-imagick
-		pdf? ( media-gfx/imagemagick[png] )
-		apache2? (
-			>=www-servers/apache-2.4.0
-			|| (
-				dev-lang/php:5.6[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-				dev-lang/php:7.0[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-				dev-lang/php:7.1[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-			)
-		)
-		nginx? (
-			>=www-servers/nginx-1.7.0:*
-			|| (
-				dev-lang/php:5.6[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-				dev-lang/php:7.0[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-				dev-lang/php:7.1[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-			)
-		)"
-RDEPEND="${DEPEND}"
-
-want_apache2
-
-pkg_setup() {
-	depend.apache_pkg_setup
-
-	enewgroup icingaweb2
-	enewgroup icingacmd
-	use nginx && usermod -a -G icingacmd,icingaweb2 nginx
-	use apache2 && usermod -a -G icingacmd,icingaweb2 apache
-}
-
-pkg_config() {
-	if [[ -d /etc/icingaweb2 ]] ; then
-		einfo "Updating existing installation ..."
-	else
-		einfo "Running first time setup ..."
-		einfo "Creating configuration directory ..."
-		/usr/share/${PN}/bin/icingacli setup config directory
-		einfo "Creating authentication token for web setup ..."
-		/usr/share/${PN}/bin/icingacli setup token create
-		if use apache2 ; then
-			einfo "The following might be useful for your Apache2 configuration:"
-			/usr/share/${PN}/bin/icingacli setup config webserver apache --document-root /usr/share/${PN}/public
-		fi
-		if use nginx ; then
-			einfo "The following might be useful for your NGinx configuration:"
-			/usr/share/${PN}/bin/icingacli setup config webserver nginx --document-root /usr/share/${PN}/public
-		fi
-	fi
-	einfo "All done."
-}
-
-src_install() {
-	insinto "/usr/share/${PN}"
-	doins -r "${S}"/*
-	fperms -R a+rX "/usr/share/${PN}/public/"
-	fperms u+x,g+x "/usr/share/${PN}/bin/icingacli"
-}
-
-pkg_postinst() {
-	einfo "Run 'emerge --config =${CATEGORY}/${PF}' to finish setup."
-}
diff --git a/www-apps/icingaweb2/icingaweb2-2.5.3.ebuild b/www-apps/icingaweb2/icingaweb2-2.5.3.ebuild
index f3513d784a28..f0f9dd8f5d6a 100644
--- a/www-apps/icingaweb2/icingaweb2-2.5.3.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-2.5.3.ebuild
@@ -12,7 +12,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="apache2 ldap mysql nginx pdf postgres"
 REQUIRED_USE="^^ ( apache2 nginx )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND=">=net-analyzer/icinga2-2.1.1
 		dev-php/pecl-imagick
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index c7e4d79ecab3..ee8f8ec8d616 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 4cf9d2b3d135..1bb3fb52d778 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -187,100 +187,100 @@ DIST firefox-52.8.0esr-xh.xpi 441173 BLAKE2B 79a2b0c6037dfc638a6987a17f864c274c1
 DIST firefox-52.8.0esr-zh-CN.xpi 461679 BLAKE2B 3dd05e314d096b5e4433cbdc7445792b95ef3eaf4e7edbff2835b285e05025fed38f69b4ab51a3662fb04e32a7f1ce75acbc18bd6bfb46ecac9ceed22c15e57f SHA512 bdde8f6b01970332cbaf4e00124669987211b04c4a4e01fded9dd4ccd4b3cd265622d6207f476007cf85dccbf52dfefff3f4fbc4ede92a10c618fa148dac49db
 DIST firefox-52.8.0esr-zh-TW.xpi 453068 BLAKE2B 2099fc503ef3bcdd50a65ce48129a92e6567da06bba45142e6f383bb4ea8a6a9fb7a59056f078fda2177c82d22b8268b005908999d31b847750534121962a462 SHA512 88a08cc47c9cc0f22186271e0a8f472862c8f7f0ddc10c580efe56bb93f0d30b35704c86d79eb86c3ef2c24b8dbae2c922130e4f11df9864db66bd871efc3454
 DIST firefox-52.8.0esr.source.tar.xz 214054520 BLAKE2B 3410a3e485e891119a5d4ac0e47b963fcd225c5d8f3ca8dbfe3f25456de80171263228f34241278c78d932bef44106a5fbb05c588e55b04ca07abec9daec613a SHA512 4136fa582e4ffd754d46a79bdb562bd12da4d013d87dfe40fa92addf377e95f5f642993c8b783edd5290089619beeb5a907a0810b68b8808884f087986977df1
-DIST firefox-60.0-ach.xpi 496060 BLAKE2B 6a9600447736f1ed7c7b04dc68bcf7766ace6c5c7736e29c55bb8022f01a2d1af9f886dcb9f0580ba23d3238261de504c7f94b39c25688c06ecec284b6dc3f7f SHA512 4000fc74a943d8d48a118fff171e65620eab992007a98c169a9133b7deb4c69a543c834f9b765ffe43c907e6cb98e96e2d4a0a71077ea22d2e1d3c3f86a6b238
-DIST firefox-60.0-af.xpi 486533 BLAKE2B df0323c5d59e21968ce51883225e8cffeca2ff532bb8e91f1a6ac9a6d1324d70c3c95123e35b891f035c4c59d9ea436d65a95d3e9ceecd547b055846a85953f6 SHA512 ad4d0d5e3d748c195ce53f73a4e3f6fd3b009388d709b99c37fd95075b2727bf9b1d4d527af8c9d2b2602c89699f7878b28e35be177a5e658323e239510c75ef
-DIST firefox-60.0-an.xpi 519732 BLAKE2B e2526c661c0272f442f39bb608d3e9cbc17f004a65a0ffcd66b5f35123bbf8eac8bb3d457a9fd9f2dc03d0db98286575aa1a9c27c21a0db14e4d64a6c13932d7 SHA512 564adac606bd9e3220b5eb0dfe11ed999b75c24352c063ed4879eab065e0740f91c4214bb219f7c66e073d0c47a1ec55644b928e9914d4fab1cccfc733fe5dfb
-DIST firefox-60.0-ar.xpi 546957 BLAKE2B f9423c9879a6043dca0fdd7fc460e43107028947275e087e600bb53eb44424ec954069e8167b8ab69c4359f08e4553ac698dc84a7f301d149fc5fc55bbd70f4f SHA512 841fddf65fdad6a312608e59958b53c29ffb43b67339d40381692117625500be00553ff7ddbe4e6db04df5519deaef5d38992240d08534738fef3bd0b63f7fb0
-DIST firefox-60.0-as.xpi 529947 BLAKE2B f84d8296f572cea468cda3b5010bd4f5824c3f3ed7cf8d858d5f709cdcc040054fd6020810180732917319fd5f9727db2192cd5b482868a1db5a8d9677349208 SHA512 da1ff316077ae5fef02f14c3ac5fca5543e16864d1a08fb0bce8b184ee9dc2dcbb5721e3501ffa3a915c7662f1170f1d654c8661906062d8cd676b0a59f8902c
-DIST firefox-60.0-ast.xpi 507866 BLAKE2B 0be4fdffbcc51b20ef35464f0a3488fea9eeb1bbec01375dc40343f02353b85feb5a0a185259cfba7f6d5de851fa7f4b75c4bb0d9701dbd8fc556d18c0f495f6 SHA512 283f636f2a1b64d908742cebfbd04bac2f485d2473f1e5c560c113a84e67e1e880791aaec6a88c3c441312cec84d7ba461d0f597d5453d20886f7183aff68a9e
-DIST firefox-60.0-az.xpi 523975 BLAKE2B 2e76c1374259b690361c0ce23bd239577ad6f0db4df545fc4c207132a50ffd020fd00cd1429aabc7ed94d3f744eea03cad1fd3d75d562fa51e90679c27ef68c5 SHA512 7215828146713d1bdbf1a419c76bc24823fde8400662ac6265bbf26543b13fdff9b5824e99d702481df6c97da497eff105668a5ec82001d68a681e9e4780e949
-DIST firefox-60.0-bg.xpi 573075 BLAKE2B 95cfc43e00eaec80283af639bcecd81fa5b4f54115b104210ad361b8257c7e317b0d6620f6b2a9c9e8bc14b0e2c17c44d6a406dce96b89203c6752253c527457 SHA512 365a4f828b0022d6d7022fcae75e081ac656249769f269b141d99bc8b0b7e4a7bf4480094d4a7b646b58a581edca9d69797fb51f9281c3f0fc58e1f02676df15
-DIST firefox-60.0-bn-BD.xpi 589638 BLAKE2B 9c22b41b603effe7a3b79b801fbbd712c994cdb627eee06e180c77f29952e42e624d74ec62cc7ed5d1cb1b32fe411a07d57b8307a4c0bb4ad8da911f22c28488 SHA512 91400026814b98f5f9d9180b2cea58bb2d8f13a8df4edd012689709f0c46b41291db50b17289d3acaa3a4555072c2b1f8bdd1e71b89dbe72aa0adde45c81e794
-DIST firefox-60.0-bn-IN.xpi 570084 BLAKE2B 8e1d7fc5f72e3d4223d3e2e4b6182f0e239f4c0832b249c5f0623e3c271eb8859d7a979b5adaaa4f6751e5c56ca2c060ce4826c9d31ba7e3f04be84b623d6aa7 SHA512 f2f3934062ce87bdd6652419623472828cf1596abe01a698b39014a0faa2a1cd8c01c135313d2b1e1737da6dae6e2f31d9158ea4e47dab4d9f4cd07a822e84dd
-DIST firefox-60.0-br.xpi 511252 BLAKE2B 81512330ccf917cabe85b03e2c2d76ecd90791903e4d76963e4409c6fa01897da2671d3069a84642efe80d15a23f3652794756190cf1b1ff96aa81d36d632e0f SHA512 7258f991dd35cd2cb0eb09396c30ea2149d3061e677610312a93c2be55feccc9b649c3ae44c09bcebbee0be878c5c4186478a12d5e8425d01267f5bf1eac0290
-DIST firefox-60.0-bs.xpi 513930 BLAKE2B c7d517fc9b9f2b7759a50c8c4f635b548cbc2644cf35f5c839195077616d6364c59fbda0d5eef4cc105fd6afb98f0bd4f99d0c88724d1db95870cecd0ea5ff2e SHA512 4ac6a3a9fe921a75874b01d66cb7e694232c80e005e3fc4a9fda4e7183011741373d8940a59b82ae4d644d0f9ebbc483c15e81e6eebd1ab9ec22c8798739381e
-DIST firefox-60.0-ca.xpi 524485 BLAKE2B 5c70545410a2c22b22d1807afdec15b76d2b5665f32c2b555b8e1cec666608768a0558ad49c7c9a4a5d810bdf42edd530e9b0aacf8dfd4a13e5033dada9d81f1 SHA512 979c8d61c5d0e03ce4a216b68cb07040f1a8e118fa154e103308531d62413a5b7c5b6d384f868938ec6cf7f6f7484d8766bff9fad187ab8e86e27dd9d15d195f
-DIST firefox-60.0-cak.xpi 535507 BLAKE2B 4dc098c5991cb5dc9f4b9ae7572b25e90c5e6c3189a5f6bc6182dd53e1a513f9aee6726100b6e1c635ac620023a0ed337f0a41ecd646dc261ac91db062cad845 SHA512 2b830c0823262c9d20b928fbe0af0634c3970e4cf885e972b1d0643b22df311552dc44f84ad00bb00a7615b221b83d2327caaa3108570970842a241e2cc33fab
-DIST firefox-60.0-cs.xpi 531020 BLAKE2B b7d513cc58e07967f46032c3259fc60c3d23728f37704105ad4441caa7fb127f6024d90dee9dbfafd6768d2082f189eb572b784ed623b8e8d8bb4d206297a532 SHA512 b4308f0bc27ca900d893b5bff02f96c22ba53cbc91b5d6ce2c08d9b44b2b3225762d80c57e56f0bf551c795e301cb19ca8e7b0d2502e743f203f8af0913e82e2
-DIST firefox-60.0-cy.xpi 515865 BLAKE2B 9d5e028a6738a24ba5aac2d30b7a4e41bbea89344b33ab7fe9135406f617e7ac875c6fb91f9078f139271d63219a11ff1db93e054737f00b5ef89375f2a1a6e2 SHA512 c0df7dc67009fed80524a1d080be4ce1a4127479c2aef0ed87719924dd156309c70e1294719f2d69b91198d525e4367b2d106cea57e63e99eb2a47f0d669e87c
-DIST firefox-60.0-da.xpi 509983 BLAKE2B 40b92d9079946e5b71acda69e48f72f77daeaaa9fb19f592569950f16679518d68ad242228f079d066578488d174fa1659a64fb446d07e05e3e12607e54351a7 SHA512 de13754c64dff13bb50318cd6d3472e9593f832779298a6af6ba620fa038bb79c5697ecf12325afdac3d6943ac13f2932a82d94115e826fede68e44fdb0595d6
-DIST firefox-60.0-de.xpi 525692 BLAKE2B de339abdf57968107ba478a3b957bf31385713ba3f7b430babc470a3440e5f39115febc76e34276aab6bca0e29d53b5b69b379532f2a07cc5204422bce6addcd SHA512 2d1c89b548ebb6bcb69ceff92b9efed9d65d1c416508a11e3d35100ed567de6ccacd7b237cfd723a30158139d2c90479ee49bc78f01af4aed8e980c0d71c8fb0
-DIST firefox-60.0-dsb.xpi 538745 BLAKE2B 9387e78832a48a0ba8ce0bd6a4990ca1508b96aef89df9b51cdb790c966f1bc0a388b874b0490f2472b9def346de1dda3c8f0b7e5b9ed278a6e75683a5e665ef SHA512 fc19f8af13d889ff2d000d662bdbdd02e00894d01c5660e8ab3a6e3fad652aee3f621f1c25b7da2481435f430b59fc9f31e07639fdd02e5f4a265554393ad7c2
-DIST firefox-60.0-el.xpi 592911 BLAKE2B 5a6ab62387e0c1dcd0d6c3af23b34da4a1e2a91b8f0db76c98a2fc721d64c6aaf9e05449f8d59b5e211554e1cde540d0c0f562020ee35f7f480c1342cb629d1a SHA512 b0ca463b7252f01497ef2e9230ed5a29813359117d6a710edd5a91513ae75ebf53da2fbccc30c5da0f13fd94a8f85b3dc211b53392f9e143300234c3b4259be1
-DIST firefox-60.0-en-GB.xpi 490907 BLAKE2B 33bcf0181f2afbb38d1092b3466be0e4139affeabbad99ab60583c2bef0443c18759f9a2e4c9abd41a46c570f5e54edc8a5193a5d9497b66c844bd4688b3820f SHA512 72eeec44f9a80b0ba8a15921ca7a5b0e99cf5d937419344e65e4490b1bf992c26f1dc4319610af8f289ad26e5d6a9cdbcd0714019ed5fecb2c223e5df340dbb7
-DIST firefox-60.0-en-ZA.xpi 473893 BLAKE2B 231de0c695e6c2843c74aee71993762700419c1078d7be1de8daf934c87eba50188f8a36c2e0ab666e44331cf252748c8de04591845a39806fa74aca3ee94543 SHA512 83b8c258c3e916d3f81ce49f495fd92a02fba5dcc5d8407c00ea576b8caeab808fd21f09243b441d5cb9e97fcc038da25f98ab2a401ee1b26c8b4c57f2b51afe
-DIST firefox-60.0-eo.xpi 510486 BLAKE2B a275c693465c157756c6e5fcbb76ea2e5f769eb22acd16adc71671f4ce8adca002980b911d3bb976e25e6aef0a9f29be385f96a8a803265fa286c4de19a9a874 SHA512 013330b48f987000e7687fc2aca2f6e3608fef14ecf5cb68c374990a9c6147edc53ae3bdfa355d82e8a7b24abe8505885a89e2b7aa628368561cc6c187ee9119
-DIST firefox-60.0-es-AR.xpi 523825 BLAKE2B 8d9fd5af2d9bb1cbc89ab87f93ddaaa5d8b643ec4321fe0f01d3132746a92e3d74788bd545a4923f917b919569151f3050058af0b93443201eda393ed68606f9 SHA512 a683bea0c37db8e98a527df90949eab52a93e44dfca76e12404062e8519acee778c0750345c205019968606e5a6a2beaad1da8565344559506a2773271c9de11
-DIST firefox-60.0-es-CL.xpi 526509 BLAKE2B 0e53bf6002ee62a4a952d0fd3dd76082351203e5dc2a072899dbcd42a23bc5c4e68f3aa40e27210024a5aa7f065218e37e9e5a2e4b2804f8cdabdf30b60cf9e7 SHA512 413ef921da9edd7c5b55bfaebd5033a7ca224dd1c8e6461e9c748e2a9b3fe8f3ebbae93f089c196784d69d2946306d2286558af6a410ce08da7a5c0a84a89f0c
-DIST firefox-60.0-es-ES.xpi 459145 BLAKE2B cdc386cc4868c07866a204cc2e39fb562c8315f835bba7a0d4f8ab9f80f734bcc25a8b88699ac137ff7cbb0d2aad845756d02d49468589f645d831795d71fef0 SHA512 e655e6375dfb8bc92d0e23205e58106d71642b5791c2274302003e0037bd42ebd3f1d17df38bd0d06b77a6c1b1f70630333daa5d3bc3ca475d0e583d3902d504
-DIST firefox-60.0-es-MX.xpi 527837 BLAKE2B 38a027d3c710118a5ba8b29a2ba665af9a099225dc2a3ba8c97312f351c1dfec4141b8ab19253f024d572fba4637670603faa7cc88b9352a327f5bc4bdd202c4 SHA512 7a7c92261d4ea0908c02a7f4460e3dbf88e82dabf3cb3502d71e1165864b99e3e140b27545aacc78b565784bed8603a0c4dca3fafa905fde192eb522a6f058de
-DIST firefox-60.0-et.xpi 504177 BLAKE2B a08f1b266df8c0bff3942896d4b96d211fd66671b5e71cdbbfb259f0cca0a269473a5cb1e5adaa503dfc1cb9251839021736c5bf72e9cd83923d1c3090571d80 SHA512 911c3d4c6526ba7345a591044097cbb9f8062c177cbf6675f1a8d1be9b3598f21782bd8d53896c91f0733515fe78593ea7acdae029cfb8b2b08f0e4c98bbc544
-DIST firefox-60.0-eu.xpi 510932 BLAKE2B d78b2563f9342ace14dfe22b11b6599fbd7550a2795b245f5c28c98e43f174da577cf8471af9742124df49ac37254a2dbb4ee1fb1355594c190294adeb121d1e SHA512 b23fa2e6ed9bd6cd6a0ce8f97bc636d58ba30803a247492ed2b53454515f7d8aeb146fedb8931769fff8ba03a57947637408668e819226c85f20e4f19e98aaec
-DIST firefox-60.0-fa.xpi 565492 BLAKE2B 0bf57bf17fcae1116f73f3663b982b164c6aa499ee8365014134c72ebfab3cf73d0c192f640224bbf722704c39a66c222ce7774afc54f83b574b71ba66b62958 SHA512 1611b8d34f511da01c4b826154429c8e2082b93089a8dcd74fd8e9debc4a57c1755247050c008aa118cfac45a397ec2a34d48b67f32766b089054702ce98d203
-DIST firefox-60.0-ff.xpi 511431 BLAKE2B 787541d4779a3aa0b7ca6e815d7846bf23144a1c9763e921885047339b20e18de160ba34d1eb9a391f8fdebe539241f7408db89c5a8460ceef383d7fe7734bfb SHA512 7d8f9bf35645b97fc16805ca02280f86a35fab4b9ab421f731cc2e6c06da04318d0de31949b46f1f7768fd2681f5db9dcf0a0ad86212915f35f0dea3f647d9ab
-DIST firefox-60.0-fi.xpi 505404 BLAKE2B 8d377a384cc40871006e55be4943fe06a1666e085d3443a772a2a296c761ebc44642f01cfd6b77ad559e60ecbabda88440579268d62130819c6f66f1b9736aac SHA512 676d4671f7d0181de052d756cd3d606e5ed403e11d6b254461d2dc27dd7ddb1f699902c3bb53f7a2a657dc2ea8bccd3eb2e7a0a2d5ba574736fdc45ed208dca1
-DIST firefox-60.0-fr.xpi 535240 BLAKE2B 729d72f6593269e768b0ace99be160236cc74d3cfc108442cb849e8676f8da2483e9ce61c6b221210dac0c80a9a44f22d13d48606f58ea94f2f957595236a24a SHA512 5fa31f99f86cb94d5cfebc859a96e4ce228acf60520f27deaac6af2a15502b3724d512dc718be7d6f18234f62a42ab18c3f37b35bd9ae378c7377c9969c3e8d3
-DIST firefox-60.0-fy-NL.xpi 523737 BLAKE2B 3db292e63e7ba30abfb68d007d2c2ad915d5515a387f14f009d281c13abd2fdc24c22654a6c4931619c53effcb3bf9cc451452fa4439c4c7a9c09c2bd9141f03 SHA512 51118c4b2fb6bb984f54fd0827350aae93242ac7b1c29d2f46383c6b169d66b5885ed2615bb98ff447d5ddf358030d67730b8f2c808af2915ed6f6a63c71b1f6
-DIST firefox-60.0-ga-IE.xpi 526201 BLAKE2B 0ad305d6d137ccbec9f63725dc2bc7d3159aaad5825ea93b3bb036b6f40db902199c05e6d294e52ad4b38559c84b2ee043fd7db3f5aa11fde1f038ad8dbb2758 SHA512 676ffc722cf4e2380c63e602f65cc601b48471fdca32298a99c408d9ff9a65db405dd2ae2947da933c25768a6566e6c5f5b8b2b9acb84cae632ae06cbba0a222
-DIST firefox-60.0-gd.xpi 520094 BLAKE2B dd15f7a4c9640518d6fd2893cadae07cf4e8321b65b77a8acf084f2ca3b55e8c158749c3f2f18da9604546d834eff189b1780522fcefd8bda13f078fcf033863 SHA512 a9c98319ceb37bf347f11c732d1cb33276c0ef1794fbcf88eedbb2dcccd5130ce7f0f95e036a1c21eb682d47fd889c6a05175f5ef11a41d325b1f60b85740db0
-DIST firefox-60.0-gl.xpi 496596 BLAKE2B e14297d0e50ab99a476063d676b575fd80ed5851c4e78e043a289655acc1142196cc59e4f305ed8cb944acd3ff6ede2cad174b476dc525b22aa31c024afe577a SHA512 c899edf53c14ad57b8161cb78b5172b2884ff3390cd0d0c029bac9987925a4dc2b7b5bfafe02b5e9c05dd9bac2fde7df4f3903d1c687711f74e99119ae42facf
-DIST firefox-60.0-gn.xpi 532445 BLAKE2B 88094fa828860de35fdcf443c0923fb1e73433447423dd90e6911feab63fde94c47c7ca3127c1a4b5a15064254eaf9187dcf3b823926363a10ad75b003e10d95 SHA512 42634c891c7429080c49a5802e9d0f101f16ffb39bdcd62b9d372fe68637527db3872eb5297f5f0be87883f8801ee0ca984b0be35d17ae61744f54ec2d56a8e6
-DIST firefox-60.0-gu-IN.xpi 589477 BLAKE2B 9fd73ca901842fe43551ae64487466c910fafc84aa58f321244490bdd8e3c27a98110b6f13a6b270d5d7564690af08d5064348f9654a821370d05f71539a00a9 SHA512 06877e34fc2f5f5a981d6b4675a87350daf3aa32e8bc7b3bde99ff06e300a55a4dd4b74cbd4506dd4470c38c0097612c38c2f907f3263747af9d7634bea77dae
-DIST firefox-60.0-he.xpi 535208 BLAKE2B 7b3c4ad6b8b43215689fc7cc141b8fb69c26b14d85ff13ca4b9d2fb35dc8229518664bf65e955073528393e05e918657ce76bf74cb79fb261f95671395477703 SHA512 eb3c5d7834fc1e8883a5973386411a24c19157b643425b9715cb01524e47b675f9e4b2607a1a70d3f793b30ff2ad4c568049853b3a9d31837aea02604f4c2204
-DIST firefox-60.0-hi-IN.xpi 590081 BLAKE2B 1272cacd0bffc935abb2dfa81380f82bfc3af1a89986fdd2c91c4871061333b0fa35b9052b88f55c663b21381cdbb900cd2105d6a668c4a289cf2cb711101545 SHA512 bb0a0cfeea4104515bcd49924464a382e8f0f0691bac36e88a43c54c3f140446c3636a551da410b34b0faff1c6d2634367ffcc524b21e2bde99edf7d4243c0a8
-DIST firefox-60.0-hr.xpi 515190 BLAKE2B b7512e56ea22d4c670c63b1039aecbb6de5f7ebf6f8ea29aaefc110f1401e13872368b3c5ca5deb37ab060e3b64c03e129d95f744cfc714f9c429322a35e6bb5 SHA512 dc58ff020baec16056adb11f8b2f8bf334e0632c34460ac1f3af43cc836b940faf0719810fd57c25fed5674a37ed50beed241fb4eb2592a271100cec5629e698
-DIST firefox-60.0-hsb.xpi 536278 BLAKE2B 8afe9946b66916fa74e68acc675813da1a03e2cd7730d38da91e77a4f9c91a628a3d4212ba1c3a650fdbd885931d67475d4734fa597cdbc28db7a599fa8022f3 SHA512 d863d508fcefe197e252cfbb9167d3672555202ea01e6940718b9552953cafc64f11bdff22116120e97d7d855e1d2fbf8a5f82a377527d0f146984c7fc30ed3e
-DIST firefox-60.0-hu.xpi 537586 BLAKE2B f30de1c23d116a738f400ba2cff01c4581390f63fc42daf32a385821c0185cda633722017459ef3be5a7ed6ba6b70fe8d3444a08cda44f541a3e1baf0f1009ff SHA512 23acfed9c6c2c978507077463231897f8a41e1c34bfff9acdc45b169906c1bf7dcdaf09ad7924e133372ab5c50458f01a2c5f48f8126dd488edc3b02740fe001
-DIST firefox-60.0-hy-AM.xpi 568631 BLAKE2B 0ebb43b8005fb77a80fb8320fcd792b4b6b5d89f2bf5e7fa703f8dd8b6862c47677a6b2d98462c187046ab9fbf793b2f0a54dac6e1719692ae42d455c216055a SHA512 8a9e71db5f7bfbf0eea21d5ce650a55afdc639b763dd568e692a29e220a2217425435398239d37eff7d915989d3437b550fc979159e1f1b21941f56b4cc8111b
-DIST firefox-60.0-id.xpi 501456 BLAKE2B c7a5cc85807bc20e4867d36d6e93228484648b0388d68299a16fc2880611916693ee7cef0441cdef44b843c936689ac657a5610f7539c05ab5810a3de8f8f4b9 SHA512 9f9d29d8c3240f10b3a75bfc5455f5675ba76eab1e509591a94d301b8272fb95f6fd617775f0f3a1ee92c62b632e1b7294d51c1456a60cf47131d5b8c231877a
-DIST firefox-60.0-is.xpi 512502 BLAKE2B 2ad7d3d83d30a16a1c55a4d5e925ccab127e2529751c1f940a1e264d0958c3b6909137828ac48a6a1b4fc065204a64fe615e795bc37f58c5a7ee29b49ae60c6c SHA512 6c90902e847dbc7561854e6812e3cb3d8c0c2b059b69bf710b765c40066f9a756d83e014067153dc5d266d86e412ad9fb1c8b7726cd3b29464c6a17b32e444e4
-DIST firefox-60.0-it.xpi 398258 BLAKE2B 42f34fb0a9b4345f5da0a99cf1f31134db35fe3d3c7b37fce95f6da224e508b20edee6ea6072ff8071e1fba206f51e5dd94cb3e9c83fee3bc1dd38fe89285188 SHA512 c0a43388e5565a035f0034c505834e9999d791636a537334ae497af048b827043837397a554db0c4d4c0700f0930e2e7d4162d1629bea44aa33e58fc166c5f81
-DIST firefox-60.0-ja.xpi 571236 BLAKE2B dd2e91b8c7bd0626f7b41df5084ce4c6b82c6207787c1e2cb48f29e4aa515734e06f3a2125963a3c7dade3a0379ce28a660bcf86fa1c5c9c89fa94509dd90c6c SHA512 b617d225bcf35a0cf0c7b32adf9865f28ea1609dcf63e9142aeafb1db58cc32347cd461287bd227236adde7dac8418ee558062b148de1eba1b1392a318571676
-DIST firefox-60.0-ka.xpi 556067 BLAKE2B 60ffe0fd06921d01fb4238a858e1df2100db2d02418724f7d7a61bfd047cbbf2c0abb3da12d95c13714752e4af417b9639ba0a388649470827cca4f9dc32ad47 SHA512 c56ff803e49b5f32e9e9de5f2b5cbdb6c14962f3767c401cca602ef5a2fd96d7eb86dc2e1709a3a0b1bc48bc32b97ed134e5c76becbcbd60a9e82ed0bbd85c55
-DIST firefox-60.0-kab.xpi 519620 BLAKE2B c82652db24c519019ce4eb2e221e9af5836d9065ceb74944ec56aa73a1f0b8441acc26a19dd3dade775d67c1109dc4fada388a5257dd2c12e0dd574a8ea2776d SHA512 52260d26dcf3acfd8f65caf9e27368f5620edd180205debf8154c34eeb4ab2835f4add78d6951c0e6fc76e856c038df5ab817bae1d79892d238d3d305f595f92
-DIST firefox-60.0-kk.xpi 582208 BLAKE2B 3f4c68cbea549add3d90d2eae946e7aeb95b5065b85299512d52ce6ce08d9f6d53b4772bc4331b5485a905f6632a8d56461bdab923b75cd0e35d461830219612 SHA512 5bf1d7bddb28248ffea6ba4747bdd3ab48e3bb7c6a476c7363043aa87f244f0ff4b5d5215af974b20a09028b1212d1cf49cc570ffb7d47e93d41c082072d0b0a
-DIST firefox-60.0-km.xpi 582334 BLAKE2B d1862a32ad53c553a83df0db971913b449215e89b75e8a688feddceae653b0a6a0bc274d464a41d54fdbe9023b0cc35281de5685468ca3f340cacef45cf558f1 SHA512 bc8550cdcc720f0719a9280a8b2cfa30d65c119c7f458507ccb10bab44b1efca7f78913cf697d1a44a0b7b2a445cb2bdd6cd594431757e716cbd593f883c52c3
-DIST firefox-60.0-kn.xpi 585100 BLAKE2B e8a094170208d7d1fec02bbdf89faa30b3554fe55d0d7a596aeab1a59ed5ba8e0c0a55c7e61bd176c3d3bba7b84e9a9bf498406eb2ec2d78ed14a5f52c5e0eeb SHA512 96277881dff2a9a743557848568ae840dd4c3ee50d16e2871f29e1c6965d50bd15929cd351575f8b07b8594234e23a1a32c5b1dec6e260040ad73180d6141d5b
-DIST firefox-60.0-ko.xpi 547048 BLAKE2B d7125b0c9af0e3974252d3a68f528ca49388b7db5c1785b534a6007658dc3b2905fb8970bc06d94f3b9b09253b98d228801b0f5935f34ae55201a156815c8a5f SHA512 14ced219c67108b9a7c97dce8f4d03e749642471690821b4eb02ccee1393a1138818e2b4ff57630fe4eec36a95373f9914cd728b1888976f3389384bdd7f1715
-DIST firefox-60.0-lij.xpi 512398 BLAKE2B 6e2decebcfb158c2fd472bafbaf31b9b64ad6c2f6bbc7b87793b85525af0bfec1ea5a62a517b6c2f49a10156a5d4757ac19b9370392a1bb57660d1e69b44b3b3 SHA512 c28089d5ec2bd69e6b18f440bb45ffc61e7610e7387875c9c945df5e72db1387868f3d65ab00d299e2c2def7802638fff119bbc58fe2b4ca4b2b6c221d72c48a
-DIST firefox-60.0-lt.xpi 535634 BLAKE2B 5f46ab8ea5f4da60f215c966cf07f93518468fb2becbd6ec7da14647f623511b8688fe6ae3c2ba7a875adea91f99a5de5171564a0cc3076fa16094ab7daa5633 SHA512 e0771143be3ceb6dacb1addad8558753eb4196cb4fdef58c66d7c6a3bd4de21045a7111f44d4b039256e95c4e06480c8855a23876ea41d3c1ec9787ad66a9f3c
-DIST firefox-60.0-lv.xpi 525636 BLAKE2B 6fba4da45ab5ef9e146f3ff079f116ddd1b8ffe34145062811f493d926bf226c731e4f9d27f0400a4d9ab811aa34e4f166ae61d27899ca8fdf7dbfb621087a93 SHA512 3d254673cf73b0184c01faf65d1cf764f53f7f0e50c75536fc861bbe1ab8b82226fbdaaeb0753e87dbe1d15d96ba02b1ce3625f3defda1262619e6aa3c549237
-DIST firefox-60.0-mai.xpi 548470 BLAKE2B ac10710097cbdb4a5efd233472e693c30ca0e36d9191fe8135147b8166089e78c43a87f2133ca45896cd768881ede7c150e8d2a4321bd89a6639cf4f367b843a SHA512 02ac892f09681a81b650af95a9a26a67798fca293d847e2f60d2d02c01b2ed91d2a47f726c5788625dc8e03ebf6a0ca87b3060604d9f5156ab1fcc8e718ac42f
-DIST firefox-60.0-mk.xpi 513024 BLAKE2B b84503335dd8b20d904cac5f179b2f5b6d8dd60606fd01cc807a178746061b2b691747ef644c4c0b4604d11091d09dd599c0d411e9b93ffc81dde15b0e90424b SHA512 ba778f6348d7a82d971ab0de23f6db0c404db463946539e5a7190a1a27bf8fcc5262be4e5201935a6689d6077f88a3d441c4ef51612a2c50679d0144e48248d2
-DIST firefox-60.0-ml.xpi 598200 BLAKE2B 4ac2dcfb59fe31385f16e29edf086cb35b7a0c8f0760b584813e7e901bac28bbd461fa1520bebd3f0d388c308ea8ab3159e88bc25c6b82245a38c03e426b2536 SHA512 10ed64b47487f14ab6948f1c6fc4ccc82ca731964dd6b97a67eed1bd416f018bc7cf1d4b7c535544a2dd3f3745bf45a94949e9e6bd54708666b0da2373a50f56
-DIST firefox-60.0-mr.xpi 578337 BLAKE2B c70eaaad2ed8f24e9e8e8125e82422920fff5e612830f60a8efc0f9a1ca73a562f1417fb4ab538a58641a85f5a3f916deb2a47224f11b8987239b49fdbd3f9df SHA512 7fbf58b9e823a661722d7c4077309c4c71f2dccc2bb277434357e066ca8e16d5643b5baca407e13a693f9613a06111a2150b5fa38f9f0f10809f8c928d209f64
-DIST firefox-60.0-ms.xpi 508782 BLAKE2B 7d05e68407d396eac221ef00929cfd6a823a435d60913c7c2685120862366a63b3bbedecd4f68c2acb457e079beaa5de3feeb62373e0abf4af9e45a2ec9ca1d2 SHA512 802945745040f4077a3fed79f9f3f80ac07246176025b913e8ca2bb42044a720c107fa11bac34362d2002c8bb64dd8af7b24be685e009c3e8e93adcd9f4ab911
-DIST firefox-60.0-nb-NO.xpi 509096 BLAKE2B 04b44b10389372a34c88cf081dff1eb5a63cad4b27515dc15235ca32171d15f890cdb7e79f15417f18bbd36904d93a47eb33549264d7dc9f25d57a312d89d592 SHA512 70e0df8047becb0c0b77b91d79e3e522727d9e6458618b108c9c694e2edcdf3e11ea8ad0e6df768ef4e22d5b6dbb25009e0402bd63a6c9615b78f25476861874
-DIST firefox-60.0-nl.xpi 516657 BLAKE2B e6e6f4fd3cadbbead381427c18188ee44c7630ec570215deebc51d2cb931cc4cfdf0de847e0a1ce1a75c3f87faae69c30137509a109d3624a8f98293ef8f313e SHA512 3e344a09f21ee1e40a748afff0d40b768b234a9d8bd6f632ed74f57b4823cb1b51489f8a54f6dbf6dd0015486bf0c5f8f27a7f8137d4c8692dd09ba593eeb1c2
-DIST firefox-60.0-nn-NO.xpi 510618 BLAKE2B 8a99b8f35cb7990b0a8daaf678a6f4090c08c6bc2fc2c865922925f5fa10e3408eec7f02470aed49a66fdf420a7f62a9cb7d139f31d957521baa12f1034cc584 SHA512 0805d7cf14c930a646ed0761a506abbea53b1cd29fc2bf42ac5d3dab5cc6a6e584eb86f1f23933826e12796390ac00314a02b89488217e28b949d1a370f12c96
-DIST firefox-60.0-or.xpi 540093 BLAKE2B 3cebb397eaad96673adb7854d6cfa120d5d875cb81f652156e05fd760572a77a26c1c72cfe0124ab7b65490a657a185c05e1111b13065520e88dafcd9cd0dbbc SHA512 92cd506669e3faa2bda9bb5b7dd3150c193ea9717cc02afa7c320e98481a6cdf6c78a46160646172f8b653b3c832662eed409462260d3bb0175221a9fdb605a5
-DIST firefox-60.0-pa-IN.xpi 557089 BLAKE2B d27f363ba8d38c1e5b2a214ecf49afc6e998936ab2fd7a745b5459a9e8733e60ad40dec6ad6874092d92e4447a203e13f10b95d5262c75983dcc8539f6486e12 SHA512 7d9990eacc8070357de181646fc895c17cac59d581cc02f957a138611ac319bf09ece8389de78f5a0ff3b5726d70d2b0827fd1f555a662777a185faf38622d48
-DIST firefox-60.0-patches-01.tar.xz 110152 BLAKE2B a5927cbf169a6d0acf73044385695fab67154648d69f6689a8e5ed76cd98eefaace38089571d32901cebde1bb55bb59e794a48d2b8a63b2177dc74c544c36e09 SHA512 cdc88de38a176c231d05ced908270f7afbf3a81259dbe0ef8536505d63fb6d0e6cadc4b20a4d5645644997298440a7bd65f738b049e87b76809c0c1f43336ed2
-DIST firefox-60.0-pl.xpi 418188 BLAKE2B 0e9ab48db1209be3b08a95dfd721a2501415edeac92c5ca944334579d03de62f7b0e859aa645c9393191ba031ea7ed065f73521b0ed89e48824ccf57c4a2ff3e SHA512 d0599367261fd9cf7152d9aba303d2d93f0dbd03ec1dcd5d99b4432763627e46170e5264c092a1dfce9b0db92eb07f8c764237c8a6f4adaa54dcf74181e48904
-DIST firefox-60.0-pt-BR.xpi 513937 BLAKE2B 684fb7cf3736c0c2905a6f9125128d49fe6eeb519739846ab0f4f744b1e04a81cb8e56ddf02fa1bc593a0fd63cc1571c0dc9ebebfea896f5a4c44ad62f5bd7c8 SHA512 aa452b59811cdfb7e527a1f471559c076dce8078bbe04fe15b30ed3ef8ff0b05b2b8281bae6072a50e2aefb83a932927439b1e95d3721cc173360055190d5272
-DIST firefox-60.0-pt-PT.xpi 518541 BLAKE2B a5d5e0e58cc141b96b36b0fe91e415bac38c19f2db5a75f0b0fcfefcc6d43d5d742f9b2d7743cf9af93472966d20d0b4575aee7daf64e9fb1775b06cae014d37 SHA512 7ca5e992e9d82573590f26439ad2ef2abb7f44e36c261ce5105295b4bc37cacffb4ef9e8c4e66ddb601f04f9b51438b04655d12bcf8bf23b57861b878423c7a4
-DIST firefox-60.0-rm.xpi 505265 BLAKE2B 2577ce2efa7e5395a5487a216917364e1c5346f3247c666c2c2006f037a22eb784dc50360ef377b03ae519d419160c56ea00ce9457511c9960507bf8efa8c780 SHA512 5a7ea8fcde5969a9150bf9051f448a72933e400e61eb11b966812129d9b9315baf3ea5cd3276254d12389e8c87b34ae51f2a601a7e7003c2198828f9acee6d73
-DIST firefox-60.0-ro.xpi 513282 BLAKE2B f7e489869728e9b5553ed35997a52cf80cebf57104ddccd44d3ed9907f7fadcb39f1582cff207086d37b40ff779a326820045b7d49d2250b861b3a9e47e737cd SHA512 7069b9ed1943f6ccbbf88211ad45a047695248c2dd2cf52aaa5f7aabfc911968be75582b9ce7248a14ecfe451c25516149dce628a45728920e8e3fd5e7d83fb7
-DIST firefox-60.0-ru.xpi 590510 BLAKE2B 0f8b1f1a6c3860292bcacd8fa5af8c20ba9154bdfdd73596e8a24bd645b204764e16d2b33f9717d9691091d064cd5d6510361c2757d0339dd3dc0b27eeb9b305 SHA512 48a6068069b6345681b0597d242ee58f7a12cb4ab6a4a5c63b605c6cbe8311ee4fa0c323aa38fefed05b5f05715e2d9d00f8421bb91da375e1de4ccf96e401df
-DIST firefox-60.0-si.xpi 544796 BLAKE2B 29129c1a9989b407be23dca67fa669479300f11af59a4c2ca1898851ab0d814d08014d0156a201a372afbd99b1dfb9a76f357aa4280247a5c1def9fa13fcbb11 SHA512 c96e5e95816e3b5371cf22a896b4f120a2ec343033fde3b90d22b2c10ad2ce7d70dec1b032cac83093c02c6a771eb241ea4ef38a07ea8ee02f12ef296ea96058
-DIST firefox-60.0-sk.xpi 540922 BLAKE2B 8379e282fd32b3835ecc77f9f52d1af709fe06e938c2dd65442f722c580253fb4e331e48d5b51c0f9f36b7fba7918f0457763cb4f9f9e996a40adb4c1012017b SHA512 10aba0170644ecf3b452379f760233a7fa13bc3362dce85a5b1f93f4d14809639db56f052f5b6578103f8aa560199f92d2b26c8bedebf7735ecaea00c26bb78b
-DIST firefox-60.0-sl.xpi 518574 BLAKE2B d1cdd6133a45930322820ad9af306f5cc58835c8be540a063e26accd6fcb98fffc87ab44edd62aa9121a65d0b92acd6dbe039bd9c646ab9409b9bfa717a675e6 SHA512 184feea1eff11c76d80e105e9b5c0b75d7b078b974c8a5454c67a1af20d2692548e71cbc833b29df9f051cdc2cfad301e96e1257b5c70e694861f98daebb8e1e
-DIST firefox-60.0-son.xpi 496914 BLAKE2B f19a0f7264a44ee1925874a5e07286891fae78781e8fd51dbc1c4bf44631e31b48893a3cdea0cebaedf78a8d6886773543c5810e7c975fc9646d260a3b6682a4 SHA512 5da4404bb78d3cdd67b0b4eba1aef00dce6c88e6992255bcfcafaa127c4d8427720045e27291433409c0ce35b27bb48ca34bb812e67043f3b3e2af63dfe7e476
-DIST firefox-60.0-sq.xpi 520493 BLAKE2B 630077ce84dc6f7e1b2bff571ed41953d46f43ac933ee0df85f8453398730218bf09ac955d3b4a39dd524068ea9422e27c1b0a76369b7048130c44303a77ca1d SHA512 f12af93782099529aea0ceac450f9271f4cec8129872423cc38287e9ce30d86670a4f1fee31012303ff80ec7ba30d0b40a6d3aed6774d27706b2dcb9d2f8a226
-DIST firefox-60.0-sr.xpi 547995 BLAKE2B 8aa7079cd3290f7b5042c32938bcde7f1f6d4817c78fbd501cff7b5968813c5cda69589de729903f2a09237436c6a0dbb91853a5aa89598b9cb4b9266c5ab80f SHA512 2f542c0d9e5c722ccaecdee58a5665fc40d279b8c2f1c20f0df1625fea1f426618f9fd972ce45ce3526b0e88d238436b10a924f67c5de154cdcbe4b4ef3b00ca
-DIST firefox-60.0-sv-SE.xpi 517847 BLAKE2B d744cef932419dfcbdd37c5ab0f3c69550a171a634640e6923d27bd385c9a3055cfc2d989cc2e364de6be96a15b901e5e0f826046a4d74c206c19b2add3c3f92 SHA512 909ae6c9746243042ab831b56a343b344f281ff81f494542f43218213a84164c10ed6cb0a498d981001a36e68b96f608dfcf9bc406a61ef1a3b9f22aae371253
-DIST firefox-60.0-ta.xpi 577139 BLAKE2B c7c5efbbbe4068121e6e4d8f287ba60cdf8d1e4a55628390a5c37617ff17abf2b2545e8b731ac147a08ce546c733b789ff2f163e9628310156ec1582f35233e8 SHA512 3b9e7bf0c84205a9d6807708999c6e0e95db8d3e603ab26bbe37bd9ea0d359271dd739084569437f26fc345a7912f16f51ed9e89347085e31bd2239e84779fe7
-DIST firefox-60.0-te.xpi 590183 BLAKE2B c59ff533c6733ed74e228aa048a7abb72c03cd9e693753acc0f755b2f57d25775a4e4737dd9edd35a892c07d19a4aee4ac48ddda4f53eb87768e6694159d3d87 SHA512 c880efc666d01825d24bbfeaff31e34cc4f053ae0db80e9bffaad5be3ebf338260db23fcbd4ec81bba52a875fc3897fe3a9bb0323822898d72689e516ea52f08
-DIST firefox-60.0-th.xpi 562036 BLAKE2B e38ed2313fa7833783de258f62043bcef10ca009c426c96106ebad2b746237751ef94f423be85845fc16cf336f49840604efd5bc5b75181da5f8ace262bc2739 SHA512 6138c9c314e552ba13127333e1f92e8b502ea865cee323951b2a21c70bbc1ddb9addd70230e03ae7ba95ffb971c9db23cb485eecab9b26817e9f69f2cc789313
-DIST firefox-60.0-tr.xpi 525033 BLAKE2B 784228a20d76b505bea931f7d6f24b9e33a40f95ee262133d11b5e673f2b0576088ba24af63a93e0a9ffc839720b04a6626b3ba26ffc971fd9f77067c367c82e SHA512 d6554bc68fd372e8d0167b7010e15470106f27b3b45122d6efffe83c01345da01c1963980c13a1e94b686e72cd9cc9f7afe985ddaab37213ad6a8e07a48e7c02
-DIST firefox-60.0-uk.xpi 580145 BLAKE2B 64693f6aae2e1274ae9f7b643138d50f96d14ac4d7fe5463c13d41fc4bfa0290d44480667f9585f9d376ca2b18e02c3eedf206d6ce83f49d1097ec6b082d0c79 SHA512 268c77e37991577325c7216fa58e24a8827ce97f83e4d002b81f9fcdb6246ae7d2d962fa0e8bb6322c254d628b300a8859bc08490847e76863fc8d2d27e8b1a6
-DIST firefox-60.0-uz.xpi 512909 BLAKE2B 8e259f16dd4c6e16a1223438f61ac0576341b1d3b3da61cebacc6801a80a38fb87ef1da2a1211e23596e4e01e1141ec955684b59aca7c04f52c7f2f5afb7912d SHA512 74efb5b0cc152c851136a4144c1785d0e1e4929164c6f2858bda469bdf19d4c08ceef991a73ed8a849986bc0ab47b7223a91fdd7d064e7211a8778e90e554494
-DIST firefox-60.0-vi.xpi 527412 BLAKE2B 6ca993d7590c0da9217093ac9583b86f0d381387398220c22ac61000f4691b014dcf526d6447833f80d566574f39b1faa5be315946ddf6c44b4a0bab3bcaca58 SHA512 9c837d79f2257ea8f42c8405303a4e51561dd1974f2d6e21b4fb912fe57cc9a716de3275f38b6acb0c22029926aa230d46c8c041e4d595f3c995f7a588b2ead3
-DIST firefox-60.0-xh.xpi 511081 BLAKE2B 37d778b5ea864bc872a23a490228f3ff9dd5762ac5dc7e858d4f64835963d1ec8124e90439bf5ef48041e958f6aa2c66213058aaf81dc7d1abb44a81093ac491 SHA512 48aaa3b060a51fc6de9ce370f296acccff92fd1aba3070d52d0545a64387f1a68abe457bae9857e8ebd1cdd55071c5a4311297a5f24e1c8d4c811b8d6a84b26a
-DIST firefox-60.0-zh-CN.xpi 542804 BLAKE2B bd5cd289fe0c6b5d7f46f885c29d286c24649b0ff5f1bc4fde196db8458489a936cdeb9f2009d7592b61a7ba69c378788231c6dd179333b8a2519b459f3bfdae SHA512 c4a8984cfb629624934084d245d9de9053feb0b11f031c9d504cbbbc1d527f3c1f5e25717caa869060b4c57b0389a6efb68a190b443c6a7f84a2fcc288394aba
-DIST firefox-60.0-zh-TW.xpi 541119 BLAKE2B 33cc14ea7cc6b3e36f84a3e710b65e84c5ebdb07612c5977509650419a1dc0087b567452cc4be343841ffd53e9434811f0596396aa7d50b299feeaba8e1fd370 SHA512 1523c61e27a063438dc4c4baa50809fbadb509b7f278aa71af4b1b7b1f6a843632f041c84f00f3a7ae7c9363efcc59cf9ed9520660a17fecd036e868f043ab1c
-DIST firefox-60.0.source.tar.xz 266717500 BLAKE2B 1cc4fcb0ca26b3cbbe0e0e8278ebb6edf4d38b6e65201db78df921bae44350eae6a0566c3fcf688df33fc90c605738254acbcd93f3346988e7acabf1f4565e6f SHA512 63c156238a6b6b6188f093d2658d3152cd0ff6a1e275dd819a6d111dd4f964cac548632f45cd0f561b17537cde2740afe681e28d5a4d69477d9f39030567a0fc
+DIST firefox-60.0-patches-02.tar.xz 111088 BLAKE2B 9564d55b243c5e759a83b6d48076d3de9060c7bd99498df3ced477077b5ce2e2582452979872f0707ee681633d04a9761e2887282d69cced7e20bf39efc38c2c SHA512 919ffdb0624f1fa68a7e457f5270833e69c8f29e1764a46edfc345056c4e8ada1e85e53de3766fd9a0b2afc1a959c15762e27f43e29f5945176f9ade362407ac
+DIST firefox-60.0.1-ach.xpi 496056 BLAKE2B 5bc684c3b4550c5ffd956e2222fe13c41d59b15c89a04f3f7b7b75f5396b59c23f4c31b68a284144bc642f52528da5cf488bb6381659a56cbc5b6c4cac9bbf8b SHA512 e20bac51e42a10624dcd65135b156c7cdbd9ad2b745be10d88f3bbbf26495081d091d7fde91946f4d159416db7fff1ad66d1fca05e3a50385b1cc1c9f742d817
+DIST firefox-60.0.1-af.xpi 486534 BLAKE2B 3a73f48c3144de2eec7b87591107851bd2d7c0ccde98432abe844d08f3a958eae26bca9cabb5487be59205b8c841991372068d78e07dba36eef973241a4e9b8f SHA512 45ee0d111318fbd48254bc835f40dd5b07670c44a57f8c4b3987181e550bd29b56a91b8bb2fabf3e04a855041172dab4f36cc64c4d8c7209086e6c8f89591b00
+DIST firefox-60.0.1-an.xpi 519725 BLAKE2B 01a33db80716913bbc2f93cf8159b5017c32ab65917a0f2468cbb5d010e4f15add77f7d645e63d9804553cbcdd11e0c4c60b2b9789a8cfbceb0bb4f5d64294fe SHA512 53aff6cb9a4115e4df2de8620d5f93695ce7f9aac86597d9901c2d74f6c146b4871f2cc8c70b93c5494031d05a18a91076c8172e486a602831028fe9f7307774
+DIST firefox-60.0.1-ar.xpi 546952 BLAKE2B 76bf3665f1ae870e5e1d6952ea8aa1c8295af342b15849345be3f9524e952d5c9ad43d7d613da886e841b346ea8f7354d3d745ad4d008444aa508b6a9b1c78c3 SHA512 f47e4a56053bf625c388afc2e7798e1d035407699c281d10cd7dac6ebee692318bbca2474b07c2af7c28f7f2c5aa9fcf83b5e8b8fcb7cf1fad89798f98ff2378
+DIST firefox-60.0.1-as.xpi 529948 BLAKE2B d0ef5f84b3d0ec92c15eb17cb451d19a147b3ebfcda2d89727f912a7a88937f810e4f2359134870db1e1f31223524dde3e7c2de3672a5385f7dd91ed2e3fb7b9 SHA512 5cde4d7931d384dc18b874ed4ddbe9aa21a6d2421f27541ac87456408a5b34a5dfd7584886cf847ad5412e0317c1af20a373a6407bd8ba72aeac3dd0c2206ee0
+DIST firefox-60.0.1-ast.xpi 507867 BLAKE2B e34ef307adcb4a01c35258aaf30fe61712fa27a146e7faca4f49cbfd0368fa0dbb863abfeeba7310c31876711b383b1ba04b35b6a185d0f0096889964583e97a SHA512 2d947a8bee70241f4022b5f8d4ad3a71e5cf08467019a49f275ba2220197bb66c5b731cda3aa645627a7c71649032f4ce289bbd72a5aec361d1ecf6b41b7e98f
+DIST firefox-60.0.1-az.xpi 523976 BLAKE2B 6d35380fb255042b2e3415afde0ee5ed548824cc4a3ba696139d446cb7707f6322fb43c9631b7d94d8b98f1f338cc8b65f3eb916ddfe20b311ad0e690290548c SHA512 6c75236ceea3fb821ba2748f73873143b2b849e8bd2db41b75e458f57cec5d32a0e48d0046b6e6a4205f7db90cca941702e8037effed9e9ee25b93147efbfd77
+DIST firefox-60.0.1-bg.xpi 573077 BLAKE2B 96b54c39f5fe43b1c0f5288e9661a1636fdcbc501dc531b89f2adc237e00864925d0ed6be5b5ecc66e8a5b787f09e45daf6440a61ccb32d99610b579fb9be483 SHA512 59168d9b8126c4787bdd893452c84598922001ee0ceca2f26c2a1840d78b3bafa3f2b94f43b4d0c07f92cb75c6f2042034b612a394d0d933992848ffb1f96120
+DIST firefox-60.0.1-bn-BD.xpi 589632 BLAKE2B 6f58abb4ef1f849ecf70c605075c1b36f5fa3fcb7f1978d13592e4c3423d2055c5a4ddcc869fa6e63c7940c15df283797cf7509a6a5e12aacc01a84b5ab6d2f6 SHA512 f2aa7388e22e05182f6a2b96bbb6fe88f7db2ac4a2fcae5a50f81d7202995c5907280dc379fa699ece3417ea8a526ad31176d5234bc844eb087113464693a53f
+DIST firefox-60.0.1-bn-IN.xpi 570080 BLAKE2B 61829121d5bc7ceaf5e93bc0e33f36117473d35be8012911d9fff18ce2242ad6d80031cea4e12b9ed5a4e1905b4e7573b91ddf844ebd8987aa7d7b52af5d6c7c SHA512 35c825790ffd4bfa4a31c0cf7d484f5a72bd84d8b91626b184838e9ae564aefef388c73efc46bce319cb95401aea7e5fc993847a96b82d2f71ce0324aa54f2a8
+DIST firefox-60.0.1-br.xpi 511250 BLAKE2B 09315f97f84639b4a9d6ec8e7114ff918cdd650bd2fa0a8849f9970bfc5f122a7012caad988458a53f969247be97cdb6e0d359d9cbd4e97b04b2c7a89a1cc927 SHA512 269dffaf4b52cac41a8baef6cb4569a3a2b1b73dee655150a38cabd987a1beec0612f4305e25132a7a42f4be8a200fa6566974789bf6376a0ca1fa100b09f27d
+DIST firefox-60.0.1-bs.xpi 513932 BLAKE2B 70741fef505bf0b468edc5849e341bcd8c8d2dfa3ebe1ffa108d7fb48a5f2d5fce64de50dbd66ac57fbef6ab1214a7128f2eb39848b3a403c85dfe825a73507e SHA512 1457a328398d22c17ae93607a123b3e5812f90d2b25b92e1e96f35fc08e0902bafac7eb92c1cd50a6dd46451a10a693786ef2c634f6990b0f8f513bfb7a09afb
+DIST firefox-60.0.1-ca.xpi 524483 BLAKE2B 96da7997972cb33bb57728e9670a19df40c4f0dcdb8bf0b1312163cfa5472821b45ab64e3487aedee6c3b30aa9adb92f629daf5a201ef34826140601b1684bb8 SHA512 3f6589c32d920d6be0e1559f789cb22aa0e7405a0aa5b6672bee8ae58f71d1088966247f38bb376f50757da13c929eb07f6c96787d035e5db87a4042215f460a
+DIST firefox-60.0.1-cak.xpi 535518 BLAKE2B c518e9a0b758cc837669c2f50e54ff1bf0ae5ecb64991f3e2aea13a5a0d210e92e95c5d588378d561327707f6f0239e637fc8e44abd517dfdf45ef98574103b6 SHA512 94224d1188ae90829aee6bd00c967dc68d61cda01f1497dc4be29bba461a91ccc23cac82e13e51dcf1168a1a37a4bc401ec762ab51e890a22580a22d345fe2f5
+DIST firefox-60.0.1-cs.xpi 531016 BLAKE2B 1add1a1a4b140f5a38764e67bd2b4bdeba3804340563fe79e8d310c3dda3e5347f79e4bfd22a2a1d269f593dcb324dcd02a546703219393433bdba91434992b3 SHA512 f861528c868a519e05f91bde57d24a9bfdd9e78cd38ce5d656f07fc4eaa9eb93670eb8354cea7fc2731d7a1305b1a2aedfd73dd6a8b5e5f894acdd3c906a4684
+DIST firefox-60.0.1-cy.xpi 515864 BLAKE2B 8902f9224eb3f6e2507e99d04182ae3da66f3c75d0cb47388806e6e0ba0bbd588d19552096de86f81c9baa984dd1d7d56cc70b25a76b4efa83832053704c016d SHA512 4941079d1a6c7241fc6ac3da85da2b2be3a7a2b75301d412c955297608b41937cc17ffc0540df9c19d9c3d27a2429ae2b9b694542f3f35ebcef356c5d17c141d
+DIST firefox-60.0.1-da.xpi 509975 BLAKE2B b0cadcb9af8151a4caca78c339a3077334cf61e1d23a58d95714419f0a724117070903665e0d08f8a6cbbe7eae98fcac202d07f722abcab8fdb78aa83feb5a6d SHA512 2cad9f31a27495e097045ff5f1155c0f79e3b05ec0486dbfbbad2b233a04a8d95019d2b6e169a0af21af14b4211017ac51b8af71080d7bc57cb546788cfdcc8b
+DIST firefox-60.0.1-de.xpi 525690 BLAKE2B 230a8436b12a0ca2b48971be465075dd18c32f65d32472b30fc19e54e579590e34da51a49c29a2af46557c05709ddad1430fe3c5080844eea62893571b099745 SHA512 8e015b759efee3a27c539b4e744545164cc5e1167aef8f5b39a8d8c4a9330f06e68e49453dd62efa6652f17b6f13f2d19d8a04e814c69e2a468efa0c6488a14c
+DIST firefox-60.0.1-dsb.xpi 538748 BLAKE2B 0de434e5201a6d84e252bb31bf5345292bc4f38187b1f2acc2202203f2ae9c1753d5c4c486b2b85dba6f656ad9afc70fec43fa35a3fafd92595ab9b5164a8991 SHA512 7edc8cfac807b2d3e7ad3b1b5ce2b2a3bf775f41efa93ab421174133691c98a2c58e422f4550e509d5b1eef3f298135ab48a7b2fb0e2c8aac9a26de5bdeda02f
+DIST firefox-60.0.1-el.xpi 592915 BLAKE2B 7ec5d66f7f7fc601a737ba69892920d3e8526fd04a6adbc1b92b13faf106962f2da7698724a14fbe308ff4a6f920e62a00f6c65cdfbc4344efeb28560bbee6fc SHA512 cd7ce0ad14cacba0e206865cd72aa4275d6e46af004bcdd4ba65388d77f93c311461c15a9a748c9f3a30b83bba62eaa8d79d89952c63c48a6b542990b0ac63bb
+DIST firefox-60.0.1-en-GB.xpi 490905 BLAKE2B b01c8e551d45f215d5e3b0543d836ad5bd0c8d940640bce2551f70c861006ff35a1508635fac5f207d69f5b16de33b68f1c1c6fb03ad357be3f3448e35eaf045 SHA512 cd9b0d1261b9a511b5e3bfc67005c0308af8a4926deaebddbb4847ec39fa7483cd4821f33fb09a54c9e00fa10cb918e7a7243cd51d8bd08a49fbead25105ac64
+DIST firefox-60.0.1-en-ZA.xpi 473892 BLAKE2B 42109016a870ec6f24e9149cc08973c50acf45982dab25234fe843da6a9aa9ac2ffe88bb142488af0ac6ca35f28e81c065c15e0b3f2facb5c078bb59be03003c SHA512 e56871825a98eaf1862fd55a80e0fb1d127e3cb61642a34f690c9e35b880c0957889298585fe6885a85ffe15b5739dc3b1c5c05c496a2db43247a3e3c8ebbd07
+DIST firefox-60.0.1-eo.xpi 510496 BLAKE2B 9da4847d50d7f5293f2edfddd783b2940425199183fe2836bef6da009c3ecf9c6553b18c567d70f87c39d648cf4a6f1abd88b9596b1804f1f022e67eb6e37f21 SHA512 b99412a89661a35612dd3014ed3ba8038868af391e685568c147072a03e9d99755862112ce240e3ea4d720a8f7b639a6732e960fd23eb657483d493130b483c3
+DIST firefox-60.0.1-es-AR.xpi 523829 BLAKE2B 440a808994336494ac8bde9b5a3dd14dc77ddcfc74f1b3f429c2713ab8d214aa914c48fd1ae3a8c837b36d5521ad6c53100b4ffdd29f4d531ca97c7e43b56b15 SHA512 b790e4e437e30bda0aaefb56b8a357372e0aa81dde02fce0d51258c2752484f17b5be82430425e59556b7bf7cd678cae49e9bc19ffe6cbaae889e080c11e0df9
+DIST firefox-60.0.1-es-CL.xpi 526508 BLAKE2B e74b2db598919a1028fba7099711c17a23e2539c8ede52308448f0d386bc1d72b5e399d08f81fb1978f066e6079d32c9374ed45a922da8c7ce6215824ed8472c SHA512 cb68c62a709fbb48235e1efbc125fe40163cadd8cb59972a29c482569a0f2f5cfe6f4d999bcfb6d9b6e0df76a2538df8b3053ec0b11c9b029cc26414345bd528
+DIST firefox-60.0.1-es-ES.xpi 459139 BLAKE2B 7966579849976391b2c64471536451391236029d04e8726c8528375127f05602dfb370fd549f8c14a84c1374cbce17eee9546482000909ea8557fb12b3d8635a SHA512 7609ed2893f0c8d63c9070adb75d7bcc5efe33cc7703769a855e4d5bec9ab0e57b2beb7206b32257a8578d1eeb9b4f8f4b16fc5f8abdc650bb4482343c55b80a
+DIST firefox-60.0.1-es-MX.xpi 527843 BLAKE2B ec344ac57cfba06592066ea88bce4d8cb5218901dfea6264b227a87329f7bef40d6375cfdded92581e423046d8473edb152913ee9cf33006d3ba7cf59e4ef78f SHA512 0b110fae791de0db8d106149d456c49d116c6d99e795d72fe9ac9198392560a3c6bdf7a3865c0da2d05fbe514b05afb65076a917a00b2624269404293ec97994
+DIST firefox-60.0.1-et.xpi 504174 BLAKE2B 70b4ff9016e95b28b1990547bd03ee08687258af5c1b50274af03135b839b8ed7706f68414e43597e77496c8158cd2e51b7f196394021e57c606a4b7f643a6f4 SHA512 cf8368debaf225a2afd9f2ec9f32e5cf89aa7bb269e0701705cff273db7d0b6c293d28fd36b15bfbdcde4eb9572212c5374fea71a5bbf2dfa5ccbf980efa5b20
+DIST firefox-60.0.1-eu.xpi 510936 BLAKE2B d156bfb5fd6628c1057e567534ff6d0f37a14b4205836dad9bc4f13b5bf4f0e68d6ca0e8a0654f94ab7679de8391d01dd8241ab2b7fdc0d19caa132112eed875 SHA512 af89298e451630eb88e1d4282bc26de2b7c7b332e2115df0c16e5d9425eff17debdcad2bbbdef6a8d6299edbb5182464138ddf44b0d6970d67c37e8343650117
+DIST firefox-60.0.1-fa.xpi 565485 BLAKE2B 93f557b6cfc1327181e92b07b793c2fdb11e7d8651e998eba5a5804e0d0547d68afded7443626f6bb4c1c2f985110e80680e782abd5db2f3198e7f9cfc061099 SHA512 f5ccc9bab51b092cbc4c3e279e2cc3461f04cc99f6bc856a91402fd5aff5b68cf38ad741adbe99a00032d137135aaa309db12c63a4c9b929b7440c95ee70460d
+DIST firefox-60.0.1-ff.xpi 511430 BLAKE2B 590e1c400709252ff5c50af1ea25d96b2da6d52d156d2a9683cbb0a9d7cd8ce44e8f0e19587a847272ddfc7990bcebaf71980b84154850d533a801c71cf424a4 SHA512 adadf1e9fb29fab4bee2b3d994e4927f14077fc30f255ccbe43d1deed3b667dd3328c7b62e8f373fe283a9791c62064a1ececa87ed4181cc0017c53ab65064d0
+DIST firefox-60.0.1-fi.xpi 505406 BLAKE2B 044e2f11896615b68c9f8e6f59d007c46f874962dd00cc7fb9bacca2eac3d71b32355773e5bc6caa45044a9111874774814565e7ba4a71f01068794773802681 SHA512 c41b390b05e7a289a2b9191774cf1011b9c4ee335f34bcb05b73f1de29e669f31c4c1fec2a9173abfeb843b5c4290dfb441a1d5f3a72fe7a5c7f29a097477aa4
+DIST firefox-60.0.1-fr.xpi 535233 BLAKE2B 23deb89b8bfc4596d2faff32fe81bd35e49e4cb5d8884d57947457d21afedf40bc92cf7372143fb956068579617b1c8b85996d1edff1c3f54543d7cd9392567a SHA512 6e1e8807ea2ff242111c1ca77423f1b9cbc6f3203a9c9d81411b5452200fbdcd7815c2e384d2885f399336367648cc86a38365b376649d2b64d31f6e8ae09c87
+DIST firefox-60.0.1-fy-NL.xpi 523738 BLAKE2B 6775be90895a8069b7ce0b8713ccc92daa8aca9e1d0da834e6a4e4bc4b8b500fb9e061c1c3e40a397c1b426c3e61e61bb9f332b6d328b862413cbe0aed68f8d6 SHA512 920ebc465291806d9b0a1a5f0378f51405cf1867cceb3b61990a49de33240e55a5dcf34ea1ead1f2f90ed8576ef601f5a0b3c203f5da2215a77ffb58cba6643c
+DIST firefox-60.0.1-ga-IE.xpi 526203 BLAKE2B 78aed61358347a04ffc095b69c5860e364e4b6d9c56c9702d98728a0af8cc50f59871942cc49a55a3ea5a56b3b76ed9e7257c648ac83b849c65da17310fd7792 SHA512 170994900c333b22eca9b77f356b30f17226f905da0b9842a5704b8e4bdc603bc6857ec906caa3c647ace2f7ef3dd5f78d5e4301240bc94ed9284e52ef5ae4ae
+DIST firefox-60.0.1-gd.xpi 520093 BLAKE2B c0461575b3966c3da1057016c9e5310ba8ab35cbb6251e607ea2588f0b17c13ec88159b72b7ae80d402cd55ad676989bb3f5704abeb001a6be3cd5a6b1de4a53 SHA512 3d42fe3a3962962caf3beb08802bdd587eaedbcf2e509c985c991f666b56696bb25bdee55ad0524f904f23531e9ba4df6481c0200797948a8c17b8db732b3372
+DIST firefox-60.0.1-gl.xpi 496599 BLAKE2B aafd1d37df4f2b8d174abdda2bc9458e7ec4adde7972ac4cfd00c4d3adb1c5c11c398a03bddd4cbf98ec87fb4c56633ec774eb3c8089a11321479994a4c5e83d SHA512 2716b0e115c7807839d767ab5e1d47dba5188ca2d005f0e8df3092987f6b07de247a0ff0b383e85a64225921934b2af0daa4e263c16ddb9cfd46496a2516572a
+DIST firefox-60.0.1-gn.xpi 532445 BLAKE2B 0bf4c85166ff3c9281b5fe3eead91e1d09bb53f1578af2b379b8f76c01163e866887687e55f78ad553a7b1393590ccf9c48b55665cb3f0725d13160f88f14828 SHA512 3e75de44b79516402562e74a4d1512720e58f02b69509342ead5452e9ab020387745d8cf8ad4e8e17a0d95fde163635830c4dfbce60c2b47be30cd1712977570
+DIST firefox-60.0.1-gu-IN.xpi 589481 BLAKE2B c602ee0641f13e406e19338c12be3d97523bef2a22f09d667aa5a2c6d141b871a4366a8b4055d33d0e7e3b3da54fb88a39f7b0fc84d94f282b41cad5b4790f04 SHA512 86c0c3431f459cbdb31b4816b5abc03c048bcd9c63c0dc2a308e6d5e02e19c5bb3eff0bbb63c14446657d71b4295d3ff2a0d2485ce0b9f8734e81629f806cb61
+DIST firefox-60.0.1-he.xpi 535206 BLAKE2B eb402c6a190f2bbd919ca81ee863e3f1ad61ec586c2b406f734333e0f274e916bbbce3aa9102db99a303293b4c7cc8400cd5f5bb74064461ebe7bc56d2c5a66a SHA512 cc0da9739899c5c99e521b1387c43c30269555f808a8e67978cad7ceb447459915618bdd0eaef7c9af37a390a2c1cfc11d2367edd502f4b4b51aca3f403583b2
+DIST firefox-60.0.1-hi-IN.xpi 590076 BLAKE2B b072faa4922d7e81c6066618951c1183c4ea9d01a929d131a8341df6e72905b2c5d43b68269ba6752b3f18fcea1894acc0cba546f90e55b2037ceb6939d0a12e SHA512 68dd4d7a28f4faa32d09c8b21c7751b715ce1e382f7278a23b59b30501c118e3e93991c718f3eae37b4dbe950bb24112e76460018f143f7c77a62e2e34b2d53e
+DIST firefox-60.0.1-hr.xpi 515187 BLAKE2B 79d3c8cc874f2b69ea27842e6d493b3823d88feadc8fc4acde1d35863b80e5785600b824c180349dec2dbef60be743f52b0061cdbbed542c68f7b68e0fa85efa SHA512 eff7c45a71d402c03fc3a80296cf8207b6be0a2f24fd8f07fc4675f13c7d109fff1b6a74ed3d9d1ce25473afd3f8755ac7c3d173579e44dd4492acad1da56b77
+DIST firefox-60.0.1-hsb.xpi 536281 BLAKE2B 14104fc2393639e609d32cd7ecfbd5abca83e4d760b53cd8cb4f86a39fcac829790b78825f7cb47f26955e6c78ab782f3064e3eab1d29dffa9f8529cf17e6c40 SHA512 f17ebafab12ca5db8fd7935dc40c3d3d0b2beee7bc97fbe317bb33d4e8b512bfe16949c1e1c8a93f754c543ea3fbaa3402d6d6aa4a253f73f7ce941ec8b9d498
+DIST firefox-60.0.1-hu.xpi 537581 BLAKE2B 5d995c72b5ac69522315bee890f96be5708b18deccc5c98202ab53b4783d1dbca430bab9b9ef622e2f7169812195afda43f5993d00204e828fe399059106c6c7 SHA512 6c0e632d8cbb1358b1025f39ade1b3dbfb3d65e9c6c57a11366d5f27712835408ec3ee4167730dc3b1820e727be0c2f4a6cff72c48231a490da2fc475246afd9
+DIST firefox-60.0.1-hy-AM.xpi 568629 BLAKE2B 428650a800c298466532a2751c9f90f3acf2d56a8dff7573c309640feb0aaf7e4f280476d6bd4cdc125e5a5ff93e141360fd4c39c9864b67a37d3689d4f1da8f SHA512 43698616d031a2da7f85ac29757ad5dae6a71960d4796ef8eef8cb93e15778bdd378504b8c9076505d41851251cef563c2a6a1f6aa70eddb5577f0e8b030630f
+DIST firefox-60.0.1-id.xpi 501451 BLAKE2B c0a1818eb07116f3073de188cde05b59817d44812b15988952f4792e72948c8788ecc1b191e0d6d3faf6e8b332bbb87a1925184fd1a6ec0dcf8e2297122c3ca2 SHA512 61d2d69966d9e63747983ec7c7505d6ecce448eb7087871bd629b97ed1a04d15c7e49b87467f0c12a1910d272a0c20236580d75ad7974bb0b31f53e9a3fead27
+DIST firefox-60.0.1-is.xpi 512504 BLAKE2B bb9981839ea8112438fc78fd350d9c1059fff847e40f55e46948ac5da37ebdc25f32f682089b20a3ae31189c932651596c378392f2f46254e90ac556d21d196d SHA512 bddab5ed7076f43e4f3bf839ca0922b9020c04174338ccf9ee1417c06fdff3c6b024b35729c97cbb2bf866ce2fa04f3f6c494beecbca96a63f51746e7ef99979
+DIST firefox-60.0.1-it.xpi 398259 BLAKE2B e8032c61605015f584cab6e25b662354fac7600d87590ba54ab9b42ce064334962fa72e741f382bd8fd3aabe348d35c863d26b7b3bfbacf27aab44d67d8d8f19 SHA512 172adb50979581c16b5441ce2b81e86505446c1d2cf6f875d2791079370eb582fbad6534fbb458c58a5d64eb86b7114737841afc25de07c35dc17149cac75a05
+DIST firefox-60.0.1-ja.xpi 571238 BLAKE2B 66addd5ce2442bf6e6f2026754106c2ea5a779edb0fc82ab7faae5cac63930bcaf23c23c3393d86b465d891ab603d7320378fda23418b12e986e200d8f397dad SHA512 11809a880180712644da8b5cc6e83f559ba5e4a663c024e6c4a565710e9dded425e2f51fd5384c0fdb9630c43da4e58918a1481c4da4a0bc2a398d0dee6b2877
+DIST firefox-60.0.1-ka.xpi 556068 BLAKE2B a8ce260495ccc5e608c3c55be3058065736a10d35e4d2c6a92300e8b42647c366f4dffec3a2defb98c82737030c1f5bf034491a6f4c9549ffcd3ca73b80f2a96 SHA512 eb34eed11a6b187623a2de7c73906d9234e63790c91b7adaefbbf253d7e9c4300f113e60f175c43ac04c4e398d160bae12ae7814a43501339f5449592f3cf3fc
+DIST firefox-60.0.1-kab.xpi 519625 BLAKE2B adbad0f6c874b93cf31c03ed501c73f403a865617ba5e564d8003efcf141050771095175c214d9465294907217e45b3abc49ad23be319e1442a18d59615c88b3 SHA512 aa714d03d2984bdd64287f5637ec594d42633f1b01a07cdd16e2e19280ac86d0948030aa363194b666694b17ab9bdd6026f0f9895d8f721f4a7f0cbc084c574b
+DIST firefox-60.0.1-kk.xpi 582200 BLAKE2B d37fca9824047b913ebaa8dd31db0cc4b49365bc1197f75c46bdf35c37e209fc8b403e8df02431bf891d9a0b4dd506fb9bc414d0f66d262fbb3fa3f1a647613a SHA512 abeb75ce00510173c0d8691179a0af6f68577b16672bd246da3f6ff3268870cbf09e5d1a858a48fa89255fa4597aa6428bf7f7d44facee7a05a22a2181354918
+DIST firefox-60.0.1-km.xpi 582337 BLAKE2B baef344a509d639113afb9529bf3929895172fe1ac95af1b6aa938dec2780c73332d6e8758acf049630be9dde57a52d4c71ad4ff5135d2047680a4b4715cf640 SHA512 a24363ae2deaca39eafeeca88f130bd492d8dee32e23ee51239cf1dec882ae02a73bcfa3a25054b69d40e5735ce174fdf7c8476a863fe12e89c1c7c183a4219e
+DIST firefox-60.0.1-kn.xpi 585098 BLAKE2B 9aedd9f3898ccd431c3c7aafe4ca8deb9b933379ac190a27b0c0871940091fb31690dd7d7d70f03484f35a506dfa5e927dea404f4808a446aa565ecbcc149c10 SHA512 aef993e76f13814235636b88a07440566c91f1c6a67eedf49cf6fa49947c539202f52daedbc46498dbf589a59d627b7b0f6662b92f90544470f97b0afe5cc821
+DIST firefox-60.0.1-ko.xpi 547052 BLAKE2B d51c071e06803930fbb82d02c66d709e71e436e09cfb5f3813795a8bb708ebf5f283ff48e55f2d46b6930213313ce4cb29e50b6bd5ad473791cfd6ff10bbb168 SHA512 aa900925fb150b569023d0536b1dba6b3e3ad1b978556dafc6f7f795838e0b4d637d74a52132dd97a35dc7f717f852cdf578ac711fb1d58d3dbcbd40c66772a6
+DIST firefox-60.0.1-lij.xpi 512395 BLAKE2B c5bbad329f5eb92cac279201b4fc971b9b5c68a0fc343174b6927fd3582a2e6baf2f51030b69eb83f0d36d99918f9eba0d1863c7283e146387eedcbbb239e80c SHA512 426a777ebd08f4c06bd1c3b3a3b52caed4329b72cdc087e1e9828259e5b889bf93ec9ef4416ecbf002f97e56b91b0130b8d5121e6a028910912e08a46709c5fb
+DIST firefox-60.0.1-lt.xpi 535632 BLAKE2B c2547dddeec76f07dbe07d701e6e5b6a762ac4336a506087dcebeb3609b84e830e3f860ecb035f8dd830043d9336cbe373a341c9f8e7015ca25a3558d6a65fcc SHA512 d50d626e8bd50ff1aa79d974cba65f3a700ab204e8b03ef34d1a6eed11d59350d318f06b022273040892f2ef910f44303830be1fde7134b91430f59f1d4e2421
+DIST firefox-60.0.1-lv.xpi 525646 BLAKE2B 51cbd614ab16b93d9c33fdb68788acaf0e34523cee4dc29ff1caf46a5a2611bb22636429fa7527e9f6517935a996a9966b6e9a8651cc6c4798adb428f770f8df SHA512 47fbc5c21d5255a37b11c6fbd1cdd79e1ff306aae1065b77b4d12e400d79cc226dfb78b31d0e0d48ba71aae9c0a16fe8f50bdb3e90c936c1dbeae172fb8e1d33
+DIST firefox-60.0.1-mai.xpi 548475 BLAKE2B 348a43f7a23a788c15c7e005501cda024f68634e6a536ade2ba8980cd685dae77da6c056c31b950fad26715f48f948aa43945fb0878e225f624efa05bf975343 SHA512 83fd38827ef53894f0a91b08ac6ba7c40d2c3b403f5a3a23ef016f94838fdce83ac388894ee1744c37683e78d62ee8a9c991ff88733509f9d17d403bd16ba0f4
+DIST firefox-60.0.1-mk.xpi 513028 BLAKE2B 1975abe9544f00835d4283482e43de5638441df0ba736af472b01a02b824d4399b5d8bbb7832b51b842dc8abae674eeaef13fe20a7e5b20b2a13fda639bad6a4 SHA512 48980fe49e802127090976b84ad9d85c158c7f767b92a354de65c6715e01964594d9487ab6173afa9368f307e8d8317aba1b63f196f3ab539c687a8b06d7c42c
+DIST firefox-60.0.1-ml.xpi 598200 BLAKE2B 2fd419aecdde7371aab61495c4e4826faa31d2932eeeabb0542154d594f0a87798219dfbdea1a726860509cee83e880f881f39b90887d897cdc850db921ab9e1 SHA512 ed8fdcdad6cf5db22f96a1030f82e6416e6e276b1fad83172a155518299877277050e6aa3abff3cbebf68caaab9d813c66c686fb9b7f59d87719dc3ed201c28e
+DIST firefox-60.0.1-mr.xpi 578339 BLAKE2B 6a9a0e6dba55fbd16e5fbcf5f4008edf545a33a4e0bbfb7e98a7b442117cdbc0661d70eab35739ad1430e18934e13088d3c0222af1c3ef7f9c72a49497c4123b SHA512 49152902c8b5388c17e640f7eedc2946980d4305ea77b35d301f914c4839da0d702d493c1c836538c7ddcea7d7a4cdfbdf4505a0b4c2a1ce805f7cf1c5a58018
+DIST firefox-60.0.1-ms.xpi 508783 BLAKE2B 0b4df92cad7159307cc57e838e1d88bbe5271a808e8fed5bece9b464980c5bccd24551ece6372f80c0b977e68a23876b32f539bed73e8117b42df56648c9b4e7 SHA512 8f21fe94aff2037227afdea5fa851de41ef8bdf7633175d1ce70fa3f31824e02b3d8fe5930063cc4c184a5d76fe98cbed0fa8647a22a8ac872bad2e479df7e9c
+DIST firefox-60.0.1-nb-NO.xpi 509104 BLAKE2B 630f7b18b440f06a5f6d92ea69d97967aca90d800684c396192abca00b23e5d8068e4bd21afddd6860b548c896a08fefc3ed98ab4c93029e53b9799770473b99 SHA512 17815ca0fb6e160817e69c03867d0d7c2977d378ff76a8564b6c6962a827e588ec727c9ba75001b38d98d25c6fe4f9f419ed22f22f1161bbc4adcda726cfc39d
+DIST firefox-60.0.1-nl.xpi 516663 BLAKE2B d8cb0fcf291b2973c4a62d5e1dae3bfb2800baac396419c324b5088702f8b9de35b9f18eb570ea0c995aa66e19aa07dff5edd086c7c91a058cbe39090561cfc7 SHA512 1a03c2c0760272633dc20fa27ad717fa2066ae9627ffec4b2c2d9134e806171923af496e92cb3d8e00975840d425e2ba27fa52a7dfcdb4b64033e45a9485fc28
+DIST firefox-60.0.1-nn-NO.xpi 510631 BLAKE2B c603e37274b4c48ae3b153ad25f38037b827641f9518a828b429a6a042ee8e10ba6c478f3de89bd48302dc9e05fae4843a70d596fce7745110ac86842d612339 SHA512 de429d6f666b1965bd31dd74fa3e2807d45cd9eed296a8540b11c0bf6747c7c1d7cae3b58e33c9c83aedea88ab49df690fffad4be146b5179f86db1165022d0f
+DIST firefox-60.0.1-or.xpi 540092 BLAKE2B 7c5751836e9437d92a61a8cc34109f6ad480f46c5860acd21f0faddaab05ea0074a5f2f6a3df4ba2fa4fc231e74e06c55d5544b6135999086437fcced973966e SHA512 6360b2ededd333d3eb8096b8346d8638a079e40d4f5310f081e2532285e677423da5b848cad745a66d3388f39f06cb3b4dd46f73979563473117a28c04bf84ba
+DIST firefox-60.0.1-pa-IN.xpi 557090 BLAKE2B dbe9538d598a9705f8b7ab404270bc9385ff3ccf6fc29c2d611a5e187a8d2a3d5cfd174edbe0aec37c3c5d120cf226259f5593b4e6132ff00f5e4d61f0c94265 SHA512 3db6b0487641572303c35882299d52ce0b060453dc947c93c80deab548dc9b32dcbbd4d60c05f9a9dedff7d87435d135f025e1575dcef72b3ddebe7490a64145
+DIST firefox-60.0.1-pl.xpi 418197 BLAKE2B 72c2fac355bc101fd846c48f148b8a1d78c6fd7fceb14cde8195881476e5075add96a8ef48e41fe56b0077028d684a7bb8c2834715ba098ee47e883a7b6bd8ce SHA512 2cb0f33ec4a7fa08354e6722f783f27ce9bfd809428ef04ac1870cd9ae5825e438045cb7a6bcddeea8803b6feb9b81649129111375377aef8db68694b58848b8
+DIST firefox-60.0.1-pt-BR.xpi 513941 BLAKE2B b1ad69c99daaac45f1fb5f0af0243c38fede5de15f0140cfc7c252cc0b0525c05ea6605e1ce6c3111fbb5dbc8bf029df1a8c034e63626db7208df91d61466e84 SHA512 ff8048c968da9dc7947e8478181721f1facab1b760b201f1a7d407b0b832c45737947965b5b5a28bf588bf182070804b2d73899e9c122b8b0e747e8f5a1022bc
+DIST firefox-60.0.1-pt-PT.xpi 518538 BLAKE2B 5e70c87359b45562fb26b57d07362ab3a1fbb2e102730cfc23062f7b49336738d31768e195a4670ccd690e22cf002ad3305918a69043c7252839229d7ae33fec SHA512 aea5e36eee95ad103f54f33a70ca8e1463d5d3f5679ac57417a27c2dd8962e53aefaa0a8c0a5d0658f05d5d6ddf2cfc4e6aa60088da0f367ccbd89e755d7e552
+DIST firefox-60.0.1-rm.xpi 505268 BLAKE2B c3224dbd370f94d56ced8df7bc5a62bdf530ddf7c90cea446a8b7f7eff8869228b43e0fc1b607da8c06d413a86f497d334bbf0754948fa25ac49ef9fe57b44da SHA512 5d3c481775955e1b6d079ae661df3f9daa5e2f2d3a996bdf06928dd1b2da2a954a6cf9dc13cf4762a68f25832b72cda775ab32763cd774f17f428bce5122ccd6
+DIST firefox-60.0.1-ro.xpi 513283 BLAKE2B 2e12907406ca56036b0f30d1551469a3315fd9f924aecb2e02b2e88d011ccb74c77c5a75087ab112708add3a6ef9e9f9524f5cd802ec5180bfaef7913cc8ae95 SHA512 dbee0d9a5168ca496fccec1e39670be57b967b5a3cb14fe9c2b977f285da07747200f2f8e0ac8d17eb0ee1ec66b652650074fb6315f79b47b235378ea4f4e801
+DIST firefox-60.0.1-ru.xpi 590512 BLAKE2B 126554ddea6be4f77e7cd2c8cacb0132850d6d004bb4746c8099f1cb4afc60a5857d7f4ca663382db2b5296073310fc5a38f0c08916a3b81ed8c0e44af5d0875 SHA512 dfcf29a6e1fa0c1118d92e5d883c419afc5308212577c790a1b74c6c76794bc1de6bf72e09f2cdbe18fd47017022bc18b5377bbf674e95936a9402300c216c7f
+DIST firefox-60.0.1-si.xpi 544805 BLAKE2B 26268d5a3feb8b7d0c6dcb60c8e745c9232d03bee7e97e45e93e8800165964ddd294010b29ac1c2d1273db93183254d70a463a9990a133109c187be9bf8fb835 SHA512 e332d48ade9e6f1e866c98b4feb8e1825c123e2de72671440b89784fdb33a9e243bbde7170978f30aae754255cc1b024197091e1abb7aa90ccf26f7a307a5296
+DIST firefox-60.0.1-sk.xpi 540930 BLAKE2B b10c1d2209b0d2adfd075347a009bed6148eff1f7aa5ccda2361f8c414a77fb3af29c63ffe316ce0509beca44de83c5cca8d26cc01217169d3850d3400b550e3 SHA512 5c5309bee06b704ec0ed0c54fbe10a8671d585a557dcc4114f4fa568029d98d824f2b6c9aab05e4ebf7316a59a88f6cc1579ac1688992680e312750881088a56
+DIST firefox-60.0.1-sl.xpi 518574 BLAKE2B 02aea0d5d8c29113f51f0f22ea1571b69b28fef5e6179f8992c5b9920e2f53cb7a342ca9ba592ddb2657399367def1e6adf6f210c3a5b46bd109faf73403ee92 SHA512 b9af5a07d38708e6f05c354f919de4d07b069fb4afb6d7aa1220f92a4c8a45f355a19fa38efa80b85fc4bf1837e40d0f8bce41c10112e25e05ac5cb5a6db61f5
+DIST firefox-60.0.1-son.xpi 496912 BLAKE2B d68b95bf1df859f7971baf4e342ab8a84286c507bb28c8ca4d6cf73856ec6d7d19a70ecc4728f8d96c44bb8568542cb1b9a74e8a920e6701032eed75ab7fbbc7 SHA512 ef6923e3775b51f9610de78fd2e7a7de76efdd0d256f2e6583b43bbe2b2912ecbb1276d7d703e24105cccd43ff5500a2c0334c76dbba0176ae48396984f7196f
+DIST firefox-60.0.1-sq.xpi 520490 BLAKE2B b51a77a0dfd1c99542b745db8cd445afe21e1d7bed43e8f87a8033fa1e18ed33f212c41d481da4d316101e6b3b66b54cac4c3b3500df0f4572a9626125d12a67 SHA512 536e27be1934feecb7d56d7a9d3597a968fcd197326a8159cd86678a636af79b16296350b16e1f8970112a4e1d13832cc54eeafde6367b1f24d286c5f7aca405
+DIST firefox-60.0.1-sr.xpi 547998 BLAKE2B ffb96dd7500cf13dba30856475847467f41344007ec41c6241590ded09d5ababcf1d72b1f6c8abdcb9e2519e121227f60b3dd768e3c89e93af4d54e97b27615e SHA512 910afc84ae20319631c4be1d8470edae53b00356064a9e7bfcaa0d014d2d5cc88e97a472f350646b061cc817f4cbe2c8eeabf1b18e6fcc57e038e37a9bd8e6ea
+DIST firefox-60.0.1-sv-SE.xpi 517843 BLAKE2B 7e4e7fbaac4a88159b10b59e266b59a7357306e8e4d0a753b73be7b5981a294bdf7345b581559a00cab42ae6e9950a332039c363025ec26882e805186bdce62e SHA512 030528ceb6963e71c60a17b83a0c298727512b3e2014f2f1cd32e26b8a5b699c3e9a7e2ab3ab25f18c694d61ff23b5a3b740e36d2e8b3fd5644c289e9ddf4d90
+DIST firefox-60.0.1-ta.xpi 577143 BLAKE2B be5645f2ecd2713894d9c05d0fccf4802c3d28a66f9667efafbf4fb981ffcbd522e00fdf54491def8b318334e9a167ea8da38e35106657d2faf5cab356543d09 SHA512 71e9feaed8ddfa9d1355cf67ac0104f0f44b703b99c3ce9b24cb899e67754ad341c6859f5a157ef0f72a01d1d8a5a4c91363d0fe08d13615242fce901131fbb6
+DIST firefox-60.0.1-te.xpi 590180 BLAKE2B dec6532c86118f04c56ee3ef7688c6a51a7d27b30afd1d0cc8e04b1a0167f68d3f0fcbde7a91852b09886a3a7433a8d6f41c799fb094a5dbf216adc9480632c7 SHA512 bacbcc747febde781eb89d1d86a4b5ed762dcd083a182275f001ec30a50dec4bc4d8921d3194bdbd3854536b48e46265dda5310dce724515890246eb6cb57146
+DIST firefox-60.0.1-th.xpi 562032 BLAKE2B cbecf0c405a1e5fb1fe2fd5ed93f0f272342f607e6747dc0f80dd31e37601a453be4db4f00dde0f38549b1353d8f259d1c502366b381540dd193f846b5844e3a SHA512 8004171e25cbf9c99c81569b114ca4827a72df39247cbf6c97bcaae3533fd1d03d44795d8ff38bc244f5832fe20c0c1ddeb4ed6625577d2b9c4f52e7a947c0db
+DIST firefox-60.0.1-tr.xpi 525038 BLAKE2B ed5fb540b6a1acf520f890d5e4e3ceafc1b45fa900da3569ee37876618a26d74c72942fd350e589026416e61a7cb7841442b3f89d39bfa20ca57be2e181a1309 SHA512 d25b22f5f5200210c433c70a2b089b6f575adc434fe2e4888e815beaa70873ec61b6b5922937431ecee73b2e7881cf5c4bbfe13d38b9f264935b59e34c7d4672
+DIST firefox-60.0.1-uk.xpi 580148 BLAKE2B d66598a483ed6832c7bb963f5d652da6a55dfc01158946e9f679629a0c8c6cd6b3445749436286f59305f466a7da39156e44b45db18ee14f100bfd947f56d942 SHA512 c921fdd343bca58afdc7f2a6a1a9c9c775ae7f0656aac78d9f8a3dde3fe13241c2bfcb42a91354e163bc25b741ad3f631d7a215656f74db0d7a01e3e91af4bcf
+DIST firefox-60.0.1-uz.xpi 512911 BLAKE2B 295b16688b3b0efcef159b487e43ef7d213b119624350d2892fdb992dbc7c7b26efcc76c33ba0df7091c24edeb49c63142794f480176bab342c96fa09c66ed74 SHA512 069501cef3ac75a8f6f1db811d300bf95a785fd9f7ae60071c6db7353b5e9901944fae12916b214fdd73b0ef6b8f6df2045d79a9eda6b791ef6b8e0bb12b088e
+DIST firefox-60.0.1-vi.xpi 527411 BLAKE2B 578271f42384b7a21e706d4d39d95cb6e13f14036a42a026b78e96d38a18b192120e71caaf07be170ceb432a4eb51f8bdde9f59d73e972e3e8a0651f9a897c83 SHA512 aa71dddaea0f1e5ae872deacef271c9d7957c8647cfafb4da49a7d8cb4ff81ba093b14b8d1cb07a8e747150f21be4cfd2123afad109708fb4b88a66404c52654
+DIST firefox-60.0.1-xh.xpi 511081 BLAKE2B ceb7c7ed1a9a961d5953cad461d5a22236c300ab4a9112cc32732e21ff692a24e0e691b5b39f8ff24533ef908c2f6626b0b570e6cd20f56666858451e11e2535 SHA512 d5ab081f220273d5f20a23c40476497cea99c35d650a78fa28d22422de32c6060e1ce33f237c8805a060086b0fd8f08a27782f6f22511645e575667310a5d3aa
+DIST firefox-60.0.1-zh-CN.xpi 542802 BLAKE2B 642f75a9d76c45f4aa7f214a30f7b130c6fdee154eb2145f2f2a8da14c9641f162a83a7c8847e093201c116f16a1ccd71d9b4f5373ce32bd5c8f20cc93a885c1 SHA512 01f9bc5e4ae7387e64d293a2d17fca514a345f2ba2e6de02bb1c0406805abe59173c4177a2c5697f396d54139a19a68c509535811834c47f2cc0bad4d03dd1b4
+DIST firefox-60.0.1-zh-TW.xpi 541124 BLAKE2B 98e83600cf9530caf498ef6d7dda35f9557d85026802da9e19be80845ff5cdc3e8baf72c61f93b445ef21f52c0cc290b3d5248d106a2ce1103f814f6e1431956 SHA512 801b4e89bda0f288d4235d1ef6db4dae9a8f90eb0bfec9073aaa20d33a8f6d8dfd2655be36935f9ec20186d353e4e7300a116143f54645a18728d3dea4bfe6c9
+DIST firefox-60.0.1.source.tar.xz 267804748 BLAKE2B 2ea8d3e4b7b912e159ca618a1c152123535fb4f9779348d91e8f467a4181cf9fe8d81440590b21d95a23403cc3b8ef48754955fa2a50c47df20c266faa584eeb SHA512 160fe83fc9101930521bdefefa8e32458a7438f454114aa5b1206ab4f63ce89566d84d4b7aca4c2c8d4fda529b33e29aa8a5228a643961e4b3e09b18d0c13510
 EBUILD firefox-52.6.0.ebuild 12940 BLAKE2B 357e3e6cd6b355af23afdeb5db93ebab0dc2049436f8f448e7ff0e34e5c84414a2db4efb05cc13f050f1fd02626797395b53bf3bc5e416dd13ebdd90dec6de02 SHA512 bb0b364de552649c5fc0b58d13c8ae4d3dcc6497aae83acd014af89545f4355791d0ed6a1002e25630e8a5d797386e3a1b1ad6ae314574e6b12fb50673bc231b
 EBUILD firefox-52.8.0.ebuild 12940 BLAKE2B 357e3e6cd6b355af23afdeb5db93ebab0dc2049436f8f448e7ff0e34e5c84414a2db4efb05cc13f050f1fd02626797395b53bf3bc5e416dd13ebdd90dec6de02 SHA512 bb0b364de552649c5fc0b58d13c8ae4d3dcc6497aae83acd014af89545f4355791d0ed6a1002e25630e8a5d797386e3a1b1ad6ae314574e6b12fb50673bc231b
-EBUILD firefox-60.0.ebuild 11594 BLAKE2B b3794f33290128423366e31af961417ffcc3f2012337602d984eb597ea30c7b0c13ba336dea2418921a9852f4f64867c4b01699603e1fa3aba300d774f9cd234 SHA512 b6e39b384335c27463128b1f17af815fca5fb014b67ca15a995beeaee73252b749dfcfef679e0690bf21f28489062a2af23088854843aa7a6d00547d18d78e5c
+EBUILD firefox-60.0.1.ebuild 11594 BLAKE2B 4943dae7f631cf6f1599fbe89a68c1fe5f48d3283b7558faf3f330875019f9897fbff868beaca0cc337135b515ea81239c1cb3e43c6914f48557502c0b257b71 SHA512 44d9ad976706a033a6613ad922b2542c3efe5730edb316dc22f955c28db86fd2b9bd33e06a906b1fb824757feb1ccfc8c4ad3cc2e447c83a72de717f394f7f37
 MISC metadata.xml 2097 BLAKE2B 48891b46d3fbb16b3e0355ac35bea758fb24e6d1fd5d6123bc5b62ba4416c814daa8761dcd439d8c77ea30ceca5eb07306c10e7110fbc3ad063519ec97f7adc6 SHA512 563e087dfc1f413dbc1d97d81f3187666e2cad46acd87e579e8cd1c0ffb01f49402c71e06856056cf08be14beb62f1e0ed67044fd8afa09c4e8558127cef7bc2
diff --git a/www-client/firefox/firefox-60.0.ebuild b/www-client/firefox/firefox-60.0.1.ebuild
index a48268577ccb..2bf75ce5e17a 100644
--- a/www-client/firefox/firefox-60.0.ebuild
+++ b/www-client/firefox/firefox-60.0.1.ebuild
@@ -24,7 +24,7 @@ if [[ ${MOZ_ESR} == 1 ]]; then
 fi
 
 # Patch version
-PATCH="${PN}-60.0-patches-01"
+PATCH="${PN}-60.0-patches-02"
 MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
 
 MOZCONFIG_OPTIONAL_WIFI=1
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index 685a0ec7dd69..f1595d23334a 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-beta_67.0.3396.48-1_amd64.deb 53690648 BLAKE2B 7222f04fa5d370aa52262f698b21545906cbf16656fbdaf4d7acd7fd88ea8cae66ae9ab0e8fe86fd61fd1155b4739f0994eaa77950dd781b767255880ae933b8 SHA512 0e7bef42e7a7a3cb4f935860b67d361cd158a7a07c576ad2bf012652371fe3a1e0ad31790e5a230796b0ae0dac5175ae7d425652d0c40873e454164aa4da5c6e
-EBUILD google-chrome-beta-67.0.3396.48.ebuild 3615 BLAKE2B 6d174a808c9f33ec215bd4caa269afcbc50a5d89a96d30f841d9b5f2355bc8fbfa06ea96aa1c2af61138e529a6248941b19f398d06a87f6d337e98926ff767c1 SHA512 862516fc6d507feaae8c2a2d424c47d38f0fa557f5254dfd3b9a7c2caf84febe85e72ed70ee84599a94028eb168360ed545c318ff95819babe2ef708a389845f
+DIST google-chrome-beta_67.0.3396.56-1_amd64.deb 53717138 BLAKE2B 2298fda12ae312089552429afa5ba5800947d4a76e2c859224fb424e96a9a25a930ef89995adb1b0c2377a33f6c56dfecf6033f663d89bd9f932539505269268 SHA512 8d28a562a21251fffdfef6aa6e2e5eb69be4e24a722d312aac6baf5c1246fee1f092b4765ddc2def20e598e39b8ebfc8cbcbf470fd546a54a06d09917eb87ddb
+EBUILD google-chrome-beta-67.0.3396.56.ebuild 3615 BLAKE2B 6d174a808c9f33ec215bd4caa269afcbc50a5d89a96d30f841d9b5f2355bc8fbfa06ea96aa1c2af61138e529a6248941b19f398d06a87f6d337e98926ff767c1 SHA512 862516fc6d507feaae8c2a2d424c47d38f0fa557f5254dfd3b9a7c2caf84febe85e72ed70ee84599a94028eb168360ed545c318ff95819babe2ef708a389845f
 MISC metadata.xml 517 BLAKE2B dfd840aa3f7845f67c8d6cca488d89845ca7c259eb4df00f8458ae48b1962df91ca8299ef34785f635dcab25b445246e999fbbfef3bdd7117a4ee1b14beca420 SHA512 837becd9e41aca24694cd10a7bddbc5ca501aca983832daccb4c091a7712267ef20051e7a19af02bc3b48eed89c9e18aa0d46ca2411e1d58d045ceb732a180af
diff --git a/www-client/google-chrome-beta/google-chrome-beta-67.0.3396.48.ebuild b/www-client/google-chrome-beta/google-chrome-beta-67.0.3396.56.ebuild
index 500479b752d3..500479b752d3 100644
--- a/www-client/google-chrome-beta/google-chrome-beta-67.0.3396.48.ebuild
+++ b/www-client/google-chrome-beta/google-chrome-beta-67.0.3396.56.ebuild
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index b52dee6d5d2c..399acb1cccc1 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1,3 +1,3 @@
-DIST opera-beta_53.0.2907.31_amd64.deb 54224526 BLAKE2B c9be699e1ef4851b27b4688dffc38e6a48069c29d0ff89c598d4cd68bb6819da4d34d0b842837fc79a75043539fee75e5a01da372bf04f86290a50b3bfa235d2 SHA512 a9125c835806fb322a87557583f7c4c39fd4d60c0a31c79dfe66c5bd2e2db53fb1b2b816cdb59c1fe106796e82152068ccc2836e697372ba543494f8cfc54d05
-EBUILD opera-beta-53.0.2907.31.ebuild 2316 BLAKE2B ecc23746187167ffd747896035e6c2fe21d79a591209b5fb5d460c932086b3b46887bbc9ed6e3208f4c4fb4edc3fe5a5b48f496788886607defd06b03a80108e SHA512 70842898fe3c3031a66eee59ac8fc1cdc7a5ff1e24d51fbcfcf9a15657b084fd0eb0b07b32ef494bd85627420d05808533c945b0da56e49e260091a40c3981a1
+DIST opera-beta_54.0.2952.8_amd64.deb 55215750 BLAKE2B 395ac802d228dcdc3b0b66681bb58e474a91625d9ce9e0c3b0f46b39981093cce3af4f67ec306fd8eb125b71b5861aadc6a364e6b4fb96a0eeb75886e75610ce SHA512 f795902c1606281b2ed8a00bb21515b79a388896d6c1b949e99f2f17eaea926d19aa8b7ce0328ce859293100e81ee0b0377635eca672f51309ef10e400142349
+EBUILD opera-beta-54.0.2952.8.ebuild 2316 BLAKE2B ecc23746187167ffd747896035e6c2fe21d79a591209b5fb5d460c932086b3b46887bbc9ed6e3208f4c4fb4edc3fe5a5b48f496788886607defd06b03a80108e SHA512 70842898fe3c3031a66eee59ac8fc1cdc7a5ff1e24d51fbcfcf9a15657b084fd0eb0b07b32ef494bd85627420d05808533c945b0da56e49e260091a40c3981a1
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/opera-beta/opera-beta-53.0.2907.31.ebuild b/www-client/opera-beta/opera-beta-54.0.2952.8.ebuild
index 308b38bc8be3..308b38bc8be3 100644
--- a/www-client/opera-beta/opera-beta-53.0.2907.31.ebuild
+++ b/www-client/opera-beta/opera-beta-54.0.2952.8.ebuild
diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index c7e7c90aa527..bebcf45fca57 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -22,6 +22,26 @@ DIST seamonkey-2.49.7.0-sk.xpi 967988 BLAKE2B fd7db86b778be8b1202c031ccb6b18805f
 DIST seamonkey-2.49.7.0-sv-SE.xpi 940793 BLAKE2B ec901577f833e69f78d0fba13fe1ee1297105332db66fa5e0c841f19aca4e3274822f43f49b925eba7e86bb8682963424369bb4ce8b089df32d8fc7fbd294e2d SHA512 0ac1b0a8e599ef0ffe49d8a7b94dd25818601fb5603273ed995b9a4bb52c5e13a360c76b9278bf8a14b8dce5609f33be319c43fa13ee7b16eda897f6c2d39ddf
 DIST seamonkey-2.49.7.0-zh-CN.xpi 946349 BLAKE2B ff8d5dfc671cf51e9af849e7781eb3ada2cda97cc542a8a28306a7c060043752be7614574c0c4882c54dec8a82972a46a7c8bc8085d94a9273264cd15dbfbc83 SHA512 5d3a6accc9deb69b6d52bccca0b52e12b8727d0e6a99067dba52921a147c333b7b777d7dc4935510fb981c9cfae2c4cfc30f310fad9b06e5537ef1dbb89b5e28
 DIST seamonkey-2.49.7.0-zh-TW.xpi 1002365 BLAKE2B e66f68187c0373f96ba8f58f420c8a4c917015e6c38a54a6c80d9cdf4b31620ff3c104ffccc1f4e0f140673b15eefe1742a2b0f3208e00abb4a593322cb1edf9 SHA512 a5797304f4de6edf807238a551676fe9755d9ae0dc0141ea959c6edae8bc742ad11976a2b1cf4f2a324ad6b94c1a97c77e29b8100a679af7002156d1d0150376
+DIST seamonkey-2.49.8.0-cs.xpi 941974 BLAKE2B 4de71b190c63e4284b5915ab3f9f9672026fd2375996df26064598a6e1859f3e9b56c668c63a4741c37471c23dadb6eefc018a1715d7afa3e5ced8477a16eb50 SHA512 c3b061e0b735c6949a0ce7f8be22c7818e6bd039de5284015b0ff63b8456f18bd51db9f3a3d1f9a5df2a6d0610043ea9e33f16ccd3ba64e20ac53e901196afd3
+DIST seamonkey-2.49.8.0-de.xpi 949902 BLAKE2B a51a5ccf0a86708b26c9394cc88d3a05f6108760933b5ccca92d54390090f379ab34b4d90796e77764bcba1fbb20a8ffe56f7cf5ba7aeefc80e0e01d3f5cc86b SHA512 fb85fa867b5b9417190aa25cc678d68e3afed04bfe052896167aaf46042397da6e1bbeb70acc321f46bd0bed4f0856152d80a348b478a336d28825c4120af1c6
+DIST seamonkey-2.49.8.0-en-GB.xpi 911789 BLAKE2B 495cd6fcb8cde5dcbab636bad20e1da5f89dcfb3bbafea12fec1c2fc68bdf9145d533828163884dd25988f792839739a3374a233567820cdf97fb49c44d7228c SHA512 973fc7f693abe9b87bd971f79e050bd4bd9a16e4e6f6a50d9298f2c71d45aa328c4279055382b7f9bf8c807dff9c1ab8855d97dbbe3eb4d71c40ee5e3a02f3b6
+DIST seamonkey-2.49.8.0-es-AR.xpi 952759 BLAKE2B fb882c78290507b7bd349ab01545c7263b983b156c26938fa77565658b55d567d3f057b177b2e98be0d83e5bfb21c3b9bf39f31ecbc4b406739afa6f3af5e5ec SHA512 ec198ed919079e16bf638be032cc7de165d0e9d05d0742a12828b5ad510884d4dd0da57c0cbae85b3fe0089a1be26f42c9887957ab6ecac8b8ef6cf0fbbcb345
+DIST seamonkey-2.49.8.0-es-ES.xpi 897737 BLAKE2B 6ddefeeff9b9d1c96b4dc8d068a179d92a353470329571e8b84962f3c667bdb06cd4f9851a64868958e99412d7eb7f3a3910edf48c4a73c86474283a8268c504 SHA512 e9fb5834f3086ee1cf99404930149f06ee7f3f0d5796550c3368b915ed9f729dbd92032682c6273b687b6f3077a4ca3a78192e101f1276d90ebf2eb71f39f22e
+DIST seamonkey-2.49.8.0-fr.xpi 969290 BLAKE2B ec7bbac2dda87d64486e36a18b18ab89c5940df2134704c5fa5af892c0b9669ff2cea81fb34355d383b6207c0993504afe052c5c435a4a402862a5c814debfe7 SHA512 188f4a8c79b10f95c807a08837290fbc3245c983e6797b8f8a0beea4f4ffad915abeb942920f9986910a0530218f4e35ba16de60b4f21d33116ae16756eb4e8c
+DIST seamonkey-2.49.8.0-hu.xpi 955174 BLAKE2B 60784e962a43bf01630f76693b17954d4788daebb54d29f95ff5f3650ecd78b7067f1af20421d104feffaed10d08dfe1b25f8551969678bd4e1fe9b414a7edcf SHA512 e28beb23242a6535230df4fd1adb82e8957487179402cb82dedc2faa6464b411d22ddb2732e0490a916597301eebf2fda727bcadb34e029bd468bd066dbc3080
+DIST seamonkey-2.49.8.0-it.xpi 793590 BLAKE2B 4c7e837b93a090b3f0934a37bb1c63534dce632839677b0127055502cb7dc57f210c1390afa663ca9c2f4f01196756579750d94b8815de12fc6b2bd9c12a6a19 SHA512 c750a85b74bb37d966f1bbecdafcd6ad9d4532eaf0f49f9148081f821c61aec332646eb7c43f0eef4b736362a8c2ab0a1205a38537129f6fe920dc8ae0f16ca9
+DIST seamonkey-2.49.8.0-ja.xpi 1033801 BLAKE2B 0fb8ebcde8c64f60872d3ed4acd17249c852fb43863e5649cf778dfffde13cdee5ed63af4d66647d4c57a9d456a769b2b43f28cf9637b8b71ffb053dc0f46bee SHA512 454756af04d5d3301c3ffe321109e1c78aa69a3b9e4a29e1b1e7226b958062e451551d73c3df87785fd80e74a4e433fc2094e3702ceb1a547abb858551878056
+DIST seamonkey-2.49.8.0-lt.xpi 956024 BLAKE2B 75ffe875f683e8e47e703574e4a3b73cb2bb764e8163f833208e06b914709acf772734848a2164b94f138dae021c4915e8b20f417132c84197042215548b5b25 SHA512 14124e0b9b60f360f6f2b77b5bafe80569894754a3ffd27b6a3aab34136d7876d785b5e9178cb1d34ec46a7b858f26327658e1a3e43ac97abe272838dde78228
+DIST seamonkey-2.49.8.0-nl.xpi 957391 BLAKE2B 859a5cce26654b3f67d4a340d40b96d66199461250342a699f3186f97edad0347174e87a68a6be21bd6c2ff91497195be98bfb717679d76aa9be2590b809ee9c SHA512 0f3e68df37e211b73773e1b84d39d4540d1d8865cc534bad841babc30c074bb9301cc472aa0e4e61e09bc26948270e1106e1546d27705380819d830ca158215d
+DIST seamonkey-2.49.8.0-pl.xpi 913004 BLAKE2B 8fa4e937c41b6585075f920a778c13d08fcbb6a5759d5371a05d278b5646963d4b8a066aedd60e7521caf354d4ed57e14864d6cb802900284a8be05553ea0e38 SHA512 532b64032b6e4cb902cd9d99ef5505f3ac57964452196f3a9f49eff1bd965c5a8a8271960951482266f12214cce4cad876268f9f38a193f5d91c2644fef0aff8
+DIST seamonkey-2.49.8.0-pt-PT.xpi 939012 BLAKE2B 16bcdbd9c04f023dba7de4e5caaa16f2bbd0bda45625008b909fa360eb98409b21081b892d9e3dcc4fbc5a3ffb1bafc630f2266f69149c70ad96a81025aa7e01 SHA512 f8cac43e61de1d4dfbc0febddcadfa10cc457e7552016c79ff954cddef900470e60912c607076976b15811944a07cd785fbd2ffd85a5af3ce545ec98c12bdc05
+DIST seamonkey-2.49.8.0-ru.xpi 995907 BLAKE2B ce02fd35e093b3f5c2fed309a2fae066e48c7b3351075d55b72751d66b6e13fb13758b8ef4ffa351e85907152ac78a0fb4ced99e2af2993f5906440ba69b0051 SHA512 846f7f361a15ea1b04539ec789dffb459e1fbd85283c720883d6545da67a979e040c80b5cb6a0938f0ca9e059e837310cf3fb2d97671e37ff256ad2ac780291c
+DIST seamonkey-2.49.8.0-sk.xpi 967988 BLAKE2B fd7db86b778be8b1202c031ccb6b18805fc9027f50dd513e3ca0ef2afa1208f5df0b7636c0b6f822fda9618ebe48dc1b16710888284c2d5681e00e4be26c03cf SHA512 8fb02cb8f95c68ce40aabaf79c57bd7c655092dd5fb939d68a62a1bec707b903fbcf16299ff8dd094e161b5f4c732a813d63e33b3ff3ac09f9e1afcf740426d9
+DIST seamonkey-2.49.8.0-sv-SE.xpi 940793 BLAKE2B ec901577f833e69f78d0fba13fe1ee1297105332db66fa5e0c841f19aca4e3274822f43f49b925eba7e86bb8682963424369bb4ce8b089df32d8fc7fbd294e2d SHA512 0ac1b0a8e599ef0ffe49d8a7b94dd25818601fb5603273ed995b9a4bb52c5e13a360c76b9278bf8a14b8dce5609f33be319c43fa13ee7b16eda897f6c2d39ddf
+DIST seamonkey-2.49.8.0-zh-CN.xpi 946349 BLAKE2B ff8d5dfc671cf51e9af849e7781eb3ada2cda97cc542a8a28306a7c060043752be7614574c0c4882c54dec8a82972a46a7c8bc8085d94a9273264cd15dbfbc83 SHA512 5d3a6accc9deb69b6d52bccca0b52e12b8727d0e6a99067dba52921a147c333b7b777d7dc4935510fb981c9cfae2c4cfc30f310fad9b06e5537ef1dbb89b5e28
+DIST seamonkey-2.49.8.0-zh-TW.xpi 1002365 BLAKE2B e66f68187c0373f96ba8f58f420c8a4c917015e6c38a54a6c80d9cdf4b31620ff3c104ffccc1f4e0f140673b15eefe1742a2b0f3208e00abb4a593322cb1edf9 SHA512 a5797304f4de6edf807238a551676fe9755d9ae0dc0141ea959c6edae8bc742ad11976a2b1cf4f2a324ad6b94c1a97c77e29b8100a679af7002156d1d0150376
 DIST thunderbird-52.7.0.source.tar.xz 230410444 BLAKE2B 4c7d10a16f78c2ea791d72f3f99b25556ccfce9448d7b1235403738722aee1c8ad9aa08a21bce3c5a82389d9b4d96ada104950b0168424308f07fa6a939c190b SHA512 875ad6f2b030c65d248ecec4f4a5b51767c3ee7944ac72893237efd2af50145ec2e4a9efa8d60807b78bcfb8189969e5a67d15124710e8b0091f639cddfbfe21
+DIST thunderbird-52.8.0.source.tar.xz 230380780 BLAKE2B 6bb13abbbfc6fbb9eba6bbc9a66b891bf463233ff875b4bf0b877c3ee8c6b868e964381cd7904ff91027189ef05bf11eae90791612cee66720c0713930594df0 SHA512 ce44f32f44244560499c44dbe963a8296cf58cf33e3f26d07be455746ed7f77791084e41bc66b2c90fe46e97fa15ae2041b1f5fcfa94d15b45c4f90172230d03
 EBUILD seamonkey-2.49.7.0_p0.ebuild 12777 BLAKE2B acd8d141bde54ef97de914b4e93dc21f778ffd52fee6b3ce7cb10572f43b81893b234246c9daad8345b6fc2c5e59ea27d83abe3a9156098387210eacd5795589 SHA512 d26f680fa5924307f473aa5f1955cc62e19badd328ae4f9d3909de74eae1217596445856bfe2775f37090550dbfd05812df75b28e5faf40677b0bd3e2a588661
+EBUILD seamonkey-2.49.8.0_p0.ebuild 12774 BLAKE2B 008d1a377595b6d66f4fb4ea9b9266da771cda3cd4bed5f098a52c156d98bbec748af843f1c03401159027ad969823696fc619f239beff3413a70413388fcc51 SHA512 17f5ba03be6fc1e8d7c037e059c7d46cd26f48e13806c857b8d98a014748aaf9319ee62026ba4f411777edabe768c8a0dc318f17324b303bc6dd8ddd5794aba4
 MISC metadata.xml 1882 BLAKE2B e72fa92838230026eaab872a858ba54ccecf47055bff324215219f785e3143daa13984d1f8b2bc746d8a0cc1a07c74a0ee2067f029b92df098431a43588a27a3 SHA512 d533b6033b37fe1410722b2f005a147e1508a2e9a390176a199b15a6464ff5b354ba5ee2542ea243c33b4d4d1e1f91b6e331f9bf43f13b0ef1ceb973e8e9e117
diff --git a/www-client/seamonkey/seamonkey-2.49.8.0_p0.ebuild b/www-client/seamonkey/seamonkey-2.49.8.0_p0.ebuild
new file mode 100644
index 000000000000..ad42e85496ba
--- /dev/null
+++ b/www-client/seamonkey/seamonkey-2.49.8.0_p0.ebuild
@@ -0,0 +1,403 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+WANT_AUTOCONF="2.1"
+
+# This list can be updated with scripts/get_langs.sh from the mozilla overlay
+# note - could not roll langpacks for: ca fi
+#MOZ_LANGS=(ca cs de en-GB es-AR es-ES fi fr gl hu it ja lt nb-NO nl pl pt-PT
+#	    ru sk sv-SE tr uk zh-CN zh-TW)
+MOZ_LANGS=(cs de en-GB es-AR es-ES fr hu it ja lt nl pl pt-PT
+	    ru sk sv-SE zh-CN zh-TW)
+
+MOZ_PV="${PV/_pre*}"
+MOZ_PV="${MOZ_PV/_alpha/a}"
+MOZ_PV="${MOZ_PV/_beta/b}"
+MOZ_PV="${MOZ_PV/_rc/rc}"
+MOZ_PV="${MOZ_PV/_p[0-9]}"
+MOZ_P="${P}"
+MY_MOZ_P="${PN}-${MOZ_PV}"
+
+if [[ ${PV} == *_pre* ]] ; then
+# the following are for upstream build candidates
+	MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/candidates/${MOZ_PV}-candidates/build${PV##*_pre}"
+	MOZ_LANGPACK_PREFIX="linux-i686/xpi/"
+	SRC_URI+=" ${MOZ_HTTP_URI}/source/${MY_MOZ_P}.source.tar.xz -> ${P}.source.tar.xz"
+	S="${WORKDIR}/${MY_MOZ_P}"
+	# And the langpack stuff stays at eclass defaults
+# the following is for self-rolled releases
+	#MOZ_HTTP_URI="https://dev.gentoo.org/~axs/distfiles"
+	#MOZ_LANGPACK_PREFIX="${MY_MOZ_P}."
+	#MOZ_LANGPACK_SUFFIX=".langpack.xpi"
+	#SRC_URI="${SRC_URI}
+	#${MOZ_HTTP_URI}/${P}.source.tar.xz
+	#"
+elif [[ ${PV} == *_p[0-9] ]]; then
+	# gentoo-unofficial release using thunderbird distfiles to build seamonkey instead
+	TB_MAJOR=52
+	SMPV="${PV%.[0-9].*}"
+	MOZ_P="${PN}-${MOZ_PV}"
+	MOZ_HTTP_URI="https://archive.mozilla.org/pub/thunderbird/releases/${MOZ_PV/${SMPV}/${TB_MAJOR}}"
+	#MOZ_GENERATE_LANGPACKS=1
+	#https://dev.gentoo.org/~axs/distfiles/${PN}-${SMPV}-l10n-sources-20170727.tar.xz
+	MOZ_LANGPACK_PREFIX="../../../seamonkey/releases/2.49.1/linux-i686/xpi/"
+	MOZ_LANGPACK_SUFFIX=".xpi"
+	S="${WORKDIR}/thunderbird-${MOZ_PV/${SMPV}/${TB_MAJOR}}"
+	CHATZILLA_VER="SEA2_48_RELBRANCH"
+	INSPECTOR_VER="DOMI_2_0_17"
+	SRC_URI="${SRC_URI}
+	${MOZ_HTTP_URI}/source/thunderbird-${MOZ_PV/${SMPV}/${TB_MAJOR}}.source.tar.xz
+	https://hg.mozilla.org/chatzilla/archive/${CHATZILLA_VER}.tar.bz2 -> chatzilla-${CHATZILLA_VER}.tar.bz2
+	https://hg.mozilla.org/dom-inspector/archive/${INSPECTOR_VER}.tar.bz2 -> dom-inspector-${INSPECTOR_VER}.tar.bz2
+	"
+else
+	MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases/${MOZ_PV}"
+	MOZ_LANGPACK_PREFIX="langpack/${MY_MOZ_P}."
+	MOZ_LANGPACK_SUFFIX=".langpack.xpi"
+	S="${WORKDIR}/${PN}-${MOZ_PV}"
+	SRC_URI="${SRC_URI}
+	${MOZ_HTTP_URI}/source/${MY_MOZ_P}.source.tar.xz -> ${P}.source.tar.xz
+	"
+fi
+
+MOZCONFIG_OPTIONAL_GTK3=1
+MOZCONFIG_OPTIONAL_WIFI=1
+inherit check-reqs flag-o-matic toolchain-funcs eutils mozconfig-v6.52 pax-utils xdg-utils autotools mozextension nsplugins mozlinguas-v2
+
+PATCHFF="firefox-52.4-patches-02"
+PATCH="${PN}-2.46-patches-01"
+
+DESCRIPTION="Seamonkey Web Browser"
+HOMEPAGE="http://www.seamonkey-project.org"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
+
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="+calendar +chatzilla +crypt +gmp-autoupdate +ipc jack minimal pulseaudio +roaming selinux test"
+
+SRC_URI+="
+	https://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCHFF}.tar.xz
+	https://dev.gentoo.org/~axs/mozilla/patchsets/${PATCHFF}.tar.xz
+	https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCHFF}.tar.xz
+	https://dev.gentoo.org/~axs/mozilla/patchsets/${PATCH}.tar.xz
+	https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz
+"
+
+ASM_DEPEND=">=dev-lang/yasm-1.1"
+
+RDEPEND="
+	>=dev-libs/nss-3.28.3
+	>=dev-libs/nspr-4.13.1
+	jack? ( virtual/jack )
+	crypt? ( >=x11-plugins/enigmail-2.0.5 )
+"
+
+DEPEND="
+	${RDEPEND}
+	!elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( dev-libs/libexecinfo ) ) )
+	amd64? ( ${ASM_DEPEND}
+		virtual/opengl )
+	x86? ( ${ASM_DEPEND}
+		virtual/opengl )
+"
+
+BUILD_OBJ_DIR="${S}/seamonk"
+
+# allow GMP_PLUGIN_LIST to be set in an eclass or
+# overridden in the enviromnent (advanced hackers only)
+if [[ -z $GMP_PLUGIN_LIST ]] ; then
+	GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
+fi
+
+pkg_setup() {
+	if [[ ${PV} == *_pre* ]] ; then
+		ewarn "You're using an unofficial release of ${PN}. Don't file any bug in"
+		ewarn "Gentoo's Bugtracker against this package in case it breaks for you."
+		ewarn "Those belong to upstream: https://bugzilla.mozilla.org"
+	fi
+
+	moz_pkgsetup
+}
+
+pkg_pretend() {
+	# Ensure we have enough disk space to compile
+	if use debug || use test ; then
+		CHECKREQS_DISK_BUILD="8G"
+	else
+		CHECKREQS_DISK_BUILD="4G"
+	fi
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# Unpack language packs
+	mozlinguas_src_unpack
+
+	if [[ -n $TB_MAJOR ]]; then
+		# move the irc and inspector code into the correct locations
+		# when we are building from a thunderbird tarball
+		mv "${WORKDIR}"/chatzilla-${CHATZILLA_VER} \
+			"${S}"/mozilla/extensions/irc || die
+		mv "${WORKDIR}"/dom-inspector-${INSPECTOR_VER} \
+			"${S}"/mozilla/extensions/inspector || die
+	fi
+}
+
+src_prepare() {
+	# Apply our patches
+	eapply "${WORKDIR}"/seamonkey
+
+	# browser patches go here
+	pushd "${S}"/mozilla &>/dev/null || die
+	rm -f "${WORKDIR}"/firefox/1000_gentoo_install_dir.patch
+	eapply "${WORKDIR}"/firefox
+	popd &>/dev/null || die
+
+	if grep -q '^sdkdir.*$(MOZ_APP_NAME)-devel' mozilla/config/baseconfig.mk ; then
+		sed '/^sdkdir/s@-devel@@' \
+			-i mozilla/config/baseconfig.mk || die
+	else
+		einfo "baseconfig.mk hackery no longer needed."
+	fi
+
+	# Shell scripts sometimes contain DOS line endings; bug 391889
+	grep -rlZ --include="*.sh" $'\r$' . |
+	while read -r -d $'\0' file ; do
+		einfo edos2unix "${file}"
+		edos2unix "${file}"
+	done
+
+	# force a version update that matches the minor and patch version of thunderbird
+	if [[ -n ${TB_MAJOR} ]]; then
+		echo ${MOZ_PV} >"${S}"/suite/config/version.txt
+	fi
+
+	# Allow user to apply any additional patches without modifing ebuild
+	eapply_user
+
+	local ms="${S}/mozilla"
+
+	# Enable gnomebreakpad
+	if use debug ; then
+		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
+			"${ms}"/build/unix/run-mozilla.sh || die "sed failed!"
+	fi
+
+	# Ensure that are plugins dir is enabled as default
+	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
+		"${ms}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"
+	sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \
+		"${ms}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!"
+
+	# Don't exit with error when some libs are missing which we have in
+	# system.
+	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
+		-i "${S}"/suite/installer/Makefile.in || die
+	# Don't error out when there's no files to be removed:
+	sed 's@\(xargs rm\)$@\1 -f@' \
+		-i "${ms}"/toolkit/mozapps/installer/packager.mk || die
+
+	# Don't build libs-% locale files for chatzilla if we are not building chatzilla
+	# (this is hard-coded in the build system at present rather than being based on configuration)
+	use chatzilla || sed '/extensions\/irc\/locales libs-/s@^@#@' \
+		-i "${S}"/suite/locales/Makefile.in || die
+
+	eautoreconf old-configure.in
+	cd "${S}"/mozilla || die
+	eautoconf old-configure.in
+	cd "${S}"/mozilla/js/src || die
+	eautoconf old-configure.in
+	cd "${S}"/mozilla/memory/jemalloc/src || die
+	WANT_AUTOCONF= eautoconf
+}
+
+src_configure() {
+	MEXTENSIONS="default"
+	# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
+	# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+	# get your own set of keys.
+	_google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+	mozconfig_config
+
+	# enable JACK, bug 600002
+	mozconfig_use_enable jack
+
+	# It doesn't compile on alpha without this LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	if ! use chatzilla ; then
+		MEXTENSIONS+=",-irc"
+	fi
+	if ! use roaming ; then
+		MEXTENSIONS+=",-sroaming"
+	fi
+
+	# Setup api key for location services
+	echo -n "${_google_api_key}" > "${S}"/google-api-key
+	mozconfig_annotate '' --with-google-api-keyfile="${S}/google-api-key"
+
+	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+
+	# Other sm-specific settings
+	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
+	mozconfig_annotate '' --enable-safe-browsing
+	mozconfig_use_enable calendar
+
+	mozlinguas_mozconfig
+
+	# Use an objdir to keep things organized.
+	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
+	echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig
+
+	# Finalize and report settings
+	mozconfig_final
+
+	# Work around breakage in makeopts with --no-print-directory
+	MAKEOPTS="${MAKEOPTS/--no-print-directory/}"
+
+	if [[ $(gcc-major-version) -lt 4 ]] ; then
+		append-cxxflags -fno-stack-protector
+	elif [[ $(gcc-major-version) -gt 4 || $(gcc-minor-version) -gt 3 ]] ; then
+		if use amd64 || use x86 ; then
+			append-flags -mno-avx
+		fi
+	fi
+
+	# workaround for funky/broken upstream configure...
+	SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
+	emake V=1 -f client.mk configure
+}
+
+src_compile() {
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \
+	emake V=1 -f client.mk
+
+	mozlinguas_src_compile
+}
+
+src_install() {
+	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	DICTPATH="\"${EPREFIX}/usr/share/myspell\""
+
+	local emid
+	cd "${BUILD_OBJ_DIR}" || die
+
+	# Pax mark xpcshell for hardened support, only used for startupcache creation.
+	pax-mark m "${BUILD_OBJ_DIR}/dist/bin/xpcshell"
+
+	# Copy our preference before omnijar is created.
+	sed "s|SEAMONKEY_PVR|${PVR}|" "${FILESDIR}"/all-gentoo-1.js > \
+		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
+		|| die
+
+	# Set default path to search for dictionaries.
+	echo "pref(\"spellchecker.dictionary_path\", ${DICTPATH});" \
+		>> "${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
+		|| die
+
+	echo 'pref("extensions.autoDisableScopes", 3);' >> \
+		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
+		|| die
+
+	local plugin
+	if ! use gmp-autoupdate ; then
+		for plugin in "${GMP_PLUGIN_LIST[@]}" ; do
+			echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
+				"${S}/${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+				|| dir
+		done
+	fi
+
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
+	emake DESTDIR="${D}" install
+	cp "${FILESDIR}"/${PN}.desktop "${T}" || die
+
+	sed 's|^\(MimeType=.*\)$|\1text/x-vcard;text/directory;application/mbox;message/rfc822;x-scheme-handler/mailto;|' \
+		-i "${T}"/${PN}.desktop || die
+	sed 's|^\(Categories=.*\)$|\1Email;|' -i "${T}"/${PN}.desktop \
+		|| die
+
+	# Install language packs
+	mozlinguas_src_install
+
+	# Add StartupNotify=true bug 290401
+	if use startup-notification ; then
+		echo "StartupNotify=true" >> "${T}"/${PN}.desktop || die
+	fi
+
+	# Install icon and .desktop for menu entry
+	newicon "${S}"/suite/branding/nightly/content/icon64.png ${PN}.png
+	domenu "${T}"/${PN}.desktop
+
+	# Required in order to use plugins and even run seamonkey on hardened.
+	pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{seamonkey,seamonkey-bin,plugin-container}
+
+	if use minimal ; then
+		rm -rf "${ED}"/usr/include "${ED}${MOZILLA_FIVE_HOME}"/{idl,include,lib,sdk}
+	fi
+
+	if use chatzilla ; then
+		local emid='{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}'
+
+		# remove the en_US-only xpi file so a version with all requested locales can be installed
+		if [[ -e "${ED}"${MOZILLA_FIVE_HOME}/distribution/extensions/${emid}.xpi ]]; then
+			rm -f "${ED}"${MOZILLA_FIVE_HOME}/distribution/extensions/${emid}.xpi || die
+		fi
+
+		# merge the extra locales into the main extension
+		mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/xpi-stage/chatzilla
+
+		# install the merged extension
+		mkdir -p "${T}/${emid}" || die
+		cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/xpi-stage/chatzilla/* || die
+		insinto ${MOZILLA_FIVE_HOME}/distribution/extensions
+		doins -r "${T}/${emid}"
+	fi
+
+	# Handle plugins dir through nsplugins.eclass
+	share_plugins_dir
+
+	# revdep-rebuild entry
+	insinto /etc/revdep-rebuild
+	echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}*" >> ${T}/11${PN}
+	doins "${T}"/11${PN}
+}
+
+pkg_preinst() {
+	MOZILLA_FIVE_HOME="${ROOT}/usr/$(get_libdir)/${PN}"
+
+	if [ -d ${MOZILLA_FIVE_HOME}/plugins ] ; then
+		rm ${MOZILLA_FIVE_HOME}/plugins -rf
+	fi
+}
+
+pkg_postinst() {
+	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+
+	# Update mimedb for the new .desktop file
+	xdg_desktop_database_update
+	#gnome2_icon_cache_update
+
+	if ! use gmp-autoupdate ; then
+		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
+		elog "installing into new profiles:"
+		local plugin
+		for plugin in "${GMP_PLUGIN_LIST[@]}"; do elog "\t ${plugin}" ; done
+	fi
+
+	if use chatzilla ; then
+		elog "chatzilla is now an extension which can be en-/disabled and configured via"
+		elog "the Add-on manager."
+	fi
+}
diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index 3bf4f1204ba1..24319d45dcd9 100644
--- a/www-plugins/Manifest.gz
+++ b/www-plugins/Manifest.gz
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index dc42fc057b89..6e50da39c651 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,7 +1,7 @@
-DIST google-chrome-beta_67.0.3396.48-1_amd64.deb 53690648 BLAKE2B 7222f04fa5d370aa52262f698b21545906cbf16656fbdaf4d7acd7fd88ea8cae66ae9ab0e8fe86fd61fd1155b4739f0994eaa77950dd781b767255880ae933b8 SHA512 0e7bef42e7a7a3cb4f935860b67d361cd158a7a07c576ad2bf012652371fe3a1e0ad31790e5a230796b0ae0dac5175ae7d425652d0c40873e454164aa4da5c6e
+DIST google-chrome-beta_67.0.3396.56-1_amd64.deb 53717138 BLAKE2B 2298fda12ae312089552429afa5ba5800947d4a76e2c859224fb424e96a9a25a930ef89995adb1b0c2377a33f6c56dfecf6033f663d89bd9f932539505269268 SHA512 8d28a562a21251fffdfef6aa6e2e5eb69be4e24a722d312aac6baf5c1246fee1f092b4765ddc2def20e598e39b8ebfc8cbcbf470fd546a54a06d09917eb87ddb
 DIST google-chrome-stable_66.0.3359.181-1_amd64.deb 52336026 BLAKE2B ff6d8646970c11734c0bb692e5174ecad70094356d0929e24763b23bf4cd03fbe7cbb7a64b8188b55395708e4d505782b8e3879bdfa7b0e2f8a66e76fe27d276 SHA512 95c0d47e8017072f8bfbfd7a46d46677e8729791bdc48fddb3d966574702a167dcde7557e317048bfa93d9216e613385244353f7fa94b8b793d384fb09427c93
 DIST google-chrome-unstable_68.0.3432.3-1_amd64.deb 55602134 BLAKE2B 5e890e93970400d5c2f4e8bd75774439a2db6148a84b916b5da67d487cfda93a8a18516080e2a657ac717e64eda102fadd4ac979155127517fd3dcd8f404e355 SHA512 8ce67236db5120f562c0399a23c6bd72118f78027a66f7629aba802b6cc3e00f50cde304235d502a6b88f03717ce58fcf5a05e14daa964fc9191edf6385a6daf
 EBUILD chrome-binary-plugins-66.0.3359.181.ebuild 1438 BLAKE2B 0ebcfadfdc0070f0a7539c188fd5cbd311bbd60bf1ff3eceff4fb0ec66b05384abcdd5e1626b88e42f2eddc28bd840b90ad83456be3cb3b7514eb2c98043f4bb SHA512 3ba4363fd6dec797e5338c01bf2e033fecffa02a7908ddc149730ae498db3b192bb647f5f892e9c4aadcb54677b5c6a04011dbcd6d4940d3952b7a33f7dd9b3c
-EBUILD chrome-binary-plugins-67.0.3396.48_beta.ebuild 1308 BLAKE2B c17906f06379601f1c871f27f971de4c2f57dd91eecf64736ddfe89c29ab8b11c95a7816a242ef8a4ffb1c9257acd23064472c875924dc4a2556593179e5fd61 SHA512 47d00d8c91ee366cbad72d17020f819c1a12ffff8d5e1111dfc7b9c1fcdd716529bbb9c34df573413f4cd23180343f373cfb66d41191f972f022a19358e14d9e
+EBUILD chrome-binary-plugins-67.0.3396.56_beta.ebuild 1308 BLAKE2B c17906f06379601f1c871f27f971de4c2f57dd91eecf64736ddfe89c29ab8b11c95a7816a242ef8a4ffb1c9257acd23064472c875924dc4a2556593179e5fd61 SHA512 47d00d8c91ee366cbad72d17020f819c1a12ffff8d5e1111dfc7b9c1fcdd716529bbb9c34df573413f4cd23180343f373cfb66d41191f972f022a19358e14d9e
 EBUILD chrome-binary-plugins-68.0.3432.3_alpha.ebuild 1308 BLAKE2B c17906f06379601f1c871f27f971de4c2f57dd91eecf64736ddfe89c29ab8b11c95a7816a242ef8a4ffb1c9257acd23064472c875924dc4a2556593179e5fd61 SHA512 47d00d8c91ee366cbad72d17020f819c1a12ffff8d5e1111dfc7b9c1fcdd716529bbb9c34df573413f4cd23180343f373cfb66d41191f972f022a19358e14d9e
 MISC metadata.xml 341 BLAKE2B da1d1a85bb21e659671b98e12d0b3b31760dab269f8d298b44923f6936a4c43a27b67bff50adf76cb883460d5fe3112027d9b678826eeb220448cd114805320e SHA512 253960d995af2946bafa0bcd96a874e50197aa629efd0dfe7ce404dc72180a2298119b9cabd0b605c65b0894fe0316f7b3bdab602bdfade4323a0bdd70311fdd
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-67.0.3396.48_beta.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-67.0.3396.56_beta.ebuild
index 976ebd3dcd42..976ebd3dcd42 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-67.0.3396.48_beta.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-67.0.3396.56_beta.ebuild
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 3bec4c4692cd..e0dc052b2ec9 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/h2o/Manifest b/www-servers/h2o/Manifest
index 60f4709ade37..8519a1e72aff 100644
--- a/www-servers/h2o/Manifest
+++ b/www-servers/h2o/Manifest
@@ -6,4 +6,4 @@ AUX h2o.service 290 BLAKE2B 3cddabe28f0054d1e9f650ae1520bc13a417227a244ffe7f1b72
 DIST h2o-2.2.4.tar.gz 16212596 BLAKE2B 0c2702fb3c7e85e7eae107294794f80cee02b6b2488bbc2e880ea356d8362f0de8f08c3c3d686512cbf9ae1558aed23354f44e27edaf449e43d5876940248296 SHA512 508ebe93b890f573e735d9b1f9c91a669144be3523e34fb7455227fd10b38e04a5db73e706fe8d05849fea3019e792754097871c073715c9eef4eae7c33560b5
 EBUILD h2o-2.2.4.ebuild 1379 BLAKE2B 2bea638d603a43d339673e315d5a962b489e1927f30f7c887a3cbd27ef8359dc6291ef689d2d70e3eccf51ed2bc5993270e250b49cb43bbf0a7f08fe60a50cec SHA512 d997c62b90e5a80eda61bb9056778fe99f123765529804a19aed8817506df7d1b6fe418d7a91bdfd497cb355ad0c80b182ff2ec258608307a49c0255bd0feddb
 EBUILD h2o-9999.ebuild 1124 BLAKE2B 25f6ead8a1169987f617695b5ff588305dc6f6f44e0210e9844139b169b8fb22af522a3e91ccff1c27935117dcba29c66606bef84c34091fcf802176b7939887 SHA512 7829f692d3611dea66e531492c1035ef3233817bebce5e6b486a958b1b70f4416b98d88d607a912a78dc9197aacedfcd398ed4b0d81dd78c95df0812c065a604
-MISC metadata.xml 728 BLAKE2B 4598619035779d5059c269d24712e86b592636162e5fe5c3a244c6c48dd63dd9391c78cf365ded5052a6ce8e0cc43deaf7dc58b21b9320ee5ddce969d2b92317 SHA512 ae4a00e6c50ef7930e264cb3a747e14e656908fab0e3da4673c6719dda3744b34451361cd118feaaa6eebf3980c56ec297df9306e9ffa56c56df6c150e27707b
+MISC metadata.xml 723 BLAKE2B ee78e52073d993524549ea7138f32e517676813fa01e40daeb20ed00e1b0814cd03d8ef27df30fd63a5265a838718ce39bb24bd5ccecd99c4a6334e88b71d713 SHA512 fff35f9ca2df4329b6b439787e525dcdda5c3379a5104e35d95247c0d01f0e1585e4a03c73f12c259743165a511f3430fe95a3ac173d58442f8aebc8568115c5
diff --git a/www-servers/h2o/metadata.xml b/www-servers/h2o/metadata.xml
index 8603b5978487..2ae01bc9733c 100644
--- a/www-servers/h2o/metadata.xml
+++ b/www-servers/h2o/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>csmk+gentoo@chaoslab.org</email>
+		<email>gentoo@chaoslab.org</email>
 		<name>Ian Moone</name>
 	</maintainer>
 	<maintainer type="project">
diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index 4462a71dea90..1b6fbc14d09b 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
diff --git a/x11-apps/listres/Manifest b/x11-apps/listres/Manifest
index 3ff361902684..c92a8acd5b74 100644
--- a/x11-apps/listres/Manifest
+++ b/x11-apps/listres/Manifest
@@ -1,5 +1,3 @@
-DIST listres-1.0.3.tar.bz2 115429 BLAKE2B e4cc1e627d2331595e88ce6610c5cffa50eed0f2f8c898b3b9bfd93d1aeb66346d33079b1c25fd23e6694f47d5f7a3484ffac2f0dfb2043d6688820dded3eb89 SHA512 999156e9fcf1636fd4a398dc3940749eeab3b514141b9dc5125bbbb4c611c0fca9d4afa7e3b127bd9e7d3e3f94b942ef3be6aa79636eaf89bef75353c8203c22
 DIST listres-1.0.4.tar.bz2 125472 BLAKE2B 99865e682eb2894b7af1a84a6fd29bf16f0345b8660bbb61060dbb7927bf376591c7403356b97cff13ff3392321d52f34388f49fd2aac6dab52592317818010c SHA512 925bceab6ff96fcf91f58ba2f858905d6e2eff7074ba29cfc02def7c19fb493545837884f1070dc004422451f749cd459000c01e8c9bb51a7cce7f7ab4067b8a
-EBUILD listres-1.0.3.ebuild 336 BLAKE2B 9db3d2d63c03d9c0bdb9b02aeea7bd45c61d23b235bd59add58667bb92bf5c7f5ae61f0e2e8b6c1d484bb2187d9235b8dadaeb39c1adab9399c900737545b530 SHA512 8a40929741355112ea57e33a6b67c2538a01536ba56d6e65869a4c8900a8b08c7f58bcf29a73432b2559e4db9d8c2e4d4f6632b3ab2482162434c46ec1ed90cf
 EBUILD listres-1.0.4.ebuild 336 BLAKE2B 075eaba7cf254aab6e44632734afcce458004d6925b1d7acea3f84a00313055760dfd67bcf29baa7a370da3bd9171dbe4ed2f97841c5a49c00ff7177ae1fd8cd SHA512 06e59504299c060d6aa89f97c6a55fe0dc89700e6d3c5517fd2654810daeb842dc07296228f2411cb2afe35d5565ba245fda818d18cbbdba1fd2df3641021f02
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/listres/listres-1.0.3.ebuild b/x11-apps/listres/listres-1.0.3.ebuild
deleted file mode 100644
index f3b647b0af7d..000000000000
--- a/x11-apps/listres/listres-1.0.3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit xorg-2
-
-DESCRIPTION="list resources in widgets"
-KEYWORDS="amd64 arm hppa ~mips ppc ppc64 s390 sh sparc x86"
-IUSE=""
-RDEPEND="x11-libs/libX11
-	x11-libs/libXt
-	x11-libs/libXmu
-	x11-libs/libXaw"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/oclock/Manifest b/x11-apps/oclock/Manifest
index 05c4d3c436df..ace2382f18c6 100644
--- a/x11-apps/oclock/Manifest
+++ b/x11-apps/oclock/Manifest
@@ -1,5 +1,3 @@
-DIST oclock-1.0.3.tar.bz2 122758 BLAKE2B 72bdadf7b3f63e856862e77735cb64a29ceae6000e89dec770de38474c01ec80afe03b05d329fbaf7bc1a3d186c70c57889c93f87c2b376119632400c2f68336 SHA512 438e92c3ce79c4147dac687c7310f86e0839bff975eed9f19a75c0979e4d26f782a53af930dedc7c42b1f9ad5a37e853e3f10da0ab63d30526c0a23152825a62
 DIST oclock-1.0.4.tar.bz2 132835 BLAKE2B 8547aeb06ac33917d44f318ffaa38bd899b78176e4ecd0e4446706cdcb3fe30933b4a63cc465601268d8d868e90d498c0fc6a27f8c0feb304fb7ca1f44492d4d SHA512 6e0d36a84572a153226b2929f2253cb7adc3c9e5e3af168aeaf8c487ade2e43517b271a8e9cdb2a2c4a67ca56ed0b99c194ca63a4a822b68bfc72ca6518335e7
-EBUILD oclock-1.0.3.ebuild 378 BLAKE2B ebee6243d946f57957e9d041bb5a1f7836ef5c5cde52296ca557d861543b821b0c305d1b497f582612e5663631e5e6b21c1b598f27603107a675310d0c954863 SHA512 0af6c397b9f3380a4413c704fdd895c71ab918d69c41ec224c9dfc9d46e677dae2bf0b31053e115022a5526c3e46f892c3ee09a1328516b4c2daf50a26399d07
 EBUILD oclock-1.0.4.ebuild 378 BLAKE2B 98094e87e495b0549b32d5573e2c5a471a418f29d81246b94c44b7df6d2ffa04082679c500c1fb1d1fec810a53e0c8925e1d2434e810b231d1abe0bf60ace8a4 SHA512 9c673e5f657065644bbaba835924d872ff926336f26e9fa3cdfa1b046774c188afe3342aff3647dda2066df2c68a51dd13a8fa6989c6141e3143fd1ea39c5707
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/oclock/oclock-1.0.3.ebuild b/x11-apps/oclock/oclock-1.0.3.ebuild
deleted file mode 100644
index 27a2d3042bc0..000000000000
--- a/x11-apps/oclock/oclock-1.0.3.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit xorg-2
-
-DESCRIPTION="round X clock"
-
-KEYWORDS="alpha amd64 arm ~ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libxkbfile"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/setxkbmap/Manifest b/x11-apps/setxkbmap/Manifest
index 61f0be714356..cfb40959069c 100644
--- a/x11-apps/setxkbmap/Manifest
+++ b/x11-apps/setxkbmap/Manifest
@@ -1,5 +1,3 @@
-DIST setxkbmap-1.3.0.tar.bz2 125844 BLAKE2B db808dee77bfd23b1727c7eb8e5aa1112145b7ec10b317c758e2dfff06863cbb0ac1494a668aa3b5bddad5ff0ddb13c49adefaf9409599c7e008f765489921ba SHA512 d4843485f44a9204d1aa8bf16b3ad661747be119b0b5f38ced74dc35773519765af07fd290ab0265766de6206138e085a775bfc6edae6a232f2da9c260c0b581
 DIST setxkbmap-1.3.1.tar.bz2 133817 BLAKE2B f58f63623afd69275ef25cc33237176c2d1814fa124d7a5dade6ad3cf60b5ee5a8434857cfdb9b17c6f6c6cfce4dbf861a6c6bc232d9e12989acce7be285c63b SHA512 5ddc2fc40ddc5a35815606998d3f111e3c2b8d915bf609462c703f9f691a0b3a6477ee98837c0a28f11dd3f0a30f17a3bcdfa38d4ca45140e521c74d043ecdee
-EBUILD setxkbmap-1.3.0.ebuild 424 BLAKE2B 325aa01bdbc136d65a3c27aca8acca77e12fec3352000278fb2fee004c59392c42206582296e9c72e79bf6ba1cf286d4c07b948d8e91d0733177eb0f45631724 SHA512 5bf64b3965a15373fd65ae41babd047dbe66013b2a2ebe95bd8b2896de469c3bc595d3c04a6658cdc24ce407dacea0926b700426f78ce858db42d98211f5c95a
 EBUILD setxkbmap-1.3.1.ebuild 426 BLAKE2B 2d93aae330635fabbef481af23e48dae60f9da26d4d2615a32d629767f851e172ac8ba009e101f9823850a7589a1aac9168cfd16c86e8030998d6131820da7be SHA512 138143d0b8220f34996ac218a43b20b92ec2de0d4954ff592bb63354da39a4de9d1e2c980c6e59356c8d1b27b4e443911721e1e8fd0c48e13e03aff3ff1e32a1
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/setxkbmap/setxkbmap-1.3.0.ebuild b/x11-apps/setxkbmap/setxkbmap-1.3.0.ebuild
deleted file mode 100644
index 0405a28de6fa..000000000000
--- a/x11-apps/setxkbmap/setxkbmap-1.3.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit xorg-2
-
-DESCRIPTION="Controls the keyboard layout of a running X server"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-DEPEND="x11-libs/libxkbfile
-	x11-libs/libX11"
-RDEPEND="${RDEPEND}
-	x11-misc/xkeyboard-config"
diff --git a/x11-apps/smproxy/Manifest b/x11-apps/smproxy/Manifest
index d96594e1a46a..3a97394f3c95 100644
--- a/x11-apps/smproxy/Manifest
+++ b/x11-apps/smproxy/Manifest
@@ -1,5 +1,3 @@
-DIST smproxy-1.0.5.tar.bz2 118207 BLAKE2B 79afc9787ddc36d43de9679cdb6ad8a76db19433e3c54b02a80349b9ed71431b3e3274e69da915d379f363a6810a6a84b3d68c1fb6490d41e67df6f36427c4f9 SHA512 88ea92d468e1e46e473bda5bf355f0b2a98b178c5aa54e1fd29d9038a39fe843a7122a853e983034ffe6f5be3ed7b85f8b51266e4a4d1677a755ab6d4c30040e
 DIST smproxy-1.0.6.tar.bz2 132046 BLAKE2B b1eeba52730da79ed9f374636631c0400df997b2c5ab5ce18f1644ea6de7c55ba2914978d0b8b88f0cc455a0b5a65513fd7e29d2a374e7464fed14e007f8cf96 SHA512 4945c92c0f07c5dba5698889f415e78ce406939f4a36eb977309488c27385ce4ce04235c4e850a90a451fea8d7885ded7c6b18db71335c7731b38aaeefa9fcb7
-EBUILD smproxy-1.0.5.ebuild 332 BLAKE2B 0617fda9ac279155d78bbc67044c4bb00db8cb29e6f5d1211ce6e41b35ed23c92ef318c1db5493769f05452e94b13bd160453ef8c04d0ac8d4273d8540099d05 SHA512 388a359defde84414176670ab68172f2fc51beb56092065b8cd8655ed43f090b07391478fc2ed59a90283ebe89d0c89ddafbba6bdb636c8f7d54188838e82016
 EBUILD smproxy-1.0.6.ebuild 341 BLAKE2B a3cb56b2dfb45b1d0d7ecbddd6cae18cea207e9b3945f840ad34c945812c7d99ccb5eb6f9c508c2903d8a2b7ade81756726303f9f4bb55c5d8d1e4fb2dc55521 SHA512 4e5ea3632faad5fdbdfd9301e35d6fface36ae0b851c814a76661d59490522b865be062556bd6d0019e0b8ea222ca4c541ba04ca5aef6a9571af59722267b664
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/smproxy/smproxy-1.0.5.ebuild b/x11-apps/smproxy/smproxy-1.0.5.ebuild
deleted file mode 100644
index 491d36494d88..000000000000
--- a/x11-apps/smproxy/smproxy-1.0.5.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit xorg-2
-
-DESCRIPTION="Session Manager Proxy"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND="x11-libs/libXt
-	x11-libs/libXmu"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/x11perf/Manifest b/x11-apps/x11perf/Manifest
index d25f0af347ec..8b2c4735a0e5 100644
--- a/x11-apps/x11perf/Manifest
+++ b/x11-apps/x11perf/Manifest
@@ -1,5 +1,3 @@
-DIST x11perf-1.5.4.tar.bz2 167655 BLAKE2B 4ebc600038eb3d852d94d3db8e63ed252963e26854078b04d3dc7574207815112a01a9deaa422205447291fa57b80b16fb55def3b068a0f88998bb39007a7358 SHA512 5ffb9f2ed87a07f0596c60532666c1887d0fcef8da4554d6baac2ae61030af8c12e8146d7daf6dbed40f33d8d9700521794b2b89827fe19ccbfed77c39f064b9
 DIST x11perf-1.6.0.tar.bz2 191086 BLAKE2B accdbc4899a28a76bc1487d2f6fa04f5309337eee5e650455c9c3bd4a5187cd7ad42565bb2713c7f5974542bf8b9a2297db0ada81659479487b4a1a2e6227f25 SHA512 a9508c9dd6db2663b5bd30f5e1f5f80b1d22ce5221ae3dc292e746f8e554fda2d3130f7311f2545e20244dceb51e867fe80fec82c9ac5911dcdc90a73b231623
-EBUILD x11perf-1.5.4.ebuild 409 BLAKE2B 9c2c928bb5886d36b3afe00ce3d09c8e5b6a85d8bec8df871ba662d0f38a2d6f27bafcf0e9c4ad35e54d05bb75e0b485780613c2ce41acaec768ec9e04d9e021 SHA512 90a7cec6a014c24baf20c0652a129856721e82e145753e26b83a1f58be55c7148565467bd35422e24f92ea710bce201e5d296c3fa3835409cd5804ca687c08c6
 EBUILD x11perf-1.6.0.ebuild 418 BLAKE2B b2940ce8477cfdfd28963bb373b4801caf6fb4c7401f2f3a82618063c6430ba8f6216743385c26cbba5fb042bde5d260637ec9c5315e7ec533e2fb23f64d4116 SHA512 6e2adbd3d46ea817008f6a06367d287a6165f55fff4f98486ac471ef3b86916cff6e299b77f48a4bdf781f6a1b350deebfdd86d3019e9a9302cd6e32aafa6877
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/x11perf/x11perf-1.5.4.ebuild b/x11-apps/x11perf/x11perf-1.5.4.ebuild
deleted file mode 100644
index 23a057110073..000000000000
--- a/x11-apps/x11perf/x11perf-1.5.4.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit xorg-2
-
-DESCRIPTION="X rendering operation stress test utility"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXmu
-	x11-libs/libXft
-	x11-libs/libXrender
-	x11-libs/libXext"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xcmsdb/Manifest b/x11-apps/xcmsdb/Manifest
index b426b19c7dda..44e7a8e29ab4 100644
--- a/x11-apps/xcmsdb/Manifest
+++ b/x11-apps/xcmsdb/Manifest
@@ -1,5 +1,3 @@
-DIST xcmsdb-1.0.4.tar.bz2 136502 BLAKE2B 48342533cbd41ba49b68e4be3869c7fac9ec4c4ec9465e20d5855c32a1fbc12a419f68fb6e237210327950b03b4c0dab039b3e072164710526e6337f6460a95b SHA512 ddbcc10846ac8ec1b74373d0bf1944ca03f2a5ff775861fb39cad6d53828412b4fadc1d9e6ca8f79b22188e2d16b127496a85c243e347b84b2bef1ff82330702
 DIST xcmsdb-1.0.5.tar.bz2 145419 BLAKE2B 41269ca270e4b11838f54669900a074dfbbc7339af84db8638498e220eb7abac2fe055ca003dba326babf368d26137eabc0f0bae9f69233d9c91f7e727c3ba30 SHA512 e47bfce87d7531e7809c300e01120c3e8d6001130d9a6c9f6de5bc19651d8712d273a6f54452223bd8c4bff4612b5ecae8db45eddb022da945ed6e14c9c84ae4
-EBUILD xcmsdb-1.0.4.ebuild 362 BLAKE2B f0cd60cfd7423809ce5a86556d44b966d4fc0f08422cddd251f86b5ca44108deb9c287040bc0d78927267d924700b99e15b031e6031111663e83ae09cf715ae1 SHA512 b2624761495a4fa1d638e9ec56807b2396a113912899452641a0f10899f188fdabd201cdb8b6acf2d6d07ad871a47f17b62d031fe0134cb45e877b14910a39de
 EBUILD xcmsdb-1.0.5.ebuild 371 BLAKE2B 1b7011eb8a63ad44876e396507bf0d490d8f0c4f2bcc011dd5fdff2f44ea5e33f74fb6f378b09dde5ca8668d92da8e058f99dc83bf1594fda86dadac13393b1e SHA512 2128d5e1f203a7275aa1c23803b6ba3de13dc7abae716ccca7da57da0d2f38b75ba9a9afea4feaf4121bb430a1f0f14a5eabfda142b261678bc480cdcf58f238
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xcmsdb/xcmsdb-1.0.4.ebuild b/x11-apps/xcmsdb/xcmsdb-1.0.4.ebuild
deleted file mode 100644
index 90ba5e466e4d..000000000000
--- a/x11-apps/xcmsdb/xcmsdb-1.0.4.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit xorg-2
-
-DESCRIPTION="Device Color Characterization utility for X Color Management System"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xgamma/Manifest b/x11-apps/xgamma/Manifest
index f039a0070f21..758ece35951b 100644
--- a/x11-apps/xgamma/Manifest
+++ b/x11-apps/xgamma/Manifest
@@ -1,5 +1,3 @@
-DIST xgamma-1.0.5.tar.bz2 115035 BLAKE2B e24ad2d1ad76139d8cb0dc9e86e2eb25deda01d5c1ee1f16da135cb45d937e7c574d2330ef8359548dfd7e7400034ce031a6b1250efeab55ea3d8f2d3e08da62 SHA512 6680a4e2ef7cc8806febdb69b85922eaf98a4c779ef2b1f9875507d10b31a43dc3cc2ec147b1f3ccac6f3c5f6abdaaea320eef2ebac68c14608599b17bae4ec9
 DIST xgamma-1.0.6.tar.bz2 123105 BLAKE2B fbf5496e7c91f1e96d591721bfe7a1771659e7ef408be689e205e898191e0fd6beeff9466f4eff628054aefa640e83d7a8d69de028a6a6e5716a1eee50ef0abd SHA512 2d41798e15ac8c6f6731a2da29589207d936eaee1223ce6f3ca948e67d63c5c8b955d11c7db092dcd8c66a6209bd15c1de3dc1446dad4b4277134f010c6fc47a
-EBUILD xgamma-1.0.5.ebuild 392 BLAKE2B 2c58f38cc1b3e24d6676f4d3c447d94d7d62e9cee30265f0f3ed4cc9fed36ab9f81efae2efb46b55bfc8c40f795165d8c453a6d6d598ee2d5baef14f8f8f86d3 SHA512 8267a6e0ff64c9d02e612c7f4fcca1f26b4cb63af8016791d2e8e4e0b9ac4f7495304018776139eb14c61fca1f2e69300e9347a63f1390ecc7a8f36da99e96f6
 EBUILD xgamma-1.0.6.ebuild 401 BLAKE2B f2e73e061952ffc82008293dfcac595f893b22fe4101d52ddf4e9000b41195cc34aa3df208fccb710276e172ca2bb43cf44596977029e87ad16a90cbf7c98906 SHA512 4efd59b90db7dec1943eaa7bca648243e2a3821980e826688c1ae87d8c10d22a334b415e33bdbad1cdd3dc18b6798ded1188e41dabd6d19ee0160560b9b4cc61
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xgamma/xgamma-1.0.5.ebuild b/x11-apps/xgamma/xgamma-1.0.5.ebuild
deleted file mode 100644
index bc105e08848b..000000000000
--- a/x11-apps/xgamma/xgamma-1.0.5.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit xorg-2
-
-DESCRIPTION="Alter a monitor's gamma correction through the X server"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND="x11-libs/libXxf86vm
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-apps/xkbevd/Manifest b/x11-apps/xkbevd/Manifest
index 6e9eee7a1c08..abc7d5939d96 100644
--- a/x11-apps/xkbevd/Manifest
+++ b/x11-apps/xkbevd/Manifest
@@ -1,5 +1,3 @@
-DIST xkbevd-1.1.3.tar.bz2 147027 BLAKE2B 17be00eaf56931bb8ba6f556e1e0d64d9d432a9308db6292f5a366dc6925873ce62d790ba701cd0b7b4c4fa499c34ba199c3f098838234c399d4ab60d8b86645 SHA512 0bec7ec60c2eb7f252c290a80152d4917b6462df7ab2fc9a8234ae0ce68f56a06a939fb702513857c9176630386e2ac1dba29a8ca8b91db1adb6f3c5385f4f38
 DIST xkbevd-1.1.4.tar.bz2 151991 BLAKE2B 5f48968f4a45aeb5a851ba5c6c9cc6dd525d4385bda3475e1261a8419a3ea931fefff8e315309b6fcfba766ec9d95b4d64b93861f84798f5d730e2c5584c2cec SHA512 7628eddd0e1dc0c4df8e61eb3f6a6bf0e9d92a87e96bb2f5248ba5bd3d99d868885c36860b78e8ea2eaba3bb9a420067ef95c4d58c1254fa3d12fb25dd4e60e7
-EBUILD xkbevd-1.1.3.ebuild 350 BLAKE2B 096750b3039cd157d3fc82965dba3f9d4726be34dc8ed7bd604b5875b975f3afcb7bc4ddf76a45a1cb172aca94091e99ebcc217eea72489a41efd1e840784288 SHA512 7859e20fdc0a356c916c5c2276b39a382e8c1a8b49b45d90ebf762a86ce3caca2a53b06ff2b33ad089479fc391d32e367d6c67fedf0379a624247442b77d1f78
 EBUILD xkbevd-1.1.4.ebuild 359 BLAKE2B c5cc2639cb653db8d0d6316ff77382539e6d9d4cd78e083a8519528bc8fbb439c5e16a6185e1af7cf8391b2d7f73c8f4e1705fdec06596f4ce37ea52a0f9e547 SHA512 6769422e9b64a387e04ff5ac83b725b10321643ae3918d1443348d5578462ba368d115ce6d55a3b0b7327435926fad3d81661a23455e920e9524e98ef358e2fe
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xkbevd/xkbevd-1.1.3.ebuild b/x11-apps/xkbevd/xkbevd-1.1.3.ebuild
deleted file mode 100644
index a0c6e65b6be4..000000000000
--- a/x11-apps/xkbevd/xkbevd-1.1.3.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit xorg-2
-
-DESCRIPTION="XKB event daemon"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libxkbfile"
-DEPEND="${RDEPEND}
-	sys-devel/bison"
diff --git a/x11-apps/xlsatoms/Manifest b/x11-apps/xlsatoms/Manifest
index bdc8eea4862d..f09eef9dd858 100644
--- a/x11-apps/xlsatoms/Manifest
+++ b/x11-apps/xlsatoms/Manifest
@@ -1,5 +1,3 @@
-DIST xlsatoms-1.1.1.tar.bz2 116501 BLAKE2B 14cf98b57bf74f11c75d693c3d33ff8c4dbefef76c9d9dc62717332f764ee27160ce85c997a8e65f665823f302567daef092ba7be46b9c91c1d9077fc968eaf5 SHA512 c372c80c82942eb7ee50eb243182d4bfcbaf417d0f6e2253c0baf7df65e506908914604b06add6d745cc32d7b3bcfa6c49e93dd52d78cecbae13ed49f856dd0f
 DIST xlsatoms-1.1.2.tar.bz2 123157 BLAKE2B db6dcd01a8494411068ae43cb93c03fe03191c981d400a7f1fe2c179e7db2bc665af8989f6e4f0b136668d3f78cf491015b58d5fc3dc7707925b9688be780848 SHA512 f29001de22818792212312f1b9daee1bf7afa2ef2ae945cd8c14bdc1a7bb40064d3878c5efea60458ac0bf515ab1ece16fa90cbd2b0a879a5f07f3aa3e6a0baa
-EBUILD xlsatoms-1.1.1.ebuild 332 BLAKE2B 2b4b3eb919e1e6a97152ec16320e2332a851bee374234aeca1c475746fce42869c6374dc0408eddd2d5803dececb2931efbad0884e3138adc4ec7f236156344c SHA512 f0326e059f8511b006e0aa4f56aeba06e396bd9a407756fa844e8a3203dd68f183d18466e78d8644530f12c50b424c74e2edd52f0a4e23f94ed5310d690dc0fe
 EBUILD xlsatoms-1.1.2.ebuild 341 BLAKE2B 920c1f44de8613ff2ae2edd650003c2869017b707739fc1ed700a8d4ba8d0f01c4fdd1cf57c9eb7e7cec9c738eef24cc79407e60794b7323e3b69cdcb3a70c62 SHA512 220d8b3c42669824e12f018beb64604b94bdde2f6bbaf5a40b23f442de7ad7427a61dc6f0305cdf6fe77fae2e0ae65428267542fdb023ba560997a05dc7a6a6a
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xlsatoms/xlsatoms-1.1.1.ebuild b/x11-apps/xlsatoms/xlsatoms-1.1.1.ebuild
deleted file mode 100644
index dd0a6fb289e4..000000000000
--- a/x11-apps/xlsatoms/xlsatoms-1.1.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit xorg-2
-
-DESCRIPTION="list interned atoms defined on server"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND="x11-libs/libxcb"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xlsclients/Manifest b/x11-apps/xlsclients/Manifest
index 83112dc7a9bb..81d14c5b66ed 100644
--- a/x11-apps/xlsclients/Manifest
+++ b/x11-apps/xlsclients/Manifest
@@ -1,7 +1,3 @@
-DIST xlsclients-1.1.2.tar.bz2 114703 BLAKE2B 68e8d077b26760d14e825cb73724cf4c98f3f429f35e541a0fcc65c5162b00fffb90bcdc5bc8b1f9d8e8f250333756104608d4325f2d1bf1616746c7f4dc3b8a SHA512 c217c17ddd937fd27b11706e6453a6171037bc33f9d108c0bf717dd5f2a0580eb82bb9085342d81d526c75d8aaa0a2d911e6ebcaa12ac8cafce4caa726ac93e8
-DIST xlsclients-1.1.3.tar.bz2 127324 BLAKE2B 03860a7b3e53e371aaa66156029821e4693c720213e64b66f329121823a9ee01ce6e2f37970cdb434ce21a7484285c8df7f4effd1e17b028792131634a9651da SHA512 4266068b96bb0bf565021fbda726511a387800fcc81b6b53f3fb847ca6a4de50811f66ca1423a56414619ad6f3b4d2dfb235106a1eacf9e5def8cf49c2b2ba85
 DIST xlsclients-1.1.4.tar.bz2 130586 BLAKE2B 8e13bd29f10035a101cabe2a271fd665618dce12f7047f441bf943e8c4d2743e2385874b8e1cf42b69f6a19b7a3d5c16ec9ecff7e6cb62401888802d6946dd5e SHA512 42fd848d88d3cf31168a37fed63f9f5b60ddc4f36be2956b354e574c93129d75f29e005d6631784380bcef27860b54c64f419ca18ad77f092f4520dec47b10f4
-EBUILD xlsclients-1.1.2.ebuild 359 BLAKE2B 0d8ea6cae585681c224caf70c1d452f7f02e9660430db8cb7db97f50bf1ba8ef23a5f8144c47e9d06611c146233e4f4cefdf1453bc172da7f0f66de9e022aac3 SHA512 f20475c6510d02d85480f2d776ad626b5bb075c1fcf20c3e2341c688b1de868fc4c24f2756802da2147e1b67affd419dbd83ded9bde697e84b6d9b70250a1aad
-EBUILD xlsclients-1.1.3.ebuild 368 BLAKE2B c27f85d6e4530d27f6593b8c752dc9d8effa2b2c8b7065706e1343b76bca0c8ab0f32868920470fcda5c6bb357c596d720f2cbcc465fa004f85793796e8fd3c0 SHA512 dac8507547f2304debe0eb4e1a0184d5b97b5027866a53e22c967b1ce79e5c0c1e318bb55f3b320506de2f557b3363fec7922b7634d7019e6591c1d94791a287
 EBUILD xlsclients-1.1.4.ebuild 368 BLAKE2B a0dad845d6992b8094d64d6d346bec86d8db9dab2c681272d2c3d9ee553207c18b6b64817ca23e5973f977510d88b2ba6db9c18ed291fe6072a7139a220bd4a8 SHA512 7b081c2355561c4498410a86a1149a5d6b460674bdc2f5c2e8ee1d56c81ee2f2400eb85e1a424be7322af595ffaca96e2f8ea48cf1b3f3d418dd736f43ad201f
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xlsclients/xlsclients-1.1.2.ebuild b/x11-apps/xlsclients/xlsclients-1.1.2.ebuild
deleted file mode 100644
index e6a230099598..000000000000
--- a/x11-apps/xlsclients/xlsclients-1.1.2.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit xorg-2
-
-DESCRIPTION="X.Org xlsclients application"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND="
-	>=x11-libs/libxcb-1.7
-	>=x11-libs/xcb-util-0.3.8
-"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xlsclients/xlsclients-1.1.3.ebuild b/x11-apps/xlsclients/xlsclients-1.1.3.ebuild
deleted file mode 100644
index ba85c829520a..000000000000
--- a/x11-apps/xlsclients/xlsclients-1.1.3.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="X.Org xlsclients application"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND="
-	>=x11-libs/libxcb-1.7
-	>=x11-libs/xcb-util-0.3.8
-"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xlsfonts/Manifest b/x11-apps/xlsfonts/Manifest
index 3a52ac8111e8..5bbbb2f1b38b 100644
--- a/x11-apps/xlsfonts/Manifest
+++ b/x11-apps/xlsfonts/Manifest
@@ -1,7 +1,3 @@
-DIST xlsfonts-1.0.4.tar.bz2 124533 BLAKE2B 44f5671b2f63253fd98d0d6a64208916029786c0bfdef700bcc6977f319d3d8525d41438a2f3924f364c61ff81a3ce3fe8a8626af87ea832a74ab2dbc3ecb96a SHA512 e4cc52ce2f677f9a90e0924dac15a732c3bba584e2513fc68a4aadd46c6d2f56401fb1128ac42e8b569b722023053e07933d2d7bc45f18b7c8717c667d260c4e
-DIST xlsfonts-1.0.5.tar.bz2 131072 BLAKE2B 9785b22f25b552454fd7e67f9617b32fa4047dbb72a6f2898444e0930e604705f5ee8683b7df3574a055e210f1c316e03ab942f5d7ff4884b23d9834a4592a4d SHA512 e20f9efa0fa33980486671abd4ef59a82fd3df033d9c1b24db8c5b2b27ada93f03dba1e3ad586a35f3b7893bef5e8f14186f1914ab3507862cce4e104199a490
 DIST xlsfonts-1.0.6.tar.bz2 133500 BLAKE2B e21b5776ca02c5fe07ba80c2e845fd04d75642ed7984080df3402a478748e4bea00f93134eaf359da9d5223be6bf98224067bd3413c072c2f38bd589fdc90328 SHA512 052a3b1dec23cb20fdfacd4500cb836feb3b888bf568a548ea71deb58a4ba10a1ad5392d658e95272c6d4a1832edf1f19c3de2498b78dca82c43ee52800a30c0
-EBUILD xlsfonts-1.0.4.ebuild 351 BLAKE2B 6442bd1727411b36f683e845a170e21efd68ca7f917997ec62ba94be6f8681cde115db4c30c99c993da02f411c9d223c355d557e12b87a0ce01ab471b0e5474c SHA512 61603c2404e6f7331ac51c0b57ec455df9475abe63b16501163ce0680d91f72b45f57ae788b9b382ee40ff35ee09b223f5e7b89466348b30ce39aeb548f485f9
-EBUILD xlsfonts-1.0.5.ebuild 353 BLAKE2B ac1dede047be48a809541e35a300e3a11bf0f43f2ed7af28129251a9b801f675cb3b203be9081f39d44d3e42003bd9487bab6feb701bb2d315957e6817b27718 SHA512 2e49a32fc545cfb8173ef9b5c9d1f6a6012c9ad595f9958d18c36722788b4204b8301b225766304443a4705733b656aeea81ef728c8169b5741fee976482ec32
 EBUILD xlsfonts-1.0.6.ebuild 353 BLAKE2B 0a428203e819410d789160c8f3d36528bc9ceccc88fcbf987daa3f2fbed03f7816ad680ca19bf9738bdf809d3a185c4289fd5e1760884a340009f6fd2f26f753 SHA512 150761d9db5c4b4fdfe1535554f80c9a42ff90de65dd815d0da707b1e7369cd67e0fec218bbe291e0082f92a219da1191dbf616d7729468abf2b7a0b5ae13127
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xlsfonts/xlsfonts-1.0.4.ebuild b/x11-apps/xlsfonts/xlsfonts-1.0.4.ebuild
deleted file mode 100644
index 2f2e1d89f6d4..000000000000
--- a/x11-apps/xlsfonts/xlsfonts-1.0.4.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit xorg-2
-
-DESCRIPTION="X.Org xlsfonts application"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE=""
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xlsfonts/xlsfonts-1.0.5.ebuild b/x11-apps/xlsfonts/xlsfonts-1.0.5.ebuild
deleted file mode 100644
index 9cee87cd6cda..000000000000
--- a/x11-apps/xlsfonts/xlsfonts-1.0.5.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="X.Org xlsfonts application"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE=""
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xpr/Manifest b/x11-apps/xpr/Manifest
index 9b162a1e7deb..baffd091a1ec 100644
--- a/x11-apps/xpr/Manifest
+++ b/x11-apps/xpr/Manifest
@@ -1,5 +1,3 @@
-DIST xpr-1.0.4.tar.bz2 143144 BLAKE2B 0c336de348effdd7594e499fd6516c62bb7769f0e8437a446a16433beaf4a8e237f3f054f73dc56bd333579331edf0fead46e158d9c1f401f3c56f2d9957c978 SHA512 4b88b71a6da835b8f27b185510cff6bc6b260e009b31b9118f12d77d37e660606654ff7ebd50014ff13f15ca74011cd3ffc12a417cea5e38d6d29ccc820a2957
 DIST xpr-1.0.5.tar.bz2 150714 BLAKE2B 89d20134a3a9a12e319d343ae20c3aac71d1d2d2cbbffe1ff71375211efb3a4b22c2d99099fb1621fba838778702cca8c088181218c5d2c5fcb6af706d23b359 SHA512 d5dfb936ec4ad0067d02654dec8e862fe337ff6a2c2f974b2b3a612a829c2e728a0d51e7aba00ed2a94dc96dc50cc69f2c59f522e0635013f5f4f5bb3f4ab967
-EBUILD xpr-1.0.4.ebuild 338 BLAKE2B 06ffd4e19f34eed52fe1ccace1c93c19b9055512da4bacaedd809ef5dd4bd179542c459cfe4807b8c5a52d16075019381efe5e60f385f04f9b2a6f119e32dee9 SHA512 3ed52e0c001c580d202ac6f824681551f60de13ee2744e3e0c2cebf320eebd14c7b6d467fe10359f4e7965cc79ff89fb8ab949aee29d61e143db1f44a9f06442
 EBUILD xpr-1.0.5.ebuild 338 BLAKE2B 79f2dacbd340edf6eb1c37de1cc99f9195f7688163a5392de1fa115877980e5a41d4adaf3131b9123a1d06a0374fd4770c58f935732ec00b1daf8d1782409974 SHA512 6e4d69ad739d5610999aa1cecef558f6151dcbc21117b908a62cb7ea4c434d0500654e8ed1f12b545bb5977b22874bc0054ecabd9273fa5ed45a2ee587127e5e
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xpr/xpr-1.0.4.ebuild b/x11-apps/xpr/xpr-1.0.4.ebuild
deleted file mode 100644
index 12163336328c..000000000000
--- a/x11-apps/xpr/xpr-1.0.4.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit xorg-2
-
-DESCRIPTION="X.Org xpr application"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-RDEPEND="x11-libs/libXmu
-	x11-libs/libX11"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xvidtune/Manifest b/x11-apps/xvidtune/Manifest
index 3ce581832831..f82d4e490bc8 100644
--- a/x11-apps/xvidtune/Manifest
+++ b/x11-apps/xvidtune/Manifest
@@ -1,5 +1,3 @@
-DIST xvidtune-1.0.2.tar.bz2 113117 BLAKE2B ca6c59d1554370bbee31b508fe291049592467d5228e3e5355f8e6b45193c9a683df35c75ad4c66e399bd5a5a9fcb9c044603d27a5b1d1d4fafad58fbe3b837e SHA512 4afbd4739e9fd1f94f7c5694a0bf4f7c90deba8e0b34ae446b49058293ccc90f27d0b3da2a134e1724f87183b8bbef73035eaf8c82fc11094e85b6e84c773276
 DIST xvidtune-1.0.3.tar.bz2 128492 BLAKE2B 87271fa736f1c377f48f36fbb63a28ad0e6327ca612b681328aec44cafa839f5e1c04b239907e25f547b5a69e7dbd92bccd3500ed20760efcf18fb570078241b SHA512 0f8a4fca1b544ef8f9623246fb0ece75739a0889f2e729c040cd768c595f0bbbfa3a665576369032535c34c7d55784a29b62f0d51432bf2b75d2cec619db7352
-EBUILD xvidtune-1.0.2-r1.ebuild 385 BLAKE2B b9524abc47248e1bb9e44da0ccd86bf887571d70daf94352d0121117099424046d4ae06d541d01d0b9430cc415c82d7d07a2d8f928307cfab8eeb51e2d8862fb SHA512 7c1ff2ad8d4d65c7426263d5bba9cab38ec8ec5b99ba988f33d1e8014ceb63914da86985e01fe2fb75f0cdc99c662b2d4c023fdbc0e60ee0577ceb2045dfdf16
 EBUILD xvidtune-1.0.3.ebuild 387 BLAKE2B afed5e237a469f6578311fc545f2869865a3bbe87a985f4d4373ade1d1fc12365b1dbe42ddd693e074ff9691676b873b287de6f6fed951d9574ec2b17fac65cf SHA512 5bac1f6468e9a5a85bdaf317e6c6c394d12d85d726515e4d22ef0e377cbfe091897bfa9bb9728b830fcdde72bc51be88c03fe44d171b9c54c1e270bbae634eec
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xvidtune/xvidtune-1.0.2-r1.ebuild b/x11-apps/xvidtune/xvidtune-1.0.2-r1.ebuild
deleted file mode 100644
index 2da520d4712c..000000000000
--- a/x11-apps/xvidtune/xvidtune-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit xorg-2
-
-DESCRIPTION="video mode tuner for Xorg"
-
-KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 s390 sh sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libXaw
-	x11-libs/libXmu
-	x11-libs/libX11
-	x11-libs/libXt
-	x11-libs/libXxf86vm"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-apps/xwud/Manifest b/x11-apps/xwud/Manifest
index 7b0d8180d856..e4d3a8eb346b 100644
--- a/x11-apps/xwud/Manifest
+++ b/x11-apps/xwud/Manifest
@@ -1,5 +1,3 @@
-DIST xwud-1.0.4.tar.bz2 124604 BLAKE2B e2c39708777b3f05f4013bf82598d0d33b4a8a69706467e3dad873f996375e9636a9662c9b939855d36c64a9bc03bd7b12e994541da08de8b126e4b170762dfe SHA512 f3ef5fb0dc9c9e3dc3acfa597c1332263f62be5e524c7512600106e9d8eb5733231729853f6b123205367db52cb0a567320dff65d29743bf892e237795ebee57
 DIST xwud-1.0.5.tar.bz2 133376 BLAKE2B 27ce8251ae2a2a87393655e1824121dd54f75839a8066405299e9052bf2c55c6946cd686f285dca1d7339029d8ca8b94e4adb3efb485b42bd347db212b12858d SHA512 27a0ce7481978ae6cd94b0d94374af72185e270d68f2496620e148bb00945427c4827138d9efc48745e6382e3da3390ed0cdff7dbd02dcf9706e8ecccae97184
-EBUILD xwud-1.0.4.ebuild 324 BLAKE2B 8d0f5d1e95f0fda4163597727a922e86856a73c942a8a69c00154116349af9d057bf5f6b562f45306bdeed0367e69a604ead79f3ed839971c3cce239cc035117 SHA512 203269ab64350ee68c3b1f1cbd98401c1da694f4bc92c20ac4321d0c1a28c4800f39c8d3308adca9fc0386a0f78fa4eb8a5c418447bb14d26826e9c59158b8b2
 EBUILD xwud-1.0.5.ebuild 324 BLAKE2B db3bcd404f1a7278169c66d46f988aa190c4ea5d0ef6f077e9ec2d2d51cea5c8ba15ed05e818af678ce4ab42bbb67594f435c00ba7d055b24affc4140c84278f SHA512 e87e43cc386af70fe3883b1f2900233386b2eacf9ad9dbe817cafc83346fe338682c7baa847bc7647f68393246efb7000ce53b957a61fd71723c4303837042e2
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xwud/xwud-1.0.4.ebuild b/x11-apps/xwud/xwud-1.0.4.ebuild
deleted file mode 100644
index f345b2edc8ce..000000000000
--- a/x11-apps/xwud/xwud-1.0.4.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit xorg-2
-
-DESCRIPTION="image displayer for X"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}"
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index ce4027f899ce..c8c92af9282e 100644
--- a/x11-drivers/Manifest.gz
+++ b/x11-drivers/Manifest.gz
diff --git a/x11-drivers/xf86-input-mtrack/Manifest b/x11-drivers/xf86-input-mtrack/Manifest
index c045afc19b4f..539dee9aefd4 100644
--- a/x11-drivers/xf86-input-mtrack/Manifest
+++ b/x11-drivers/xf86-input-mtrack/Manifest
@@ -1,8 +1,4 @@
 AUX xf86-input-mtrack-0.2.0-drop-mtrack-test.patch 370 BLAKE2B ae2e56bcb86898269157f9e2af597aa9896170288b437f68b2cd3496264a66fd4e6edf9807a85ebec7c6374c8fa11103dded89046255a0d9fd405d45511f3622 SHA512 368c407119963e432ae10c058c40b026099bc0359b23a888f5d72909e30189354e2620692516eb919648217bf48b7939b736784208beae7cc8f356cfdb10deb0
-DIST xf86-input-mtrack-0.3.0.tar.gz 35826 BLAKE2B f3c1c169ab1e12320214ee6f6ff319f2057333645c312a0ca12e99e7bdf94d99b3008291bc965fcbf5c37919993c97c7c46e4a88b118a2aefd0d619bfdfdf593 SHA512 68422f04ce0b73473cbb4dc7e920dedfce2c91ece1ee59e84dc7f7be5d8e77a2c9b2284dbaefcb0b08ee14868e204c5841fd05320129ec56b33e6ee352c04688
-DIST xf86-input-mtrack-0.3.1.tar.gz 370599 BLAKE2B de31a7b39f7c647d296deccdf0f3ff570bb9b45e89eeed8fa3a40278724d2229a952f51fddfcb39b3660654d04a74119eb34b0bdeb5644b2f3d7061e3cc428c3 SHA512 b8615970092138a7d3670a9783ac29bd57e8f86312af722e6439ef55ca5812a33bbf8460adda1931699084e8a56601c02f307d375e54723857a47f934718a448
 DIST xf86-input-mtrack-0.4.1.tar.gz 386733 BLAKE2B 6d7a49bd34894df6e88a900a86eb249a69a396d046776dd801b41a4ee505d07145f7ce66c2a83a21fa209cb78c6d709fb697145a30cf5cb5f78badd589844bd7 SHA512 2c517b27f4915978a01ed1d6d63f156b84c4eb1006a5e972183616a01c6d672fd7bc1c248ae22dcb09024be670afce1130c8fd8325b015811d58d020f244f010
-EBUILD xf86-input-mtrack-0.3.0.ebuild 1024 BLAKE2B 6261db42943a13c9fc5405b63c989b4cad1f27cd0bad193cdc1e7404c3465d16ea55d824433bccc214177bbed21f06b97a6724487c3b7ae4e19b2490af7f0a66 SHA512 ab788192bea1ffec75609d4de991cbd3757008ff7b339c46eadf026b2dfc8ecc7432cb9273da138611c161f771bb38959321fdfb704eb8a95568446f527f62e9
-EBUILD xf86-input-mtrack-0.3.1.ebuild 1024 BLAKE2B 478e491530a5a29253e9c29644777f6981f53ab623b934ae5108f58132a8eef1a5164f8006880382f03ca56110db600246c161b44f2dad4c71b5a42b9482b13c SHA512 a4997d874b2688881787ce2197c1a94906967519b1eb09e2d8e1bea85fa3a7a8d946443c168ab68f77df4d347f66e52d8c9b2c280c66ab5b7badf7f744dd7378
 EBUILD xf86-input-mtrack-0.4.1.ebuild 875 BLAKE2B ec2bcde3aba6c698bb84932cd566d1b7c377973e5a54d13f74ee5780fcd6d840df30795c3f5f23ca0db20f6e72b8b32acb71949be8b54c0137a0021bb6f2b07f SHA512 fda127708e6bfd937e3edf1bf91fbede89fb7aa99923633f8922418a2aa699885dac433edfc2eba5662ef09d8f3a4f81a66b03536885dd838a521109ec103b2b
 MISC metadata.xml 419 BLAKE2B 35638a571f1318d04069535dc93b5575c22eb3178f13f7321e5e709143a04c5263f8986975967180d9685f34f25865104a5415a3888b5dfbf87b1397a31d846f SHA512 ea5d21be0cf5020e2a1b8d6d342e1ba6c95946a2a6a00df69ae43b4d022fefa452ccd2d1ae1be619a72f7e7fb8a0c124f2b2655a2779ee28451fe0e493a7e5be
diff --git a/x11-drivers/xf86-input-mtrack/xf86-input-mtrack-0.3.0.ebuild b/x11-drivers/xf86-input-mtrack/xf86-input-mtrack-0.3.0.ebuild
deleted file mode 100644
index b9798eae3c3b..000000000000
--- a/x11-drivers/xf86-input-mtrack/xf86-input-mtrack-0.3.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-XORG_EAUTORECONF=yes
-
-inherit xorg-2 vcs-snapshot
-
-DESCRIPTION="Xorg Driver for Multitouch Trackpads"
-HOMEPAGE="https://github.com/BlueDragonX/xf86-input-mtrack"
-SRC_URI="https://github.com/BlueDragonX/xf86-input-mtrack/tarball/v${PV/_/-} -> ${P}.tar.gz"
-IUSE="debug"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-
-RDEPEND="${RDEPEND}
-	>=sys-libs/mtdev-1.0"
-DEPEND="${DEPEND}
-	>=sys-libs/mtdev-1.0
-	x11-base/xorg-proto"
-
-DOCS=( "README.md" )
-PATCHES=( "${FILESDIR}"/${PN}-0.2.0-drop-mtrack-test.patch )
-
-pkg_setup() {
-	xorg-2_pkg_setup
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable debug)
-	)
-}
-
-pkg_postinst() {
-	xorg-2_pkg_postinst
-
-	elog
-	elog "To enable multitouch support add the following lines"
-	elog "to your xorg.conf:"
-	elog ""
-	elog "Section \"InputClass\""
-	elog "  MatchIsTouchpad \"true\""
-	elog "  Identifier      \"Touchpads\""
-	elog "  Driver          \"mtrack\""
-	elog "EndSection"
-	elog
-}
diff --git a/x11-drivers/xf86-input-mtrack/xf86-input-mtrack-0.3.1.ebuild b/x11-drivers/xf86-input-mtrack/xf86-input-mtrack-0.3.1.ebuild
deleted file mode 100644
index 08cd6a90bb42..000000000000
--- a/x11-drivers/xf86-input-mtrack/xf86-input-mtrack-0.3.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_EAUTORECONF=yes
-
-inherit xorg-2 vcs-snapshot
-
-DESCRIPTION="Xorg Driver for Multitouch Trackpads"
-HOMEPAGE="https://github.com/BlueDragonX/xf86-input-mtrack"
-SRC_URI="https://github.com/BlueDragonX/xf86-input-mtrack/tarball/v${PV/_/-} -> ${P}.tar.gz"
-IUSE="debug"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-
-RDEPEND="${RDEPEND}
-	>=sys-libs/mtdev-1.0"
-DEPEND="${DEPEND}
-	>=sys-libs/mtdev-1.0
-	x11-base/xorg-proto"
-
-DOCS=( "README.md" )
-PATCHES=( "${FILESDIR}"/${PN}-0.2.0-drop-mtrack-test.patch )
-
-pkg_setup() {
-	xorg-2_pkg_setup
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable debug)
-	)
-}
-
-pkg_postinst() {
-	xorg-2_pkg_postinst
-
-	elog
-	elog "To enable multitouch support add the following lines"
-	elog "to your xorg.conf:"
-	elog ""
-	elog "Section \"InputClass\""
-	elog "  MatchIsTouchpad \"true\""
-	elog "  Identifier      \"Touchpads\""
-	elog "  Driver          \"mtrack\""
-	elog "EndSection"
-	elog
-}
diff --git a/x11-drivers/xf86-input-tslib/Manifest b/x11-drivers/xf86-input-tslib/Manifest
index bdf48f518d5f..1615a574bb56 100644
--- a/x11-drivers/xf86-input-tslib/Manifest
+++ b/x11-drivers/xf86-input-tslib/Manifest
@@ -2,6 +2,5 @@ AUX fix-overlapped-variable.patch 485 BLAKE2B e7fd7e023965a2a193f6fa4d1f428ca30d
 AUX xf86-input-tslib-0.0.6-xf86XInputSetScreen.patch 782 BLAKE2B 71c706b4d4e01a9257b56e1c0d2245e78c2e1fcea34146312ad6d57b48d3e4196e14b36143677c69ae2fe7dd158b27a11337d594e222ac8cdd40b6c40f58e494 SHA512 264c921d12591795e8b04c22a7f3b85e63605b3bbc2aaab8418b61ac6ebeb3683bf4e357dddea6c73d416d233bc4d1249f3af17011cc542880772a885c7f4d28
 AUX xf86-input-tslib-port-ABI-12-r48.patch 5306 BLAKE2B e5421a0cf4f0fd645d61777eb7cadf444dd04989eede04b7766453940b65d3a319ec72f57838be14f106215b6aaf5aebd7af73b28dc02b2cad7fcb8e014eb4d0 SHA512 9cdd4c47e8efa3560dd0b508422322f0f4185f4359d98cd7d5c06394bdf096de23e42c5af9f682c457d44831091823867233ced8c6329d2776cf3b5b6bd1ba34
 DIST xf86-input-tslib_0.0.6-3.tar.gz 307751 BLAKE2B 05037c2ca9339245b0987ce7e0121f4825a840dab24e60ce901d290b13841a3843d6c93ef9910db92d47418d649189d78e18e26ec248c4ff9ad1131e54b81240 SHA512 abc6060ba595790dab02a191861ee128a729916a6ea2df2a818a0b3388839dac933a0d7ee5530735f376f917f33bf8db40d42a7dce90b20a7682344370bc7b48
-EBUILD xf86-input-tslib-0.0.6-r2.ebuild 727 BLAKE2B cdb2e464846235c6e37088c6771740a6e92d410d41c690587f5d03ab03dfcbde6c4aa279f053164c1a7e6734028409b69cffefca57aead2869dc4cc4897c7e67 SHA512 e04f9672b3bada3400e70aaa225075a20858eb96ad7b511348d75e60ba3ecf6c4354e9beca124cf0655e84fbff4a1d1072ae612e6beb0114b9eac3339a8eda6f
 EBUILD xf86-input-tslib-0.0.6-r3.ebuild 781 BLAKE2B 3b4040ab660975e9135dbd8768e2832f297571fe85cc6f2cba83c8abc89e9323780d6de62a9ba989a0db8c8e34fa8b26b3dfb3a8cdabab33f1448c7e96e251f1 SHA512 c7b8f2629e3d4517c5903ff5ca758dff7ab780b3400c94a61a309706d3cb1c465804919cc59fa5c3942b5dc66dae11b5cd8c545935dd468beb9f31e0d28dce25
 MISC metadata.xml 338 BLAKE2B 3f7f7614c07d92a52a1499634820de2891cf891fd2c86230b69a99b83afae1af395ed8eaabd32b4b17b19b3ffcfd717ea6e7963beb18dfca0ae3db77269eeb87 SHA512 cf7eafaffce2e1064714ac53d374fcb81a4a77cf7a3b9826c595b0b40a01a54b0280ecf4c824b8741b09893d770e80495084ede42281242959f283b5c0d51d2c
diff --git a/x11-drivers/xf86-input-tslib/xf86-input-tslib-0.0.6-r2.ebuild b/x11-drivers/xf86-input-tslib/xf86-input-tslib-0.0.6-r2.ebuild
deleted file mode 100644
index 7956b05629ed..000000000000
--- a/x11-drivers/xf86-input-tslib/xf86-input-tslib-0.0.6-r2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit xorg-2
-
-PATCHLEVEL=3
-DEBSOURCES="${PN}_${PV}-${PATCHLEVEL}.tar.gz"
-
-DESCRIPTION="xorg input driver for use of tslib based touchscreen devices"
-HOMEPAGE="http://www.pengutronix.de/software/xf86-input-tslib/index_en.html"
-SRC_URI="ftp://cdn.debian.net/debian/pool/main/x/${PN}/${DEBSOURCES}"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/tslib"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-S=${WORKDIR}/${PN}-trunk
-
-DOCS=( COPYING ChangeLog )
-
-PATCHES=(
-	"${FILESDIR}"/fix-overlapped-variable.patch
-	"${FILESDIR}"/${PN}-port-ABI-12-r48.patch
-)
diff --git a/x11-drivers/xf86-input-void/Manifest b/x11-drivers/xf86-input-void/Manifest
index 67e89a7fbd21..98e9be72a47f 100644
--- a/x11-drivers/xf86-input-void/Manifest
+++ b/x11-drivers/xf86-input-void/Manifest
@@ -1,5 +1,3 @@
-DIST xf86-input-void-1.4.0.tar.bz2 273454 BLAKE2B 1fca3285d5ca6b75ee3f53dec4f5768130aea10467fde3dfb3ae49afb41d45dce52635cbf79525ec497a2da5f6a093652a46c44a04997c73ce2dbbe1cdbaf388 SHA512 f7bc9820f93b266ac5b9c3e03c9921cc983c566df0ef195fff18408aac5dd2866b4a5bdbdeb69ac1f9af81c61abbf0c8b564299e5b5ebbcae9a27574843c0c85
 DIST xf86-input-void-1.4.1.tar.bz2 271597 BLAKE2B c78d829dfc9aed788fc2e527f796c697546dfa9687189f5f36043fb017515307303d1bc419458e909107fdb30f6f534e9086e86708d4b8bf2447ed941d223011 SHA512 3cbcba9510635fc4a3b610fb940584417d4b3fcace88670b1289906a7da15614e9a286590cecd1840af4bb3bd0c62f246522b1203700067ec384c3cc11b7e94a
-EBUILD xf86-input-void-1.4.0.ebuild 346 BLAKE2B 6946f3aa0180da8024b5cf5b83024d8eabfa6472124d47672c5d837d6e25d665e275e1aba3dc0bc43b51d169c73177ecf82f0239865e71655a64233b97af5c4d SHA512 5ca1104732dbed745cf67420f77b2ef5160a8ed9c4bbc30055ce8ec307b64aadd7c222a69237bb7eb864c088f7313072f3d69efa941a3cb81c0bdb1cae5a799d
 EBUILD xf86-input-void-1.4.1.ebuild 355 BLAKE2B a37dae8a82e881b740502836fee20230b3e2eee54a7613cee5f5ac5c8340f968cd83d9e30fc18d3c10dc7204276c7c977d03b36d359c9569645aa056bbe6f2c7 SHA512 58d7d7b89670e2968889fa3d98cc84c69d4165b48ccd48e68105657443fb3218b3467cf9c0ad62893b05546218308c451968766c92ac94660bee51a93cf4164b
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-input-void/xf86-input-void-1.4.0.ebuild b/x11-drivers/xf86-input-void/xf86-input-void-1.4.0.ebuild
deleted file mode 100644
index a818a53418a2..000000000000
--- a/x11-drivers/xf86-input-void/xf86-input-void-1.4.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit xorg-2
-
-DESCRIPTION="null input driver"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=x11-base/xorg-server-1.9.99.1"
-DEPEND="${RDEPEND}"
diff --git a/x11-drivers/xf86-video-dummy/Manifest b/x11-drivers/xf86-video-dummy/Manifest
index d92bf8d6fb53..0ee0ae36505d 100644
--- a/x11-drivers/xf86-video-dummy/Manifest
+++ b/x11-drivers/xf86-video-dummy/Manifest
@@ -1,7 +1,3 @@
-DIST xf86-video-dummy-0.3.6.tar.bz2 285892 BLAKE2B 79fc1915cad3055715529da2254be87cf1b490e757ad6521121ca3957f4d97e1db50e4bebafd0b203ff40af49f096f6f2da1e982f5550eea0ad13f192f1f3fe3 SHA512 3a530083d591ebde37b58a329d9a6ed4955d09d8f3f7fb566840681f2588aa752014c8753f411aec0410a2704b3b55729868a27aee138df42eb7d7bb5a5a52c5
-DIST xf86-video-dummy-0.3.7.tar.bz2 279806 BLAKE2B 0f1f05ac5f9d75a3fd141e98712bd15b3dedf3bb5f3f031254e6864d8fcc1d3dafc4c3165b3f1d5dada3adb03586f4de620bc2b8b91dab4b840cfcd50b6bc6fc SHA512 2893964f19901af0b18417a271a3418c5adfaa311cd1688c159b86a7bdf68517d53d98a9b2c1a9942c7d2cde8ccb742832fd78c2ab0aa29844d261b9334548ec
 DIST xf86-video-dummy-0.3.8.tar.bz2 302353 BLAKE2B 1327db3aeec2ff7e3ff0876b25eace6fcdc7fc428967dee9f0b8ee4c22dd7904dcb47d5433bdc14ab56638225b2d33f3a26543dc9e6041c60af4135c1555f798 SHA512 f534113fd9987e44d2e0d0c53bd1b71be4ba69ec239ecec4aba8fcdcc10597722c54cbc01da38e0975ac7660e4e4028330e4cdd369e755c25ec059d2dfabad80
-EBUILD xf86-video-dummy-0.3.6.ebuild 489 BLAKE2B 511326e8f1741bd4bb43b4c67fbcc822e1bedf07e1a78d2e01b151c42d4d76d94ee489671ef11243a7d1e64c7b1fdd53b1b1ca6767fcb1d296fb5fe421254278 SHA512 77fd5a7b7132666e21292e8098a9f54c666c338761b069581a889f699d309262badc4871376aeb67c7ae983a7344b33ae53890090301fe54306a40ed90dc04c0
-EBUILD xf86-video-dummy-0.3.7.ebuild 498 BLAKE2B 3cacc8ab7a4cbf507ea30947b4f44a37ca87bbbadcfcd3d8170c7c4918178fef3e175ec5917e58efe66e80b55462db823728db4516c1deaf6e574004020e0ad1 SHA512 9f6ce83887d3cf6946fb613e2130cd7bc8bd56ffe3f26ec3b8468bec36f112d3deb7028903b9ceb03355b207a21a45b41da652520d3cf1af57dc8df1f2416912
 EBUILD xf86-video-dummy-0.3.8.ebuild 498 BLAKE2B 3cacc8ab7a4cbf507ea30947b4f44a37ca87bbbadcfcd3d8170c7c4918178fef3e175ec5917e58efe66e80b55462db823728db4516c1deaf6e574004020e0ad1 SHA512 9f6ce83887d3cf6946fb613e2130cd7bc8bd56ffe3f26ec3b8468bec36f112d3deb7028903b9ceb03355b207a21a45b41da652520d3cf1af57dc8df1f2416912
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.6.ebuild b/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.6.ebuild
deleted file mode 100644
index 74af38fe6fb6..000000000000
--- a/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.6.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit xorg-2
-
-DESCRIPTION="X.Org driver for dummy cards"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-IUSE="dga"
-
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	dga? ( x11-base/xorg-proto )"
-
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable dga)
-	)
-	xorg-2_pkg_setup
-}
diff --git a/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.7.ebuild b/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.7.ebuild
deleted file mode 100644
index 4a6f6c1a00f4..000000000000
--- a/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.7.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="X.Org driver for dummy cards"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-IUSE="dga"
-
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	dga? ( x11-base/xorg-proto )"
-
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable dga)
-	)
-	xorg-2_pkg_setup
-}
diff --git a/x11-drivers/xf86-video-newport/Manifest b/x11-drivers/xf86-video-newport/Manifest
index 56c3caa39234..b8db7cf0a243 100644
--- a/x11-drivers/xf86-video-newport/Manifest
+++ b/x11-drivers/xf86-video-newport/Manifest
@@ -1,5 +1,3 @@
-DIST xf86-video-newport-0.2.3.tar.bz2 266377 BLAKE2B af86a71e8c2377e5611817a05cd1ad32070149d131121123a83f8d3e9ace13675540769ec8299b9940d85ac86816a35fef7ffe03a3e2782b321cbde0301b1808 SHA512 7a3d26658f906fd2a8ac8d0fe44e2c2bd794eb291de8639b137a055d52f3cc447a3c269d50b897bb9d59da9253d555734764cb3fe42ebd8ddc58484d55402646
 DIST xf86-video-newport-0.2.4.tar.bz2 308541 BLAKE2B 3d5d1725b41f2a1128b804a904a31c684ce00bdc967940fbc01023d2960656ab41673cf265ea8dcd639dfedcb6cefa2f0e2fd2fc439cc8012c3fe3857796b1a7 SHA512 22f48068ac988c4dcf4a85b63704be86631258c145afe6df985fe4f60ac1848f14126d6d58f7d247b3d6e6169d2c3ef8dfbcdd4028ddd8366f06889854a0474f
-EBUILD xf86-video-newport-0.2.3.ebuild 227 BLAKE2B 0456a60a2ae7953d5f06c3ac6776524289828bab1c94aac6371ea391d8de8344d8937372c4e47e1af3df3e14e407608ccacfafb27fbac7cd9ee592204613f7f9 SHA512 87f57f2d09c9c6c6870abea9e8f7cf9ab9e28dba584da0f2fd5a3f037d244a76e7e6d1c4d499ef327c6f6ac722f0614f8eb04528ccc45b570225e8b6aee324f3
 EBUILD xf86-video-newport-0.2.4.ebuild 227 BLAKE2B 78bffa3d3f8c1030d93bb3c1a27bf3fe36f5c9af24de132258ca9250c13d1a3d89726ea3856a4e46edc96053908f6b2e8541d29b6ea9e073ffe68653f387271e SHA512 65c1f30cb7bbc10512bed599633b0e843bd0fa35c7c7ad208a3b51b189d53c044dfb355b16438dae7d392655408bd85a73ba70e7d47fc0f8cf2f5ab24261e641
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-newport/xf86-video-newport-0.2.3.ebuild b/x11-drivers/xf86-video-newport/xf86-video-newport-0.2.3.ebuild
deleted file mode 100644
index 30e7631cedb3..000000000000
--- a/x11-drivers/xf86-video-newport/xf86-video-newport-0.2.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit xorg-2
-
-DESCRIPTION="Newport video driver"
-KEYWORDS="-* ~mips"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 6942d8c7b9cb..a481efa87d2a 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/gtkglext/Manifest b/x11-libs/gtkglext/Manifest
index 9b9288890363..f803a3ea2e05 100644
--- a/x11-libs/gtkglext/Manifest
+++ b/x11-libs/gtkglext/Manifest
@@ -1,4 +1,5 @@
+AUX gtkglext-1.2.0-gcc8-fixes.patch 791 BLAKE2B d0f17c83bccd6e92c640383fecdce384cd0ecb92868f3f70d87b16aed8a85357e9391134c3c233549f7471d64e02416bde03ff92028d8d2f19eacd3802542875 SHA512 b6240ce1f293e3bd37d71a09233417c4acfa2a7fce05ba65ba364181e6075f86fc72797586b93fb81e057ab8de2191ad345415bd6cc6e29e38945cfb4362f3cb
 AUX gtkglext-1.2.0-gl-configure.patch 11350 BLAKE2B ad0cadfa12bda13866da64433935520bcbb77a9fb430640d31c66b14ffb867a1ae1cb236e459b9d13c0493279185dbe8c8eddafce86abd14b2ab4b2d0a59a0f9 SHA512 b164b8e64ff8fbe6d9b3437100c35d1352056094c4395fc1df4a40d8c91edf7543317ec05e3a05af1da9fe432817e312e7a8fc80fd3343824365d4579046f8fb
 DIST gtkglext-1.2.0.tar.bz2 703821 BLAKE2B 985d84cf1b87a23cfebcf536cecb087bbfd050f5131cf70b2a09e9a2e556e7f2549ed1b4b26ec6eccf790a383e3530d27171a553145614b641437c7c2d8462b5 SHA512 c5452b7594195da3c1428dc3021a041d70bb8079a514b7310fe7b66f638748ad2399adead36047b52b60b033757581e72f0532c0301e033019bf909f7365071d
-EBUILD gtkglext-1.2.0-r4.ebuild 1795 BLAKE2B b2882132e9958df3a866ad65dcb00340a2b8c2a804f23d00fe51fc69e49bc73ee1dc10a2a3eda92943214b15282162d3bec5cd4e352b975ae791f5c5e4a4586b SHA512 0b584c4b4a2971dbf511d174555cfaf2ee2d4df7b706bf3a20bd3983a0d7e39028ed24c0a21cd48a77d4d8813e519942d0f1e864358dc89045c4118fd072a667
+EBUILD gtkglext-1.2.0-r4.ebuild 1554 BLAKE2B a337a17177ec9a90e7218a08a20cf44469644202aa95719fd34a1223f85f3a20854c936c2a26281e05f1616389916c677b88ab416706a17fcfb7553b3eb90530 SHA512 bdd055aa81a04be324a555e501e372eb5d7640f4b7ac19b8e40107dfe3a206e7fc28ee4f11bf627d5fa9792882da0b7bb6d5a18e1dd6b26fb9247a4ffa7b3608
 MISC metadata.xml 331 BLAKE2B 214f9245eccb98bed5314d370a2e16d8605c46629c656c05a22c1a037e7aeeb9d3255f24203405b148fc73276241db48243303a86abea879c08a944025cc51b4 SHA512 8c9768b7a27485752cb816de376d4e9e352e6522e42eb489d41aab48f0fd47541483913c7fec9ec4bbdfea3aa846c35bedab83ac2524901635337a7111f14ab9
diff --git a/x11-libs/gtkglext/files/gtkglext-1.2.0-gcc8-fixes.patch b/x11-libs/gtkglext/files/gtkglext-1.2.0-gcc8-fixes.patch
new file mode 100644
index 000000000000..266f5fefc1ed
--- /dev/null
+++ b/x11-libs/gtkglext/files/gtkglext-1.2.0-gcc8-fixes.patch
@@ -0,0 +1,34 @@
+From 1fe275cd7dfa9f3a6db771b0cb945d96787e72cf Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu@fedoraproject.org>
+Date: Thu, 15 Mar 2018 15:56:20 +0100
+Subject: [PATCH 2/2] GCC-8 fixes.
+
+---
+ gdk/gdkglshapes.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gdk/gdkglshapes.c b/gdk/gdkglshapes.c
+index f72abba..9d1197f 100644
+--- a/gdk/gdkglshapes.c
++++ b/gdk/gdkglshapes.c
+@@ -544,7 +544,7 @@ static GLfloat idata[12][3] =
+   {-Z, -X, 0}
+ };
+ 
+-static int index[20][3] =
++static int iindex[20][3] =
+ {
+   {0, 4, 1},
+   {0, 9, 4},
+@@ -574,7 +574,7 @@ icosahedron(GLenum shadeType)
+   int i;
+ 
+   for (i = 19; i >= 0; i--) {
+-    drawtriangle(i, idata, index, shadeType);
++    drawtriangle(i, idata, iindex, shadeType);
+   }
+ }
+ 
+-- 
+2.14.3
+
diff --git a/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild b/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
index 518b12f06ebe..948cc280bb4e 100644
--- a/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
+++ b/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-
-GNOME2_LA_PUNT="yes"
+EAPI=6
 inherit autotools gnome2 multilib-minimal
 
 DESCRIPTION="GL extensions for Gtk+ 2.0"
@@ -15,35 +13,33 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
-RDEPEND=">=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+RDEPEND="
+	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
 	>=x11-libs/gtk+-2.24.23:2[${MULTILIB_USEDEP}]
 	>=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}]
 	>=x11-libs/pangox-compat-0.0.2[${MULTILIB_USEDEP}]
 	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
 	>=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]
 	>=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
-	>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]"
+	>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
+"
 DEPEND="${RDEPEND}
 	>=sys-devel/autoconf-archive-2014.02.28
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
 
 src_prepare() {
+	# Fix build issues with gcc patch from Fedora, bug #649718
+	eapply "${FILESDIR}"/${P}-gcc8-fixes.patch
+
 	# Ancient configure.in with broken multilib gl detection (bug #543050)
 	# Backport some configure updates from upstream git master to fix
-	epatch "${FILESDIR}/${P}-gl-configure.patch"
+	eapply "${FILESDIR}/${P}-gl-configure.patch"
+
 	mv configure.{in,ac} || die "mv failed"
 	eautoreconf
 
 	gnome2_src_prepare
-
-	# Remove development knobs, bug #308973
-	sed -i 's:-D\(G.*DISABLE_DEPRECATED\):-D__\1__:g' \
-		examples/Makefile.am examples/Makefile.in \
-		gdk/Makefile.am gdk/Makefile.in \
-		gdk/win32/Makefile.am gdk/win32/Makefile.in \
-		gdk/x11/Makefile.am gdk/x11/Makefile.in \
-		gtk/Makefile.am gtk/Makefile.in \
-		|| die "sed failed"
 }
 
 multilib_src_configure() {
diff --git a/x11-libs/libxshmfence/Manifest b/x11-libs/libxshmfence/Manifest
index 06b7fc6a8120..5681c408948d 100644
--- a/x11-libs/libxshmfence/Manifest
+++ b/x11-libs/libxshmfence/Manifest
@@ -1,3 +1,3 @@
 DIST libxshmfence-1.3.tar.bz2 308644 BLAKE2B 6e1e75fbe9d113cb258eb8f6a5106ea565f6749efd79bd3aa21222514063aadf8499d82d2a14bfcd0a69f7d4c4dce49a5efeb38d54d2019eb0c93345f0ba8a37 SHA512 c446e055f8fac62b9aa266132289a4cfc030282147974c45ce96d1768a98d1afb997470e58e4a68513174c404cbf373bdde2f0cd4b34abdbce1d89dd0b6fe2b7
-EBUILD libxshmfence-1.3.ebuild 426 BLAKE2B 6bdf3a30c37bfa20dd1b0df2b33e07ea683b5c84aa0dc3ba398e0cf6a5dbcb678bf1896e5aed707fb7326655be50fdffd93d1ebf17a75943580397529cca108e SHA512 4b3821f758847c1f19d64464e2b4eae8e20b44ca567e35211daa9efdbf5017eb2300f2fd9574aa5b413c604df143d33f09c6f66636e25e91f7e3560fbd48ce27
+EBUILD libxshmfence-1.3-r1.ebuild 426 BLAKE2B 6bdf3a30c37bfa20dd1b0df2b33e07ea683b5c84aa0dc3ba398e0cf6a5dbcb678bf1896e5aed707fb7326655be50fdffd93d1ebf17a75943580397529cca108e SHA512 4b3821f758847c1f19d64464e2b4eae8e20b44ca567e35211daa9efdbf5017eb2300f2fd9574aa5b413c604df143d33f09c6f66636e25e91f7e3560fbd48ce27
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libxshmfence/libxshmfence-1.3.ebuild b/x11-libs/libxshmfence/libxshmfence-1.3-r1.ebuild
index 4d71010ce83d..4d71010ce83d 100644
--- a/x11-libs/libxshmfence/libxshmfence-1.3.ebuild
+++ b/x11-libs/libxshmfence/libxshmfence-1.3-r1.ebuild
diff --git a/x11-libs/rep-gtk/Manifest b/x11-libs/rep-gtk/Manifest
index 71dfc9c9180e..a6ced3a0b19b 100644
--- a/x11-libs/rep-gtk/Manifest
+++ b/x11-libs/rep-gtk/Manifest
@@ -1,5 +1,5 @@
 DIST rep-gtk-0.90.8.1.tar.xz 251652 BLAKE2B b10a2a88b1950da4cb0f85d7dea53167184fcbf28a515b68de70f9ffc6e6cb9a2e2208020f8d6a9a52235cf4b1454901a0edeae990a2bb7227ba7eaa5da6db45 SHA512 033c148b34591672f29b0a1636b4c962ff82423f627243db07746899bfbf0ccd479322743d0822903bf954cdb3bae662ef7b2f8064cbe2741c5e8cf886e56d1b
 DIST rep-gtk_0.90.8.3.tar.xz 120616 BLAKE2B a0ada2bb13a8104d0dd532f35b64e6b049711284b60b4c4960b730909061ecce058a0ee79517cc508db95647d93f9af95c5ca73cf76e26b59467c8441064ac07 SHA512 d33de562c94731c0ce0fbca574952b9f36c2f2cb084783976486c8751daba5de0d20bc781a06ebd2005e541bbbec3f984453ef65ba6233bb7acfefa31b1acaac
 EBUILD rep-gtk-0.90.8.1.ebuild 1163 BLAKE2B 29f07de2e6265aa82b35d8d9398714edb2edb62c0f201632404428e5a12debbddc8bfc7dada51b30c8ec1475738b28a2e6e23a4cf41fb9e3681cd2c7631e658f SHA512 f66f4e7bad2ef1611fe5aa64379706011d91f3962a078cb9c3448e152e2796bdff99c4e05352df61c5dc243c1ec4c3031fa99e4610560f5d64ee6b82e55dd0c4
-EBUILD rep-gtk-0.90.8.3.ebuild 993 BLAKE2B c970247cbf3a55fb67e559bd32b78cd058d85f42a045bba996fe476eb229f300cb9fb1ae57ef89bf7d99b9d422c4c8dd5d916942a8cb497aa2e7bea4f4dbc738 SHA512 ce67c3205d6a5975d6208a020cfd96a0c7e67ddeabcc62efca00b73b0a74d79c809bb00e170b5c37b8567b13b0b35f7e424496a839278a2ebaf85266ec8d6771
+EBUILD rep-gtk-0.90.8.3.ebuild 992 BLAKE2B 07fdc83b91f99f1a69af90774e296876f558fa70edc3ef4e1b61bd8a9f59bdfb08384f39d448b6f883068562d9722eb4f00e5b86a8ef5d361b3b79e90311a160 SHA512 c2128a9ddf5704242b74633bc0a0ea601a9bf640361efeb0e34ccb627fa89bbff9f4a5431cb612e63b258779316af85df998ad8c3da17668c6de7a6587ae3ae8
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-libs/rep-gtk/rep-gtk-0.90.8.3.ebuild b/x11-libs/rep-gtk/rep-gtk-0.90.8.3.ebuild
index b639e968f95b..80b9fd2b78fd 100644
--- a/x11-libs/rep-gtk/rep-gtk-0.90.8.3.ebuild
+++ b/x11-libs/rep-gtk/rep-gtk-0.90.8.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://download.tuxfamily.org/librep/${PN}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="gtk-2.0"
-KEYWORDS="alpha amd64 ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ia64 ppc ~ppc64 sparc x86 ~x86-fbsd"
 IUSE="examples"
 
 RDEPEND=">=dev-libs/librep-0.90.5
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 48b5be8f1d5d..0091837f019a 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/dunst/Manifest b/x11-misc/dunst/Manifest
index 7b567785bf76..2bff9457efbe 100644
--- a/x11-misc/dunst/Manifest
+++ b/x11-misc/dunst/Manifest
@@ -1,5 +1,7 @@
 DIST dunst-1.1.0.tar.bz2 79032 BLAKE2B d0c0550a7bc2da5ba5f3fdfd04d06c03e70cf3bc4b69dc69071667a885a361fbb9564dc02d6a0530b85eea2df845b8b5f917ceef0dbe5159f968f20ef50762f6 SHA512 ba01a6b18da5199b3356342f5c22592f93f447389267810bbfc35decf1a67f89650d445d3c1dd6f3cc76a4f86f7165adc777b669444627e42d3e671d4f04a04b
 DIST dunst-1.2.0.tar.gz 110628 BLAKE2B 4bd695c31da23aa5657e3f8aac7c3d54d66f720f57d1b256c215f5d0a42c1367fbca7838f6f8e85c87df7a65c4679413be30608b48e3f017f54e695fa064c10a SHA512 223c8aae61574770a76bff84723643a3c03d3d9a8f4094bc4e92e16826703e7c0a7c3327945db8469b8dcc48fe5cfaba51e6724149e6571a7ffc1716656e30f3
+DIST dunst-1.3.2.tar.gz 121575 BLAKE2B 97f0011ce960a7852dca5a2917e328de2cc1a052ad0b7c2f07e878e3b6eb5281e49a070a574885b9a66eb6dc30ac07fdfd6322b44cbb7dbc1edf8d193a68b538 SHA512 eb7bff16a19d8f60e2f0eec419a0ffb2f8822b5ec2ffbe535303a71cc7d4ef528e5dbf2fe5f8f2f6f5bfd1ad2d39eab79b68054af924e118c646e059b6929465
 EBUILD dunst-1.1.0.ebuild 1193 BLAKE2B 22be8ac22df55546417fd0afbd6231b9b32ca1f4f95e20729219681a00e397d7a3a13f7499f0d05d72037413fb00dd45a7f2f6ec35a505695087fc6970dd22ea SHA512 3dae12bba3ee11392cb59428164543d36280a256f359041bfa575b26622615c5211370888d7fd12640bcbedddcac60179b630d7485e8783532926ba423d791c4
-EBUILD dunst-1.2.0.ebuild 1069 BLAKE2B 6dce17a435b06bae35455e1b0a9a7e66289162704c7a1a216aeae3eeb9ab3d370966dc9957cc62a0267d5361a347fb8e84e697aa4e5f862146bde5f6827f8b3a SHA512 ba6073ddec4a0f1fd397768bd4a170d16c576d082c8a1780eaa7bb7472e5e08be5b47c68fea3b0fc24a8db18e47e273c5ed770d7a28a9d0de8ca333590facc5a
-MISC metadata.xml 354 BLAKE2B 7024c3c1eb5499cb65bd59147da8c2d8054fccb779970652b62de9fd51617cfe9aee303ac8770da9a12c88515cb1fdf5c47ca9693ba4edd5830588030b6d1916 SHA512 fe149f9d5b272ad4238cd4bdce6fb48d71d4145c2bb0630ec521e16f00fb07009dcd52c1a06f016da333a2aa5972a6f00c36944d676046217ee201e13a676a7a
+EBUILD dunst-1.2.0.ebuild 1074 BLAKE2B 5d447c350b682b60af29da65683aa8255a74d0020e3993a64e1e724a3d9aad690f5f265402c0507f20f327323d5a7425533e14913b762b778b77b52c69040ee2 SHA512 dfda0ac316107e33237af4c0db8bd4bc65d3f0d8831cc81229b7340a58d1f3ba458b84bdbe6108f9a3629121acda63bbec663c640cfcdae469e403aba20bef8c
+EBUILD dunst-1.3.2.ebuild 1077 BLAKE2B 9bec7b7921fb762a6d929cae4d3024561a49dbc83e8ed46347c5b02bce198d7b3e5b2081e1481f9cc7ae914ae039fc9687a365b3c8819170ec5788840ec4f59f SHA512 9d809d67cf6b59a4c6d2bab878bbc154f20a0f45a6a4344895af14d42e63b760801adc53087c24e29057fe9373ed98f8df13a9bc4cd85ca4ffc5d04aa3a03de3
+MISC metadata.xml 448 BLAKE2B 088d419b835ebdb800e07ae00892d0c01bef6f862d72ac3976d58202e532870c1c0f8e96ea292c95e9579bda48b5c81952f954afee300e250a21167af639bf7e SHA512 4269d385c94e1dcfcd89f9ba95486da2a7feea2370fe1cef33051a3886e8c7612911bca2da15fa049d6692994c8c342e308fdfa2645a5f576ad93080e8d54d73
diff --git a/x11-misc/dunst/dunst-1.2.0.ebuild b/x11-misc/dunst/dunst-1.2.0.ebuild
index ceff714d927e..01a433b8b8ea 100644
--- a/x11-misc/dunst/dunst-1.2.0.ebuild
+++ b/x11-misc/dunst/dunst-1.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/${PN}-project/${PN}/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="dunstify"
 
 CDEPEND="
diff --git a/x11-misc/dunst/dunst-1.3.2.ebuild b/x11-misc/dunst/dunst-1.3.2.ebuild
new file mode 100644
index 000000000000..18ef727cb181
--- /dev/null
+++ b/x11-misc/dunst/dunst-1.3.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Customizable and lightweight notification-daemon"
+HOMEPAGE="http://www.knopwob.org/dunst/ https://github.com/dunst-project/dunst"
+SRC_URI="https://github.com/${PN}-project/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="dunstify"
+
+CDEPEND="
+	dev-libs/glib:2
+	dev-libs/libxdg-basedir
+	sys-apps/dbus
+	x11-libs/cairo[X,glib]
+	x11-libs/gdk-pixbuf
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/pango[X]
+	dunstify? ( x11-libs/libnotify )
+"
+DEPEND="
+	${CDEPEND}
+	dev-lang/perl
+	virtual/pkgconfig
+"
+
+RDEPEND="${CDEPEND}"
+
+src_prepare() {
+	sed -i -e "/^CFLAGS/ { s:-g::;s:-O.:: }" config.mk || die
+
+	default
+}
+
+src_compile() {
+	tc-export CC
+	emake
+	use dunstify && emake dunstify
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="/usr" install
+
+	use dunstify && dobin dunstify
+
+	dodoc AUTHORS CHANGELOG.md README.md RELEASE_NOTES
+}
diff --git a/x11-misc/dunst/metadata.xml b/x11-misc/dunst/metadata.xml
index f0fe7c4c53ca..de3681ee1319 100644
--- a/x11-misc/dunst/metadata.xml
+++ b/x11-misc/dunst/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type='project'>
-<email>desktop-misc@gentoo.org</email>
-<name>Gentoo Desktop Miscellaneous Project</name>
-</maintainer>
-<use>
-<flag name="dunstify">Experimental replacement for notify-send.</flag>
-</use>
+	<maintainer type='project'>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
+	<use>
+		<flag name="dunstify">Experimental replacement for notify-send.</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">dunst-project/dunst</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/gmrun/Manifest b/x11-misc/gmrun/Manifest
index dc2563a8088b..8d4d9810634c 100644
--- a/x11-misc/gmrun/Manifest
+++ b/x11-misc/gmrun/Manifest
@@ -1,7 +1,9 @@
 AUX gmrun-0.9.2-gcc43.patch 744 BLAKE2B 3b9fb28048c9ed4017811348011c7560cb71e1fe54b8c1348e795abec8593afcd1823202270ee7727450bf654ff0327b14f74d66defd62cb3ec77210c88498ef SHA512 376d0a5425f264044cb0d1635e0c5aaede0ad962fa21fc552cf2ae4145a33520f8035193fd4e9c3108ef5cfdc671aa2fc4922479836d392a0d3d287e810593c5
+AUX gmrun-0.9.2-gcc6-pie.patch 2772 BLAKE2B 7fc08a7a1570d1dba41551b99209636f2c13337c35c8bd0e90bcc4526eee0d44f40be339b2946ff8dc4e040b9589c733478b251b267a54b39bc3e54af2f666e2 SHA512 55fe649a1a79a9a5b78e84856577ac9bfddcee56b671941932b8907212203e67e3de186dfdbc117341e486b7fce2ab511df3df0032b9438da1e221280ad553cc
 AUX gmrun-0.9.2-glibc210.patch 324 BLAKE2B 6080d23e033fe589c6df27622c955dc4c81100635c8fb977c0bd7dfd99dd128247ce72f03d63964b045944f492db899fd262a8e41ba303a7709e81377db2e474 SHA512 6488186908e33fe27e4e4f6d81fe9dd5fc1bb74e15b2153ebd660788be75432e68dfebb6ee21b17a0711b99d5d1e54eaf0a4384111bfe56134cce817b4bed49d
 AUX gmrun-0.9.2-stlport.patch 697 BLAKE2B 6ebb5d3a8a0a0047ab5a537a5a6f7814add9b9a9ae05feb0ac9b9eab8b5643097b2b31ec0afadfbe345abba89d46432b64bdf34e1f1516ffa2c0c4fd8422bddd SHA512 84ea68891309b6c3a29188e188e4572b7228abf3d874f138750cf51f33f8fc42aee33f8f4538fc80e324c16e64c68b739cc321cb94e49dd4ace5ec1b3bc4605d
 AUX gmrun-0.9.2-sysconfdir.patch 863 BLAKE2B 11cd0ded75db0d90843799a1e06cc9118bf323d540d3870acf3c98e34486b902cb08e03a859c2a0debb1761a5d20923d560b41e276743640d9ab7a85026cb8ce SHA512 0c201cc73f35bf1d56ccc072e2adcc8c6acf5d42d325919fc2e4c4d4440db076812e5a4dc67cde3f857b78332b7f37adc1fb250bababee6ff4aecc16ecc0cbee
 DIST gmrun-0.9.2.tar.gz 66097 BLAKE2B 3b8f253e8d683d02c8b6cc8da3d54103b53c6b9ebd4d90b4675325809f592f407a32532e6f0d3d3a112f5c7b9304eaae75bc3ba7f1e1b372614d95206edf0da3 SHA512 3ce881463c23b6c2c39b4d41ff98f3d4a2b77f45a46d4ac43d8bbf726fcb3769b643436932714f9f5c22b855188928453810468d165af2c2433059a0149d6422
 EBUILD gmrun-0.9.2-r1.ebuild 837 BLAKE2B 597e3bf5f5bb78fa88d6cd30f40ff8b988ddadd4628951280b0822d00a4c41c4a99639328564ccaa5cce79fef0ef778b1676eb3be8f73e2e498eac5b891dabf7 SHA512 20d45866530f4c4b817a44eecb37a756f7381c1679bea84413d4bd2064c6f9df5993f465d33545fd3425327edb9266c5318c8f13b11a50e22318c73bdc032885
+EBUILD gmrun-0.9.2-r2.ebuild 768 BLAKE2B 3e79d32b18a322c86b83da6eb171ff6314757a8b2c81f7a6282301b015d73e3c29743354921b6ab7e410f1d88a808607313029ff6f9b689bdb80a8acd6b7011a SHA512 e36415e424243fd967bf85fb7cc66b8790da7db137aa61de9a0eaf24fc9c0199c2820a2bf54257e7e9827f0e427c653fd963941d72d824c4353f48040bfde46c
 MISC metadata.xml 523 BLAKE2B 64ba9f284e12ddc2c01c23641870422810ea147ef875177c633082e9ab65f86b0cef0ae332eb61235cee9facdc2de08a9a3e07b27cf595696ab3e42d03a161e2 SHA512 8cd78652f2a6be93952b1edb9570261fba71afff13eeba915e47c4178adfbb26450ed1159812ad211c941a0ffbd96b3e5b864c2c7300b882d2245285a1d3f730
diff --git a/x11-misc/gmrun/files/gmrun-0.9.2-gcc6-pie.patch b/x11-misc/gmrun/files/gmrun-0.9.2-gcc6-pie.patch
new file mode 100644
index 000000000000..3ef46c7bd653
--- /dev/null
+++ b/x11-misc/gmrun/files/gmrun-0.9.2-gcc6-pie.patch
@@ -0,0 +1,84 @@
+From 351d355835532dbea8430902977873e887dd1c12 Mon Sep 17 00:00:00 2001
+From: Lucian Poston <lucian.poston@gmail.com>
+Date: Wed, 6 Dec 2017 04:22:28 -0800
+Subject: [PATCH] fix segfault in gcc-6
+
+---
+ src/gtkcompletionline.cc | 27 +++++++++++++++------------
+ src/gtkcompletionline.h  |  2 +-
+ 2 files changed, 16 insertions(+), 13 deletions(-)
+
+diff --git a/src/gtkcompletionline.cc b/src/gtkcompletionline.cc
+index eb324b5..537fafb 100644
+--- a/src/gtkcompletionline.cc
++++ b/src/gtkcompletionline.cc
+@@ -77,22 +77,25 @@ static gboolean
+ on_key_press(GtkCompletionLine *cl, GdkEventKey *event, gpointer data);
+ 
+ /* get_type */
+-guint gtk_completion_line_get_type(void)
++GType gtk_completion_line_get_type(void)
+ {
+-  static guint type = 0;
++  static GType type = 0;
+   if (type == 0)
+   {
+-    GtkTypeInfo type_info =
++    static const GTypeInfo type_info =
+     {
+-      "GtkCompletionLine",
+-      sizeof(GtkCompletionLine),
+       sizeof(GtkCompletionLineClass),
+-      (GtkClassInitFunc)gtk_completion_line_class_init,
+-      (GtkObjectInitFunc)gtk_completion_line_init,
+-      /*(GtkArgSetFunc)*/NULL /* reserved */,
+-      /*(GtkArgGetFunc)*/NULL /* reserved */
++      NULL,
++      NULL,
++      (GClassInitFunc)gtk_completion_line_class_init,
++      NULL,
++      NULL,
++      sizeof(GtkCompletionLine),
++      0,
++      (GInstanceInitFunc)gtk_completion_line_init,
++      NULL
+     };
+-    type = gtk_type_unique(gtk_entry_get_type(), &type_info);
++    type = g_type_register_static(GTK_TYPE_ENTRY, "GtkCompletionLine", &type_info, (GTypeFlags)0);
+   }
+   return type;
+ }
+@@ -114,7 +117,7 @@ gtk_completion_line_class_init(GtkCompletionLineClass *klass)
+ 
+   gtk_completion_line_signals[NOTUNIQUE] =
+     gtk_signal_new("notunique",
+-                   GTK_RUN_FIRST, G_TYPE_FROM_CLASS(object_class),
++                  GTK_RUN_FIRST, G_TYPE_FROM_CLASS(object_class),
+                    GTK_SIGNAL_OFFSET(GtkCompletionLineClass,
+                                      notunique),
+                    gtk_signal_default_marshaller, GTK_TYPE_NONE, 0);
+@@ -778,7 +781,7 @@ complete_line(GtkCompletionLine *object)
+ GtkWidget *
+ gtk_completion_line_new()
+ {
+-  return GTK_WIDGET(gtk_type_new(gtk_completion_line_get_type()));
++  return GTK_WIDGET(g_object_new(gtk_completion_line_get_type(), NULL));
+ }
+ 
+ static void
+diff --git a/src/gtkcompletionline.h b/src/gtkcompletionline.h
+index 5e14cd7..0d7f2dc 100644
+--- a/src/gtkcompletionline.h
++++ b/src/gtkcompletionline.h
+@@ -76,7 +76,7 @@ extern "C++" {
+     void (* cancel)(GtkCompletionLine *cl);
+   };
+ 
+-  guint gtk_completion_line_get_type(void);
++  GType gtk_completion_line_get_type(void);
+   GtkWidget *gtk_completion_line_new();
+ 
+   void gtk_completion_line_last_history_item(GtkCompletionLine*);
+-- 
+2.13.6
+
diff --git a/x11-misc/gmrun/gmrun-0.9.2-r2.ebuild b/x11-misc/gmrun/gmrun-0.9.2-r2.ebuild
new file mode 100644
index 000000000000..b2ce6fb13cbd
--- /dev/null
+++ b/x11-misc/gmrun/gmrun-0.9.2-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools
+
+DESCRIPTION="A GTK-2 based launcher box with bash style auto completion!"
+HOMEPAGE="https://sourceforge.net/projects/gmrun/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-1"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~x86"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/popt
+	x11-libs/gtk+:2
+"
+DEPEND="
+	${RDEPEND}
+	elibc_glibc? ( >=sys-libs/glibc-2.10 )
+	sys-apps/sed
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	eapply \
+		"${FILESDIR}"/${P}-gcc43.patch \
+		"${FILESDIR}"/${P}-gcc6-pie.patch \
+		"${FILESDIR}"/${P}-sysconfdir.patch \
+		"${FILESDIR}"/${P}-glibc210.patch \
+		"${FILESDIR}"/${P}-stlport.patch
+
+	eapply_user
+	eautoreconf
+}
diff --git a/x11-misc/shared-mime-info/Manifest b/x11-misc/shared-mime-info/Manifest
index 117f72d816bb..45573af795f5 100644
--- a/x11-misc/shared-mime-info/Manifest
+++ b/x11-misc/shared-mime-info/Manifest
@@ -1,3 +1,3 @@
 DIST shared-mime-info-1.9.tar.xz 607648 BLAKE2B 6ac4c0dbe3862be78dc4fb5711ca3c8137ae9dee83752b1811991f44bae0ba83036fb10c598c4a098933df8914a67212db97c8bcfefc80febd2ce3e4673846d7 SHA512 b4ab7bfec4cbc827fe0d459040967afb714c073ad27ec9ad46e51ebc49c56b2a85501a3c8c5c199b4cb5359fc46580d6f2dfdb49da1670216d5d2b56758de491
-EBUILD shared-mime-info-1.9.ebuild 1471 BLAKE2B 56a16d41ea79d6205fc12f4267192f0d6139c3e43de5ede74bf154577d217baa687c3eed46201bbbb61b58a6a44fcddc484bbf48fdcdd1d1b134c9a7c52ae89b SHA512 4cad2957b70ba474ff6986ac4e9dfad8752f1acebd103df29825174e2c8152032b3c6ce84b94187816e2c4765657f396ca1da6c906452225358e856e8c612878
+EBUILD shared-mime-info-1.9.ebuild 1468 BLAKE2B 0209388692eb50642d52579e68b110424c8417886e2d7f89a1129c6aa45472e8ed9fb2ca722fceffddf9f449db9fa6a053bd543a8cdbab43afa1c0b9268ba952 SHA512 2b5b7ddc08167cc72df3f5c07ee1a9b76c316ad76c6fce1bea43ffb044c91e7792d850b21afefbbf7a580ea9597eeceb738cc4db9bbc8532c99d70fdcfe68a50
 MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae
diff --git a/x11-misc/shared-mime-info/shared-mime-info-1.9.ebuild b/x11-misc/shared-mime-info/shared-mime-info-1.9.ebuild
index 4d7eae0ed5e1..78fe4402a9dc 100644
--- a/x11-misc/shared-mime-info/shared-mime-info-1.9.ebuild
+++ b/x11-misc/shared-mime-info/shared-mime-info-1.9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://people.freedesktop.org/~hadess/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND=">=dev-libs/glib-2
diff --git a/x11-misc/xiccd/Manifest b/x11-misc/xiccd/Manifest
index 93f58b3f2e0a..30ef34759e77 100644
--- a/x11-misc/xiccd/Manifest
+++ b/x11-misc/xiccd/Manifest
@@ -1,5 +1,3 @@
-DIST xiccd-0.2.3.tar.gz 30136 BLAKE2B 8e45754d76aae29e0ca398534d2031e058964685d8fda7e1f082fdc96c012158226f3e57fccc99dce253f3a948c6a04ef0aba85f45ce674061b982597179235c SHA512 2c68c5de95dd6390c4196e198c63a78f82903d4f1210b98b8e67ee7b0ebc5d06e21e553288e2ced26c2df9c232c0b6fd1972308bf0a0e31dbdfae8ec208a86ec
 DIST xiccd-0.2.4.tar.gz 30981 BLAKE2B 079b743f88308b3fff5826bccef125c90636182cf1e6311166e91a337b24be824ac564696f1c65d112fccf737bfbff968ce3d96a2a31ba29cca1069377e16695 SHA512 40101467a38e9369b171b44d5d7fd4b07968dfcd74ace89e15f3dfad32131a3dc3b26249af2340e408908bd3df766785b46e885a3b68ff26b24ed2627a40cd2c
-EBUILD xiccd-0.2.3.ebuild 506 BLAKE2B 0e58d75c0d583104f3191817ae9689a4176447515b8abfb08ac8d9ec8826caf2fa043dc54c41316da8d3b9bc36ccec0f0f224affd0d6202eae063debe871fcec SHA512 85650c8738fb06ae5981bf6d42e1dacdc0dccbf28cdc083a57ae5d167d40059ceffdd770da8d40f5c438653b13066cf175ea516c2c117241efd0ec66cbda2ac5
 EBUILD xiccd-0.2.4.ebuild 506 BLAKE2B 1af3760f9e7de84bd58183a29e90c720f90e2040256e1d9e3b86d9abbf4b36ea4a42d84155342dd0073488d54ddcdf372bf40b9247009077bb9f9bdde660d0ac SHA512 ffd40914be02c49134a58f419e49423dbeb8bb612a56537331ff948b9c08e09cdea7bbf29a5eedf63586fa80e4e911717b8fa61c84cf1139585c8c3415a7aa7a
 MISC metadata.xml 764 BLAKE2B 386c639b7452560295dc0b25e0dfafe126c868d4749711125faf5aa57c027d45ac69ce658d09f775504eea2a8ee9d1ef89cb821ccf695d17506fe14639d847f8 SHA512 91b048281b6c4ca83e6ba61e870e5f04b90bae2668727edf18946c1ee703284b48a4caf4a1f259c80106fcdcaba91c10048c9f4569a2a5b45110a8acd2e1b2db
diff --git a/x11-misc/xiccd/xiccd-0.2.3.ebuild b/x11-misc/xiccd/xiccd-0.2.3.ebuild
deleted file mode 100644
index 71eb9b4bf531..000000000000
--- a/x11-misc/xiccd/xiccd-0.2.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="A desktop environment-independent bridge between colord and X"
-HOMEPAGE="https://github.com/agalakhov/xiccd"
-SRC_URI="https://github.com/agalakhov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="dev-libs/glib:2
-	x11-apps/xrandr
-	x11-misc/colord"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/x11-misc/zim/Manifest b/x11-misc/zim/Manifest
index 8c7bf1930c59..d68abf35fdcd 100644
--- a/x11-misc/zim/Manifest
+++ b/x11-misc/zim/Manifest
@@ -3,8 +3,10 @@ DIST zim-0.65.tar.gz 1899614 BLAKE2B e7989d91120f2ffe0668c996b5abd61cc1cb12b2a5a
 DIST zim-0.66.tar.gz 2020216 BLAKE2B 7a2af3dca2ff72dd94c605c4fa89b0d3be1413643c781aa151483445e6a029db6021ed84df797b6d9aaac05fd791fe50e4bdc9f1682d252e80f083bf37a10602 SHA512 9693dba8ee6ad915a85ca999674350b278043559ba4adf93c03c8815211ecab451a6e2dceaf62ea7048609eb86f19485f2dd77dbaaf6f2d81f97f6450bf25ca9
 DIST zim-0.67.tar.gz 2034747 BLAKE2B 47e49191e699f93727f566593d616ef0da5b826dccb2f952c6220627d67f295d40e57b9e00dec8395a933a0378c0b1b05c25db7a2cb30fd4509e6ee06269c831 SHA512 0f3387a74a9d6a1e972b4ad411230b9318c58432bd853ef6d45cd535dcdef901369a70dd619b842f1e6564a4b583075865d30acb75cc7649facf5acfe43d8b94
 DIST zim-0.68-rc1.tar.gz 2602967 BLAKE2B 7a1eed33e8d7f27ea287c993f1dde5e8d89cc9435f909ede5696f80ceaee454a38d0ab903313d6a07375797bd43cf48925e81be725094d4a4ce188f750fcac9e SHA512 60c2c654f6b40edcf029efb8367e18a8c4cca7fde11339f4ab9b3724f07f4041aae5740cd7a42fe3b2f836537c699ad597cef0eaec0b0511cb7c65b40ea6e04e
+DIST zim-0.68.tar.gz 2044224 BLAKE2B 5c53c3197bc5de90c38059e7323366ed5b7600ebf0b3575d81e618d972d0360f67660da4637f1e6f1459549b21525ed17183e9c2f57f8ab0b27236e36bda9666 SHA512 4ab7f2b55e37ae917a7faa0018a36cbad2534bb43146f47810479155009eb2ccbf4f8ab185d8b4cd3ba7e22a4e2fc5eb08c4bae0688186c13d31dfcab23b0048
 EBUILD zim-0.65.ebuild 1777 BLAKE2B 29f8c8c7bd19e0580603df7a246160f57f42f08c4e474abd8852245dbe7e1656e8d8e17bdc7952771c571ea94c35c18d80e67c4990e8206c5baa806ff2847977 SHA512 d3d2cb0eea9629277c38883523a7cda05a275b729c34805c9eeaab11ea016d46b05f325efb7d6af2a093d3c71fac0b8e50e46b642a62275772cb9f2a870de6e0
 EBUILD zim-0.66.ebuild 1779 BLAKE2B b3f4597786e61255a1cfc5990ea88354be0db3f86e0c1fab2472bbccf4e7384b596bd1e6ea795a5debe3a7fb8a5fe9d539f58cb269e7a170d5f81000bffebde2 SHA512 e2f1e3bc0f287beeb2e7b1fbabb0225fc06776682bdc832d6c874f8159a64a750bbaeb73461bc81ca40f03780f44d3a7f2dc2a26aa08b9102d808c200d39dd0e
 EBUILD zim-0.67.ebuild 1828 BLAKE2B b6fc04b1b8166a2c4e4539ce1533f41d9d40ba7798031886b508fefa34ee71b554135f8962bb6d4c7e075b13b219e6354ecc233c98b549804f65cebfc218ab16 SHA512 d735ebe9821d634fff6ee707b2694cc347b32a7d65b88a0f7a179171496088714ac4fb6cce5806c60881d5149971b41438c2707b52457e4daa8d08f0e4bd71d3
+EBUILD zim-0.68.ebuild 1847 BLAKE2B 12615ea89e434348ff24ed1f492a09c11944c54c1bc4931f8a555b04eed4bb909a205e7b980ae1a6e63054441cafb854c5b76b21b068ad2b62daa51a76e69238 SHA512 5fe0bd6aa83e1645b630a70c287fe50e16a60fc6bdb966fb768be2052d65bd4c484ee1896379fd6990d30614b4048834460813ffa15179ac57127946a51504d5
 EBUILD zim-0.68_rc1.ebuild 1871 BLAKE2B 9bcd6204f6e7c06face149cfa2b77fafcc90dc69c2e55359fe1b5df83ee0735368be03a527ca5d7bd811b0da242b2ecd740dc46d8a39526778420f226d6e807e SHA512 4d6f5ffd3247519248ee30c48f922b576526e954280ef76b954145bd368cbb10a2c8304d1dc9de12c526be1802a381cbe2f84ee0e080be0551ae94529da685f0
 MISC metadata.xml 824 BLAKE2B a6ac745b62015073844af9a8aae0ef1d6ca6b7c28e881c7b85d31e00c808076fa944feec5980cdefc72b5ddfa2cecb98fc96b4745df12743212a4d572679408d SHA512 26a4774e75f0a06bfedc2c26f4ca688f9a2644935302e0674ba5a5308af88bc90f291a01f5b10bba62ac0f0a46561d63bfd9289de67bc53c4be454542ea76816
diff --git a/x11-misc/zim/zim-0.68.ebuild b/x11-misc/zim/zim-0.68.ebuild
new file mode 100644
index 000000000000..44110e717f31
--- /dev/null
+++ b/x11-misc/zim/zim-0.68.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+DISTUTILS_SINGLE_IMPL=1
+
+inherit xdg-utils distutils-r1 gnome2-utils virtualx
+
+DESCRIPTION="A desktop wiki"
+HOMEPAGE="http://zim-wiki.org/"
+SRC_URI="http://zim-wiki.org/downloads/${P}.tar.gz"
+
+LICENSE="BSD GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/pygtk[${PYTHON_USEDEP}]
+	dev-python/pygobject:2[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	x11-misc/xdg-utils
+	test? (
+		dev-vcs/bzr
+		dev-vcs/git
+		dev-vcs/mercurial )"
+
+DOCS=( CHANGELOG.txt README.txt HACKING )
+PATCHES=( "${FILESDIR}"/${PN}-0.60-remove-ubuntu-theme.patch )
+
+python_prepare_all() {
+	sed -i -e "s/'USER'/'LOGNAME'/g" zim/__init__.py zim/fs.py || die
+
+	if [[ ${LINGUAS} ]]; then
+		local lingua
+		for lingua in translations/*.po; do
+			lingua=${lingua/.po}
+			lingua=${lingua/translations\/}
+			has ${lingua} ${LINGUAS} || \
+				{ rm translations/${lingua}.po || die; }
+		done
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	VIRTUALX_COMMAND="${PYTHON}" virtualmake test.py
+}
+
+python_install() {
+	distutils-r1_python_install --skip-xdg-cmd
+}
+
+pkg_postinst() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+	if ! has_version ${CATEGORY}/${PN}; then
+		einfo "Please emerge these packages for additional functionality"
+		einfo "    dev-lang/R"
+		einfo "    dev-python/gtkspell-python"
+		einfo "    dev-vcs/bzr"
+		einfo "    media-gfx/graphviz"
+		einfo "    media-gfx/imagemagick"
+		einfo "    media-gfx/scrot"
+		einfo "    media-sound/lilypond"
+		einfo "    sci-visualization/gnuplot"
+		einfo "    virtual/latex-base app-text/dvipng"
+	fi
+}
+
+pkg_postrm() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index 1673bde8ebb7..8f3d13049a99 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/enigmail/Manifest b/x11-plugins/enigmail/Manifest
index cc1f041a3be6..578dd08d7403 100644
--- a/x11-plugins/enigmail/Manifest
+++ b/x11-plugins/enigmail/Manifest
@@ -3,6 +3,6 @@ DIST enigmail-2.0.4.tar.gz 2533719 BLAKE2B 9c3a38233df2c05e4bbbdfa2fd762b6362cc0
 DIST enigmail-2.0.5.tar.gz 2534693 BLAKE2B ad5984b74df2bd1c563f89a23136d9c9742aa7ba94d5683b9046f93eb11c5f729231497e5bb6e8c002c03feb55f2e2a07b43063bc63de3c7c578ea5b4b136fd1 SHA512 9edf78f38dbdb73f16190cc6b08eb02dcc199c41026003d19ce302a48fb4d9a6be6e765bbb7a8ef7f1bc3eea1065182437850da23c3ef5b89d1d5c66c602480b
 EBUILD enigmail-1.9.9.ebuild 1922 BLAKE2B 91c9d28229704a6fc1b529a3b9948c3b4b32e097a2f9ec4d44e9e036ad2b7615314c1cf14120e536304cfb43c3ce0d71a6e327f92992c4f79b51ad484ffad6dd SHA512 b2e8dd3b86c1aaf37954c067bdaae67217f7446317817af837f9a2affd4c886d0e3d3b81b10f402105cd54a4534449a86ebe69673024367a34467fea400b6cba
 EBUILD enigmail-2.0.4.ebuild 2174 BLAKE2B 8a2cc0d181c27dc6dfdfaf5e0d51983fe290b8b4fdaf7e3dcaba6401a1c874ff20d363a2b13ac14fac225c3d9aeb904e529de5945112a158ac6b32db37690e6c SHA512 be8c9b87f459bf006a2455d492190f5a4ad7a38ef3369c8408cb27fa65cfe36208175df1752cd5715c6f4592cafeec80b8f1e9535158cac771d74823d0d31afa
-EBUILD enigmail-2.0.5.ebuild 2176 BLAKE2B 941c7f06bb44515c26c920ba15fe6c7babb041a01c84ac747c72c1bb3ec0e652a92a6277b16912724ef39250553ee7853f3d96883224b3ebb0552b2e38b56c76 SHA512 4fa175b4ad4412c7e3f18fcbb8d5dcb4cce5605dec07dd39e62e6ff1399d9f805d228ba9d0de083f66ac8802d0af8b2b5e6189e7baafc378cb418504fdfa6376
+EBUILD enigmail-2.0.5.ebuild 2175 BLAKE2B dfa49006af6629de4eebd328e552bf2b3f2fd31a1f849d8ad03a15826f5e6a3a117febf39d51dc58dc8f39c7efdef9d3be3f9289bb54e4238e4db19199762937 SHA512 61c86e0891c3dc92f09891c82ab515af584029b1c77592dee0d04e8297484b5a516eacc8a75d943ad3e60b772537b50c4cafaa5f621a3a09c376e8a1c22a4e5f
 EBUILD enigmail-9999.ebuild 2105 BLAKE2B 47053af959ddf2b745ad0aa620b8e1666905e5bb0ca60cb7fe8cfe02eb8160cbbc981940a78a0ddb0c01e1e7a557465f243eea15c44d6ff7e613f03695d58076 SHA512 4c7c4051d47d1692cd8eff3cd1d32027cbc6608257faf2fe437483df9676b70c320cb5546acd632142d8de0c612c6a6281d5eb6d151eeac494c7c1b359060a3e
 MISC metadata.xml 250 BLAKE2B 9e6643b2a0b90fc083246090047db38d3b9a3b71db8542051307b7e87394135d3337e1ea54b83a0c7474661a0fd07d950385b44cbed6ee95f6e6ad718bd0b062 SHA512 ba5e7c1f6ee117471a3804bc54211e7f89c75e965a865f45f85015a0a28ec7d511ef9bbc196eef8245dc9259f54b04eb3563d83811a293bb946cf0977563892b
diff --git a/x11-plugins/enigmail/enigmail-2.0.5.ebuild b/x11-plugins/enigmail/enigmail-2.0.5.ebuild
index 9e8d0cbb3958..8d6d09bb3f6a 100644
--- a/x11-plugins/enigmail/enigmail-2.0.5.ebuild
+++ b/x11-plugins/enigmail/enigmail-2.0.5.ebuild
@@ -21,7 +21,7 @@ else
 		SRC_URI="http://www.enigmail.net/download/beta/${P/_/-}.tar.gz"
 	else
 		SRC_URI="http://www.enigmail.net/download/source/${P}.tar.gz"
-		KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+		KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 	fi
 	S="${WORKDIR}/${PN}"
 fi
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 67ef3f2301a1..79555e76ed52 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/cwm/Manifest b/x11-wm/cwm/Manifest
index 0c7d4c65abfb..bcb865073932 100644
--- a/x11-wm/cwm/Manifest
+++ b/x11-wm/cwm/Manifest
@@ -1,4 +1,3 @@
-AUX cwm-4.2_p20111229-Makefile.patch 259 BLAKE2B a0d07907342587c807957c6c7fbf521ce39db3bb88c6d9f35212120837aa8e679c2c1c6f0848e7221785fa1b9ff4671bf4f92869b7943e65eebc1dcdeea35425 SHA512 d943debea5c55430b4304809bd9e0ae15d754dc6abd2a9b895f23186faaad12181f4752bf2c663f73aa99d605050c551e483556a6065e60571dc4b3a269bb610
 DIST cwm-5.6-chneukirchen.tar.gz 50799 BLAKE2B 4d9341e89b21187044bbcbc658dea2eac6f6c1c87f25e1b0b81871a9f8b95af7354c8b486bd77f201acba430e019a5c784591cfc5efb281fd40d6670749958ad SHA512 0bb5f9c69e1ed30ef38ced70008baa347032a0c31ee2d4a88e3b45092969a5427ef160577da4891aba3181067235b244f11fc796815f41448930b438099b5bfc
 DIST cwm-5.6-xmw.tar.gz 53738 BLAKE2B 9c36c42fc35a8206035ed59fb8fe2e8eb13effcdb43d488bcc99c2d0f48476e206e46fd52c0928afdb51d55c68d9be03a186aaf4c49d03bcdf8754df0c5d81db SHA512 cf0174523838dba5997206be904ab667efc5ff7e413e98bb81cc3a69d40a79b54e21405787e088486feb8790d1094a2d3cce0be08d7ee36a2b9b0dadd78466c7
 EBUILD cwm-5.6.ebuild 1006 BLAKE2B c104bcfe023a159a8251951ba5854bc81eda5739e1d3d890df3532eebfd41a6fdbfc4eccce83c63a83f2c931c2c1e9897d2386d649b6f32146ab173b36e7ed12 SHA512 e7fbee979acdd1c82bc47bfc4e7b1dc1e0a686c5d9bf5e3dbe8bbcd19a4fdc6c77ecfb03418872440c25c4929fbb5491d18e31ac9e7719c392d76866131da498
diff --git a/x11-wm/cwm/files/cwm-4.2_p20111229-Makefile.patch b/x11-wm/cwm/files/cwm-4.2_p20111229-Makefile.patch
deleted file mode 100644
index bb00c017112a..000000000000
--- a/x11-wm/cwm/files/cwm-4.2_p20111229-Makefile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cwm-20111229/Makefile
-+++ cwm-20111229/Makefile
-@@ -16,7 +16,7 @@
- 
- CPPFLAGS+=	`pkg-config --cflags fontconfig x11 xft xinerama xrandr`
- 
--CFLAGS=		-Wall -O2 -g
-+CFLAGS?=	-Wall -O2 -g
- 
- LDFLAGS+=	`pkg-config --libs fontconfig x11 xft xinerama xrandr`
- 
diff --git a/x11-wm/oroborus/Manifest b/x11-wm/oroborus/Manifest
index 487502ededdb..88bc7f61ba48 100644
--- a/x11-wm/oroborus/Manifest
+++ b/x11-wm/oroborus/Manifest
@@ -1,4 +1,3 @@
-AUX oroborus.desktop 137 BLAKE2B 0c90b2f1b81af70b0355f738ee96398208a8514dd53ac6e3a5173ea54712df2d21021c2c2ab540e9791d5cd39c0dba696763b679a6963ae3ee63a29478cc71e5 SHA512 6fffb36df68027eb763c947d575e8de7cadcfc5fba42caa6d74a54bab884011f81961004563d3327f692905f64d57edca8829724d6fefb3961d23117d6b6ef80
 DIST oroborus_2.0.20.tar.gz 335099 BLAKE2B 6c4dc4e8104f47ca847b0e358ac606aeb684b004a0fc6cf55130318814efd65ef96a602630ea01a090b6851595982fd7c3865d5efec38f72182e29c3ccc1aae5 SHA512 0ffa9e3ce25c3d2cb6f24c827755b4f7af14f6e34127fec66ef367cb8dc53ceb89d0fec3619f80f055f9d2241dfa0e4edf53e4e22dad1558d7b448f0b878c573
-EBUILD oroborus-2.0.20-r1.ebuild 511 BLAKE2B 03dafae2ec029e30abfedc140e6c529f8c1928032fc23f8b94c9d083867660e803395636dc4d4ed1880ff9096ae1d2775cc63964eff3478a991ff808f8f01ad7 SHA512 94e3363c8445235014d150a1b61cecc490f76b2f45091f941ff858999ec3090d4747bc8d250466f9c3ffa3f00d8c55cbc055cdbb0320bfdd5845699694a2b8c3
+EBUILD oroborus-2.0.20-r1.ebuild 512 BLAKE2B a3180dc0a0b4b229f820eb5aa1e5476e59b975aa7d7d4c8ca2938bcfe69cd616626de4fee6829f439a8cc7345f181ff373c6c911201f253f159605f9f5f4a99c SHA512 d5c7b956b4459fa5a2040553f129901e5ad1554479c9981f6431cf146668c21b60e56ec3db91e3aa5c1f065e5b4a91ff13f5728022a91722e2439fceb99ca054
 MISC metadata.xml 493 BLAKE2B 8885e6d63fa88a19a9866150d3774733d459c7a40d75269f575f54ac6657e4426d706d2efde4363c539a299134816ab97687106844861c774e4f66ff371604f7 SHA512 f5e29aa56730150e348a610458c2faf18a203712e06ec78cfe0861dc61d0bc1f3c502f53abf02648b81566cee831ddf590894923b220f9b071badc5572d6cadf
diff --git a/x11-wm/oroborus/files/oroborus.desktop b/x11-wm/oroborus/files/oroborus.desktop
deleted file mode 100644
index 725ce52170e3..000000000000
--- a/x11-wm/oroborus/files/oroborus.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Oroborus
-Exec=oroborus
-TryExec=oroborus
-Icon=
-Type=Application
-
-[X-Window Manager]
-SessionManaged=false
diff --git a/x11-wm/oroborus/oroborus-2.0.20-r1.ebuild b/x11-wm/oroborus/oroborus-2.0.20-r1.ebuild
index 1c51ba7f9b18..071ee8295d30 100644
--- a/x11-wm/oroborus/oroborus-2.0.20-r1.ebuild
+++ b/x11-wm/oroborus/oroborus-2.0.20-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 DESCRIPTION="Small and fast window manager"
-HOMEPAGE="http://www.oroborus.org"
+HOMEPAGE="https://www.oroborus.org"
 SRC_URI="mirror://debian/pool/main/o/${PN}/${PN}_${PV}.tar.gz"
 
 LICENSE="GPL-2"
author	V3n3RiX <venerix@redcorelinux.org>	2018-05-25 15:22:17 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-05-25 15:22:17 +0100
commit	22910f5d14da606bd7f06e19a2f61c5d1a8fc94b (patch)
tree	808b5701901fb54b53ec3ecf6f33272e933f3ea6
parent	91c0ec2d7067f6ab1ef578bd9967b32ca07eb502 (diff)