diff --git a/Manifest b/Manifest
index 406bfcda07b6..5070d2b18f07 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 28819 BLAKE2B 8450f49362504f77e00c13a9f7173e22269d11b36dae003da18925235c6c976d7b6584107b1835e272ad4af1277aa1a1045a6584e379ab07cc7fbe66596ff610 SHA512 721c3f71089d5fd7e3ea65bbe59de69b91d302b9106e2d282f06bf394fa53b34263efec264d671d5cbd9dc7659d89a072f02b0c0b82e89a6738bf256413a93e8
-TIMESTAMP 2018-10-09T06:08:41Z
+MANIFEST Manifest.files.gz 28828 BLAKE2B e9c087ce6520bb7f2cd461407e6ae7adf3552b1e2c6f902e9ac2c5ad032a3756c062d38658af5c60608bdbf913f465778cf98a1995dab3fab67ea31a1f290429 SHA512 bf0b949f7b48f10d3052e0b5c173033082a90c954a222f3a9fa150aa413ad1b1f12828fadb332ad1ebbf811a8f8bad7ff5c80d8bd7e034aa353775c32cdee2ac
+TIMESTAMP 2018-10-09T09:08:38Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlu8RelfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlu8cBZfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCEvRAApXdFImbHBaGt+dRidPs35Vq3V2EzFaiyKVw6xDDTkyTLmlS6/TzX4CDN
-gZsH0t7E+EYVJE80JtSPUyDGMTB1Y7dTm/ZLidSYZnkfwQIer92nbw+UPMwNodFP
-RuVWjrg5nG/xhTTTeDYsGt7tjyZ2m7J+SDXVGm/0WRCnmMSazwdRfM/0NVy6wOhU
-MM8WeQseBv0N5frZBcY3ddCdjdo8Rb9m6VGl+ISFy3amTeIW1gdtqYHg1DXeZpou
-xarPeg9Kcj0fKPP8tXwU90NxpCFznsPvxUM9vSO/pO428zgO6vLF5VkMmKu7CH/7
-D38igYrEX61BhHqZg+GCy6h6DValZJJa/VZbikjc3+SCmGKhr62ZU6ZpUbemL0u1
-yHTvNGcsZUjKrvI4+jgIWlcmUk3XHBfFt1WcucVjkn+Oe9xWuRWUZbMXyM1nUBJi
-Xs0d7XH1cpFpG2bEE3TlpPruHwPRg1YaSuoz03oJZVtsBguZZhVddxXXWCk9Qkw0
-12nurtokHEkaUs5+l1JCzOAiPmdJconL+79fOKg0H/OcbCfAciJgEISUghBNVsMp
-bCDT2Yi7t6KN+3f0FBHe4O6DgdiVctfYJCiMKTwAeDACT7/ODHavVXFJqkzdgXLP
-uAfXrypBqusLzzd3TlwEemouSIhRKK2U/imM6iBmRu7UR1bARxQ=
-=IdN8
+klCN7A//RLiSKpSoIqEUOLCFqkOLQby+FWEvV/uS6AzcYXHal49NI4hRRn7uS387
+DSz8g0bdP8XWct+HSc4I2nuC1Lkl/vuivIB9fqZz4iZhfwTrzMqNAQCRJglL9RV9
+ohzDTDQ9pC99GiBsORIYvXaiSR3UAshfhQRx7P8uhOV/8IsjchoAY5VdJCPDjmg4
+cPX1GxGnW4zgN76onIPnYOlPOoUc7hcjVotfdbZEHUSLeQPuzv8azZXHjj0M/ieB
+PjdLmiZiohSk9dF1LIgo9eP5pUwZxoeDcQBjsLB1ahZRVEYsJmkk5NBn+q0dQmrz
+6Rlm7Xb1SqCClVt/SI/g9m4Gdx4XyrcD7372RHnjMT0iMjgZ8BvWVF1ILv3RLCVt
+9p3I/4lyS2G1R9Etl9akxZhdL8w02By/ne4hvoQepptNBEAi5m2P9mwNbR2RxppK
+0l7nbQ9MYYn9sY/e+d+OFegIvlyc2Otl3I9qvn+r6+zGBL1fEdBV8stPuLlB9crG
+beXuvdYpUrxBID2MgXr/DQL0BDs2WQo057EtKZjC3uCW0yZwj2+F5Ya9zc8BmVhp
+Vlwf/hczL1/3ote/ge/SVH97iLFlvwM9mpaR+geWH5V+zbQvrlO7CFFuREYfE6Jb
+9lldILvJ6T7HNTu3p/361upVTkfWGg0tSJAmnaViGcnYhqyo5rM=
+=lGcd
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 8ce3990b05c7..7f3da6b098b7 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index f4d6347fc7ba..8fe24188cd96 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/ssdeep/Manifest b/app-crypt/ssdeep/Manifest
index 1c7257bf26f7..31f7056402bb 100644
--- a/app-crypt/ssdeep/Manifest
+++ b/app-crypt/ssdeep/Manifest
@@ -1,4 +1,6 @@
 AUX ssdeep-2.10-shared.patch 174 BLAKE2B fff5447389ca80a63bf8ac422ca8c06aa1d17715bde05e00e9922b57004f807a435cef58d2d32af269eb39c764ba53b81daae4b745f69f74754f83f13923ee21 SHA512 9429c38e22cf100809062818c286419d141089e0dd081c11034d7f62143ef9fe2d2bac0ad67104d448c387b7bd4b84ff364933f363faae3dda527e5e8390ad1f
 DIST ssdeep-2.13.tar.gz 380712 BLAKE2B 8f5e81a7043fce72e05d45aed963067456c0f344ca66dc9c34cbf5206ba1a497315e0219344ac99815b342a811d2af16d2409421311102288e19084dafd80f22 SHA512 26473f1b8801398534c674d7fdd6e87cf4d7862ed91454bb22865f8b6cf885c777250d0d1cdf2c20a28fdf4961c3b21e505e82f37fb75486a9442902d96f5186
+DIST ssdeep-2.14.1.tar.gz 408831 BLAKE2B 7e0709a18876a192568e37d1deb63df11f2feadaff7b53c3bcb3a9f2566b18897e50b7543a29ec5cd3132981bcaf4609615793f31fa9cf654334e8fc5a90afac SHA512 a8f87e21f654d482a67709da273cf58808af377cfcb20f189986bad58530e382f8f1d3a5eaf33aa02284015a6fa7ccfc7fc383e487de6e0e4f57405a16537217
 EBUILD ssdeep-2.13.ebuild 598 BLAKE2B b6267e1b8f9bd2fa9393007e8cbf860cdecf799bed0ca967e4704fd4fd9e8e5993ecb6ccad78bc435be4fb044f26cc52a59183aa8976abace0598547fd721793 SHA512 aaf327f091d9974672057796a4fec56b89b47680d47ac5305b13832e1b08968484cddf31be2b2b1769a0e2e00a93f2f0aae01472204111f7d202dbff5824f49e
+EBUILD ssdeep-2.14.1.ebuild 766 BLAKE2B b5737db3c0a80ee7c825d24319c720c284b84190b97491175038e40259d1686e522eb11ae29f63f716ea2672538aa00a865d14c0edde75fec19910d63b6cacd1 SHA512 9f0a2596a66e23b90ea02e11a4a144016acf836ca5e9cbe617998139fba0c78765f92c5d8b25fbc6e12415e4ea2a0b6459da48ffc66964f96c663a3b18211016
 MISC metadata.xml 316 BLAKE2B 1916bbf9c489db6a30a7ee238630b4c5b137c1d795ab18183761dd49a5d7bdd40c970c916201c6e217435569f35e7e74ade29f1c3b65b43997dcc0f0f9625d4a SHA512 3fd64f3472e5d036fb4617b2f44d074eff34eeb940cc90c55334712f745b5f4abe02939f423fbf5e28ab6b4eddea2655016711efeffd4707932fe136b0562707
diff --git a/app-crypt/ssdeep/ssdeep-2.14.1.ebuild b/app-crypt/ssdeep/ssdeep-2.14.1.ebuild
new file mode 100644
index 000000000000..cd1c9c5b5c22
--- /dev/null
+++ b/app-crypt/ssdeep/ssdeep-2.14.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="Computes context triggered piecewise hashes (fuzzy hashes)"
+HOMEPAGE="http://ssdeep.sourceforge.net/"
+SRC_URI="https://github.com/${PN}-project/${PN}/releases/download/release-${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+DOCS=(
+	AUTHORS
+	ChangeLog
+	FILEFORMAT
+	NEWS
+	README
+	TODO
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.10-shared.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" \
+		econf \
+			$(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index c2d8c0cbc9e9..aa0aaefe1e01 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/okteta/Manifest b/app-editors/okteta/Manifest
index 6e8d6993747e..e0da9e8deace 100644
--- a/app-editors/okteta/Manifest
+++ b/app-editors/okteta/Manifest
@@ -1,3 +1,5 @@
 DIST okteta-0.25.3.tar.xz 950956 BLAKE2B d177db59b5327f4e75157c99fdac2191de9a7ef63433635ccf8f11ef4dc4ff201942c9f68383d720b18c26a9e7335bc1181ea4f0e36491b34b27e6c7dc469c9e SHA512 f27b0c2ca3c5f1ad838af847e08c53c8f8f3c386921bd2e0d5e833902659477196e6c6b72a428443e2be9013928c2151c1889ef33d59404815a34d81560ef2a7
+DIST okteta-0.25.4.tar.xz 950344 BLAKE2B 3a3daf5cdb9e349e145a22afe836c78e18972e1f984472267cd182630b8f8132e10efb49cbc9fac40768aef4dadbb678afa26eb965642f07f407030f15b71dbd SHA512 d9887a90efbad3bb2caa0d3bb12af27708b77d54a90cd0da82eace7ea6dfc2efbcea3d7dc720bf4a088a823a8ed9edf75ab1c3680aa6d99c640d5c9e4c385e16
 EBUILD okteta-0.25.3.ebuild 1600 BLAKE2B 4a63d9f28a852ee3263a76b4498d0a08e7bba942b003d0c8d426b09940360eef677f4f9785190b3424400734a3b802b485b3fe573d9ae0df8fac5c59b96b6662 SHA512 4e5fde23df3ce32108e04afa9bf47905452d45b8996e13c37b4cf0e3606f45ad6fc7cffca361a2b03796d08881f13608150ecbe9e6aa00849ae1f20efeece1c9
+EBUILD okteta-0.25.4.ebuild 1602 BLAKE2B 8a2edfd625497bda5a473cb97cf5c7bbb1e5f259d5ea3afaa083e0cb1d3777488c33c11294c36bd73429cdc96e6c4356b89ab322f1e1b2ec0de81494f9195ce6 SHA512 eb26056d13e1037fe24d802d5585f59f7d48f0651ec03284072256015266cba27c031c788a2d1c7911dc4b833d7f976dcb4598ded6daf551942cdc8cd5fd30b1
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/app-editors/okteta/okteta-0.25.4.ebuild b/app-editors/okteta/okteta-0.25.4.ebuild
new file mode 100644
index 000000000000..891f51eadc74
--- /dev/null
+++ b/app-editors/okteta/okteta-0.25.4.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Hex editor by KDE"
+HOMEPAGE="https://www.kde.org/applications/utilities/okteta
+https://utils.kde.org/projects/okteta"
+IUSE="crypt designer"
+
+DEPEND="
+	$(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 kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtscript 'scripttools')
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	crypt? ( app-crypt/qca:2[qt5(+)] )
+	designer? ( $(add_qt_dep designer) )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DOMIT_EXAMPLES=ON
+		$(cmake-utils_use_find_package crypt Qca-qt5)
+		-DBUILD_DESIGNERPLUGIN=$(usex designer)
+	)
+
+	kde5_src_configure
+}
+
+src_test() {
+	local myctestargs=( -j1 )
+
+	kde5_src_test
+}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 18c85f9cdb2c..8537efc10e7a 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/gnat-gpl/Manifest b/dev-lang/gnat-gpl/Manifest
index ab39b0aa13d4..736fb61d53a5 100644
--- a/dev-lang/gnat-gpl/Manifest
+++ b/dev-lang/gnat-gpl/Manifest
@@ -13,6 +13,7 @@ DIST ecj-4.5.jar 1470676 BLAKE2B 793c10ba09fd8040c0e1181204141aea16780c9c9088e07
 DIST gcc-4.4.3-specs-0.2.0.tar.bz2 2004 BLAKE2B 96f5ba2028bc6e0ef71e009857c37118a54d13d30de24d697c85e5772f9f2b7853615648cf2e4ee81d8385f6518c64588c0b56675c00f95ef39fca2a808f075e SHA512 779ecb0a064d2138b54569c8ae501975b8a6b72e5a3acbf8597619a8db77ee42ef9b0e62608d5192a15e4393e7dfc009bb50b994782236faa744b2c46b5fe517
 DIST gcc-4.9-gpl-2016-src.tar.gz 76361760 BLAKE2B 681aac3dd2e04110f58637cc9fe1eb663ce55af16a929a446eb59ce338bec9357e65517890f7fa01d61eec9c5041336722b2b94a5fea27a55ade686fe1fe9fbc SHA512 da1e26b4dbbe0ec634eab4e64d1cdb2632300c24f0885bc72fb57edba6ce29ab92b04eaedd8f8077ea623f1ef1428f53616e8c8d6630328d9790d968b60c67cf
 DIST gcc-4.9.4-patches-1.2.tar.bz2 25447 BLAKE2B 3141897688409c84cab4ffea67deb220d2218107f279a0cc1758d08c858f3a3856150df48ae37d2f14c6f69bc82de1e87f22cc356f179dfdf47ae9eef28a4182 SHA512 61b1e86e8dbc2838e7b5c88c4a3bab9ed5b6485258b7971799850ffd97cb67ad2564552af4e9ebc860dcc2a4b786c91d2079469468fb95f8e28e2fc981b4c812
+DIST gcc-4.9.4-patches-1.3.tar.bz2 26060 BLAKE2B a61cb29111e8a9e35d810c0c557e901fc0d78e3b62027f5ea622d29becff9492e350c932824b23e5a38604bc3fa6c39fed9db902df4f830a3a362f1a1c2d9f58 SHA512 0214da6712a1b583f028be60e562f742d3d484d930976e2fce7be090113517c0e07faa20f750411b5125902f38a9944fe0c1dc8605d161c5bb11843acdebab75
 DIST gcc-4.9.4-piepatches-v0.6.4.tar.bz2 14414 BLAKE2B 2eccd4f2a164fbb32d13c7fe91627a2424c0a5570fe0cac97c2bb1c95294ba3d770832da7c445f75c91791466c5139a1e13753a3a40d87ff5e44e42749adee27 SHA512 243fa272ea0e49f700a76508bab3e03bbb353bcb930581b2f87f9a47df5cd3880e29f20b71612b21190adc463849e1e6ac2a38a49c0002b562d93d436f538285
 DIST gcc-4.9.4-uclibc-patches-1.0.tar.bz2 2618 BLAKE2B bff85a4088fb94fdb7a8b0bd552be98ace3e6d145889b6f8b4a1f2db2dad14342d155890ab159b42d5b55d88dfb7c392eb7f92590084e1958f6284c561da30f1 SHA512 5a1f44caa9261f4947101379628143869b31dec67fa28605e8e1f3894d4b7120c3f68ba6deb59da7a74fa906e27ab32cd3767761837dc3dfebc37865d349d6db
 DIST gcc-4.9.4.tar.bz2 90097606 BLAKE2B 373ff939ea72d6c4a7f3ab899b852b4c919481af2cfe3291281d9354c58a270d2eba73a0f301d90840dfabf423c82b368e113df7a2cb6cc28b2a703b0b6eb585 SHA512 93abb78e16277454f41a8e9810f41f66c0fdffdc539a762ff6b67d3037f78db971378683fd2ebf707d1d51c059fad2161fe42d110c330027f40214b7db0f3efe
@@ -21,6 +22,7 @@ DIST gcc-6.3.0-patches-1.0.tar.bz2 7596 BLAKE2B e3c298bd80b83e72d6ea9b4ec777d4f2
 DIST gcc-6.3.0.tar.bz2 99903185 BLAKE2B 3dc1e965afcad665d659fbb953978ef297ddbdd4d8918d36b35e977f8a2786b986f6875af2f12c599cc827b2b725d8b79ac021c9b51fb1d6d274318a59aa182c SHA512 234dd9b1bdc9a9c6e352216a7ef4ccadc6c07f156006a59759c5e0e6a69f0abcdc14630eff11e3826dd6ba5933a8faa43043f3d1d62df6bd5ab1e82862f9bf78
 DIST gcc-7-gpl-2018-src.tar.gz 90302033 BLAKE2B 2f79137e176bff04c4fb17ab863302943588226d5b599dfa1acf0e495111be1c581f4e130f911c312916669c4f2707eec5218601db090d5060248b2fe481d710 SHA512 79f06deca5753251de82a703f4a9698c117706290df779291a5405edb06f1c225d1d2416bda0e67dcd87cc308bf79504e89d4bd8e22aa0eedfbf06d88bc37f33
 DIST gcc-7.3.0-patches-1.4.tar.bz2 8238 BLAKE2B 72a5dcb046558c8f5c3a75040fe24ce1106c43af7510d6febf667b4377cb9caea5ebe9e1287af90e4ebfffa3f3f22ca85f533acf57c2e2d896f92adc1659b9f5 SHA512 24ed0d82240426efb111bbf48913b96fdc824ae3aa5a653298a726ebe64a40791f484229bbab9cc58f73d658e0b4b83ccd13081cfbea6e1673ef1d076cca3b33
+DIST gcc-7.3.0-patches-1.6.tar.bz2 11313 BLAKE2B cdb823d73a66949cd73f9ebff50cf1cdbb59f04b439a700c239110d36982d70c8acd219402ce8aea26f848d5067856d9aa54470ea683678bbfe9fe08a9f592d1 SHA512 7670deb57e07a83a05f54d962c0faa36d91d8cf43f9f023d3231983e98768d9f90f2a3c9a95f69853086012474fc336bc47fc4af4ab9337b69c89415ce61c1c4
 DIST gcc-7.3.0.tar.xz 62462388 BLAKE2B dc8f132b21bd0543c3d9dd17557038aafe65675aa73c540954234a3c972b4c31c939149bd50183d072ab6c8d16919e19daeaaffd619ce2ccd62dbdf9a5bb3302 SHA512 ad41a7e4584e40e92cdf860bc0288500fbaf5dfb7e8c3fcabe9eba809c87bcfa85b46c19c19921b0cdf6d05483faede8287bb9ea120c0d1559449a70e602c8d4
 DIST gcc-interface-4.9-gpl-2016-src.tar.gz 339037 BLAKE2B 8218ea3a3e3ddb11febb5f2fbcfad69ec25251d3ed6bf4f9c70dc9b3720cc2fb3310d704db40bd0c749be89b17a2b3766ddae3d6158313480073856057ad4bcf SHA512 507df314d1890c228c19f458bd51197377deaaa2d6082fe1e71b62b683252ee5fba4adfe2386246e14618b1c77288e0dcb5bf501e2daaca249b6299462c2f6bd
 DIST gcc-interface-6-gpl-2017-src.tar.gz 347016 BLAKE2B 934c6dac491abece9a6868d28fe9d2a6a1109238fe25c9b94abe83dfc22a1085489f0e0384626da0a3abeebe7537c5715df49a7e2d40577c96eb7ac897b84fd8 SHA512 5833303fce5bf812ccbc71f3d3726c0cb877937d75327edb15097c0b7dba58024a52688392906695ab92fb4e5d7a6623671eac9a05d17937dc0270bafcde920a
@@ -30,7 +32,9 @@ DIST gnat-gpl-2014-x86_64-linux-bin.tar.gz 236253400 BLAKE2B c1db70db9442ba24688
 DIST gnat-gpl-2016-src.tar.gz 8857249 BLAKE2B 3ff0fe247990e2a612ac989aa389e9ccae2e29c16177975c327b53ae1471030d0a70e5a2e3af219ad9a3288c241f2d18da349d0650f7fde01d439f4e4720de88 SHA512 4a5cb58ede5b4ae2887e64f0f2e12e0e06470d320796f06d02f7ddd932ff0d3b40e6d3e98a81138fff6906548a55153c2a186ff4a6e3d23b9dbe01ca582da1f8
 DIST gnat-gpl-2017-src.tar.gz 8783473 BLAKE2B b0415b42f4d3a5e8675591a5602ff0a96945670104064671a232c0c12271ee141a3a5d148b8507bdab83cb8a0677c57b78e690060088308c51732bad3715964f SHA512 ae7314a2241107ed4d962dce08306eeb34c5f11e26183935bbb1ccf3a5eb011d6457c1b6fcded93dd0ee9ba31d791971ebe2a5a5a0ae04ff80d87a670325a098
 DIST gnat-gpl-2018-src.tar.gz 8706578 BLAKE2B ba245fd91cc5263d5b8c159d9e75caf6bed21dcaa5fa43734af8775a4008ce5f96bfb84a8b5e6e734ff883314ab3219dacec3fe95a5baa33fb712bfb5ff8bce8 SHA512 0ff7e848ef77f7e772e2a1b01905307a91c332f32329456f5238c4b7eb46cc118709e8682a5fc826d98a7d99fd15a92c194f4a278f04bc465165cfa616cc3c2e
+EBUILD gnat-gpl-2016-r1.ebuild 5680 BLAKE2B 60f04ec0a78d589656ca1c7307c67051cbfe9c97cf2125fc90531631d61e8f28f7b5d8039820033f37145f6780878c4270216c236744b791eb180c577ccbc5b4 SHA512 3879af661544424ef47dd02461e9a815e96411064e1bc12d7ad52dce29ec90a1f836a9619a08d3feb513a245a21f5eaa04e919ba6ff60081fea7bd6faa4f8801
 EBUILD gnat-gpl-2016.ebuild 5681 BLAKE2B d1c5db2018a8e8d5c9dbb10caf800aa2b3ea220ed7276fa77c43bdef541e523377ea6024d89db75277a68c28796d8fc5d339bdac52802682cc33e6cb458b3922 SHA512 3a6180130b11c3fc9c417f6cfb0303ee21b6e5c183a547e23e9510ea119d3a5becb31a4a073d5b160f9b7146b35c82ab12ea7bb7cdb53b899e89ca1177c3aebf
 EBUILD gnat-gpl-2017.ebuild 4916 BLAKE2B 63c46822894529952dec8f45723b09e590c69269bfc4b3408dc6d720fa72b574956aa3e2a8adc51c400baf02414454d3153022e59cb69ebb4c5c9214fefcc40f SHA512 3d7d6b8fac5e9d0be36df050451a959437796d63f30a678d756af7e9aa5a036d13d2a25a2dcbd16aee799c44cb41ade35ca5771a43dc779ec74d341cd835d99b
+EBUILD gnat-gpl-2018-r1.ebuild 5001 BLAKE2B 162100c8960728c1c161bf5f7abc89e1e20919e456968b68faaf6a76fb0ca40cd01f223a245a9cc46ccaba0c741a34ff5c2c3a5c6dcc1697f54b2999a6769d63 SHA512 f29bfbfe1e122e6c517f740b9da3a65953cdcae14394810446f3a26c26db81164d48275281d14ad2aa205feaf88780669fe31d8b65c746e84cc39a87c0dba740
 EBUILD gnat-gpl-2018.ebuild 4977 BLAKE2B d3444587edad2afcc11eb5a83bcbddc7bdd849140247d9cd049445b356030045709525699e7e616ffa1feda40cd27e141fda5514ef92646e6e56e024e49da504 SHA512 aad1ee06999dec10fa2e7e50867e1a6adbe361de5e795d8f1642831ce2d66559957917d0e9a80cd8498bb447ef8191692f62d162a8760c7831c3468c42946966
 MISC metadata.xml 1960 BLAKE2B e66552f4c0655619e736b6af14822d84e6c49aa6c019cb8c8b0e215629f9c8ab68aa55758639e35107120a39c578d82e1036bc0be82ff67728104f44c875d107 SHA512 04f14bcdd96ae4f6e285abfd07de89828eb989ce779aa59decf689920a179d859ffe809d7960e9c3599c2f6fff6ab2aafbb54458da07fa91841c61e0dfca47ab
diff --git a/dev-lang/gnat-gpl/gnat-gpl-2016-r1.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2016-r1.ebuild
new file mode 100644
index 000000000000..ac29e3d9590c
--- /dev/null
+++ b/dev-lang/gnat-gpl/gnat-gpl-2016-r1.ebuild
@@ -0,0 +1,214 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PATCH_VER="1.3"
+UCLIBC_VER="1.0"
+
+# Hardened gcc 4 stuff
+PIE_VER="0.6.4"
+SPECS_VER="0.2.0"
+SPECS_GCC_VER="4.4.3"
+# arch/libc configurations known to be stable with {PIE,SSP}-by-default
+PIE_GLIBC_STABLE="x86 amd64 mips ppc ppc64 arm ia64"
+PIE_UCLIBC_STABLE="x86 arm amd64 mips ppc ppc64"
+SSP_STABLE="amd64 x86 mips ppc ppc64 arm"
+# uclibc need tls and nptl support for SSP support
+# uclibc need to be >= 0.9.33
+SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm"
+#end Hardened stuff
+
+TOOLCHAIN_GCC_PV=4.9.4
+
+inherit eutils toolchain-funcs toolchain
+
+REL=4.9
+MYP=gcc-${REL}-gpl-${PV}-src
+BTSTRP_X86=gnat-gpl-2014-x86-linux-bin
+BTSTRP_AMD64=gnat-gpl-2014-x86_64-linux-bin
+
+DESCRIPTION="GNAT Ada Compiler - GPL version"
+HOMEPAGE="http://libre.adacore.com/"
+SRC_URI+="
+	http://mirrors.cdn.adacore.com/art/57399304c7a447658e0aff7f
+		-> ${P}-src.tar.gz
+	http://mirrors.cdn.adacore.com/art/573992d4c7a447658d00e1db
+		-> ${MYP}.tar.gz
+	http://mirrors.cdn.adacore.com/art/57399232c7a447658e0aff7d
+		-> gcc-interface-${REL}-gpl-${PV}-src.tar.gz
+	bootstrap? (
+		amd64? (
+			http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c ->
+			${BTSTRP_AMD64}.tar.gz
+		)
+		x86? (
+			http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248 ->
+			${BTSTRP_X86}.tar.gz
+		)
+	)"
+
+LICENSE+=" GPL-2 GPL-3"
+SLOT="${TOOLCHAIN_GCC_PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="bootstrap"
+
+RDEPEND="!sys-devel/gcc:${TOOLCHAIN_GCC_PV}"
+DEPEND="${RDEPEND}
+	elibc_glibc? ( >=sys-libs/glibc-2.8 )
+	>=sys-devel/binutils-2.20"
+
+PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
+
+S="${WORKDIR}"/${MYP}
+
+FSFGCC=gcc-${TOOLCHAIN_GCC_PV}
+
+pkg_setup() {
+	toolchain_pkg_setup
+
+	if use amd64; then
+		BTSTRP=${BTSTRP_AMD64}
+	else
+		BTSTRP=${BTSTRP_X86}
+	fi
+	if use bootstrap; then
+		GCC="${WORKDIR}"/${BTSTRP}/bin/gcc
+	else
+		GCC=${ADA:-$(tc-getCC)}
+	fi
+	CC=${GCC}
+	local base=$(basename ${GCC})
+	CXX="${base/gcc/g++}"
+	GNATMAKE="${base/gcc/gnatmake}"
+	GNATBIND="${base/gcc/gnatbind}"
+	if [[ ${base} != ${GCC} ]] ; then
+		local path=$(dirname ${GCC})
+		GNATMAKE="${path}/${GNATMAKE}"
+		GNATBIND="${path}/${GNATBIND}"
+		CXX="${path}/${CXX}"
+	fi
+}
+
+src_unpack() {
+	if ! use bootstrap && [[ -z "$(type ${GNATMAKE} 2>/dev/null)" ]] ; then
+		eerror "You need a gcc compiler that provides the Ada Compiler:"
+		eerror "1) use gcc-config to select the right compiler or"
+		eerror "2) set the bootstrap use flag"
+		die "ada compiler not available"
+	fi
+
+	GCC_A_FAKEIT="${P}-src.tar.gz
+		${MYP}.tar.gz
+		${FSFGCC}.tar.bz2
+		gcc-interface-${REL}-gpl-${PV}-src.tar.gz"
+	if use bootstrap; then
+		GCC_A_FAKEIT="${GCC_A_FAKEIT} ${BTSTRP}.tar.gz"
+	fi
+
+	toolchain_src_unpack
+	if use bootstrap; then
+		rm ${BTSTRP}/libexec/gcc/${CHOST}/4.7.4/ld || die
+	fi
+}
+
+src_prepare() {
+	mv ../${P}-src/src/ada gcc/ || die
+	mv ../gcc-interface-${REL}-gpl-${PV}-src gcc/ada/gcc-interface || die
+
+	sed -i \
+		-e "s:gnatmake:${GNATMAKE}:g" \
+		gcc/ada/Make-generated.in || die "sed failed"
+
+	sed -i \
+		-e "/xoscons/s:gnatmake:${GNATMAKE}:g" \
+		gcc/ada/gcc-interface/Makefile.in || die "sed failed"
+
+	mv ../${FSFGCC}/gcc/doc/gcc.info gcc/doc/ || die
+	mv ../${FSFGCC}/libjava . || die
+	rm -r ../${FSFGCC} || die
+
+	cd ..
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	rm patch/10_all_default-fortify-source.patch
+	rm piepatch/34_all_gcc48_config_i386.patch
+	cd -
+
+	if has_version '<sys-libs/glibc-2.12' ; then
+		ewarn "Your host glibc is too old; disabling automatic fortify."
+		ewarn "Please rebuild gcc after upgrading to >=glibc-2.12 #362315"
+		EPATCH_EXCLUDE+=" 10_all_default-fortify-source.patch"
+	fi
+
+	# Bug 638056
+	epatch "${FILESDIR}/${P}-bootstrap.patch"
+
+	toolchain_src_prepare
+
+	use vanilla && return 0
+	# Use -r1 for newer piepatchet that use DRIVER_SELF_SPECS for the hardened specs.
+	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env-r1.patch
+}
+
+src_configure() {
+	local trueGCC_BRANCH_VER=${GCC_BRANCH_VER}
+	GCC_BRANCH_VER=$(gcc-version)
+	downgrade_arch_flags
+	GCC_BRANCH_VER=${trueGCC_BRANCH_VER}
+	toolchain_src_configure \
+		--enable-languages=ada \
+		--disable-libada \
+		CC=${GCC} \
+		GNATBIND=${GNATBIND} \
+		GNATMAKE=yes
+}
+
+src_compile() {
+	unset ADAFLAGS
+	toolchain_src_compile
+	gcc_do_make "-C gcc gnatlib-shared"
+	ln -s gcc ../build/prev-gcc || die
+	ln -s ${CHOST} ../build/prev-${CHOST} || die
+	gcc_do_make "-C gcc gnattools"
+}
+
+src_install() {
+	toolchain_src_install
+	cd "${D}"${BINPATH}
+	for x in gnat*; do
+		# For some reason, g77 gets made instead of ${CTARGET}-g77...
+		# this should take care of that
+		if [[ -f ${x} ]] ; then
+			# In case they're hardlinks, clear out the target first
+			# otherwise the mv below will complain.
+			rm -f ${CTARGET}-${x}
+			mv ${x} ${CTARGET}-${x}
+		fi
+
+		if [[ -f ${CTARGET}-${x} ]] ; then
+			if ! is_crosscompile ; then
+				ln -sf ${CTARGET}-${x} ${x}
+				dosym ${BINPATH#${EPREFIX}}/${CTARGET}-${x} \
+					/usr/bin/${x}-${GCC_CONFIG_VER}
+			fi
+			# Create versioned symlinks
+			dosym ${BINPATH#${EPREFIX}}/${CTARGET}-${x} \
+				/usr/bin/${CTARGET}-${x}-${GCC_CONFIG_VER}
+		fi
+
+		if [[ -f ${CTARGET}-${x}-${GCC_CONFIG_VER} ]] ; then
+			rm -f ${CTARGET}-${x}-${GCC_CONFIG_VER}
+			ln -sf ${CTARGET}-${x} ${CTARGET}-${x}-${GCC_CONFIG_VER}
+		fi
+	done
+}
+
+pkg_postinst () {
+	toolchain_pkg_postinst
+	einfo "This provide the GNAT compiler with gcc for ada/c/c++ and more"
+	einfo "The compiler binary is gcc-${TOOLCHAIN_GCC_PV}"
+	einfo "Even if the c/c++ compilers are using almost the same patched"
+	einfo "source as the sys-devel/gcc package its use is not extensively"
+	einfo "tested, and not supported for updating your system, except for ada"
+	einfo "related packages"
+}
diff --git a/dev-lang/gnat-gpl/gnat-gpl-2018-r1.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2018-r1.ebuild
new file mode 100644
index 000000000000..13a8539ec192
--- /dev/null
+++ b/dev-lang/gnat-gpl/gnat-gpl-2018-r1.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PATCH_VER="1.6"
+
+TOOLCHAIN_GCC_PV=7.3.0
+GCC_CONFIG_VER=7.3.1
+
+inherit eutils toolchain-funcs toolchain
+
+REL=7
+MYP=gcc-${REL}-gpl-${PV}-src
+BTSTRP_X86=gnat-gpl-2014-x86-linux-bin
+BTSTRP_AMD64=gnat-gpl-2014-x86_64-linux-bin
+
+DESCRIPTION="GNAT Ada Compiler - GPL version"
+HOMEPAGE="http://libre.adacore.com/"
+SRC_URI+="
+	http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27aa5
+		-> ${P}-src.tar.gz
+	http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27aa7
+		-> ${MYP}.tar.gz
+	http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27aa6
+		-> gcc-interface-${REL}-gpl-${PV}-src.tar.gz
+	bootstrap? (
+		amd64? (
+			http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c ->
+			${BTSTRP_AMD64}.tar.gz
+		)
+		x86? (
+			http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248 ->
+			${BTSTRP_X86}.tar.gz
+		)
+	)"
+
+LICENSE+=" GPL-2 GPL-3"
+KEYWORDS="~amd64 ~x86"
+IUSE="+bootstrap"
+
+RDEPEND="!sys-devel/gcc:${GCC_CONFIG_VER}"
+DEPEND="${RDEPEND}
+	elibc_glibc? ( >=sys-libs/glibc-2.13 )
+	>=sys-devel/binutils-2.20"
+
+S="${WORKDIR}"/${MYP}
+PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )"
+FSFGCC=gcc-${TOOLCHAIN_GCC_PV}
+
+pkg_setup() {
+	toolchain_pkg_setup
+
+	if use amd64; then
+		BTSTRP=${BTSTRP_AMD64}
+	else
+		BTSTRP=${BTSTRP_X86}
+	fi
+
+	if use bootstrap; then
+		GCC="${WORKDIR}"/${BTSTRP}/bin/gcc
+	else
+		GCC=${ADA:-$(tc-getCC)}
+	fi
+
+	gnatbase=$(basename ${GCC})
+	gnatpath=$(dirname ${GCC})
+
+	GNATMAKE=${gnatbase/gcc/gnatmake}
+	if [[ ${gnatpath} != "." ]] ; then
+		GNATMAKE="${gnatpath}/${GNATMAKE}"
+	fi
+}
+
+src_unpack() {
+	if ! use bootstrap && [[ -z "$(type ${GNATMAKE} 2>/dev/null)" ]] ; then
+		eerror "You need a gcc compiler that provides the Ada Compiler:"
+		eerror "1) use gcc-config to select the right compiler or"
+		eerror "2) set the bootstrap use flag"
+		die "ada compiler not available"
+	fi
+
+	GCC_A_FAKEIT="
+		${P}-src.tar.gz
+		${MYP}.tar.gz
+		gcc-interface-${REL}-gpl-${PV}-src.tar.gz"
+	if use bootstrap; then
+		GCC_A_FAKEIT="${GCC_A_FAKEIT} ${BTSTRP}.tar.gz"
+	fi
+
+	toolchain_src_unpack
+	if use bootstrap; then
+		rm ${BTSTRP}/libexec/gcc/${CHOST}/4.7.4/ld || die
+	fi
+}
+
+src_prepare() {
+	CC=${GCC}
+	CXX="${gnatbase/gcc/g++}"
+	GNATBIND="${gnatbase/gcc/gnatbind}"
+	GNATLINK="${gnatbase/gcc/gnatlink}"
+	GNATLS="${gnatbase/gcc/gnatls}"
+	if [[ ${gnatpath} != "." ]] ; then
+		CXX="${gnatpath}/${CXX}"
+		GNATBIND="${gnatpath}/${GNATBIND}"
+		GNATLINK="${gnatpath}/${GNATLINK}"
+		GNATLS="${gnatpath}/${GNATLS}"
+	fi
+	mkdir bin || die
+	ln -s $(which ${GCC}) bin/gcc || die
+	ln -s $(which ${CXX}) bin/g++ || die
+	ln -s $(which ${GNATMAKE}) bin/gnatmake || die
+	ln -s $(which ${GNATBIND}) bin/gnatbind || die
+	ln -s $(which ${GNATLINK}) bin/gnatlink || die
+	ln -s $(which ${GNATLS}) bin/gnatls || die
+
+	cd ..
+	mv ${P}-src/src/ada ${MYP}/gcc/ || die
+	mv gcc-interface-${REL}-gpl-${PV}-src ${MYP}/gcc/ada/gcc-interface || die
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	rm patch/91_all_bmi-i386-PR-target-81763.patch || die
+	rm patch/93_all_copy-constructible-fix.patch || die
+	rm patch/95*.patch || die
+	cd -
+	sed -i \
+		-e 's:$(P) ::g' \
+		gcc/ada/gcc-interface/Makefile.in \
+		|| die "sed failed"
+	toolchain_src_prepare
+}
+
+src_configure() {
+	export PATH=${PWD}/bin:${PATH}
+	local trueGCC_BRANCH_VER=${GCC_BRANCH_VER}
+	GCC_BRANCH_VER=$(gcc-version)
+	downgrade_arch_flags
+	GCC_BRANCH_VER=${trueGCC_BRANCH_VER}
+	toolchain_src_configure \
+		--enable-languages=ada \
+		--disable-libada
+}
+
+src_compile() {
+	unset ADAFLAGS
+	toolchain_src_compile
+	gcc_do_make "-C gcc gnatlib-shared"
+	ln -s gcc ../build/prev-gcc || die
+	ln -s ${CHOST} ../build/prev-${CHOST} || die
+	gcc_do_make "-C gcc gnattools"
+}
+
+src_install() {
+	toolchain_src_install
+	cd "${D}"${BINPATH}
+	for x in gnat*; do
+		# For some reason, g77 gets made instead of ${CTARGET}-g77...
+		# this should take care of that
+		if [[ -f ${x} ]] ; then
+			# In case they're hardlinks, clear out the target first
+			# otherwise the mv below will complain.
+			rm -f ${CTARGET}-${x}
+			mv ${x} ${CTARGET}-${x}
+		fi
+
+		if [[ -f ${CTARGET}-${x} ]] ; then
+			if ! is_crosscompile ; then
+				ln -sf ${CTARGET}-${x} ${x}
+				dosym ${BINPATH#${EPREFIX}}/${CTARGET}-${x} \
+					/usr/bin/${x}-${GCC_CONFIG_VER}
+			fi
+			# Create versioned symlinks
+			dosym ${BINPATH#${EPREFIX}}/${CTARGET}-${x} \
+				/usr/bin/${CTARGET}-${x}-${GCC_CONFIG_VER}
+		fi
+
+		if [[ -f ${CTARGET}-${x}-${GCC_CONFIG_VER} ]] ; then
+			rm -f ${CTARGET}-${x}-${GCC_CONFIG_VER}
+			ln -sf ${CTARGET}-${x} ${CTARGET}-${x}-${GCC_CONFIG_VER}
+		fi
+	done
+}
+
+pkg_postinst () {
+	toolchain_pkg_postinst
+	einfo "This provide the GNAT compiler with gcc for ada/c/c++ and more"
+	einfo "The compiler binary is ${CTARGET}-gcc-${TOOLCHAIN_GCC_PV}"
+	einfo "Even if the c/c++ compilers are using almost the same patched"
+	einfo "source as the sys-devel/gcc package its use is not extensively"
+	einfo "tested, and not supported for updating your system, except for ada"
+	einfo "related packages"
+}
diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz
index 84643e03b06f..f7da536ad397 100644
Binary files a/dev-tcltk/Manifest.gz and b/dev-tcltk/Manifest.gz differ
diff --git a/dev-tcltk/expect-lite/Manifest b/dev-tcltk/expect-lite/Manifest
index 653d2ae7b2a9..841ed9d2764e 100644
--- a/dev-tcltk/expect-lite/Manifest
+++ b/dev-tcltk/expect-lite/Manifest
@@ -1,7 +1,9 @@
 DIST expect-lite_4.6.1.tar.gz 142875 BLAKE2B 9e7143d78d68338c4d6ec2858f3a24c5b5330193bfc064c27b190bf6ac7b01e53340e48006f5313cb301b6f6f9f858e818ead8fbe6117ba9ee8c6035b9f9b059 SHA512 a250f34472dad6c44149edf85d35f7ea159e0673aa5619864a71eb78003d0c1a2ec3d25505618f616d12d82d50bda8039a239b443014b43b2387059e6b6eb7d6
 DIST expect-lite_4.7.2.tar.gz 145084 BLAKE2B 053f26ceaa98cde7bfe680f3076cdcd5391cfb6483c6ec0d0c9bcdf1f51e4b53c6429cef50a10915cbb01955fbee77bb6075bde612b6299bfd95357ab88f7408 SHA512 1f635f87fb53624f687477bae41edd37474c5358de368af8065d4222181ed4a5efdb55c8fda47e1f1b4c163fa2a423e7d84a7da8415b17cd250417432ee0fc5b
 DIST expect-lite_4.8.0.tar.gz 148917 BLAKE2B 0aeba8356c41f740807b914941c58a7ed26cc826ce2e297c5275b4f9a8c227437b2120d74f60229274aa56858ce03021245ef218e8d75a64cc6508f43b3afe2b SHA512 b4956dbcdde1e5648a51be99069069be6ff2ae6fb7a67116a35bbbb8786228920e9177bd1b14d0ac3dd0a8ebdd6fa523c62bb7f23c84407ebe73abe3523e43c0
+DIST expect-lite_4.9.0.tar.gz 149560 BLAKE2B 6db5c7f37d996996bcd94ef5e0b7d2d2d592cfd88f56f751c35f53826d3cea473861d332327caf4e9c6950a983b2d907955a7b68e8ea46655e07a8197fbe1f6b SHA512 1a210f5937cf31768a77c9f8d7147be1d8bd3f4e3c68c8941fef7871d22c209c9946aa1f3b2705a0332523439a7e8c9ef7ae3a46d4b5174b5e759bf15dcad4e5
 EBUILD expect-lite-4.6.1.ebuild 626 BLAKE2B dfca655dcbbfc6c05af6f22dd45f7fbc0aada96cb6e6402c98aa4b481c866d5aee41940f17d2b62d2628c36bc7b7e403c52df6ad429c843a9a0793e750abafa3 SHA512 cbeb25d446b9441324b29e41978c4b8cceaffdbf25a365492b676a601046c078dc172941a04ec327d52ce5211e36e125d84863b39bc3d90e452c164f43a5141b
 EBUILD expect-lite-4.7.2.ebuild 628 BLAKE2B 4762755e07d9bbaacb84dc0e6295d864e0c6bd3e3985ffedaee761bc380cf8c7927bf5aaaabcf60dfde5bdbb9fe92e9e0138a023adb34e3c92544ec704a53c5b SHA512 aff36ec455374906e646afb0accbd041dfcbab5397e84c41e77e6597db436894c1299db9b12dfcca746a7067ddaf26b1e6a050cb1ff1ca7eab1a43dc0d5a6687
 EBUILD expect-lite-4.8.0.ebuild 609 BLAKE2B 03e0ccd1544a9c4dff58d7b5e02bef9a5878ddac6e5361725357aded02e4ee164a09a2f08991872ee273302f33ff8251718dd2e744568dd56a81da2c1e017e13 SHA512 659555ec0eb741831fd52046fd335c297046033111102b37591bcc87118a263e1b77649af5ec9fa30db0c81ad32fd74058f7fb50a61e46e4c319ed4acf165b67
+EBUILD expect-lite-4.9.0.ebuild 629 BLAKE2B e80f7f9c066018ccc411f503ba09fdc4d6da62699da2f61f871ca81b2eef84fd9fb41252805a521d0cd099ccee903f9d845dea49e80279b83e40fe7a47318d61 SHA512 5f52232d8d12a1417c4c867d30a609f48576b6f5fbc480c58044baaf4c40a827cb40ad34bb60abd470fe31b9b6566e4341bcdc971bcde1cb2d615b5277bb404c
 MISC metadata.xml 434 BLAKE2B 7255ecd664e8675ba5728d606b7961ffca2823b680cdc6c2c7cd918abf474563f87a09911cf9e71f82970fe9216c5b91f00dee7b25fcf38fb3296e9695827b8b SHA512 ecdfb3b8fcb84becaf9284a7ca2efdc9d49e662394a6a9a0fb6d8a8ba3249b3c2b622dbbfd41790235be170ee9c64d96b2e5e99cf8dab52ed904ccb18ffbd8bf
diff --git a/dev-tcltk/expect-lite/expect-lite-4.9.0.ebuild b/dev-tcltk/expect-lite/expect-lite-4.9.0.ebuild
new file mode 100644
index 000000000000..4ca05009dc47
--- /dev/null
+++ b/dev-tcltk/expect-lite/expect-lite-4.9.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="quick and easy command line automation tool built on top of expect"
+HOMEPAGE="http://expect-lite.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug examples"
+
+RDEPEND="dev-tcltk/expect
+	debug? ( dev-tcltk/tclx )"
+
+S=${WORKDIR}/${PN}.proj
+
+DOCS=(
+	bashrc ChangeLog README
+)
+
+HTML_DOCS=(
+	"Docs/*"
+)
+
+src_install() {
+	default
+	dobin ${PN}
+	doman man/*
+
+	if use examples ; then
+		docinto examples
+		dodoc examples/*
+	fi
+}
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index c1a43bab559e..5c3805883959 100644
Binary files a/dev-vcs/Manifest.gz and b/dev-vcs/Manifest.gz differ
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index dedd77ab2955..0c4cb3db9de2 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -34,7 +34,7 @@ DIST git-manpages-2.19.1.tar.xz 431852 BLAKE2B e15be2e1680a28c3c57e7b6e022173ef4
 EBUILD git-2.16.4.ebuild 19308 BLAKE2B c9b9a129e60c18afca00af335bc8098ee24c7ab767d69b75453d5dc223c1d885f6b199868b0155a961eacb39b79bc7d0d9d918f17c581923fec0a352d3e83004 SHA512 b333154f1ed1d0f568f9ca2de3b2ff27210c14ab7e5a6bcf5893eefd1da22578a75b88b18226fd099a21b7768d629f7f08fe3cda49283c5f3ff99d63c9352019
 EBUILD git-2.16.5.ebuild 19321 BLAKE2B 705159518a346d42653fb45e37e4279d774a64aee81d5171b5c4a66f3f3b7b3cac2c53ca387aa44564d877f78f9c42bc7b3877c6fbac8e700c40df729f889088 SHA512 03336f2ebf3d1d269b2d901eb0d8a6a2465b4a897e633a4a1319ef2344160a0cc3f97e3ef90b89a438f8ab8f406a86e76fe54d3111a2656592deccdb16deec0f
 EBUILD git-2.18.0.ebuild 19285 BLAKE2B b063979032d0f4dbd7b60a83a1e9f911b22dd713ca44f5d3574218e2d8df5688fc7bcab53d879738d2b9f1f904fdf2ba2311aa04737404c0fd46290d3bccaa09 SHA512 e71875cd6015c6a7e38973877e6d5d8856a323577ecbf18c8cebc12e18ae1702044b624e3b4ef2410d1003c4761509e47ae0f93b5bc1a68fcc562c1f7841bcd5
-EBUILD git-2.18.1.ebuild 19292 BLAKE2B 363d21d85e7290ab85390bcf930f4ed6d8e41c0a23eb0eab6cc0477d984915113970790d08b9e504a938e9f0cd5be7430c909a28e7b79527ad85577a664ebeb5 SHA512 9350f9a6b52935a74b6506650387954b64d97626978785e887f14fdf9f0826b8c956468663775a5603fe2a5884c0da021787ac31f216a6da47b19f4012e57a76
+EBUILD git-2.18.1.ebuild 19291 BLAKE2B 1a5ab59539f7c530389a378abdf9b1b8d5d50f57dfbcd112db98ab8984a221bee04627fbde2493ac87c92b4c7dd5fe100dd6c915338077690d9e0b50d9d29c3d SHA512 c1ef53b32767bd2eb0996bc6781351fb309c0db48fc23f682d813085279d03e64fe33fc6a9cf676434eb5b70092c0540e08573aa740163749c137727e991508a
 EBUILD git-2.19.0.ebuild 18970 BLAKE2B 288408e8e20bbb5b16e714d366af4573b88c906a5af70e9f53c5c1f3dd1f80d7682295066aa8a0b8cde5feb12eafc1e292e63786bed2455e33e58770935be849 SHA512 de17312e00f2c9c412b98056a565329a237960a2a80c0769d4a9481fb10bc3b9273b39ad924fafee08b358165aef161208e5e308a13e5c8d9dc1a678247dbb79
 EBUILD git-2.19.1.ebuild 18970 BLAKE2B 288408e8e20bbb5b16e714d366af4573b88c906a5af70e9f53c5c1f3dd1f80d7682295066aa8a0b8cde5feb12eafc1e292e63786bed2455e33e58770935be849 SHA512 de17312e00f2c9c412b98056a565329a237960a2a80c0769d4a9481fb10bc3b9273b39ad924fafee08b358165aef161208e5e308a13e5c8d9dc1a678247dbb79
 EBUILD git-9999-r1.ebuild 18970 BLAKE2B 288408e8e20bbb5b16e714d366af4573b88c906a5af70e9f53c5c1f3dd1f80d7682295066aa8a0b8cde5feb12eafc1e292e63786bed2455e33e58770935be849 SHA512 de17312e00f2c9c412b98056a565329a237960a2a80c0769d4a9481fb10bc3b9273b39ad924fafee08b358165aef161208e5e308a13e5c8d9dc1a678247dbb79
diff --git a/dev-vcs/git/git-2.18.1.ebuild b/dev-vcs/git/git-2.18.1.ebuild
index 2f2de4ae7ec0..c647dc5d9224 100644
--- a/dev-vcs/git/git-2.18.1.ebuild
+++ b/dev-vcs/git/git-2.18.1.ebuild
@@ -45,7 +45,7 @@ if [[ ${PV} != *9999 ]]; then
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index 29cfc97b69c7..160d18aa3b3b 100644
Binary files a/kde-misc/Manifest.gz and b/kde-misc/Manifest.gz differ
diff --git a/kde-misc/tellico/Manifest b/kde-misc/tellico/Manifest
index e0d8f711927a..b2c61f228c73 100644
--- a/kde-misc/tellico/Manifest
+++ b/kde-misc/tellico/Manifest
@@ -1,3 +1,7 @@
+AUX tellico-3.1.3-regexp-filtering.patch 1450 BLAKE2B 0149988de7c468ba089fe61aff7d7d0b111576f894d2f80bf4e2ddec13edf59baf575fec007833baa1d2610f045948dc79a89896d9482927bed62df4c341ad53 SHA512 406d30f13b3f9c7adf884ab71658781ceececa9e3befe05338f7d90bc0955ac93bc6d362c1e03a70452da34fb8640907fd89374f896ef33523bc51bdce3208ec
+AUX tellico-3.1.3-version.patch 586 BLAKE2B a4e6a53891b8418f1abdde2ecd25085c15f7f689e3647be241af605c877798e31a95bc3bd269c6a5103919f13a542cd60a626f7fab4e129b91cacfd80a0bde93 SHA512 72393098706404d200c5c57826ec064db49ace5508577e05d35078f215c204d6cf5921384ee823d4adf0f0d3e3aeb15e29fae214dfe01b21748b36b199e87ed4
 DIST tellico-3.1.2.tar.xz 4591752 BLAKE2B 9601fa35c068d7c961bef1235cb65609b8c148b64a72771817ac16e3662ebdc35ed9b53944fe1d30c62732f2861e5a668907cc3ea9dc9f682c9e2336b12bea22 SHA512 e86966636123db813f33ad90197950e1afb38d4096e15c785a9d9f2b846872d254cbdaeec7528a13627bf8edc63d409a42fbb35172949b9b45d6a4b5c40ac28f
+DIST tellico-3.1.3.tar.xz 4607668 BLAKE2B 4c4fb678b16611c448e0fc77f0b5c9e03f344c76d20e6006c03ee12140b647fefa7a3aba2f5312ea8c36f3722418981fb469a6c199f1e115542c784003854d28 SHA512 9024f423f0685e834ed46e7038c5b95fab5b684aaac00d6298e23493fb4290daeda994faf36a0f04973093a477be5506591e6b0e7f57ef5591fb10953ad8ec5e
 EBUILD tellico-3.1.2.ebuild 2444 BLAKE2B dfec9fcfd4d5aa540754add21046d5b2612c330f2a25532265afe9ee862ef653623088042eb21b159df97afaf1ce564dd1eca3ddaa0632c326e4b74497c0e8f6 SHA512 dd30b2d42880faaa59f42a00a600f4c81f541b8bc69700f8d86f63fe8a774604e7ffba136c6afb0e1e51ad1cc04c54658080249b15eb1555c666da8a3ca91a44
+EBUILD tellico-3.1.3.ebuild 2531 BLAKE2B 1c430392dff83d804b2569f81391a27dac33ba44fe05e2890250161488809d339e7db77c530fb2cb5f6593639702bf14fb6c7e8c9cd770b69be3928a575889be SHA512 74552cda47e9c8a94c02c82ea58aab356e40b3ed402bc05b50456fa2e1b7b03d255d53476e3c71c29b61c5a8ab4b4b67b396a9aa1f42521c50418b5a3b7c3f0d
 MISC metadata.xml 597 BLAKE2B 7b88f7d3e9aa4e5a291eb98034886b61d9f68dd0ef694da227287a6e4892fb553fc3c14a84a087dbbccdfbd5a4291e7708f772e2655ba9e314a8627e77871346 SHA512 3e1196598053c7ba9a29d578f20da3da281d0ed27e371716e66c3311e6dc888baa28f72cbe5af768ff8aed50eff84f541b2ba2a62f5f5fe6ef48ed125e4f8300
diff --git a/kde-misc/tellico/files/tellico-3.1.3-regexp-filtering.patch b/kde-misc/tellico/files/tellico-3.1.3-regexp-filtering.patch
new file mode 100644
index 000000000000..51a4c2b470f6
--- /dev/null
+++ b/kde-misc/tellico/files/tellico-3.1.3-regexp-filtering.patch
@@ -0,0 +1,44 @@
+From 47f19fac2fdbbf5c5b5124883043e473f8c44edd Mon Sep 17 00:00:00 2001
+From: Robby Stephenson <robby@periapsis.org>
+Date: Tue, 2 Oct 2018 21:02:37 -0400
+Subject: Fix bug when using regexp filter for number fields
+
+Only use a QIntValidator when the filter rule is not a regular
+expression.
+
+BUG: 399323
+FIXED-IN: 3.1.4
+FIXED-IN: 3.2
+---
+ ChangeLog                    | 4 ++++
+ src/gui/filterrulewidget.cpp | 3 ++-
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index 879f4d0..3284dc7 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,7 @@
++2018-10-02  Robby Stephenson  <robby@periapsis.org>
++
++	* Fixed bug when using a regular expression for filtering in a number field (Bug 399323).
++
+ 2018-09-02  Robby Stephenson  <robby@periapsis.org>
+ 
+ 	* Released Tellico 3.1.3.
+diff --git a/src/gui/filterrulewidget.cpp b/src/gui/filterrulewidget.cpp
+index 8e3d7b1..aa3718d 100644
+--- a/src/gui/filterrulewidget.cpp
++++ b/src/gui/filterrulewidget.cpp
+@@ -169,7 +169,8 @@ void FilterRuleWidget::slotRuleFunctionChanged(int which_) {
+   } else {
+     m_valueStack->setCurrentWidget(m_ruleValue);
+     m_ruleValue->setPlaceholderText(QString());
+-    if(m_ruleType == Number) {
++    if(m_ruleType == Number &&
++      (data != FilterRule::FuncRegExp && data != FilterRule::FuncNotRegExp)) {
+       m_ruleValue->setValidator(new QIntValidator(this));
+     } else {
+       m_ruleValue->setValidator(nullptr);
+-- 
+cgit v0.11.2
diff --git a/kde-misc/tellico/files/tellico-3.1.3-version.patch b/kde-misc/tellico/files/tellico-3.1.3-version.patch
new file mode 100644
index 000000000000..845d08316178
--- /dev/null
+++ b/kde-misc/tellico/files/tellico-3.1.3-version.patch
@@ -0,0 +1,24 @@
+From 1aa87a1c1538a0103a1624c663606b8d47566f42 Mon Sep 17 00:00:00 2001
+From: Robby Stephenson <robby@periapsis.org>
+Date: Mon, 3 Sep 2018 08:39:49 -0400
+Subject: Correctly set version number
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 214e2ca..817750b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -2,7 +2,7 @@
+ cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
+ 
+ project(Tellico)
+-set(TELLICO_VERSION "3.1.2+git")
++set(TELLICO_VERSION "3.1.3")
+ 
+ set(QT_MIN_VERSION "5.4.0")
+ 
+-- 
+cgit v0.11.2
diff --git a/kde-misc/tellico/tellico-3.1.3.ebuild b/kde-misc/tellico/tellico-3.1.3.ebuild
new file mode 100644
index 000000000000..f536c9614b6a
--- /dev/null
+++ b/kde-misc/tellico/tellico-3.1.3.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Collection manager based on KDE Frameworks"
+HOMEPAGE="http://tellico-project.org/"
+SRC_URI="http://tellico-project.org/files/${P}.tar.xz"
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+KEYWORDS="~amd64 ~x86"
+IUSE="cddb discid pdf scanner semantic-desktop taglib v4l xmp yaz"
+
+RDEPEND="
+	$(add_frameworks_dep karchive)
+	$(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 kguiaddons)
+	$(add_frameworks_dep khtml)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_frameworks_dep sonnet)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	>=dev-perl/Text-BibTeX-0.780.0-r1
+	dev-libs/libxml2
+	dev-libs/libxslt
+	cddb? ( $(add_kdeapps_dep libkcddb) )
+	discid? ( dev-libs/libcdio:= )
+	pdf? ( app-text/poppler[qt5] )
+	scanner? ( $(add_kdeapps_dep libksane) )
+	semantic-desktop? ( $(add_frameworks_dep kfilemetadata) )
+	taglib? ( >=media-libs/taglib-1.5 )
+	v4l? ( >=media-libs/libv4l-0.8.3 )
+	xmp? ( >=media-libs/exempi-2 )
+	yaz? ( >=dev-libs/yaz-2:0 )
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+"
+
+# tests need network access
+RESTRICT="test"
+
+DOCS=( AUTHORS ChangeLog README )
+
+PATCHES=(
+	"${FILESDIR}/${P}-version.patch"
+	"${FILESDIR}/${P}-regexp-filtering.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_Csv=ON
+		$(cmake-utils_use_find_package cddb KF5Cddb)
+		$(cmake-utils_use_find_package discid CDIO)
+		$(cmake-utils_use_find_package pdf Poppler)
+		$(cmake-utils_use_find_package scanner KF5Sane)
+		$(cmake-utils_use_find_package semantic-desktop KF5FileMetaData)
+		$(cmake-utils_use_find_package taglib Taglib)
+		-DENABLE_WEBCAM=$(usex v4l)
+		$(cmake-utils_use_find_package xmp Exempi)
+		$(cmake-utils_use_find_package yaz Yaz)
+	)
+
+	kde5_src_configure
+}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 2e44ba82e9cd..ee2df3d7bc58 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/libextractor/Manifest b/media-libs/libextractor/Manifest
index 7cec762e034f..4853f4879045 100644
--- a/media-libs/libextractor/Manifest
+++ b/media-libs/libextractor/Manifest
@@ -1,5 +1,7 @@
 AUX libextractor-1.6-CVE-2017-17440.patch 3584 BLAKE2B a50d293c88c95c59d3399a2ca4fee6f6e935bee84d4f7c7a5a85e27f0f1e34edb0713f0e0010491015e0c792de5bbde64c2dc392a01ec3470ecec46ed8691a04 SHA512 defa28c0303028cdb8c2d08d15ff62a56a7548ed57d6b577bc61842e74b69b4da6d82ba48082e89341643db433b7f256423556ab482fd6a61936ecd18637796b
 AUX libextractor-1.6-ffmpeg-4.patch 873 BLAKE2B ebaec46a809c12252c7c6416a9376b86d6af353a74ae4779fb36af93465dee6654c3717a51df0a138ac70aa08ec3a790950e64602547e091eb2dfb3f209ebc7a SHA512 2931a1fe44f3a5d5d5307ef9ae33237e803a4afc6a47df3a465c1f502ed872391957cd81ac5154053cd4d2b6caf690335791b5ed0cede7227291450bb7dd4a9a
 DIST libextractor-1.6.tar.gz 8053454 BLAKE2B cf5e9d5fd1bc09e20495810e5a85280916632eb1c5e5c6c68aaf1cbccb8a5970465d3fd6b313e0cfc7e5c262a815996d7bec563c04b04faf7467ddbe987dfb4c SHA512 1e477450d89cc83030100fc9dc11734f39b1ccd1765f8cf4a4938f32253e2e19a48b5337328605451589865142b2d6bf6d7102198115985a1e0da22fca4bc2a8
+DIST libextractor-1.7.tar.gz 8075299 BLAKE2B ce738f8839dded4065f8f8d4241c8ad525930f852492605af75c7031b5204c09763c2d4c7a84df6e062512e66509fa308163bcbfd5b655e071c8e43d4fe48f07 SHA512 00340af0987f58c16824f50a18484e76f110fa2b4a43788b950ea4313e6916b94d5e7f16e1f21c8a54509885d9b44dabdc5be7727547549836ddd8ca7251dbff
 EBUILD libextractor-1.6.ebuild 2903 BLAKE2B 8ede2d00e886629456ff76eff0d9dd0b4186d530eb833670ef4b29145f2428aad33505b1d341dddf1c2e28c64802593ed04fc85d76aa4e95e39bd8c34756f6c5 SHA512 be91cb7483cd04dcbee3b07d638da2b604b499389b355f2a6f43701e3c27b396d2f595ee0986c410e97f855bbbe47cb642a4b2f9a1fd0edbf39d4f07565e847e
+EBUILD libextractor-1.7.ebuild 2756 BLAKE2B e0d8da460333a504cc039d1aa3817b2bbda780603912cac22bc3b74b36d7a46f42437ebc9630f8f8406050cac8860da66abeb55d4c9a3f4a4a0baa410ad223d7 SHA512 8408b9c28324b94a1212e268adc6231b956c611fbf29798ffba84bd54649a6e81be7383dfbaf74b5f756b86bcfd9f75e3f0f70ec28250dcea0e5e183b1fdede3
 MISC metadata.xml 615 BLAKE2B eac56c7364e331eb2a0f0955318cfb0cf7c6fe4a95493899b489f755d18b4c4b1ced0e7f7ea0a7716c996ac7640d04a326cbd2230313e123c4b2de4fefbaccba SHA512 b4a4403dfccc02e61fa15f60a19ed23ce43374cc41d616ebbe385865618ae9392bd663fbdbdf01013f4203de2ee51dcbe1caf0974d720dac1be1f4ea029b4fc0
diff --git a/media-libs/libextractor/libextractor-1.7.ebuild b/media-libs/libextractor/libextractor-1.7.ebuild
new file mode 100644
index 000000000000..74dc8b4f10b7
--- /dev/null
+++ b/media-libs/libextractor/libextractor-1.7.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Library to extract metadata from files of arbitrary type"
+HOMEPAGE="https://www.gnu.org/software/libextractor/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="apparmor +archive +bzip2 ffmpeg flac gif gsf gstreamer gtk jpeg +magic midi mp4 mpeg tidy tiff vorbis +zlib" # test
+
+RESTRICT="test"
+
+DEPEND="
+	app-text/iso-codes
+	dev-libs/glib:2
+	media-gfx/exiv2:=
+	sys-devel/libtool
+	virtual/libiconv
+	virtual/libintl
+	apparmor? ( sys-libs/libapparmor )
+	archive? ( app-arch/libarchive:= )
+	bzip2? ( app-arch/bzip2 )
+	ffmpeg? ( virtual/ffmpeg )
+	flac? (
+		media-libs/flac
+		media-libs/libogg
+	)
+	gif? ( media-libs/giflib:= )
+	gsf? ( gnome-extra/libgsf:= )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	gtk? ( x11-libs/gtk+:3 )
+	jpeg? ( virtual/jpeg:0 )
+	magic? ( sys-apps/file )
+	midi? ( media-libs/libsmf )
+	mp4? ( media-libs/libmp4v2:0 )
+	mpeg? ( media-libs/libmpeg2 )
+	tidy? ( app-text/htmltidy )
+	tiff? ( media-libs/tiff:0 )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	zlib? ( sys-libs/zlib )
+"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+# test? ( app-forensics/zzuf )
+RDEPEND="${DEPEND}
+	!sci-biology/glimmer
+"
+
+src_prepare() {
+	default
+
+	# m4/ax_create_pkgconfig_info.m4 is passing environment LDFLAGS to Libs:
+	sed -i \
+		-e '/^ax_create_pkgconfig_ldflags=/s:$LDFLAGS ::' \
+		-e 's:tidy/tidy.h:tidy.h:' \
+		-e 's:tidy/tidybuffio.h:buffio.h:' \
+		configure src/plugins/html_extractor.c || die
+
+	if ! use tidy; then
+		sed -i -e 's:tidy.h:dIsAbLe&:' configure || die
+	fi
+}
+
+src_configure() {
+	e_ac_cv() {
+		export ac_cv_"$@"
+	}
+
+	e_ac_cv {lib_rpm_rpmReadPackageFile,prog_HAVE_ZZUF}=no
+
+	e_ac_cv header_FLAC_all_h=$(usex flac)
+	e_ac_cv lib_FLAC_FLAC__stream_decoder_init_stream=$(usex flac)
+	e_ac_cv lib_FLAC_FLAC__stream_decoder_init_ogg_stream=$(usex flac)
+
+	e_ac_cv header_sys_apparmor_h=$(usex apparmor)
+	e_ac_cv header_archive_h=$(usex archive)
+	e_ac_cv header_bzlib_h=$(usex bzip2)
+	e_ac_cv header_gif_lib_h=$(usex gif)
+	e_ac_cv header_jpeglib_h=$(usex jpeg)
+	e_ac_cv header_magic_h=$(usex magic)
+	e_ac_cv header_mpeg2dec_mpeg2_h=$(usex mpeg)
+	e_ac_cv header_tiffio_h=$(usex tiff)
+	e_ac_cv header_vorbis_vorbisfile_h=$(usex vorbis)
+	e_ac_cv header_zlib_h=$(usex zlib)
+	e_ac_cv lib_mp4v2_MP4ReadProvider=$(usex mp4)
+	e_ac_cv lib_smf_smf_load_from_memory=$(usex midi)
+
+	econf \
+		--disable-static \
+		--enable-experimental \
+		--enable-glib \
+		--disable-gsf-gnome \
+		$(use_enable ffmpeg) \
+		$(use_enable gsf) \
+		$(use_with gstreamer)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index a9b83874b0ee..1dbe865e0da2 100644
Binary files a/metadata/Manifest.gz and b/metadata/Manifest.gz differ
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index fd78166f28e7..41afc63e4c4c 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 09 Oct 2018 06:08:37 +0000
+Tue, 09 Oct 2018 09:08:33 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index e8cdba7ddb56..cc87d0db29df 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 428688 BLAKE2B ad7b0e93dc8d25ffce2b6b151e2b2f9d3f4644e2e0bd01b04b2cf32db642d1d55604ebfba538d50e5bffd72012f36cafeebb5fa8b059c51e9495a17ed7d24e61 SHA512 38eef2b8a964d52745f651dc5c44cb508b253654c94f1704d61e63093636d75a72c2f7e2db78f40261fe9fecdede9dacd2401b62f42b01813651f01c9fe87245
-TIMESTAMP 2018-10-09T06:08:40Z
+TIMESTAMP 2018-10-09T09:08:37Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlu8RehfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlu8cBVfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAzEg/+LW+I9siH829c9bi6qwxHRecS29MXnCaYONyV/ML3cvPxhjWWgcwfbodH
-GJ8KKPalB62Vi69J7FIRvUB2MUQ7zdX0yhtAh3Z3PWxFQ5U1s5TATGujLWbjNov4
-PKd3GgX1rK3u1Nj6QOcsmtQMnTiSAahj0XIqKDTyM8uU99wixA9j77MN99M3aFM8
-aK3WSIuJG5XNMXu/TNjtb8deMmH5guDABYphn/DSQqxfprOWXz56Qrp5k53DaUYl
-HWHO2XCNt7XlM89O1c2M1pubAhSaSED4Ad9TiSVoDjiAyTKxiwEgk7mZo6DXmrtA
-vHLKUcxMzdp/s6zFd56ggAFoA43nBLRerj9sQMS4Nfgy6reTpXzDbfwEIEnVPna1
-hO9HdACRT4k87Xz2EhZWpokhqNViOSgu5PlQyh4unG/MbPpYPtfs4n/yBzllG2py
-uicjVEE+ihvlgyNVCBMgxMwR9Voaila35m7QzMuUTJxZuVplY0/7TaIEm/Mnce2C
-qzqx2GMXzzstTIDTlEBwA++B2zyA3asV3KwxHLKdnL90QSll7kIcOQHotFMD0g0I
-1RlGjcXhYU9wksmXHHrupyxGyo441WsZ73i1zcklmyU4C3ZC6+lE52BBHLZA6pk1
-Hsgp1lLdIpcy0L4n3Fw22jV7qR0/7uBUftNVd+iaYdxQ3r7j4AI=
-=LEJ8
+klBf+RAAkyXYc0KmNx4A0DpTDUklHEIQ+rkibYswwHeKRPE705d4bV+2wRR10kKL
+Vo8AdGS+wxCzZeACJvdwOo7APkoSRoSRI9CejV0SolteJdKmTk1RQYY1XMl3S4aA
+PSADzED1kNkZqSbJmRBqvcoiiSBj8791GBLb34/mB+UdDexFW6vv5GDf3ddCJ5vW
+P01QFhi9U4N/qgOZnqydXpfmU4g45foAY4GsblOWVW5K3+EjXYDYCxq9qou81Vsa
+78YtCP/j+6Rct5nHFVuElre9IfTdz39IRbC0rk0cpzJKMz78q1IvBKhZEztJOnRv
+vzH7wd1QTsQMb8hALtJMcn5K5TWEbWyqTAmvzbcktwkq/ssCQtnBzdCEpNYrTBXw
+7wF4Z8uDTJv74WxPu8sBkeZL8DNXfFpF1TkL4s2NsqxsBgdUDJYnqK4ZySJgTDwb
+1t0AoxROW6+htT36BnTmrNI3X8wv+V1nUIfAABCs0t22CNpJpkpNzrILwM2y1U/A
+9gH/QLOdIZCMjVUpKuUhNGStBmFVUla0gxQJ4uPKL+FKOJpxoWdbHCB8mSwjwVuS
+n43Cug01pnLKQVzlt1lEG3ezhb2RDZYdVkObbY97o6VRMyvhB0WPRbgz0Qo+W039
+9zQhHmvhvwtUUNHTI6AnjEfYiAzkEQC4HelsDM7Wd/8R/0taXdE=
+=Tx9u
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index fd78166f28e7..41afc63e4c4c 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 09 Oct 2018 06:08:37 +0000
+Tue, 09 Oct 2018 09:08:33 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 980733a287ee..1a63b7280e39 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 0d10678287cc..d47397762469 100644
Binary files a/metadata/md5-cache/app-crypt/Manifest.gz and b/metadata/md5-cache/app-crypt/Manifest.gz differ
diff --git a/metadata/md5-cache/app-crypt/ssdeep-2.14.1 b/metadata/md5-cache/app-crypt/ssdeep-2.14.1
new file mode 100644
index 000000000000..b2f12c2f1f5a
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/ssdeep-2.14.1
@@ -0,0 +1,12 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<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
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Computes context triggered piecewise hashes (fuzzy hashes)
+EAPI=7
+HOMEPAGE=http://ssdeep.sourceforge.net/
+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=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://github.com/ssdeep-project/ssdeep/releases/download/release-2.14.1/ssdeep-2.14.1.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=91ae5b07e40acbc99798dfffca1cfabf
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index fc3cb380f336..159484aa2fbd 100644
Binary files a/metadata/md5-cache/app-editors/Manifest.gz and b/metadata/md5-cache/app-editors/Manifest.gz differ
diff --git a/metadata/md5-cache/app-editors/okteta-0.25.4 b/metadata/md5-cache/app-editors/okteta-0.25.4
new file mode 100644
index 000000000000..4dc6f66a5282
--- /dev/null
+++ b/metadata/md5-cache/app-editors/okteta-0.25.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtscript-5.9.4:5[scripttools] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 crypt? ( app-crypt/qca:2[qt5(+)] ) designer? ( >=dev-qt/designer-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.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.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=Hex editor by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/okteta https://utils.kde.org/projects/okteta
+IUSE=crypt designer test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtscript-5.9.4:5[scripttools] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 crypt? ( app-crypt/qca:2[qt5(+)] ) designer? ( >=dev-qt/designer-5.9.4:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/okteta/0.25.4/src/okteta-0.25.4.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=edf9f3143fa3cd03fa9a7521c909fbb4
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index a92ea16aeddd..29a7c34255a3 100644
Binary files a/metadata/md5-cache/dev-lang/Manifest.gz and b/metadata/md5-cache/dev-lang/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2016-r1 b/metadata/md5-cache/dev-lang/gnat-gpl-2016-r1
new file mode 100644
index 000000000000..b4d4a02778e3
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2016-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=!sys-devel/gcc:4.9.4 elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/binutils-2.20 >=sys-apps/sed-4 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= graphite? ( >=dev-libs/cloog-0.18.0:0= >=dev-libs/isl-0.11.1:0= ) >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) regression-test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) gcj? ( awt? ( x11-base/xorg-proto x11-libs/libXt x11-libs/libX11 x11-libs/libXtst =x11-libs/gtk+-2* virtual/pkgconfig x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip )
+DESCRIPTION=GNAT Ada Compiler - GPL version
+EAPI=5
+HOMEPAGE=http://libre.adacore.com/
+IUSE=bootstrap regression-test vanilla altivec debug nopie nossp doc hardened multilib objc awt gcj pgo objc-gc libssp objc++ fixed-point go graphite cilk +vtv +nls +nptl +cxx +fortran +openmp +sanitize
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+ GPL-2 GPL-3
+PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.7
+RDEPEND=!sys-devel/gcc:4.9.4 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= graphite? ( >=dev-libs/cloog-0.18.0:0= >=dev-libs/isl-0.11.1:0= )
+RESTRICT=strip
+SLOT=4.9.4
+SRC_URI=mirror://gnu/gcc/gcc-4.9.4/gcc-4.9.4.tar.bz2 mirror://gentoo/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.9.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-patches-1.3.tar.bz2 mirror://gentoo/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar ) http://mirrors.cdn.adacore.com/art/57399304c7a447658e0aff7f -> gnat-gpl-2016-src.tar.gz http://mirrors.cdn.adacore.com/art/573992d4c7a447658d00e1db -> gcc-4.9-gpl-2016-src.tar.gz http://mirrors.cdn.adacore.com/art/57399232c7a447658e0aff7d -> gcc-interface-4.9-gpl-2016-src.tar.gz bootstrap? ( amd64? ( http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c -> gnat-gpl-2014-x86_64-linux-bin.tar.gz ) x86? ( http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248 -> gnat-gpl-2014-x86-linux-bin.tar.gz ) )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	79f371777ed8aea7eccf4c6b9134e9a5	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=d735ba1505bb6d965d4ff87a7a546fc4
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2018-r1 b/metadata/md5-cache/dev-lang/gnat-gpl-2018-r1
new file mode 100644
index 000000000000..2197e49860f7
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2018-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=!sys-devel/gcc:7.3.1 elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/binutils-2.20 >=sys-apps/sed-4 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) regression-test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
+DESCRIPTION=GNAT Ada Compiler - GPL version
+EAPI=5
+HOMEPAGE=http://libre.adacore.com/
+IUSE=+bootstrap regression-test vanilla altivec debug doc hardened multilib objc pgo objc-gc libssp objc++ fixed-point go graphite cilk +vtv jit mpx +pie +ssp +pch +nls +nptl +cxx +fortran +openmp +sanitize
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+ GPL-2 GPL-3
+PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-1.7
+RDEPEND=!sys-devel/gcc:7.3.1 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
+RESTRICT=strip
+SLOT=7.3.1
+SRC_URI=mirror://gnu/gcc/gcc-7.3.0/gcc-7.3.0.tar.xz mirror://gentoo/gcc-7.3.0-patches-1.6.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-7.3.0-patches-1.6.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-7.3.0-patches-1.6.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-7.3.0-patches-1.6.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-7.3.0-patches-1.6.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-7.3.0-patches-1.6.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-7.3.0-patches-1.6.tar.bz2 http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27aa5 -> gnat-gpl-2018-src.tar.gz http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27aa7 -> gcc-7-gpl-2018-src.tar.gz http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27aa6 -> gcc-interface-7-gpl-2018-src.tar.gz bootstrap? ( amd64? ( http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c -> gnat-gpl-2014-x86_64-linux-bin.tar.gz ) x86? ( http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248 -> gnat-gpl-2014-x86-linux-bin.tar.gz ) )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	79f371777ed8aea7eccf4c6b9134e9a5	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=aa294c17f9c0fb99532179c85b0fa69b
diff --git a/metadata/md5-cache/dev-tcltk/Manifest.gz b/metadata/md5-cache/dev-tcltk/Manifest.gz
index 6e68906cdce7..3b71a35f44f4 100644
Binary files a/metadata/md5-cache/dev-tcltk/Manifest.gz and b/metadata/md5-cache/dev-tcltk/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-tcltk/expect-lite-4.9.0 b/metadata/md5-cache/dev-tcltk/expect-lite-4.9.0
new file mode 100644
index 000000000000..8bc8e7a3095f
--- /dev/null
+++ b/metadata/md5-cache/dev-tcltk/expect-lite-4.9.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=quick and easy command line automation tool built on top of expect
+EAPI=6
+HOMEPAGE=http://expect-lite.sourceforge.net/
+IUSE=debug examples
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-tcltk/expect debug? ( dev-tcltk/tclx )
+SLOT=0
+SRC_URI=mirror://sourceforge/expect-lite/expect-lite_4.9.0.tar.gz
+_md5_=0a365c6d852a827a259b6c38265c031d
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index 7a1f4ae9b0ef..c24e61ee87b4 100644
Binary files a/metadata/md5-cache/dev-vcs/Manifest.gz and b/metadata/md5-cache/dev-vcs/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-vcs/git-2.18.1 b/metadata/md5-cache/dev-vcs/git-2.18.1
index 34cb5209664c..6c7944ed96af 100644
--- a/metadata/md5-cache/dev-vcs/git-2.18.1
+++ b/metadata/md5-cache/dev-vcs/git-2.18.1
@@ -4,11 +4,11 @@ DESCRIPTION=stupid content tracker: distributed VCS designed for speed and effic
 EAPI=6
 HOMEPAGE=https://www.git-scm.com/
 IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) 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_python3_7(-),python_single_target_python2_7(+)] )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://kernel/software/scm/git/git-2.18.1.tar.xz mirror://kernel/software/scm/git/git-manpages-2.18.1.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.18.1.tar.xz )
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	0bd80b082268528830da0d72ac571d9a	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3ee3dc0022660be32d881668422755f4
+_md5_=4126688197189caa52f50e68fc363852
diff --git a/metadata/md5-cache/kde-misc/Manifest.gz b/metadata/md5-cache/kde-misc/Manifest.gz
index beb37f328b31..421bb3e7700a 100644
Binary files a/metadata/md5-cache/kde-misc/Manifest.gz and b/metadata/md5-cache/kde-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/kde-misc/tellico-3.1.3 b/metadata/md5-cache/kde-misc/tellico-3.1.3
new file mode 100644
index 000000000000..fa41afc5f79a
--- /dev/null
+++ b/metadata/md5-cache/kde-misc/tellico-3.1.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/khtml-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kitemmodels-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/solid-5.46.0:5 >=kde-frameworks/sonnet-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-perl/Text-BibTeX-0.780.0-r1 dev-libs/libxml2 dev-libs/libxslt cddb? ( >=kde-apps/libkcddb-17.12.3:5 ) discid? ( dev-libs/libcdio:= ) pdf? ( app-text/poppler[qt5] ) scanner? ( >=kde-apps/libksane-17.12.3:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.46.0:5 ) taglib? ( >=media-libs/taglib-1.5 ) v4l? ( >=media-libs/libv4l-0.8.3 ) xmp? ( >=media-libs/exempi-2 ) yaz? ( >=dev-libs/yaz-2:0 ) sys-devel/gettext 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.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.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=Collection manager based on KDE Frameworks
+EAPI=6
+HOMEPAGE=http://tellico-project.org/
+IUSE=cddb discid pdf scanner semantic-desktop taglib v4l xmp yaz test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 )
+RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/khtml-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kitemmodels-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/solid-5.46.0:5 >=kde-frameworks/sonnet-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-perl/Text-BibTeX-0.780.0-r1 dev-libs/libxml2 dev-libs/libxslt cddb? ( >=kde-apps/libkcddb-17.12.3:5 ) discid? ( dev-libs/libcdio:= ) pdf? ( app-text/poppler[qt5] ) scanner? ( >=kde-apps/libksane-17.12.3:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.46.0:5 ) taglib? ( >=media-libs/taglib-1.5 ) v4l? ( >=media-libs/libv4l-0.8.3 ) xmp? ( >=media-libs/exempi-2 ) yaz? ( >=dev-libs/yaz-2:0 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+RESTRICT=test
+SLOT=5
+SRC_URI=http://tellico-project.org/files/tellico-3.1.3.tar.xz
+_eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	13d3b96a32511c767537abe037b05d16	kde5-functions	5976508bb4b803af7b28e66822122b26	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=ad7ee4da7285323b3b321d0cc8d71430
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 186a0bfd0875..999a9f9b07e6 100644
Binary files a/metadata/md5-cache/media-libs/Manifest.gz and b/metadata/md5-cache/media-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/media-libs/libextractor-1.7 b/metadata/md5-cache/media-libs/libextractor-1.7
new file mode 100644
index 000000000000..8b3c9585ae3a
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libextractor-1.7
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gettext virtual/pkgconfig
+DEFINED_PHASES=configure install prepare
+DEPEND=app-text/iso-codes dev-libs/glib:2 media-gfx/exiv2:= sys-devel/libtool virtual/libiconv virtual/libintl apparmor? ( sys-libs/libapparmor ) archive? ( app-arch/libarchive:= ) bzip2? ( app-arch/bzip2 ) ffmpeg? ( virtual/ffmpeg ) flac? ( media-libs/flac media-libs/libogg ) gif? ( media-libs/giflib:= ) gsf? ( gnome-extra/libgsf:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( x11-libs/gtk+:3 ) jpeg? ( virtual/jpeg:0 ) magic? ( sys-apps/file ) midi? ( media-libs/libsmf ) mp4? ( media-libs/libmp4v2:0 ) mpeg? ( media-libs/libmpeg2 ) tidy? ( app-text/htmltidy ) tiff? ( media-libs/tiff:0 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) zlib? ( sys-libs/zlib )
+DESCRIPTION=Library to extract metadata from files of arbitrary type
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/libextractor/
+IUSE=apparmor +archive +bzip2 ffmpeg flac gif gsf gstreamer gtk jpeg +magic midi mp4 mpeg tidy tiff vorbis +zlib
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+LICENSE=GPL-3
+RDEPEND=app-text/iso-codes dev-libs/glib:2 media-gfx/exiv2:= sys-devel/libtool virtual/libiconv virtual/libintl apparmor? ( sys-libs/libapparmor ) archive? ( app-arch/libarchive:= ) bzip2? ( app-arch/bzip2 ) ffmpeg? ( virtual/ffmpeg ) flac? ( media-libs/flac media-libs/libogg ) gif? ( media-libs/giflib:= ) gsf? ( gnome-extra/libgsf:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( x11-libs/gtk+:3 ) jpeg? ( virtual/jpeg:0 ) magic? ( sys-apps/file ) midi? ( media-libs/libsmf ) mp4? ( media-libs/libmp4v2:0 ) mpeg? ( media-libs/libmpeg2 ) tidy? ( app-text/htmltidy ) tiff? ( media-libs/tiff:0 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) zlib? ( sys-libs/zlib ) !sci-biology/glimmer
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://gnu/libextractor/libextractor-1.7.tar.gz
+_md5_=85cb0c2add0acf48115ff81247822296
diff --git a/metadata/md5-cache/net-dialup/Manifest.gz b/metadata/md5-cache/net-dialup/Manifest.gz
index 27cb565a5a51..4fab5849b53a 100644
Binary files a/metadata/md5-cache/net-dialup/Manifest.gz and b/metadata/md5-cache/net-dialup/Manifest.gz differ
diff --git a/metadata/md5-cache/net-dialup/lrzsz-0.12.20-r3 b/metadata/md5-cache/net-dialup/lrzsz-0.12.20-r3
deleted file mode 100644
index c7b32968ac91..000000000000
--- a/metadata/md5-cache/net-dialup/lrzsz-0.12.20-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=nls? ( virtual/libintl ) >=app-portage/elt-patches-20170815 !<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=Communication package providing the X, Y, and ZMODEM file transfer protocols
-EAPI=2
-HOMEPAGE=https://www.ohse.de/uwe/software/lrzsz.html
-IUSE=nls
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=https://www.ohse.de/uwe/releases/lrzsz-0.12.20.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a12e83af95aa99128ac8a9530c88a26d
diff --git a/metadata/md5-cache/net-dialup/lrzsz-0.12.20-r4 b/metadata/md5-cache/net-dialup/lrzsz-0.12.20-r4
index 7b9a918e55c5..fed527adcbcc 100644
--- a/metadata/md5-cache/net-dialup/lrzsz-0.12.20-r4
+++ b/metadata/md5-cache/net-dialup/lrzsz-0.12.20-r4
@@ -5,9 +5,9 @@ DESCRIPTION=Communication package providing the X, Y, and ZMODEM file transfer p
 EAPI=7
 HOMEPAGE=https://www.ohse.de/uwe/software/lrzsz.html
 IUSE=nls
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://www.ohse.de/uwe/releases/lrzsz-0.12.20.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=bc46239516e68b100913f7a3fdb83e90
+_md5_=af5478cd73f7bfead492f0f515caae38
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index d23f1f20b498..f550d3b0ec44 100644
Binary files a/metadata/md5-cache/net-libs/Manifest.gz and b/metadata/md5-cache/net-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/net-libs/libsignon-glib-1.14 b/metadata/md5-cache/net-libs/libsignon-glib-1.14
index 012cb941a8ca..e0d08766e9d4 100644
--- a/metadata/md5-cache/net-libs/libsignon-glib-1.14
+++ b/metadata/md5-cache/net-libs/libsignon-glib-1.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-libs/glib:2 net-libs/signond introspection? ( dev-libs/gobject-introspection:= ) 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(-)] 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(-)] ) dev-util/gdbus-codegen doc? ( dev-util/gtk-doc ) >=app-portage/elt-patches-20170815 !<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=dev-libs/glib:2 net-libs/signond introspection? ( dev-libs/gobject-introspection:= ) 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(-)] 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(-)] ) dev-util/glib-utils dev-util/gdbus-codegen doc? ( dev-util/gtk-doc ) >=app-portage/elt-patches-20170815 !<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=GLib binding for the D-Bus API provided by signond
 EAPI=6
 HOMEPAGE=https://01.org/gsso/
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://gitlab.com/accounts-sso/libsignon-glib/repository/archive.tar.gz?ref=VERSION_1.14 -> libsignon-glib-1.14.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ae64bb2b5d5d85b284584b08bbeab4fb
+_md5_=bcfdd41292c83c18d9e15b1999634188
diff --git a/metadata/md5-cache/sci-astronomy/Manifest.gz b/metadata/md5-cache/sci-astronomy/Manifest.gz
index 9179837a1ce5..af6968145b7a 100644
Binary files a/metadata/md5-cache/sci-astronomy/Manifest.gz and b/metadata/md5-cache/sci-astronomy/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-astronomy/stellarium-0.16.0-r1 b/metadata/md5-cache/sci-astronomy/stellarium-0.16.0-r1
index 246b3e7bc382..5b1b24c8ee4b 100644
--- a/metadata/md5-cache/sci-astronomy/stellarium-0.16.0-r1
+++ b/metadata/md5-cache/sci-astronomy/stellarium-0.16.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=3D photo-realistic skies in real time
 EAPI=6
 HOMEPAGE=http://www.stellarium.org/
 IUSE=debug gps media nls stars l10n_af l10n_am l10n_ar l10n_as l10n_ast l10n_az l10n_be l10n_bg l10n_bn l10n_bo l10n_br l10n_bs l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_el l10n_en l10n_en-GB l10n_en-US l10n_eo l10n_es l10n_et l10n_eu l10n_fa l10n_fi l10n_fil l10n_fr l10n_ga l10n_gd l10n_gl l10n_gu l10n_he l10n_hi l10n_hr l10n_hu l10n_hy l10n_ia l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kk l10n_kn l10n_ko l10n_ky l10n_la l10n_lb l10n_lo l10n_lt l10n_lv l10n_mk l10n_ml l10n_mn l10n_mr l10n_ms l10n_nb l10n_nl l10n_nn l10n_oc l10n_pa l10n_pl l10n_pt l10n_pt-BR l10n_ro l10n_ru l10n_se l10n_si l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_sw l10n_ta l10n_te l10n_tg l10n_th l10n_tl l10n_tr l10n_tt l10n_uk l10n_uz l10n_vi l10n_zh-CN l10n_zh-HK l10n_zh-TW l10n_zu
-KEYWORDS=amd64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=media-fonts/dejavu dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtscript:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtserialport:5 dev-qt/qtwidgets:5 virtual/opengl sys-libs/zlib media? ( dev-qt/qtmultimedia:5[widgets] ) gps? ( dev-qt/qtpositioning:5 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/stellarium/stellarium-0.16.0.tar.gz stars? ( mirror://sourceforge/stellarium/stars_4_1v0_1.cat mirror://sourceforge/stellarium/stars_5_2v0_1.cat mirror://sourceforge/stellarium/stars_6_2v0_1.cat mirror://sourceforge/stellarium/stars_7_2v0_1.cat mirror://sourceforge/stellarium/stars_8_2v0_1.cat )
 _eclasses_=cmake-utils	f0bc1c175684130a76ab6c17f575d820	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=9ffb39c205bd27cb7d63d089ccd439b5
+_md5_=9c091aba1499ae3a234b70bb909530ba
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 4e86ec126d11..955487f585fa 100644
Binary files a/metadata/md5-cache/sys-apps/Manifest.gz and b/metadata/md5-cache/sys-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-apps/lm_sensors-3.4.0_p20180923 b/metadata/md5-cache/sys-apps/lm_sensors-3.4.0_p20180923
index e2ff58817d76..02299c2fa975 100644
--- a/metadata/md5-cache/sys-apps/lm_sensors-3.4.0_p20180923
+++ b/metadata/md5-cache/sys-apps/lm_sensors-3.4.0_p20180923
@@ -4,10 +4,10 @@ DESCRIPTION=Hardware Monitoring user-space utilities
 EAPI=6
 HOMEPAGE=https://hwmon.wiki.kernel.org/ https://github.com/lm-sensors/lm-sensors
 IUSE=contrib sensord static-libs kernel_linux abi_x86_32 abi_x86_64 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 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+ LGPL-2.1
 RDEPEND=sensord? ( net-analyzer/rrdtool virtual/logger ) dev-lang/perl !<sys-apps/openrc-0.21.7
 SLOT=0/4.4.0
 SRC_URI=https://github.com/lm-sensors/lm-sensors/archive/807f9b1529892c0ac89bca0c7ae781c59f9c8393.tar.gz -> lm_sensors-3.4.0_p20180923.tar.gz
 _eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	systemd	47c677ae1d7b69031f11f630ac09f0d1	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=685a93dec8365984fc1aabf8602674ed
+_md5_=0d28ad2c559aa2ba4bbd74860341a1c5
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index ad69966708a2..0a39c2fe09fc 100644
Binary files a/metadata/md5-cache/x11-wm/Manifest.gz and b/metadata/md5-cache/x11-wm/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-wm/larswm-7.5.3-r1 b/metadata/md5-cache/x11-wm/larswm-7.5.3-r1
deleted file mode 100644
index 5c884c0e22b1..000000000000
--- a/metadata/md5-cache/x11-wm/larswm-7.5.3-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXext x11-base/xorg-proto x11-misc/imake x11-misc/gccmakedep app-text/rman
-DESCRIPTION=Tiling window manager for X11, based on 9wm by David Hogan
-EAPI=2
-HOMEPAGE=http://larswm.fnurt.net/
-KEYWORDS=alpha ~amd64 ppc ppc64 x86 ~x86-fbsd
-LICENSE=9wm
-RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXext
-SLOT=0
-SRC_URI=http://larswm.fnurt.net/larswm-7.5.3.tar.gz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=72ec644a913f788620df59649a45d601
diff --git a/metadata/md5-cache/x11-wm/larswm-7.5.3-r2 b/metadata/md5-cache/x11-wm/larswm-7.5.3-r2
index 911ca552bc74..6e4d2fcb30cb 100644
--- a/metadata/md5-cache/x11-wm/larswm-7.5.3-r2
+++ b/metadata/md5-cache/x11-wm/larswm-7.5.3-r2
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXext x11-base/
 DESCRIPTION=Tiling window manager for X11, based on 9wm by David Hogan
 EAPI=7
 HOMEPAGE=http://www.fnurt.net/larswm/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
+KEYWORDS=alpha amd64 ppc ppc64 x86 ~x86-fbsd
 LICENSE=9wm
 RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXext
 SLOT=0
 SRC_URI=http://www.fnurt.net/larswm/larswm-7.5.3.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=a9d8f4c5b1b54275fb4eb6cd8870f369
+_md5_=2e866a1577a412f04cd0570145aaba84
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index a29d6e4ad291..872c742a880b 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 20301 BLAKE2B 94e5e08bb1fb06daafae41f3b009e2486b835bd0478950857eac122294511d53866717ddacc70984a676a09a2b97a064b0b9e8ecd5261e58b3a0ec55bd0f3e51 SHA512 b72f3b14f69444a7d849878751dfcf10341f96aea126f20e0209c97c73e22d9421610392df5ee4ceb1577f6541480778b86eba9a821033b7318f43cb04c9b479
-TIMESTAMP 2018-10-09T06:08:40Z
+TIMESTAMP 2018-10-09T09:08:37Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlu8RehfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlu8cBVfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klC5fQ//X7Uk39ONLrQeD3YADvwIW3w4dqHsx8IWUglYNkSVOZxYznReX2MsRoqG
-0pmlm7HhghxuJ+9hfIkYqBQdBRT2krc6fqg4ILli5ww2DOsYqMUa9fdgPsHD88AO
-So9Cv/leLDeFzj57QGeGt9eg3oVAsHPClBuI85KdjX88yxbotkJvTZ3mXv0NvZ0d
-bwXrwrXYopH/IeZ/ASHVaNfIqQtS4zXP0f3TStRCV5dOvX60bZki2z+WSDdrN9Xn
-zqm/HZbWE3/UOJGOKFljgjLASOUbzK5CQxxrHIy8+XEg6vd67DVtPc999sCVg+xf
-DDYCb44a0wMd3B73tLrAYuGeVgROxlJBa9WQPsJwYt9lWQU7jx8GFG9pLzAk+R5X
-RatCsyHInbX2254skWt7G+bM9PdsEluYICRrhwmNzDrClAarr04yg+SkReoVDkAI
-Y6mQBF/yRtkUD8qCk85SOTJtkf8VCREIxpomEZnwjv52YXUyvZm1Rp7TvlpnNKnO
-G29sGNYeGP+wLPMxwgoeKKgzFoV7wFgSSq2b/EYZr0GewNKnCucWmrcZz42P6xxO
-/dfkwRX0Db51UT64fM75pT51+k4xyNenkC3bwv1GE/1juM08cCWCtc5cJ7ABAtBW
-ndPr+LZf1kBuhNnPpkysIrZUrkpQeglJX6iy/N2lNrU02WRLOI4=
-=4ZdW
+klDitA/9GMS9Mw1rPWBEz3x0p1ZDJPk160Jc4+i+dLheK+1+CJvHU4x82ytfgmOm
+rceAnyk+vhc7IgHvqOekgXL5IzcpDHL+efFfMqB1hKV3MyKLfz2wyZ48bD9RSgfn
+z/vZgqMtJAaWf+6H355PEudWf24/Pwq67k4g6V1NRkCWr0EByeiVZ2mmsFZ8uvM2
+yWbdmA1PglMdFdn+JrEdSLyO8JwM4PCs8VjeRf21hS0Nbnc684ND7rL65smp4K1y
+OAlY6dX8POnESYB7enKM16U6aloiMJpc61LvZ5c4/sGBQ4pspMJeKKRV/ZDV0ySn
+xTyn11sCBaPQwUayeFGSBRsl7xrMd96G/KK613ffaJliNs4u5cdLfh7JrVPN1B7F
+kNVCNl+r/dovgXWmXdBb4KjzU2/2E5kDNOiBIun0Xc3V5VE4S0Gm8RRvgCVvrWhj
+Bnd0uXPxwK9tV1AhZSvP5vjxMosesVGYSbeFVVxBd3cWbitkMqAMpelZSMLYYmU3
+7M9h+hHpPNTAT9UuQr0qZDTn9k1qLwySNwuNREns+fO58QBRstTXOvWYGtSnSwyd
+MQuXFysn3p3dfICfqdvyKoArW71bMAEG1oKsd34/LDfn4rJcEOSoamrDgESu+A1L
+n/B5BdS0i8YvQkqyMDbUVxcxq9FzJ6RfIcKDh4UPkHSdhx0gfVA=
+=B65T
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index fd78166f28e7..41afc63e4c4c 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 09 Oct 2018 06:08:37 +0000
+Tue, 09 Oct 2018 09:08:33 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 348b8d386e42..e8abb2aa4b2a 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue Oct  9 06:08:37 UTC 2018
+Tue Oct  9 09:08:33 UTC 2018
diff --git a/metadata/timestamp.calculate b/metadata/timestamp.calculate
index 3fbcba30662c..4fc48fb3366b 100644
--- a/metadata/timestamp.calculate
+++ b/metadata/timestamp.calculate
@@ -4065,8 +4065,7 @@
 1702282250 ./net-dialup/isdn-firmware/isdn-firmware-2005.8.15.2.ebuild
 1804220338 ./net-dialup/freeradius/freeradius-3.0.15.ebuild
 1806171439 ./net-dialup/freeradius/freeradius-3.0.17.ebuild
-1808150039 ./net-dialup/lrzsz/lrzsz-0.12.20-r3.ebuild
-1808150039 ./net-dialup/lrzsz/lrzsz-0.12.20-r4.ebuild
+1810091209 ./net-dialup/lrzsz/lrzsz-0.12.20-r4.ebuild
 1808210339 ./net-dialup/xl2tpd/xl2tpd-1.3.10.ebuild
 1707171243 ./net-dialup/xl2tpd/xl2tpd-1.3.6.ebuild
 1808101139 ./net-dialup/xl2tpd/xl2tpd-1.3.12.ebuild
@@ -4222,6 +4221,7 @@
 1806091709 ./app-crypt/qca/qca-2.2.0_pre20180606.ebuild
 1801022040 ./app-crypt/argon2/argon2-20161029-r1.ebuild
 1809221439 ./app-crypt/argon2/argon2-20171227.ebuild
+1810091139 ./app-crypt/ssdeep/ssdeep-2.14.1.ebuild
 1809280333 ./app-crypt/ssdeep/ssdeep-2.13.ebuild
 1807022309 ./app-crypt/gkeys/gkeys-9999.ebuild
 1705141229 ./app-crypt/gkeys/gkeys-0.2.ebuild
@@ -5216,7 +5216,7 @@
 1702282250 ./net-libs/enet/enet-1.3.7.ebuild
 1810070209 ./net-libs/rest/rest-0.8.1.ebuild
 1803041808 ./net-libs/libcork/libcork-0.15.0.ebuild
-1801270339 ./net-libs/libsignon-glib/libsignon-glib-1.14.ebuild
+1810091109 ./net-libs/libsignon-glib/libsignon-glib-1.14.ebuild
 1709231535 ./net-libs/axtls/axtls-2.1.4.ebuild
 1807212309 ./net-libs/axtls/axtls-2.1.3.ebuild
 1702282250 ./net-libs/axtls/axtls-2.1.2.ebuild
@@ -10374,7 +10374,7 @@
 1808310239 ./dev-vcs/git/git-2.16.4.ebuild
 1810052339 ./dev-vcs/git/git-2.19.1.ebuild
 1809111209 ./dev-vcs/git/git-9999-r2.ebuild
-1810052339 ./dev-vcs/git/git-2.18.1.ebuild
+1810091139 ./dev-vcs/git/git-2.18.1.ebuild
 1809111209 ./dev-vcs/git/git-9999-r3.ebuild
 1810070139 ./dev-vcs/git/git-2.18.0.ebuild
 1809111209 ./dev-vcs/git/git-2.19.0.ebuild
@@ -11026,6 +11026,7 @@
 1806041338 ./app-editors/jedit/jedit-5.4.0.ebuild
 1806041338 ./app-editors/jedit/jedit-5.2.0-r1.ebuild
 1810010409 ./app-editors/okteta/okteta-0.25.3.ebuild
+1810091139 ./app-editors/okteta/okteta-0.25.4.ebuild
 1804140408 ./app-editors/bluefish/bluefish-2.2.6.ebuild
 1805270804 ./app-editors/bluefish/bluefish-2.2.10.ebuild
 1804140408 ./app-editors/bluefish/bluefish-2.2.9.ebuild
@@ -11585,8 +11586,10 @@
 1803110238 ./dev-lang/smlnj/smlnj-110.82.ebuild
 1702282250 ./dev-lang/smlnj/smlnj-110.75.ebuild
 1804211108 ./dev-lang/gnat-gpl/gnat-gpl-2016.ebuild
+1810090939 ./dev-lang/gnat-gpl/gnat-gpl-2016-r1.ebuild
 1804211108 ./dev-lang/gnat-gpl/gnat-gpl-2017.ebuild
 1807300939 ./dev-lang/gnat-gpl/gnat-gpl-2018.ebuild
+1810090939 ./dev-lang/gnat-gpl/gnat-gpl-2018-r1.ebuild
 1807270039 ./dev-lang/elixir/elixir-1.7.1.ebuild
 1805071638 ./dev-lang/elixir/elixir-1.6.5.ebuild
 1707292223 ./dev-lang/elixir/elixir-1.4.5.ebuild
@@ -15607,6 +15610,7 @@
 1805012209 ./dev-tcltk/tkpiechart/tkpiechart-6.5-r1.ebuild
 1702282250 ./dev-tcltk/ck/ck-8.0-r4.ebuild
 1702282250 ./dev-tcltk/expect-lite/expect-lite-4.8.0.ebuild
+1810090939 ./dev-tcltk/expect-lite/expect-lite-4.9.0.ebuild
 1805012209 ./dev-tcltk/expect-lite/expect-lite-4.6.1.ebuild
 1805012209 ./dev-tcltk/expect-lite/expect-lite-4.7.2.ebuild
 1702282250 ./dev-tcltk/itk/itk-3.4.1.ebuild
@@ -22129,7 +22133,7 @@
 1707052231 ./sci-astronomy/fitsh/fitsh-0.9.2.ebuild
 1702282250 ./sci-astronomy/sextractor/sextractor-2.19.5.ebuild
 1702282250 ./sci-astronomy/sextractor/sextractor-2.19.5-r1.ebuild
-1806242339 ./sci-astronomy/stellarium/stellarium-0.16.0-r1.ebuild
+1810091139 ./sci-astronomy/stellarium/stellarium-0.16.0-r1.ebuild
 1704201936 ./sci-astronomy/astrometry/astrometry-0.70.ebuild
 1707142031 ./sci-astronomy/astrometry/astrometry-0.72.ebuild
 1704201936 ./sci-astronomy/astrometry/astrometry-0.67-r2.ebuild
@@ -27912,8 +27916,7 @@
 1809111109 ./x11-wm/i3/i3-4.14.1.ebuild
 1810021739 ./x11-wm/i3/i3-4.15.ebuild
 1809111109 ./x11-wm/i3/i3-4.13-r1.ebuild
-1809301509 ./x11-wm/larswm/larswm-7.5.3-r2.ebuild
-1805220439 ./x11-wm/larswm/larswm-7.5.3-r1.ebuild
+1810091209 ./x11-wm/larswm/larswm-7.5.3-r2.ebuild
 1805220439 ./x11-wm/dwm/dwm-9999.ebuild
 1807061709 ./x11-wm/dwm/dwm-6.1-r1.ebuild
 1805240409 ./x11-wm/oroborus/oroborus-2.0.20-r1.ebuild
@@ -31819,7 +31822,7 @@
 1808201309 ./sys-apps/fd/fd-7.1.0.ebuild
 1807211139 ./sys-apps/fd/fd-7.0.0.ebuild
 1702282250 ./sys-apps/netkit-base/netkit-base-0.17-r9.ebuild
-1810090839 ./sys-apps/lm_sensors/lm_sensors-3.4.0_p20180923.ebuild
+1810091209 ./sys-apps/lm_sensors/lm_sensors-3.4.0_p20180923.ebuild
 1808310240 ./sys-apps/lm_sensors/lm_sensors-3.4.0_p20170901.ebuild
 1808111239 ./sys-apps/dcfldd/dcfldd-1.3.4.1-r1.ebuild
 1805012209 ./sys-apps/dcfldd/dcfldd-1.3.4.1.ebuild
@@ -32829,6 +32832,7 @@
 1810070139 ./media-libs/libmad/libmad-0.15.1b-r9.ebuild
 1804201108 ./media-libs/libmad/libmad-0.15.1b-r8.ebuild
 1809161509 ./media-libs/libextractor/libextractor-1.6.ebuild
+1810091109 ./media-libs/libextractor/libextractor-1.7.ebuild
 1810050809 ./media-libs/libmodplug/libmodplug-0.8.9.0.ebuild
 1802221708 ./media-libs/x265/x265-2.7.ebuild
 1804181639 ./media-libs/x265/x265-2.6.ebuild
@@ -33176,6 +33180,7 @@
 1808301439 ./kde-misc/kio-gdrive/kio-gdrive-1.2.4.ebuild
 1806071339 ./kde-misc/kdirstat/kdirstat-3.1.3.ebuild
 1805081038 ./kde-misc/kshutdown/kshutdown-4.2.ebuild
+1810091109 ./kde-misc/tellico/tellico-3.1.3.ebuild
 1805051038 ./kde-misc/tellico/tellico-3.1.2.ebuild
 1702282250 ./kde-misc/colord-kde/colord-kde-0.5.0.ebuild
 1810041609 ./kde-misc/latte-dock/latte-dock-0.8.1.ebuild
@@ -39929,16 +39934,15 @@
 1809280334 metadata/md5-cache/net-dialup/kpnadsl4linux-1.11
 1809280334 metadata/md5-cache/net-dialup/minicom-2.7.1
 1809280334 metadata/md5-cache/net-dialup/tkvoice-1.5
-1810030549 metadata/md5-cache/net-dialup/Manifest.gz
+1810091209 metadata/md5-cache/net-dialup/Manifest.gz
 1809280334 metadata/md5-cache/net-dialup/pppconfig-2.3.21
 1809280334 metadata/md5-cache/net-dialup/xl2tpd-1.3.6
 1809280334 metadata/md5-cache/net-dialup/dwun-0.96e-r4
 1809281540 metadata/md5-cache/net-dialup/sendpage-1.1.0-r3
 1809280334 metadata/md5-cache/net-dialup/fbgetty-0.1.698-r1
 1809280334 metadata/md5-cache/net-dialup/globespan-adsl-0.11-r1
-1809280334 metadata/md5-cache/net-dialup/lrzsz-0.12.20-r3
 1810021239 metadata/md5-cache/net-dialup/speedtouch-usb-3.0.1.2-r3
-1809280334 metadata/md5-cache/net-dialup/lrzsz-0.12.20-r4
+1810091209 metadata/md5-cache/net-dialup/lrzsz-0.12.20-r4
 1809280334 metadata/md5-cache/net-dialup/freeradius-3.0.15
 1809280334 metadata/md5-cache/net-dialup/linux-atm-2.5.0
 1810021239 metadata/md5-cache/net-dialup/linux-atm-2.5.2
@@ -40149,7 +40153,7 @@
 1809280333 metadata/md5-cache/app-crypt/johntheripper-1.7.9-r6
 1809280333 metadata/md5-cache/app-crypt/onak-0.5.0
 1809280333 metadata/md5-cache/app-crypt/jitterentropy-2.1.1
-1810082339 metadata/md5-cache/app-crypt/Manifest.gz
+1810091139 metadata/md5-cache/app-crypt/Manifest.gz
 1808252239 metadata/md5-cache/app-crypt/debian-archive-keyring-2014.3
 1809280333 metadata/md5-cache/app-crypt/libu2f-server-1.1.0
 1809280333 metadata/md5-cache/app-crypt/jetring-0.25
@@ -40173,6 +40177,7 @@
 1809280333 metadata/md5-cache/app-crypt/monkeysphere-0.37
 1804061408 metadata/md5-cache/app-crypt/paperkey-1.5
 1809280333 metadata/md5-cache/app-crypt/cardpeek-0.8.4
+1810091139 metadata/md5-cache/app-crypt/ssdeep-2.14.1
 1809280333 metadata/md5-cache/app-crypt/keybase-9999
 1810021239 metadata/md5-cache/app-crypt/veracrypt-1.22
 1809280333 metadata/md5-cache/app-crypt/rhash-1.3.6-r1
@@ -41008,7 +41013,7 @@
 1810030549 metadata/md5-cache/net-libs/librsync-2.0.1-r1
 1809280334 metadata/md5-cache/net-libs/rpcsvc-proto-1.4
 1809280334 metadata/md5-cache/net-libs/libosmo-netif-9999
-1810030549 metadata/md5-cache/net-libs/libsignon-glib-1.14
+1810091109 metadata/md5-cache/net-libs/libsignon-glib-1.14
 1809280334 metadata/md5-cache/net-libs/zeromq-2.2.0
 1809280334 metadata/md5-cache/net-libs/tox-0_pre20160904
 1810030549 metadata/md5-cache/net-libs/grpc-1.13.1
@@ -41094,7 +41099,7 @@
 1810030549 metadata/md5-cache/net-libs/google-cloud-cpp-0.2.0-r1
 1810030549 metadata/md5-cache/net-libs/gupnp-av-0.12.10
 1809280334 metadata/md5-cache/net-libs/libmbim-1.6.0
-1810081009 metadata/md5-cache/net-libs/Manifest.gz
+1810091109 metadata/md5-cache/net-libs/Manifest.gz
 1809280334 metadata/md5-cache/net-libs/nghttp2-1.33.0
 1807061439 metadata/md5-cache/net-libs/wandio-1.0.5
 1810030549 metadata/md5-cache/net-libs/farstream-0.2.8-r2
@@ -46306,7 +46311,7 @@
 1809281540 metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.4.1-r1
 1809280334 metadata/md5-cache/dev-vcs/tig-2.3.3
 1809280334 metadata/md5-cache/dev-vcs/tig-9999
-1810052339 metadata/md5-cache/dev-vcs/git-2.18.1
+1810091139 metadata/md5-cache/dev-vcs/git-2.18.1
 1809281540 metadata/md5-cache/dev-vcs/git-9999-r2
 1809281540 metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.2.4
 1807071339 metadata/md5-cache/dev-vcs/cvsgraph-1.7.0
@@ -46337,7 +46342,7 @@
 1809152309 metadata/md5-cache/dev-vcs/cvs2cl-2.71-r1
 1809280334 metadata/md5-cache/dev-vcs/svn2git-9999
 1809281540 metadata/md5-cache/dev-vcs/gitolite-gentoo-3.5.3.1
-1810071339 metadata/md5-cache/dev-vcs/Manifest.gz
+1810091139 metadata/md5-cache/dev-vcs/Manifest.gz
 1809280334 metadata/md5-cache/dev-vcs/git-mailz-0.12
 1809280334 metadata/md5-cache/dev-vcs/cvs-fast-export-1.38
 1705101908 metadata/md5-cache/dev-vcs/mr-1.20170129
@@ -47025,7 +47030,8 @@
 1702282308 metadata/md5-cache/app-editors/le-1.14.3
 1809280333 metadata/md5-cache/app-editors/ee-1.5.2
 1810030549 metadata/md5-cache/app-editors/neovim-0.3.1
-1810062339 metadata/md5-cache/app-editors/Manifest.gz
+1810091139 metadata/md5-cache/app-editors/Manifest.gz
+1810091139 metadata/md5-cache/app-editors/okteta-0.25.4
 1810030549 metadata/md5-cache/app-editors/jedit-5.2.0-r1
 1809280333 metadata/md5-cache/app-editors/emacs-24.5-r5
 1809280333 metadata/md5-cache/app-editors/jove-4.16.0.73
@@ -47450,6 +47456,7 @@
 1809280333 metadata/md5-cache/dev-lang/lua-5.2.3
 1809280333 metadata/md5-cache/dev-lang/luajit-2.0.5-r1
 1809280333 metadata/md5-cache/dev-lang/tcc-0.9.26-r1
+1810090939 metadata/md5-cache/dev-lang/gnat-gpl-2018-r1
 1809280333 metadata/md5-cache/dev-lang/lua-5.3.3
 1809280333 metadata/md5-cache/dev-lang/lua-5.1.5-r4
 1809280333 metadata/md5-cache/dev-lang/jimtcl-9999
@@ -47562,7 +47569,7 @@
 1809280333 metadata/md5-cache/dev-lang/nqp-9999
 1809280333 metadata/md5-cache/dev-lang/tuprolog-3.1.0
 1809280333 metadata/md5-cache/dev-lang/whitespace-0.4
-1810090339 metadata/md5-cache/dev-lang/Manifest.gz
+1810090939 metadata/md5-cache/dev-lang/Manifest.gz
 1809280333 metadata/md5-cache/dev-lang/ghc-7.10.3
 1809280333 metadata/md5-cache/dev-lang/polyml-5.6
 1809280333 metadata/md5-cache/dev-lang/R-3.3.2
@@ -47671,6 +47678,7 @@
 1809280333 metadata/md5-cache/dev-lang/yasm-9999
 1809280333 metadata/md5-cache/dev-lang/lfe-0.10.1
 1809280333 metadata/md5-cache/dev-lang/polyml-5.4.1
+1810090939 metadata/md5-cache/dev-lang/gnat-gpl-2016-r1
 1809280333 metadata/md5-cache/dev-lang/f2c-20060507
 1809280333 metadata/md5-cache/dev-lang/tk-8.6.5
 1809280333 metadata/md5-cache/dev-lang/go-1.10.2
@@ -51549,7 +51557,7 @@
 1809280333 metadata/md5-cache/dev-tcltk/expect-5.45
 1805012209 metadata/md5-cache/dev-tcltk/vtcl-1.6.0-r1
 1809280333 metadata/md5-cache/dev-tcltk/tkdnd-2.6
-1810072239 metadata/md5-cache/dev-tcltk/Manifest.gz
+1810090939 metadata/md5-cache/dev-tcltk/Manifest.gz
 1809280333 metadata/md5-cache/dev-tcltk/tcl3d-0.5.0
 1809280333 metadata/md5-cache/dev-tcltk/tls-1.6.7
 1809280333 metadata/md5-cache/dev-tcltk/mysqltcl-3.05
@@ -51567,6 +51575,7 @@
 1809280333 metadata/md5-cache/dev-tcltk/tcl-mccp-0.6
 1809280333 metadata/md5-cache/dev-tcltk/tkimg-1.4-r9
 1809170309 metadata/md5-cache/dev-tcltk/mysqltcl-3.052-r1
+1810090939 metadata/md5-cache/dev-tcltk/expect-lite-4.9.0
 1809280333 metadata/md5-cache/dev-tcltk/tkcon-2.5
 1810062239 metadata/md5-cache/dev-tcltk/tclperl-3.2-r1
 1809280333 metadata/md5-cache/dev-tcltk/tcl3d-0.4.0
@@ -55494,7 +55503,7 @@
 1809280334 metadata/md5-cache/sys-freebsd/freebsd-mk-defs-11.1
 1809280334 metadata/md5-cache/sys-freebsd/freebsd-usbin-11.1
 1809280334 metadata/md5-cache/sys-freebsd/freebsd-usbin-11.1_p1
-1810090839 metadata/md5-cache/Manifest.gz
+1810091209 metadata/md5-cache/Manifest.gz
 1809280334 metadata/md5-cache/www-apache/passenger-5.3.4
 1809280334 metadata/md5-cache/www-apache/mod_macro-1.1.10
 1809280334 metadata/md5-cache/www-apache/mod_wsgi-4.5.17
@@ -58055,7 +58064,7 @@
 1809280334 metadata/md5-cache/sci-astronomy/esomidas-17.02-r1
 1809280334 metadata/md5-cache/sci-astronomy/xephem-3.7.7
 1809280334 metadata/md5-cache/sci-astronomy/esorex-3.10.2
-1810030549 metadata/md5-cache/sci-astronomy/stellarium-0.16.0-r1
+1810091139 metadata/md5-cache/sci-astronomy/stellarium-0.16.0-r1
 1809280334 metadata/md5-cache/sci-astronomy/sextractor-2.19.5
 1702282330 metadata/md5-cache/sci-astronomy/missfits-2.8.0
 1809280334 metadata/md5-cache/sci-astronomy/aatm-0.6
@@ -58079,7 +58088,7 @@
 1809280334 metadata/md5-cache/sci-astronomy/skycat-3.1.3
 1809280334 metadata/md5-cache/sci-astronomy/astrometry-0.72
 1809280334 metadata/md5-cache/sci-astronomy/cpl-7.0
-1810062309 metadata/md5-cache/sci-astronomy/Manifest.gz
+1810091139 metadata/md5-cache/sci-astronomy/Manifest.gz
 1809280334 metadata/md5-cache/sci-astronomy/galaxy-2.2-r1
 1809280334 metadata/md5-cache/sci-astronomy/montage-5.0
 1809280334 metadata/md5-cache/sci-astronomy/predict-2.2.3-r2
@@ -63896,7 +63905,7 @@
 1810030549 metadata/md5-cache/x11-wm/enlightenment-0.22.4
 1809280334 metadata/md5-cache/x11-wm/lumina-9999
 1806031709 metadata/md5-cache/x11-wm/page-1.9.9-r2
-1810070209 metadata/md5-cache/x11-wm/Manifest.gz
+1810091209 metadata/md5-cache/x11-wm/Manifest.gz
 1810030549 metadata/md5-cache/x11-wm/muffin-3.6.0
 1810030549 metadata/md5-cache/x11-wm/muffin-3.8.2
 1809280334 metadata/md5-cache/x11-wm/evilwm-1.1.1
@@ -63951,8 +63960,7 @@
 1809280334 metadata/md5-cache/x11-wm/ratpoison-9999
 1810030549 metadata/md5-cache/x11-wm/mutter-3.26.2-r1
 1809280334 metadata/md5-cache/x11-wm/sithwm-1.2.3
-1809280334 metadata/md5-cache/x11-wm/larswm-7.5.3-r1
-1809301509 metadata/md5-cache/x11-wm/larswm-7.5.3-r2
+1810091209 metadata/md5-cache/x11-wm/larswm-7.5.3-r2
 1809280334 metadata/md5-cache/kde-apps/kdesdk-meta-18.04.3
 1810030549 metadata/md5-cache/kde-apps/libksane-18.04.3
 1810030549 metadata/md5-cache/kde-apps/knetwalk-18.08.1
@@ -67951,7 +67959,7 @@
 1809280334 metadata/md5-cache/sys-apps/iproute2-9999
 1809280334 metadata/md5-cache/sys-apps/dbus-broker-15
 1809280334 metadata/md5-cache/sys-apps/toybox-9999
-1810090839 metadata/md5-cache/sys-apps/Manifest.gz
+1810091209 metadata/md5-cache/sys-apps/Manifest.gz
 1809280334 metadata/md5-cache/sys-apps/hwids-20170328
 1809010139 metadata/md5-cache/sys-apps/smc-sum-2.0.1.20180420-r1
 1809280334 metadata/md5-cache/sys-apps/restorecond-9999
@@ -68211,7 +68219,7 @@
 1809280334 metadata/md5-cache/sys-apps/install-xattr-9999
 1809280334 metadata/md5-cache/sys-apps/sysvinit-2.88-r9
 1809280334 metadata/md5-cache/sys-apps/groff-1.22.2
-1810090839 metadata/md5-cache/sys-apps/lm_sensors-3.4.0_p20180923
+1810091209 metadata/md5-cache/sys-apps/lm_sensors-3.4.0_p20180923
 1809280334 metadata/md5-cache/sys-apps/rng-tools-6.1-r2
 1809280334 metadata/md5-cache/sys-apps/kmod-25
 1809280334 metadata/md5-cache/sys-apps/rng-tools-6.4
@@ -68724,7 +68732,7 @@
 1810030549 metadata/md5-cache/media-libs/phonon-gstreamer-4.9.0-r2
 1810062009 metadata/md5-cache/media-libs/raptor-2.0.15-r1
 1809280334 metadata/md5-cache/media-libs/gavl-1.2.0
-1810081909 metadata/md5-cache/media-libs/Manifest.gz
+1810091109 metadata/md5-cache/media-libs/Manifest.gz
 1809280334 metadata/md5-cache/media-libs/libsixel-1.8.1
 1808151104 metadata/md5-cache/media-libs/elles_icc_profiles-20160501.0932
 1809280334 metadata/md5-cache/media-libs/libmtp-1.1.14
@@ -68997,6 +69005,7 @@
 1809280334 metadata/md5-cache/media-libs/libsamplerate-9999
 1809280334 metadata/md5-cache/media-libs/libhdhomerun-20150826
 1809280334 metadata/md5-cache/media-libs/libdiscid-0.6.1
+1810091109 metadata/md5-cache/media-libs/libextractor-1.7
 1805012209 metadata/md5-cache/media-libs/sdlmm-0.1.8-r1
 1809280334 metadata/md5-cache/media-libs/tiff-3.9.7-r1
 1809280334 metadata/md5-cache/media-libs/libmkv-0.6.5.1
@@ -69186,11 +69195,12 @@
 1810030549 metadata/md5-cache/kde-misc/kio-locate-0.5.3-r1
 1810030549 metadata/md5-cache/kde-misc/gmailfeed-1.1
 1810030549 metadata/md5-cache/kde-misc/zanshin-0.5.0
+1810091109 metadata/md5-cache/kde-misc/tellico-3.1.3
 1810030549 metadata/md5-cache/kde-misc/playbar2-2.5
 1810030549 metadata/md5-cache/kde-misc/systemd-kcm-1.2.1
 1810030549 metadata/md5-cache/kde-misc/wacomtablet-3.1.0
 1810030549 metadata/md5-cache/kde-misc/basket-2.49a_p20170225-r1
-1810060009 metadata/md5-cache/kde-misc/Manifest.gz
+1810091109 metadata/md5-cache/kde-misc/Manifest.gz
 1810030549 metadata/md5-cache/kde-misc/kdiff3-0.9.98_p20170219-r1
 1810030549 metadata/md5-cache/kde-misc/skanlite-2.1.0.1
 1810030549 metadata/md5-cache/kde-misc/kshutdown-4.2
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index dcf485a5b54d..a37aef1d6a7e 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 09 Oct 2018 06:30:01 +0000
+Tue, 09 Oct 2018 09:30:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 544ca7251d99..a7185e379ce3 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-0865e8550bfcfad282d9da0f4d1b2032b4a07d22 1539061964 2018-10-09T05:12:44+00:00
+9e90ff081539207b5993f5457993e142ec33217a 1539075661 2018-10-09T09:01:01+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 5dfbb0b40021..8185d3bb1897 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1539065101 Tue 09 Oct 2018 06:05:01 AM UTC
+1539075901 Tue 09 Oct 2018 09:05:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index fd78166f28e7..41afc63e4c4c 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Tue, 09 Oct 2018 06:08:37 +0000
+Tue, 09 Oct 2018 09:08:33 +0000
diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index 9ad3116d9c42..3055068866a7 100644
Binary files a/net-dialup/Manifest.gz and b/net-dialup/Manifest.gz differ
diff --git a/net-dialup/lrzsz/Manifest b/net-dialup/lrzsz/Manifest
index 2d7aa729e5c6..88467f4a3115 100644
--- a/net-dialup/lrzsz/Manifest
+++ b/net-dialup/lrzsz/Manifest
@@ -3,6 +3,5 @@ AUX lrzsz-0.12.20-automake-1.13.patch 454 BLAKE2B 19627ec86b92c5e1dfcd4404408b9a
 AUX lrzsz-autotools.patch 8725 BLAKE2B 8f499974f0184784d1e800a43e8fdd09b389bb2a2c48ae335708ca25eb2b7130b5554fcbb8217aa3833ffdf2d0756fe091df615351b4c23214e7889dbf2399aa SHA512 4ba98fb4a72d8fcc654741d57992598d56eded61e7b89c54d44edd7a609149e15d9948d777d70bf41137daa0b860c67e1212a3f38519434cb5d44546bfb94909
 AUX lrzsz-implicit-decl.patch 428 BLAKE2B c08a244d292be32bb49fff6186cbe847c106dee67b3ea463860d1e6387e159af1b106e5f78ea5bce31c347cb7207c95116243fa515e4daafb23d2cc309776480 SHA512 7dd642aa6701671986e6ab1635935c7a8088ad5ee74131b7c486e2e87d748fc835798d1a8a291e85a80ba3f88328ce4f293a8dafb1ebd9924f1f31fb2bd3a7d7
 DIST lrzsz-0.12.20.tar.gz 280938 BLAKE2B 86511ab112da849f5894f18c045f2c8a9dd4c4e97426c1d98c5b91aade6c39e26f4a7e5674e057c9596a240dfd3ef32053fcdc8ee58b33654cf15eec64779b1e SHA512 9bce64036f1f1c65f5910f19802aecaf3dc5ffeab0feeca10fa8d2fe1b83e212391cce23056d22fd0eda52df89e12ede68eb5d22ffcf22f935910d2af7399f12
-EBUILD lrzsz-0.12.20-r3.ebuild 1586 BLAKE2B e0b54505e4ec5bde6039340fab0b5f3191f0feb1b60de82ab49a477c6b7e8f7726526c47b853bc2c7da9f2b50421070c45f6eb5098bd2fee8d743690eb76b7fa SHA512 5330b4ba5e07e0e3c61512c757cc46d33590e5aa9e9bb81289a8811a162e1b57ce048c3226724fb92184bc3a1b45ff9552fc6f259a679a107276630ba44ca58a
-EBUILD lrzsz-0.12.20-r4.ebuild 1541 BLAKE2B 77d884836156c108db551ce947a15bd5bd79513f3172d8b29ca049df2ce778089fea45f8b145a026b580e05a1bf2c0eafe4167498d9827b4bbaed173c9e770ac SHA512 cb7ef34ac19d7d095c23ca1515a4bb65bab2d6a4cb24e36e9fff13be04e55d2323a5bb7743b66a686bb06bc3412c7ad442e2eb007d3e26d4eb98196ecb8f889a
+EBUILD lrzsz-0.12.20-r4.ebuild 1526 BLAKE2B 3e78ffb152f06a7f77f312d9918cc2ad83d4f9655867e9f7def2797cb1c978da3c68f88e3488a346bf18ad5a95fa39c5338fd003dc733a0a415cf37eab2bb797 SHA512 3b6f34b961047010d5b22b00bf78b729c2ae4f463c58364b7e8afcc691ce4fafed3fe5c3ace0e6a44cb80dabbaf62b6ce35bf3ea13ab3c3c7250cb127a3423b9
 MISC metadata.xml 359 BLAKE2B 842a9354b4b11a8894d58eda8cee0a31b60bb74981333e3e8ee383cb8caa1f0ee0577060880b123c3d73fb7cb5562a542c346f04bba3e60c5e40d9ef83a26c26 SHA512 5e033194af9899fd66ee44372089c3e63a2839a486f845ba139786a862f1b0534902465e776d901155ddffb794e7419f338b4c5ed43d6a8301c98ae8dc24db70
diff --git a/net-dialup/lrzsz/lrzsz-0.12.20-r3.ebuild b/net-dialup/lrzsz/lrzsz-0.12.20-r3.ebuild
deleted file mode 100644
index 8449f89be7ab..000000000000
--- a/net-dialup/lrzsz/lrzsz-0.12.20-r3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit autotools flag-o-matic eutils toolchain-funcs
-
-DESCRIPTION="Communication package providing the X, Y, and ZMODEM file transfer protocols"
-HOMEPAGE="https://www.ohse.de/uwe/software/lrzsz.html"
-SRC_URI="https://www.ohse.de/uwe/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="nls"
-
-DEPEND="nls? ( virtual/libintl )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-autotools.patch
-	epatch "${FILESDIR}"/${PN}-implicit-decl.patch
-	epatch "${FILESDIR}"/${P}-automake-1.12.patch
-	epatch "${FILESDIR}"/${P}-automake-1.13.patch
-
-	# automake is unhappy if this is missing
-	>> config.rpath
-	# This is too old.  Remove it so automake puts in a newer copy.
-	rm -f missing
-	# Autoheader does not like seeing this file.
-	rm -f acconfig.h
-
-	eautoreconf
-}
-
-src_configure() {
-	tc-export CC
-	append-flags -Wstrict-prototypes
-	econf $(use_enable nls) || die "econf failed"
-}
-
-src_test() {
-	#Don't use check target.
-	#See bug #120748 before changing this function.
-	make vcheck || die "tests failed"
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		install || die "make install failed"
-
-	local x
-	for x in {r,s}{b,x,z} ; do
-		dosym l${x} /usr/bin/${x}
-		dosym l${x:0:1}z.1 /usr/share/man/man1/${x}.1
-		[ "${x:1:1}" = "z" ] || dosym l${x:0:1}z.1 /usr/share/man/man1/l${x}.1
-	done
-
-	dodoc AUTHORS COMPATABILITY ChangeLog NEWS README* THANKS TODO
-}
diff --git a/net-dialup/lrzsz/lrzsz-0.12.20-r4.ebuild b/net-dialup/lrzsz/lrzsz-0.12.20-r4.ebuild
index 0b999da1b239..cb2d74b42e8e 100644
--- a/net-dialup/lrzsz/lrzsz-0.12.20-r4.ebuild
+++ b/net-dialup/lrzsz/lrzsz-0.12.20-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.ohse.de/uwe/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="nls"
 
 DEPEND="nls? ( virtual/libintl )"
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 7af114a96519..9c2b7f4e289f 100644
Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ
diff --git a/net-libs/libsignon-glib/Manifest b/net-libs/libsignon-glib/Manifest
index c2dc2fb690db..85372603cb93 100644
--- a/net-libs/libsignon-glib/Manifest
+++ b/net-libs/libsignon-glib/Manifest
@@ -1,5 +1,5 @@
 AUX libsignon-glib-1.12-doc-disable.patch 844 BLAKE2B 600b936552c64473dfce637d60a782526a42858d3b7e3118c78ec442cb6d53e167503407d0bf3ded34024a7065d5fdbf3f487edd7e3fb701d0a009eff158d094 SHA512 690ee30d4e1d6277c0b02720212654d482173a75657da7f72c30f258921cbe790ea2d47d3de9a598be04e4ef55b995118ab5a537ed728c2735445915810f561d
 AUX libsignon-glib-1.14-default-opts.patch 1714 BLAKE2B 8c00bcf5b056cd0fe05f58ed5727569cf9b917d6e4e7e11d90bd52ef343f8b26e02f98ab463e5c2a1121ba48f0260896f1301b1446c0f26146a8e2e5d6ce3c05 SHA512 bb27417ff1dc03510fdd1f019b7b8d044a8c281243467dfa7d2fdd8123ef3290a325a7c9a96bd246f37891bd7ac9ce2702b40396ed067dbac4b9e995a89d2430
 DIST libsignon-glib-1.14.tar.gz 54019 BLAKE2B 9ffdb96a374ef0848c1b70cb369a533ea826b24856a32b4b454a0fd8982533041fcc88382fdf1eee6857aa36ec8d076885fc769a058e148e91da54dbddaf7125 SHA512 c2277933d6ec2c3288ce510c853da7719116dac15d60c7114fcdcb87d04e7f70390d066938dea6aa0f819fbd70158fb875c5be5684c47fd27c0b6c55e9467a1d
-EBUILD libsignon-glib-1.14.ebuild 1756 BLAKE2B bb5a3f42035dee0647b6e13f040c766ab1b78210cd4fcdf39e05869e22e9a56ec9b7d4e7a10643765407a16ff173eb646b52599fc6ce6748b53d9b8cb6cb8d6a SHA512 1b11907e4a449014fa1a75ce0b06e1cc6790d9843dcf5725b4ac7bd5ce6e3ec33e8ae58702fcc5c0b0bb72eee27091528f7963a0325e55db7387ba1b776b745d
+EBUILD libsignon-glib-1.14.ebuild 1700 BLAKE2B 854e8555d79b659070278d39b16e60d616de010ae3b7b5053e2e5b882d94ac5297193a270853d5a6ad2ca905bf53853bad02bbd0d2b4882e3aed2d4b6c76580d SHA512 c26d4017da7a744631788a630a14bfbe01ce86cbf7592eddf5c5a2173eb5e19216f2017cc95746a45ebe0c519bc7936b4ab78c86c1990732f47e004427a3a947
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/libsignon-glib/libsignon-glib-1.14.ebuild b/net-libs/libsignon-glib/libsignon-glib-1.14.ebuild
index 51eecdc3d558..740195845377 100644
--- a/net-libs/libsignon-glib/libsignon-glib-1.14.ebuild
+++ b/net-libs/libsignon-glib/libsignon-glib-1.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,6 +27,7 @@ RDEPEND="
 	)
 "
 DEPEND="${RDEPEND}
+	dev-util/glib-utils
 	dev-util/gdbus-codegen
 	doc? ( dev-util/gtk-doc )
 "
@@ -72,8 +73,6 @@ src_configure() {
 }
 
 src_compile() {
-	# fails to compile with more than one thread
-	MAKEOPTS="${MAKEOPTS} -j1"
 	default
 	if use python; then
 		python_foreach_impl run_in_build_dir default
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index c0c943da853d..e6fa048735fe 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/package.mask b/profiles/package.mask
index 807f01f72591..d2cd1f5e96fb 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Sergei Trofimovich <slyfox@gentoo.org> (09 Oct 2018)
+# Upstream is not actively maintained. Needs a port to mupdf-1.14.
+app-text/fbpdf
+
 # Davide Pesavento <pesa@gentoo.org> (08 Oct 2018)
 # Ebuild is not ready, major packaging changes required. Bug 668014.
 >=dev-python/PyQt5-5.11
diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz
index 384d917e6bbd..852e74c85233 100644
Binary files a/sci-astronomy/Manifest.gz and b/sci-astronomy/Manifest.gz differ
diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest
index 0f07006214da..73274474dd37 100644
--- a/sci-astronomy/stellarium/Manifest
+++ b/sci-astronomy/stellarium/Manifest
@@ -4,5 +4,5 @@ DIST stars_6_2v0_1.cat 148352404 BLAKE2B c605b284b3d768cb1619ada3f58d406fa7737f0
 DIST stars_7_2v0_1.cat 305710678 BLAKE2B 1cc9b4a6bc35a9339e495f7e0da4f7e90a0e92b05b5de8599be1bbdd2a8053cbcec44b0e58bc9248364666db9cdf23449edf236e3f21fdc0e8f1a4a706afc919 SHA512 43b866eb793e8812c9d5502101a6c985d2055fb88bdbda274726bcd51e1527ecf342b22acd673318c9c8e88cac68eace18de8f27d29ffe64933fd32a5b84c5e3
 DIST stars_8_2v0_1.cat 559068934 BLAKE2B c040a369cdf6885759998e1315b554d21a5e2b9b149a67967a8af45606aebf57bec407fab5ce1904978af0dc529aa6bddd267331ca45f58617bbf56d5ca99dee SHA512 06d4fa298b9dff8452f550377df99fcaa5e7107cfc7b75c9a4769b3cb6d97a822a54213c706102c1d7ef2dabc16df32a85f46b2f6d6c6f76a4e919353b739de4
 DIST stellarium-0.16.0.tar.gz 204675673 BLAKE2B fe34ab611569e23277ae9f273d1ae72139d5b860d0ae1b5650a9744960ce8bac6953d7de98b60bd224374aa77db33c00081ed90d1683b2007ef1b5068af158ff SHA512 0f75441435ff1d0fa149264116e9ae6ec3b3553f7c66e78832bdb0ffd55cbef656b820680134d95f89c73e80ef283372660ea7545db7fff205da66cf4cf8e9d6
-EBUILD stellarium-0.16.0-r1.ebuild 2682 BLAKE2B a7d339dba9db7e9e61d7ae2f87392ccd2e75f127aead0c93f79c0dcf6477ecaf891b9318a4a8e0741ef6ffaf7d91f0a49cc1d45d54b3c16299dc899622847400 SHA512 d3f8dd098fa304ed3e9030d02b842bf8c640ca0200731b9864f70f8e5e0b141b9666dc22014d54308ce4a7c5cc563a632460aa8beb41189f8c466c62f0a88afa
+EBUILD stellarium-0.16.0-r1.ebuild 2678 BLAKE2B 4ad1b128b5d332059796e02782935c7fbb4c355339264eb5679e86a2d10e734f76bb203c6b18401e7ef96f7b851b862a9a7d6501e86a76a45aa831dcd856d01f SHA512 db6a1df905b969aa878ed6bd5274e7496696805df7200366f70621929aa83239d5d20082d89eab83af02cd99b843d695ab8dbcbe3e750da54f3d2bbc3b68cabf
 MISC metadata.xml 758 BLAKE2B 69f3db0b3705b55f1eb04d67e0e6d6baab7e7e7df214f0a5386b74efd2863b63290581cd6c5b90000bab20a423902722ab560a670aa25796c7d555875a5961ac SHA512 33bc261705580ece702dce6d2f4d4143e80daa072a09bfbb40bb522d3a494f5f438d560a3ff0aa089313b365015189aa909b831a95166c8e709477dc6625a31c
diff --git a/sci-astronomy/stellarium/stellarium-0.16.0-r1.ebuild b/sci-astronomy/stellarium/stellarium-0.16.0-r1.ebuild
index 343831a3b7bc..c812fd7ca1c7 100644
--- a/sci-astronomy/stellarium/stellarium-0.16.0-r1.ebuild
+++ b/sci-astronomy/stellarium/stellarium-0.16.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug gps media nls stars"
 
 RESTRICT="test" # There are no tests
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 8e3ab5422487..423ea6c0ef54 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/lm_sensors/Manifest b/sys-apps/lm_sensors/Manifest
index beee5b080c03..6e3532f95a08 100644
--- a/sys-apps/lm_sensors/Manifest
+++ b/sys-apps/lm_sensors/Manifest
@@ -10,5 +10,5 @@ AUX sensord.service-r1 155 BLAKE2B 8a61565976b7d333dfb257d0e57a18140229bedb44fc0
 DIST lm_sensors-3.4.0_p20170901.tar.gz 208487 BLAKE2B b6d2eb6efee25891fbd655738ba25e91d8ec5d97f07e24ee217ab1a59c51a8ab59e042a90ed6fa1de4459992adc740252588419c0f74ce02f9ad7c1f4f9750da SHA512 5c4a750efdff2ef086a5ed1b6a8a03278872ca077255eae91d0696af229f37b09216e2f53d1d6e4602596fd8b978e0b9c27327357621486c5d7b1d39ecd16fea
 DIST lm_sensors-3.4.0_p20180923.tar.gz 264263 BLAKE2B 7444934429b16ae19af0390e8d3e6a2cf979dccf3c83ee8a3fd0f1f358d07bbc3e446197d44deb994a6d3313cff492625b8fd5c7462c39eb5e10b998b6588cb1 SHA512 cf6ea7898248420e2927aa673ba166ede8e774f605038fad4e503f178ab36c2b371253c69197739fe533663dac191b40dce7c3b4ad71488e4f15e4583f6ad363
 EBUILD lm_sensors-3.4.0_p20170901.ebuild 6319 BLAKE2B d1ddc399feb10b050e28e0e7b2ae05178b3de4eacde019ae615f57d2d83c214b54330f1f0923ffe2e27838b6048f27b4cb2225ead5436002a84da2fbbddb2a50 SHA512 72759cde25a87a464e9ee6f25945965172c514c0878eb44c258ac295142575815975aa4425e1c13522e94faadabdbcaef6248e2b4b89af14bcd4e047241685bb
-EBUILD lm_sensors-3.4.0_p20180923.ebuild 6326 BLAKE2B d0687502731811925e9986a79b789465e7868e13aefdc173b928d528007587725697b3e1fb4422809d9abc591ed84f5aeff85e58e4c203b7f829ff417fb999dd SHA512 a155265a257d2fdc53c3f5ff500628f23c69bed8ada0bde58dbfb7f8bcd85e9ba9a31f68be3c658b5ab9e1c3552a77a7b659852ea351889dd3fc479b93c57840
+EBUILD lm_sensors-3.4.0_p20180923.ebuild 6325 BLAKE2B c430d5cf2224887d07d0ddd8ecfca49e9b87a4a8c8daf22c8afaab077f52881565226e58dcdaebd924bc0eba4182df582de993e4aeae644230beb02d35eac315 SHA512 6304e2595768655771332e623556989920919c233e054933f872fe53c321fa96543af183ac329e31a36bff501fce6595365110c26aec2d8740127cdfcb01b76a
 MISC metadata.xml 943 BLAKE2B dec9c9764069667a9f5f5cd8359d0dc06020d6acbed972daab0b538b9f172f6d081a057cc6c55362de11c26857d1a885bb8a04e18dab1062370a8ddf0e25d7e8 SHA512 c32b85e2771b216861bf16d8c7ccfc8277b34c7ab712edaf487083f8d9e2a8e3707b65d1dd952e92d925fbefa87cf76799aa0b30f11ae8acfd4ffe27f2caf1f8
diff --git a/sys-apps/lm_sensors/lm_sensors-3.4.0_p20180923.ebuild b/sys-apps/lm_sensors/lm_sensors-3.4.0_p20180923.ebuild
index 65e82e0df667..1079358ad8d3 100644
--- a/sys-apps/lm_sensors/lm_sensors-3.4.0_p20180923.ebuild
+++ b/sys-apps/lm_sensors/lm_sensors-3.4.0_p20180923.ebuild
@@ -19,7 +19,7 @@ LICENSE="GPL-2+ LGPL-2.1"
 # SUBSLOT based on SONAME of libsensors.so
 SLOT="0/4.4.0"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="contrib sensord static-libs"
 
 COMMON_DEPS="
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 4f9677aa880d..e43c0e2b9e4c 100644
Binary files a/x11-wm/Manifest.gz and b/x11-wm/Manifest.gz differ
diff --git a/x11-wm/larswm/Manifest b/x11-wm/larswm/Manifest
index 58463d11b78c..1f2588ab4934 100644
--- a/x11-wm/larswm/Manifest
+++ b/x11-wm/larswm/Manifest
@@ -1,5 +1,4 @@
 AUX larswm.desktop 125 BLAKE2B 15556dde41d8bbec4649e946a0cc8113fda06d667bb0c85691964af2513e32a36da0e0ce5bf979c212f295e4305b3fae202f62f883c459b297516facc66547db SHA512 033ca80e83d928eca524c0a5473f2776f363ff301442a7a7c3f34bb99bc61af8a524f6bf39ee1d6282ce5f732bd1fd7b0b242ad4909063496c4c6965becd7b43
 DIST larswm-7.5.3.tar.gz 84505 BLAKE2B 4548f8d757b8dc86f8bf545bc45b09f8b934792fea2a9a49d905669b767b453d007b29923fc0d7c9b4bd744f8c77e72652388bb66f51658846699d6b517f40d5 SHA512 7c99aadcc419f695b55bf0ea2f9833757c06f6ba0f00ae58e1db6e38df70bf944bac44834418bb52188d844722a7ac3c49388280c649ede073a74c21572cf3d4
-EBUILD larswm-7.5.3-r1.ebuild 1078 BLAKE2B f8b14cf87f046a374f7e0eb58d6f2ffebfedd2c67509d371bb08d28ddf92f8a1431d1516707715f67b81979ad47d1f5acb85183e70c2f7a411d950d81afd663a SHA512 da3268fd8b1ab4fb827cad6c574431ddacd5c6072a44b382055ea627515d021cc676baefb0a2cc5f75d24a41f44a670bf44454f717589f402932319385cc7cf2
-EBUILD larswm-7.5.3-r2.ebuild 1062 BLAKE2B 264987fd2b95cfcd219324818449cdf4ffcff9a2b6cb2c9121471bf63c79dc3b459224a8963e520d557953aaae50a8e7889be1b02ea4d267c3ba83dce6b7640e SHA512 b97af0e59075b108afa05d111bfe06179c22a3da3f734653c0c8926b1996b02323476722c406e9f48324fa95dab9f118035e59c2fe87296853575fd2782195ef
+EBUILD larswm-7.5.3-r2.ebuild 1057 BLAKE2B a7afdecda207c950831fcf873c551929168ed37735749c62affc636cbb682c1e8f5bc708467f5944190418865d88f2bc9ee457819549b166c4c823b026caaf56 SHA512 c17d3d863ed37be157893696f03d1eaaf9dbfc5d80ab50640e95dd797249ab9d1e790357c7800e68f628ee73e9f483ac9f8e5c6f3b1d8915fea2cabca6a865ea
 MISC metadata.xml 605 BLAKE2B a55956469773e235d3c3bae88bcc826689fcc80aad5b1cfbf36908875253a0ce4728cd1a8692bd91c551e1cc1c2c5aa293a5339beb27799c5fa8d5fcf94438c8 SHA512 5c777d2c54e8cbe89c8644cd68697e1da2049c75a450cd6be085fba62bab7d56a8b4a28850330599684dfe9c9725977d14f8de1e52e624911d5c5c7088acb29d
diff --git a/x11-wm/larswm/larswm-7.5.3-r1.ebuild b/x11-wm/larswm/larswm-7.5.3-r1.ebuild
deleted file mode 100644
index 6c4d029b86c5..000000000000
--- a/x11-wm/larswm/larswm-7.5.3-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit toolchain-funcs
-
-DESCRIPTION="Tiling window manager for X11, based on 9wm by David Hogan"
-HOMEPAGE="http://larswm.fnurt.net/"
-SRC_URI="http://larswm.fnurt.net/${P}.tar.gz"
-LICENSE="9wm"
-
-SLOT="0"
-KEYWORDS="alpha ~amd64 ppc ppc64 x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libXext"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	x11-misc/imake
-	x11-misc/gccmakedep
-	app-text/rman"
-
-src_configure() {
-	xmkmf -a || die
-}
-
-src_compile() {
-	emake \
-		CC=$(tc-getCC) \
-		CCOPTIONS="${CFLAGS}" \
-		EXTRA_LDOPTIONS="${LDFLAGS}" \
-		|| die
-}
-
-src_install() {
-	dobin larsclock larsmenu larsremote larswm
-	newbin sample.xsession larswm-session
-	for x in *.man ; do
-		newman $x ${x/man/1}
-	done
-	dodoc ChangeLog README* sample.*
-
-	insinto /etc/X11
-	newins sample.larswmrc larswmrc || die
-	exeinto /etc/X11/Sessions
-	newexe sample.xsession larswm
-	insinto /usr/share/xsessions
-	doins "${FILESDIR}"/larswm.desktop || die
-}
diff --git a/x11-wm/larswm/larswm-7.5.3-r2.ebuild b/x11-wm/larswm/larswm-7.5.3-r2.ebuild
index 84b61cef262f..e3ae4ba69ed7 100644
--- a/x11-wm/larswm/larswm-7.5.3-r2.ebuild
+++ b/x11-wm/larswm/larswm-7.5.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.fnurt.net/larswm/${P}.tar.gz"
 LICENSE="9wm"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ppc ppc64 x86 ~x86-fbsd"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXmu